diff options
| -rw-r--r-- | apps/contacts/README.tanghus | 22 | ||||
| -rw-r--r-- | apps/contacts/css/styles.css | 2 | ||||
| -rw-r--r-- | apps/contacts/lib/addressbook.php | 6 |
3 files changed, 3 insertions, 27 deletions
diff --git a/apps/contacts/README.tanghus b/apps/contacts/README.tanghus deleted file mode 100644 index 28043063fcc..00000000000 --- a/apps/contacts/README.tanghus +++ /dev/null @@ -1,22 +0,0 @@ -As I like to run regular, automated backups of my PIM data I looked into an -easy way of getting the direct link to an address book, and noticed the -elegant way it was possible in the calendar, where you can click on the -'Calendars' button and download it directly. -I modified the export.php script for the contacts app and can now run backups -with wget and http authentication. Hence the name 'tanghus_remote_backup' for -this branch. -Then I implemented the nice popup window function to get an UI for it and one -thing lead to another: - -As for the Calendar app there's a js popup for address book activation, CardDAV link, export, -edit, delete and add address books. - -When making changes to the address books the contact list is updated to show the -contacts in the active address book(s). - -When an address book is activated the setting is saved using OC_Preferences::setValue(). - -Most of the code is copy/paste from the Calendar and Contacts apps ;-) - -Tested with fresh clone from git@gitorious.org:~tanghus/owncloud/tanghus-owncloud.git, removed -database and config.php.
\ No newline at end of file diff --git a/apps/contacts/css/styles.css b/apps/contacts/css/styles.css index 048f4cf9d2d..f961767a0d6 100644 --- a/apps/contacts/css/styles.css +++ b/apps/contacts/css/styles.css @@ -1,4 +1,4 @@ -#chooseaddressbook {margin-right: 170px; float: right; font-size: 12px;} +#chooseaddressbook {margin-right: 170px; float: right;} #contacts_details_name { font-weight:bold;font-size:1.1em;margin-left:25%;} #contacts_details_photo { margin:.5em 0em .5em 25%; } diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php index 7d55a00d601..6f2f34225de 100644 --- a/apps/contacts/lib/addressbook.php +++ b/apps/contacts/lib/addressbook.php @@ -145,7 +145,7 @@ class OC_Contacts_Addressbook{ * @param integer $uid User id. If null current user will be used. * @return array */ - public static function activeIds($uid){ + public static function activeIds($uid = null){ if(is_null($uid)){ $uid = OC_User::getUser(); } @@ -221,9 +221,7 @@ class OC_Contacts_Addressbook{ * @return boolean */ public static function isActive($id){ - //if(defined("DEBUG") && DEBUG) { - OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()),OC_Log::DEBUG); - //} + OC_Log::write('contacts','OC_Contacts_Addressbook::isActive('.$id.'):'.in_array($id, self::activeIds()), OC_Log::DEBUG); return in_array($id, self::activeIds()); } |