nextcloud / server

lib/private/Diagnostics/NullEventLogger.php

Indentation +23 added lines, -23 removed lines

@@ -29,30 +29,30 @@
  * Dummy event logger that doesn't actually log anything
  */
 class NullEventLogger implements IEventLogger {
-	/**
-	 * Mark the start of an event
-	 *
-	 * @param $id
-	 * @param $description
-	 */
-	public function start($id, $description) {
-	}
+    /**
+     * Mark the start of an event
+     *
+     * @param $id
+     * @param $description
+     */
+    public function start($id, $description) {
+    }
 
-	/**
-	 * Mark the end of an event
-	 *
-	 * @param $id
-	 */
-	public function end($id) {
-	}
+    /**
+     * Mark the end of an event
+     *
+     * @param $id
+     */
+    public function end($id) {
+    }
 
-	public function log($id, $description, $start, $end) {
-	}
+    public function log($id, $description, $start, $end) {
+    }
 
-	/**
-	 * @return \OCP\Diagnostics\IEvent[]
-	 */
-	public function getEvents() {
-		return array();
-	}
+    /**
+     * @return \OCP\Diagnostics\IEvent[]
+     */
+    public function getEvents() {
+        return array();
+    }
 }

lib/private/Config.php

Indentation +198 added lines, -198 removed lines

