lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work on contact

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-09-14 13:31:26 +02:00
parent 79bd426363
commit af63ac4051
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/adherents/card.php
View File

@ -487,7 +487,6 @@ if (empty($reshook))
$object->socialnetworks = array(); $object->socialnetworks = array();
if (! empty($conf->socialnetworks->enabled)) { if (! empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
if (!$value['active']) break;
$object->socialnetworks[$key] = GETPOST("member_".$key, 'alpha'); $object->socialnetworks[$key] = GETPOST("member_".$key, 'alpha');
} }
} }

10
htdocs/contact/card.php
View File

@ -196,7 +196,9 @@ if (empty($reshook))
$object->socialnetworks = array(); $object->socialnetworks = array();
if (! empty($conf->socialnetworks->enabled)) { if (! empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml'); if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml')!='') {
$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
}
} }
} }
$object->email = GETPOST("email", 'alpha'); $object->email = GETPOST("email", 'alpha');
@ -374,7 +376,9 @@ if (empty($reshook))
//$object->linkedin = GETPOST("linkedin", 'alpha'); //$object->linkedin = GETPOST("linkedin", 'alpha');
if (! empty($conf->socialnetworks->enabled)) { if (! empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
$object->socialnetworks[$key] = GETPOST($key, 'alpha'); if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml')!='') {
$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
}
} }
} }
$object->phone_pro = GETPOST("phone_pro", 'alpha'); $object->phone_pro = GETPOST("phone_pro", 'alpha');
@ -383,7 +387,7 @@ if (empty($reshook))
$object->fax = GETPOST("fax", 'alpha'); $object->fax = GETPOST("fax", 'alpha');
$object->priv = GETPOST("priv", 'int'); $object->priv = GETPOST("priv", 'int');
$object->note_public = GETPOST("note_public", 'none'); $object->note_public = GETPOST("note_public", 'none');
$object->note_private = GETPOST("note_private", 'none'); $object->note_private = GETPOST("note_private", 'none');
// Fill array 'array_options' with data from add form // Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels, $object); $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

4
htdocs/contact/class/contact.class.php
View File

@ -750,8 +750,8 @@ class Contact extends CommonObject
$sql.= " c.fk_pays as country_id,"; $sql.= " c.fk_pays as country_id,";
$sql.= " c.fk_departement as state_id,"; $sql.= " c.fk_departement as state_id,";
$sql.= " c.birthday,"; $sql.= " c.birthday,";
$sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid,"; $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email,";
$sql.= " c.socialnetworks, c.skype, c.twitter, c.facebook, c.linkedin,"; $sql.= " c.socialnetworks, c.jabberid, c.skype, c.twitter, c.facebook, c.linkedin,";
$sql.= " c.photo,"; $sql.= " c.photo,";
$sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.canvas,"; $sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.canvas,";
$sql.= " c.import_key,"; $sql.= " c.import_key,";

1
test/phpunit/ContactTest.php
View File

@ -208,6 +208,7 @@ class ContactTest extends PHPUnit\Framework\TestCase
$localobject->fax='New fax'; $localobject->fax='New fax';
$localobject->email='newemail@newemail.com'; $localobject->email='newemail@newemail.com';
$localobject->jabberid='New im id'; $localobject->jabberid='New im id';
$localobject->socialnetworks['jabber']='New im id';
$localobject->default_lang='es_ES'; $localobject->default_lang='es_ES';
$result=$localobject->update($localobject->id, $user); $result=$localobject->update($localobject->id, $user);