From: Frank Karlitschek <karlitschek@kde.org>
Date: Sat, 16 Apr 2011 16:50:49 +0000 (+0200)
Subject: Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
X-Git-Tag: v3.0~267^2~558^2~139
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=150631849f5829eaf1f68517b1c81d4339a5f23b;p=nextcloud-server.git

Merge branch 'refactoring' of git.kde.org:owncloud into refactoring

Conflicts:
	admin/apps.php
---

150631849f5829eaf1f68517b1c81d4339a5f23b
diff --cc admin/apps.php
index cd686fadf16,10bfd83c9b2..dc7b51bb820
--- a/admin/apps.php
+++ b/admin/apps.php
@@@ -24,26 -24,16 +24,28 @@@
  require_once('../lib/base.php');
  require( 'template.php' );
  if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
--	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
++	header( "Location: ".OC_HELPER::linkTo( "", "index.php" ));
  	exit();
  }
  
 -// We have some javascript foo!
 -OC_UTIL::addScript( "admin", "apps" );
  
 +// Load the files we need
- OC_UTIL::addStyle( "files", "files" );
- OC_UTIL::addScript( "files", "files" );
++//OC_UTIL::addStyle( "", "files" );
++//OC_UTIL::addScript( "", "files" );
  
 +
 +$categories=OC_OCSCLIENT::getCategories();
 +$apps=OC_OCSCLIENT::getApplications($categories);
 +
 +
 +// return template
- $tmpl = new OC_TEMPLATE( "files", "index", "user" );
+ $tmpl = new OC_TEMPLATE( "admin", "apps", "admin" );
++
 +$tmpl->assign( "categories", $categories );
 +$tmpl->assign( "apps", $apps );
  $tmpl->printPage();
  
 +
 +
  ?>
+ 
diff --cc admin/index.php
index 2446ebc50aa,2446ebc50aa..80e70d13f9a
--- a/admin/index.php
+++ b/admin/index.php
@@@ -24,7 -24,7 +24,7 @@@
  require_once('../lib/base.php');
  require( 'template.php' );
  if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
--	header( "Location: ".OC_HELPER::linkTo( "index.php" ));
++	header( "Location: ".OC_HELPER::linkTo( "","index.php" ));
  	exit();
  }
  
diff --cc lib/base.php
index 31d4142900f,dbeba1dd1f9..9ecf7db0778
--- a/lib/base.php
+++ b/lib/base.php
@@@ -85,6 -85,6 +85,7 @@@ require_once('log.php')
  require_once('user.php');
  require_once('group.php');
  require_once('ocs.php');
++require_once('ocsclient.php');
  require_once('connect.php');
  require_once('remotestorage.php');
  require_once('plugin.php');