nextcloud / server

lib/public/activity/imanager.php

Indentation +186 added lines, -186 removed lines

@@ -39,190 +39,190 @@
  * @since 6.0.0
  */
 interface IManager {
-	/**
-	 * Generates a new IEvent object
-	 *
-	 * Make sure to call at least the following methods before sending it to the
-	 * app with via the publish() method:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function generateEvent();
-
-	/**
-	 * Publish an event to the activity consumers
-	 *
-	 * Make sure to call at least the following methods before sending an Event:
-	 *  - setApp()
-	 *  - setType()
-	 *  - setAffectedUser()
-	 *  - setSubject()
-	 *
-	 * @param IEvent $event
-	 * @return null
-	 * @since 8.2.0
-	 */
-	public function publish(IEvent $event);
-
-	/**
-	 * @param string $app           The app where this event is associated with
-	 * @param string $subject       A short description of the event
-	 * @param array  $subjectParams Array with parameters that are filled in the subject
-	 * @param string $message       A longer description of the event
-	 * @param array  $messageParams Array with parameters that are filled in the message
-	 * @param string $file          The file including path where this event is associated with
-	 * @param string $link          A link where this event is associated with
-	 * @param string $affectedUser  Recipient of the activity
-	 * @param string $type          Type of the notification
-	 * @param int    $priority      Priority of the notification
-	 * @return null
-	 * @since 6.0.0
-	 * @deprecated 8.2.0 Grab an IEvent from generateEvent() instead and use the publish() method
-	 */
-	public function publishActivity($app, $subject, $subjectParams, $message, $messageParams, $file, $link, $affectedUser, $type, $priority);
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of \OCP\Activity\IConsumer
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function registerConsumer(\Closure $callable);
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * activity consumers are actually requested
-	 *
-	 * $callable has to return an instance of \OCP\Activity\IExtension
-	 *
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 8.0.0
-	 */
-	public function registerExtension(\Closure $callable);
-
-	/**
-	 * Will return additional notification types as specified by other apps
-	 *
-	 * @param string $languageCode
-	 * @return array Array "stringID of the type" => "translated string description for the setting"
-	 * 				or Array "stringID of the type" => [
-	 * 					'desc' => "translated string description for the setting"
-	 * 					'methods' => [\OCP\Activity\IExtension::METHOD_*],
-	 * 				]
-	 * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
-	 */
-	public function getNotificationTypes($languageCode);
-
-	/**
-	 * @param string $method
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function getDefaultTypes($method);
-
-	/**
-	 * @param string $type
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getTypeIcon($type);
-
-	/**
-	 * @param string $type
-	 * @param int $id
-	 * @since 8.2.0
-	 */
-	public function setFormattingObject($type, $id);
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function isFormattingFilteredObject();
-
-	/**
-	 * @param string $app
-	 * @param string $text
-	 * @param array $params
-	 * @param boolean $stripPath
-	 * @param boolean $highlightParams
-	 * @param string $languageCode
-	 * @return string|false
-	 * @since 8.0.0
-	 */
-	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
-
-	/**
-	 * @param string $app
-	 * @param string $text
-	 * @return array|false
-	 * @since 8.0.0
-	 */
-	public function getSpecialParameterList($app, $text);
-
-	/**
-	 * @param array $activity
-	 * @return integer|false
-	 * @since 8.0.0
-	 */
-	public function getGroupParameter($activity);
-
-	/**
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function getNavigation();
-
-	/**
-	 * @param string $filterValue
-	 * @return boolean
-	 * @since 8.0.0
-	 */
-	public function isFilterValid($filterValue);
-
-	/**
-	 * @param array $types
-	 * @param string $filter
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function filterNotificationTypes($types, $filter);
-
-	/**
-	 * @param string $filter
-	 * @return array
-	 * @since 8.0.0
-	 */
-	public function getQueryForFilter($filter);
-
-
-	/**
-	 * Set the user we need to use
-	 *
-	 * @param string|null $currentUserId
-	 * @throws \UnexpectedValueException If the user is invalid
-	 * @since 9.0.1
-	 */
-	public function setCurrentUserId($currentUserId);
-
-	/**
-	 * Get the user we need to use
-	 *
-	 * Either the user is logged in, or we try to get it from the token
-	 *
-	 * @return string
-	 * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
-	 * @since 8.1.0
-	 */
-	public function getCurrentUserId();
+    /**
+     * Generates a new IEvent object
+     *
+     * Make sure to call at least the following methods before sending it to the
+     * app with via the publish() method:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function generateEvent();
+
+    /**
+     * Publish an event to the activity consumers
+     *
+     * Make sure to call at least the following methods before sending an Event:
+     *  - setApp()
+     *  - setType()
+     *  - setAffectedUser()
+     *  - setSubject()
+     *
+     * @param IEvent $event
+     * @return null
+     * @since 8.2.0
+     */
+    public function publish(IEvent $event);
+
+    /**
+     * @param string $app           The app where this event is associated with
+     * @param string $subject       A short description of the event
+     * @param array  $subjectParams Array with parameters that are filled in the subject
+     * @param string $message       A longer description of the event
+     * @param array  $messageParams Array with parameters that are filled in the message
+     * @param string $file          The file including path where this event is associated with
+     * @param string $link          A link where this event is associated with
+     * @param string $affectedUser  Recipient of the activity
+     * @param string $type          Type of the notification
+     * @param int    $priority      Priority of the notification
+     * @return null
+     * @since 6.0.0
+     * @deprecated 8.2.0 Grab an IEvent from generateEvent() instead and use the publish() method
+     */
+    public function publishActivity($app, $subject, $subjectParams, $message, $messageParams, $file, $link, $affectedUser, $type, $priority);
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * activity consumers are actually requested
+     *
+     * $callable has to return an instance of \OCP\Activity\IConsumer
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 6.0.0
+     */
+    public function registerConsumer(\Closure $callable);
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * activity consumers are actually requested
+     *
+     * $callable has to return an instance of \OCP\Activity\IExtension
+     *
+     * @param \Closure $callable
+     * @return void
+     * @since 8.0.0
+     */
+    public function registerExtension(\Closure $callable);
+
+    /**
+     * Will return additional notification types as specified by other apps
+     *
+     * @param string $languageCode
+     * @return array Array "stringID of the type" => "translated string description for the setting"
+     * 				or Array "stringID of the type" => [
+     * 					'desc' => "translated string description for the setting"
+     * 					'methods' => [\OCP\Activity\IExtension::METHOD_*],
+     * 				]
+     * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
+     */
+    public function getNotificationTypes($languageCode);
+
+    /**
+     * @param string $method
+     * @return array
+     * @since 8.0.0
+     */
+    public function getDefaultTypes($method);
+
+    /**
+     * @param string $type
+     * @return string
+     * @since 8.0.0
+     */
+    public function getTypeIcon($type);
+
+    /**
+     * @param string $type
+     * @param int $id
+     * @since 8.2.0
+     */
+    public function setFormattingObject($type, $id);
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function isFormattingFilteredObject();
+
+    /**
+     * @param string $app
+     * @param string $text
+     * @param array $params
+     * @param boolean $stripPath
+     * @param boolean $highlightParams
+     * @param string $languageCode
+     * @return string|false
+     * @since 8.0.0
+     */
+    public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
+
+    /**
+     * @param string $app
+     * @param string $text
+     * @return array|false
+     * @since 8.0.0
+     */
+    public function getSpecialParameterList($app, $text);
+
+    /**
+     * @param array $activity
+     * @return integer|false
+     * @since 8.0.0
+     */
+    public function getGroupParameter($activity);
+
+    /**
+     * @return array
+     * @since 8.0.0
+     */
+    public function getNavigation();
+
+    /**
+     * @param string $filterValue
+     * @return boolean
+     * @since 8.0.0
+     */
+    public function isFilterValid($filterValue);
+
+    /**
+     * @param array $types
+     * @param string $filter
+     * @return array
+     * @since 8.0.0
+     */
+    public function filterNotificationTypes($types, $filter);
+
+    /**
+     * @param string $filter
+     * @return array
+     * @since 8.0.0
+     */
+    public function getQueryForFilter($filter);
+
+
+    /**
+     * Set the user we need to use
+     *
+     * @param string|null $currentUserId
+     * @throws \UnexpectedValueException If the user is invalid
+     * @since 9.0.1
+     */
+    public function setCurrentUserId($currentUserId);
+
+    /**
+     * Get the user we need to use
+     *
+     * Either the user is logged in, or we try to get it from the token
+     *
+     * @return string
+     * @throws \UnexpectedValueException If the token is invalid, does not exist or is not unique
+     * @since 8.1.0
+     */
+    public function getCurrentUserId();
 }

lib/public/activity/ievent.php

Indentation +162 added lines, -162 removed lines

