diff options
| -rw-r--r-- | apps/contacts/ajax/addproperty.php | 8 | ||||
| -rw-r--r-- | apps/contacts/lib/app.php | 1 | ||||
| -rw-r--r-- | apps/contacts/lib/vcard.php | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php index f016820ce5f..a4b5c591197 100644 --- a/apps/contacts/ajax/addproperty.php +++ b/apps/contacts/ajax/addproperty.php @@ -74,6 +74,14 @@ foreach ($parameters as $key=>$element) { } $checksum = md5($vcard->children[$line]->serialize()); +/* FIXME: OC_Contacts_App::getPropertyLineByChecksum throws an OC_JSON error when doing this check. + Fix for v. 3.1 +if(!is_null(OC_Contacts_App::getPropertyLineByChecksum($id, $checksum))) { + OC_JSON::error(array('data' => array('message' => $l->t('Trying to add duplicate property.')))); + OC_Log::write('contacts','ajax/addproperty.php: Trying to add duplicate property: '.$name, OC_Log::DEBUG); + exit(); +} +*/ if(!OC_Contacts_VCard::edit($id,$vcard->serialize())) { OC_JSON::error(array('data' => array('message' => $l->t('Error adding contact property.')))); OC_Log::write('contacts','ajax/addproperty.php: Error updating contact property: '.$name, OC_Log::ERROR); diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php index bc1e4974b30..39df497043b 100644 --- a/apps/contacts/lib/app.php +++ b/apps/contacts/lib/app.php @@ -85,6 +85,7 @@ class OC_Contacts_App{ break; } } + // FIXME: I'm not sure this should throw a JSON error as it might just be used to check for dupes. /Tanghus. if(is_null($line)){ OC_JSON::error(array('data' => array( 'message' => self::$l10n->t('Information about vCard is incorrect. Please reload the page.')))); exit(); diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index ceac2dcfad2..aefa2c74114 100644 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -320,6 +320,8 @@ class OC_Contacts_VCard{ * ['value'] htmlspecialchars escaped value of property * ['parameters'] associative array name=>value * ['checksum'] checksum of whole property + * NOTE: $value is not escaped anymore. It shouldn't make any difference + * but we should look out for any problems. */ public static function structureProperty($property){ $value = $property->value; |