diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index e9aa0f98146..908a46c91d1 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -301,6 +301,8 @@ if (empty($reshook)) $object->phone_mobile= trim(GETPOST("phone_mobile",'alpha')); $object->email = preg_replace('/\s+/', '', GETPOST("member_email",'alpha')); $object->skype = trim(GETPOST("skype",'alpha')); + $object->twitter = trim(GETPOST("twitter",'alpha')); + $object->facebook = trim(GETPOST("facebook",'alpha')); $object->birth = $birthdate; $object->typeid = GETPOST("typeid",'int'); @@ -443,6 +445,8 @@ if (empty($reshook)) $phone_perso=GETPOST("phone_perso",'alpha'); $phone_mobile=GETPOST("phone_mobile",'alpha'); $skype=GETPOST("member_skype",'alpha'); + $twitter=GETPOST("member_twitter",'alpha'); + $facebook=GETPOST("member_facebook",'alpha'); $email=preg_replace('/\s+/', '', GETPOST("member_email",'alpha')); $login=GETPOST("member_login",'alpha'); $pass=GETPOST("password",'alpha'); @@ -467,7 +471,11 @@ if (empty($reshook)) $object->phone = $phone; $object->phone_perso = $phone_perso; $object->phone_mobile= $phone_mobile; + $object->skype = $skype; + $object->twitter = $twitter; + $object->facebook = $facebook; + $object->email = $email; $object->login = $login; $object->pass = $pass; @@ -985,7 +993,19 @@ else print ''.$langs->trans("Skype").''; } - // Birthday + // Twitter + if (! empty($conf->socialnetworks->enabled)) + { + print ''.$langs->trans("Twitter").''; + } + + // Facebook + if (! empty($conf->socialnetworks->enabled)) + { + print ''.$langs->trans("Facebook").''; + } + + // Birthday print "".$langs->trans("Birthday")."\n"; print $form->selectDate(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc'); print "\n"; @@ -1220,7 +1240,7 @@ else // Skype if (! empty($conf->socialnetworks->enabled)) { - print ''.$langs->trans("Skype").'skype).'">'; + print ''.$langs->trans("Skype").'skype).'">'; } // Twitter diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 21f6c3407d9..888e3043de1 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -88,7 +88,11 @@ class Adherent extends CommonObject public $state; // Label of department public $email; + public $skype; + public $twitter; + public $facebook; + public $phone; public $phone_perso; public $phone_mobile; @@ -468,6 +472,8 @@ class Adherent extends CommonObject $sql.= ", state_id = ".($this->state_id>0?$this->db->escape($this->state_id):"null"); $sql.= ", email = '".$this->db->escape($this->email)."'"; $sql.= ", skype = '".$this->db->escape($this->skype)."'"; + $sql.= ", twitter = '".$this->db->escape($this->twitter)."'"; + $sql.= ", facebook = '".$this->db->escape($this->facebook)."'"; $sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null"); $sql.= ", phone_perso = ".($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null"); $sql.= ", phone_mobile = ".($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null"); @@ -574,6 +580,8 @@ class Adherent extends CommonObject $luser->email=$this->email; $luser->skype=$this->skype; + $luser->twitter=$this->twitter; + $luser->facebook=$this->facebook; $luser->office_phone=$this->phone; $luser->user_mobile=$this->phone_mobile; @@ -613,6 +621,8 @@ class Adherent extends CommonObject $lthirdparty->town=$this->town; $lthirdparty->email=$this->email; $lthirdparty->skype=$this->skype; + $lthirdparty->twitter=$this->twitter; + $lthirdparty->facebook=$this->facebook; $lthirdparty->phone=$this->phone; $lthirdparty->state_id=$this->state_id; $lthirdparty->country_id=$this->country_id; @@ -1100,7 +1110,7 @@ class Adherent extends CommonObject $sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,"; $sql.= " d.note_public,"; - $sql.= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,"; + $sql.= " d.email, d.skype, d.twitter, d.facebook, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass, d.pass_crypted,"; $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,"; $sql.= " d.datec as datec,"; $sql.= " d.tms as datem,"; @@ -1172,7 +1182,10 @@ class Adherent extends CommonObject $this->phone_perso = $obj->phone_perso; $this->phone_mobile = $obj->phone_mobile; $this->email = $obj->email; + $this->skype = $obj->skype; + $this->twitter = $obj->twitter; + $this->facebook = $obj->facebook; $this->photo = $obj->photo; $this->statut = $obj->statut; @@ -2265,7 +2278,9 @@ class Adherent extends CommonObject $this->country = 'France'; $this->morphy = 1; $this->email = 'specimen@specimen.com'; - $this->skype = 'tom.hanson'; + $this->skype = 'skypepseudo'; + $this->twitter = 'twitterpseudo'; + $this->facebook = 'facebookpseudo'; $this->phone = '0999999999'; $this->phone_perso = '0999999998'; $this->phone_mobile = '0999999997'; @@ -2372,6 +2387,8 @@ class Adherent extends CommonObject if ($this->town && ! empty($conf->global->LDAP_MEMBER_FIELD_TOWN)) $info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->town; if ($this->country_code && ! empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY)) $info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code; if ($this->skype && ! empty($conf->global->LDAP_MEMBER_FIELD_SKYPE)) $info[$conf->global->LDAP_MEMBER_FIELD_SKYPE] = $this->skype; + if ($this->twitter && ! empty($conf->global->LDAP_MEMBER_FIELD_TWITTER)) $info[$conf->global->LDAP_MEMBER_FIELD_TWITTER] = $this->twitter; + if ($this->facebook && ! empty($conf->global->LDAP_MEMBER_FIELD_FACEBOOK)) $info[$conf->global->LDAP_MEMBER_FIELD_FACEBOOK] = $this->facebook; if ($this->phone && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE] = $this->phone; if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso; if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 9dee03e87c6..cf733932129 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -201,6 +201,8 @@ if (empty($reshook)) { $object->office_fax = GETPOST("office_fax", 'alpha'); $object->user_mobile = GETPOST("user_mobile"); $object->skype = GETPOST("skype", 'alpha'); + $object->twitter = GETPOST("twitter", 'alpha'); + $object->facebook = GETPOST("facebook", 'alpha'); $object->email = preg_replace('/\s+/', '', GETPOST("email", 'alpha')); $object->job = GETPOST("job", 'alpha'); $object->signature = GETPOST("signature"); @@ -348,6 +350,8 @@ if (empty($reshook)) { $object->office_fax = GETPOST("office_fax", 'alpha'); $object->user_mobile = GETPOST("user_mobile"); $object->skype = GETPOST("skype", 'alpha'); + $object->twitter = GETPOST("twitter", 'alpha'); + $object->facebook = GETPOST("facebook", 'alpha'); $object->email = preg_replace('/\s+/', '', GETPOST("email", 'alpha')); $object->job = GETPOST("job", 'alpha'); $object->signature = GETPOST("signature",'none'); @@ -588,6 +592,8 @@ if (empty($reshook)) { $ldap_fax = $attribute[$conf->global->LDAP_FIELD_FAX]; $ldap_mobile = $attribute[$conf->global->LDAP_FIELD_MOBILE]; $ldap_skype = $attribute[$conf->global->LDAP_FIELD_SKYPE]; + $ldap_twitter = $attribute[$conf->global->LDAP_FIELD_TWITTER]; + $ldap_facebook = $attribute[$conf->global->LDAP_FIELD_FACEBOOK]; $ldap_mail = $attribute[$conf->global->LDAP_FIELD_MAIL]; $ldap_sid = $attribute[$conf->global->LDAP_FIELD_SID]; } @@ -1023,7 +1029,7 @@ if ($action == 'create' || $action == 'adduserldap') print ''; if (! empty($ldap_twitter)) { - print ''; + print ''; print $ldap_twitter; } else @@ -1040,7 +1046,7 @@ if ($action == 'create' || $action == 'adduserldap') print ''; if (! empty($ldap_facebook)) { - print ''; + print ''; print $ldap_facebook; } else