@@ -36,166 +36,166 @@
  * @since 8.2.0
  */
 interface IEvent {
-	/**
-	 * Set the app of the activity
-	 *
-	 * @param string $app
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setApp($app);
-
-	/**
-	 * Set the type of the activity
-	 *
-	 * @param string $type
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setType($type);
-
-	/**
-	 * Set the affected user of the activity
-	 *
-	 * @param string $user
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setAffectedUser($user);
-
-	/**
-	 * Set the author of the activity
-	 *
-	 * @param string $author
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setAuthor($author);
-
-	/**
-	 * Set the author of the activity
-	 *
-	 * @param int $timestamp
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setTimestamp($timestamp);
-
-	/**
-	 * Set the subject of the activity
-	 *
-	 * @param string $subject
-	 * @param array $parameters
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setSubject($subject, array $parameters = []);
-
-	/**
-	 * Set the message of the activity
-	 *
-	 * @param string $message
-	 * @param array $parameters
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setMessage($message, array $parameters = []);
-
-	/**
-	 * Set the object of the activity
-	 *
-	 * @param string $objectType
-	 * @param int $objectId
-	 * @param string $objectName
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setObject($objectType, $objectId, $objectName = '');
-
-	/**
-	 * Set the link of the activity
-	 *
-	 * @param string $link
-	 * @return IEvent
-	 * @since 8.2.0
-	 */
-	public function setLink($link);
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getApp();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getType();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getAffectedUser();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getAuthor();
-
-	/**
-	 * @return int
-	 * @since 8.2.0
-	 */
-	public function getTimestamp();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getSubject();
-
-	/**
-	 * @return array
-	 * @since 8.2.0
-	 */
-	public function getSubjectParameters();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getMessage();
-
-	/**
-	 * @return array
-	 * @since 8.2.0
-	 */
-	public function getMessageParameters();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getObjectType();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getObjectId();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getObjectName();
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLink();
+    /**
+     * Set the app of the activity
+     *
+     * @param string $app
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setApp($app);
+
+    /**
+     * Set the type of the activity
+     *
+     * @param string $type
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setType($type);
+
+    /**
+     * Set the affected user of the activity
+     *
+     * @param string $user
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setAffectedUser($user);
+
+    /**
+     * Set the author of the activity
+     *
+     * @param string $author
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setAuthor($author);
+
+    /**
+     * Set the author of the activity
+     *
+     * @param int $timestamp
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setTimestamp($timestamp);
+
+    /**
+     * Set the subject of the activity
+     *
+     * @param string $subject
+     * @param array $parameters
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setSubject($subject, array $parameters = []);
+
+    /**
+     * Set the message of the activity
+     *
+     * @param string $message
+     * @param array $parameters
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setMessage($message, array $parameters = []);
+
+    /**
+     * Set the object of the activity
+     *
+     * @param string $objectType
+     * @param int $objectId
+     * @param string $objectName
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setObject($objectType, $objectId, $objectName = '');
+
+    /**
+     * Set the link of the activity
+     *
+     * @param string $link
+     * @return IEvent
+     * @since 8.2.0
+     */
+    public function setLink($link);
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getApp();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getType();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getAffectedUser();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getAuthor();
+
+    /**
+     * @return int
+     * @since 8.2.0
+     */
+    public function getTimestamp();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getSubject();
+
+    /**
+     * @return array
+     * @since 8.2.0
+     */
+    public function getSubjectParameters();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getMessage();
+
+    /**
+     * @return array
+     * @since 8.2.0
+     */
+    public function getMessageParameters();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getObjectType();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getObjectId();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getObjectName();
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLink();
 }

lib/public/sabrepluginevent.php

Indentation +53 added lines, -53 removed lines

@@ -33,65 +33,65 @@
  */
 class SabrePluginEvent extends Event {
 
-	/** @var int */
-	protected $statusCode;
+    /** @var int */
+    protected $statusCode;
 
-	/** @var string */
-	protected $message;
+    /** @var string */
+    protected $message;
 
-	/** @var Server */
-	protected $server;
+    /** @var Server */
+    protected $server;
 
-	/**
-	 * @since 8.2.0
-	 */
-	public function __construct($server = null) {
-		$this->message = '';
-		$this->statusCode = Http::STATUS_OK;
-		$this->server = $server;
-	}
+    /**
+     * @since 8.2.0
+     */
+    public function __construct($server = null) {
+        $this->message = '';
+        $this->statusCode = Http::STATUS_OK;
+        $this->server = $server;
+    }
 
-	/**
-	 * @param int $statusCode
-	 * @return self
-	 * @since 8.2.0
-	 */
-	public function setStatusCode($statusCode) {
-		$this->statusCode = (int) $statusCode;
-		return $this;
-	}
+    /**
+     * @param int $statusCode
+     * @return self
+     * @since 8.2.0
+     */
+    public function setStatusCode($statusCode) {
+        $this->statusCode = (int) $statusCode;
+        return $this;
+    }
 
-	/**
-	 * @param string $message
-	 * @return self
-	 * @since 8.2.0
-	 */
-	public function setMessage($message) {
-		$this->message = (string) $message;
-		return $this;
-	}
+    /**
+     * @param string $message
+     * @return self
+     * @since 8.2.0
+     */
+    public function setMessage($message) {
+        $this->message = (string) $message;
+        return $this;
+    }
 
-	/**
-	 * @return int
-	 * @since 8.2.0
-	 */
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
+    /**
+     * @return int
+     * @since 8.2.0
+     */
+    public function getStatusCode() {
+        return $this->statusCode;
+    }
 
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getMessage() {
-		return $this->message;
-	}
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getMessage() {
+        return $this->message;
+    }
 
-	/**
-	 * @return null|Server
-	 * @since 9.0.0
-	 */
-	public function getServer() {
-		return $this->server;
-	}
+    /**
+     * @return null|Server
+     * @since 9.0.0
+     */
+    public function getServer() {
+        return $this->server;
+    }
 }

lib/autoloader.php

Indentation +161 added lines, -161 removed lines

