rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity

Updates to localusers backend. cc @LEDfan

Browse Source
This commit is contained in:
Thomas Tanghus 2014-04-24 15:30:51 +02:00
parent 971675f7fe
commit a457684f41
4 changed files with 87 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
appinfo/database.xml
View File

@ -353,32 +353,33 @@
<declaration>
<field>
<name>id</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>255</length>
</field>
<field>
<name>owner</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>255</length>
</field>
<field>
<name>addressbookid</name>
<name>idx</name>
<type>integer</type>
<default></default>
<default>0</default>
<notnull>true</notnull>
<autoincrement>1</autoincrement>
<unsigned>true</unsigned>
<length>4</length>
</field>
<field>
<name>fullname</name>
<name>id</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>64</length>
</field>
<field>
<name>addressbookid</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>64</length>
</field>
<field>
<name>displayname</name>
<type>text</type>
<default></default>
<notnull>false</notnull>
@ -391,14 +392,6 @@
<notnull>false</notnull>
</field>
<field>
<name>uri</name>
<type>text</type>
<default></default>
<notnull>false</notnull>
<length>200</length>
</field>
<field>
<name>lastmodified</name>
<type>integer</type>
@ -412,7 +405,7 @@
</table>
<table>
<table>
<name>*dbprefix*contacts_ocu_cards_properties</name>
@ -468,6 +461,30 @@
<length>4</length>
</field>
<index>
<name>ocup_contactid_index</name>
<field>
<name>contactid</name>
<sorting>ascending</sorting>
</field>
</index>
<index>
<name>ocup_name_index</name>
<field>
<name>name</name>
<sorting>ascending</sorting>
</field>
</index>
<index>
<name>ocup_value_index</name>
<field>
<name>value</name>
<sorting>ascending</sorting>
</field>
</index>
</declaration>
</table>

18
appinfo/update.php
View File

@ -8,21 +8,22 @@
*/
$installedVersion = OCP\Config::getAppValue('contacts', 'installed_version');
if (version_compare($installedVersion, '0.2.5', '>=')) {
// Set all address books active as (de)activating went awol at rewrite.
$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `active`= 1' );
$stmt = OCP\DB::prepare('UPDATE `*PREFIX*contacts_addressbooks` SET `active`= 1');
$result = $stmt->execute(array());
} elseif (version_compare($installedVersion, '0.2.4', '==')) {
// First set all address books in-active.
$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `active`=0' );
$stmt = OCP\DB::prepare('UPDATE `*PREFIX*contacts_addressbooks` SET `active`=0');
$result = $stmt->execute(array());
// Then get all the active address books.
$stmt = OCP\DB::prepare( 'SELECT `userid`,`configvalue` FROM `*PREFIX*preferences` WHERE `appid`=\'contacts\' AND `configkey`=\'openaddressbooks\'' );
$stmt = OCP\DB::prepare('SELECT `userid`,`configvalue` FROM `*PREFIX*preferences` WHERE `appid`=\'contacts\' AND `configkey`=\'openaddressbooks\'');
$result = $stmt->execute(array());
// Prepare statement for updating the new 'active' field.
$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `active`=? WHERE `id`=? AND `userid`=?' );
$stmt = OCP\DB::prepare('UPDATE `*PREFIX*contacts_addressbooks` SET `active`=? WHERE `id`=? AND `userid`=?');
while ($row = $result->fetchRow()) {
$ids = explode(';', $row['configvalue']);
foreach ($ids as $id) {
@ -31,6 +32,13 @@ if (version_compare($installedVersion, '0.2.5', '>=')) {
}
// Remove the old preferences.
$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `appid`=\'contacts\' AND `configkey`=\'openaddressbooks\'' );
$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `appid`=\'contacts\' AND `configkey`=\'openaddressbooks\'');
$result = $stmt->execute(array());
}
if (version_compare($installedVersion, '0.3.0.14', '==')) {
// Rebuild this while we can
$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*contacts_ocu_cards`');
$result = $stmt->execute(array());
$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*contacts_ocu_cards_properties`');
$result = $stmt->execute(array());
}

2
appinfo/version
View File

@ -1 +1 @@
0.3.0.14
0.3.0.15

55
lib/backend/localusers.php
View File

