nextcloud / server

lib/private/Lock/MemcacheLockingProvider.php

Indentation +92 added lines, -92 removed lines

@@ -27,102 +27,102 @@
 use OCP\IMemcache;
 
 class MemcacheLockingProvider extends AbstractLockingProvider {
-	/**
-	 * @var \OCP\IMemcache
-	 */
-	private $memcache;
+    /**
+     * @var \OCP\IMemcache
+     */
+    private $memcache;
 
-	/**
-	 * @param \OCP\IMemcache $memcache
-	 * @param int $ttl
-	 */
-	public function __construct(IMemcache $memcache, $ttl = 3600) {
-		$this->memcache = $memcache;
-		$this->ttl = $ttl;
-	}
+    /**
+     * @param \OCP\IMemcache $memcache
+     * @param int $ttl
+     */
+    public function __construct(IMemcache $memcache, $ttl = 3600) {
+        $this->memcache = $memcache;
+        $this->ttl = $ttl;
+    }
 
-	private function setTTL($path) {
-		if ($this->memcache instanceof IMemcacheTTL) {
-			$this->memcache->setTTL($path, $this->ttl);
-		}
-	}
+    private function setTTL($path) {
+        if ($this->memcache instanceof IMemcacheTTL) {
+            $this->memcache->setTTL($path, $this->ttl);
+        }
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @return bool
-	 */
-	public function isLocked($path, $type) {
-		$lockValue = $this->memcache->get($path);
-		if ($type === self::LOCK_SHARED) {
-			return $lockValue > 0;
-		} else if ($type === self::LOCK_EXCLUSIVE) {
-			return $lockValue === 'exclusive';
-		} else {
-			return false;
-		}
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @return bool
+     */
+    public function isLocked($path, $type) {
+        $lockValue = $this->memcache->get($path);
+        if ($type === self::LOCK_SHARED) {
+            return $lockValue > 0;
+        } else if ($type === self::LOCK_EXCLUSIVE) {
+            return $lockValue === 'exclusive';
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function acquireLock($path, $type) {
-		if ($type === self::LOCK_SHARED) {
-			if (!$this->memcache->inc($path)) {
-				throw new LockedException($path);
-			}
-		} else {
-			$this->memcache->add($path, 0);
-			if (!$this->memcache->cas($path, 0, 'exclusive')) {
-				throw new LockedException($path);
-			}
-		}
-		$this->setTTL($path);
-		$this->markAcquire($path, $type);
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function acquireLock($path, $type) {
+        if ($type === self::LOCK_SHARED) {
+            if (!$this->memcache->inc($path)) {
+                throw new LockedException($path);
+            }
+        } else {
+            $this->memcache->add($path, 0);
+            if (!$this->memcache->cas($path, 0, 'exclusive')) {
+                throw new LockedException($path);
+            }
+        }
+        $this->setTTL($path);
+        $this->markAcquire($path, $type);
+    }
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	public function releaseLock($path, $type) {
-		if ($type === self::LOCK_SHARED) {
-			if ($this->getOwnSharedLockCount($path) === 1) {
-				$removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
-				if (!$removed) { //someone else also has a shared lock, decrease only
-					$this->memcache->dec($path);
-				}
-			} else {
-				// if we own more than one lock ourselves just decrease
-				$this->memcache->dec($path);
-			}
-		} else if ($type === self::LOCK_EXCLUSIVE) {
-			$this->memcache->cad($path, 'exclusive');
-		}
-		$this->markRelease($path, $type);
-	}
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    public function releaseLock($path, $type) {
+        if ($type === self::LOCK_SHARED) {
+            if ($this->getOwnSharedLockCount($path) === 1) {
+                $removed = $this->memcache->cad($path, 1); // if we're the only one having a shared lock we can remove it in one go
+                if (!$removed) { //someone else also has a shared lock, decrease only
+                    $this->memcache->dec($path);
+                }
+            } else {
+                // if we own more than one lock ourselves just decrease
+                $this->memcache->dec($path);
+            }
+        } else if ($type === self::LOCK_EXCLUSIVE) {
+            $this->memcache->cad($path, 'exclusive');
+        }
+        $this->markRelease($path, $type);
+    }
 
-	/**
-	 * Change the type of an existing lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function changeLock($path, $targetType) {
-		if ($targetType === self::LOCK_SHARED) {
-			if (!$this->memcache->cas($path, 'exclusive', 1)) {
-				throw new LockedException($path);
-			}
-		} else if ($targetType === self::LOCK_EXCLUSIVE) {
-			// we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
-			if (!$this->memcache->cas($path, 1, 'exclusive')) {
-				throw new LockedException($path);
-			}
-		}
-		$this->setTTL($path);
-		$this->markChange($path, $targetType);
-	}
+    /**
+     * Change the type of an existing lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function changeLock($path, $targetType) {
+        if ($targetType === self::LOCK_SHARED) {
+            if (!$this->memcache->cas($path, 'exclusive', 1)) {
+                throw new LockedException($path);
+            }
+        } else if ($targetType === self::LOCK_EXCLUSIVE) {
+            // we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
+            if (!$this->memcache->cas($path, 1, 'exclusive')) {
+                throw new LockedException($path);
+            }
+        }
+        $this->setTTL($path);
+        $this->markChange($path, $targetType);
+    }
 }

lib/private/Search/Provider/File.php

Indentation +40 added lines, -40 removed lines

@@ -32,45 +32,45 @@
  */
 class File extends \OCP\Search\Provider {
 
-	/**
-	 * Search for files and folders matching the given query
-	 * @param string $query
-	 * @return \OCP\Search\Result
-	 */
-	function search($query) {
-		$files = Filesystem::search($query);
-		$results = array();
-		// edit results
-		foreach ($files as $fileData) {
-			// skip versions
-			if (strpos($fileData['path'], '_versions') === 0) {
-				continue;
-			}
-			// skip top-level folder
-			if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
-				continue;
-			}
-			// create audio result
-			if($fileData['mimepart'] === 'audio'){
-				$result = new \OC\Search\Result\Audio($fileData);
-			}
-			// create image result
-			elseif($fileData['mimepart'] === 'image'){
-				$result = new \OC\Search\Result\Image($fileData);
-			}
-			// create folder result
-			elseif($fileData['mimetype'] === 'httpd/unix-directory'){
-				$result = new \OC\Search\Result\Folder($fileData);
-			}
-			// or create file result
-			else{
-				$result = new \OC\Search\Result\File($fileData);
-			}
-			// add to results
-			$results[] = $result;
-		}
-		// return
-		return $results;
-	}
+    /**
+     * Search for files and folders matching the given query
+     * @param string $query
+     * @return \OCP\Search\Result
+     */
+    function search($query) {
+        $files = Filesystem::search($query);
+        $results = array();
+        // edit results
+        foreach ($files as $fileData) {
+            // skip versions
+            if (strpos($fileData['path'], '_versions') === 0) {
+                continue;
+            }
+            // skip top-level folder
+            if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
+                continue;
+            }
+            // create audio result
+            if($fileData['mimepart'] === 'audio'){
+                $result = new \OC\Search\Result\Audio($fileData);
+            }
+            // create image result
+            elseif($fileData['mimepart'] === 'image'){
+                $result = new \OC\Search\Result\Image($fileData);
+            }
+            // create folder result
+            elseif($fileData['mimetype'] === 'httpd/unix-directory'){
+                $result = new \OC\Search\Result\Folder($fileData);
+            }
+            // or create file result
+            else{
+                $result = new \OC\Search\Result\File($fileData);
+            }
+            // add to results
+            $results[] = $result;
+        }
+        // return
+        return $results;
+    }
 	
 }

Spacing +4 added lines, -4 removed lines

@@ -51,19 +51,19 @@
 				continue;
 			}
 			// create audio result
-			if($fileData['mimepart'] === 'audio'){
+			if ($fileData['mimepart'] === 'audio') {
 				$result = new \OC\Search\Result\Audio($fileData);
 			}
 			// create image result
-			elseif($fileData['mimepart'] === 'image'){
+			elseif ($fileData['mimepart'] === 'image') {
 				$result = new \OC\Search\Result\Image($fileData);
 			}
 			// create folder result
-			elseif($fileData['mimetype'] === 'httpd/unix-directory'){
+			elseif ($fileData['mimetype'] === 'httpd/unix-directory') {
 				$result = new \OC\Search\Result\Folder($fileData);
 			}
 			// or create file result
-			else{
+			else {
 				$result = new \OC\Search\Result\File($fileData);
 			}
 			// add to results

lib/private/Search/Result/Image.php

Indentation +8 added lines, -8 removed lines

@@ -29,13 +29,13 @@
  */
 class Image extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'image';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'image';
 	
-	/**
-	 * @TODO add EXIF information
-	 */
+    /**
+     * @TODO add EXIF information
+     */
 }

lib/private/Search/Result/File.php

Indentation +70 added lines, -70 removed lines

@@ -32,85 +32,85 @@
  */
 class File extends \OCP\Search\Result {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'file';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'file';
 
-	/**
-	 * Path to file
-	 * @var string
-	 */
-	public $path;
+    /**
+     * Path to file
+     * @var string
+     */
+    public $path;
 
-	/**
-	 * Size, in bytes
-	 * @var int 
-	 */
-	public $size;
+    /**
+     * Size, in bytes
+     * @var int 
+     */
+    public $size;
 
-	/**
-	 * Date modified, in human readable form
-	 * @var string
-	 */
-	public $modified;
+    /**
+     * Date modified, in human readable form
+     * @var string
+     */
+    public $modified;
 
-	/**
-	 * File mime type
-	 * @var string
-	 */
-	public $mime_type;
+    /**
+     * File mime type
+     * @var string
+     */
+    public $mime_type;
 
-	/**
-	 * File permissions:
-	 * 
-	 * @var string
-	 */
-	public $permissions;
+    /**
+     * File permissions:
+     * 
+     * @var string
+     */
+    public $permissions;
 
-	/**
-	 * Create a new file search result
-	 * @param FileInfo $data file data given by provider
-	 */
-	public function __construct(FileInfo $data) {
+    /**
+     * Create a new file search result
+     * @param FileInfo $data file data given by provider
+     */
+    public function __construct(FileInfo $data) {
 
-		$path = $this->getRelativePath($data->getPath());
+        $path = $this->getRelativePath($data->getPath());
 
-		$info = pathinfo($path);
-		$this->id = $data->getId();
-		$this->name = $info['basename'];
-		$this->link = \OC::$server->getURLGenerator()->linkToRoute(
-			'files.view.index',
-			[
-				'dir' => $info['dirname'],
-				'scrollto' => $info['basename'],
-			]
-		);
-		$this->permissions = $data->getPermissions();
-		$this->path = $path;
-		$this->size = $data->getSize();
-		$this->modified = $data->getMtime();
-		$this->mime = $data->getMimetype();
-	}
+        $info = pathinfo($path);
+        $this->id = $data->getId();
+        $this->name = $info['basename'];
+        $this->link = \OC::$server->getURLGenerator()->linkToRoute(
+            'files.view.index',
+            [
+                'dir' => $info['dirname'],
+                'scrollto' => $info['basename'],
+            ]
+        );
+        $this->permissions = $data->getPermissions();
+        $this->path = $path;
+        $this->size = $data->getSize();
+        $this->modified = $data->getMtime();
+        $this->mime = $data->getMimetype();
+    }
 
-	/**
-	 * @var Folder $userFolderCache
-	 */
-	static protected $userFolderCache = null;
+    /**
+     * @var Folder $userFolderCache
+     */
+    static protected $userFolderCache = null;
 
-	/**
-	 * converts a path relative to the users files folder
-	 * eg /user/files/foo.txt -> /foo.txt
-	 * @param string $path
-	 * @return string relative path
-	 */
-	protected function getRelativePath ($path) {
-		if (!isset(self::$userFolderCache)) {
-			$user = \OC::$server->getUserSession()->getUser()->getUID();
-			self::$userFolderCache = \OC::$server->getUserFolder($user);
-		}
-		return self::$userFolderCache->getRelativePath($path);
-	}
+    /**
+     * converts a path relative to the users files folder
+     * eg /user/files/foo.txt -> /foo.txt
+     * @param string $path
+     * @return string relative path
+     */
+    protected function getRelativePath ($path) {
+        if (!isset(self::$userFolderCache)) {
+            $user = \OC::$server->getUserSession()->getUser()->getUID();
+            self::$userFolderCache = \OC::$server->getUserFolder($user);
+        }
+        return self::$userFolderCache->getRelativePath($path);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 	 * @param string $path
 	 * @return string relative path
 	 */
-	protected function getRelativePath ($path) {
+	protected function getRelativePath($path) {
 		if (!isset(self::$userFolderCache)) {
 			$user = \OC::$server->getUserSession()->getUser()->getUID();
 			self::$userFolderCache = \OC::$server->getUserFolder($user);

lib/private/Search/Result/Audio.php

Indentation +8 added lines, -8 removed lines

@@ -29,13 +29,13 @@
  */
 class Audio extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'audio';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'audio';
 	
-	/**
-	 * @TODO add ID3 information
-	 */
+    /**
+     * @TODO add ID3 information
+     */
 }

lib/private/Search/Result/Folder.php

Indentation +5 added lines, -5 removed lines

@@ -29,10 +29,10 @@
  */
 class Folder extends File {
 
-	/**
-	 * Type name; translated in templates
-	 * @var string 
-	 */
-	public $type = 'folder';
+    /**
+     * Type name; translated in templates
+     * @var string 
+     */
+    public $type = 'folder';
 	
 }

lib/private/AppFramework/Utility/SimpleContainer.php

Spacing +7 added lines, -7 removed lines

@@ -89,17 +89,17 @@ 
 	 * @throws QueryException if the class could not be found or instantiated
 	 */
 	public function resolve($name) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
+		$baseMsg = 'Could not resolve '.$name.'!';
 		try {
 			$class = new ReflectionClass($name);
 			if ($class->isInstantiable()) {
 				return $this->buildClass($class);
 			} else {
-				throw new QueryException($baseMsg .
+				throw new QueryException($baseMsg.
 					' Class can not be instantiated');
 			}
-		} catch(ReflectionException $e) {
-			throw new QueryException($baseMsg . ' ' . $e->getMessage());
+		} catch (ReflectionException $e) {
+			throw new QueryException($baseMsg.' '.$e->getMessage());
 		}
 	}
 
@@ -115,7 +115,7 @@ 
 			return $this->offsetGet($name);
 		} else {
 			$object = $this->resolve($name);
-			$this->registerService($name, function () use ($object) {
+			$this->registerService($name, function() use ($object) {
 				return $object;
 			});
 			return $object;
@@ -141,7 +141,7 @@ 
 	 */
 	public function registerService($name, Closure $closure, $shared = true) {
 		$name = $this->sanitizeName($name);
-		if (isset($this[$name]))  {
+		if (isset($this[$name])) {
 			unset($this[$name]);
 		}
 		if ($shared) {
@@ -159,7 +159,7 @@ 
 	 * @param string $target the target that should be resolved instead
 	 */
 	public function registerAlias($alias, $target) {
-		$this->registerService($alias, function (IContainer $container) use ($target) {
+		$this->registerService($alias, function(IContainer $container) use ($target) {
 			return $container->query($target);
 		}, false);
 	}

Indentation +114 added lines, -114 removed lines

@@ -42,122 +42,122 @@
 class SimpleContainer extends Container implements IContainer {
 
 
-	/**
-	 * @param ReflectionClass $class the class to instantiate
-	 * @return \stdClass the created class
-	 */
-	private function buildClass(ReflectionClass $class) {
-		$constructor = $class->getConstructor();
-		if ($constructor === null) {
-			return $class->newInstance();
-		} else {
-			$parameters = [];
-			foreach ($constructor->getParameters() as $parameter) {
-				$parameterClass = $parameter->getClass();
-
-				// try to find out if it is a class or a simple parameter
-				if ($parameterClass === null) {
-					$resolveName = $parameter->getName();
-				} else {
-					$resolveName = $parameterClass->name;
-				}
-
-				$parameters[] = $this->query($resolveName);
-			}
-			return $class->newInstanceArgs($parameters);
-		}
-	}
-
-
-	/**
-	 * If a parameter is not registered in the container try to instantiate it
-	 * by using reflection to find out how to build the class
-	 * @param string $name the class name to resolve
-	 * @return \stdClass
-	 * @throws QueryException if the class could not be found or instantiated
-	 */
-	public function resolve($name) {
-		$baseMsg = 'Could not resolve ' . $name . '!';
-		try {
-			$class = new ReflectionClass($name);
-			if ($class->isInstantiable()) {
-				return $this->buildClass($class);
-			} else {
-				throw new QueryException($baseMsg .
-					' Class can not be instantiated');
-			}
-		} catch(ReflectionException $e) {
-			throw new QueryException($baseMsg . ' ' . $e->getMessage());
-		}
-	}
-
-
-	/**
-	 * @param string $name name of the service to query for
-	 * @return mixed registered service for the given $name
-	 * @throws QueryException if the query could not be resolved
-	 */
-	public function query($name) {
-		$name = $this->sanitizeName($name);
-		if ($this->offsetExists($name)) {
-			return $this->offsetGet($name);
-		} else {
-			$object = $this->resolve($name);
-			$this->registerService($name, function () use ($object) {
-				return $object;
-			});
-			return $object;
-		}
-	}
-
-	/**
-	 * @param string $name
-	 * @param mixed $value
-	 */
-	public function registerParameter($name, $value) {
-		$this[$name] = $value;
-	}
-
-	/**
-	 * The given closure is call the first time the given service is queried.
-	 * The closure has to return the instance for the given service.
-	 * Created instance will be cached in case $shared is true.
-	 *
-	 * @param string $name name of the service to register another backend for
-	 * @param Closure $closure the closure to be called on service creation
-	 * @param bool $shared
-	 */
-	public function registerService($name, Closure $closure, $shared = true) {
-		$name = $this->sanitizeName($name);
-		if (isset($this[$name]))  {
-			unset($this[$name]);
-		}
-		if ($shared) {
-			$this[$name] = $closure;
-		} else {
-			$this[$name] = parent::factory($closure);
-		}
-	}
-
-	/**
-	 * Shortcut for returning a service from a service under a different key,
-	 * e.g. to tell the container to return a class when queried for an
-	 * interface
-	 * @param string $alias the alias that should be registered
-	 * @param string $target the target that should be resolved instead
-	 */
-	public function registerAlias($alias, $target) {
-		$this->registerService($alias, function (IContainer $container) use ($target) {
-			return $container->query($target);
-		}, false);
-	}
-
-	/*
+    /**
+     * @param ReflectionClass $class the class to instantiate
+     * @return \stdClass the created class
+     */
+    private function buildClass(ReflectionClass $class) {
+        $constructor = $class->getConstructor();
+        if ($constructor === null) {
+            return $class->newInstance();
+        } else {
+            $parameters = [];
+            foreach ($constructor->getParameters() as $parameter) {
+                $parameterClass = $parameter->getClass();
+
+                // try to find out if it is a class or a simple parameter
+                if ($parameterClass === null) {
+                    $resolveName = $parameter->getName();
+                } else {
+                    $resolveName = $parameterClass->name;
+                }
+
+                $parameters[] = $this->query($resolveName);
+            }
+            return $class->newInstanceArgs($parameters);
+        }
+    }
+
+
+    /**
+     * If a parameter is not registered in the container try to instantiate it
+     * by using reflection to find out how to build the class
+     * @param string $name the class name to resolve
+     * @return \stdClass
+     * @throws QueryException if the class could not be found or instantiated
+     */
+    public function resolve($name) {
+        $baseMsg = 'Could not resolve ' . $name . '!';
+        try {
+            $class = new ReflectionClass($name);
+            if ($class->isInstantiable()) {
+                return $this->buildClass($class);
+            } else {
+                throw new QueryException($baseMsg .
+                    ' Class can not be instantiated');
+            }
+        } catch(ReflectionException $e) {
+            throw new QueryException($baseMsg . ' ' . $e->getMessage());
+        }
+    }
+
+
+    /**
+     * @param string $name name of the service to query for
+     * @return mixed registered service for the given $name
+     * @throws QueryException if the query could not be resolved
+     */
+    public function query($name) {
+        $name = $this->sanitizeName($name);
+        if ($this->offsetExists($name)) {
+            return $this->offsetGet($name);
+        } else {
+            $object = $this->resolve($name);
+            $this->registerService($name, function () use ($object) {
+                return $object;
+            });
+            return $object;
+        }
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     */
+    public function registerParameter($name, $value) {
+        $this[$name] = $value;
+    }
+
+    /**
+     * The given closure is call the first time the given service is queried.
+     * The closure has to return the instance for the given service.
+     * Created instance will be cached in case $shared is true.
+     *
+     * @param string $name name of the service to register another backend for
+     * @param Closure $closure the closure to be called on service creation
+     * @param bool $shared
+     */
+    public function registerService($name, Closure $closure, $shared = true) {
+        $name = $this->sanitizeName($name);
+        if (isset($this[$name]))  {
+            unset($this[$name]);
+        }
+        if ($shared) {
+            $this[$name] = $closure;
+        } else {
+            $this[$name] = parent::factory($closure);
+        }
+    }
+
+    /**
+     * Shortcut for returning a service from a service under a different key,
+     * e.g. to tell the container to return a class when queried for an
+     * interface
+     * @param string $alias the alias that should be registered
+     * @param string $target the target that should be resolved instead
+     */
+    public function registerAlias($alias, $target) {
+        $this->registerService($alias, function (IContainer $container) use ($target) {
+            return $container->query($target);
+        }, false);
+    }
+
+    /*
 	 * @param string $name
 	 * @return string
 	 */
-	protected function sanitizeName($name) {
-		return ltrim($name, '\\');
-	}
+    protected function sanitizeName($name) {
+        return ltrim($name, '\\');
+    }
 
 }

lib/private/AppFramework/Utility/TimeFactory.php

Indentation +6 added lines, -6 removed lines

@@ -34,12 +34,12 @@
 class TimeFactory implements ITimeFactory {
 
 
-	/**
-	 * @return int the result of a call to time()
-	 */
-	public function getTime() {
-		return time();
-	}
+    /**
+     * @return int the result of a call to time()
+     */
+    public function getTime() {
+        return time();
+    }
 
 
 }

lib/private/AppFramework/Core/API.php

Spacing +16 added lines, -16 removed lines

@@ -38,7 +38,7 @@ 
  * class and add your methods
  * @deprecated
  */
-class API implements IApi{
+class API implements IApi {
 
 	private $appName;
 
@@ -46,7 +46,7 @@ 
 	 * constructor
 	 * @param string $appName the name of your application
 	 */
-	public function __construct($appName){
+	public function __construct($appName) {
 		$this->appName = $appName;
 	}
 
@@ -56,7 +56,7 @@ 
 	 * @return string the user id of the current user
 	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
 	 */
-	public function getUserId(){
+	public function getUserId() {
 		return \OCP\User::getUser();
 	}
 
@@ -67,8 +67,8 @@ 
 	 * @param string $scriptName the name of the javascript in js/ without the suffix
 	 * @param string $appName the name of the app, defaults to the current one
 	 */
-	public function addScript($scriptName, $appName=null){
-		if($appName === null){
+	public function addScript($scriptName, $appName = null) {
+		if ($appName === null) {
 			$appName = $this->appName;
 		}
 		\OCP\Util::addScript($appName, $scriptName);
@@ -81,8 +81,8 @@ 
 	 * @param string $styleName the name of the css file in css/without the suffix
 	 * @param string $appName the name of the app, defaults to the current one
 	 */
-	public function addStyle($styleName, $appName=null){
-		if($appName === null){
+	public function addStyle($styleName, $appName = null) {
+		if ($appName === null) {
 			$appName = $this->appName;
 		}
 		\OCP\Util::addStyle($appName, $styleName);
@@ -94,8 +94,8 @@ 
 	 * shorthand for addScript for files in the 3rdparty directory
 	 * @param string $name the name of the file without the suffix
 	 */
-	public function add3rdPartyScript($name){
-		\OCP\Util::addScript($this->appName . '/3rdparty', $name);
+	public function add3rdPartyScript($name) {
+		\OCP\Util::addScript($this->appName.'/3rdparty', $name);
 	}
 
 
@@ -104,8 +104,8 @@ 
 	 * shorthand for addStyle for files in the 3rdparty directory
 	 * @param string $name the name of the file without the suffix
 	 */
-	public function add3rdPartyStyle($name){
-		\OCP\Util::addStyle($this->appName . '/3rdparty', $name);
+	public function add3rdPartyStyle($name) {
+		\OCP\Util::addStyle($this->appName.'/3rdparty', $name);
 	}
 
 
@@ -117,7 +117,7 @@ 
 	 * @param string $appName the name of an app
 	 * @return bool true if app is enabled
 	 */
-	public function isAppEnabled($appName){
+	public function isAppEnabled($appName) {
 		return \OCP\App::isEnabled($appName);
 	}
 
@@ -127,7 +127,7 @@ 
 	 * @return \OCP\IEventSource a new open EventSource class
 	 * @deprecated Use \OC::$server->createEventSource();
 	 */
-	public function openEventSource(){
+	public function openEventSource() {
 		return \OC::$server->createEventSource();
 	}
 
@@ -164,7 +164,7 @@ 
 	 * @param string $signalClass
 	 * @param string $signalName
 	 */
-	public function clearHook($signalClass=false, $signalName=false) {
+	public function clearHook($signalClass = false, $signalName = false) {
 		if ($signalClass) {
 			\OC_Hook::clear($signalClass, $signalName);
 		}
@@ -176,8 +176,8 @@ 
 	 * suffix, relative to your apps directory! not the template directory
 	 * @param string $appName the name of the app, defaults to the current one
 	 */
-	public function registerAdmin($mainPath, $appName=null) {
-		if($appName === null){
+	public function registerAdmin($mainPath, $appName = null) {
+		if ($appName === null) {
 			$appName = $this->appName;
 		}
 

Indentation +156 added lines, -156 removed lines

@@ -40,162 +40,162 @@
  */
 class API implements IApi{
 
-	private $appName;
-
-	/**
-	 * constructor
-	 * @param string $appName the name of your application
-	 */
-	public function __construct($appName){
-		$this->appName = $appName;
-	}
-
-
-	/**
-	 * Gets the userid of the current user
-	 * @return string the user id of the current user
-	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
-	 */
-	public function getUserId(){
-		return \OCP\User::getUser();
-	}
-
-
-	/**
-	 * Adds a new javascript file
-	 * @deprecated include javascript and css in template files
-	 * @param string $scriptName the name of the javascript in js/ without the suffix
-	 * @param string $appName the name of the app, defaults to the current one
-	 */
-	public function addScript($scriptName, $appName=null){
-		if($appName === null){
-			$appName = $this->appName;
-		}
-		\OCP\Util::addScript($appName, $scriptName);
-	}
-
-
-	/**
-	 * Adds a new css file
-	 * @deprecated include javascript and css in template files
-	 * @param string $styleName the name of the css file in css/without the suffix
-	 * @param string $appName the name of the app, defaults to the current one
-	 */
-	public function addStyle($styleName, $appName=null){
-		if($appName === null){
-			$appName = $this->appName;
-		}
-		\OCP\Util::addStyle($appName, $styleName);
-	}
-
-
-	/**
-	 * @deprecated include javascript and css in template files
-	 * shorthand for addScript for files in the 3rdparty directory
-	 * @param string $name the name of the file without the suffix
-	 */
-	public function add3rdPartyScript($name){
-		\OCP\Util::addScript($this->appName . '/3rdparty', $name);
-	}
-
-
-	/**
-	 * @deprecated include javascript and css in template files
-	 * shorthand for addStyle for files in the 3rdparty directory
-	 * @param string $name the name of the file without the suffix
-	 */
-	public function add3rdPartyStyle($name){
-		\OCP\Util::addStyle($this->appName . '/3rdparty', $name);
-	}
-
-
-	/**
-	 * @deprecated communication between apps should happen over built in
-	 * callbacks or interfaces (check the contacts and calendar managers)
-	 * Checks if an app is enabled
-	 * also use \OC::$server->getAppManager()->isEnabledForUser($appName)
-	 * @param string $appName the name of an app
-	 * @return bool true if app is enabled
-	 */
-	public function isAppEnabled($appName){
-		return \OCP\App::isEnabled($appName);
-	}
-
-
-	/**
-	 * used to return and open a new event source
-	 * @return \OCP\IEventSource a new open EventSource class
-	 * @deprecated Use \OC::$server->createEventSource();
-	 */
-	public function openEventSource(){
-		return \OC::$server->createEventSource();
-	}
-
-	/**
-	 * @deprecated register hooks directly for class that build in hook interfaces
-	 * connects a function to a hook
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param string $slotClass class name of slot
-	 * @param string $slotName name of slot, in another word, this is the
-	 *               name of the method that will be called when registered
-	 *               signal is emitted.
-	 * @return bool always true
-	 */
-	public function connectHook($signalClass, $signalName, $slotClass, $slotName) {
-		return \OCP\Util::connectHook($signalClass, $signalName, $slotClass, $slotName);
-	}
-
-	/**
-	 * @deprecated implement the emitter interface instead
-	 * Emits a signal. To get data from the slot use references!
-	 * @param string $signalClass class name of emitter
-	 * @param string $signalName name of signal
-	 * @param array $params default: array() array with additional data
-	 * @return bool true if slots exists or false if not
-	 */
-	public function emitHook($signalClass, $signalName, $params = array()) {
-		return  \OCP\Util::emitHook($signalClass, $signalName, $params);
-	}
-
-	/**
-	 * clear hooks
-	 * @deprecated clear hooks directly for class that build in hook interfaces
-	 * @param string $signalClass
-	 * @param string $signalName
-	 */
-	public function clearHook($signalClass=false, $signalName=false) {
-		if ($signalClass) {
-			\OC_Hook::clear($signalClass, $signalName);
-		}
-	}
-
-
-	/**
-	 * Register a backgroundjob task
-	 * @param string $className full namespace and class name of the class
-	 * @param string $methodName the name of the static method that should be
-	 * called
-	 * @deprecated Use \OC::$server->getJobList()->add();
-	 */
-	public function addRegularTask($className, $methodName) {
-		\OCP\Backgroundjob::addRegularTask($className, $methodName);
-	}
-
-
-	/**
-	 * Tells ownCloud to include a template in the admin overview
-	 * @param string $mainPath the path to the main php file without the php
-	 * suffix, relative to your apps directory! not the template directory
-	 * @param string $appName the name of the app, defaults to the current one
-	 */
-	public function registerAdmin($mainPath, $appName=null) {
-		if($appName === null){
-			$appName = $this->appName;
-		}
-
-		\OCP\App::registerAdmin($appName, $mainPath);
-	}
+    private $appName;
+
+    /**
+     * constructor
+     * @param string $appName the name of your application
+     */
+    public function __construct($appName){
+        $this->appName = $appName;
+    }
+
+
+    /**
+     * Gets the userid of the current user
+     * @return string the user id of the current user
+     * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
+     */
+    public function getUserId(){
+        return \OCP\User::getUser();
+    }
+
+
+    /**
+     * Adds a new javascript file
+     * @deprecated include javascript and css in template files
+     * @param string $scriptName the name of the javascript in js/ without the suffix
+     * @param string $appName the name of the app, defaults to the current one
+     */
+    public function addScript($scriptName, $appName=null){
+        if($appName === null){
+            $appName = $this->appName;
+        }
+        \OCP\Util::addScript($appName, $scriptName);
+    }
+
+
+    /**
+     * Adds a new css file
+     * @deprecated include javascript and css in template files
+     * @param string $styleName the name of the css file in css/without the suffix
+     * @param string $appName the name of the app, defaults to the current one
+     */
+    public function addStyle($styleName, $appName=null){
+        if($appName === null){
+            $appName = $this->appName;
+        }
+        \OCP\Util::addStyle($appName, $styleName);
+    }
+
+
+    /**
+     * @deprecated include javascript and css in template files
+     * shorthand for addScript for files in the 3rdparty directory
+     * @param string $name the name of the file without the suffix
+     */
+    public function add3rdPartyScript($name){
+        \OCP\Util::addScript($this->appName . '/3rdparty', $name);
+    }
+
+
+    /**
+     * @deprecated include javascript and css in template files
+     * shorthand for addStyle for files in the 3rdparty directory
+     * @param string $name the name of the file without the suffix
+     */
+    public function add3rdPartyStyle($name){
+        \OCP\Util::addStyle($this->appName . '/3rdparty', $name);
+    }
+
+
+    /**
+     * @deprecated communication between apps should happen over built in
+     * callbacks or interfaces (check the contacts and calendar managers)
+     * Checks if an app is enabled
+     * also use \OC::$server->getAppManager()->isEnabledForUser($appName)
+     * @param string $appName the name of an app
+     * @return bool true if app is enabled
+     */
+    public function isAppEnabled($appName){
+        return \OCP\App::isEnabled($appName);
+    }
+
+
+    /**
+     * used to return and open a new event source
+     * @return \OCP\IEventSource a new open EventSource class
+     * @deprecated Use \OC::$server->createEventSource();
+     */
+    public function openEventSource(){
+        return \OC::$server->createEventSource();
+    }
+
+    /**
+     * @deprecated register hooks directly for class that build in hook interfaces
+     * connects a function to a hook
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param string $slotClass class name of slot
+     * @param string $slotName name of slot, in another word, this is the
+     *               name of the method that will be called when registered
+     *               signal is emitted.
+     * @return bool always true
+     */
+    public function connectHook($signalClass, $signalName, $slotClass, $slotName) {
+        return \OCP\Util::connectHook($signalClass, $signalName, $slotClass, $slotName);
+    }
+
+    /**
+     * @deprecated implement the emitter interface instead
+     * Emits a signal. To get data from the slot use references!
+     * @param string $signalClass class name of emitter
+     * @param string $signalName name of signal
+     * @param array $params default: array() array with additional data
+     * @return bool true if slots exists or false if not
+     */
+    public function emitHook($signalClass, $signalName, $params = array()) {
+        return  \OCP\Util::emitHook($signalClass, $signalName, $params);
+    }
+
+    /**
+     * clear hooks
+     * @deprecated clear hooks directly for class that build in hook interfaces
+     * @param string $signalClass
+     * @param string $signalName
+     */
+    public function clearHook($signalClass=false, $signalName=false) {
+        if ($signalClass) {
+            \OC_Hook::clear($signalClass, $signalName);
+        }
+    }
+
+
+    /**
+     * Register a backgroundjob task
+     * @param string $className full namespace and class name of the class
+     * @param string $methodName the name of the static method that should be
+     * called
+     * @deprecated Use \OC::$server->getJobList()->add();
+     */
+    public function addRegularTask($className, $methodName) {
+        \OCP\Backgroundjob::addRegularTask($className, $methodName);
+    }
+
+
+    /**
+     * Tells ownCloud to include a template in the admin overview
+     * @param string $mainPath the path to the main php file without the php
+     * suffix, relative to your apps directory! not the template directory
+     * @param string $appName the name of the app, defaults to the current one
+     */
+    public function registerAdmin($mainPath, $appName=null) {
+        if($appName === null){
+            $appName = $this->appName;
+        }
+
+        \OCP\App::registerAdmin($appName, $mainPath);
+    }
 
 
 }