From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 19 Sep 2013 10:32:32 +0000 (+0200)
Subject: Merge branch 'appframework-master' into server_folder_methods
X-Git-Tag: v6.0.0alpha2~121^2~12^2~1^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d5126dd6b4d1d07c1da4cee4de0e857e81df6c73;p=nextcloud-server.git

Merge branch 'appframework-master' into server_folder_methods
---

d5126dd6b4d1d07c1da4cee4de0e857e81df6c73
diff --cc lib/public/iservercontainer.php
index 89e71db8d17,1725b7c74e0..cbb9fdf6c2f
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@@ -62,20 -62,13 +62,27 @@@ 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 an ICache instance
+ 	 *
+ 	 * @return \OCP\ICache
+ 	 */
+ 	function getCache();
+ 
  	/**
  	 * Returns the current session
  	 *
diff --cc lib/server.php
index 3454622425a,f4dc22a2be4..5c386593f1d
--- a/lib/server.php
+++ b/lib/server.php
@@@ -94,42 -97,13 +97,49 @@@ class Server extends SimpleContainer im
  		return $this->query('RootFolder');
  	}
  
 +	/**
 +	 * Returns a view to ownCloud's files folder
 +	 *
 +	 * @return \OCP\Files\Folder
 +	 */
 +	function getUserFolder() {
 +
 +		$dir = '/files';
 +		$root = $this->getRootFolder();
 +		$folder = null;
 +		if(!$root->nodeExists($dir)) {
 +			$folder = $root->newFolder($dir);
 +		} else {
 +			$folder = $root->get($dir);
 +		}
 +		return $folder;
 +
 +	}
 +
 +	/**
 +	 * Returns an app-specific view in ownClouds data directory
 +	 *
 +	 * @return \OCP\Files\Folder
 +	 */
 +	function getAppFolder() {
 +
 +		$dir = '/' . \OC_App::getCurrentApp();
 +		$root = $this->getRootFolder();
 +		$folder = null;
 +		if(!$root->nodeExists($dir)) {
 +			$folder = $root->newFolder($dir);
 +		} else {
 +			$folder = $root->get($dir);
 +		}
 +		return $folder;
 +
+ 	/**
+ 	 * Returns an ICache instance
+ 	 *
+ 	 * @return \OCP\ICache
+ 	 */
+ 	function getCache() {
+ 		return $this->query('UserCache');
  	}
  
  	/**