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

Some reminders in the code of what I have to change post OC3.0

Browse source
This commit is contained in:
Thomas Tanghus 2012-01-25 01:10:56 +01:00
parent fdf3df3de5
commit db1f77e4f5
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/contacts/ajax/addproperty.php
View file

@ -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);

1
apps/contacts/lib/app.php
View file

@ -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();

2
apps/contacts/lib/vcard.php
View file

@ -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;