mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixup! move migration 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-10-30 14:03:41 +01:00
parent 161608b1f1
commit 353f5bd469
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/dav/lib/CardDAV/CardDavBackend.php
View File

@ -1130,9 +1130,20 @@ class CardDavBackend implements BackendInterface, SyncSupport {
}
}
/**
* Extract UID from vcard
*
* @param string $cardData the vcard raw data
* @return string the uid or empty if none
* @throws BadRequest
*/
private function getUID($cardData) {
$vCard = Reader::read($cardData);
$uid = $vCard->UID->getValue();
return $uid;
if ($vCard->UID) {
$uid = $vCard->UID->getValue();
return $uid;
}
// should already be handled, but just in case
throw new BadRequest('vCards on CardDAV servers MUST have a UID property');
}
}

30
lib/private/Repair/NC15/SetVcardDatabaseUID.php
View File

@ -27,6 +27,7 @@ use OCP\IConfig;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
use Sabre\VObject\Reader;
class SetVcardDatabaseUID implements IRepairStep {
const MAX_ROWS = 1000;
@ -70,20 +71,27 @@ class SetVcardDatabaseUID implements IRepairStep {
} while (count($rows) > 0);
}
private function getUid($carddata) {
preg_match('/UID:(.*)$/m', $carddata, $matches);
if (count($matches) > 1) {
return $matches[1];
/**
* Extract UID from vcard
*
* @param string $cardData the vcard raw data
* @return string the uid or empty if none
*/
private function getUID(string $cardData): string {
$vCard = Reader::read($cardData);
if ($vCard->UID) {
$uid = $vCard->UID->getValue();
return $uid;
}
return false;
return '';
}
/**
* @param int $id
* @param string $uid
*/
private function update($id, $uid) {
private function update(int $id, string $uid) {
if (!$this->updateQuery) {
$builder = $this->connection->getQueryBuilder();
@ -98,16 +106,14 @@ class SetVcardDatabaseUID implements IRepairStep {
$this->updateQuery->execute();
}
private function repair() {
private function repair(): int {
$this->connection->beginTransaction();
$entries = $this->getInvalidEntries();
$count = 0;
foreach ($entries as $entry) {
$count++;
$uid = $this->getUid($entry['carddata']);
if ($uid !== false) {
$this->update($entry['id'], $uid);
}
$uid = $this->getUID($entry['carddata']);
$this->update($entry['id'], $uid);
}
$this->connection->commit();
@ -118,7 +124,7 @@ class SetVcardDatabaseUID implements IRepairStep {
$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0');
// was added to 15.0.0.2
return version_compare($versionFromBeforeUpdate, '15.0.0.2', '<=');
return version_compare($versionFromBeforeUpdate, '15.0.0.3', '<=');
}
public function run(IOutput $output) {