merge master into filesystem

10 files changed, 656 insertions, 44 deletions

diff --git a/lib/app.php b/lib/app.php
index 2e03db6c8d2..6b35cdffec9 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -94,7 +94,15 @@ class OC_App{
 	 */
 	public static function enable( $app ){
 		if(!OC_Installer::isInstalled($app)){
-			OC_Installer::installShippedApp($app);
+			// check if app is a shipped app or not. OCS apps have an integer as id, shipped apps use a string
+			if(!is_numeric($app)){
+				OC_Installer::installShippedApp($app);
+			}else{
+                                $download=OC_OCSClient::getApplicationDownload($app,1);
+				if(isset($download['downloadlink']) and $download['downloadlink']<>'') {
+					OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
+				}
+			}
 		}
 		OC_Appconfig::setValue( $app, 'enabled', 'yes' );
 	}
@@ -107,6 +115,7 @@ class OC_App{
 	 * This function set an app as disabled in appconfig.
 	 */
 	public static function disable( $app ){
+		// check if app is a shiped app or not. if not delete
 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
 	}
 
diff --git a/lib/base.php b/lib/base.php
index f1303c298e0..83b14f2b970 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -70,6 +70,31 @@ class OC{
 		}
 	}
 
+	/**
+	 * autodetects the formfactor of the used device
+	 * default -> the normal desktop browser interface
+	 * mobile -> interface for smartphones
+	 * tablet -> interface for tablets
+	 * standalone -> the default interface but without header, footer and sidebar. just the application. useful to ue just a specific app on the desktop in a standalone window.
+	 */
+	public static function detectFormfactor(){
+		// please add more useragent strings for other devices
+		if(isset($_SERVER['HTTP_USER_AGENT'])){
+			if(stripos($_SERVER['HTTP_USER_AGENT'],'ipad')>0) {
+				$mode='tablet';
+			}elseif(stripos($_SERVER['HTTP_USER_AGENT'],'iphone')>0){
+				$mode='mobile';
+			}elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'],'nokia')>0)){
+				$mode='mobile';
+			}else{
+				$mode='default';
+			}
+		}else{
+			$mode='default';
+		}
+		return($mode);
+	}
+
 	public static function init(){
 		// register autoloader
 		spl_autoload_register(array('OC','autoload'));
@@ -139,6 +164,16 @@ class OC{
 		ini_set('session.cookie_httponly','1;');
 		session_start();
 
+		// if the formfactor is not yet autodetected do the autodetection now. For possible forfactors check the detectFormfactor documentation
+		if(!isset($_SESSION['formfactor'])){
+			$_SESSION['formfactor']=OC::detectFormfactor();
+		}
+		// allow manual override via GET parameter
+		if(isset($_GET['formfactor'])){
+			$_SESSION['formfactor']=$_GET['formfactor'];
+		}
+
+
 		// Add the stuff we need always
 		OC_Util::addScript( "jquery-1.6.4.min" );
 		OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
@@ -220,5 +255,7 @@ OC::init();
 
 require_once('fakedirstream.php');
 
+
+
 // FROM search.php
 new OC_Search_Provider_File();
diff --git a/lib/db.php b/lib/db.php
index 16d477d1b86..05ed8398b7b 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -279,7 +279,7 @@ class OC_DB {
 			'output' => $file,
 			'end_of_line' => "\n"
 		);
-		self::$schema->dumpDatabase( $definition, $dump_options, MDB2_SCHEMA_DUMP_STRUCTURE );
+		self::$schema->dumpDatabase( $definition, $dump_options, $mode );
 
 		return true;
 	}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 87efdb15ad2..18bfd69d719 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -51,7 +51,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		return is_readable($this->datadir.$path);
 	}
 	public function is_writeable($path){
-		return is_writeable($this->datadir.$path);
+		return is_writable($this->datadir.$path);
 	}
 	public function file_exists($path){
 		return file_exists($this->datadir.$path);
diff --git a/lib/filesystem.php b/lib/filesystem.php
index c3830b34168..8765775dc29 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -107,35 +107,6 @@ class OC_Filesystem{
 	}
 	
 	/**
-	* check if the current users has the right premissions to read a file
-	* @param  string  path
-	* @return bool
-	*/
-	static private function canRead($path){
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
-			return false;
-		}
-		return true;//dummy untill premissions are correctly implemented, also the correcty value because for now users are locked in their seperate data dir and can read/write everything in there
-	}
-	/**
-	* check if the current users has the right premissions to write a file
-	* @param  string  path
-	* @return bool
-	*/
-	static private function canWrite($path){
-		if(substr($path,0,1)!=='/'){
-			$path='/'.$path;
-		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
-			return false;
-		}
-		return true;//dummy untill premissions are correctly implemented, also the correcty value because for now users are locked in their seperate data dir and can read/write everything in there
-	}
-	
-	/**
 	* mount an OC_Filestorage in our virtual filesystem
 	* @param OC_Filestorage storage
 	* @param string mountpoint
@@ -204,15 +175,28 @@ class OC_Filesystem{
 	*/
 	static public function getLocalFile($path){
 		$parent=substr($path,0,strrpos($path,'/'));
-		if(self::canRead($parent) and $storage=self::getStorage($path)){
+		if(self::isValidPath($parent) and $storage=self::getStorage($path)){
 			return $storage->getLocalFile(self::getInternalPath($path));
 		}
 	}
 	
 	/**
+	 * check if the requested path is valid
+	 * @param string path
+	 * @return bool
+	 */
+	static public function isValidPath($path){
+		if(substr($path,0,1)!=='/'){
+			$path='/'.$path;
+		}
+		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
+			return false;
+		}
+		return true;
+	}
+	/**
 	 * following functions are equivilent to their php buildin equivilents for arguments/return values.
 	 */
