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

Merge branch 'master' of git://anongit.kde.org/owncloud

This commit is contained in:
Arthur Schiwon 2011-08-24 14:36:16 +02:00
parent 0f3ef8aeb0 f4c498edba
commit 4028dc984a
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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/'.OC_User::getUser().'/'.$_['addressbooks'][0]['uri'])); ?> <?php echo $l->t('The path to this addressbook is %s', array(((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].OC::$WEBROOT.'/apps/contacts/carddav.php/addressbooks/'.OC_User::getUser().'/'.$_['addressbooks'][0]['uri'])); ?>
<?php endif; ?> <?php endif; ?>

33
apps/contacts/temporaryupdate.php
View File

@ -1,33 +0,0 @@
<?php
/**
* ownCloud - Addressbook
*
* @author Jakob Sack
* @copyright 2011 Jakob Sack mail@jakobsack.de
*
* 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/>.
*
*/
// Init owncloud
require_once('../../lib/base.php');
$connector = new OC_Connector_Sabre_Principal;
$users = OC_User::getUsers();
foreach($users as $user){
$foo = $connector->getPrincipalByPath('principals/'.$user);
if(!isset($foo)){
OC_Connector_Sabre_Principal::addPrincipal(array('uid'=>$user));
}
}
echo "done";