@@ -34,165 +34,165 @@
 use \OCP\AutoloadNotAllowedException;
 
 class Autoloader {
-	/** @var bool */
-	private $useGlobalClassPath = true;
-	/** @var array */
-	private $validRoots = [];
-
-	/**
-	 * Optional low-latency memory cache for class to path mapping.
-	 *
-	 * @var \OC\Memcache\Cache
-	 */
-	protected $memoryCache;
-
-	/**
-	 * Autoloader constructor.
-	 *
-	 * @param string[] $validRoots
-	 */
-	public function __construct(array $validRoots) {
-		foreach ($validRoots as $root) {
-			$this->validRoots[$root] = true;
-		}
-	}
-
-	/**
-	 * Add a path to the list of valid php roots for auto loading
-	 *
-	 * @param string $root
-	 */
-	public function addValidRoot($root) {
-		$root = stream_resolve_include_path($root);
-		$this->validRoots[$root] = true;
-	}
-
-	/**
-	 * disable the usage of the global classpath \OC::$CLASSPATH
-	 */
-	public function disableGlobalClassPath() {
-		$this->useGlobalClassPath = false;
-	}
-
-	/**
-	 * enable the usage of the global classpath \OC::$CLASSPATH
-	 */
-	public function enableGlobalClassPath() {
-		$this->useGlobalClassPath = true;
-	}
-
-	/**
-	 * get the possible paths for a class
-	 *
-	 * @param string $class
-	 * @return array|bool an array of possible paths or false if the class is not part of ownCloud
-	 */
-	public function findClass($class) {
-		$class = trim($class, '\\');
-
-		$paths = array();
-		if ($this->useGlobalClassPath && array_key_exists($class, \OC::$CLASSPATH)) {
-			$paths[] = \OC::$CLASSPATH[$class];
-			/**
-			 * @TODO: Remove this when necessary
-			 * Remove "apps/" from inclusion path for smooth migration to mutli app dir
-			 */
-			if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
-				\OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
-				$paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
-			}
-		} elseif (strpos($class, 'OC_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
-			$paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
-		} elseif (strpos($class, 'OC\\') === 0) {
-			$split = explode('\\', $class, 3);
-
-			if (count($split) === 3) {
-				$split[1] = strtolower($split[1]);
-
-				if ($split[1] === 'core') {
-					$paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
-				} else if ($split[1] === 'settings') {
-					$paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
-				} else {
-					$paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
-				}
-
-			} else {
-				$paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('\\', '/', $split[1])) . '.php';
-			}
-		} elseif (strpos($class, 'OCP\\') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
-		} elseif (strpos($class, 'OCA\\') === 0) {
-			list(, $app, $rest) = explode('\\', $class, 3);
-			$app = strtolower($app);
-			$appPath = \OC_App::getAppPath($app);
-			if ($appPath && stream_resolve_include_path($appPath)) {
-				$paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
-				// If not found in the root of the app directory, insert '/lib' after app id and try again.
-				$paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
-			}
-		} elseif (strpos($class, 'Test_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
-		} elseif (strpos($class, 'Test\\') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
-		}
-		return $paths;
-	}
-
-	/**
-	 * @param string $fullPath
-	 * @return bool
-	 */
-	protected function isValidPath($fullPath) {
-		foreach ($this->validRoots as $root => $true) {
-			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
-				return true;
-			}
-		}
-		throw new AutoloadNotAllowedException($fullPath);
-	}
-
-	/**
-	 * Load the specified class
-	 *
-	 * @param string $class
-	 * @return bool
-	 */
-	public function load($class) {
-		$pathsToRequire = null;
-		if ($this->memoryCache) {
-			$pathsToRequire = $this->memoryCache->get($class);
-		}
-
-		if (!is_array($pathsToRequire)) {
-			// No cache or cache miss
-			$pathsToRequire = array();
-			foreach ($this->findClass($class) as $path) {
-				$fullPath = stream_resolve_include_path($path);
-				if ($fullPath && $this->isValidPath($fullPath)) {
-					$pathsToRequire[] = $fullPath;
-				}
-			}
-
-			if ($this->memoryCache) {
-				$this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
-			}
-		}
-
-		foreach ($pathsToRequire as $fullPath) {
-			require_once $fullPath;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Sets the optional low-latency cache for class to path mapping.
-	 *
-	 * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
-	 */
-	public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
-		$this->memoryCache = $memoryCache;
-	}
+    /** @var bool */
+    private $useGlobalClassPath = true;
+    /** @var array */
+    private $validRoots = [];
+
+    /**
+     * Optional low-latency memory cache for class to path mapping.
+     *
+     * @var \OC\Memcache\Cache
+     */
+    protected $memoryCache;
+
+    /**
+     * Autoloader constructor.
+     *
+     * @param string[] $validRoots
+     */
+    public function __construct(array $validRoots) {
+        foreach ($validRoots as $root) {
+            $this->validRoots[$root] = true;
+        }
+    }
+
+    /**
+     * Add a path to the list of valid php roots for auto loading
+     *
+     * @param string $root
+     */
+    public function addValidRoot($root) {
+        $root = stream_resolve_include_path($root);
+        $this->validRoots[$root] = true;
+    }
+
+    /**
+     * disable the usage of the global classpath \OC::$CLASSPATH
+     */
+    public function disableGlobalClassPath() {
+        $this->useGlobalClassPath = false;
+    }
+
+    /**
+     * enable the usage of the global classpath \OC::$CLASSPATH
+     */
+    public function enableGlobalClassPath() {
+        $this->useGlobalClassPath = true;
+    }
+
+    /**
+     * get the possible paths for a class
+     *
+     * @param string $class
+     * @return array|bool an array of possible paths or false if the class is not part of ownCloud
+     */
+    public function findClass($class) {
+        $class = trim($class, '\\');
+
+        $paths = array();
+        if ($this->useGlobalClassPath && array_key_exists($class, \OC::$CLASSPATH)) {
+            $paths[] = \OC::$CLASSPATH[$class];
+            /**
+             * @TODO: Remove this when necessary
+             * Remove "apps/" from inclusion path for smooth migration to mutli app dir
+             */
+            if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
+                \OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
+                $paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
+            }
+        } elseif (strpos($class, 'OC_') === 0) {
+            $paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+            $paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+        } elseif (strpos($class, 'OC\\') === 0) {
+            $split = explode('\\', $class, 3);
+
+            if (count($split) === 3) {
+                $split[1] = strtolower($split[1]);
+
+                if ($split[1] === 'core') {
+                    $paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+                } else if ($split[1] === 'settings') {
+                    $paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+                } else {
+                    $paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+                }
+
+            } else {
+                $paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('\\', '/', $split[1])) . '.php';
+            }
+        } elseif (strpos($class, 'OCP\\') === 0) {
+            $paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
+        } elseif (strpos($class, 'OCA\\') === 0) {
+            list(, $app, $rest) = explode('\\', $class, 3);
+            $app = strtolower($app);
+            $appPath = \OC_App::getAppPath($app);
+            if ($appPath && stream_resolve_include_path($appPath)) {
+                $paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+                // If not found in the root of the app directory, insert '/lib' after app id and try again.
+                $paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+            }
+        } elseif (strpos($class, 'Test_') === 0) {
+            $paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
+        } elseif (strpos($class, 'Test\\') === 0) {
+            $paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
+        }
+        return $paths;
+    }
+
+    /**
+     * @param string $fullPath
+     * @return bool
+     */
+    protected function isValidPath($fullPath) {
+        foreach ($this->validRoots as $root => $true) {
+            if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+                return true;
+            }
+        }
+        throw new AutoloadNotAllowedException($fullPath);
+    }
+
+    /**
+     * Load the specified class
+     *
+     * @param string $class
+     * @return bool
+     */
+    public function load($class) {
+        $pathsToRequire = null;
+        if ($this->memoryCache) {
+            $pathsToRequire = $this->memoryCache->get($class);
+        }
+
+        if (!is_array($pathsToRequire)) {
+            // No cache or cache miss
+            $pathsToRequire = array();
+            foreach ($this->findClass($class) as $path) {
+                $fullPath = stream_resolve_include_path($path);
+                if ($fullPath && $this->isValidPath($fullPath)) {
+                    $pathsToRequire[] = $fullPath;
+                }
+            }
+
+            if ($this->memoryCache) {
+                $this->memoryCache->set($class, $pathsToRequire, 60); // cache 60 sec
+            }
+        }
+
+        foreach ($pathsToRequire as $fullPath) {
+            require_once $fullPath;
+        }
+
+        return false;
+    }
+
+    /**
+     * Sets the optional low-latency cache for class to path mapping.
+     *
+     * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
+     */
+    public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
+        $this->memoryCache = $memoryCache;
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -98,12 +98,12 @@ 
 			 * Remove "apps/" from inclusion path for smooth migration to mutli app dir
 			 */
 			if (strpos(\OC::$CLASSPATH[$class], 'apps/') === 0) {
-				\OCP\Util::writeLog('core', 'include path for class "' . $class . '" starts with "apps/"', \OCP\Util::DEBUG);
+				\OCP\Util::writeLog('core', 'include path for class "'.$class.'" starts with "apps/"', \OCP\Util::DEBUG);
 				$paths[] = str_replace('apps/', '', \OC::$CLASSPATH[$class]);
 			}
 		} elseif (strpos($class, 'OC_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
-			$paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/lib/private/legacy/'.strtolower(str_replace('_', '/', substr($class, 3)).'.php');
+			$paths[] = \OC::$SERVERROOT.'/lib/private/'.strtolower(str_replace('_', '/', substr($class, 3)).'.php');
 		} elseif (strpos($class, 'OC\\') === 0) {
 			$split = explode('\\', $class, 3);
 
@@ -111,31 +111,31 @@ 
 				$split[1] = strtolower($split[1]);
 
 				if ($split[1] === 'core') {
-					$paths[] = \OC::$SERVERROOT . '/core/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+					$paths[] = \OC::$SERVERROOT.'/core/'.strtolower(str_replace('\\', '/', $split[2])).'.php';
 				} else if ($split[1] === 'settings') {
-					$paths[] = \OC::$SERVERROOT . '/settings/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+					$paths[] = \OC::$SERVERROOT.'/settings/'.strtolower(str_replace('\\', '/', $split[2])).'.php';
 				} else {
-					$paths[] = \OC::$SERVERROOT . '/lib/private/' . $split[1] . '/' . strtolower(str_replace('\\', '/', $split[2])) . '.php';
+					$paths[] = \OC::$SERVERROOT.'/lib/private/'.$split[1].'/'.strtolower(str_replace('\\', '/', $split[2])).'.php';
 				}
 
 			} else {
-				$paths[] = \OC::$SERVERROOT . '/lib/private/' . strtolower(str_replace('\\', '/', $split[1])) . '.php';
+				$paths[] = \OC::$SERVERROOT.'/lib/private/'.strtolower(str_replace('\\', '/', $split[1])).'.php';
 			}
 		} elseif (strpos($class, 'OCP\\') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/lib/public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/lib/public/'.strtolower(str_replace('\\', '/', substr($class, 4)).'.php');
 		} elseif (strpos($class, 'OCA\\') === 0) {
 			list(, $app, $rest) = explode('\\', $class, 3);
 			$app = strtolower($app);
 			$appPath = \OC_App::getAppPath($app);
 			if ($appPath && stream_resolve_include_path($appPath)) {
-				$paths[] = $appPath . '/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				$paths[] = $appPath.'/'.strtolower(str_replace('\\', '/', $rest).'.php');
 				// If not found in the root of the app directory, insert '/lib' after app id and try again.
-				$paths[] = $appPath . '/lib/' . strtolower(str_replace('\\', '/', $rest) . '.php');
+				$paths[] = $appPath.'/lib/'.strtolower(str_replace('\\', '/', $rest).'.php');
 			}
 		} elseif (strpos($class, 'Test_') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/tests/lib/'.strtolower(str_replace('_', '/', substr($class, 5)).'.php');
 		} elseif (strpos($class, 'Test\\') === 0) {
-			$paths[] = \OC::$SERVERROOT . '/tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
+			$paths[] = \OC::$SERVERROOT.'/tests/lib/'.strtolower(str_replace('\\', '/', substr($class, 5)).'.php');
 		}
 		return $paths;
 	}
