rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00
Code Issues Releases Activity

Prevent duplicate URI. Fix #263

Browse Source
This commit is contained in:
Thomas Tanghus 2013-11-28 14:15:17 +01:00
parent 7030b117e7
commit 5f7d7a9ddb
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/backend/database.php
View File

@ -22,9 +22,10 @@
namespace OCA\Contacts\Backend;
use OCA\Contacts\Contact;
use OCA\Contacts\VObject\VCard;
use Sabre\VObject\Reader;
use OCA\Contacts\Contact,
OCA\Contacts\VObject\VCard,
OCA\Contacts\Utils\Properties,
Sabre\VObject\Reader;
/**
* Subclass this class for Cantacts backends
@ -516,7 +517,7 @@ class Database extends AbstractBackend {
return false;
}
$uri = is_null($uri) ? $contact->UID . '.vcf' : $uri;
$uri = is_null($uri) ? $this->uniqueURI($addressbookid, $contact->UID . '.vcf') : $uri;
$now = new \DateTime;
$contact->REV = $now->format(\DateTime::W3C);
@ -782,4 +783,29 @@ class Database extends AbstractBackend {
return $newname;
}
/**
* @brief Checks if a contact with the same URI already exist in the address book.
* @param string $addressBookId Address book ID.
* @param string $uri
* @returns string Unique URI
*/
protected function uniqueURI($addressBookId, $uri) {
$stmt = \OCP\DB::prepare( 'SELECT * FROM `' . $this->cardsTableName . '` WHERE `addressbookid` = ? AND `uri` = ?' );
$result = $stmt->execute(array($addressBookId, $uri));
if($result->numRows() > 0) {
while(true) {
$uri = Properties::generateUID() . '.vcf';
$result = $stmt->execute(array($addressBookId, $uri));
if($result->numRows() > 0) {
continue;
} else {
return $uri;
}
}
} else {
return $uri;
}
}
}

2
lib/utils/properties.php
View File

@ -197,7 +197,7 @@ Class Properties {
}
public static function generateUID($app = 'contacts') {
return date('Ymd\\THis') . '.' . time(). '@' . \OCP\Util::getServerHostName();
return date('Ymd\\THis') . '.' . substr(md5(rand().time()), 0, 10). '@' . \OCP\Util::getServerHostName();
}
/**