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

Conflicts:
	admin/apps.php

diff --cc admin/apps.php
index cd686fadf16aecc53308897100f89b9f7fa84321,10bfd83c9b24a5d6162cad1644d1c61bd3b0bc93..dc7b51bb820a5acbf58e1e1f0267e570fea43fa7
--- 1/admin/apps.php
--- 2/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" );
  
- OC_UTIL::addStyle( "files", "files" );
- OC_UTIL::addScript( "files", "files" );
 +// Load the files we need
++//OC_UTIL::addStyle( "", "files" );
++//OC_UTIL::addScript( "", "files" );
  
- $tmpl = new OC_TEMPLATE( "files", "index", "user" );
 +
 +$categories=OC_OCSCLIENT::getCategories();
 +$apps=OC_OCSCLIENT::getApplications($categories);
 +
 +
 +// return template
+ $tmpl = new OC_TEMPLATE( "admin", "apps", "admin" );
++
 +$tmpl->assign( "categories", $categories );
 +$tmpl->assign( "apps", $apps );
  $tmpl->printPage();
  
 +
 +
  ?>
+ 

diff --cc admin/index.php
index 2446ebc50aa363b5fce851e2a3c8f3788c197896,2446ebc50aa363b5fce851e2a3c8f3788c197896..80e70d13f9aa2261202802e1f31b3e1fcae56d38
--- 1/admin/index.php
--- 2/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 31d4142900f0cb464f1161d0e93e93e71cd69d79,dbeba1dd1f9d406783e0ed7da2410687c965502d..9ecf7db07784b2bff8acfe2205c3d94ad4c03187
--- 1/lib/base.php
--- 2/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');