Merge branch 'master' into ocs_api

Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot

5 files changed, 158 insertions, 52 deletions

diff --git a/lib/ocs/activity.php b/lib/ocs/activity.php
index 07b571665ec..c30e21018d3 100644
--- a/lib/ocs/activity.php
+++ b/lib/ocs/activity.php
@@ -1,4 +1,24 @@
 <?php
+/**
+* ownCloud
+*
+* @author Frank Karlitschek
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 class OC_OCS_Activity {
 
diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php
index b5cfbc295e8..21095ec91e9 100644
--- a/lib/ocs/cloud.php
+++ b/lib/ocs/cloud.php
@@ -1,75 +1,97 @@
 <?php
+/**
+* ownCloud
+*
+* @author Frank Karlitschek
+* @author Tom Needham
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
+* @copyright 2012 Tom Needham tom@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 class OC_OCS_Cloud {
 
-	public static function getSystemWebApps($parameters){
+	public static function getSystemWebApps($parameters) {
 		OC_Util::checkLoggedIn();
 		$apps = OC_App::getEnabledApps();
 		$values = array();
 		foreach($apps as $app) {
 			$info = OC_App::getAppInfo($app);
 			if(isset($info['standalone'])) {
-				$newvalue = array('name'=>$info['name'],'url'=>OC_Helper::linkToAbsolute($app,''),'icon'=>'');
-				$values[] = $newvalue;
+				$newValue = array('name'=>$info['name'],'url'=>OC_Helper::linkToAbsolute($app,''),'icon'=>'');
+				$values[] = $newValue;
 			}
 		}
 		return new OC_OCS_Result($values);
 	}
 	
-	public static function getUserQuota($parameters){
+	public static function getUserQuota($parameters) {
 		$user = OC_User::getUser();
 		if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) {
 
-			if(OC_User::userExists($parameters['user'])){
+			if(OC_User::userExists($parameters['user'])) {
 				// calculate the disc space
-				$user_dir = '/'.$parameters['user'].'/files';
-				OC_Filesystem::init($user_dir);
-				$rootInfo=OC_FileCache::get('');
-				$sharedInfo=OC_FileCache::get('/Shared');
-				$used=$rootInfo['size']-$sharedInfo['size'];
-				$free=OC_Filesystem::free_space();
-				$total=$free+$used;
-				if($total==0) $total=1;  // prevent division by zero
-				$relative=round(($used/$total)*10000)/100;
+				$userDir = '/'.$parameters['user'].'/files';
+				OC_Filesystem::init($useDir);
+				$rootInfo = OC_FileCache::get('');
+				$sharedInfo = OC_FileCache::get('/Shared');
+				$used = $rootInfo['size'] - $sharedInfo['size'];
+				$free = OC_Filesystem::free_space();
+				$total = $free + $used;
+				if($total===0) $total = 1;  // prevent division by zero
+				$relative = round(($used/$total)*10000)/100;
 
-				$xml=array();
-				$xml['quota']=$total;
-				$xml['free']=$free;
-				$xml['used']=$used;
-				$xml['relative']=$relative;
+				$xml = array();
+				$xml['quota'] = $total;
+				$xml['free'] = $free;
+				$xml['used'] = $used;
+				$xml['relative'] = $relative;
 
 				return new OC_OCS_Result($xml);
-			}else{
+			} else {
 				return new OC_OCS_Result(null, 300);
 			}
-		}else{
+		} else {
 			return new OC_OCS_Result(null, 300);
 		}
 	}
 	
-	public static function getUserPublickey($parameters){
+	public static function getUserPublickey($parameters) {
 
-		if(OC_User::userExists($parameters['user'])){
+		if(OC_User::userExists($parameters['user'])) {
 			// calculate the disc space
 			// TODO
 			return new OC_OCS_Result(array());
-		}else{
+		} else {
 			return new OC_OCS_Result(null, 300);
 		}
 	}
 	
-	public static function getUserPrivatekey($parameters){
+	public static function getUserPrivatekey($parameters) {
 		$user = OC_User::getUser();
 		if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) {
 
-			if(OC_User::userExists($user)){
+			if(OC_User::userExists($user)) {
 				// calculate the disc space
-				$txt='this is the private key of '.$parameters['user'];
+				$txt = 'this is the private key of '.$parameters['user'];
 				echo($txt);
-			}else{
+			} else {
 				return new OC_OCS_Result(null, 300, 'User does not exist');
 			}
-		}else{
+		} else {
 			return new OC_OCS_Result('null', 300, 'You don´t have permission to access this ressource.');
 		}
 	}
diff --git a/lib/ocs/person.php b/lib/ocs/person.php
index b5f07d88ae1..169cc8211db 100644
--- a/lib/ocs/person.php
+++ b/lib/ocs/person.php
@@ -1,18 +1,40 @@
 <?php
+/**
+* ownCloud
+*
+* @author Frank Karlitschek
+* @author Tom Needham
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
+* @copyright 2012 Tom Needham tom@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 class OC_OCS_Person {
 
-	public static function check($parameters){
+	public static function check($parameters) {
 		$login = isset($_POST['login']) ? $_POST['login'] : false;
 		$password = isset($_POST['password']) ? $_POST['password'] : false;
-		if($login && $password){
-			if(OC_User::checkPassword($login,$password)){
+		if($login && $password) {
+			if(OC_User::checkPassword($login, $password)) {
 				$xml['person']['personid'] = $login;
 				return new OC_OCS_Result($xml);
-			}else{
+			} else {
 				return new OC_OCS_Result(null, 102);
 			}
-		}else{
+		} else {
 			return new OC_OCS_Result(null, 101);
 		}
 	}
diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php
index 09d636bd733..e01ed5e8b07 100644
--- a/lib/ocs/privatedata.php
+++ b/lib/ocs/privatedata.php
@@ -1,8 +1,30 @@
 <?php
+/**
+* ownCloud
+*
+* @author Frank Karlitschek
+* @author Tom Needham
+* @copyright 2012 Frank Karlitschek frank@owncloud.org
+* @copyright 2012 Tom Needham tom@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 class OC_OCS_Privatedata {
 
-	public static function get($parameters){
+	public static function get($parameters) {
 		OC_Util::checkLoggedIn();
 		$user = OC_User::getUser();
 		$app = addslashes(strip_tags($parameters['app']));
@@ -18,26 +40,26 @@ class OC_OCS_Privatedata {
 		//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
 	}
 	
-	public static function set($parameters){
+	public static function set($parameters) {
 		OC_Util::checkLoggedIn();
 		$user = OC_User::getUser();
 		$app = addslashes(strip_tags($parameters['app']));
 		$key = addslashes(strip_tags($parameters['key']));
 		$value = OC_OCS::readData('post', 'value', 'text');
-		if(OC_Preferences::setValue($user,$app,$key,$value)){
+		if(OC_Preferences::setValue($user, $app, $key, $value)){
 			return new OC_OCS_Result(null, 100);
 		}
 	}
 	
-	public static function delete($parameters){
+	public static function delete($parameters) {
 		OC_Util::checkLoggedIn();
 		$user = OC_User::getUser();
 		$app = addslashes(strip_tags($parameters['app']));
 		$key = addslashes(strip_tags($parameters['key']));
-		if($key=="" or $app==""){
+		if($key==="" or $app==="") {
 			return new OC_OCS_Result(null, 101); //key and app are NOT optional here
 		}
-		if(OC_Preferences::deleteKey($user,$app,$key)){
+		if(OC_Preferences::deleteKey($user, $app, $key)) {
 			return new OC_OCS_Result(null, 100);
 		}
 	}
diff --git a/lib/ocs/result.php b/lib/ocs/result.php
index 4531da5ae0d..b08d911f785 100644
--- a/lib/ocs/result.php
+++ b/lib/ocs/result.php
@@ -1,16 +1,36 @@
 <?php
+/**
+* ownCloud
+*
+* @author Tom Needham
+* @copyright 2012 Tom Needham tom@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 
 class OC_OCS_Result{
 	
-	private $data, $message, $statuscode, $items, $perpage;
+	private $data, $message, $statusCode, $items, $perPage;
 	
 	/**
 	 * create the OCS_Result object
 	 * @param $data mixed the data to return
 	 */
