work on contact

Dolibarr · Sep 14, 2019 · ccaa4cc · ccaa4cc
1 parent af63ac4
commit ccaa4cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
@@ -306,7 +306,9 @@
 			$object->email       = preg_replace('/\s+/', '', GETPOST("member_email", 'alpha'));
 			$object->socialnetworks = array();
 			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->twitter     = trim(GETPOST("twitter", 'alpha'));
@@ -487,7 +489,9 @@
 		$object->socialnetworks = array();
 		if (! empty($conf->socialnetworks->enabled)) {
 			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');
+				}
 			}
 		}
 

diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
@@ -207,7 +207,6 @@ public function testContactUpdate($localobject)
 		$localobject->phone_mobile='New tel mobile';
 		$localobject->fax='New fax';
 		$localobject->email='newemail@newemail.com';
-		$localobject->jabberid='New im id';
 		$localobject->socialnetworks['jabber']='New im id';
 		$localobject->default_lang='es_ES';
 
@@ -258,8 +257,8 @@ public function testContactUpdate($localobject)
     	$this->assertEquals($localobject->fax, $newobject->fax);
     	print __METHOD__." old=".$localobject->email." new=".$newobject->email."\n";
     	$this->assertEquals($localobject->email, $newobject->email);
-    	print __METHOD__." old=".$localobject->jabberid." new=".$newobject->jabberid."\n";
-    	$this->assertEquals($localobject->jabberid, $newobject->jabberid);
+    	print __METHOD__." old=".$localobject->socialnetworks['jabber']." new=".$newobject->socialnetworks['jabber']."\n";
+    	$this->assertEquals($localobject->socialnetworks['jabber'], $newobject->socialnetworks['jabber']);
     	print __METHOD__." old=".$localobject->default_lang." new=".$newobject->default_lang."\n";
     	$this->assertEquals($localobject->default_lang, $newobject->default_lang);