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

Missing method name to OC_L10N calls.

Browse Source
This commit is contained in:
Thomas Tanghus 2013-05-18 16:49:02 +02:00
parent b5123ab99b
commit 5581b62c9a
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/addressbook.php
View File

@ -136,7 +136,7 @@ class Addressbook extends AbstractPIMCollection {
function getChild($id) { function getChild($id) {
//\OCP\Util::writeLog('contacts', __METHOD__.' id: '.$id, \OCP\Util::DEBUG); //\OCP\Util::writeLog('contacts', __METHOD__.' id: '.$id, \OCP\Util::DEBUG);
if(!$this->hasPermission(\OCP\PERMISSION_READ)) { if(!$this->hasPermission(\OCP\PERMISSION_READ)) {
throw new \Exception(self::$l10n('You do not have permissions to see this contacts'), 403); throw new \Exception(self::$l10n->t('You do not have permissions to see this contacts'), 403);
} }
if(!isset($this->objects[$id])) { if(!isset($this->objects[$id])) {
$contact = $this->backend->getContact($this->getId(), $id); $contact = $this->backend->getContact($this->getId(), $id);
@ -168,9 +168,9 @@ class Addressbook extends AbstractPIMCollection {
*/ */
function getChildren($limit = null, $offset = null, $omitdata = false) { function getChildren($limit = null, $offset = null, $omitdata = false) {
if(!$this->hasPermission(\OCP\PERMISSION_READ)) { if(!$this->hasPermission(\OCP\PERMISSION_READ)) {
throw new \Exception(self::$l10n('You do not have permissions to see these contacts'), 403); throw new \Exception(self::$l10n->t('You do not have permissions to see these contacts'), 403);
} }
//\OCP\Util::writeLog('contacts', __METHOD__.' backend: ' . print_r($this->backend, true), \OCP\Util::DEBUG);
$contacts = array(); $contacts = array();
foreach($this->backend->getContacts($this->getId(), $limit, $offset, $omitdata) as $contact) { foreach($this->backend->getContacts($this->getId(), $limit, $offset, $omitdata) as $contact) {
@ -194,10 +194,10 @@ class Addressbook extends AbstractPIMCollection {
*/ */
public function addChild($data = null) { public function addChild($data = null) {
if(!$this->hasPermission(\OCP\PERMISSION_CREATE)) { if(!$this->hasPermission(\OCP\PERMISSION_CREATE)) {
throw new \Exception(self::$l10n('You do not have permissions add contacts to the address book'), 403); throw new \Exception(self::$l10n->t('You do not have permissions add contacts to the address book'), 403);
} }
if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_CREATE)) { if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_CREATE)) {
throw new \Exception(self::$l10n('The backend for this address book does not support adding contacts'), 501); throw new \Exception(self::$l10n->t('The backend for this address book does not support adding contacts'), 501);
} }
$contact = new Contact($this, $this->backend, $data); $contact = new Contact($this, $this->backend, $data);
if($contact->save() === false) { if($contact->save() === false) {
@ -219,10 +219,10 @@ class Addressbook extends AbstractPIMCollection {
*/ */
public function deleteChild($id) { public function deleteChild($id) {
if(!$this->hasPermission(\OCP\PERMISSION_DELETE)) { if(!$this->hasPermission(\OCP\PERMISSION_DELETE)) {
throw new \Exception(self::$l10n('You do not have permissions to delete this contact'), 403); throw new \Exception(self::$l10n->t('You do not have permissions to delete this contact'), 403);
} }
if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_DELETE)) { if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_DELETE)) {
throw new \Exception(self::$l10n('The backend for this address book does not support deleting contacts'), 501); throw new \Exception(self::$l10n->t('The backend for this address book does not support deleting contacts'), 501);
} }
if($this->backend->deleteContact($this->getId(), $id)) { if($this->backend->deleteContact($this->getId(), $id)) {
if(isset($this->objects[$id])) { if(isset($this->objects[$id])) {
@ -258,6 +258,9 @@ class Addressbook extends AbstractPIMCollection {
if(!$this->hasPermission(\OCP\PERMISSION_UPDATE)) { if(!$this->hasPermission(\OCP\PERMISSION_UPDATE)) {
throw new \Exception('Access denied'); throw new \Exception('Access denied');
} }
if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_UPDATE)) {
throw new \Exception(self::$l10n->t('The backend for this address book does not support updating'), 501);
}
if(count($data) === 0) { if(count($data) === 0) {
return false; return false;
} }
@ -282,7 +285,7 @@ class Addressbook extends AbstractPIMCollection {
*/ */
public function save() { public function save() {
if(!$this->hasPermission(OCP\PERMISSION_UPDATE)) { if(!$this->hasPermission(OCP\PERMISSION_UPDATE)) {
throw new Exception(self::$l10n('You don\'t have permissions to update the address book.'), 403); throw new Exception(self::$l10n->t('You don\'t have permissions to update the address book.'), 403);
} }
} }
@ -293,7 +296,7 @@ class Addressbook extends AbstractPIMCollection {
*/ */
public function delete() { public function delete() {
if(!$this->hasPermission(OCP\PERMISSION_DELETE)) { if(!$this->hasPermission(OCP\PERMISSION_DELETE)) {
throw new Exception(self::$l10n('You don\'t have permissions to delete the address book.'), 403); throw new Exception(self::$l10n->t('You don\'t have permissions to delete the address book.'), 403);
} }
return $this->backend->deleteAddressBook($this->getId()); return $this->backend->deleteAddressBook($this->getId());
} }

22
lib/contact.php
View File

@ -109,7 +109,7 @@ class Contact extends VObject\VCard implements IPIMObject {
*/ */
public function getMetaData() { public function getMetaData() {
if(!$this->hasPermission(\OCP\PERMISSION_READ)) { if(!$this->hasPermission(\OCP\PERMISSION_READ)) {
throw new \Exception(self::$l10n('You do not have permissions to see this contacts'), 403); throw new \Exception(self::$l10n->t('You do not have permissions to see this contact'), 403);
} }
if(!isset($this->props['displayname'])) { if(!isset($this->props['displayname'])) {
if(!$this->retrieve()) { if(!$this->retrieve()) {
@ -156,7 +156,7 @@ class Contact extends VObject\VCard implements IPIMObject {
*/ */
function getDisplayName() { function getDisplayName() {
if(!$this->hasPermission(\OCP\PERMISSION_READ)) { if(!$this->hasPermission(\OCP\PERMISSION_READ)) {
throw new \Exception(self::$l10n('You do not have permissions to see this contacts'), 403); throw new \Exception(self::$l10n->t('You do not have permissions to see this contact'), 403);
} }
return isset($this->props['displayname']) ? $this->props['displayname'] : null; return isset($this->props['displayname']) ? $this->props['displayname'] : null;
} }
@ -239,7 +239,7 @@ class Contact extends VObject\VCard implements IPIMObject {
*/ */
public function delete() { public function delete() {
if(!$this->hasPermission(\OCP\PERMISSION_DELETE)) { if(!$this->hasPermission(\OCP\PERMISSION_DELETE)) {
throw new \Exception(self::$l10n('You do not have permissions to delete this contact'), 403); throw new \Exception(self::$l10n->t('You do not have permissions to delete this contact'), 403);
} }
return $this->props['backend']->deleteContact( return $this->props['backend']->deleteContact(
$this->getParent()->getId(), $this->getParent()->getId(),
@ -254,7 +254,7 @@ class Contact extends VObject\VCard implements IPIMObject {
*/ */
public function save($force = false) { public function save($force = false) {
if(!$this->hasPermission(\OCP\PERMISSION_UPDATE)) { if(!$this->hasPermission(\OCP\PERMISSION_UPDATE)) {
throw new \Exception(self::$l10n('You do not have permissions to update this contact'), 403); throw new \Exception(self::$l10n->t('You do not have permissions to update this contact'), 403);
} }
if($this->isSaved() && !$force) { if($this->isSaved() && !$force) {
\OCP\Util::writeLog('contacts', __METHOD__.' Already saved: ' . print_r($this->props, true), \OCP\Util::DEBUG); \OCP\Util::writeLog('contacts', __METHOD__.' Already saved: ' . print_r($this->props, true), \OCP\Util::DEBUG);
@ -265,7 +265,7 @@ class Contact extends VObject\VCard implements IPIMObject {
} }
if($this->getId()) { if($this->getId()) {
if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_UPDATE)) { if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_UPDATE)) {
throw new \Exception(self::$l10n('The backend for this contact does not support updating it'), 501); throw new \Exception(self::$l10n->t('The backend for this contact does not support updating it'), 501);
} }
if($this->getBackend() if($this->getBackend()
->updateContact( ->updateContact(
@ -283,7 +283,7 @@ class Contact extends VObject\VCard implements IPIMObject {
} else { } else {
//print(__METHOD__.' ' . print_r($this->getParent(), true)); //print(__METHOD__.' ' . print_r($this->getParent(), true));
if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_CREATE)) { if(!$this->getBackend()->hasContactMethodFor(\OCP\PERMISSION_CREATE)) {
throw new \Exception(self::$l10n('This not support adding contacts'), 501); throw new \Exception(self::$l10n->t('This backend not support adding contacts'), 501);
} }
$this->props['id'] = $this->getBackend()->createContact( $this->props['id'] = $this->getBackend()->createContact(
$this->getParent()->getId(), $this $this->getParent()->getId(), $this
@ -298,8 +298,6 @@ class Contact extends VObject\VCard implements IPIMObject {
* FIXME: Clean this up and make sure the logic is OK. * FIXME: Clean this up and make sure the logic is OK.
*/ */
public function retrieve() { public function retrieve() {
//error_log(__METHOD__);
//\OCP\Util::writeLog('contacts', __METHOD__.' ' . print_r($this->props, true), \OCP\Util::DEBUG);
if($this->isRetrieved() || count($this->children) > 1) { if($this->isRetrieved() || count($this->children) > 1) {
//\OCP\Util::writeLog('contacts', __METHOD__. ' children', \OCP\Util::DEBUG); //\OCP\Util::writeLog('contacts', __METHOD__. ' children', \OCP\Util::DEBUG);
return true; return true;
@ -392,7 +390,7 @@ class Contact extends VObject\VCard implements IPIMObject {
} }
$idx += 1; $idx += 1;
} }
throw new Exception(self::$l10n('Property not found'), 404); throw new Exception(self::$l10n->t('Property not found'), 404);
} }
/** /**
@ -409,7 +407,7 @@ class Contact extends VObject\VCard implements IPIMObject {
return $property; return $property;
} }
} }
throw new \Exception(self::$l10n('Property not found'), 404); throw new \Exception(self::$l10n->t('Property not found'), 404);
} }
/** /**
@ -457,7 +455,7 @@ class Contact extends VObject\VCard implements IPIMObject {
break; break;
case 'IMPP': case 'IMPP':
if(is_null($parameters) || !isset($parameters['X-SERVICE-TYPE'])) { if(is_null($parameters) || !isset($parameters['X-SERVICE-TYPE'])) {
throw new \InvalidArgumentException(self::$l10n(' Missing IM parameter for: ') . $name. ' ' . $value, 412); throw new \InvalidArgumentException(self::$l10n->t(' Missing IM parameter for: ') . $name. ' ' . $value, 412);
} }
$serviceType = $parameters['X-SERVICE-TYPE']; $serviceType = $parameters['X-SERVICE-TYPE'];
if(is_array($serviceType)) { if(is_array($serviceType)) {
@ -465,7 +463,7 @@ class Contact extends VObject\VCard implements IPIMObject {
} }
$impp = Utils\Properties::getIMOptions($serviceType); $impp = Utils\Properties::getIMOptions($serviceType);
if(is_null($impp)) { if(is_null($impp)) {
throw new \UnexpectedValueException(self::$l10n('Unknown IM: ') . $serviceType, 415); throw new \UnexpectedValueException(self::$l10n->t('Unknown IM: ') . $serviceType, 415);
} }
$value = $impp['protocol'] . ':' . $value; $value = $impp['protocol'] . ':' . $value;
$property->setValue($value); $property->setValue($value);