move the private namespace OC into lib/private - OCP will stay in lib/public

Conflicts:
	lib/private/vcategories.php

5 files changed, 0 insertions, 349 deletions

diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php
deleted file mode 100644
index 2dd99319057..00000000000
--- a/lib/ocs/cloud.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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 getCapabilities($parameters) {
-		$result = array();
-		list($major, $minor, $micro) = OC_Util::getVersion();
-		$result['version'] = array(
-			'major' => $major,
-			'minor' => $minor,
-			'micro' => $micro,
-			'string' => OC_Util::getVersionString(),
-			'edition' => OC_Util::getEditionString(),
-			);
-			
-		$result['capabilities'] = array(
-			'core' => array(
-				'pollinterval' => OC_Config::getValue('pollinterval', 60),
-				),
-			);
-			
-		return new OC_OCS_Result($result);
-	}
-	
-	/**
-	 * gets user info
-	 *
-	 * exposes the quota of an user:
-	 * <data>
-	 *   <quota>
-	 *      <free>1234</free>
-	 *      <used>4321</used>
-	 *      <total>5555</total>
-	 *      <ralative>0.78</ralative>
-	 *   </quota>
-	 * </data>
-	 *
-	 * @param $parameters object should contain parameter 'userid' which identifies
-	 *                           the user from whom the information will be returned
-	 */
-	public static function getUser($parameters) {
-		// Check if they are viewing information on themselves
-		if($parameters['userid'] === OC_User::getUser()) {
-			// Self lookup
-			$quota = array();
-			$storage = OC_Helper::getStorageInfo();
-			$quota = array(
-				'free' =>  $storage['free'],
-				'used' =>  $storage['used'],
-				'total' =>  $storage['total'],
-				'relative' => $storage['relative'],
-				);
-			return new OC_OCS_Result(array('quota' => $quota));
-		} else {
-			// No permission to view this user data
-			return new OC_OCS_Result(null, 997);
-		}
-	}
-
-	public static function getUserPublickey($parameters) {
-
-		if(OC_User::userExists($parameters['user'])) {
-			// calculate the disc space
-			// TODO
-			return new OC_OCS_Result(array());
-		} else {
-			return new OC_OCS_Result(null, 300);
-		}
-	}
-
-	public static function getUserPrivatekey($parameters) {
-		$user = OC_User::getUser();
-		if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
-
-			if(OC_User::userExists($user)) {
-				// calculate the disc space
-				$txt = 'this is the private key of '.$parameters['user'];
-				echo($txt);
-			} else {
-				return new OC_OCS_Result(null, 300, 'User does not exist');
-			}
-		} else {
-			return new OC_OCS_Result('null', 300, 'You don´t have permission to access this ressource.');
-		}
-	}
-}
diff --git a/lib/ocs/config.php b/lib/ocs/config.php
deleted file mode 100644
index f19121f4b2b..00000000000
--- a/lib/ocs/config.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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_Config {
-
-	public static function apiConfig($parameters) {
-		$xml['version'] = '1.7';
-		$xml['website'] = 'ownCloud';
-		$xml['host'] = OCP\Util::getServerHost();
-		$xml['contact'] = '';
-		$xml['ssl'] = 'false';
-		return new OC_OCS_Result($xml);
-	}
-
-}
diff --git a/lib/ocs/person.php b/lib/ocs/person.php
deleted file mode 100644
index 1c8210d0825..00000000000
--- a/lib/ocs/person.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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) {
-		$login = isset($_POST['login']) ? $_POST['login'] : false;
-		$password = isset($_POST['password']) ? $_POST['password'] : false;
-		if($login && $password) {
-			if(OC_User::checkPassword($login, $password)) {
-				$xml['person']['personid'] = $login;
-				return new OC_OCS_Result($xml);
-			} else {
-				return new OC_OCS_Result(null, 102);
-			}
-		} else {
-			return new OC_OCS_Result(null, 101);
-		}
-	}
-
-}
diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php
deleted file mode 100644
index 4dfd0a6e66e..00000000000
--- a/lib/ocs/privatedata.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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) {
-		OC_Util::checkLoggedIn();
-		$user = OC_User::getUser();
-		$app = addslashes(strip_tags($parameters['app']));
-		$key = addslashes(strip_tags($parameters['key']));
-		$result = OC_OCS::getData($user, $app, $key);
-		$xml = array();
-		foreach($result as $i=>$log) {
-			$xml[$i]['key']=$log['key'];
-			$xml[$i]['app']=$log['app'];
-			$xml[$i]['value']=$log['value'];
-		}
-		return new OC_OCS_Result($xml);
-		//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
-	}
-
-	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)) {
-			return new OC_OCS_Result(null, 100);
-		}
-	}
-
-	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==="") {
-			return new OC_OCS_Result(null, 101); //key and app are NOT optional here
-		}
-		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
deleted file mode 100644
index 84f06fa01c7..00000000000
--- a/lib/ocs/result.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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{
-
-	protected $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) {
-		$this->data = $data;
-		$this->statusCode = $code;
-		$this->message = $message;
-	}
-
-	/**
-	 * optionally set the total number of items available
-	 * @param $items int
-	 */
-	public function setTotalItems(int $items) {
-		$this->items = $items;
-	}
-
-	/**
-	 * optionally set the the number of items per page
-	 * @param $items int
-	 */
-	public function setItemsPerPage(int $items) {
-		$this->perPage = $items;
-	}
-	
-	/**
-	 * get the status code
-	 * @return int
-	 */
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
-	
-	/**
-	 * get the meta data for the result
-	 * @return array
-	 */
-	public function getMeta() {
-		$meta = array();
-		$meta['status'] = ($this->statusCode === 100) ? 'ok' : 'failure';
-		$meta['statuscode'] = $this->statusCode;
-		$meta['message'] = $this->message;
-		if(isset($this->items)) {
-			$meta['totalitems'] = $this->items;
-		}
-		if(isset($this->perPage)) {
-			$meta['itemsperpage'] = $this->perPage;
-		}
-		return $meta;
-
-	}
-	
-	/**
-	 * get the result data
-	 * @return array|string|int 
-	 */
-	public function getData() {
-		return $this->data;
-	}
-	
-	/**
-	 * return bool if the method succedded
-	 * @return bool
-	 */
-	public function succeeded() {
-		return (substr($this->statusCode, 0, 1) === '1');
-	}
-
-
-}