diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2012-06-11 19:07:51 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2012-06-11 19:07:51 +0200 |
| commit | 2b22c538c8cafafedb057947ff90abb5d219c903 (patch) | |
| tree | 1082ac159bceb05207b36be26e0e4b53bcdf8bcb /apps/contacts | |
| parent | 6d68b7620cd38fda23d2d5dec73a80818035c38d (diff) | |
| download | nextcloud-server-2b22c538c8cafafedb057947ff90abb5d219c903.tar.gz nextcloud-server-2b22c538c8cafafedb057947ff90abb5d219c903.zip | |
Make some apps compatible
Diffstat (limited to 'apps/contacts')
| -rw-r--r-- | apps/contacts/ajax/addproperty.php | 13 | ||||
| -rw-r--r-- | apps/contacts/templates/part.contacts.php | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php index 42b0c782035..94e09bac190 100644 --- a/apps/contacts/ajax/addproperty.php +++ b/apps/contacts/ajax/addproperty.php @@ -82,6 +82,7 @@ if(is_array($value)) { $value = strip_tags($value); } +/* preprocessing value */ switch($name) { case 'BDAY': $date = New DateTime($value); @@ -94,6 +95,8 @@ switch($name) { case 'N': case 'ORG': case 'NOTE': + $value = str_replace('\n', ' \\n', $value); + break; case 'NICKNAME': // TODO: Escape commas and semicolons. break; @@ -105,8 +108,14 @@ switch($name) { break; } - -$property = $vcard->addProperty($name, $value); //, $parameters); +switch($name) { + case 'NOTE': + $vcard->setString('NOTE', $value); + break; + default: + $property = $vcard->addProperty($name, $value); //, $parameters); + break; +} $line = count($vcard->children) - 1; diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php index 57517505405..00a61f72fdd 100644 --- a/apps/contacts/templates/part.contacts.php +++ b/apps/contacts/templates/part.contacts.php @@ -8,5 +8,5 @@ } } ?> - <li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo htmlspecialchars($display); ?></a></li> + <li role="button" book-id="<?php echo $contact['addressbookid']; ?>" data-id="<?php echo $contact['id']; ?>"><a href="index.php?id=<?php echo $contact['id']; ?>"><?php echo $display; ?></a></li> <?php endforeach; ?> |