From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 23 Sep 2013 22:09:21 +0000 (+0200)
Subject: Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_m... 
X-Git-Tag: v6.0.0alpha2~121^2~12^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=698394c994a79aa4faa53c2d69e9937d798d8948;p=nextcloud-server.git

Merge branch 'server_folder_methods' of github.com:owncloud/core into server_folder_methods

Conflicts:
	lib/public/iservercontainer.php
	lib/server.php
---

698394c994a79aa4faa53c2d69e9937d798d8948
diff --cc lib/public/iservercontainer.php
index dcf8c162e6f,cbb9fdf6c2f..d3ee5d15dcc
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@@ -62,22 -62,19 +62,35 @@@ interface IServerContainer 
  	 */
  	function getRootFolder();
  
+ 	/**
+ 	 * Returns a view to ownCloud's files folder
+ 	 *
+ 	 * @return \OCP\Files\Folder
+ 	 */
+ 	function getUserFolder();
+ 
+ 	/**
+ 	 * Returns an app-specific view in ownClouds data directory
+ 	 *
+ 	 * @return \OCP\Files\Folder
+ 	 */
+ 	function getAppFolder();
 +	/**
 +	 * Returns the user session
 +	 *
 +	 * @return \OCP\IUserSession
 +	 */
 +	function getUserSession();
 +
 +	/**
 +	 * @return \OCP\INavigationManager
 +	 */
 +	function getNavigationManager();
 +
 +	/**
 +	 * @return \OCP\IConfig
 +	 */
 +	function getConfig();
  
  	/**
  	 * Returns an ICache instance
diff --cc lib/server.php
index dcfd0a2db99,4f5bcfbe676..fccb8fad4d0
--- a/lib/server.php
+++ b/lib/server.php
@@@ -184,33 -133,6 +184,34 @@@ class Server extends SimpleContainer im
  		return $folder;
  	}
  
 +	/**
 +	 * @return \OC\User\Manager
 +	 */
 +	function getUserManager() {
 +		return $this->query('UserManager');
 +	}
 +
 +	/**
 +	 * @return \OC\User\Session
 +	 */
 +	function getUserSession() {
 +		return $this->query('UserSession');
 +	}
 +
 +	/**
 +	 * @return \OC\NavigationManager
 +	 */
 +	function getNavigationManager() {
 +		return $this->query('NavigationManager');
 +	}
 +
 +	/**
 +	 * @return \OC\Config
 +	 */
 +	function getConfig() {
 +		return $this->query('AllConfig');
 +	}
++
  	/**
  	 * Returns an ICache instance
  	 *