mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small fixes

This commit is contained in:
Jakob Sack 2011-08-10 22:27:55 +02:00
parent ec31a29b3c
commit 5324d6f7df
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/contacts/carddav.php
View File

@ -32,8 +32,8 @@ $carddavBackend = new OC_Connector_Sabre_CardDAV();
// Root nodes // Root nodes
$nodes = array( $nodes = array(
new Sabre_DAVACL_PrincipalCollection($principalBackend), new Sabre_DAVACL_PrincipalCollection($principalBackend),
new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend), new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),
); );
// Fire up server // Fire up server

4
apps/contacts/lib/addressbook.php
View File

@ -120,10 +120,10 @@ class OC_Contacts_Addressbook{
} }
public static function deleteAddressbook($id){ public static function deleteAddressbook($id){
$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' ); $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
$stmt->execute(array($id)); $stmt->execute(array($id));
$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_addressbooks WHERE addressbookid = ?' ); $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ?' );
$stmt->execute(array($id)); $stmt->execute(array($id));
return true; return true;

2
apps/contacts/templates/index.php
View File

@ -13,5 +13,5 @@ OC_Util::addStyle('contacts','styles');
<?php echo $this->inc("part.details"); ?> <?php echo $this->inc("part.details"); ?>
</div> </div>
<?php if(count($_['addressbooks']) == 1 ): ?> <?php if(count($_['addressbooks']) == 1 ): ?>
<?php echo $l->t('The path to this addressbook is %s', array(OC::$WEBROOT.'/apps/contacts/carddav.php/addressbooks/'.$_['addressbooks'][0]['uri'])); ?> <?php echo $l->t('The path to this addressbook is %s', array(OC::$WEBROOT.'/apps/contacts/carddav.php/addressbooks/'.OC_User::getUser().'/'.$_['addressbooks'][0]['uri'])); ?>
<?php endif; ?> <?php endif; ?>