wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't add empty property parameters.

Browse source
This commit is contained in:
Thomas Tanghus 2012-08-23 01:18:59 +02:00
parent 1df596e758
commit 99d17c5190
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/contacts/ajax/contact/addproperty.php
View file

@ -141,11 +141,15 @@ foreach ($parameters as $key=>$element) {
// And it probably shouldn't be done here anyways :-/
foreach($element as $e) {
if($e != '' && !is_null($e)) {
$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $e);
if(trim($e)) {
$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $e);
}
}
}
} else {
if(trim($element)) {
$vcard->children[$line]->parameters[] = new Sabre_VObject_Parameter($key, $element);
}
}
}
$checksum = md5($vcard->children[$line]->serialize());

22
apps/contacts/ajax/contact/saveproperty.php
View file

@ -133,17 +133,21 @@ if(!$value) {
debug('Adding parameter: '.$key);
if(is_array($parameter)) {
foreach($parameter as $val) {
debug('Adding parameter: '.$key.'=>'.$val);
$vcard->children[$line]->add(new Sabre_VObject_Parameter(
$key,
strtoupper(strip_tags($val)))
);
if(trim($val)) {
debug('Adding parameter: '.$key.'=>'.$val);
$vcard->children[$line]->add(new Sabre_VObject_Parameter(
$key,
strtoupper(strip_tags($val)))
);
}
}
} else {
$vcard->children[$line]->add(new Sabre_VObject_Parameter(
$key,
strtoupper(strip_tags($parameter)))
);
if(trim($parameter)) {
$vcard->children[$line]->add(new Sabre_VObject_Parameter(
$key,
strtoupper(strip_tags($parameter)))
);
}
}
}
}