@@ -146,7 +146,7 @@ 
 	 */
 	protected function isValidPath($fullPath) {
 		foreach ($this->validRoots as $root => $true) {
-			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+			if (substr($fullPath, 0, strlen($root) + 1) === $root.'/') {
 				return true;
 			}
 		}

lib/private/archive/zip.php

Indentation +194 added lines, -194 removed lines

@@ -29,201 +29,201 @@
  */
 
 class OC_Archive_ZIP extends OC_Archive{
-	/**
-	 * @var ZipArchive zip
-	 */
-	private $zip=null;
-	private $path;
+    /**
+     * @var ZipArchive zip
+     */
+    private $zip=null;
+    private $path;
 
-	/**
-	 * @param string $source
-	 */
-	function __construct($source) {
-		$this->path=$source;
-		$this->zip=new ZipArchive();
-		if($this->zip->open($source, ZipArchive::CREATE)) {
-		}else{
-			OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, OCP\Util::WARN);
-		}
-	}
-	/**
-	 * add an empty folder to the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	function addFolder($path) {
-		return $this->zip->addEmptyDir($path);
-	}
-	/**
-	 * add a file to the archive
-	 * @param string $path
-	 * @param string $source either a local file or string data
-	 * @return bool
-	 */
-	function addFile($path, $source='') {
-		if($source and $source[0]=='/' and file_exists($source)) {
-			$result=$this->zip->addFile($source, $path);
-		}else{
-			$result=$this->zip->addFromString($path, $source);
-		}
-		if($result) {
-			$this->zip->close();//close and reopen to save the zip
-			$this->zip->open($this->path);
-		}
-		return $result;
-	}
-	/**
-	 * rename a file or folder in the archive
-	 * @param string $source
-	 * @param string $dest
-	 * @return boolean|null
-	 */
-	function rename($source, $dest) {
-		$source=$this->stripPath($source);
-		$dest=$this->stripPath($dest);
-		$this->zip->renameName($source, $dest);
-	}
-	/**
-	 * get the uncompressed size of a file in the archive
-	 * @param string $path
-	 * @return int
-	 */
-	function filesize($path) {
-		$stat=$this->zip->statName($path);
-		return $stat['size'];
-	}
-	/**
-	 * get the last modified time of a file in the archive
-	 * @param string $path
-	 * @return int
-	 */
-	function mtime($path) {
-		return filemtime($this->path);
-	}
-	/**
-	 * get the files in a folder
-	 * @param string $path
-	 * @return array
-	 */
-	function getFolder($path) {
-		$files=$this->getFiles();
-		$folderContent=array();
-		$pathLength=strlen($path);
-		foreach($files as $file) {
-			if(substr($file, 0, $pathLength)==$path and $file!=$path) {
-				if(strrpos(substr($file, 0, -1), '/')<=$pathLength) {
-					$folderContent[]=substr($file, $pathLength);
-				}
-			}
-		}
-		return $folderContent;
-	}
-	/**
-	 * get all files in the archive
-	 * @return array
-	 */
-	function getFiles() {
-		$fileCount=$this->zip->numFiles;
-		$files=array();
-		for($i=0;$i<$fileCount;$i++) {
-			$files[]=$this->zip->getNameIndex($i);
-		}
-		return $files;
-	}
-	/**
-	 * get the content of a file
-	 * @param string $path
-	 * @return string
-	 */
-	function getFile($path) {
-		return $this->zip->getFromName($path);
-	}
-	/**
-	 * extract a single file from the archive
-	 * @param string $path
-	 * @param string $dest
-	 * @return boolean|null
-	 */
-	function extractFile($path, $dest) {
-		$fp = $this->zip->getStream($path);
-		file_put_contents($dest, $fp);
-	}
-	/**
-	 * extract the archive
-	 * @param string $dest
-	 * @return bool
-	 */
-	function extract($dest) {
-		return $this->zip->extractTo($dest);
-	}
-	/**
-	 * check if a file or folder exists in the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	function fileExists($path) {
-		return ($this->zip->locateName($path)!==false) or ($this->zip->locateName($path.'/')!==false);
-	}
-	/**
-	 * remove a file or folder from the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	function remove($path) {
-		if($this->fileExists($path.'/')) {
-			return $this->zip->deleteName($path.'/');
-		}else{
-			return $this->zip->deleteName($path);
-		}
-	}
-	/**
-	 * get a file handler
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 */
-	function getStream($path, $mode) {
-		if($mode=='r' or $mode=='rb') {
-			return $this->zip->getStream($path);
-		} else {
-			//since we cant directly get a writable stream,
-			//make a temp copy of the file and put it back
-			//in the archive when the stream is closed
-			if(strrpos($path, '.')!==false) {
-				$ext=substr($path, strrpos($path, '.'));
-			}else{
-				$ext='';
-			}
-			$tmpFile=OCP\Files::tmpFile($ext);
-			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
-			if($this->fileExists($path)) {
-				$this->extractFile($path, $tmpFile);
-			}
-			self::$tempFiles[$tmpFile]=$path;
-			return fopen('close://'.$tmpFile, $mode);
-		}
-	}
+    /**
+     * @param string $source
+     */
+    function __construct($source) {
+        $this->path=$source;
+        $this->zip=new ZipArchive();
+        if($this->zip->open($source, ZipArchive::CREATE)) {
+        }else{
+            OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, OCP\Util::WARN);
+        }
+    }
+    /**
+     * add an empty folder to the archive
+     * @param string $path
+     * @return bool
+     */
+    function addFolder($path) {
+        return $this->zip->addEmptyDir($path);
+    }
+    /**
+     * add a file to the archive
+     * @param string $path
+     * @param string $source either a local file or string data
+     * @return bool
+     */
+    function addFile($path, $source='') {
+        if($source and $source[0]=='/' and file_exists($source)) {
+            $result=$this->zip->addFile($source, $path);
+        }else{
+            $result=$this->zip->addFromString($path, $source);
+        }
+        if($result) {
+            $this->zip->close();//close and reopen to save the zip
+            $this->zip->open($this->path);
+        }
+        return $result;
+    }
+    /**
+     * rename a file or folder in the archive
+     * @param string $source
+     * @param string $dest
+     * @return boolean|null
+     */
+    function rename($source, $dest) {
+        $source=$this->stripPath($source);
+        $dest=$this->stripPath($dest);
+        $this->zip->renameName($source, $dest);
+    }
+    /**
+     * get the uncompressed size of a file in the archive
+     * @param string $path
+     * @return int
+     */
+    function filesize($path) {
+        $stat=$this->zip->statName($path);
+        return $stat['size'];
+    }
+    /**
+     * get the last modified time of a file in the archive
+     * @param string $path
+     * @return int
+     */
+    function mtime($path) {
+        return filemtime($this->path);
+    }
+    /**
+     * get the files in a folder
+     * @param string $path
+     * @return array
+     */
+    function getFolder($path) {
+        $files=$this->getFiles();
+        $folderContent=array();
+        $pathLength=strlen($path);
+        foreach($files as $file) {
+            if(substr($file, 0, $pathLength)==$path and $file!=$path) {
+                if(strrpos(substr($file, 0, -1), '/')<=$pathLength) {
+                    $folderContent[]=substr($file, $pathLength);
+                }
+            }
+        }
+        return $folderContent;
+    }
+    /**
+     * get all files in the archive
+     * @return array
+     */
+    function getFiles() {
+        $fileCount=$this->zip->numFiles;
+        $files=array();
+        for($i=0;$i<$fileCount;$i++) {
+            $files[]=$this->zip->getNameIndex($i);
+        }
+        return $files;
+    }
+    /**
+     * get the content of a file
+     * @param string $path
+     * @return string
+     */
+    function getFile($path) {
+        return $this->zip->getFromName($path);
+    }
+    /**
+     * extract a single file from the archive
+     * @param string $path
+     * @param string $dest
+     * @return boolean|null
+     */
+    function extractFile($path, $dest) {
+        $fp = $this->zip->getStream($path);
+        file_put_contents($dest, $fp);
+    }
+    /**
+     * extract the archive
+     * @param string $dest
+     * @return bool
+     */
+    function extract($dest) {
+        return $this->zip->extractTo($dest);
+    }
+    /**
+     * check if a file or folder exists in the archive
+     * @param string $path
+     * @return bool
+     */
+    function fileExists($path) {
+        return ($this->zip->locateName($path)!==false) or ($this->zip->locateName($path.'/')!==false);
+    }
+    /**
+     * remove a file or folder from the archive
+     * @param string $path
+     * @return bool
+     */
+    function remove($path) {
+        if($this->fileExists($path.'/')) {
+            return $this->zip->deleteName($path.'/');
+        }else{
+            return $this->zip->deleteName($path);
+        }
+    }
+    /**
+     * get a file handler
+     * @param string $path
+     * @param string $mode
+     * @return resource
+     */
+    function getStream($path, $mode) {
+        if($mode=='r' or $mode=='rb') {
+            return $this->zip->getStream($path);
+        } else {
+            //since we cant directly get a writable stream,
+            //make a temp copy of the file and put it back
+            //in the archive when the stream is closed
+            if(strrpos($path, '.')!==false) {
+                $ext=substr($path, strrpos($path, '.'));
+            }else{
+                $ext='';
+            }
+            $tmpFile=OCP\Files::tmpFile($ext);
+            \OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
+            if($this->fileExists($path)) {
+                $this->extractFile($path, $tmpFile);
+            }
+            self::$tempFiles[$tmpFile]=$path;
+            return fopen('close://'.$tmpFile, $mode);
+        }
+    }
 