@@ -39,227 +39,227 @@
  * configuration file of ownCloud.
  */
 class Config {
-	/** @var array Associative array ($key => $value) */
-	protected $cache = array();
-	/** @var string */
-	protected $configDir;
-	/** @var string */
-	protected $configFilePath;
-	/** @var string */
-	protected $configFileName;
+    /** @var array Associative array ($key => $value) */
+    protected $cache = array();
+    /** @var string */
+    protected $configDir;
+    /** @var string */
+    protected $configFilePath;
+    /** @var string */
+    protected $configFileName;
 
-	/**
-	 * @param string $configDir Path to the config dir, needs to end with '/'
-	 * @param string $fileName (Optional) Name of the config file. Defaults to config.php
-	 */
-	public function __construct($configDir, $fileName = 'config.php') {
-		$this->configDir = $configDir;
-		$this->configFilePath = $this->configDir.$fileName;
-		$this->configFileName = $fileName;
-		$this->readData();
-	}
+    /**
+     * @param string $configDir Path to the config dir, needs to end with '/'
+     * @param string $fileName (Optional) Name of the config file. Defaults to config.php
+     */
+    public function __construct($configDir, $fileName = 'config.php') {
+        $this->configDir = $configDir;
+        $this->configFilePath = $this->configDir.$fileName;
+        $this->configFileName = $fileName;
+        $this->readData();
+    }
 
-	/**
-	 * Lists all available config keys
-	 *
-	 * Please note that it does not return the values.
-	 *
-	 * @return array an array of key names
-	 */
-	public function getKeys() {
-		return array_keys($this->cache);
-	}
+    /**
+     * Lists all available config keys
+     *
+     * Please note that it does not return the values.
+     *
+     * @return array an array of key names
+     */
+    public function getKeys() {
+        return array_keys($this->cache);
+    }
 
-	/**
-	 * Gets a value from config.php
-	 *
-	 * If it does not exist, $default will be returned.
-	 *
-	 * @param string $key key
-	 * @param mixed $default = null default value
-	 * @return mixed the value or $default
-	 */
-	public function getValue($key, $default = null) {
-		if (isset($this->cache[$key])) {
-			return $this->cache[$key];
-		}
+    /**
+     * Gets a value from config.php
+     *
+     * If it does not exist, $default will be returned.
+     *
+     * @param string $key key
+     * @param mixed $default = null default value
+     * @return mixed the value or $default
+     */
+    public function getValue($key, $default = null) {
+        if (isset($this->cache[$key])) {
+            return $this->cache[$key];
+        }
 
-		return $default;
-	}
+        return $default;
+    }
 
-	/**
-	 * Sets and deletes values and writes the config.php
-	 *
-	 * @param array $configs Associative array with `key => value` pairs
-	 *                       If value is null, the config key will be deleted
-	 */
-	public function setValues(array $configs) {
-		$needsUpdate = false;
-		foreach ($configs as $key => $value) {
-			if ($value !== null) {
-				$needsUpdate |= $this->set($key, $value);
-			} else {
-				$needsUpdate |= $this->delete($key);
-			}
-		}
+    /**
+     * Sets and deletes values and writes the config.php
+     *
+     * @param array $configs Associative array with `key => value` pairs
+     *                       If value is null, the config key will be deleted
+     */
+    public function setValues(array $configs) {
+        $needsUpdate = false;
+        foreach ($configs as $key => $value) {
+            if ($value !== null) {
+                $needsUpdate |= $this->set($key, $value);
+            } else {
+                $needsUpdate |= $this->delete($key);
+            }
+        }
 
-		if ($needsUpdate) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+        if ($needsUpdate) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * Sets the value and writes it to config.php if required
-	 *
-	 * @param string $key key
-	 * @param mixed $value value
-	 */
-	public function setValue($key, $value) {
-		if ($this->set($key, $value)) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+    /**
+     * Sets the value and writes it to config.php if required
+     *
+     * @param string $key key
+     * @param mixed $value value
+     */
+    public function setValue($key, $value) {
+        if ($this->set($key, $value)) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * This function sets the value
-	 *
-	 * @param string $key key
-	 * @param mixed $value value
-	 * @return bool True if the file needs to be updated, false otherwise
-	 */
-	protected function set($key, $value) {
-		if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
-			// Add change
-			$this->cache[$key] = $value;
-			return true;
-		}
+    /**
+     * This function sets the value
+     *
+     * @param string $key key
+     * @param mixed $value value
+     * @return bool True if the file needs to be updated, false otherwise
+     */
+    protected function set($key, $value) {
+        if (!isset($this->cache[$key]) || $this->cache[$key] !== $value) {
+            // Add change
+            $this->cache[$key] = $value;
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Removes a key from the config and removes it from config.php if required
-	 * @param string $key
-	 */
-	public function deleteKey($key) {
-		if ($this->delete($key)) {
-			// Write changes
-			$this->writeData();
-		}
-	}
+    /**
+     * Removes a key from the config and removes it from config.php if required
+     * @param string $key
+     */
+    public function deleteKey($key) {
+        if ($this->delete($key)) {
+            // Write changes
+            $this->writeData();
+        }
+    }
 
-	/**
-	 * This function removes a key from the config
-	 *
-	 * @param string $key
-	 * @return bool True if the file needs to be updated, false otherwise
-	 */
-	protected function delete($key) {
-		if (isset($this->cache[$key])) {
-			// Delete key from cache
-			unset($this->cache[$key]);
-			return true;
-		}
-		return false;
-	}
+    /**
+     * This function removes a key from the config
+     *
+     * @param string $key
+     * @return bool True if the file needs to be updated, false otherwise
+     */
+    protected function delete($key) {
+        if (isset($this->cache[$key])) {
+            // Delete key from cache
+            unset($this->cache[$key]);
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	 * Loads the config file
-	 *
-	 * Reads the config file and saves it to the cache
-	 *
-	 * @throws \Exception If no lock could be acquired or the config file has not been found
-	 */
-	private function readData() {
-		// Default config should always get loaded
-		$configFiles = array($this->configFilePath);
+    /**
+     * Loads the config file
+     *
+     * Reads the config file and saves it to the cache
+     *
+     * @throws \Exception If no lock could be acquired or the config file has not been found
+     */
+    private function readData() {
+        // Default config should always get loaded
+        $configFiles = array($this->configFilePath);
 
-		// Add all files in the config dir ending with the same file name
-		$extra = glob($this->configDir.'*.'.$this->configFileName);
-		if (is_array($extra)) {
-			natsort($extra);
-			$configFiles = array_merge($configFiles, $extra);
-		}
+        // Add all files in the config dir ending with the same file name
+        $extra = glob($this->configDir.'*.'.$this->configFileName);
+        if (is_array($extra)) {
+            natsort($extra);
+            $configFiles = array_merge($configFiles, $extra);
+        }
 
-		// Include file and merge config
-		foreach ($configFiles as $file) {
-			$fileExistsAndIsReadable = file_exists($file) && is_readable($file);
-			$filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
-			if($file === $this->configFilePath &&
-				$filePointer === false) {
-				// Opening the main config might not be possible, e.g. if the wrong
-				// permissions are set (likely on a new installation)
-				continue;
-			}
+        // Include file and merge config
+        foreach ($configFiles as $file) {
+            $fileExistsAndIsReadable = file_exists($file) && is_readable($file);
+            $filePointer = $fileExistsAndIsReadable ? fopen($file, 'r') : false;
+            if($file === $this->configFilePath &&
+                $filePointer === false) {
+                // Opening the main config might not be possible, e.g. if the wrong
+                // permissions are set (likely on a new installation)
+                continue;
+            }
 
-			// Try to acquire a file lock
-			if(!flock($filePointer, LOCK_SH)) {
-				throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
-			}
+            // Try to acquire a file lock
+            if(!flock($filePointer, LOCK_SH)) {
+                throw new \Exception(sprintf('Could not acquire a shared lock on the config file %s', $file));
+            }
 
-			unset($CONFIG);
-			include $file;
-			if(isset($CONFIG) && is_array($CONFIG)) {
-				$this->cache = array_merge($this->cache, $CONFIG);
-			}
+            unset($CONFIG);
+            include $file;
+            if(isset($CONFIG) && is_array($CONFIG)) {
+                $this->cache = array_merge($this->cache, $CONFIG);
+            }
 
-			// Close the file pointer and release the lock
-			flock($filePointer, LOCK_UN);
-			fclose($filePointer);
-		}
-	}
+            // Close the file pointer and release the lock
+            flock($filePointer, LOCK_UN);
+            fclose($filePointer);
+        }
+    }
 
-	/**
-	 * Writes the config file
-	 *
-	 * Saves the config to the config file.
-	 *
-	 * @throws HintException If the config file cannot be written to
-	 * @throws \Exception If no file lock can be acquired
-	 */
-	private function writeData() {
-		// Create a php file ...
-		$content = "<?php\n";
-		$content .= '$CONFIG = ';
-		$content .= var_export($this->cache, true);
-		$content .= ";\n";
+    /**
+     * Writes the config file
+     *
+     * Saves the config to the config file.
+     *
+     * @throws HintException If the config file cannot be written to
+     * @throws \Exception If no file lock can be acquired
+     */
+    private function writeData() {
+        // Create a php file ...
+        $content = "<?php\n";
+        $content .= '$CONFIG = ';
+        $content .= var_export($this->cache, true);
+        $content .= ";\n";
 
-		touch ($this->configFilePath);
-		$filePointer = fopen($this->configFilePath, 'r+');
+        touch ($this->configFilePath);
+        $filePointer = fopen($this->configFilePath, 'r+');
 
-		// Prevent others not to read the config
-		chmod($this->configFilePath, 0640);
+        // Prevent others not to read the config
+        chmod($this->configFilePath, 0640);
 
-		// File does not exist, this can happen when doing a fresh install
-		if(!is_resource ($filePointer)) {
-			// TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
-			// currently this breaks app routes but also could have other side effects especially during setup and exception handling
-			$url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
-			throw new HintException(
-				"Can't write into config directory!",
-				'This can usually be fixed by '
-				.'<a href="' . $url . '" target="_blank" rel="noreferrer">giving the webserver write access to the config directory</a>.');
-		}
+        // File does not exist, this can happen when doing a fresh install
+        if(!is_resource ($filePointer)) {
+            // TODO fix this via DI once it is very clear that this doesn't cause side effects due to initialization order
+            // currently this breaks app routes but also could have other side effects especially during setup and exception handling
+            $url = \OC::$server->getURLGenerator()->linkToDocs('admin-dir_permissions');
+            throw new HintException(
+                "Can't write into config directory!",
+                'This can usually be fixed by '
+                .'<a href="' . $url . '" target="_blank" rel="noreferrer">giving the webserver write access to the config directory</a>.');
+        }
 
-		// Try to acquire a file lock
-		if(!flock($filePointer, LOCK_EX)) {
-			throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
-		}
+        // Try to acquire a file lock
+        if(!flock($filePointer, LOCK_EX)) {
+            throw new \Exception(sprintf('Could not acquire an exclusive lock on the config file %s', $this->configFilePath));
+        }
 
-		// Write the config and release the lock
-		ftruncate ($filePointer, 0);
-		fwrite($filePointer, $content);
-		fflush($filePointer);
-		flock($filePointer, LOCK_UN);
-		fclose($filePointer);
+        // Write the config and release the lock
+        ftruncate ($filePointer, 0);
+        fwrite($filePointer, $content);
+        fflush($filePointer);
+        flock($filePointer, LOCK_UN);
+        fclose($filePointer);
 
-		// Try invalidating the opcache just for the file we wrote...
-		if (!\OC_Util::deleteFromOpcodeCache($this->configFilePath)) {
-			// But if that doesn't work, clear the whole cache.
-			\OC_Util::clearOpcodeCache();
-		}
-	}
+        // Try invalidating the opcache just for the file we wrote...
+        if (!\OC_Util::deleteFromOpcodeCache($this->configFilePath)) {
+            // But if that doesn't work, clear the whole cache.
+            \OC_Util::clearOpcodeCache();
+        }
+    }
 }
 

lib/private/DateTimeZone.php

Indentation +86 added lines, -86 removed lines

@@ -29,100 +29,100 @@
 use OCP\ISession;
 
 class DateTimeZone implements IDateTimeZone {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var ISession */
-	protected $session;
+    /** @var ISession */
+    protected $session;
 
-	/**
-	 * Constructor
-	 *
-	 * @param IConfig $config
-	 * @param ISession $session
-	 */
-	public function __construct(IConfig $config, ISession $session) {
-		$this->config = $config;
-		$this->session = $session;
-	}
+    /**
+     * Constructor
+     *
+     * @param IConfig $config
+     * @param ISession $session
+     */
+    public function __construct(IConfig $config, ISession $session) {
+        $this->config = $config;
+        $this->session = $session;
+    }
 
-	/**
-	 * Get the timezone of the current user, based on his session information and config data
-	 *
-	 * @param bool|int $timestamp
-	 * @return \DateTimeZone
-	 */
-	public function getTimeZone($timestamp = false) {
-		$timeZone = $this->config->getUserValue($this->session->get('user_id'), 'core', 'timezone', null);
-		if ($timeZone === null) {
-			if ($this->session->exists('timezone')) {
-				return $this->guessTimeZoneFromOffset($this->session->get('timezone'), $timestamp);
-			}
-			$timeZone = $this->getDefaultTimeZone();
-		}
+    /**
+     * Get the timezone of the current user, based on his session information and config data
+     *
+     * @param bool|int $timestamp
+     * @return \DateTimeZone
+     */
+    public function getTimeZone($timestamp = false) {
+        $timeZone = $this->config->getUserValue($this->session->get('user_id'), 'core', 'timezone', null);
+        if ($timeZone === null) {
+            if ($this->session->exists('timezone')) {
+                return $this->guessTimeZoneFromOffset($this->session->get('timezone'), $timestamp);
+            }
+            $timeZone = $this->getDefaultTimeZone();
+        }
 
-		try {
-			return new \DateTimeZone($timeZone);
-		} catch (\Exception $e) {
-			\OCP\Util::writeLog('datetimezone', 'Failed to created DateTimeZone "' . $timeZone . "'", \OCP\Util::DEBUG);
-			return new \DateTimeZone($this->getDefaultTimeZone());
-		}
-	}
+        try {
+            return new \DateTimeZone($timeZone);
+        } catch (\Exception $e) {
+            \OCP\Util::writeLog('datetimezone', 'Failed to created DateTimeZone "' . $timeZone . "'", \OCP\Util::DEBUG);
+            return new \DateTimeZone($this->getDefaultTimeZone());
+        }
+    }
 
-	/**
-	 * Guess the DateTimeZone for a given offset
-	 *
-	 * We first try to find a Etc/GMT* timezone, if that does not exist,
-	 * we try to find it manually, before falling back to UTC.
-	 *
-	 * @param mixed $offset
-	 * @param bool|int $timestamp
-	 * @return \DateTimeZone
-	 */
-	protected function guessTimeZoneFromOffset($offset, $timestamp) {
-		try {
-			// Note: the timeZone name is the inverse to the offset,
-			// so a positive offset means negative timeZone
-			// and the other way around.
-			if ($offset > 0) {
-				$timeZone = 'Etc/GMT-' . $offset;
-			} else {
-				$timeZone = 'Etc/GMT+' . abs($offset);
-			}
+    /**
+     * Guess the DateTimeZone for a given offset
+     *
+     * We first try to find a Etc/GMT* timezone, if that does not exist,
+     * we try to find it manually, before falling back to UTC.
+     *
+     * @param mixed $offset
+     * @param bool|int $timestamp
+     * @return \DateTimeZone
+     */
+    protected function guessTimeZoneFromOffset($offset, $timestamp) {
+        try {
+            // Note: the timeZone name is the inverse to the offset,
+            // so a positive offset means negative timeZone
+            // and the other way around.
+            if ($offset > 0) {
+                $timeZone = 'Etc/GMT-' . $offset;
+            } else {
+                $timeZone = 'Etc/GMT+' . abs($offset);
+            }
 
-			return new \DateTimeZone($timeZone);
-		} catch (\Exception $e) {
-			// If the offset has no Etc/GMT* timezone,
-			// we try to guess one timezone that has the same offset
-			foreach (\DateTimeZone::listIdentifiers() as $timeZone) {
-				$dtz = new \DateTimeZone($timeZone);
-				$dateTime = new \DateTime();
+            return new \DateTimeZone($timeZone);
+        } catch (\Exception $e) {
+            // If the offset has no Etc/GMT* timezone,
+            // we try to guess one timezone that has the same offset
+            foreach (\DateTimeZone::listIdentifiers() as $timeZone) {
+                $dtz = new \DateTimeZone($timeZone);
+                $dateTime = new \DateTime();
 
-				if ($timestamp !== false) {
-					$dateTime->setTimestamp($timestamp);
-				}
+                if ($timestamp !== false) {
+                    $dateTime->setTimestamp($timestamp);
+                }
 
-				$dtOffset = $dtz->getOffset($dateTime);
-				if ($dtOffset == 3600 * $offset) {
-					return $dtz;
-				}
-			}
+                $dtOffset = $dtz->getOffset($dateTime);
+                if ($dtOffset == 3600 * $offset) {
+                    return $dtz;
+                }
+            }
 
-			// No timezone found, fallback to UTC
-			\OCP\Util::writeLog('datetimezone', 'Failed to find DateTimeZone for offset "' . $offset . "'", \OCP\Util::DEBUG);
-			return new \DateTimeZone($this->getDefaultTimeZone());
-		}
-	}
+            // No timezone found, fallback to UTC
+            \OCP\Util::writeLog('datetimezone', 'Failed to find DateTimeZone for offset "' . $offset . "'", \OCP\Util::DEBUG);
+            return new \DateTimeZone($this->getDefaultTimeZone());
+        }
+    }
 
-	/**
-	 * Get the default timezone of the server
-	 *
-	 * Falls back to UTC if it is not yet set.
-	 * 
-	 * @return string
-	 */
-	protected function getDefaultTimeZone() {
-		$serverTimeZone = date_default_timezone_get();
-		return $serverTimeZone ?: 'UTC';
-	}
+    /**
+     * Get the default timezone of the server
+     *
+     * Falls back to UTC if it is not yet set.
+     * 
+     * @return string
+     */
+    protected function getDefaultTimeZone() {
+        $serverTimeZone = date_default_timezone_get();
+        return $serverTimeZone ?: 'UTC';
+    }
 }

lib/private/Tagging/TagMapper.php

Indentation +39 added lines, -39 removed lines

@@ -33,47 +33,47 @@
  */
 class TagMapper extends Mapper {
 
-	/**
-	* Constructor.
-	*
-	* @param IDBConnection $db Instance of the Db abstraction layer.
-	*/
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'vcategory', 'OC\Tagging\Tag');
-	}
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $db Instance of the Db abstraction layer.
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'vcategory', 'OC\Tagging\Tag');
+    }
 
-	/**
-	* Load tags from the database.
-	*
-	* @param array|string $owners The user(s) whose tags we are going to load.
-	* @param string $type The type of item for which we are loading tags.
-	* @return array An array of Tag objects.
-	*/
-	public function loadTags($owners, $type) {
-		if(!is_array($owners)) {
-			$owners = array($owners);
-		}
+    /**
+     * Load tags from the database.
+     *
+     * @param array|string $owners The user(s) whose tags we are going to load.
+     * @param string $type The type of item for which we are loading tags.
+     * @return array An array of Tag objects.
+     */
+    public function loadTags($owners, $type) {
+        if(!is_array($owners)) {
+            $owners = array($owners);
+        }
 
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners)-1) . '?) AND `type` = ? ORDER BY `category`';
-		return $this->findEntities($sql, array_merge($owners, array($type)));
-	}
+        $sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+            . 'WHERE `uid` IN (' . str_repeat('?,', count($owners)-1) . '?) AND `type` = ? ORDER BY `category`';
+        return $this->findEntities($sql, array_merge($owners, array($type)));
+    }
 
-	/**
-	* Check if a given Tag object already exists in the database.
-	*
-	* @param Tag $tag The tag to look for in the database.
-	* @return bool
-	*/
-	public function tagExists($tag) {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
-		try {
-			$this->findEntity($sql, array($tag->getOwner(), $tag->getType(), $tag->getName()));
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-		return true;
-	}
+    /**
+     * Check if a given Tag object already exists in the database.
+     *
+     * @param Tag $tag The tag to look for in the database.
+     * @return bool
+     */
+    public function tagExists($tag) {
+        $sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+            . 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
+        try {
+            $this->findEntity($sql, array($tag->getOwner(), $tag->getType(), $tag->getName()));
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+        return true;
+    }
 }
 

lib/private/Tagging/Tag.php

Indentation +47 added lines, -47 removed lines

@@ -37,54 +37,54 @@
  */
 class Tag extends Entity {
 
-	protected $owner;
-	protected $type;
-	protected $name;
+    protected $owner;
+    protected $type;
+    protected $name;
 
-	/**
-	* Constructor.
-	*
-	* @param string $owner The tag's owner
-	* @param string $type The type of item this tag is used for
-	* @param string $name The tag's name
-	*/
-	public function __construct($owner = null, $type = null, $name = null) {
-		$this->setOwner($owner);
-		$this->setType($type);
-		$this->setName($name);
-	}
+    /**
+     * Constructor.
+     *
+     * @param string $owner The tag's owner
+     * @param string $type The type of item this tag is used for
+     * @param string $name The tag's name
+     */
+    public function __construct($owner = null, $type = null, $name = null) {
+        $this->setOwner($owner);
+        $this->setType($type);
+        $this->setName($name);
+    }
 
-	/**
-	 * Transform a database columnname to a property
-	 *
-	 * @param string $columnName the name of the column
-	 * @return string the property name
-	 * @todo migrate existing database columns to the correct names
-	 * to be able to drop this direct mapping
-	 */
-	public function columnToProperty($columnName){
-		if ($columnName === 'category') {
-		    return 'name';
-		} elseif ($columnName === 'uid') {
-		    return 'owner';
-		} else {
-		    return parent::columnToProperty($columnName);
-		}
-	}
+    /**
+     * Transform a database columnname to a property
+     *
+     * @param string $columnName the name of the column
+     * @return string the property name
+     * @todo migrate existing database columns to the correct names
+     * to be able to drop this direct mapping
+     */
+    public function columnToProperty($columnName){
+        if ($columnName === 'category') {
+            return 'name';
+        } elseif ($columnName === 'uid') {
+            return 'owner';
+        } else {
+            return parent::columnToProperty($columnName);
+        }
+    }
 
-	/**
-	 * Transform a property to a database column name
-	 *
-	 * @param string $property the name of the property
-	 * @return string the column name
-	 */
-	public function propertyToColumn($property){
-		if ($property === 'name') {
-		    return 'category';
-		} elseif ($property === 'owner') {
-		    return 'uid';
-		} else {
-		    return parent::propertyToColumn($property);
-		}
-	}
+    /**
+     * Transform a property to a database column name
+     *
+     * @param string $property the name of the property
+     * @return string the column name
+     */
+    public function propertyToColumn($property){
+        if ($property === 'name') {
+            return 'category';
+        } elseif ($property === 'owner') {
+            return 'uid';
+        } else {
+            return parent::propertyToColumn($property);
+        }
+    }
 }

lib/private/Route/Route.php

Indentation +114 added lines, -114 removed lines

@@ -32,127 +32,127 @@
 use Symfony\Component\Routing\Route as SymfonyRoute;
 
 class Route extends SymfonyRoute implements IRoute {
-	/**
-	 * Specify the method when this route is to be used
-	 *
-	 * @param string $method HTTP method (uppercase)
-	 * @return \OC\Route\Route
-	 */
-	public function method($method) {
-		$this->setMethods($method);
-		return $this;
-	}
+    /**
+     * Specify the method when this route is to be used
+     *
+     * @param string $method HTTP method (uppercase)
+     * @return \OC\Route\Route
+     */
+    public function method($method) {
+        $this->setMethods($method);
+        return $this;
+    }
 
-	/**
-	 * Specify POST as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function post() {
-		$this->method('POST');
-		return $this;
-	}
+    /**
+     * Specify POST as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function post() {
+        $this->method('POST');
+        return $this;
+    }
 
-	/**
-	 * Specify GET as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function get() {
-		$this->method('GET');
-		return $this;
-	}
+    /**
+     * Specify GET as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function get() {
+        $this->method('GET');
+        return $this;
+    }
 
-	/**
-	 * Specify PUT as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function put() {
-		$this->method('PUT');
-		return $this;
-	}
+    /**
+     * Specify PUT as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function put() {
+        $this->method('PUT');
+        return $this;
+    }
 
-	/**
-	 * Specify DELETE as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function delete() {
-		$this->method('DELETE');
-		return $this;
-	}
+    /**
+     * Specify DELETE as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function delete() {
+        $this->method('DELETE');
+        return $this;
+    }
 
-	/**
-	 * Specify PATCH as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function patch() {
-		$this->method('PATCH');
-		return $this;
-	}
+    /**
+     * Specify PATCH as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function patch() {
+        $this->method('PATCH');
+        return $this;
+    }
 
-	/**
-	 * Defaults to use for this route
-	 *
-	 * @param array $defaults The defaults
-	 * @return \OC\Route\Route
-	 */
-	public function defaults($defaults) {
-		$action = $this->getDefault('action');
-		$this->setDefaults($defaults);
-		if (isset($defaults['action'])) {
-			$action = $defaults['action'];
-		}
-		$this->action($action);
-		return $this;
-	}
+    /**
+     * Defaults to use for this route
+     *
+     * @param array $defaults The defaults
+     * @return \OC\Route\Route
+     */
+    public function defaults($defaults) {
+        $action = $this->getDefault('action');
+        $this->setDefaults($defaults);
+        if (isset($defaults['action'])) {
+            $action = $defaults['action'];
+        }
+        $this->action($action);
+        return $this;
+    }
 
-	/**
-	 * Requirements for this route
-	 *
-	 * @param array $requirements The requirements
-	 * @return \OC\Route\Route
-	 */
-	public function requirements($requirements) {
-		$method = $this->getMethods();
-		$this->setRequirements($requirements);
-		if (isset($requirements['_method'])) {
-			$method = $requirements['_method'];
-		}
-		if ($method) {
-			$this->method($method);
-		}
-		return $this;
-	}
+    /**
+     * Requirements for this route
+     *
+     * @param array $requirements The requirements
+     * @return \OC\Route\Route
+     */
+    public function requirements($requirements) {
+        $method = $this->getMethods();
+        $this->setRequirements($requirements);
+        if (isset($requirements['_method'])) {
+            $method = $requirements['_method'];
+        }
+        if ($method) {
+            $this->method($method);
+        }
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches
-	 *
-	 * @param string|callable $class the class or a callable
-	 * @param string $function the function to use with the class
-	 * @return \OC\Route\Route
-	 *
-	 * This function is called with $class set to a callable or
-	 * to the class with $function
-	 */
-	public function action($class, $function = null) {
-		$action = array($class, $function);
-		if (is_null($function)) {
-			$action = $class;
-		}
-		$this->setDefault('action', $action);
-		return $this;
-	}
+    /**
+     * The action to execute when this route matches
+     *
+     * @param string|callable $class the class or a callable
+     * @param string $function the function to use with the class
+     * @return \OC\Route\Route
+     *
+     * This function is called with $class set to a callable or
+     * to the class with $function
+     */
+    public function action($class, $function = null) {
+        $action = array($class, $function);
+        if (is_null($function)) {
+            $action = $class;
+        }
+        $this->setDefault('action', $action);
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches, includes a file like
-	 * it is called directly
-	 * @param string $file
-	 * @return void
-	 */
-	public function actionInclude($file) {
-		$function = create_function('$param',
-			'unset($param["_route"]);'
-			.'$_GET=array_merge($_GET, $param);'
-			.'unset($param);'
-			.'require_once "'.$file.'";');
-		$this->action($function);
-	}
+    /**
+     * The action to execute when this route matches, includes a file like
+     * it is called directly
+     * @param string $file
+     * @return void
+     */
+    public function actionInclude($file) {
+        $function = create_function('$param',
+            'unset($param["_route"]);'
+            .'$_GET=array_merge($_GET, $param);'
+            .'unset($param);'
+            .'require_once "'.$file.'";');
+        $this->action($function);
+    }
 }

lib/private/Route/CachingRouter.php

Indentation +32 added lines, -32 removed lines

@@ -28,38 +28,38 @@
 use OCP\ILogger;
 
 class CachingRouter extends Router {
-	/**
-	 * @var \OCP\ICache
-	 */
-	protected $cache;
+    /**
+     * @var \OCP\ICache
+     */
+    protected $cache;
 
-	/**
-	 * @param \OCP\ICache $cache
-	 * @param ILogger $logger
-	 */
-	public function __construct($cache, ILogger $logger) {
-		$this->cache = $cache;
-		parent::__construct($logger);
-	}
+    /**
+     * @param \OCP\ICache $cache
+     * @param ILogger $logger
+     */
+    public function __construct($cache, ILogger $logger) {
+        $this->cache = $cache;
+        parent::__construct($logger);
+    }
 
-	/**
-	 * Generate url based on $name and $parameters
-	 *
-	 * @param string $name Name of the route to use.
-	 * @param array $parameters Parameters for the route
-	 * @param bool $absolute
-	 * @return string
-	 */
-	public function generate($name, $parameters = array(), $absolute = false) {
-		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . intval($absolute);
-		$cachedKey = $this->cache->get($key);
-		if ($cachedKey) {
-			return $cachedKey;
-		} else {
-			$url = parent::generate($name, $parameters, $absolute);
-			$this->cache->set($key, $url, 3600);
-			return $url;
-		}
-	}
+    /**
+     * Generate url based on $name and $parameters
+     *
+     * @param string $name Name of the route to use.
+     * @param array $parameters Parameters for the route
+     * @param bool $absolute
+     * @return string
+     */
+    public function generate($name, $parameters = array(), $absolute = false) {
+        asort($parameters);
+        $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . intval($absolute);
+        $cachedKey = $this->cache->get($key);
+        if ($cachedKey) {
+            return $cachedKey;
+        } else {
+            $url = parent::generate($name, $parameters, $absolute);
+            $this->cache->set($key, $url, 3600);
+            return $url;
+        }
+    }
 }

lib/private/TagManager.php

Indentation +44 added lines, -44 removed lines

@@ -40,53 +40,53 @@
 
 class TagManager implements \OCP\ITagManager {
 
-	/**
-	 * User session
-	 *
-	 * @var \OCP\IUserSession
-	 */
-	private $userSession;
+    /**
+     * User session
+     *
+     * @var \OCP\IUserSession
+     */
+    private $userSession;
 
-	/**
-	 * TagMapper
-	 *
-	 * @var TagMapper
-	 */
-	private $mapper;
+    /**
+     * TagMapper
+     *
+     * @var TagMapper
+     */
+    private $mapper;
 
-	/**
-	* Constructor.
-	*
-	* @param TagMapper $mapper Instance of the TagMapper abstraction layer.
-	* @param \OCP\IUserSession $userSession the user session
-	*/
-	public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
-		$this->mapper = $mapper;
-		$this->userSession = $userSession;
+    /**
+     * Constructor.
+     *
+     * @param TagMapper $mapper Instance of the TagMapper abstraction layer.
+     * @param \OCP\IUserSession $userSession the user session
+     */
+    public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
+        $this->mapper = $mapper;
+        $this->userSession = $userSession;
 
-	}
+    }
 
-	/**
-	* Create a new \OCP\ITags instance and load tags from db.
-	*
-	* @see \OCP\ITags
-	* @param string $type The type identifier e.g. 'contact' or 'event'.
-	* @param array $defaultTags An array of default tags to be used if none are stored.
-	* @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	* @param string $userId user for which to retrieve the tags, defaults to the currently
-	* logged in user
-	* @return \OCP\ITags
-	*/
-	public function load($type, $defaultTags = array(), $includeShared = false, $userId = null) {
-		if (is_null($userId)) {
-			$user = $this->userSession->getUser();
-			if ($user === null) {
-				// nothing we can do without a user
-				return null;
-			}
-			$userId = $this->userSession->getUser()->getUId();
-		}
-		return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);
-	}
+    /**
+     * Create a new \OCP\ITags instance and load tags from db.
+     *
+     * @see \OCP\ITags
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
+     * @param array $defaultTags An array of default tags to be used if none are stored.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
+     * logged in user
+     * @return \OCP\ITags
+     */
+    public function load($type, $defaultTags = array(), $includeShared = false, $userId = null) {
+        if (is_null($userId)) {
+            $user = $this->userSession->getUser();
+            if ($user === null) {
+                // nothing we can do without a user
+                return null;
+            }
+            $userId = $this->userSession->getUser()->getUId();
+        }
+        return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);
+    }
 
 }

lib/private/ContactsManager.php

Indentation +160 added lines, -160 removed lines

@@ -27,164 +27,164 @@
 
 namespace OC {
 
-	class ContactsManager implements \OCP\Contacts\IManager {
-
-		/**
-		 * This function is used to search and find contacts within the users address books.
-		 * In case $pattern is empty all contacts will be returned.
-		 *
-		 * @param string $pattern which should match within the $searchProperties
-		 * @param array $searchProperties defines the properties within the query pattern should match
-		 * @param array $options - for future use. One should always have options!
-		 * @return array an array of contacts which are arrays of key-value-pairs
-		 */
-		public function search($pattern, $searchProperties = array(), $options = array()) {
-			$this->loadAddressBooks();
-			$result = array();
-			foreach($this->addressBooks as $addressBook) {
-				$r = $addressBook->search($pattern, $searchProperties, $options);
-				$contacts = array();
-				foreach($r as $c){
-					$c['addressbook-key'] = $addressBook->getKey();
-					$contacts[] = $c;
-				}
-				$result = array_merge($result, $contacts);
-			}
-
-			return $result;
-		}
-
-		/**
-		 * This function can be used to delete the contact identified by the given id
-		 *
-		 * @param object $id the unique identifier to a contact
-		 * @param string $addressBookKey identifier of the address book in which the contact shall be deleted
-		 * @return bool successful or not
-		 */
-		public function delete($id, $addressBookKey) {
-			$addressBook = $this->getAddressBook($addressBookKey);
-			if (!$addressBook) {
-				return null;
-			}
-
-			if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
-				return $addressBook->delete($id);
-			}
-
-			return null;
-		}
-
-		/**
-		 * This function is used to create a new contact if 'id' is not given or not present.
-		 * Otherwise the contact will be updated by replacing the entire data set.
-		 *
-		 * @param array $properties this array if key-value-pairs defines a contact
-		 * @param string $addressBookKey identifier of the address book in which the contact shall be created or updated
-		 * @return array representing the contact just created or updated
-		 */
-		public function createOrUpdate($properties, $addressBookKey) {
-			$addressBook = $this->getAddressBook($addressBookKey);
-			if (!$addressBook) {
-				return null;
-			}
-
-			if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
-				return $addressBook->createOrUpdate($properties);
-			}
-
-			return null;
-		}
-
-		/**
-		 * Check if contacts are available (e.g. contacts app enabled)
-		 *
-		 * @return bool true if enabled, false if not
-		 */
-		public function isEnabled() {
-			return !empty($this->addressBooks) || !empty($this->addressBookLoaders);
-		}
-
-		/**
-		 * @param \OCP\IAddressBook $addressBook
-		 */
-		public function registerAddressBook(\OCP\IAddressBook $addressBook) {
-			$this->addressBooks[$addressBook->getKey()] = $addressBook;
-		}
-
-		/**
-		 * @param \OCP\IAddressBook $addressBook
-		 */
-		public function unregisterAddressBook(\OCP\IAddressBook $addressBook) {
-			unset($this->addressBooks[$addressBook->getKey()]);
-		}
-
-		/**
-		 * @return array
-		 */
-		public function getAddressBooks() {
-			$this->loadAddressBooks();
-			$result = array();
-			foreach($this->addressBooks as $addressBook) {
-				$result[$addressBook->getKey()] = $addressBook->getDisplayName();
-			}
-
-			return $result;
-		}
-
-		/**
-		 * removes all registered address book instances
-		 */
-		public function clear() {
-			$this->addressBooks = array();
-			$this->addressBookLoaders = array();
-		}
-
-		/**
-		 * @var \OCP\IAddressBook[] which holds all registered address books
-		 */
-		private $addressBooks = array();
-
-		/**
-		 * @var \Closure[] to call to load/register address books
-		 */
-		private $addressBookLoaders = array();
-
-		/**
-		 * In order to improve lazy loading a closure can be registered which will be called in case
-		 * address books are actually requested
-		 *
-		 * @param \Closure $callable
-		 */
-		public function register(\Closure $callable)
-		{
-			$this->addressBookLoaders[] = $callable;
-		}
-
-		/**
-		 * Get (and load when needed) the address book for $key
-		 *
-		 * @param string $addressBookKey
-		 * @return \OCP\IAddressBook
-		 */
-		protected function getAddressBook($addressBookKey)
-		{
-			$this->loadAddressBooks();
-			if (!array_key_exists($addressBookKey, $this->addressBooks)) {
-				return null;
-			}
-
-			return $this->addressBooks[$addressBookKey];
-		}
-
-		/**
-		 * Load all address books registered with 'register'
-		 */
-		protected function loadAddressBooks()
-		{
-			foreach($this->addressBookLoaders as $callable) {
-				$callable($this);
-			}
-			$this->addressBookLoaders = array();
-		}
-	}
+    class ContactsManager implements \OCP\Contacts\IManager {
+
+        /**
+         * This function is used to search and find contacts within the users address books.
+         * In case $pattern is empty all contacts will be returned.
+         *
+         * @param string $pattern which should match within the $searchProperties
+         * @param array $searchProperties defines the properties within the query pattern should match
+         * @param array $options - for future use. One should always have options!
+         * @return array an array of contacts which are arrays of key-value-pairs
+         */
+        public function search($pattern, $searchProperties = array(), $options = array()) {
+            $this->loadAddressBooks();
+            $result = array();
+            foreach($this->addressBooks as $addressBook) {
+                $r = $addressBook->search($pattern, $searchProperties, $options);
+                $contacts = array();
+                foreach($r as $c){
+                    $c['addressbook-key'] = $addressBook->getKey();
+                    $contacts[] = $c;
+                }
+                $result = array_merge($result, $contacts);
+            }
+
+            return $result;
+        }
+
+        /**
+         * This function can be used to delete the contact identified by the given id
+         *
+         * @param object $id the unique identifier to a contact
+         * @param string $addressBookKey identifier of the address book in which the contact shall be deleted
+         * @return bool successful or not
+         */
+        public function delete($id, $addressBookKey) {
+            $addressBook = $this->getAddressBook($addressBookKey);
+            if (!$addressBook) {
+                return null;
+            }
+
+            if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
+                return $addressBook->delete($id);
+            }
+
+            return null;
+        }
+
+        /**
+         * This function is used to create a new contact if 'id' is not given or not present.
+         * Otherwise the contact will be updated by replacing the entire data set.
+         *
+         * @param array $properties this array if key-value-pairs defines a contact
+         * @param string $addressBookKey identifier of the address book in which the contact shall be created or updated
+         * @return array representing the contact just created or updated
+         */
+        public function createOrUpdate($properties, $addressBookKey) {
+            $addressBook = $this->getAddressBook($addressBookKey);
+            if (!$addressBook) {
+                return null;
+            }
+
+            if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
+                return $addressBook->createOrUpdate($properties);
+            }
+
+            return null;
+        }
+
+        /**
+         * Check if contacts are available (e.g. contacts app enabled)
+         *
+         * @return bool true if enabled, false if not
+         */
+        public function isEnabled() {
+            return !empty($this->addressBooks) || !empty($this->addressBookLoaders);
+        }
+
+        /**
+         * @param \OCP\IAddressBook $addressBook
+         */
+        public function registerAddressBook(\OCP\IAddressBook $addressBook) {
+            $this->addressBooks[$addressBook->getKey()] = $addressBook;
+        }
+
+        /**
+         * @param \OCP\IAddressBook $addressBook
+         */
+        public function unregisterAddressBook(\OCP\IAddressBook $addressBook) {
+            unset($this->addressBooks[$addressBook->getKey()]);
+        }
+
+        /**
+         * @return array
+         */
+        public function getAddressBooks() {
+            $this->loadAddressBooks();
+            $result = array();
+            foreach($this->addressBooks as $addressBook) {
+                $result[$addressBook->getKey()] = $addressBook->getDisplayName();
+            }
+
+            return $result;
+        }
+
+        /**
+         * removes all registered address book instances
+         */
+        public function clear() {
+            $this->addressBooks = array();
+            $this->addressBookLoaders = array();
+        }
+
+        /**
+         * @var \OCP\IAddressBook[] which holds all registered address books
+         */
+        private $addressBooks = array();
+
+        /**
+         * @var \Closure[] to call to load/register address books
+         */
+        private $addressBookLoaders = array();
+
+        /**
+         * In order to improve lazy loading a closure can be registered which will be called in case
+         * address books are actually requested
+         *
+         * @param \Closure $callable
+         */
+        public function register(\Closure $callable)
+        {
+            $this->addressBookLoaders[] = $callable;
+        }
+
+        /**
+         * Get (and load when needed) the address book for $key
+         *
+         * @param string $addressBookKey
+         * @return \OCP\IAddressBook
+         */
+        protected function getAddressBook($addressBookKey)
+        {
+            $this->loadAddressBooks();
+            if (!array_key_exists($addressBookKey, $this->addressBooks)) {
+                return null;
+            }
+
+            return $this->addressBooks[$addressBookKey];
+        }
+
+        /**
+         * Load all address books registered with 'register'
+         */
+        protected function loadAddressBooks()
+        {
+            foreach($this->addressBookLoaders as $callable) {
+                $callable($this);
+            }
+            $this->addressBookLoaders = array();
+        }
+    }
 }