Some cleanup, better error messages and such.

This commit is contained in:
Thomas Tanghus 2012-01-04 22:36:34 +01:00
parent 47548fb8c6
commit 604ca61d78
2 changed files with 30 additions and 3 deletions

View File

@ -48,9 +48,10 @@ $details = array();
if(is_null($id) && count($contacts) > 0) { if(is_null($id) && count($contacts) > 0) {
$id = $contacts[0]['id']; $id = $contacts[0]['id'];
} }
if(!is_null($id)) {
$vcard = OC_Contacts_App::getContactVCard($id); $vcard = OC_Contacts_App::getContactVCard($id);
$details = OC_Contacts_VCard::structureContact($vcard); $details = OC_Contacts_VCard::structureContact($vcard);
}
// if( !is_null($id)/* || count($contacts)*/){ // if( !is_null($id)/* || count($contacts)*/){
// if(is_null($id)) $id = $contacts[0]['id']; // if(is_null($id)) $id = $contacts[0]['id'];
// $vcard = OC_Contacts_App::getContactVCard($id); // $vcard = OC_Contacts_App::getContactVCard($id);

View File

@ -1,3 +1,29 @@
/**
* ownCloud - Addressbook
*
* @author Jakob Sack
* @copyright 2011 Jakob Sack mail@jakobsack.de
* @copyright 2011-2012 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/>.
*
* TODO:
* If you add a contact, its thumbnail doesnt show in the list. But when you add another one it shows up, but not for the second contact added.
* Place a new contact in correct alphabetic order
*/
Contacts={ Contacts={
UI:{ UI:{
showCardDAVUrl:function(username, bookname){ showCardDAVUrl:function(username, bookname){