-	private static $tempFiles=array();
-	/**
-	 * write back temporary files
-	 */
-	function writeBack($tmpFile) {
-		if(isset(self::$tempFiles[$tmpFile])) {
-			$this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
-			unlink($tmpFile);
-		}
-	}
+    private static $tempFiles=array();
+    /**
+     * write back temporary files
+     */
+    function writeBack($tmpFile) {
+        if(isset(self::$tempFiles[$tmpFile])) {
+            $this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
+            unlink($tmpFile);
+        }
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function stripPath($path) {
-		if(!$path || $path[0]=='/') {
-			return substr($path, 1);
-		}else{
-			return $path;
-		}
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function stripPath($path) {
+        if(!$path || $path[0]=='/') {
+            return substr($path, 1);
+        }else{
+            return $path;
+        }
+    }
 }

Spacing +42 added lines, -42 removed lines

@@ -28,21 +28,21 @@ 
  *
  */
 
-class OC_Archive_ZIP extends OC_Archive{
+class OC_Archive_ZIP extends OC_Archive {
 	/**
 	 * @var ZipArchive zip
 	 */
-	private $zip=null;
+	private $zip = null;
 	private $path;
 
 	/**
 	 * @param string $source
 	 */
 	function __construct($source) {
-		$this->path=$source;
-		$this->zip=new ZipArchive();
-		if($this->zip->open($source, ZipArchive::CREATE)) {
-		}else{
+		$this->path = $source;
+		$this->zip = new ZipArchive();
+		if ($this->zip->open($source, ZipArchive::CREATE)) {
+		} else {
 			OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, OCP\Util::WARN);
 		}
 	}
@@ -60,14 +60,14 @@ 
 	 * @param string $source either a local file or string data
 	 * @return bool
 	 */
-	function addFile($path, $source='') {
-		if($source and $source[0]=='/' and file_exists($source)) {
-			$result=$this->zip->addFile($source, $path);
-		}else{
-			$result=$this->zip->addFromString($path, $source);
+	function addFile($path, $source = '') {
+		if ($source and $source[0] == '/' and file_exists($source)) {
+			$result = $this->zip->addFile($source, $path);
+		} else {
+			$result = $this->zip->addFromString($path, $source);
 		}
-		if($result) {
-			$this->zip->close();//close and reopen to save the zip
+		if ($result) {
+			$this->zip->close(); //close and reopen to save the zip
 			$this->zip->open($this->path);
 		}
 		return $result;
@@ -79,8 +79,8 @@ 
 	 * @return boolean|null
 	 */
 	function rename($source, $dest) {
-		$source=$this->stripPath($source);
-		$dest=$this->stripPath($dest);
+		$source = $this->stripPath($source);
+		$dest = $this->stripPath($dest);
 		$this->zip->renameName($source, $dest);
 	}
 	/**
@@ -89,7 +89,7 @@ 
 	 * @return int
 	 */
 	function filesize($path) {
-		$stat=$this->zip->statName($path);
+		$stat = $this->zip->statName($path);
 		return $stat['size'];
 	}
 	/**
@@ -106,13 +106,13 @@ 
 	 * @return array
 	 */
 	function getFolder($path) {
-		$files=$this->getFiles();
-		$folderContent=array();
-		$pathLength=strlen($path);
-		foreach($files as $file) {
-			if(substr($file, 0, $pathLength)==$path and $file!=$path) {
-				if(strrpos(substr($file, 0, -1), '/')<=$pathLength) {
-					$folderContent[]=substr($file, $pathLength);
+		$files = $this->getFiles();
+		$folderContent = array();
+		$pathLength = strlen($path);
+		foreach ($files as $file) {
+			if (substr($file, 0, $pathLength) == $path and $file != $path) {
+				if (strrpos(substr($file, 0, -1), '/') <= $pathLength) {
+					$folderContent[] = substr($file, $pathLength);
 				}
 			}
 		}
@@ -123,10 +123,10 @@ 
 	 * @return array
 	 */
 	function getFiles() {
-		$fileCount=$this->zip->numFiles;
-		$files=array();
-		for($i=0;$i<$fileCount;$i++) {
-			$files[]=$this->zip->getNameIndex($i);
+		$fileCount = $this->zip->numFiles;
+		$files = array();
+		for ($i = 0; $i < $fileCount; $i++) {
+			$files[] = $this->zip->getNameIndex($i);
 		}
 		return $files;
 	}
@@ -162,7 +162,7 @@ 
 	 * @return bool
 	 */
 	function fileExists($path) {
-		return ($this->zip->locateName($path)!==false) or ($this->zip->locateName($path.'/')!==false);
+		return ($this->zip->locateName($path) !== false) or ($this->zip->locateName($path.'/') !== false);
 	}
 	/**
 	 * remove a file or folder from the archive
@@ -170,9 +170,9 @@ 
 	 * @return bool
 	 */
 	function remove($path) {
-		if($this->fileExists($path.'/')) {
+		if ($this->fileExists($path.'/')) {
 			return $this->zip->deleteName($path.'/');
-		}else{
+		} else {
 			return $this->zip->deleteName($path);
 		}
 	}
@@ -183,33 +183,33 @@ 
 	 * @return resource
 	 */
 	function getStream($path, $mode) {
-		if($mode=='r' or $mode=='rb') {
+		if ($mode == 'r' or $mode == 'rb') {
 			return $this->zip->getStream($path);
 		} else {
 			//since we cant directly get a writable stream,
 			//make a temp copy of the file and put it back
 			//in the archive when the stream is closed
-			if(strrpos($path, '.')!==false) {
-				$ext=substr($path, strrpos($path, '.'));
-			}else{
-				$ext='';
+			if (strrpos($path, '.') !== false) {
+				$ext = substr($path, strrpos($path, '.'));
+			} else {
+				$ext = '';
 			}
-			$tmpFile=OCP\Files::tmpFile($ext);
+			$tmpFile = OCP\Files::tmpFile($ext);
 			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
-			if($this->fileExists($path)) {
+			if ($this->fileExists($path)) {
 				$this->extractFile($path, $tmpFile);
 			}
-			self::$tempFiles[$tmpFile]=$path;
+			self::$tempFiles[$tmpFile] = $path;
 			return fopen('close://'.$tmpFile, $mode);
 		}
 	}
 
-	private static $tempFiles=array();
+	private static $tempFiles = array();
 	/**
 	 * write back temporary files
 	 */
 	function writeBack($tmpFile) {
-		if(isset(self::$tempFiles[$tmpFile])) {
+		if (isset(self::$tempFiles[$tmpFile])) {
 			$this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
 			unlink($tmpFile);
 		}
@@ -220,9 +220,9 @@ 
 	 * @return string
 	 */
 	private function stripPath($path) {
-		if(!$path || $path[0]=='/') {
+		if (!$path || $path[0] == '/') {
 			return substr($path, 1);
-		}else{
+		} else {
 			return $path;
 		}
 	}

Braces +5 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
 		$this->path=$source;
 		$this->zip=new ZipArchive();
 		if($this->zip->open($source, ZipArchive::CREATE)) {
-		}else{
+		} else{
 			OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, OCP\Util::WARN);
 		}
 	}
@@ -63,7 +63,7 @@ 
 	function addFile($path, $source='') {
 		if($source and $source[0]=='/' and file_exists($source)) {
 			$result=$this->zip->addFile($source, $path);
-		}else{
+		} else{
 			$result=$this->zip->addFromString($path, $source);
 		}
 		if($result) {
@@ -172,7 +172,7 @@ 
 	function remove($path) {
 		if($this->fileExists($path.'/')) {
 			return $this->zip->deleteName($path.'/');
-		}else{
+		} else{
 			return $this->zip->deleteName($path);
 		}
 	}
@@ -191,7 +191,7 @@ 
 			//in the archive when the stream is closed
 			if(strrpos($path, '.')!==false) {
 				$ext=substr($path, strrpos($path, '.'));
-			}else{
+			} else{
 				$ext='';
 			}
 			$tmpFile=OCP\Files::tmpFile($ext);
@@ -222,7 +222,7 @@ 
 	private function stripPath($path) {
 		if(!$path || $path[0]=='/') {
 			return substr($path, 1);
-		}else{
+		} else{
 			return $path;
 		}
 	}

lib/private/archive/tar.php

Indentation +333 added lines, -333 removed lines

@@ -32,358 +32,358 @@
  */
 
 class OC_Archive_TAR extends OC_Archive {
-	const PLAIN = 0;
-	const GZIP = 1;
-	const BZIP = 2;
+    const PLAIN = 0;
+    const GZIP = 1;
+    const BZIP = 2;
 
-	private $fileList;
-	private $cachedHeaders;
+    private $fileList;
+    private $cachedHeaders;
 
-	/**
-	 * @var Archive_Tar tar
-	 */
-	private $tar = null;
-	private $path;
+    /**
+     * @var Archive_Tar tar
+     */
+    private $tar = null;
+    private $path;
 
-	/**
-	 * @param string $source
-	 */
-	function __construct($source) {
-		$types = array(null, 'gz', 'bz2');
-		$this->path = $source;
-		$this->tar = new Archive_Tar($source, $types[self::getTarType($source)]);
-	}
+    /**
+     * @param string $source
+     */
+    function __construct($source) {
+        $types = array(null, 'gz', 'bz2');
+        $this->path = $source;
+        $this->tar = new Archive_Tar($source, $types[self::getTarType($source)]);
+    }
 
-	/**
-	 * try to detect the type of tar compression
-	 *
-	 * @param string $file
-	 * @return integer
-	 */
-	static public function getTarType($file) {
-		if (strpos($file, '.')) {
-			$extension = substr($file, strrpos($file, '.'));
-			switch ($extension) {
-				case '.gz':
-				case '.tgz':
-					return self::GZIP;
-				case '.bz':
-				case '.bz2':
-					return self::BZIP;
-				case '.tar':
-					return self::PLAIN;
-				default:
-					return self::PLAIN;
-			}
-		} else {
-			return self::PLAIN;
-		}
-	}
+    /**
+     * try to detect the type of tar compression
+     *
+     * @param string $file
+     * @return integer
+     */
+    static public function getTarType($file) {
+        if (strpos($file, '.')) {
+            $extension = substr($file, strrpos($file, '.'));
+            switch ($extension) {
+                case '.gz':
+                case '.tgz':
+                    return self::GZIP;
+                case '.bz':
+                case '.bz2':
+                    return self::BZIP;
+                case '.tar':
+                    return self::PLAIN;
+                default:
+                    return self::PLAIN;
+            }
+        } else {
+            return self::PLAIN;
+        }
+    }
 
-	/**
-	 * add an empty folder to the archive
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	function addFolder($path) {
-		$tmpBase = \OC::$server->getTempManager()->getTemporaryFolder();
-		if (substr($path, -1, 1) != '/') {
-			$path .= '/';
-		}
-		if ($this->fileExists($path)) {
-			return false;
-		}
-		$parts = explode('/', $path);
-		$folder = $tmpBase;
-		foreach ($parts as $part) {
-			$folder .= '/' . $part;
-			if (!is_dir($folder)) {
-				mkdir($folder);
-			}
-		}
-		$result = $this->tar->addModify(array($tmpBase . $path), '', $tmpBase);
-		rmdir($tmpBase . $path);
-		$this->fileList = false;
-		$this->cachedHeaders = false;
-		return $result;
-	}
+    /**
+     * add an empty folder to the archive
+     *
+     * @param string $path
+     * @return bool
+     */
+    function addFolder($path) {
+        $tmpBase = \OC::$server->getTempManager()->getTemporaryFolder();
+        if (substr($path, -1, 1) != '/') {
+            $path .= '/';
+        }
+        if ($this->fileExists($path)) {
+            return false;
+        }
+        $parts = explode('/', $path);
+        $folder = $tmpBase;
+        foreach ($parts as $part) {
+            $folder .= '/' . $part;
+            if (!is_dir($folder)) {
+                mkdir($folder);
+            }
+        }
+        $result = $this->tar->addModify(array($tmpBase . $path), '', $tmpBase);
+        rmdir($tmpBase . $path);
+        $this->fileList = false;
+        $this->cachedHeaders = false;
+        return $result;
+    }
 
-	/**
-	 * add a file to the archive
-	 *
-	 * @param string $path
-	 * @param string $source either a local file or string data
-	 * @return bool
-	 */
-	function addFile($path, $source = '') {
-		if ($this->fileExists($path)) {
-			$this->remove($path);
-		}
-		if ($source and $source[0] == '/' and file_exists($source)) {
-			$source = file_get_contents($source);
-		}
-		$result = $this->tar->addString($path, $source);
-		$this->fileList = false;
-		$this->cachedHeaders = false;
-		return $result;
-	}
+    /**
+     * add a file to the archive
+     *
+     * @param string $path
+     * @param string $source either a local file or string data
+     * @return bool
+     */
+    function addFile($path, $source = '') {
+        if ($this->fileExists($path)) {
+            $this->remove($path);
+        }
+        if ($source and $source[0] == '/' and file_exists($source)) {
+            $source = file_get_contents($source);
+        }
+        $result = $this->tar->addString($path, $source);
+        $this->fileList = false;
+        $this->cachedHeaders = false;
+        return $result;
+    }
 
-	/**
-	 * rename a file or folder in the archive
-	 *
-	 * @param string $source
-	 * @param string $dest
-	 * @return bool
-	 */
-	function rename($source, $dest) {
-		//no proper way to delete, rename entire archive, rename file and remake archive
-		$tmp = OCP\Files::tmpFolder();
-		$this->tar->extract($tmp);
-		rename($tmp . $source, $tmp . $dest);
-		$this->tar = null;
-		unlink($this->path);
-		$types = array(null, 'gz', 'bz');
-		$this->tar = new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
-		$this->tar->createModify(array($tmp), '', $tmp . '/');
-		$this->fileList = false;
-		$this->cachedHeaders = false;
-		return true;
-	}
+    /**
+     * rename a file or folder in the archive
+     *
+     * @param string $source
+     * @param string $dest
+     * @return bool
+     */
+    function rename($source, $dest) {
+        //no proper way to delete, rename entire archive, rename file and remake archive
+        $tmp = OCP\Files::tmpFolder();
+        $this->tar->extract($tmp);
+        rename($tmp . $source, $tmp . $dest);
+        $this->tar = null;
+        unlink($this->path);
+        $types = array(null, 'gz', 'bz');
+        $this->tar = new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
+        $this->tar->createModify(array($tmp), '', $tmp . '/');
+        $this->fileList = false;
+        $this->cachedHeaders = false;
+        return true;
+    }
 
-	/**
-	 * @param string $file
-	 */
-	private function getHeader($file) {
-		if (!$this->cachedHeaders) {
-			$this->cachedHeaders = $this->tar->listContent();
-		}
-		foreach ($this->cachedHeaders as $header) {
-			if ($file == $header['filename']
-				or $file . '/' == $header['filename']
-				or '/' . $file . '/' == $header['filename']
-				or '/' . $file == $header['filename']
-			) {
-				return $header;
-			}
-		}
-		return null;
-	}
+    /**
+     * @param string $file
+     */
+    private function getHeader($file) {
+        if (!$this->cachedHeaders) {
+            $this->cachedHeaders = $this->tar->listContent();
+        }
+        foreach ($this->cachedHeaders as $header) {
+            if ($file == $header['filename']
+                or $file . '/' == $header['filename']
+                or '/' . $file . '/' == $header['filename']
+                or '/' . $file == $header['filename']
+            ) {
+                return $header;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * get the uncompressed size of a file in the archive
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	function filesize($path) {
-		$stat = $this->getHeader($path);
-		return $stat['size'];
-	}
+    /**
+     * get the uncompressed size of a file in the archive
+     *
+     * @param string $path
+     * @return int
+     */
+    function filesize($path) {
+        $stat = $this->getHeader($path);
+        return $stat['size'];
+    }
 
-	/**
-	 * get the last modified time of a file in the archive
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	function mtime($path) {
-		$stat = $this->getHeader($path);
-		return $stat['mtime'];
-	}
+    /**
+     * get the last modified time of a file in the archive
+     *
+     * @param string $path
+     * @return int
+     */
+    function mtime($path) {
+        $stat = $this->getHeader($path);
+        return $stat['mtime'];
+    }
 
-	/**
-	 * get the files in a folder
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	function getFolder($path) {
-		$files = $this->getFiles();
-		$folderContent = array();
-		$pathLength = strlen($path);
-		foreach ($files as $file) {
-			if ($file[0] == '/') {
-				$file = substr($file, 1);
-			}
-			if (substr($file, 0, $pathLength) == $path and $file != $path) {
-				$result = substr($file, $pathLength);
-				if ($pos = strpos($result, '/')) {
-					$result = substr($result, 0, $pos + 1);
-				}
-				if (array_search($result, $folderContent) === false) {
-					$folderContent[] = $result;
-				}
-			}
-		}
-		return $folderContent;
-	}
+    /**
+     * get the files in a folder
+     *
+     * @param string $path
+     * @return array
+     */
+    function getFolder($path) {
+        $files = $this->getFiles();
+        $folderContent = array();
+        $pathLength = strlen($path);
+        foreach ($files as $file) {
+            if ($file[0] == '/') {
+                $file = substr($file, 1);
+            }
+            if (substr($file, 0, $pathLength) == $path and $file != $path) {
+                $result = substr($file, $pathLength);
+                if ($pos = strpos($result, '/')) {
+                    $result = substr($result, 0, $pos + 1);
+                }
+                if (array_search($result, $folderContent) === false) {
+                    $folderContent[] = $result;
+                }
+            }
+        }
+        return $folderContent;
+    }
 
-	/**
-	 * get all files in the archive
-	 *
-	 * @return array
-	 */
-	function getFiles() {
-		if ($this->fileList) {
-			return $this->fileList;
-		}
-		if (!$this->cachedHeaders) {
-			$this->cachedHeaders = $this->tar->listContent();
-		}
-		$files = array();
-		foreach ($this->cachedHeaders as $header) {
-			$files[] = $header['filename'];
-		}
-		$this->fileList = $files;
-		return $files;
-	}
+    /**
+     * get all files in the archive
+     *
+     * @return array
+     */
+    function getFiles() {
+        if ($this->fileList) {
+            return $this->fileList;
+        }
+        if (!$this->cachedHeaders) {
+            $this->cachedHeaders = $this->tar->listContent();
+        }
+        $files = array();
+        foreach ($this->cachedHeaders as $header) {
+            $files[] = $header['filename'];
+        }
+        $this->fileList = $files;
+        return $files;
+    }
 
-	/**
-	 * get the content of a file
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	function getFile($path) {
-		return $this->tar->extractInString($path);
-	}
+    /**
+     * get the content of a file
+     *
+     * @param string $path
+     * @return string
+     */
+    function getFile($path) {
+        return $this->tar->extractInString($path);
+    }
 
-	/**
-	 * extract a single file from the archive
-	 *
-	 * @param string $path
-	 * @param string $dest
-	 * @return bool
-	 */
-	function extractFile($path, $dest) {
-		$tmp = OCP\Files::tmpFolder();
-		if (!$this->fileExists($path)) {
-			return false;
-		}
-		if ($this->fileExists('/' . $path)) {
-			$success = $this->tar->extractList(array('/' . $path), $tmp);
-		} else {
-			$success = $this->tar->extractList(array($path), $tmp);
-		}
-		if ($success) {
-			rename($tmp . $path, $dest);
-		}
-		OCP\Files::rmdirr($tmp);
-		return $success;
-	}
+    /**
+     * extract a single file from the archive
+     *
+     * @param string $path
+     * @param string $dest
+     * @return bool
+     */
+    function extractFile($path, $dest) {
+        $tmp = OCP\Files::tmpFolder();
+        if (!$this->fileExists($path)) {
+            return false;
+        }
+        if ($this->fileExists('/' . $path)) {
+            $success = $this->tar->extractList(array('/' . $path), $tmp);
+        } else {
+            $success = $this->tar->extractList(array($path), $tmp);
+        }
+        if ($success) {
+            rename($tmp . $path, $dest);
+        }
+        OCP\Files::rmdirr($tmp);
+        return $success;
+    }
 
-	/**
-	 * extract the archive
-	 *
-	 * @param string $dest
-	 * @return bool
-	 */
-	function extract($dest) {
-		return $this->tar->extract($dest);
-	}
+    /**
+     * extract the archive
+     *
+     * @param string $dest
+     * @return bool
+     */
+    function extract($dest) {
+        return $this->tar->extract($dest);
+    }
 
-	/**
-	 * check if a file or folder exists in the archive
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	function fileExists($path) {
-		$files = $this->getFiles();
-		if ((array_search($path, $files) !== false) or (array_search($path . '/', $files) !== false)) {
-			return true;
-		} else {
-			$folderPath = $path;
-			if (substr($folderPath, -1, 1) != '/') {
-				$folderPath .= '/';
-			}
-			$pathLength = strlen($folderPath);
-			foreach ($files as $file) {
-				if (strlen($file) > $pathLength and substr($file, 0, $pathLength) == $folderPath) {
-					return true;
-				}
-			}
-		}
-		if ($path[0] != '/') { //not all programs agree on the use of a leading /
-			return $this->fileExists('/' . $path);
-		} else {
-			return false;
-		}
-	}
+    /**
+     * check if a file or folder exists in the archive
+     *
+     * @param string $path
+     * @return bool
+     */
+    function fileExists($path) {
+        $files = $this->getFiles();
+        if ((array_search($path, $files) !== false) or (array_search($path . '/', $files) !== false)) {
+            return true;
+        } else {
+            $folderPath = $path;
+            if (substr($folderPath, -1, 1) != '/') {
+                $folderPath .= '/';
+            }
+            $pathLength = strlen($folderPath);
+            foreach ($files as $file) {
+                if (strlen($file) > $pathLength and substr($file, 0, $pathLength) == $folderPath) {
+                    return true;
+                }
+            }
+        }
+        if ($path[0] != '/') { //not all programs agree on the use of a leading /
+            return $this->fileExists('/' . $path);
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * remove a file or folder from the archive
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	function remove($path) {
-		if (!$this->fileExists($path)) {
-			return false;
-		}
-		$this->fileList = false;
-		$this->cachedHeaders = false;
-		//no proper way to delete, extract entire archive, delete file and remake archive
-		$tmp = OCP\Files::tmpFolder();
-		$this->tar->extract($tmp);
-		OCP\Files::rmdirr($tmp . $path);
-		$this->tar = null;
-		unlink($this->path);
-		$this->reopen();
-		$this->tar->createModify(array($tmp), '', $tmp);
-		return true;
-	}
+    /**
+     * remove a file or folder from the archive
+     *
+     * @param string $path
+     * @return bool
+     */
+    function remove($path) {
+        if (!$this->fileExists($path)) {
+            return false;
+        }
+        $this->fileList = false;
+        $this->cachedHeaders = false;
+        //no proper way to delete, extract entire archive, delete file and remake archive
+        $tmp = OCP\Files::tmpFolder();
+        $this->tar->extract($tmp);
+        OCP\Files::rmdirr($tmp . $path);
+        $this->tar = null;
+        unlink($this->path);
+        $this->reopen();
+        $this->tar->createModify(array($tmp), '', $tmp);
+        return true;
+    }
 
-	/**
-	 * get a file handler
-	 *
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 */
-	function getStream($path, $mode) {
-		if (strrpos($path, '.') !== false) {
-			$ext = substr($path, strrpos($path, '.'));
-		} else {
-			$ext = '';
-		}
-		$tmpFile = OCP\Files::tmpFile($ext);
-		if ($this->fileExists($path)) {
-			$this->extractFile($path, $tmpFile);
-		} elseif ($mode == 'r' or $mode == 'rb') {
-			return false;
-		}
-		if ($mode == 'r' or $mode == 'rb') {
-			return fopen($tmpFile, $mode);
-		} else {
-			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
-			self::$tempFiles[$tmpFile] = $path;
-			return fopen('close://' . $tmpFile, $mode);
-		}
-	}
+    /**
+     * get a file handler
+     *
+     * @param string $path
+     * @param string $mode
+     * @return resource
+     */
+    function getStream($path, $mode) {
+        if (strrpos($path, '.') !== false) {
+            $ext = substr($path, strrpos($path, '.'));
+        } else {
+            $ext = '';
+        }
+        $tmpFile = OCP\Files::tmpFile($ext);
+        if ($this->fileExists($path)) {
+            $this->extractFile($path, $tmpFile);
+        } elseif ($mode == 'r' or $mode == 'rb') {
+            return false;
+        }
+        if ($mode == 'r' or $mode == 'rb') {
+            return fopen($tmpFile, $mode);
+        } else {
+            \OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
+            self::$tempFiles[$tmpFile] = $path;
+            return fopen('close://' . $tmpFile, $mode);
+        }
+    }
 
-	private static $tempFiles = array();
+    private static $tempFiles = array();
 
-	/**
-	 * write back temporary files
-	 */
-	function writeBack($tmpFile) {
-		if (isset(self::$tempFiles[$tmpFile])) {
-			$this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
-			unlink($tmpFile);
-		}
-	}
+    /**
+     * write back temporary files
+     */
+    function writeBack($tmpFile) {
+        if (isset(self::$tempFiles[$tmpFile])) {
+            $this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
+            unlink($tmpFile);
+        }
+    }
 
-	/**
-	 * reopen the archive to ensure everything is written
-	 */
-	private function reopen() {
-		if ($this->tar) {
-			$this->tar->_close();
-			$this->tar = null;
-		}
-		$types = array(null, 'gz', 'bz');
-		$this->tar = new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
-	}
+    /**
+     * reopen the archive to ensure everything is written
+     */
+    private function reopen() {
+        if ($this->tar) {
+            $this->tar->_close();
+            $this->tar = null;
+        }
+        $types = array(null, 'gz', 'bz');
+        $this->tar = new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -97,13 +97,13 @@ 
 		$parts = explode('/', $path);
 		$folder = $tmpBase;
 		foreach ($parts as $part) {
-			$folder .= '/' . $part;
+			$folder .= '/'.$part;
 			if (!is_dir($folder)) {
 				mkdir($folder);
 			}
 		}
-		$result = $this->tar->addModify(array($tmpBase . $path), '', $tmpBase);
-		rmdir($tmpBase . $path);
+		$result = $this->tar->addModify(array($tmpBase.$path), '', $tmpBase);
+		rmdir($tmpBase.$path);
 		$this->fileList = false;
 		$this->cachedHeaders = false;
 		return $result;
@@ -140,12 +140,12 @@ 
 		//no proper way to delete, rename entire archive, rename file and remake archive
 		$tmp = OCP\Files::tmpFolder();
 		$this->tar->extract($tmp);
-		rename($tmp . $source, $tmp . $dest);
+		rename($tmp.$source, $tmp.$dest);
 		$this->tar = null;
 		unlink($this->path);
 		$types = array(null, 'gz', 'bz');
 		$this->tar = new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
-		$this->tar->createModify(array($tmp), '', $tmp . '/');
+		$this->tar->createModify(array($tmp), '', $tmp.'/');
 		$this->fileList = false;
 		$this->cachedHeaders = false;
 		return true;
@@ -160,9 +160,9 @@ 
 		}
 		foreach ($this->cachedHeaders as $header) {
 			if ($file == $header['filename']
-				or $file . '/' == $header['filename']
-				or '/' . $file . '/' == $header['filename']
-				or '/' . $file == $header['filename']
+				or $file.'/' == $header['filename']
+				or '/'.$file.'/' == $header['filename']
+				or '/'.$file == $header['filename']
 			) {
 				return $header;
 			}
@@ -261,13 +261,13 @@ 
 		if (!$this->fileExists($path)) {
 			return false;
 		}
-		if ($this->fileExists('/' . $path)) {
-			$success = $this->tar->extractList(array('/' . $path), $tmp);
+		if ($this->fileExists('/'.$path)) {
+			$success = $this->tar->extractList(array('/'.$path), $tmp);
 		} else {
 			$success = $this->tar->extractList(array($path), $tmp);
 		}
 		if ($success) {
-			rename($tmp . $path, $dest);
+			rename($tmp.$path, $dest);
 		}
 		OCP\Files::rmdirr($tmp);
 		return $success;
@@ -291,7 +291,7 @@ 
 	 */
 	function fileExists($path) {
 		$files = $this->getFiles();
-		if ((array_search($path, $files) !== false) or (array_search($path . '/', $files) !== false)) {
+		if ((array_search($path, $files) !== false) or (array_search($path.'/', $files) !== false)) {
 			return true;
 		} else {
 			$folderPath = $path;
@@ -306,7 +306,7 @@ 
 			}
 		}
 		if ($path[0] != '/') { //not all programs agree on the use of a leading /
-			return $this->fileExists('/' . $path);
+			return $this->fileExists('/'.$path);
 		} else {
 			return false;
 		}
@@ -327,7 +327,7 @@ 
 		//no proper way to delete, extract entire archive, delete file and remake archive
 		$tmp = OCP\Files::tmpFolder();
 		$this->tar->extract($tmp);
-		OCP\Files::rmdirr($tmp . $path);
+		OCP\Files::rmdirr($tmp.$path);
 		$this->tar = null;
 		unlink($this->path);
 		$this->reopen();
@@ -359,7 +359,7 @@ 
 		} else {
 			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
 			self::$tempFiles[$tmpFile] = $path;
-			return fopen('close://' . $tmpFile, $mode);
+			return fopen('close://'.$tmpFile, $mode);
 		}
 	}
 

lib/private/l10n/string.php

Indentation +40 added lines, -40 removed lines

@@ -27,53 +27,53 @@
  */
 
 class OC_L10N_String implements JsonSerializable {
-	/** @var \OC_L10N|\OC\L10N\L10N */
-	protected $l10n;
+    /** @var \OC_L10N|\OC\L10N\L10N */
+    protected $l10n;
 
-	/** @var string */
-	protected $text;
+    /** @var string */
+    protected $text;
 
-	/** @var array */
-	protected $parameters;
+    /** @var array */
+    protected $parameters;
 
-	/** @var integer */
-	protected $count;
+    /** @var integer */
+    protected $count;
 
-	/**
-	 * @param \OC_L10N|\OC\L10N\L10N $l10n
-	 * @param string|string[] $text
-	 * @param array $parameters
-	 * @param int $count
-	 */
-	public function __construct($l10n, $text, $parameters, $count = 1) {
-		$this->l10n = $l10n;
-		$this->text = $text;
-		$this->parameters = $parameters;
-		$this->count = $count;
-	}
+    /**
+     * @param \OC_L10N|\OC\L10N\L10N $l10n
+     * @param string|string[] $text
+     * @param array $parameters
+     * @param int $count
+     */
+    public function __construct($l10n, $text, $parameters, $count = 1) {
+        $this->l10n = $l10n;
+        $this->text = $text;
+        $this->parameters = $parameters;
+        $this->count = $count;
+    }
 
-	public function __toString() {
-		$translations = $this->l10n->getTranslations();
+    public function __toString() {
+        $translations = $this->l10n->getTranslations();
 
-		$text = $this->text;
-		if(array_key_exists($this->text, $translations)) {
-			if(is_array($translations[$this->text])) {
-				$fn = $this->l10n->getPluralFormFunction();
-				$id = $fn($this->count);
-				$text = $translations[$this->text][$id];
-			}
-			else{
-				$text = $translations[$this->text];
-			}
-		}
+        $text = $this->text;
+        if(array_key_exists($this->text, $translations)) {
+            if(is_array($translations[$this->text])) {
+                $fn = $this->l10n->getPluralFormFunction();
+                $id = $fn($this->count);
+                $text = $translations[$this->text][$id];
+            }
+            else{
+                $text = $translations[$this->text];
+            }
+        }
 
-		// Replace %n first (won't interfere with vsprintf)
-		$text = str_replace('%n', $this->count, $text);
-		return vsprintf($text, $this->parameters);
-	}
+        // Replace %n first (won't interfere with vsprintf)
+        $text = str_replace('%n', $this->count, $text);
+        return vsprintf($text, $this->parameters);
+    }
 
 
-	public function jsonSerialize() {
-		return $this->__toString();
-	}
+    public function jsonSerialize() {
+        return $this->__toString();
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -56,13 +56,13 @@
 		$translations = $this->l10n->getTranslations();
 
 		$text = $this->text;
-		if(array_key_exists($this->text, $translations)) {
-			if(is_array($translations[$this->text])) {
+		if (array_key_exists($this->text, $translations)) {
+			if (is_array($translations[$this->text])) {
 				$fn = $this->l10n->getPluralFormFunction();
 				$id = $fn($this->count);
 				$text = $translations[$this->text][$id];
 			}
-			else{
+			else {
 				$text = $translations[$this->text];
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
 				$fn = $this->l10n->getPluralFormFunction();
 				$id = $fn($this->count);
 				$text = $translations[$this->text][$id];
-			}
-			else{
+			} else{
 				$text = $translations[$this->text];
 			}
 		}

lib/private/lock/nooplockingprovider.php

Indentation +21 added lines, -21 removed lines

@@ -35,35 +35,35 @@
     /**
      * {@inheritdoc}
      */
-	public function isLocked($path, $type) {
-		return false;
-	}
+    public function isLocked($path, $type) {
+        return false;
+    }
 
     /**
      * {@inheritdoc}
      */
-	public function acquireLock($path, $type) {
-		// do nothing
-	}
+    public function acquireLock($path, $type) {
+        // do nothing
+    }
 
-	/**
+    /**
      * {@inheritdoc}
-	 */
-	public function releaseLock($path, $type) {
-		// do nothing
-	}
+     */
+    public function releaseLock($path, $type) {
+        // do nothing
+    }
 
-	/**1
+    /**1
 	 * {@inheritdoc}
 	 */
-	public function releaseAll() {
-		// do nothing
-	}
+    public function releaseAll() {
+        // do nothing
+    }
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function changeLock($path, $targetType) {
-		// do nothing
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function changeLock($path, $targetType) {
+        // do nothing
+    }
 }

lib/private/lock/abstractlockingprovider.php

Indentation +84 added lines, -84 removed lines

@@ -29,95 +29,95 @@
  * to release any left over locks at the end of the request
  */
 abstract class AbstractLockingProvider implements ILockingProvider {
-	const TTL = 3600; // how long until we clear stray locks in seconds
+    const TTL = 3600; // how long until we clear stray locks in seconds
 
-	protected $acquiredLocks = [
-		'shared' => [],
-		'exclusive' => []
-	];
+    protected $acquiredLocks = [
+        'shared' => [],
+        'exclusive' => []
+    ];
 
-	/**
-	 * Check if we've locally acquired a lock
-	 *
-	 * @param string $path
-	 * @param int $type
-	 * @return bool
-	 */
-	protected function hasAcquiredLock($path, $type) {
-		if ($type === self::LOCK_SHARED) {
-			return isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 0;
-		} else {
-			return isset($this->acquiredLocks['exclusive'][$path]) && $this->acquiredLocks['exclusive'][$path] === true;
-		}
-	}
+    /**
+     * Check if we've locally acquired a lock
+     *
+     * @param string $path
+     * @param int $type
+     * @return bool
+     */
+    protected function hasAcquiredLock($path, $type) {
+        if ($type === self::LOCK_SHARED) {
+            return isset($this->acquiredLocks['shared'][$path]) && $this->acquiredLocks['shared'][$path] > 0;
+        } else {
+            return isset($this->acquiredLocks['exclusive'][$path]) && $this->acquiredLocks['exclusive'][$path] === true;
+        }
+    }
 
-	/**
-	 * Mark a locally acquired lock
-	 *
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markAcquire($path, $type) {
-		if ($type === self::LOCK_SHARED) {
-			if (!isset($this->acquiredLocks['shared'][$path])) {
-				$this->acquiredLocks['shared'][$path] = 0;
-			}
-			$this->acquiredLocks['shared'][$path]++;
-		} else {
-			$this->acquiredLocks['exclusive'][$path] = true;
-		}
-	}
+    /**
+     * Mark a locally acquired lock
+     *
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markAcquire($path, $type) {
+        if ($type === self::LOCK_SHARED) {
+            if (!isset($this->acquiredLocks['shared'][$path])) {
+                $this->acquiredLocks['shared'][$path] = 0;
+            }
+            $this->acquiredLocks['shared'][$path]++;
+        } else {
+            $this->acquiredLocks['exclusive'][$path] = true;
+        }
+    }
 
-	/**
-	 * Mark a release of a locally acquired lock
-	 *
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markRelease($path, $type) {
-		if ($type === self::LOCK_SHARED) {
-			if (isset($this->acquiredLocks['shared'][$path]) and $this->acquiredLocks['shared'][$path] > 0) {
-				$this->acquiredLocks['shared'][$path]--;
-				if ($this->acquiredLocks['shared'][$path] === 0) {
-					unset($this->acquiredLocks['shared'][$path]);
-				}
-			}
-		} else if ($type === self::LOCK_EXCLUSIVE) {
-			unset($this->acquiredLocks['exclusive'][$path]);
-		}
-	}
+    /**
+     * Mark a release of a locally acquired lock
+     *
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markRelease($path, $type) {
+        if ($type === self::LOCK_SHARED) {
+            if (isset($this->acquiredLocks['shared'][$path]) and $this->acquiredLocks['shared'][$path] > 0) {
+                $this->acquiredLocks['shared'][$path]--;
+                if ($this->acquiredLocks['shared'][$path] === 0) {
+                    unset($this->acquiredLocks['shared'][$path]);
+                }
+            }
+        } else if ($type === self::LOCK_EXCLUSIVE) {
+            unset($this->acquiredLocks['exclusive'][$path]);
+        }
+    }
 
-	/**
-	 * Change the type of an existing tracked lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 */
-	protected function markChange($path, $targetType) {
-		if ($targetType === self::LOCK_SHARED) {
-			unset($this->acquiredLocks['exclusive'][$path]);
-			if (!isset($this->acquiredLocks['shared'][$path])) {
-				$this->acquiredLocks['shared'][$path] = 0;
-			}
-			$this->acquiredLocks['shared'][$path]++;
-		} else if ($targetType === self::LOCK_EXCLUSIVE) {
-			$this->acquiredLocks['exclusive'][$path] = true;
-			$this->acquiredLocks['shared'][$path]--;
-		}
-	}
+    /**
+     * Change the type of an existing tracked lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     */
+    protected function markChange($path, $targetType) {
+        if ($targetType === self::LOCK_SHARED) {
+            unset($this->acquiredLocks['exclusive'][$path]);
+            if (!isset($this->acquiredLocks['shared'][$path])) {
+                $this->acquiredLocks['shared'][$path] = 0;
+            }
+            $this->acquiredLocks['shared'][$path]++;
+        } else if ($targetType === self::LOCK_EXCLUSIVE) {
+            $this->acquiredLocks['exclusive'][$path] = true;
+            $this->acquiredLocks['shared'][$path]--;
+        }
+    }
 
-	/**
-	 * release all lock acquired by this instance which were marked using the mark* methods
-	 */
-	public function releaseAll() {
-		foreach ($this->acquiredLocks['shared'] as $path => $count) {
-			for ($i = 0; $i < $count; $i++) {
-				$this->releaseLock($path, self::LOCK_SHARED);
-			}
-		}
+    /**
+     * release all lock acquired by this instance which were marked using the mark* methods
+     */
+    public function releaseAll() {
+        foreach ($this->acquiredLocks['shared'] as $path => $count) {
+            for ($i = 0; $i < $count; $i++) {
+                $this->releaseLock($path, self::LOCK_SHARED);
+            }
+        }
 
-		foreach ($this->acquiredLocks['exclusive'] as $path => $hasLock) {
-			$this->releaseLock($path, self::LOCK_EXCLUSIVE);
-		}
-	}
+        foreach ($this->acquiredLocks['exclusive'] as $path => $hasLock) {
+            $this->releaseLock($path, self::LOCK_EXCLUSIVE);
+        }
+    }
 }