Merge branch 'master' into subadmin

36 files changed, 235 insertions, 170 deletions

diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 25927aff637..6bfccadad9a 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -1221,7 +1221,7 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
             return $affected_rows;
         }
 
-        $result =& $this->db->_wrapResult($result, $this->result_types,
+        $result = $this->db->_wrapResult($result, $this->result_types,
             $result_class, $result_wrap_class, $this->limit, $this->offset);
         $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'post', 'result' => $result));
         return $result;
diff --git a/lib/app.php b/lib/app.php
index 77570afd512..d6b2904f3c2 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -27,7 +27,6 @@
  * upgrading and removing apps.
  */
 class OC_App{
-	static private $init = false;
 	static private $activeapp = '';
 	static private $navigation = array();
 	static private $settingsForms = array();
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index ff405ce098b..b2d6674d639 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -11,7 +11,6 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @var ZipArchive zip
 	 */
 	private $zip=null;
-	private $success=false;
 	private $path;
 	
 	function __construct($source){
diff --git a/lib/connector/sabre/client.php b/lib/connector/sabre/client.php
index 87f9d59b3ae..7e8f21264f9 100644
--- a/lib/connector/sabre/client.php
+++ b/lib/connector/sabre/client.php
@@ -68,18 +68,13 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 				// Automatically follow redirects

 				CURLOPT_FOLLOWLOCATION => true,

 				CURLOPT_MAXREDIRS => 5,

-				CURLOPT_SSL_VERIFYPEER => true,

-				//CURLOPT_SSL_VERIFYPEER	=> false,

 		);

-		

+	

 		if($this->trustedCertificates) {

 			$curlSettings[CURLOPT_CAINFO] = $this->trustedCertificates;

 		}

-	

+		

 		switch ($method) {

-			case 'PUT':

-				$curlSettings[CURLOPT_PUT] = true;

-				break;

 			case 'HEAD' :

 	

 				// do not read body with HEAD requests (this is neccessary because cURL does not ignore the body with HEAD

@@ -110,8 +105,15 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 			$curlSettings[CURLOPT_PROXY] = $this->proxy;

 		}

 	

-		if ($this->userName) {

-			$curlSettings[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC | CURLAUTH_DIGEST;

+		if ($this->userName && $this->authType) {

+			$curlType = 0;

+			if ($this->authType & self::AUTH_BASIC) {

+				$curlType |= CURLAUTH_BASIC;

+			}

+			if ($this->authType & self::AUTH_DIGEST) {

+				$curlType |= CURLAUTH_DIGEST;

+			}

+			$curlSettings[CURLOPT_HTTPAUTH] = $curlType;

 			$curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;

 		}

 	

@@ -167,5 +169,5 @@ class OC_Connector_Sabre_Client extends Sabre_DAV_Client {
 	

 		return $response;

 	

-	}

+	}	

 }
\ No newline at end of file
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index f3f6541a8d4..0842fc4fc65 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -26,17 +26,33 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	/**
 	 * Creates a new file in the directory
 	 *
-	 * data is a readable stream resource
+	 * Data will either be supplied as a stream resource, or in certain cases
+	 * as a string. Keep in mind that you may have to support either.
+	 *
+	 * After succesful creation of the file, you may choose to return the ETag
+	 * of the new file here.
+	 *
+	 * The returned ETag must be surrounded by double-quotes (The quotes should
+	 * be part of the actual string).
+	 *
+	 * If you cannot accurately determine the ETag, you should not return it.
+	 * If you don't store the file exactly as-is (you're transforming it
+	 * somehow) you should also not return an ETag.
+	 *
+	 * This means that if a subsequent GET to this new file does not exactly
+	 * return the same contents of what was submitted here, you are strongly
+	 * recommended to omit the ETag.
 	 *
 	 * @param string $name Name of the file
-	 * @param resource $data Initial payload
-	 * @return void
+	 * @param resource|string $data Initial payload
+	 * @return null|string
 	 */
 	public function createFile($name, $data = null) {
 
 		$newPath = $this->path . '/' . $name;
 		OC_Filesystem::file_put_contents($newPath,$data);
 
+		return OC_Connector_Sabre_Node::getETagPropertyForFile($newPath);
 	}
 
 	/**
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 4700dbf8b89..80f0a0ab4d8 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -26,13 +26,28 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	/**
 	 * Updates the data
 	 *
+	 * The data argument is a readable stream resource.
+	 *
+	 * After a succesful put operation, you may choose to return an ETag. The
+	 * etag must always be surrounded by double-quotes. These quotes must
+	 * appear in the actual string you're returning.
+	 *
+	 * Clients may use the ETag from a PUT request to later on make sure that
+	 * when they update the file, the contents haven't changed in the mean
+	 * time.
+	 *
+	 * If you don't plan to store the file byte-by-byte, and you return a
+	 * different object on a subsequent GET you are strongly recommended to not
+	 * return an ETag, and just return null.
+	 *
 	 * @param resource $data
-	 * @return void
+	 * @return string|null
 	 */
 	public function put($data) {
 
 		OC_Filesystem::file_put_contents($this->path,$data);
 
+		return OC_Connector_Sabre_Node::getETagPropertyForFile($this->path);
 	}
 
 	/**
@@ -79,9 +94,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 	 * @return mixed
 	 */
 	public function getETag() {
-
-		return null;
-
+		$properties = $this->getProperties(array(self::GETETAG_PROPERTYNAME));
+		if (isset($properties[self::GETETAG_PROPERTYNAME])) {
+			return $properties[self::GETETAG_PROPERTYNAME];
+		}
+		return $this->getETagPropertyForFile($this->path);
 	}
 
 	/**
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index 94382e68a1a..e95dcf02d27 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -108,7 +108,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 
 		$locks = $this->getLocks($uri,false);
 		$exists = false;
-		foreach($locks as $k=>$lock) {
+		foreach($locks as $lock) {
 			if ($lock->token == $lockInfo->token) $exists = true;
 		}
 	
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index be315a0ffd9..3cb5412f09f 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -22,6 +22,7 @@
  */
 
 abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IProperties {
+	const GETETAG_PROPERTYNAME = '{DAV:}getetag';
 
 	/**
 	 * The path to the current node
@@ -178,7 +179,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @param array $properties
 	 * @return void
 	 */
-	function getProperties($properties) {
+	public function getProperties($properties) {
 		if (is_null($this->property_cache)) {
 			$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ? AND propertypath = ?' );
 			$result = $query->execute( array( OC_User::getUser(), $this->path ));
@@ -200,4 +201,29 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		}
 		return $props;
 	}
+
+	/**
+	 * Returns the ETag surrounded by double-quotes for this path.
+	 * @param string $path Path of the file
+	 * @return string|null Returns null if the ETag can not effectively be determined
+	 */
+	static public function getETagPropertyForFile($path) {
+		$tag = OC_Filesystem::hash('md5', $path);
+		if (empty($tag)) {
+			return null;
+		}
+		$etag = '"'.$tag.'"';
+		$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
+		$query->execute( array( OC_User::getUser(), $path, self::GETETAG_PROPERTYNAME, $etag ));
+		return $etag;
+	}
+
+	/**
+	 * Remove the ETag from the cache.
+	 * @param string $path Path of the file
+	 */
+	static public function removeETagPropertyForFile($path) {
+		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*properties WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
+		$query->execute( array( OC_User::getUser(), $path, self::GETETAG_PROPERTYNAME ));
+	}
 }
diff --git a/lib/db.php b/lib/db.php
index 2a06d72ea32..6f083d17cfb 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -33,8 +33,6 @@ class OC_DB {
 	static private $MDB2=false;
 	static private $PDO=false;
 	static private $schema=false;
-	static private $affected=0;
-	static private $result=false;
 	static private $inTransaction=false;
 	static private $prefix=null;
 	static private $type=null;
@@ -222,7 +220,7 @@ class OC_DB {
 				echo( '<b>can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')</center>');
 				OC_Log::write('core',self::$MDB2->getUserInfo(),OC_Log::FATAL);
 				OC_Log::write('core',self::$MDB2->getMessage(),OC_Log::FATAL);
-				die( $error );
+				die();
 			}
 			
 			// We always, really always want associative arrays
@@ -519,8 +517,9 @@ class OC_DB {
 		
 		// Delete our temporary file
 		unlink( $file2 );
-		foreach($definition['tables'] as $name=>$table){
-			self::dropTable($name);
+		$tables=array_keys($definition['tables']);
+		foreach($tables as $table){
+			self::dropTable($table);
 		}
 	}
 	
diff --git a/lib/eventsource.php b/lib/eventsource.php
index cf10660b94c..2a8c6b92902 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -36,7 +36,7 @@ class OC_EventSource{
 		header('Cache-Control: no-cache');
 		$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
 		if($this->fallback){
-			$fallBackId=$_GET['fallback_id'];
+			$this->fallBackId=$_GET['fallback_id'];
 			header("Content-Type: text/html");
 			echo str_repeat('<span></span>'.PHP_EOL,10); //dummy data to keep IE happy
 		}else{
diff --git a/lib/filecache.php b/lib/filecache.php
index d956f34dc48..4b1774925c3 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -126,7 +126,7 @@ class OC_FileCache{
 		$query=OC_DB::prepare($sql);
 		$result=$query->execute($arguments);
 		if(OC_DB::isError($result)){
-			OC_Log::write('files','error while updating file('.$path.') in cache',OC_Log::ERROR);
+			OC_Log::write('files','error while updating file('.$id.') in cache',OC_Log::ERROR);
 		}
 	}
 
@@ -303,7 +303,7 @@ class OC_FileCache{
 	 */
 	public static function increaseSize($path,$sizeDiff, $root=false){
 		if($sizeDiff==0) return;
-		$id=self::getId($path,'');
+		$id=self::getId($path,$root);
 		while($id!=-1){//walk up the filetree increasing the size of all parent folders
 			$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET size=size+? WHERE id=?');
 			$query->execute(array($sizeDiff,$id));
diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index dd77f491ca0..93b632acb4e 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -207,7 +207,6 @@ class OC_FileCache_Update{
 
 		$cached=OC_FileCache_Cached::get($oldPath,$root);
 		$oldSize=$cached['size'];
-		$size=$view->filesize($newPath);
 		OC_FileCache::increaseSize(dirname($oldPath),-$oldSize,$root);
 		OC_FileCache::increaseSize(dirname($newPath),$oldSize,$root);
 		OC_FileCache::move($oldPath,$newPath);
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 71ef4aed00b..e786127d525 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -24,7 +24,7 @@
  * Provde a common interface to all different storage options
  */
 abstract class OC_Filestorage{
-	public function __construct($parameters){}
+	abstract public function __construct($parameters);
 	abstract public function mkdir($path);
 	abstract public function rmdir($path);
 	abstract public function opendir($path);
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index ba78fca80e5..fd389d3e2d7 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -220,7 +220,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		}
 		$tmpFile=OC_Helper::tmpFile($extension);
 		$target=fopen($tmpFile,'w');
-		$count=OC_Helper::streamCopy($source,$target);
+		OC_Helper::streamCopy($source,$target);
 		return $tmpFile;
 	}
 // 	abstract public function touch($path, $mtime=null);
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index b2eba051515..d60f32b15be 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -4,7 +4,6 @@
  */
 class OC_Filestorage_Local extends OC_Filestorage_Common{
 	protected $datadir;
-	private static $mimetypes=null;
 	public function __construct($arguments){
 		$this->datadir=$arguments['datadir'];
 		if(substr($this->datadir,-1)!=='/'){
@@ -41,7 +40,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 	}
 	public function filesize($path){
 		if($this->is_dir($path)){
-			return $this->getFolderSize($path);
+			return 0;
 		}else{
 			return filesize($this->datadir.$path);
 		}
@@ -157,7 +156,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return $return;
 	}
 
-	public function hash($type,$path,$raw){
+	public function hash($path,$type,$raw=false){
 		return hash_file($type,$this->datadir.$path,$raw);
 	}
 
@@ -187,15 +186,6 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 	}
 
 	/**
-	 * @brief get the size of folder and it's content
-	 * @param string $path file path
-	 * @return int size of folder and it's content
-	 */
-	public function getFolderSize($path){
-		return 0;//depricated, use OC_FileCach instead
-	}
-
-	/**
 	 * check if a file or folder has been updated since $time
 	 * @param int $time
 	 * @return bool
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 65318fa3ab6..ec30ffb8f4c 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -46,9 +46,10 @@
 class OC_Filesystem{
 	static private $storages=array();
 	static private $mounts=array();
-	static private $storageTypes=array();
 	public static $loaded=false;
-	private $fakeRoot='';
+	/**
+	 * @var OC_Filestorage $defaultInstance
+	 */
 	static private $defaultInstance;
 
 
@@ -155,7 +156,8 @@ class OC_Filesystem{
 		}
 		$path=str_replace('//', '/',$path);
 		$foundMountPoint='';
-		foreach(OC_Filesystem::$mounts as $mountpoint=>$storage){
+		$mountPoints=array_keys(OC_Filesystem::$mounts);
+		foreach($mountPoints as $mountpoint){
 			if($mountpoint==$path){
 				return $mountpoint;
 			}
@@ -260,10 +262,7 @@ class OC_Filesystem{
 	 * tear down the filesystem, removing all storage providers
 	 */
 	static public function tearDown(){
-		foreach(self::$storages as $mountpoint=>$storage){
-			unset(self::$storages[$mountpoint]);
-		}
-		$fakeRoot='';
+		self::$storages=array();
 	}
 	
 	/**
@@ -287,7 +286,7 @@ class OC_Filesystem{
 	* @return bool
 	*/
 	static public function chroot($fakeRoot){
-		return self::$defaultInstance->chroot($path);
+		return self::$defaultInstance->chroot($fakeRoot);
 	}
 
 	/**
@@ -320,22 +319,8 @@ class OC_Filesystem{
 		if(substr($mountpoint,-1)!=='/'){
 			$mountpoint=$mountpoint.'/';
 		}
-		if (self::getView() != null && $mountpoint != '/' && !self::is_dir(basename($mountpoint))) {
-			self::mkdir(basename($mountpoint));
-		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
-
-	/**
-	 * create all storage backends mounted in the filesystem
-	 */
-	static private function mountAll(){
-		foreach(self::$mounts as $mountPoint=>$mount){
-			if(!isset(self::$storages[$mountPoint])){
-				self::$storages[$mountPoint]=self::createStorage($mount['type'],$mount['arguments']);
-			}
-		}
-	}
 	
 	/**
 	* return the path to a local version of the file
@@ -485,9 +470,17 @@ class OC_Filesystem{
 	 * @return bool
 	 */
 	static public function hasUpdated($path,$time){
-		return self::$defaultInstance->hasUpdated($path);
+		return self::$defaultInstance->hasUpdated($path,$time);
+	}
+
+	static public function removeETagHook($params) {
+		$path=$params['path'];
+		OC_Connector_Sabre_Node::removeETagPropertyForFile($path);
 	}
 }
+OC_Hook::connect('OC_Filesystem','post_write', 'OC_Filesystem','removeETagHook');
+OC_Hook::connect('OC_Filesystem','post_delete','OC_Filesystem','removeETagHook');
+OC_Hook::connect('OC_Filesystem','post_rename','OC_Filesystem','removeETagHook');
 
 OC_Util::setupFS();
 require_once('filecache.php');
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 448663bb081..a23d7bbe7fd 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -393,7 +393,7 @@ class OC_FilesystemView {
 		return $this->basicOperation('getMimeType',$path);
 	}
 	public function hash($type,$path){
-		return $this->basicOperation('hash',$path,array('read'));
+		return $this->basicOperation('hash',$path,array('read'),$type);
 	}
 
 	public function free_space($path='/'){
diff --git a/lib/group/database.php b/lib/group/database.php
index fb173665eb8..2770ec185c4 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -41,7 +41,6 @@
  * Class for group management in a SQL Database (e.g. MySQL, SQLite)
  */
 class OC_Group_Database extends OC_Group_Backend {
-	private $userGroupCache=array();
 
 	/**
 	 * @brief Try to create a new group
@@ -116,7 +115,7 @@ class OC_Group_Database extends OC_Group_Backend {
 		// No duplicate entries!
 		if( !$this->inGroup( $uid, $gid )){
 			$query = OC_DB::prepare( "INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )" );
-			$result = $query->execute( array( $uid, $gid ));
+			$query->execute( array( $uid, $gid ));
 			return true;
 		}else{
 			return false;
@@ -133,7 +132,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 */
 	public function removeFromGroup( $uid, $gid ){
 		$query = OC_DB::prepare( "DELETE FROM *PREFIX*group_user WHERE uid = ? AND gid = ?" );
-		$result = $query->execute( array( $uid, $gid ));
+		$query->execute( array( $uid, $gid ));
 
 		return true;
 	}
diff --git a/lib/group/dummy.php b/lib/group/dummy.php
index 0825b10708a..1243891023f 100644
--- a/lib/group/dummy.php
+++ b/lib/group/dummy.php
@@ -126,7 +126,8 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 */
 	public function getUserGroups($uid){
 		$groups=array();
-		foreach($this->groups as $group=>$user){
+		$allGroups=array_keys($this->groups);
+		foreach($allGroups as $group){
 			if($this->inGroup($uid,$group)){
 				$groups[]=$group;
 			}
diff --git a/lib/group/example.php b/lib/group/example.php
index c18562db7a4..9c9ece5ac77 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -34,7 +34,7 @@ abstract class OC_Group_Example {
 	 * Trys to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
-	public static function createGroup($gid){}
+	abstract public static function createGroup($gid);
 
 	/**
 	 * @brief delete a group
@@ -43,7 +43,7 @@ abstract class OC_Group_Example {
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public static function deleteGroup($gid){}
+	abstract public static function deleteGroup($gid);
 
 	/**
 	 * @brief is user in group?
@@ -53,7 +53,7 @@ abstract class OC_Group_Example {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public static function inGroup($uid, $gid){}
+	abstract public static function inGroup($uid, $gid);
 
 	/**
 	 * @brief Add a user to a group
@@ -63,7 +63,7 @@ abstract class OC_Group_Example {
 	 *
 	 * Adds a user to a group.
 	 */
-	public static function addToGroup($uid, $gid){}
+	abstract public static function addToGroup($uid, $gid);
 
 	/**
 	 * @brief Removes a user from a group
@@ -73,7 +73,7 @@ abstract class OC_Group_Example {
 	 *
 	 * removes the user from a group.
 	 */
-	public static function removeFromGroup($uid,$gid){}
+	abstract public static function removeFromGroup($uid,$gid);
 
 	/**
 	 * @brief Get all groups a user belongs to
@@ -83,7 +83,7 @@ abstract class OC_Group_Example {
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public static function getUserGroups($uid){}
+	abstract public static function getUserGroups($uid);
 
 	/**
 	 * @brief get a list of all groups
@@ -91,19 +91,19 @@ abstract class OC_Group_Example {
 	 *
 	 * Returns a list with all groups
 	 */
-	public static function getGroups(){}
+	abstract public static function getGroups();
 
 	/**
 	 * check if a group exists
 	 * @param string $gid
 	 * @return bool
 	 */
-	public function groupExists($gid){}
+	abstract public function groupExists($gid);
 
 	/**
 	 * @brief get a list of all users in a group
 	 * @returns array with user ids
 	 */
-	public static function usersInGroup($gid){}
+	abstract public static function usersInGroup($gid);
 
 }
diff --git a/lib/helper.php b/lib/helper.php
index 0d18098a4e7..c4f7e8b2e19 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -676,10 +676,10 @@ class OC_Helper {
 	*/
 	public static function mb_str_replace($search, $replace, $subject, $encoding = 'UTF-8', &$count = null) {
 		$offset = -1;
-		$length = mb_strlen($search, 'UTF-8');
-		while(($i = mb_strrpos($subject, $search, $offset, 'UTF-8'))) {
+		$length = mb_strlen($search, $encoding);
+		while(($i = mb_strrpos($subject, $search, $offset, $encoding))) {
 			$subject = OC_Helper::mb_substr_replace($subject, $replace, $i, $length);
-			$offset = $i - mb_strlen($subject, 'UTF-8') - 1;
+			$offset = $i - mb_strlen($subject, $encoding) - 1;
 			$count++;
 		}
 		return $subject;
diff --git a/lib/image.php b/lib/image.php
index 01e843d8316..c438b3d67f6 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -24,8 +24,8 @@
 //From user comments at http://dk2.php.net/manual/en/function.exif-imagetype.php
 if ( ! function_exists( 'exif_imagetype' ) ) {
     function exif_imagetype ( $filename ) {
-        if ( ( list($width, $height, $type, $attr) = getimagesize( $filename ) ) !== false ) {
-            return $type;
+        if ( ( $info = getimagesize( $filename ) ) !== false ) {
+            return $info[2];
         }
     return false;
     }
@@ -364,7 +364,7 @@ class OC_Image {
 	public function load($imageref) {
 		if(is_resource($imageref)) {
 			if(get_resource_type($imageref) == 'gd') {
-				$this->resource = $res;
+				$this->resource = $imageref;
 				return $this->resource;
 			} elseif(in_array(get_resource_type($imageref), array('file','stream'))) {
 				return $this->loadFromFileHandle($imageref);
@@ -650,9 +650,6 @@ class OC_Image {
 			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
 			return false;
 		}
-		$width_orig=imageSX($this->resource);
-		$height_orig=imageSY($this->resource);
-		//OC_Log::write('core',__METHOD__.'(): Original size: '.$width_orig.'x'.$height_orig, OC_Log::DEBUG);
 		$process = imagecreatetruecolor($w, $h);
 		if ($process == false) {
 			OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR);
diff --git a/lib/migrate.php b/lib/migrate.php
index f788a637d3c..1b6367ed6ec 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -91,7 +91,7 @@ class OC_Migrate{
 	 	if( self::$exporttype == 'user' ){
 	 		// Check user exists
 	 		if( !is_null($uid) ){
-                                $db = new OC_User_Database;
+				$db = new OC_User_Database;
 		 		if( !$db->userExists( $uid ) ){
 					OC_Log::write('migration', 'User: '.$uid.' is not in the database and so cannot be exported.', OC_Log::ERROR);
 					return json_encode( array( 'success' => false ) );
diff --git a/lib/ocs.php b/lib/ocs.php
index 1be41202d78..77dd437d6c6 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -88,7 +88,6 @@ class OC_OCS {
        $method='get';
     }elseif($_SERVER['REQUEST_METHOD'] == 'PUT') {
        $method='put';
-       parse_str(file_get_contents("php://input"),$put_vars);
     }elseif($_SERVER['REQUEST_METHOD'] == 'POST') {
        $method='post';
     }else{
@@ -356,9 +355,6 @@ class OC_OCS {
    * @return string xml/json
    */
   private static function apiConfig($format) {
-    $user=OC_OCS::checkpassword(false);
-    $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).'';
-
     $xml['version']='1.5';
     $xml['website']='ownCloud';
     $xml['host']=OCP\Util::getServerHost();
@@ -416,7 +412,7 @@ class OC_OCS {
    */
   private static function activityPut($format,$message) {
     // not implemented in ownCloud
-    $user=OC_OCS::checkpassword();
+    OC_OCS::checkpassword();
     echo(OC_OCS::generatexml($format,'ok',100,''));
   }
 
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 951d761d7e6..ae35470cff6 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -71,7 +71,7 @@ class OC_OCSClient{
 		$tmp=$data->data;
 		$cats=array();
 
-		foreach($tmp->category as $key=>$value) {
+		foreach($tmp->category as $value) {
 
 			$id= (int) $value->id;
 			$name= (string) $value->name;
diff --git a/lib/preferences.php b/lib/preferences.php
index f72378ce94f..c91423e69bc 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -165,7 +165,7 @@ class OC_Preferences{
 	public static function deleteKey( $user, $app, $key ){
 		// No need for more comments
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' );
-		$result = $query->execute( array( $user, $app, $key ));
+		$query->execute( array( $user, $app, $key ));
 
 		return true;
 	}
@@ -181,7 +181,7 @@ class OC_Preferences{
 	public static function deleteApp( $user, $app ){
 		// No need for more comments
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ? AND appid = ?' );
-		$result = $query->execute( array( $user, $app ));
+		$query->execute( array( $user, $app ));
 
 		return true;
 	}
@@ -196,7 +196,7 @@ class OC_Preferences{
 	public static function deleteUser( $user ){
 		// No need for more comments
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ?' );
-		$result = $query->execute( array( $user ));
+		$query->execute( array( $user ));
 
 		return true;
 	}
@@ -211,7 +211,7 @@ class OC_Preferences{
 	public static function deleteAppFromAllUsers( $app ){
 		// No need for more comments
 		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE appid = ?' );
-		$result = $query->execute( array( $app ));
+		$query->execute( array( $app ));
 
 		return true;
 	}
diff --git a/lib/public/app.php b/lib/public/app.php
index 38c51af9cdb..28411933beb 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -34,28 +34,6 @@ namespace OCP;
  * This class provides functions to manage apps in ownCloud
  */
 class App {
-
-        /**
-         * @brief Makes owncloud aware of this app
-         * @brief This call is deprecated and not necessary to use.
-         * @param $data array with all information
-         * @returns true/false
-         *
-         * This function registers the application. $data is an associative array.
-         * The following keys are required:
-         *   - id: id of the application, has to be unique ('addressbook')
-         *   - name: Human readable name ('Addressbook')
-         *   - version: array with Version (major, minor, bugfix) ( array(1, 0, 2))
-         *
-         * The following keys are optional:
-         *   - order: integer, that influences the position of your application in
-         *     a list of applications. Lower values come first.
-         *
-         */
-        public static function register( $data ){
-        }
-
-
         /**
          * @brief adds an entry to the navigation
          * @param $data array containing the data
diff --git a/lib/public/json.php b/lib/public/json.php
index 1bc1e3ab4d5..99df79173eb 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -35,70 +35,137 @@ namespace OCP;
  */
 class JSON {
 
-
 	/**
 	* @brief Encode and print $data in JSON format
 	* @param array $data The data to use
 	* @param string $setContentType the optional content type
+	* @return string json formatted string.
 	*/
 	public static function encodedPrint( $data, $setContentType=true ){
 		return(\OC_JSON::encodedPrint( $data, $setContentType ));
 	}
 
-
 	/**
-	* @brief Check if the user is logged in, send json error msg if not
+	* Check if the user is logged in, send json error msg if not.
+	* 
+	* This method checks if a user is logged in. If not, a json error
+	* response will be return and the method will exit from execution
+	* of the script.
+	* The returned json will be in the format:
+	* 
+	*     {"status":"error","data":{"message":"Authentication error."}}
+	* 
+	* Add this call to the start of all ajax method files that requires
+	* an authenticated user.
+	* 
+	* @return string json formatted error string if not authenticated.
 	*/
 	public static function checkLoggedIn(){
 		return(\OC_JSON::checkLoggedIn());
 	}
 
 	/**
-	 * @brief Check an ajax get/post call if the request token is valid.
-	 * @return json Error msg if not valid.
-	 */
+	* Check an ajax get/post call if the request token is valid.
+	* 
+	* This method checks for a valid variable 'requesttoken' in $_GET,
+	* $_POST and $_SERVER. If a valid token is not found, a json error
+	* response will be return and the method will exit from execution
+	* of the script.
+	* The returned json will be in the format:
+	* 
+	*     {"status":"error","data":{"message":"Token expired. Please reload page."}}
+	* 
+	* Add this call to the start of all ajax method files that creates, 
+	* updates or deletes anything.
+	* In cases where you e.g. use an ajax call to load a dialog containing
+	* a submittable form, you will need to add the requesttoken first as a
+	* parameter to the ajax call, then assign it to the template and finally
+	* add a hidden input field also named 'requesttoken' containing the value.
+	* 
+	* @return string json formatted error string if not valid.
+	*/
 	public static function callCheck(){
 		return(\OC_JSON::callCheck());
 	}
 
 	/**
-	* @brief Send json success msg
+	* Send json success msg
+	* 
+	* Return a json success message with optional extra data.
+	* @see OCP\JSON::error() 		for the format to use.
+	* 
 	* @param array $data The data to use
+	* @return string json formatted string.
 	*/
 	public static function success( $data = array() ){
 		return(\OC_JSON::success( $data ));
 	}
 
-
 	/**
-	* @brief Send json error msg
+	* Send json error msg
+	* 
+	* Return a json error message with optional extra data for 
+	* error message or app specific data.
+	* 
+	* Example use:
+	* 
+	*     $id = [some value]
+	*     OCP\JSON::error(array('data':array('message':'An error happened', 'id': $id)));
+	* 
+	* Will return the json formatted string:
+	* 
+	*     {"status":"error","data":{"message":"An error happened", "id":[some value]}}
+	* 
 	* @param array $data The data to use
+	* @return string json formatted error string.
 	*/
 	public static function error( $data = array() ){
 		return(\OC_JSON::error( $data ));
 	}
 
-
 	/**
-	 * @brief set Content-Type header to jsonrequest
-	 * @param array $type The contwnt type header
-	 */
+	* @brief set Content-Type header to jsonrequest
+	* @param array $type The contwnt type header
+	* @return string json formatted string.
+	*/
 	public static function setContentTypeHeader( $type='application/json' ){
 		return(\OC_JSON::setContentTypeHeader( $type ));
 	}
 
-
 	/**
-	 * @brief Check if the App is enabled and send JSON error message instead
-	 * @param string $app The app to check
-	 */
+	* Check if the App is enabled and send JSON error message instead
+	* 
+	* This method checks if a specific app is enabled. If not, a json error
+	* response will be return and the method will exit from execution
+	* of the script.
+	* The returned json will be in the format:
+	* 
+	*     {"status":"error","data":{"message":"Application is not enabled."}}
+	* 
+	* Add this call to the start of all ajax method files that requires
+	* a specific app to be enabled.
+	* 
+	* @param string $app The app to check
+	* @return string json formatted string if not enabled.
+	*/
 	public static function checkAppEnabled( $app ){
 		return(\OC_JSON::checkAppEnabled( $app ));
 	}
 
-
 	/**
-	* @brief Check if the user is a admin, send json error msg if not
+	* Check if the user is a admin, send json error msg if not
+	* 
+	* This method checks if the current user has admin rights. If not, a json error
+	* response will be return and the method will exit from execution
+	* of the script.
+	* The returned json will be in the format:
+	* 
+	*     {"status":"error","data":{"message":"Authentication error."}}
+	* 
+	* Add this call to the start of all ajax method files that requires
+	* administrative rights.
+	* 
+	* @return string json formatted string if not admin user.
 	*/
 	public static function checkAdminUser(){
 		return(\OC_JSON::checkAdminUser());
diff --git a/lib/search/provider.php b/lib/search/provider.php
index 838ab696d04..b3ee79b4770 100644
--- a/lib/search/provider.php
+++ b/lib/search/provider.php
@@ -2,13 +2,17 @@
 /**
  * provides search functionalty
  */
-class OC_Search_Provider {
-	public function __construct($options){}
+abstract class OC_Search_Provider {
+	private $options;
+	
+	public function __construct($options){
+		$this->options=$options;
+	}
 	
 	/**
 	 * search for $query
 	 * @param string $query
 	 * @return array An array of OC_Search_Result's
 	 */
-	public function search($query){}
+	abstract public function search($query);
 }
diff --git a/lib/setup.php b/lib/setup.php
index 027c84db092..4d71bed86e2 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -102,7 +102,6 @@ class OC_Setup {
 				}
 				else {
 					$oldUser=OC_Config::getValue('dbuser', false);
-					$oldPassword=OC_Config::getValue('dbpassword', false);
 					
 					$query="SELECT user FROM mysql.user WHERE user='$dbuser'"; //this should be enough to check for admin rights in mysql
 					if(mysql_query($query, $connection)) {
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
index f1e0fa0e1d9..f502c6170bd 100644
--- a/lib/streamwrappers.php
+++ b/lib/streamwrappers.php
@@ -1,6 +1,4 @@
 <?php
-global $FAKEDIRS;
-$FAKEDIRS=array();
 
 class OC_FakeDirStream{
 	public static $dirs=array();
@@ -8,8 +6,6 @@ class OC_FakeDirStream{
 	private $index;
 
 	public function dir_opendir($path,$options){
-		global $FAKEDIRS;
-		$url=parse_url($path);
 		$this->name=substr($path,strlen('fakedir://'));
 		$this->index=0;
 		if(!isset(self::$dirs[$this->name])){
@@ -161,7 +157,6 @@ class OC_StaticStreamWrapper {
 	public function stream_write($data) {
 		if (!$this->writable) return 0;
 		$size = strlen($data);
-		$len = strlen(self::$data[$this->path]);
 		if ($this->stream_eof()) {
 			self::$data[$this->path] .= $data;
 		} else {
diff --git a/lib/template.php b/lib/template.php
index 3b48c27b9b4..5b6999af533 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -82,7 +82,6 @@ function relative_modified_date($timestamp) {
 	$diffhours = round($diffminutes/60);
 	$diffdays = round($diffhours/24);
 	$diffmonths = round($diffdays/31);
-	$diffyears = round($diffdays/365);
 
 	if($timediff < 60) { return $l->t('seconds ago'); }
 	else if($timediff < 120) { return $l->t('1 minute ago'); }
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index d33a87e9e4c..588a7845997 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -123,7 +123,7 @@ class OC_TemplateLayout extends OC_Template {
 					elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) { $append =true; break; }
 				}
 				if(! $append) {
-					echo('css file not found: style:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
+					echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
 					die();
 				}
 			}
diff --git a/lib/user/database.php b/lib/user/database.php
index a48b8357d64..cc27b3ddbfd 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -39,7 +39,6 @@ require_once 'phpass/PasswordHash.php';
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
 class OC_User_Database extends OC_User_Backend {
-	static private $userGroupCache=array();
 	/**
 	 * @var PasswordHash
 	 */
@@ -87,7 +86,7 @@ class OC_User_Database extends OC_User_Backend {
 	public function deleteUser( $uid ){
 		// Delete user-group-relation
 		$query = OC_DB::prepare( "DELETE FROM `*PREFIX*users` WHERE uid = ?" );
-		$result = $query->execute( array( $uid ));
+		$query->execute( array( $uid ));
 		return true;
 	}
 
@@ -104,11 +103,10 @@ class OC_User_Database extends OC_User_Backend {
 			$hasher=$this->getHasher();
 			$hash = $hasher->HashPassword($password.OC_Config::getValue('passwordsalt', ''));
 			$query = OC_DB::prepare( "UPDATE *PREFIX*users SET password = ? WHERE uid = ?" );
-			$result = $query->execute( array( $hash, $uid ));
+			$query->execute( array( $hash, $uid ));
 
 			return true;
-		}
-		else{
+		}else{
 			return false;
 		}
 	}
diff --git a/lib/user/example.php b/lib/user/example.php
index 7f3fd1b8578..77246d8136c 100644
--- a/lib/user/example.php
+++ b/lib/user/example.php
@@ -35,9 +35,7 @@ abstract class OC_User_Example extends OC_User_Backend {
 		* Creates a new user. Basic checking of username is done in OC_User
 		* itself, not in its subclasses.
 		*/
-	public function createUser($uid, $password){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
+	abstract public function createUser($uid, $password);
 
 	/**
 		* @brief Set password
@@ -47,9 +45,7 @@ abstract class OC_User_Example extends OC_User_Backend {
 		*
 		* Change the password of a user
 		*/
-	public function setPassword($uid, $password){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
+	abstract public function setPassword($uid, $password);
 
 	/**
 		* @brief Check if the password is correct
@@ -60,7 +56,5 @@ abstract class OC_User_Example extends OC_User_Backend {
 		* Check if the password is correct without logging in the user
 		* returns the user id or false
 		*/
-	public function checkPassword($uid, $password){
-		return OC_USER_BACKEND_NOT_IMPLEMENTED;
-	}
+	abstract public function checkPassword($uid, $password);
 }
diff --git a/lib/util.php b/lib/util.php
index 2eb102dfa69..f1a87742168 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -189,8 +189,6 @@ class OC_Util {
 		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" );
 
 		//common hint for all file permissons error messages
 		$permissionsHint="Permissions can usually be fixed by giving the webserver write access to the ownCloud directory";