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 16:35:18 +02:00
parent af63ac4051
commit ccaa4cc1f3
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/adherents/card.php
View File

@ -306,7 +306,9 @@ if (empty($reshook))
$object->email = preg_replace('/\s+/', '', GETPOST("member_email", 'alpha')); $object->email = preg_replace('/\s+/', '', GETPOST("member_email", 'alpha'));
$object->socialnetworks = array(); $object->socialnetworks = array();
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
$object->socialnetworks[$key] = trim(GETPOST($key, 'alpha')); if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml')!='') {
$object->socialnetworks[$key] = trim(GETPOST($key, 'alphanohtml'));
}
} }
//$object->skype = trim(GETPOST("skype", 'alpha')); //$object->skype = trim(GETPOST("skype", 'alpha'));
//$object->twitter = trim(GETPOST("twitter", 'alpha')); //$object->twitter = trim(GETPOST("twitter", 'alpha'));
@ -487,7 +489,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("member_".$key, 'alpha'); if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml')!='') {
$object->socialnetworks[$key] = GETPOST("member_".$key, 'alphanohtml');
}
} }
} }

5
test/phpunit/ContactTest.php
View File

@ -207,7 +207,6 @@ class ContactTest extends PHPUnit\Framework\TestCase
$localobject->phone_mobile='New tel mobile'; $localobject->phone_mobile='New tel mobile';
$localobject->fax='New fax'; $localobject->fax='New fax';
$localobject->email='newemail@newemail.com'; $localobject->email='newemail@newemail.com';
$localobject->jabberid='New im id';
$localobject->socialnetworks['jabber']='New im id'; $localobject->socialnetworks['jabber']='New im id';
$localobject->default_lang='es_ES'; $localobject->default_lang='es_ES';
@ -258,8 +257,8 @@ class ContactTest extends PHPUnit\Framework\TestCase
$this->assertEquals($localobject->fax, $newobject->fax); $this->assertEquals($localobject->fax, $newobject->fax);
print __METHOD__." old=".$localobject->email." new=".$newobject->email."\n"; print __METHOD__." old=".$localobject->email." new=".$newobject->email."\n";
$this->assertEquals($localobject->email, $newobject->email); $this->assertEquals($localobject->email, $newobject->email);
print __METHOD__." old=".$localobject->jabberid." new=".$newobject->jabberid."\n"; print __METHOD__." old=".$localobject->socialnetworks['jabber']." new=".$newobject->socialnetworks['jabber']."\n";
$this->assertEquals($localobject->jabberid, $newobject->jabberid); $this->assertEquals($localobject->socialnetworks['jabber'], $newobject->socialnetworks['jabber']);
print __METHOD__." old=".$localobject->default_lang." new=".$newobject->default_lang."\n"; print __METHOD__." old=".$localobject->default_lang." new=".$newobject->default_lang."\n";
$this->assertEquals($localobject->default_lang, $newobject->default_lang); $this->assertEquals($localobject->default_lang, $newobject->default_lang);