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

Remove uneeded table for address books

Browse Source
This commit is contained in:
LEDfan 2014-04-01 22:04:55 +02:00
parent 69bca05716
commit e95ca5124b
2 changed files with 15 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
appinfo/database.xml
View File

@ -346,64 +346,6 @@
</declaration>
</table>
<table>
<name>*dbprefix*contacts_ocu_addressbooks</name>
<declaration>
<field>
<name>id</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
<length>255</length>
</field>
<field>
<name>displayname</name>
<type>text</type>
<default></default>
<notnull>false</notnull>
<length>255</length>
</field>
<field>
<name>uri</name>
<type>text</type>
<default></default>
<notnull>false</notnull>
<length>200</length>
</field>
<field>
<name>description</name>
<type>text</type>
<notnull>false</notnull>
<length>255</length>
</field>
<field>
<name>ctag</name>
<type>integer</type>
<default>1</default>
<notnull>true</notnull>
<unsigned>true</unsigned>
<length>4</length>
</field>
<field>
<name>active</name>
<type>integer</type>
<default>1</default>
<notnull>true</notnull>
<length>4</length>
</field>
</declaration>
</table>
<table>
<name>*dbprefix*contacts_ocu_cards</name>

87
lib/backend/owncloudusers.php
View File

@ -52,6 +52,7 @@ class OwnCloudUsers extends AbstractBackend {
private $cardsTableName = '*PREFIX*contacts_ocu_cards';
public function __construct($userid){
$this->userid = $userid ? $userid : \OCP\User::getUser();
}
@ -59,55 +60,7 @@ class OwnCloudUsers extends AbstractBackend {
* {@inheritdoc}
*/
public function getAddressBooksForUser(array $options = array()) {
// Only 1 addressbook for every user
$sql = 'SELECT * FROM ' . $this->addressBooksTableName . ' WHERE id = ?';
$args = array($this->userid);
$query = \OCP\DB::prepare($sql);
$result = $query->execute($args);
$row = $result->fetchRow();
if(!$row){ // TODO -> better way?
// Create new addressbook
try{
$sql = 'INSERT INTO ' . $this->addressBooksTableName
. ' ( '
. 'id, '
. 'displayname, '
//. 'uri, ' TODO
. 'description, '
//. 'ctag, '
. 'active '
. ') VALUES ( '
. '?, '
. '?, '
. '?, '
. '? '
. ')';
$args = array(
$this->userid,
'ownCloud Users',
'ownCloud Users',
1
);
$query = \OCP\DB::prepare($sql);
$result = $query->execute($args);
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('contacts', __METHOD__. 'DB error: '
. \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
return array();
}
} catch(\Exception $e) {
\OCP\Util::writeLog('contacts', __METHOD__.' exception: '
. $e->getMessage(), \OCP\Util::ERROR);
return array();
}
return $this->getAddressBooksForUser();
} else {
$row['permissions'] = \OCP\PERMISSION_ALL;
return array($row);
}
return array($this->getAddressBook('admin'));
}
/**
@ -115,29 +68,19 @@ class OwnCloudUsers extends AbstractBackend {
* Only 1 addressbook for every user
*/
public function getAddressBook($addressBookId, array $options = array()) {
try{
$sql = 'SELECT * FROM ' . $this->addressBooksTableName . ' WHERE id = ?';
$args = array($addressBookId);
$query = \OCP\DB::prepare($sql);
$result = $query->execute($args);
if (\OCP\DB::isError($result)) {
\OCP\Util::writeLog('contacts', __METHOD__. 'DB error: '
. \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
return array();
} else {
$row = $result->fetchRow();
// TODO create address book if it doesn't exists
$row['permissions'] = \OCP\PERMISSION_ALL;
$row['backend'] = $this->name;
return array($row);
}
} catch(\Exception $e) {
\OCP\Util::writeLog('contacts', __METHOD__.' exception: '
. $e->getMessage(), \OCP\Util::ERROR);
return array();
}
$addressbook = array(
"id" => $addressBookId,
"displayname" => 'ownCloudUsers',
"description" => 'ownCloud Users',
"ctag" => time(),
"permissions" => \OCP\PERMISSION_ALL,
"backend" => $this->name,
"active" => 1
);
//var_dump($addressbook);
//throw new \Exception($addressBookId);
return $addressbook;
}
/**