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

WIP almost done

Browse Source
This commit is contained in:
LEDfan 2014-03-31 15:29:16 +02:00
parent c148f09386
commit 0856f4ccc8
5 changed files with 193 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
appinfo/database.xml
View File

@ -354,16 +354,6 @@
<field>
<name>id</name>
<type>integer</type>
<default>0</default>
<notnull>true</notnull>
<autoincrement>1</autoincrement>
<unsigned>true</unsigned>
<length>4</length>
</field>
<field>
<name>userid</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
@ -410,13 +400,6 @@
<length>4</length>
</field>
<index>
<name>c_addressbook_userid_index</name>
<field>
<name>userid</name>
<sorting>ascending</sorting>
</field>
</index>
</declaration>
</table>
@ -428,7 +411,7 @@
<declaration>
<field>
<name>userid</name>
<name>id</name>
<type>text</type>
<default></default>
<notnull>true</notnull>
@ -436,7 +419,7 @@
</field>
<field>
<name>ownerid</name>
<name>owner</name>
<type>text</type>
<default></default>
<notnull>true</notnull>

2
appinfo/version
View File

@ -1 +1 @@
0.3.0.6
0.3.0.8

2
lib/backend/database.php
View File

@ -431,6 +431,7 @@ class Database extends AbstractBackend {
return $cards;
}
if (!is_null($result)) {
while ($row = $result->fetchRow()) {
@ -439,7 +440,6 @@ class Database extends AbstractBackend {
}
}
return $cards;
}

191
lib/backend/owncloudusers.php
View File

