Skip to content
Snippets Groups Projects
Commit d614c3b1 authored by Thomas Tanghus's avatar Thomas Tanghus
Browse files

Code style.

parent 118d9e17
Branches
No related tags found
No related merge requests found
......@@ -25,12 +25,28 @@ class OC_Contacts_App {
$addressbook = OC_Contacts_Addressbook::find( $id );
if($addressbook === false || $addressbook['userid'] != OCP\USER::getUser()) {
if ($addressbook === false) {
OCP\Util::writeLog('contacts', 'Addressbook not found: '. $id, OCP\Util::ERROR);
OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Addressbook not found.'))));
OCP\Util::writeLog('contacts',
'Addressbook not found: '. $id,
OCP\Util::ERROR);
OCP\JSON::error(
array(
'data' => array(
'message' => self::$l10n->t('Addressbook not found.')
)
)
);
}
else {
OCP\Util::writeLog('contacts', 'Addressbook('.$id.') is not from '.OCP\USER::getUser(), OCP\Util::ERROR);
OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('This is not your addressbook.'))));
OCP\Util::writeLog('contacts',
'Addressbook('.$id.') is not from '.OCP\USER::getUser(),
OCP\Util::ERROR);
OCP\JSON::error(
array(
'data' => array(
'message' => self::$l10n->t('This is not your addressbook.')
)
)
);
}
exit();
}
......@@ -40,8 +56,17 @@ class OC_Contacts_App {
public static function getContactObject($id) {
$card = OC_Contacts_VCard::find( $id );
if( $card === false ) {
OCP\Util::writeLog('contacts', 'Contact could not be found: '.$id, OCP\Util::ERROR);
OCP\JSON::error(array('data' => array( 'message' => self::$l10n->t('Contact could not be found.').' '.print_r($id, true))));
OCP\Util::writeLog('contacts',
'Contact could not be found: '.$id,
OCP\Util::ERROR);
OCP\JSON::error(
array(
'data' => array(
'message' => self::$l10n->t('Contact could not be found.')
.' '.print_r($id, true)
)
)
);
exit();
}
......@@ -142,7 +167,9 @@ class OC_Contacts_App {
*/
protected static function getVCategories() {
if (is_null(self::$categories)) {
self::$categories = new OC_VCategories('contacts', null, self::getDefaultCategories());
self::$categories = new OC_VCategories('contacts',
null,
self::getDefaultCategories());
}
return self::$categories;
}
......@@ -198,14 +225,20 @@ class OC_Contacts_App {
}
$start = 0;
$batchsize = 10;
while($vccontacts = OC_Contacts_VCard::all($vcaddressbookids, $start, $batchsize)){
while($vccontacts =
OC_Contacts_VCard::all($vcaddressbookids, $start, $batchsize)) {
$cards = array();
foreach($vccontacts as $vccontact) {
$cards[] = $vccontact['carddata'];
}
OCP\Util::writeLog('contacts', __CLASS__.'::'.__METHOD__.', scanning: '.$batchsize.' starting from '.$start, OCP\Util::DEBUG);
OCP\Util::writeLog('contacts',
__CLASS__.'::'.__METHOD__
.', scanning: '.$batchsize.' starting from '.$start,
OCP\Util::DEBUG);
// only reset on first batch.
self::getVCategories()->rescan($cards, true, ($start == 0 ? true : false));
self::getVCategories()->rescan($cards,
true,
($start == 0 ? true : false));
$start += $batchsize;
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment