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

Conflicts:
	lib/private/vcategories.php

1 files changed, 0 insertions, 89 deletions

diff --git a/lib/avatar.php b/lib/avatar.php
deleted file mode 100644
index f20980c364b..00000000000
--- a/lib/avatar.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Christopher Schäpers <christopher@schaepers.it>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * This class gets and sets users avatars.
- */
-
-class OC_Avatar {
-
-	private $view;
-
-	/**
-	 * @brief constructor
-	 * @param $user string user to do avatar-management with
-	*/
-	public function __construct ($user) {
-		$this->view = new \OC\Files\View('/'.$user);
-	}
-
-	/**
-	 * @brief get the users avatar
-	 * @param $size integer size in px of the avatar, defaults to 64
-	 * @return boolean|\OC_Image containing the avatar or false if there's no image
-	*/
-	public function get ($size = 64) {
-		if ($this->view->file_exists('avatar.jpg')) {
-			$ext = 'jpg';
-		} elseif ($this->view->file_exists('avatar.png')) {
-			$ext = 'png';
-		} else {
-			return false;
-		}
-
-		$avatar = new OC_Image();
-		$avatar->loadFromData($this->view->file_get_contents('avatar.'.$ext));
-		$avatar->resize($size);
-		return $avatar;
-	}
-
-	/**
-	 * @brief sets the users avatar
-	 * @param $data mixed imagedata or path to set a new avatar
-	 * @throws Exception if the provided file is not a jpg or png image
-	 * @throws Exception if the provided image is not valid
-	 * @throws \OC\NotSquareException if the image is not square
-	 * @return void
-	*/
-	public function set ($data) {
-		if (\OC_App::isEnabled('files_encryption')) {
-			$l = \OC_L10N::get('lib');
-			throw new \Exception($l->t("Custom profile pictures don't work with encryption yet"));
-		}
-
-		$img = new OC_Image($data);
-		$type = substr($img->mimeType(), -3);
-		if ($type === 'peg') { $type = 'jpg'; }
-		if ($type !== 'jpg' && $type !== 'png') {
-			$l = \OC_L10N::get('lib');
-			throw new \Exception($l->t("Unknown filetype"));
-		}
-
-		if (!$img->valid()) {
-			$l = \OC_L10N::get('lib');
-			throw new \Exception($l->t("Invalid image"));
-		}
-
-		if (!($img->height() === $img->width())) {
-			throw new \OC\NotSquareException();
-		}
-
-		$this->view->unlink('avatar.jpg');
-		$this->view->unlink('avatar.png');
-		$this->view->file_put_contents('avatar.'.$type, $data);
-	}
-
-	/**
-	 * @brief remove the users avatar
-	 * @return void
-	*/
-	public function remove () {
-		$this->view->unlink('avatar.jpg');
-		$this->view->unlink('avatar.png');
-	}
-}