@ -5,13 +5,28 @@ namespace OCA\Contacts\Backend;
use OCA\Contacts\Contact,
OCA\Contacts\VObject\VCard,
OCA\Contacts\Utils\Properties,
Sabre\VObject\Reader;
Sabre\VObject\Reader,
OCA\Contacts\Addressbook;
/**
* Contact backend for storing all the ownCloud users in this installation.
* Every user has *1* personal addressbook. The id of this addresbook is the
* userid of the owner.
*/
class OwnCloudUsers extends AbstractBackend {
public $name = 'OwnCloudUsers';
/**
* The table that holds the address books.
* For every user there is *1* addressbook.
* @var string
*/
private $addressBooksTableName = '*PREFIX*contacts_ocu_addressbooks';
/**
* The table that holds the contacts.
* @var string
*/
private $cardsTableName = '*PREFIX*contacts_ocu_cards';
public function __construct($userid){
@ -46,26 +61,186 @@ class OwnCloudUsers extends AbstractBackend {
public function getContacts($addressbookid, array $options = array()){
$contacts = array();
$sql = 'SELECT * FROM ' . $this->cardsTableName . ' WHERE id = ?';
$args = array($addressBookId);
$sql = 'SELECT * FROM ' . $this->cardsTableName . ' WHERE owner = ?';
$query = \OCP\DB::prepare($sql);
$result = $query->execute($args);
$row = $result->fetchRow();
$result = $query->execute(array($this->userid));
while($row = $result->fetchRow()){
$row['permissions'] = \OCP\PERMISSION_ALL;
$row['backend'] = $this->name;
$contacts[] = $row;
}
$contactsId = array();
foreach($contacts as $contact){
$contactsId[] = $contact['id'];
}
$users = \OCP\User::getUsers();
$recall = false;
$add = array_diff($users, $contactsId);
$remove = array_diff($contactsId, $users);
if(count($add) > 0){
$this->addContacts($add, $addressbookid);
$recall = true;
}
if(count($remove) > 0){
$this->removeContacts($remove, $addressbookid);
$recall = true;
}
if($recall === true){
return $this->getContacts($addressbookid);
} else {
return $contacts;
}
}
public function getContact($addressbookid, $id, array $options = array()){
$sql = 'SELECT * FROM ' . $this->cardsTableName . ' WHERE owner = ?';
$query = \OCP\DB::prepare($sql);
$result = $query->execute(array($this->userid));
$row = $result->fetchRow();
$row['permissions'] = \OCP\PERMISSION_ALL;
return $row;
}
public function createAddressBook(array $properties) {
}
private function syncDbWithOc(){
private function addContacts($contacts, $addressbookid){
foreach($contacts as $user){
$sql = 'INSERT INTO ' . $this->cardsTableName . ' ('
. 'id, '
. 'owner,'
. 'addressbookid, '
. 'fullname, '
. 'carddata, '
. 'uri, '
. 'lastmodified'
. ') VALUES ('
. '?,'
. '?,'
. '?,'
. '?,'
. '?,'
. '?,'
. '?'
. ')';
$query = \OCP\DB::prepare($sql);
$contact = new Contact(
$addressBook = new AddressBook($this , $this->getAddressBooksForUser()), // since there is only one addressbook with OC users for each OC user we can use this function
$this,
array(
"id" => $user,
"lastmodified" => time(),
"displayname" => \OCP\User::getDisplayName($user),
"fullname" => \OCP\User::getDisplayName($user)
)
);
$carddata = $this->generateCardData($contact);
$result = $query->execute(array($user, $this->userid, $addressbookid, \OCP\User::getDisplayName($user), $carddata->serialize(), 'test', time()));
}
}
private function removeContacts($contacts, $addressbookid){
foreach($contacts as $user){
$sql = 'DELETE FROM ' . $this->cardsTableName . ' WHERE owner = ? AND id = ?';
$query = \OCP\DB::prepare($sql);
$result = $query->execute(array($this->userid, $user));
}
}
private function generateCardData($data){
if (!$data instanceof VCard) {
try {
$data = Reader::read($data);
} catch(\Exception $e) {
\OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), \OCP\Util::ERROR);
return false;
}
}
try {
$data->validate(VCard::REPAIR|VCard::UPGRADE);
} catch (\Exception $e) {
\OCP\Util::writeLog('contacts', __METHOD__ . ' ' .
'Error validating vcard: ' . $e->getMessage(), \OCP\Util::ERROR);
return false;
}
$now = new \DateTime;
$data->REV = $now->format(\DateTime::W3C);
$appinfo = \OCP\App::getAppInfo('contacts');
$appversion = \OCP\App::getAppVersion('contacts');
$prodid = '-//ownCloud//NONSGML ' . $appinfo['name'] . ' ' . $appversion.'//EN';
$data->PRODID = $prodid;
return $data;
}
public function updateContact($addressBookId, $id, $contact, array $options = array()) {
$updateRevision = true;
$isCardDAV = false;
if (!$contact instanceof VCard) {
try {
$contact = Reader::read($contact);
} catch(\Exception $e) {
\OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), \OCP\Util::ERROR);
return false;
}
}
if (is_array($id)) {
if (isset($id['id'])) {
$id = $id['id'];
} elseif (isset($id['uri'])) {
$updateRevision = false;
$isCardDAV = true;
$id = $this->getIdFromUri($id['uri']);
if (is_null($id)) {
\OCP\Util::writeLog('contacts', __METHOD__ . ' Couldn\'t find contact', \OCP\Util::ERROR);
return false;
}
} else {
throw new \Exception(
__METHOD__ . ' If second argument is an array, either \'id\' or \'uri\' has to be set.'
);
}
}
if ($updateRevision || !isset($contact->REV)) {
$now = new \DateTime;
$contact->REV = $now->format(\DateTime::W3C);
}
$data = $contact->serialize();
$sql = 'UPDATE ' . $this->cardsTableName
. ' SET '
. '`addressbookid` = ?, '
. '`fullname` = ?, '
. '`carddata` = ?, '
. '`lastmodified` = ? '
. ' WHERE '
. '`id` = ? '
. 'AND `owner` = ? ';
$query = \OCP\DB::prepare($sql);
$result = $query->execute(array($addressBookId, $contact->FN, $data, time(), $id, $this->userid));
return true;
}
}

6
lib/controller/addressbookcontroller.php
View File

@ -102,12 +102,12 @@ class AddressBookController extends Controller {
}
//$response->debug('comparing: "' . $etag . '" to ' . $this->request->getHeader('If-None-Match'));
if (!is_null($etag)
/*if (!is_null($etag)
&& $this->request->getHeader('If-None-Match') === '"'.$etag.'"')
{
return $response->setStatus(Http::STATUS_NOT_MODIFIED);
} else {
switch ($this->request->method) {
*/ switch ($this->request->method) {
case 'OPTIONS':
$options = array('GET', 'HEAD', 'OPTIONS');
if ($addressBook->hasPermission(\OCP\PERMISSION_DELETE)
@ -136,7 +136,7 @@ class AddressBookController extends Controller {
return $response->setData(array('contacts' => $contacts));
}
}
//}
}
/**