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:
Hans Bakker 2011-08-15 17:41:46 +02:00
parent 4f3fdf6c45 4a52886728
commit 66576de1b7
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/templates/layout.guest.php
View File

@ -35,6 +35,6 @@
</div></header> </div></header>
<?php echo $_['content']; ?> <?php echo $_['content']; ?>
</div> </div>
<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'is a personal cloud which runs on your own server' ); ?>.</p></footer> <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'gives you the freedom to control your own data on the internet' ); ?></p></footer>
</body> </body>
</html> </html>

23
settings/apps.php
View File

@ -46,16 +46,19 @@ foreach($registeredApps as $app){
} }
} }
$categories=array_keys(OC_OCSClient::getCategories()); $catagoryNames=OC_OCSClient::getCategories();
$externalApps=OC_OCSClient::getApplications($categories); if(is_array($catagoryNames)){
foreach($externalApps as $app){ $categories=array_keys($catagoryNames);
$apps[]=array( $externalApps=OC_OCSClient::getApplications($categories);
'name'=>$app['name'], foreach($externalApps as $app){
'id'=>$app['id'], $apps[]=array(
'active'=>false, 'name'=>$app['name'],
'description'=>$app['description'], 'id'=>$app['id'],
'author'=>$app['personid'], 'active'=>false,
); 'description'=>$app['description'],
'author'=>$app['personid'],
);
}
} }