mirror of
https://github.com/owncloudarchive/contacts.git
synced 2024-11-29 11:24:11 +01:00
Remove legacy categories code
This commit is contained in:
parent
a428947fcf
commit
99899531d2
60
lib/app.php
60
lib/app.php
@ -158,64 +158,4 @@ class App {
|
||||
return $addressBook->getChild($id);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief returns the vcategories object of the user
|
||||
* @return (object) $vcategories
|
||||
*/
|
||||
public static function getVCategories() {
|
||||
if (is_null(self::$categories)) {
|
||||
if(\OC_VCategories::isEmpty('contact')) {
|
||||
self::scanCategories();
|
||||
}
|
||||
self::$categories = new \OC_VCategories('contact',
|
||||
null,
|
||||
self::getDefaultCategories());
|
||||
}
|
||||
return self::$categories;
|
||||
}
|
||||
/**
|
||||
* @brief returns the categories for the user
|
||||
* @return (Array) $categories
|
||||
*/
|
||||
public static function getCategories($format = null) {
|
||||
$categories = self::getVCategories()->categories($format);
|
||||
return ($categories ? $categories : self::getDefaultCategories());
|
||||
}
|
||||
|
||||
/**
|
||||
* scan vcards for categories.
|
||||
* @param $vccontacts VCards to scan. null to check all vcards for the current user.
|
||||
*/
|
||||
public static function scanCategories($vccontacts = null) {
|
||||
if (is_null($vccontacts)) {
|
||||
$vcaddressbooks = Addressbook::all(\OCP\USER::getUser());
|
||||
if(count($vcaddressbooks) > 0) {
|
||||
$vcaddressbookids = array();
|
||||
foreach($vcaddressbooks as $vcaddressbook) {
|
||||
if($vcaddressbook['userid'] === \OCP\User::getUser()) {
|
||||
$vcaddressbookids[] = $vcaddressbook['id'];
|
||||
}
|
||||
}
|
||||
$start = 0;
|
||||
$batchsize = 10;
|
||||
$categories = new \OC_VCategories('contact');
|
||||
while($vccontacts =
|
||||
VCard::all($vcaddressbookids, $start, $batchsize)) {
|
||||
$cards = array();
|
||||
foreach($vccontacts as $vccontact) {
|
||||
$cards[] = array($vccontact['id'], $vccontact['carddata']);
|
||||
}
|
||||
\OCP\Util::writeLog('contacts', __METHOD__
|
||||
.', scanning: '.$batchsize.' starting from '.$start,
|
||||
\OCP\Util::DEBUG);
|
||||
// only reset on first batch.
|
||||
$categories->rescan($cards,
|
||||
true,
|
||||
($start == 0 ? true : false));
|
||||
$start += $batchsize;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -156,7 +156,6 @@ class Hooks{
|
||||
\OCP\Util::writeLog('contacts',
|
||||
__METHOD__ .', scanning: ' . $limit . ' starting from ' . $offset,
|
||||
\OCP\Util::DEBUG);
|
||||
// only reset on first batch.
|
||||
$offset += $limit;
|
||||
}
|
||||
}
|
||||
|
@ -1,84 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* ownCloud - Addressbook
|
||||
*
|
||||
* @author Jakob Sack
|
||||
* @copyright 2011 Jakob Sack mail@jakobsack.de
|
||||
* @copyright 2012-2013 Thomas Tanghus <thomas@tanghus.net>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 3 of the License, or any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public
|
||||
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
/*
|
||||
*
|
||||
* The following SQL statement is just a help for developers and will not be
|
||||
* executed!
|
||||
*
|
||||
* CREATE TABLE contacts_cards (
|
||||
* id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
|
||||
* addressbookid INT(11) UNSIGNED NOT NULL,
|
||||
* fullname VARCHAR(255),
|
||||
* carddata TEXT,
|
||||
* uri VARCHAR(100),
|
||||
* lastmodified INT(11) UNSIGNED
|
||||
* );
|
||||
*/
|
||||
|
||||
namespace OCA\Contacts;
|
||||
|
||||
use Sabre\VObject;
|
||||
|
||||
/**
|
||||
* This class manages our vCards
|
||||
*/
|
||||
class VCardLegacy {
|
||||
|
||||
/**
|
||||
* @brief Mass updates an array of cards
|
||||
* @param array $objects An array of [id, carddata].
|
||||
*/
|
||||
public static function updateDataByID($objects) {
|
||||
$stmt = \OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `carddata` = ?, `lastmodified` = ? WHERE `id` = ?' );
|
||||
$now = new \DateTime;
|
||||
foreach($objects as $object) {
|
||||
$vcard = null;
|
||||
try {
|
||||
$vcard = Sabre\VObject\Reader::read($contact['carddata']);
|
||||
} catch(\Exception $e) {
|
||||
\OC_Log::write('contacts', __METHOD__. $e->getMessage(), \OCP\Util::ERROR);
|
||||
}
|
||||
if(!is_null($vcard)) {
|
||||
$oldcard = self::find($object[0]);
|
||||
if (!$oldcard) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$vcard->{'REV'} = $now->format(\DateTime::W3C);
|
||||
$data = $vcard->serialize();
|
||||
try {
|
||||
$result = $stmt->execute(array($data,time(),$object[0]));
|
||||
if (\OC_DB::isError($result)) {
|
||||
\OC_Log::write('contacts', __METHOD__. 'DB error: ' . \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
|
||||
}
|
||||
//OCP\Util::writeLog('contacts','OCA\Contacts\VCard::updateDataByID, id: '.$object[0].': '.$object[1],OCP\Util::DEBUG);
|
||||
} catch(\Exception $e) {
|
||||
\OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), \OCP\Util::ERROR);
|
||||
\OCP\Util::writeLog('contacts', __METHOD__.', id: '.$object[0], \OCP\Util::DEBUG);
|
||||
}
|
||||
App::updateDBProperties($object[0], $vcard);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user