@ -111,13 +111,13 @@ class LocalUsers extends AbstractBackend {
* {@inheritdoc}
* There are as many contacts in this addressbook as in this ownCloud installation
*/
public function getContacts($addressbookid, array $options = array()) {
$this->updateDatabase();
public function getContacts($addressBookId, array $options = array()) {
$this->updateDatabase($addressBookId);
$contacts = array();
try{
try {
$sql = 'SELECT * FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?';
$query = \OCP\DB::prepare($sql);
$result = $query->execute(array($this->userid));
$result = $query->execute(array($addressBookId));
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('contacts', __METHOD__. 'DB error: '
@ -145,11 +145,11 @@ class LocalUsers extends AbstractBackend {
* If your username is 'foo' and you want to retrieve the contact with
* ownCloud username 'bar' the params would be: $addressbookid = 'foo'; $id = 'bar';
*/
public function getContact($addressbookid, $id, array $options = array()) {
public function getContact($addressBookId, $id, array $options = array()) {
try{
$sql = 'SELECT * FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND id = ?';
$query = \OCP\DB::prepare($sql);
$result = $query->execute(array($this->userid, $id));
$result = $query->execute(array($addressBookId, $id));
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('contacts', __METHOD__. 'DB error: '
@ -174,13 +174,13 @@ class LocalUsers extends AbstractBackend {
* @param string $addressBookId
* @return bool
*/
private function addContacts($contacts, $addressbookid) {
foreach($contacts as $user){
private function addContacts($contacts, $addressBookId) {
foreach ($contacts as $user) {
try {
$sql = 'INSERT INTO ' . $this->cardsTableName . ' ('
. 'id, '
. 'addressbookid, '
. 'fullname, ' /* Change to displayname*/
. 'displayname, '
. 'carddata, '
. 'lastmodified'
. ') VALUES ('
@ -204,7 +204,7 @@ class LocalUsers extends AbstractBackend {
$vcard->PRODID = $prodid;
$vcard->add('IMPP', 'x-owncloud-handle:' . $user, array("X-SERVICE-TYPE" => array("owncloud-handle")));
$result = $query->execute(array($user, $this->userid, \OCP\User::getDisplayName($user), $vcard->serialize(), time()));
$result = $query->execute(array($user, $addressBookId, \OCP\User::getDisplayName($user), $vcard->serialize(), time()));
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('contacts', __METHOD__. 'DB error: '
@ -231,12 +231,13 @@ class LocalUsers extends AbstractBackend {
* @param string $addressBookId
* @return bool
*/
private function removeContacts($contacts, $addressbookid) {
foreach($contacts as $user){
private function removeContacts($contacts, $addressBookId) {
foreach ($contacts as $user) {
\OCP\Util::writeLog('contacts', 'Removing: ' . $user . ' from ' . $addressBookId, \OCP\Util::DEBUG);
try {
$sql = 'DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND id = ?';
$query = \OCP\DB::prepare($sql);
$result = $query->execute(array($this->userid, $user));
$result = $query->execute(array($addressBookId, $user));
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('contacts', __METHOD__. 'DB error: '
. \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
@ -276,14 +277,14 @@ class LocalUsers extends AbstractBackend {
try{
$sql = 'UPDATE ' . $this->cardsTableName
. ' SET '
. '`fullname` = ?, '
. '`displayname` = ?, '
. '`carddata` = ?, '
. '`lastmodified` = ? '
. ' WHERE '
. '`id` = ? '
. 'AND `addressbookid` = ? ';
$query = \OCP\DB::prepare($sql);
$result = $query->execute(array($contact->FN, $contact->serialize(), time(), $id, $this->userid));
$result = $query->execute(array($contact->FN, $contact->serialize(), time(), $id, $addressBookId));
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('contacts', __METHOD__. 'DB error: '
. \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
@ -322,13 +323,13 @@ class LocalUsers extends AbstractBackend {
$updatestmt = \OCP\DB::prepare('INSERT INTO `' . $this->indexTableName . '` '
. '(`addressbookid`, `contactid`,`name`,`value`,`preferred`) VALUES(?,?,?,?,?)');
// Insert all properties in the table
foreach($vcard->children as $property) {
if(!in_array($property->name, $this->indexProperties)) {
foreach ($vcard->children as $property) {
if (!in_array($property->name, $this->indexProperties)) {
continue;
}
$preferred = 0;
foreach($property->parameters as $parameter) {
if($parameter->name == 'TYPE' && strtoupper($parameter->value) == 'PREF') {
foreach ($property->parameters as $parameter) {
if ($parameter->name == 'TYPE' && strtoupper($parameter->value) == 'PREF') {
$preferred = 1;
break;
}
@ -374,18 +375,18 @@ class LocalUsers extends AbstractBackend {
}
}
public function updateDatabase() {
public function updateDatabase($addressBookId) {
$sql = 'SELECT * FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?';
$query = \OCP\DB::prepare($sql);
$result = $query->execute(array($this->userid));
$result = $query->execute(array($addressBookId));
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('contacts', __METHOD__. 'DB error: '
. \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
return true;
return true; // Huh?
} else {
$contactsId = array();
while($row = $result->fetchRow()) {
while ($row = $result->fetchRow()) {
$contactsId[] = $row['id'];
}
@ -393,13 +394,13 @@ class LocalUsers extends AbstractBackend {
$add = array_diff($users, $contactsId);
$remove = array_diff($contactsId, $users);
if(count($add) > 0) {
$this->addContacts($add, $addressbookid);
if (count($add) > 0) {
$this->addContacts($add, $addressBookId);
$recall = true;
}
if(count($remove) > 0) {
$this->removeContacts($remove, $addressbookid);
if (count($remove) > 0) {
$this->removeContacts($remove, $addressBookId);
$recall = true;
}
return true;