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

Conflicts:
	lib/private/vcategories.php

7 files changed, 0 insertions, 751 deletions

diff --git a/lib/legacy/cache.php b/lib/legacy/cache.php
deleted file mode 100644
index f915eb516b1..00000000000
--- a/lib/legacy/cache.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Thomas Tanghus (thomas@tanghus.net)
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_Cache extends \OC\Cache {
-}
\ No newline at end of file
diff --git a/lib/legacy/config.php b/lib/legacy/config.php
deleted file mode 100644
index 7e498013737..00000000000
--- a/lib/legacy/config.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Frank Karlitschek
- * @author Jakob Sack
- * @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/>.
- *
- */
-/*
- *
- * An example of config.php
- *
- * <?php
- * $CONFIG = array(
- *     "database" => "mysql",
- *     "firstrun" => false,
- *     "pi" => 3.14
- * );
- * ?>
- *
- */
-
-/**
- * This class is responsible for reading and writing config.php, the very basic
- * configuration file of ownCloud.
- */
-OC_Config::$object = new \OC\Config(OC::$SERVERROOT.'/config/');
-class OC_Config {
-
-	/**
-	 * @var \OC\Config
-	 */
-	public static $object;
-
-	public static function getObject() {
-		return self::$object;
-	}
-
-	/**
-	 * @brief Lists all available config keys
-	 * @return array with key names
-	 *
-	 * This function returns all keys saved in config.php. Please note that it
-	 * does not return the values.
-	 */
-	public static function getKeys() {
-		return self::$object->getKeys();
-	}
-
-	/**
-	 * @brief Gets a value from config.php
-	 * @param string $key key
-	 * @param string $default = null default value
-	 * @return string the value or $default
-	 *
-	 * This function gets the value from config.php. If it does not exist,
-	 * $default will be returned.
-	 */
-	public static function getValue($key, $default = null) {
-		return self::$object->getValue($key, $default);
-	}
-
-	/**
-	 * @brief Sets a value
-	 * @param string $key key
-	 * @param string $value value
-	 *
-	 * This function sets the value and writes the config.php.
-	 *
-	 */
-	public static function setValue($key, $value) {
-		try {
-			self::$object->setValue($key, $value);
-		} catch (\OC\HintException $e) {
-			\OC_Template::printErrorPage($e->getMessage(), $e->getHint());
-		}
-	}
-
-	/**
-	 * @brief Removes a key from the config
-	 * @param string $key key
-	 *
-	 * This function removes a key from the config.php.
-	 *
-	 */
-	public static function deleteKey($key) {
-		try {
-			self::$object->deleteKey($key);
-		} catch (\OC\HintException $e) {
-			\OC_Template::printErrorPage($e->getMessage(), $e->getHint());
-		}
-	}
-}
diff --git a/lib/legacy/filesystem.php b/lib/legacy/filesystem.php
deleted file mode 100644
index 34f92b357ca..00000000000
--- a/lib/legacy/filesystem.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * Class for abstraction of filesystem functions
- * This class won't call any filesystem functions for itself but but will pass them to the correct OC_Filestorage object
- * this class should also handle all the file permission related stuff
- *
- * Hooks provided:
- *   read(path)
- *   write(path, &run)
- *   post_write(path)
- *   create(path, &run) (when a file is created, both create and write will be emitted in that order)
- *   post_create(path)
- *   delete(path, &run)
- *   post_delete(path)
- *   rename(oldpath,newpath, &run)
- *   post_rename(oldpath,newpath)
- *   copy(oldpath,newpath, &run) (if the newpath doesn't exists yes, copy, create and write will be emitted in that order)
- *   post_rename(oldpath,newpath)
- *
- *   the &run parameter can be set to false to prevent the operation from occurring
- */
-
-/**
- * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
- */
-class OC_Filesystem {
-	/**
-	 * get the mountpoint of the storage object for a path
-	 * ( note: because a storage is not always mounted inside the fakeroot, the
-	 * returned mountpoint is relative to the absolute root of the filesystem
-	 * and doesn't take the chroot into account )
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return string
-	 */
-	static public function getMountPoint($path) {
-		return \OC\Files\Filesystem::getMountPoint($path);
-	}
-
-	/**
-	 * resolve a path to a storage and internal path
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return array consisting of the storage and the internal path
-	 */
-	static public function resolvePath($path) {
-		return \OC\Files\Filesystem::resolvePath($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function init($user, $root) {
-		return \OC\Files\Filesystem::init($user, $root);
-	}
-
-	/**
-	 * get the default filesystem view
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @return \OC\Files\View
-	 */
-	static public function getView() {
-		return \OC\Files\Filesystem::getView();
-	}
-
-	/**
-	 * tear down the filesystem, removing all storage providers
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function tearDown() {
-		\OC\Files\Filesystem::tearDown();
-	}
-
-	/**
-	 * @brief get the relative path of the root data directory for the current user
-	 * @return string
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * Returns path like /admin/files
-	 */
-	static public function getRoot() {
-		return \OC\Files\Filesystem::getRoot();
-	}
-
-	/**
-	 * clear all mounts and storage backends
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	public static function clearMounts() {
-		\OC\Files\Filesystem::clearMounts();
-	}
-
-	/**
-	 * mount an \OC\Files\Storage\Storage in our virtual filesystem
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param \OC\Files\Storage\Storage $class
-	 * @param array $arguments
-	 * @param string $mountpoint
-	 */
-	static public function mount($class, $arguments, $mountpoint) {
-		\OC\Files\Filesystem::mount($class, $arguments, $mountpoint);
-	}
-
-	/**
-	 * return the path to a local version of the file
-	 * we need this because we can't know if a file is stored local or not from
-	 * outside the filestorage and for some purposes a local file is needed
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return string
-	 */
-	static public function getLocalFile($path) {
-		return \OC\Files\Filesystem::getLocalFile($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return string
-	 */
-	static public function getLocalFolder($path) {
-		return \OC\Files\Filesystem::getLocalFolder($path);
-	}
-
-	/**
-	 * return path to file which reflects one visible in browser
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return string
-	 */
-	static public function getLocalPath($path) {
-		return \OC\Files\Filesystem::getLocalPath($path);
-	}
-
-	/**
-	 * check if the requested path is valid
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @return bool
-	 */
-	static public function isValidPath($path) {
-		return \OC\Files\Filesystem::isValidPath($path);
-	}
-
-	/**
-	 * checks if a file is blacklisted for storage in the filesystem
-	 * Listens to write and rename hooks
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param array $data from hook
-	 */
-	static public function isBlacklisted($data) {
-		\OC\Files\Filesystem::isBlacklisted($data);
-	}
-
-	/**
-	 * following functions are equivalent to their php builtin equivalents for arguments/return values.
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function mkdir($path) {
-		return \OC\Files\Filesystem::mkdir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function rmdir($path) {
-		return \OC\Files\Filesystem::rmdir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function opendir($path) {
-		return \OC\Files\Filesystem::opendir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function readdir($path) {
-		return \OC\Files\Filesystem::readdir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function is_dir($path) {
-		return \OC\Files\Filesystem::is_dir($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function is_file($path) {
-		return \OC\Files\Filesystem::is_file($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function stat($path) {
-		return \OC\Files\Filesystem::stat($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function filetype($path) {
-		return \OC\Files\Filesystem::filetype($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function filesize($path) {
-		return \OC\Files\Filesystem::filesize($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function readfile($path) {
-		return \OC\Files\Filesystem::readfile($path);
-	}
-
-	/**
-	 * @deprecated Replaced by isReadable() as part of CRUDS
-	 */
-	static public function is_readable($path) {
-		return \OC\Files\Filesystem::isReadable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isCreatable($path) {
-		return \OC\Files\Filesystem::isCreatable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isReadable($path) {
-		return \OC\Files\Filesystem::isReadable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isUpdatable($path) {
-		return \OC\Files\Filesystem::isUpdatable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isDeletable($path) {
-		return \OC\Files\Filesystem::isDeletable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function isSharable($path) {
-		return \OC\Files\Filesystem::isSharable($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function file_exists($path) {
-		return \OC\Files\Filesystem::file_exists($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function filemtime($path) {
-		return \OC\Files\Filesystem::filemtime($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function touch($path, $mtime = null) {
-		return \OC\Files\Filesystem::touch($path, $mtime);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function file_get_contents($path) {
-		return \OC\Files\Filesystem::file_get_contents($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function file_put_contents($path, $data) {
-		return \OC\Files\Filesystem::file_put_contents($path, $data);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function unlink($path) {
-		return \OC\Files\Filesystem::unlink($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function rename($path1, $path2) {
-		return \OC\Files\Filesystem::rename($path1, $path2);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function copy($path1, $path2) {
-		return \OC\Files\Filesystem::copy($path1, $path2);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function fopen($path, $mode) {
-		return \OC\Files\Filesystem::fopen($path, $mode);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function toTmpFile($path) {
-		return \OC\Files\Filesystem::toTmpFile($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function fromTmpFile($tmpFile, $path) {
-		return \OC\Files\Filesystem::fromTmpFile($tmpFile, $path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function getMimeType($path) {
-		return \OC\Files\Filesystem::getMimeType($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function hash($type, $path, $raw = false) {
-		return \OC\Files\Filesystem::hash($type, $path, $raw);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function free_space($path = '/') {
-		return \OC\Files\Filesystem::free_space($path);
-	}
-
-	/**
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 */
-	static public function search($query) {
-		return \OC\Files\Filesystem::search($query);
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 */
-	static public function hasUpdated($path, $time) {
-		return \OC\Files\Filesystem::hasUpdated($path, $time);
-	}
-
-	/**
-	 * normalize a path
-	 *
-	 * @deprecated OC_Filesystem is replaced by \OC\Files\Filesystem
-	 * @param string $path
-	 * @param bool $stripTrailingSlash
-	 * @return string
-	 */
-	public static function normalizePath($path, $stripTrailingSlash = true) {
-		return \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash);
-	}
-}
diff --git a/lib/legacy/filesystemview.php b/lib/legacy/filesystemview.php
deleted file mode 100644
index d6bca62e06a..00000000000
--- a/lib/legacy/filesystemview.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file. */
-
-class OC_FilesystemView extends \OC\Files\View {}
diff --git a/lib/legacy/log.php b/lib/legacy/log.php
deleted file mode 100644
index 027cb89e97c..00000000000
--- a/lib/legacy/log.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * logging utilities
- *
- * Log is saved by default at data/owncloud.log using OC_Log_Owncloud.
- * Selecting other backend is done with a config option 'log_type'.
- */
-
-OC_Log::$object = new \OC\Log();
-class OC_Log {
-	public static $object;
-
-	const DEBUG=0;
-	const INFO=1;
-	const WARN=2;
-	const ERROR=3;
-	const FATAL=4;
-
-	static private $level_funcs = array(
-		self::DEBUG	=> 'debug',
-		self::INFO	=> 'info',
-		self::WARN	=> 'warning',
-		self::ERROR	=> 'error',
-		self::FATAL	=> 'emergency',
-		);
-
-	static public $enabled = true;
-	static protected $class = null;
-
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public static function write($app, $message, $level) {
-		if (self::$enabled) {
-			$context = array('app' => $app);
-			$func = array(self::$object, self::$level_funcs[$level]);
-			call_user_func($func, $message, $context);
-		}
-	}
-}
diff --git a/lib/legacy/preferences.php b/lib/legacy/preferences.php
deleted file mode 100644
index a663db7598b..00000000000
--- a/lib/legacy/preferences.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Frank Karlitschek
- * @author Jakob Sack
- * @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/>.
- *
- */
-
-/**
- * This class provides an easy way for storing user preferences.
- */
-OC_Preferences::$object = new \OC\Preferences(OC_DB::getConnection());
-class OC_Preferences{
-	public static $object;
-	/**
-	 * @brief Get all users using the preferences
-	 * @return array with user ids
-	 *
-	 * This function returns a list of all users that have at least one entry
-	 * in the preferences table.
-	 */
-	public static function getUsers() {
-		return self::$object->getUsers();
-	}
-
-	/**
-	 * @brief Get all apps of a user
-	 * @param string $user user
-	 * @return array with app ids
-	 *
-	 * This function returns a list of all apps of the user that have at least
-	 * one entry in the preferences table.
-	 */
-	public static function getApps( $user ) {
-		return self::$object->getApps( $user );
-	}
-
-	/**
-	 * @brief Get the available keys for an app
-	 * @param string $user user
-	 * @param string $app the app we are looking for
-	 * @return array with key names
-	 *
-	 * This function gets all keys of an app of an user. Please note that the
-	 * values are not returned.
-	 */
-	public static function getKeys( $user, $app ) {
-		return self::$object->getKeys( $user, $app );
-	}
-
-	/**
-	 * @brief Gets the preference
-	 * @param string $user user
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string $default = null, default value if the key does not exist
-	 * @return string the value or $default
-	 *
-	 * This function gets a value from the preferences table. If the key does
-	 * not exist the default value will be returned
-	 */
-	public static function getValue( $user, $app, $key, $default = null ) {
-		return self::$object->getValue( $user, $app, $key, $default );
-	}
-
-	/**
-	 * @brief sets a value in the preferences
-	 * @param string $user user
-	 * @param string $app app
-	 * @param string $key key
-	 * @param string $value value
-	 * @return bool
-	 *
-	 * Adds a value to the preferences. If the key did not exist before, it
-	 * will be added automagically.
-	 */
-	public static function setValue( $user, $app, $key, $value ) {
-		self::$object->setValue( $user, $app, $key, $value );
-		return true;
-	}
-
-	/**
-	 * @brief Deletes a key
-	 * @param string $user user
-	 * @param string $app app
-	 * @param string $key key
-	 *
-	 * Deletes a key.
-	 */
-	public static function deleteKey( $user, $app, $key ) {
-		self::$object->deleteKey( $user, $app, $key );
-		return true;
-	}
-
-	/**
-	 * @brief Remove app of user from preferences
-	 * @param string $user user
-	 * @param string $app app
-	 * @return bool
-	 *
-	 * Removes all keys in preferences belonging to the app and the user.
-	 */
-	public static function deleteApp( $user, $app ) {
-		self::$object->deleteApp( $user, $app );
-		return true;
-	}
-
-	/**
-	 * @brief Remove user from preferences
-	 * @param string $user user
-	 * @return bool
-	 *
-	 * Removes all keys in preferences belonging to the user.
-	 */
-	public static function deleteUser( $user ) {
-		self::$object->deleteUser( $user );
-		return true;
-	}
-
-	/**
-	 * @brief Remove app from all users
-	 * @param string $app app
-	 * @return bool
-	 *
-	 * Removes all keys in preferences belonging to the app.
-	 */
-	public static function deleteAppFromAllUsers( $app ) {
-		self::$object->deleteAppFromAllUsers( $app );
-		return true;
-	}
-}
diff --git a/lib/legacy/updater.php b/lib/legacy/updater.php
deleted file mode 100644
index eea7bb129cf..00000000000
--- a/lib/legacy/updater.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class OC_Updater {
-	public static function check() {
-		$updater = new \OC\Updater();
-		return $updater->check('http://apps.owncloud.com/updater.php');
-	}
-}