-	public function __construct($data=null, $code=100, $message=null){
+	public function __construct($data=null, $code=100, $message=null) {
 		$this->data = $data;
-		$this->statuscode = $code;
+		$this->statusCode = $code;
 		$this->message = $message;
 	}
 	
@@ -18,7 +38,7 @@ class OC_OCS_Result{
 	 * optionally set the total number of items available
 	 * @param $items int
 	 */
-	public function setTotalItems(int $items){
+	public function setTotalItems(int $items) {
 		$this->items = $items;
 	}
 	
@@ -26,25 +46,25 @@ class OC_OCS_Result{
 	 * optionally set the the number of items per page
 	 * @param $items int
 	 */
-	public function setItemsPerPage(int $items){
-		$this->perpage = $items;
+	public function setItemsPerPage(int $items) {
+		$this->perPage = $items;
 	}
 	
 	/**
 	 * returns the data associated with the api result
 	 * @return array
 	 */
-	public function getResult(){
+	public function getResult() {
 		$return = array();
 		$return['meta'] = array();
-		$return['meta']['status'] = ($this->statuscode === 100) ? 'ok' : 'failure';
-		$return['meta']['statuscode'] = $this->statuscode;
+		$return['meta']['status'] = ($this->statusCode === 100) ? 'ok' : 'failure';
+		$return['meta']['statuscode'] = $this->statusCode;
 		$return['meta']['message'] = $this->message;
-		if(isset($this->items)){
+		if(isset($this->items)) {
 			$return['meta']['totalitems'] = $this->items;
 		}
-		if(isset($this->perpage)){
-			$return['meta']['itemsperpage'] = $this->perpage;
+		if(isset($this->perPage)) {
+			$return['meta']['itemsperpage'] = $this->perPage;
 		}
 		$return['data'] = $this->data;
 		// Return the result data.