-	
 	static public function mkdir($path){
 		return self::basicOperation('mkdir',$path,array('create','write'));
 	}
@@ -274,7 +258,7 @@ class OC_Filesystem{
 		return self::basicOperation('unlink',$path,array('delete'));
 	}
 	static public function rename($path1,$path2){
-		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::canWrite($path1) and self::canWrite($path2)){
+		if(OC_FileProxy::runPreProxies('rename',$path1,$path2) and self::is_writeable($path1) and self::isValidPath($path2)){
 			$run=true;
 			OC_Hook::emit( 'OC_Filesystem', 'rename', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			if($run){
@@ -295,7 +279,7 @@ class OC_Filesystem{
 		}
 	}
 	static public function copy($path1,$path2){
-		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::canRead($path1) and self::canWrite($path2)){
+		if(OC_FileProxy::runPreProxies('copy',$path1,$path2) and self::is_readable($path1) and self::isValidPath($path2)){
 			$run=true;
 			OC_Hook::emit( 'OC_Filesystem', 'copy', array( 'oldpath' => $path1 ,'newpath'=>$path2, 'run' => &$run));
 			$exists=self::file_exists($path2);
@@ -350,13 +334,13 @@ class OC_Filesystem{
 		return self::basicOperation('fopen',$path,$hooks,$mode);
 	}
 	static public function toTmpFile($path){
-		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::canRead($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('toTmpFile',$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			OC_Hook::emit( 'OC_Filesystem', 'read', array( 'path' => $path));
 			return $storage->toTmpFile(self::getInternalPath($path));
 		}
 	}
 	static public function fromTmpFile($tmpFile,$path){
-		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::canWrite($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies('copy',$tmpFile,$path) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			$run=true;
 			$exists=self::file_exists($path);
 			if(!$exists){
@@ -413,7 +397,7 @@ class OC_Filesystem{
 	 * @return mixed
 	 */
 	private static function basicOperation($operation,$path,$hooks=array(),$extraParam=null){
-		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::canRead($path) and $storage=self::getStorage($path)){
+		if(OC_FileProxy::runPreProxies($operation,$path, $extraParam) and self::isValidPath($path) and $storage=self::getStorage($path)){
 			$interalPath=self::getInternalPath($path);
 			$run=true;
 			foreach($hooks as $hook){
diff --git a/lib/image.php b/lib/image.php
new file mode 100644
index 00000000000..45b6ad3918d
--- /dev/null
+++ b/lib/image.php
@@ -0,0 +1,554 @@
+<?php
+
+/**
+* ownCloud
+*
+* @author Thomas Tanghus
+* @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+*
+* 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/>.
+*
+*/
+
+/** From user comments at http://dk2.php.net/manual/en/function.exif-imagetype.php
+ * Don't know if it can come in handy?
+if ( ! function_exists( 'exif_imagetype' ) ) {
+    function exif_imagetype ( $filename ) {
+        if ( ( list($width, $height, $type, $attr) = getimagesize( $filename ) ) !== false ) {
+            return $type;
+        }
+    return false;
+    }
+}
+*/
+
+function ellipsis($str, $maxlen) {
+	if (strlen($str) > $maxlen) {
+		$characters = floor($maxlen / 2);
+		return substr($str, 0, $characters) . '...' . substr($str, -1 * $characters);
+	}
+	return $str;
+}
+
+/**
+ * Class for basic image manipulation
+ *
+ */
+class OC_Image {
+	static private $resource = false; // tmp resource.
+	static private $destroy = false; // if the resource is created withing the object.
+	static private $imagetype = IMAGETYPE_PNG; // Default to png if file type isn't evident.
+	static private $filepath = null;
+	/**
+	* @brief Constructor.
+	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
+	* @returns bool False on error
+	*/
+	function __construct($imageref = null) {
+		//OC_Log::write('core','OC_Image::__construct, start', OC_Log::DEBUG);
+		if(!extension_loaded('gd') || !function_exists('gd_info')) {
+		//if(!function_exists('imagecreatefromjpeg')) {
+			OC_Log::write('core','OC_Image::__construct, GD module not installed', OC_Log::ERROR);
+			return false;
+		}
+		if(!is_null($imageref)) {
+			self::load($imageref);
+		}
+	}
+
+	/**
+	* @brief Destructor.
+	*/
+	function __destruct() {
+		if(is_resource(self::$resource) && self::$destroy) {
+			imagedestroy(self::$resource); // Why does this issue a warning.
+		}
+	}
+
+	/**
+	* @brief Determine whether the object contains an image resource.
+	* @returns bool
+	*/
+	public function valid() { // apparently you can't name a method 'empty'...
+		$ret = is_resource(self::$resource);
+		return $ret;
+	}
+
+	/**
+	* @brief Returns the MIME type of the image or an empty string if no image is loaded.
+	* @returns int
+	*/
+	public function mimeType() {
+		return is_resource(self::$resource) ? image_type_to_mime_type(self::$imagetype) : '';
+	}
+
+	/**
+	* @brief Returns the width of the image or -1 if no image is loaded.
+	* @returns int
+	*/
+	public function width() {
+		return is_resource(self::$resource) ? imagesx(self::$resource) : -1;
+	}
+
+	/**
+	* @brief Returns the height of the image or -1 if no image is loaded.
+	* @returns int
+	*/
+	public function height() {
+		return is_resource(self::$resource) ? imagesy(self::$resource) : -1;
+	}
+
+	/**
+	* @brief Outputs the image.
+	* @returns bool
+	*/
+	public function show() {
+		return $this->_output();
+	}
+
+	/**
+	* @brief Saves the image.
+	* @returns bool
+	*/
+
+	public function save($filepath=null) {
+		if($filepath === null && self::$filepath === null) {
+			OC_Log::write('core','OC_Image::save. save() called with no path.', OC_Log::ERROR);
+			return false;
+		} elseif($filepath === null && $this->filepath !== null) {
+			$filepath = $this->filepath;
+		}
+		return $this->_output($filepath, true);
+	}
+
+	/**
+	* @brief Outputs/saves the image.
+	*/
+	private function _output($filepath=null, $really=false) {
+		if($really === false) {
+			header('Content-Type: '.self::mimeType());
+			$filepath = null; // Just being cautious ;-)
+		} else {
+			if(!is_writable(dirname($filepath))) {
+				OC_Log::write('core','OC_Image::_output. Directory \''.dirname($filepath).'\' is not writable.', OC_Log::ERROR);
+				return false;
+			} elseif(is_writable(dirname($filepath)) && file_exists($filepath) && !is_writable($filepath)) {
+				OC_Log::write('core','OC_Image::_output. File \''.$filepath.'\' is not writable.', OC_Log::ERROR);
+				return false;
+			}
+		}
+		$retval = false;
+		switch(self::$imagetype) {
+			case IMAGETYPE_GIF:
+				$retval = imagegif(self::$resource, $filepath);
+				break;
+			case IMAGETYPE_JPEG:
+				$retval = imagejpeg(self::$resource, $filepath);
+				break;
+			case IMAGETYPE_PNG:
+				$retval = imagepng(self::$resource, $filepath);
+				break;
+			case IMAGETYPE_XBM:
+				$retval = imagexbm(self::$resource, $filepath);
+				break;
+			case IMAGETYPE_WBMP:
+			case IMAGETYPE_BMP:
+				$retval = imagewbmp(self::$resource, $filepath);
+				break;
+			default:
+				$retval = imagepng(self::$resource, $filepath);
+		}
+		return $retval;
+	}
+
+	/**
+	* @brief Prints the image when called as $image().
+	*/
+	public function __invoke() {
+		return self::show();
+	}
+
+	/**
+	* @returns Returns the image resource in any.
+	*/
+	public function resource() {
+		return self::$resource;
+	}
+
+	/**
+	* @returns Returns a base64 encoded string suitable for embedding in a VCard.
+	*/
+	function __toString() {
+		ob_start();
+		$res = imagepng(self::$resource);
+		if (!$res) {
+			OC_Log::write('core','OC_Image::_string. Error writing image',OC_Log::ERROR);
+		}
+		return chunk_split(base64_encode(ob_get_clean()));
+	}
+
+	/**
+	* @brief Fixes orientation based on EXIF data.
+	* @returns bool.
+	*/
+	public function fixOrientation() {
+		if(!is_resource(self::$resource)) {
+			OC_Log::write('core','OC_Image::fixOrientation() No image loaded.', OC_Log::DEBUG);
+			return false;
+		}
+		if(is_null(self::$filepath) || !is_readable(self::$filepath)) {
+			OC_Log::write('core','OC_Image::fixOrientation() No readable file path set.', OC_Log::DEBUG);
+			return false;
+		}
+		$exif = exif_read_data(self::$filepath, 'IFD0');
+		if(!$exif) {
+			return false;
+		}
+		if(!isset($exif['Orientation'])) {
+			return true; // Nothing to fix
+		}
+		$o = $exif['Orientation'];
+		OC_Log::write('core','OC_Image::fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
+		$rotate = 0;
+		$flip = false;
+		switch($o) {
+			case 1:
+				$rotate = 0;
+				$flip = false;
+				break;
+			case 2: // Not tested
+				$rotate = 0;
+				$flip = true;
+				break;
+			case 3:
+				$rotate = 180;
+				$flip = false;
+				break;
+			case 4: // Not tested
+				$rotate = 180;
+				$flip = true;
+				break;
+			case 5: // Not tested
+				$rotate = 90;
+				$flip = true;
+				break;
+			case 6:
+				//$rotate = 90;
+				$rotate = 270;
+				$flip = false;
+				break;
+			case 7: // Not tested
+				$rotate = 270;
+				$flip = true;
+				break;
+			case 8:
+				$rotate = 270;
+				$flip = false;
+				break;
+		}
+		if($rotate) {
+			$res = imagerotate(self::$resource, $rotate, -1);
+			if($res) {
+				if(imagealphablending($res, true)) {
+					if(imagesavealpha($res, true)) {
+						self::$resource = $res;
+						return true;
+					} else {
+						OC_Log::write('core','OC_Image::fixOrientation() Error during alphasaving.', OC_Log::DEBUG);
+						return false;
+					}
+				} else {
+					OC_Log::write('core','OC_Image::fixOrientation() Error during alphablending.', OC_Log::DEBUG);
+					return false;
+				}
+			} else {
+				OC_Log::write('core','OC_Image::fixOrientation() Error during oriention fixing.', OC_Log::DEBUG);
+				return false;
+			}
+		}
+	}
+
+	/**
+	* @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	*					If a resource is passed it is the job of the caller to destroy it using imagedestroy($var)
+	* @returns An image resource or false on error
+	*/
+	public function load($imageref) {
+		if(self::loadFromFile($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromBase64($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromData($imageref) !== false) {
+			return self::$resource;
+		} elseif(self::loadFromResource($imageref) !== false) {
+			return self::$resource;
+		} else {
+			OC_Log::write('core','OC_Image::load, couldn\'t load anything. Giving up!', OC_Log::DEBUG);
+			return false;
+		}
+	}
+
+	/**
+	* @brief Loads an image from a local file.
+	* @param $imageref The path to a local file.
+	* @returns An image resource or false on error
+	*/
+	public function loadFromFile($imagepath=false) {
+		if(!is_file($imagepath) || !file_exists($imagepath) || !is_readable($imagepath)) {
+			// Debug output disabled because this method is tried before loadFromBase64?
+			OC_Log::write('core','OC_Image::loadFromFile, couldn\'t load: '.ellipsis($imagepath, 50), OC_Log::DEBUG);
+			return false;
+		}
+		$itype = exif_imagetype($imagepath);
+		switch($itype) {
+			case IMAGETYPE_GIF:
+				if (imagetypes() & IMG_GIF) {
+					self::$resource = imagecreatefromgif($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, GIF images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			case IMAGETYPE_JPEG:
+				if (imagetypes() & IMG_JPG) {
+					self::$resource = imagecreatefromjpeg($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, JPG images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			case IMAGETYPE_PNG:
+				if (imagetypes() & IMG_PNG) {
+					self::$resource = imagecreatefrompng($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, PNG images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			case IMAGETYPE_XBM:
+				if (imagetypes() & IMG_XPM) {
+					self::$resource = imagecreatefromxbm($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, XBM/XPM images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			case IMAGETYPE_WBMP:
+			case IMAGETYPE_BMP:
+				if (imagetypes() & IMG_WBMP) {
+					self::$resource = imagecreatefromwbmp($imagepath);
+				} else {
+					OC_Log::write('core','OC_Image::loadFromFile, (W)BMP images not supported: '.$imagepath, OC_Log::DEBUG);
+				}
+				break;
+			/*
+			case IMAGETYPE_TIFF_II: // (intel byte order)
+				break;
+			case IMAGETYPE_TIFF_MM: // (motorola byte order)
+				break;
+			case IMAGETYPE_JPC:
+				break;
+			case IMAGETYPE_JP2:
+				break;
+			case IMAGETYPE_JPX:
+				break;
+			case IMAGETYPE_JB2:
+				break;
+			case IMAGETYPE_SWC:
+				break;
+			case IMAGETYPE_IFF:
+				break;
+			case IMAGETYPE_ICO:
+				break;
+			case IMAGETYPE_SWF:
+				break;
+			case IMAGETYPE_PSD:
+				break;
+			*/
+			default:
+				self::$resource = imagecreatefromstring(file_get_contents($imagepath));
+				$itype = IMAGETYPE_PNG;
+				OC_Log::write('core','OC_Image::loadFromFile, Default', OC_Log::DEBUG);
+				break;
+		}
+		if($this->valid()) {
+			self::$imagetype = $itype;
+			self::$filepath = $imagepath;
+			self::$destroy = true;
+		}
+		return self::$resource;
+	}
+
+	/**
+	* @brief Loads an image from a string of data.
+	* @param $str A string of image data as read from a file.
+	* @returns An image resource or false on error
+	*/
+	public function loadFromData($str) {
+		if(is_resource($str)) {
+			return false;
+		}
+		self::$resource = imagecreatefromstring($str);
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::loadFromData, couldn\'t load', OC_Log::DEBUG);
+			return false;
+		}
+		self::$destroy = true;
+		return self::$resource;
+	}
+
+	/**
+	* @brief Loads an image from a base64 encoded string.
+	* @param $str A string base64 encoded string of image data.
+	* @returns An image resource or false on error
+	*/
+	public function loadFromBase64($str) {
+		if(!is_string($str)) {
+			return false;
+		}
+		$data = base64_decode($str);
+		if($data) { // try to load from string data
+			self::$resource = imagecreatefromstring($data);
+			if(!self::$resource) {
+				OC_Log::write('core','OC_Image::loadFromBase64, couldn\'t load', OC_Log::DEBUG);
+				return false;
+			}
+			self::$destroy = true;
+			return self::$resource;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	* @brief Checks if image resource is valid and assigns it to self::$resource.
+	* @param $res An image resource.
+	* @returns An image resource or false on error
+	*/
+	public function loadFromResource($res) {
+		if(!is_resource($res)) {
+			return false;
+		}
+		self::$resource = $res;
+	}
+
+	/**
+	* @brief Resizes the image preserving ratio.
+	* @param $maxsize The maximum size of either the width or height.
+	* @returns bool
+	*/
+	public function resize($maxsize) {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::resize, No image loaded', OC_Log::ERROR);
+			return false;
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		$ratio_orig = $width_orig/$height_orig;
+		
+		if ($ratio_orig > 1) {
+			$new_height = round($maxsize/$ratio_orig);
+			$new_width = $maxsize;
+		} else {
+			$new_width = round($maxsize*$ratio_orig);
+			$new_height = $maxsize;
+		}
+
+		$process = imagecreatetruecolor(round($new_width), round($new_height));
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::resize. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+
+		imagecopyresampled($process, self::$resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::resize. Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+
+	/**
+	* @brief Crops the image to the middle square. If the image is already square it just returns.
+	* @returns bool for success or failure
+	*/
+	public function centerCrop() {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::centerCrop, No image loaded', OC_Log::ERROR);
+			return false;
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		if($width_orig === $height_orig) {
+			return true;
+		}
+		$ratio_orig = $width_orig/$height_orig;
+		$width = $height = min($width_orig, $height_orig);
+
+		if ($ratio_orig > 1) {
+			$x = ($width_orig/2) - ($width/2);
+			$y = 0;
+		} else {
+			$y = ($height_orig/2) - ($height/2);
+			$x = 0;
+		}
+		$process = imagecreatetruecolor($width, $height);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::centerCrop. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $width, $height, $width, $height);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::centerCrop. Error resampling process image '.$width.'x'.$height,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+
+	/**
+	* @brief Crops the image from point $x$y with dimension $wx$h.
+	* @param $x Horizontal position
+	* @param $y Vertical position
+	* @param $w Width
+	* @param $h Hight
+	* @returns bool for success or failure
+	*/
+	public function crop($x, $y, $w, $h) {
+		if(!self::$resource) {
+			OC_Log::write('core','OC_Image::crop, No image loaded', OC_Log::ERROR);
+			return false;
+		}
+		$width_orig=imageSX(self::$resource);
+		$height_orig=imageSY(self::$resource);
+		//OC_Log::write('core','OC_Image::crop. Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
+		$process = imagecreatetruecolor($w, $h);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::crop. Error creating true color image',OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		imagecopyresampled($process, self::$resource, 0, 0, $x, $y, $w, $h, $w, $h);
+		if ($process == false) {
+			OC_Log::write('core','OC_Image::crop. Error resampling process image '.$w.'x'.$h,OC_Log::ERROR);
+			imagedestroy($process);
+			return false;
+		}
+		self::$resource = $process;
+		return true;
+	}
+}
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 072fd236fee..9d5932fb720 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -130,6 +130,33 @@ class OC_OCSClient{
 		return $app;
 	}
 
+        /**
+         * @brief Get the download url for an application from the OCS server
+         * @returns array with application data
+         *
+         * This function returns an download url for an applications from the OCS server
+         */
+        public static function getApplicationDownload($id,$item){
+                $url='http://api.apps.owncloud.com/v1/content/download/'.urlencode($id).'/'.urlencode($item);
+
+                $xml=@file_get_contents($url);
+                if($xml==FALSE){
+                        OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
+                        return NULL;
+                }
+                $data=simplexml_load_string($xml);
+
+                $tmp=$data->data->content;
+                $app=array();
+                if(isset($tmp->downloadlink)) { 
+	 		$app['downloadlink']=$tmp->downloadlink;
+		}else{
+	 		$app['downloadlink']='';
+		}
+                return $app;
+        }
+
+
 	/**
 	 * @brief Get all the knowledgebase entries from the OCS server
 	 * @returns array with q and a data
diff --git a/lib/setup.php b/lib/setup.php
index 9e0cc5f3cbd..d454c17599d 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -275,7 +275,7 @@ class OC_Setup {
 		$content.= "php_value post_max_size 512M\n";
 		$content.= "SetEnv htaccessWorking true\n";
 		$content.= "</IfModule>\n";
-		$content.= "<IfModule !mod_php5.c>\n";
+		$content.= "<IfModule mod_rewrite.c>";
 		$content.= "RewriteEngine on\n";
 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]\n";
 		$content.= "</IfModule>\n";
diff --git a/lib/user.php b/lib/user.php
index 241d9aa8b10..34f44f572e0 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -120,7 +120,7 @@ class OC_User {
 			return false;
 		}
 		// No empty username
-		if( !$uid ){
+		if(trim($uid) == ''){
 			return false;
 		}
 		// Check if user already exists
@@ -169,7 +169,8 @@ class OC_User {
 			foreach( OC_Group::getUserGroups( $uid ) as $i ){
 				OC_Group::removeFromGroup( $uid, $i );
 			}
-
+			// Delete the user's keys in preferences
+			OC_Preferences::deleteUser($uid);
 			// Emit and exit
 			OC_Hook::emit( "OC_User", "post_deleteUser", array( "uid" => $uid ));
 			return true;
diff --git a/lib/util.php b/lib/util.php
index 466b58078ca..a0c131201e4 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -175,8 +175,8 @@ class OC_Util {
 		$errors=array();
 
 		//check for database drivers
-		if(!is_callable('sqlite_open') and !is_callable('mysql_connect')){
-			$errors[]=array('error'=>'No database drivers (sqlite or mysql) installed.<br/>','hint'=>'');//TODO: sane hint
+		if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')){
+			$errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.<br/>','hint'=>'');//TODO: sane hint
 		}
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 		$CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" );