nextcloud / server

lib/private/DateTimeZone.php

Indentation +86 added lines, -86 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -64,7 +64,7 @@ 
 		try {
 			return new \DateTimeZone($timeZone);
 		} catch (\Exception $e) {
-			\OCP\Util::writeLog('datetimezone', 'Failed to created DateTimeZone "' . $timeZone . "'", \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('datetimezone', 'Failed to created DateTimeZone "'.$timeZone."'", \OCP\Util::DEBUG);
 			return new \DateTimeZone($this->getDefaultTimeZone());
 		}
 	}
@@ -85,9 +85,9 @@ 
 			// so a positive offset means negative timeZone
 			// and the other way around.
 			if ($offset > 0) {
-				$timeZone = 'Etc/GMT-' . $offset;
+				$timeZone = 'Etc/GMT-'.$offset;
 			} else {
-				$timeZone = 'Etc/GMT+' . abs($offset);
+				$timeZone = 'Etc/GMT+'.abs($offset);
 			}
 
 			return new \DateTimeZone($timeZone);
@@ -109,7 +109,7 @@ 
 			}
 
 			// No timezone found, fallback to UTC
-			\OCP\Util::writeLog('datetimezone', 'Failed to find DateTimeZone for offset "' . $offset . "'", \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('datetimezone', 'Failed to find DateTimeZone for offset "'.$offset."'", \OCP\Util::DEBUG);
 			return new \DateTimeZone($this->getDefaultTimeZone());
 		}
 	}

lib/private/Tagging/TagMapper.php

Indentation +39 added lines, -39 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -50,12 +50,12 @@ 
 	* @return array An array of Tag objects.
 	*/
 	public function loadTags($owners, $type) {
-		if(!is_array($owners)) {
+		if (!is_array($owners)) {
 			$owners = array($owners);
 		}
 
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners)-1) . '?) AND `type` = ? ORDER BY `category`';
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `'.$this->getTableName().'` '
+			. 'WHERE `uid` IN ('.str_repeat('?,', count($owners) - 1).'?) AND `type` = ? ORDER BY `category`';
 		return $this->findEntities($sql, array_merge($owners, array($type)));
 	}
 
@@ -66,7 +66,7 @@ 
 	* @return bool
 	*/
 	public function tagExists($tag) {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `'.$this->getTableName().'` '
 			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
 		try {
 			$this->findEntity($sql, array($tag->getOwner(), $tag->getType(), $tag->getName()));

lib/private/Tagging/Tag.php

Indentation +47 added lines, -47 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	 * @todo migrate existing database columns to the correct names
 	 * to be able to drop this direct mapping
 	 */
-	public function columnToProperty($columnName){
+	public function columnToProperty($columnName) {
 		if ($columnName === 'category') {
 		    return 'name';
 		} elseif ($columnName === 'uid') {
@@ -78,7 +78,7 @@ 
 	 * @param string $property the name of the property
 	 * @return string the column name
 	 */
-	public function propertyToColumn($property){
+	public function propertyToColumn($property) {
 		if ($property === 'name') {
 		    return 'category';
 		} elseif ($property === 'owner') {

lib/private/Route/CachingRouter.php

Indentation +32 added lines, -32 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 	 */
 	public function generate($name, $parameters = array(), $absolute = false) {
 		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . intval($absolute);
+		$key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).intval($absolute);
 		$cachedKey = $this->cache->get($key);
 		if ($cachedKey) {
 			return $cachedKey;

lib/private/TagManager.php

Indentation +44 added lines, -44 removed lines

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

lib/private/ContactsManager.php

Indentation +160 added lines, -160 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@ 
 		public function search($pattern, $searchProperties = array(), $options = array()) {
 			$this->loadAddressBooks();
 			$result = array();
-			foreach($this->addressBooks as $addressBook) {
+			foreach ($this->addressBooks as $addressBook) {
 				$r = $addressBook->search($pattern, $searchProperties, $options);
 				$contacts = array();
-				foreach($r as $c){
+				foreach ($r as $c) {
 					$c['addressbook-key'] = $addressBook->getKey();
 					$contacts[] = $c;
 				}
@@ -124,7 +124,7 @@ 
 		public function getAddressBooks() {
 			$this->loadAddressBooks();
 			$result = array();
-			foreach($this->addressBooks as $addressBook) {
+			foreach ($this->addressBooks as $addressBook) {
 				$result[$addressBook->getKey()] = $addressBook->getDisplayName();
 			}
 
@@ -181,7 +181,7 @@ 
 		 */
 		protected function loadAddressBooks()
 		{
-			foreach($this->addressBookLoaders as $callable) {
+			foreach ($this->addressBookLoaders as $callable) {
 				$callable($this);
 			}
 			$this->addressBookLoaders = array();

lib/private/Installer.php

Braces +1 added lines, -1 removed lines

@@ -412,7 +412,7 @@
 			$appDir = OC_App::getInstallPath() . '/' . $appId;
 			OC_Helper::rmdirr($appDir);
 			return true;
-		}else{
+		} else{
 			\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', \OCP\Util::ERROR);
 
 			return false;

Unused Use Statements -5 removed lines

@@ -36,17 +36,12 @@
 namespace OC;
 
 use Doctrine\DBAL\Exception\TableExistsException;
-use OC\App\AppManager;
 use OC\App\AppStore\Bundles\Bundle;
 use OC\App\AppStore\Fetcher\AppFetcher;
-use OC\App\CodeChecker\CodeChecker;
-use OC\App\CodeChecker\EmptyCheck;
-use OC\App\CodeChecker\PrivateCheck;
 use OC\Archive\TAR;
 use OC_App;
 use OC_DB;
 use OC_Helper;
-use OCP\App\IAppManager;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\ILogger;

Indentation +542 added lines, -542 removed lines

@@ -57,546 +57,546 @@
  * This class provides the functionality needed to install, update and remove apps
  */
 class Installer {
-	/** @var AppFetcher */
-	private $appFetcher;
-	/** @var IClientService */
-	private $clientService;
-	/** @var ITempManager */
-	private $tempManager;
-	/** @var ILogger */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-	/** @var array - for caching the result of app fetcher */
-	private $apps = null;
-	/** @var bool|null - for caching the result of the ready status */
-	private $isInstanceReadyForUpdates = null;
-
-	/**
-	 * @param AppFetcher $appFetcher
-	 * @param IClientService $clientService
-	 * @param ITempManager $tempManager
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(AppFetcher $appFetcher,
-								IClientService $clientService,
-								ITempManager $tempManager,
-								ILogger $logger,
-								IConfig $config) {
-		$this->appFetcher = $appFetcher;
-		$this->clientService = $clientService;
-		$this->tempManager = $tempManager;
-		$this->logger = $logger;
-		$this->config = $config;
-	}
-
-	/**
-	 * Installs an app that is located in one of the app folders already
-	 *
-	 * @param string $appId App to install
-	 * @throws \Exception
-	 * @return string app ID
-	 */
-	public function installApp($appId) {
-		$app = \OC_App::findAppInDirectories($appId);
-		if($app === false) {
-			throw new \Exception('App not found in any app directory');
-		}
-
-		$basedir = $app['path'].'/'.$appId;
-		$info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
-
-		$l = \OC::$server->getL10N('core');
-
-		if(!is_array($info)) {
-			throw new \Exception(
-				$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
-					[$info['name']]
-				)
-			);
-		}
-
-		$version = \OCP\Util::getVersion();
-		if (!\OC_App::isAppCompatible($version, $info)) {
-			throw new \Exception(
-				// TODO $l
-				$l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
-					[$info['name']]
-				)
-			);
-		}
-
-		// check for required dependencies
-		\OC_App::checkAppDependencies($this->config, $l, $info);
-		\OC_App::registerAutoloading($appId, $basedir);
-
-		//install the database
-		if(is_file($basedir.'/appinfo/database.xml')) {
-			if (\OC::$server->getAppConfig()->getValue($info['id'], 'installed_version') === null) {
-				OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml');
-			} else {
-				OC_DB::updateDbFromStructure($basedir.'/appinfo/database.xml');
-			}
-		} else {
-			$ms = new \OC\DB\MigrationService($info['id'], \OC::$server->getDatabaseConnection());
-			$ms->migrate();
-		}
-
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-		if(isset($info['settings']) && is_array($info['settings'])) {
-			\OC::$server->getSettingsManager()->setupSettings($info['settings']);
-		}
-
-		//run appinfo/install.php
-		if((!isset($data['noinstall']) or $data['noinstall']==false)) {
-			self::includeAppScript($basedir . '/appinfo/install.php');
-		}
-
-		$appData = OC_App::getAppInfo($appId);
-		OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
-
-		//set the installed version
-		\OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false));
-		\OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
-
-		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
-			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
-		}
-		foreach($info['public'] as $name=>$path) {
-			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		return $info['id'];
-	}
-
-	/**
-	 * @brief checks whether or not an app is installed
-	 * @param string $app app
-	 * @returns bool
-	 *
-	 * Checks whether or not an app is installed, i.e. registered in apps table.
-	 */
-	public static function isInstalled( $app ) {
-		return (\OC::$server->getConfig()->getAppValue($app, "installed_version", null) !== null);
-	}
-
-	/**
-	 * Updates the specified app from the appstore
-	 *
-	 * @param string $appId
-	 * @return bool
-	 */
-	public function updateAppstoreApp($appId) {
-		if($this->isUpdateAvailable($appId)) {
-			try {
-				$this->downloadApp($appId);
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), ['app' => 'core']);
-				return false;
-			}
-			return OC_App::updateApp($appId);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Downloads an app and puts it into the app directory
-	 *
-	 * @param string $appId
-	 *
-	 * @throws \Exception If the installation was not successful
-	 */
-	public function downloadApp($appId) {
-		$appId = strtolower($appId);
-
-		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
-			if($app['id'] === $appId) {
-				// Load the certificate
-				$certificate = new X509();
-				$certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
-				$loadedCertificate = $certificate->loadX509($app['certificate']);
-
-				// Verify if the certificate has been revoked
-				$crl = new X509();
-				$crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
-				if($crl->validateSignature() !== true) {
-					throw new \Exception('Could not validate CRL signature');
-				}
-				$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
-				$revoked = $crl->getRevoked($csn);
-				if ($revoked !== false) {
-					throw new \Exception(
-						sprintf(
-							'Certificate "%s" has been revoked',
-							$csn
-						)
-					);
-				}
-
-				// Verify if the certificate has been issued by the Nextcloud Code Authority CA
-				if($certificate->validateSignature() !== true) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
-							$appId
-						)
-					);
-				}
-
-				// Verify if the certificate is issued for the requested app id
-				$certInfo = openssl_x509_parse($app['certificate']);
-				if(!isset($certInfo['subject']['CN'])) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert with no CN',
-							$appId
-						)
-					);
-				}
-				if($certInfo['subject']['CN'] !== $appId) {
-					throw new \Exception(
-						sprintf(
-							'App with id %s has a cert issued to %s',
-							$appId,
-							$certInfo['subject']['CN']
-						)
-					);
-				}
-
-				// Download the release
-				$tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
-				$client = $this->clientService->newClient();
-				$client->get($app['releases'][0]['download'], ['save_to' => $tempFile]);
-
-				// Check if the signature actually matches the downloaded content
-				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
-				openssl_free_key($certificate);
-
-				if($verified === true) {
-					// Seems to match, let's proceed
-					$extractDir = $this->tempManager->getTemporaryFolder();
-					$archive = new TAR($tempFile);
-
-					if($archive) {
-						if (!$archive->extract($extractDir)) {
-							throw new \Exception(
-								sprintf(
-									'Could not extract app %s',
-									$appId
-								)
-							);
-						}
-						$allFiles = scandir($extractDir);
-						$folders = array_diff($allFiles, ['.', '..']);
-						$folders = array_values($folders);
-
-						if(count($folders) > 1) {
-							throw new \Exception(
-								sprintf(
-									'Extracted app %s has more than 1 folder',
-									$appId
-								)
-							);
-						}
-
-						// Check if appinfo/info.xml has the same app ID as well
-						$loadEntities = libxml_disable_entity_loader(false);
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
-						libxml_disable_entity_loader($loadEntities);
-						if((string)$xml->id !== $appId) {
-							throw new \Exception(
-								sprintf(
-									'App for id %s has a wrong app ID in info.xml: %s',
-									$appId,
-									(string)$xml->id
-								)
-							);
-						}
-
-						// Check if the version is lower than before
-						$currentVersion = OC_App::getAppVersion($appId);
-						$newVersion = (string)$xml->version;
-						if(version_compare($currentVersion, $newVersion) === 1) {
-							throw new \Exception(
-								sprintf(
-									'App for id %s has version %s and tried to update to lower version %s',
-									$appId,
-									$currentVersion,
-									$newVersion
-								)
-							);
-						}
-
-						$baseDir = OC_App::getInstallPath() . '/' . $appId;
-						// Remove old app with the ID if existent
-						OC_Helper::rmdirr($baseDir);
-						// Move to app folder
-						if(@mkdir($baseDir)) {
-							$extractDir .= '/' . $folders[0];
-							OC_Helper::copyr($extractDir, $baseDir);
-						}
-						OC_Helper::copyr($extractDir, $baseDir);
-						OC_Helper::rmdirr($extractDir);
-						return;
-					} else {
-						throw new \Exception(
-							sprintf(
-								'Could not extract app with ID %s to %s',
-								$appId,
-								$extractDir
-							)
-						);
-					}
-				} else {
-					// Signature does not match
-					throw new \Exception(
-						sprintf(
-							'App with id %s has invalid signature',
-							$appId
-						)
-					);
-				}
-			}
-		}
-
-		throw new \Exception(
-			sprintf(
-				'Could not download app %s',
-				$appId
-			)
-		);
-	}
-
-	/**
-	 * Check if an update for the app is available
-	 *
-	 * @param string $appId
-	 * @return string|false false or the version number of the update
-	 */
-	public function isUpdateAvailable($appId) {
-		if ($this->isInstanceReadyForUpdates === null) {
-			$installPath = OC_App::getInstallPath();
-			if ($installPath === false || $installPath === null) {
-				$this->isInstanceReadyForUpdates = false;
-			} else {
-				$this->isInstanceReadyForUpdates = true;
-			}
-		}
-
-		if ($this->isInstanceReadyForUpdates === false) {
-			return false;
-		}
-
-		if ($this->apps === null) {
-			$apps = $this->appFetcher->get();
-		}
-
-		foreach($apps as $app) {
-			if($app['id'] === $appId) {
-				$currentVersion = OC_App::getAppVersion($appId);
-				$newestVersion = $app['releases'][0]['version'];
-				if (version_compare($newestVersion, $currentVersion, '>')) {
-					return $newestVersion;
-				} else {
-					return false;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Check if app is already downloaded
-	 * @param string $name name of the application to remove
-	 * @return boolean
-	 *
-	 * The function will check if the app is already downloaded in the apps repository
-	 */
-	public function isDownloaded($name) {
-		foreach(\OC::$APPSROOTS as $dir) {
-			$dirToTest  = $dir['path'];
-			$dirToTest .= '/';
-			$dirToTest .= $name;
-			$dirToTest .= '/';
-
-			if (is_dir($dirToTest)) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Removes an app
-	 * @param string $appId ID of the application to remove
-	 * @return boolean
-	 *
-	 *
-	 * This function works as follows
-	 *   -# call uninstall repair steps
-	 *   -# removing the files
-	 *
-	 * The function will not delete preferences, tables and the configuration,
-	 * this has to be done by the function oc_app_uninstall().
-	 */
-	public function removeApp($appId) {
-		if($this->isDownloaded( $appId )) {
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
-			OC_Helper::rmdirr($appDir);
-			return true;
-		}else{
-			\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', \OCP\Util::ERROR);
-
-			return false;
-		}
-
-	}
-
-	/**
-	 * Installs the app within the bundle and marks the bundle as installed
-	 *
-	 * @param Bundle $bundle
-	 * @throws \Exception If app could not get installed
-	 */
-	public function installAppBundle(Bundle $bundle) {
-		$appIds = $bundle->getAppIdentifiers();
-		foreach($appIds as $appId) {
-			if(!$this->isDownloaded($appId)) {
-				$this->downloadApp($appId);
-			}
-			$this->installApp($appId);
-			$app = new OC_App();
-			$app->enable($appId);
-		}
-		$bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
-		$bundles[] = $bundle->getIdentifier();
-		$this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
-	}
-
-	/**
-	 * Installs shipped apps
-	 *
-	 * This function installs all apps found in the 'apps' directory that should be enabled by default;
-	 * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
-	 *                         working ownCloud at the end instead of an aborted update.
-	 * @return array Array of error messages (appid => Exception)
-	 */
-	public static function installShippedApps($softErrors = false) {
-		$errors = [];
-		foreach(\OC::$APPSROOTS as $app_dir) {
-			if($dir = opendir( $app_dir['path'] )) {
-				while( false !== ( $filename = readdir( $dir ))) {
-					if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ) {
-						if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) {
-							if(!Installer::isInstalled($filename)) {
-								$info=OC_App::getAppInfo($filename);
-								$enabled = isset($info['default_enable']);
-								if (($enabled || in_array($filename, \OC::$server->getAppManager()->getAlwaysEnabledApps()))
-									  && \OC::$server->getConfig()->getAppValue($filename, 'enabled') !== 'no') {
-									if ($softErrors) {
-										try {
-											Installer::installShippedApp($filename);
-										} catch (HintException $e) {
-											if ($e->getPrevious() instanceof TableExistsException) {
-												$errors[$filename] = $e;
-												continue;
-											}
-											throw $e;
-										}
-									} else {
-										Installer::installShippedApp($filename);
-									}
-									\OC::$server->getConfig()->setAppValue($filename, 'enabled', 'yes');
-								}
-							}
-						}
-					}
-				}
-				closedir( $dir );
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * install an app already placed in the app folder
-	 * @param string $app id of the app to install
-	 * @return integer
-	 */
-	public static function installShippedApp($app) {
-		//install the database
-		$appPath = OC_App::getAppPath($app);
-		\OC_App::registerAutoloading($app, $appPath);
-
-		if(is_file("$appPath/appinfo/database.xml")) {
-			try {
-				OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
-			} catch (TableExistsException $e) {
-				throw new HintException(
-					'Failed to enable app ' . $app,
-					'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer noopener">support channels</a>.',
-					0, $e
-				);
-			}
-		} else {
-			$ms = new \OC\DB\MigrationService($app, \OC::$server->getDatabaseConnection());
-			$ms->migrate();
-		}
-
-		//run appinfo/install.php
-		self::includeAppScript("$appPath/appinfo/install.php");
-
-		$info = OC_App::getAppInfo($app);
-		if (is_null($info)) {
-			return false;
-		}
-		\OC_App::setupBackgroundJobs($info['background-jobs']);
-
-		OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
-
-		$config = \OC::$server->getConfig();
-
-		$config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app));
-		if (array_key_exists('ocsid', $info)) {
-			$config->setAppValue($app, 'ocsid', $info['ocsid']);
-		}
-
-		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
-			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
-		}
-		foreach($info['public'] as $name=>$path) {
-			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
-		}
-
-		OC_App::setAppTypes($info['id']);
-
-		if(isset($info['settings']) && is_array($info['settings'])) {
-			// requires that autoloading was registered for the app,
-			// as happens before running the install.php some lines above
-			\OC::$server->getSettingsManager()->setupSettings($info['settings']);
-		}
-
-		return $info['id'];
-	}
-
-	/**
-	 * @param string $script
-	 */
-	private static function includeAppScript($script) {
-		if ( file_exists($script) ){
-			include $script;
-		}
-	}
+    /** @var AppFetcher */
+    private $appFetcher;
+    /** @var IClientService */
+    private $clientService;
+    /** @var ITempManager */
+    private $tempManager;
+    /** @var ILogger */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+    /** @var array - for caching the result of app fetcher */
+    private $apps = null;
+    /** @var bool|null - for caching the result of the ready status */
+    private $isInstanceReadyForUpdates = null;
+
+    /**
+     * @param AppFetcher $appFetcher
+     * @param IClientService $clientService
+     * @param ITempManager $tempManager
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(AppFetcher $appFetcher,
+                                IClientService $clientService,
+                                ITempManager $tempManager,
+                                ILogger $logger,
+                                IConfig $config) {
+        $this->appFetcher = $appFetcher;
+        $this->clientService = $clientService;
+        $this->tempManager = $tempManager;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    /**
+     * Installs an app that is located in one of the app folders already
+     *
+     * @param string $appId App to install
+     * @throws \Exception
+     * @return string app ID
+     */
+    public function installApp($appId) {
+        $app = \OC_App::findAppInDirectories($appId);
+        if($app === false) {
+            throw new \Exception('App not found in any app directory');
+        }
+
+        $basedir = $app['path'].'/'.$appId;
+        $info = OC_App::getAppInfo($basedir.'/appinfo/info.xml', true);
+
+        $l = \OC::$server->getL10N('core');
+
+        if(!is_array($info)) {
+            throw new \Exception(
+                $l->t('App "%s" cannot be installed because appinfo file cannot be read.',
+                    [$info['name']]
+                )
+            );
+        }
+
+        $version = \OCP\Util::getVersion();
+        if (!\OC_App::isAppCompatible($version, $info)) {
+            throw new \Exception(
+                // TODO $l
+                $l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
+                    [$info['name']]
+                )
+            );
+        }
+
+        // check for required dependencies
+        \OC_App::checkAppDependencies($this->config, $l, $info);
+        \OC_App::registerAutoloading($appId, $basedir);
+
+        //install the database
+        if(is_file($basedir.'/appinfo/database.xml')) {
+            if (\OC::$server->getAppConfig()->getValue($info['id'], 'installed_version') === null) {
+                OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml');
+            } else {
+                OC_DB::updateDbFromStructure($basedir.'/appinfo/database.xml');
+            }
+        } else {
+            $ms = new \OC\DB\MigrationService($info['id'], \OC::$server->getDatabaseConnection());
+            $ms->migrate();
+        }
+
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+        if(isset($info['settings']) && is_array($info['settings'])) {
+            \OC::$server->getSettingsManager()->setupSettings($info['settings']);
+        }
+
+        //run appinfo/install.php
+        if((!isset($data['noinstall']) or $data['noinstall']==false)) {
+            self::includeAppScript($basedir . '/appinfo/install.php');
+        }
+
+        $appData = OC_App::getAppInfo($appId);
+        OC_App::executeRepairSteps($appId, $appData['repair-steps']['install']);
+
+        //set the installed version
+        \OC::$server->getConfig()->setAppValue($info['id'], 'installed_version', OC_App::getAppVersion($info['id'], false));
+        \OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
+
+        //set remote/public handlers
+        foreach($info['remote'] as $name=>$path) {
+            \OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
+        }
+        foreach($info['public'] as $name=>$path) {
+            \OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        return $info['id'];
+    }
+
+    /**
+     * @brief checks whether or not an app is installed
+     * @param string $app app
+     * @returns bool
+     *
+     * Checks whether or not an app is installed, i.e. registered in apps table.
+     */
+    public static function isInstalled( $app ) {
+        return (\OC::$server->getConfig()->getAppValue($app, "installed_version", null) !== null);
+    }
+
+    /**
+     * Updates the specified app from the appstore
+     *
+     * @param string $appId
+     * @return bool
+     */
+    public function updateAppstoreApp($appId) {
+        if($this->isUpdateAvailable($appId)) {
+            try {
+                $this->downloadApp($appId);
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), ['app' => 'core']);
+                return false;
+            }
+            return OC_App::updateApp($appId);
+        }
+
+        return false;
+    }
+
+    /**
+     * Downloads an app and puts it into the app directory
+     *
+     * @param string $appId
+     *
+     * @throws \Exception If the installation was not successful
+     */
+    public function downloadApp($appId) {
+        $appId = strtolower($appId);
+
+        $apps = $this->appFetcher->get();
+        foreach($apps as $app) {
+            if($app['id'] === $appId) {
+                // Load the certificate
+                $certificate = new X509();
+                $certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+                $loadedCertificate = $certificate->loadX509($app['certificate']);
+
+                // Verify if the certificate has been revoked
+                $crl = new X509();
+                $crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+                $crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
+                if($crl->validateSignature() !== true) {
+                    throw new \Exception('Could not validate CRL signature');
+                }
+                $csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
+                $revoked = $crl->getRevoked($csn);
+                if ($revoked !== false) {
+                    throw new \Exception(
+                        sprintf(
+                            'Certificate "%s" has been revoked',
+                            $csn
+                        )
+                    );
+                }
+
+                // Verify if the certificate has been issued by the Nextcloud Code Authority CA
+                if($certificate->validateSignature() !== true) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a certificate not issued by a trusted Code Signing Authority',
+                            $appId
+                        )
+                    );
+                }
+
+                // Verify if the certificate is issued for the requested app id
+                $certInfo = openssl_x509_parse($app['certificate']);
+                if(!isset($certInfo['subject']['CN'])) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert with no CN',
+                            $appId
+                        )
+                    );
+                }
+                if($certInfo['subject']['CN'] !== $appId) {
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has a cert issued to %s',
+                            $appId,
+                            $certInfo['subject']['CN']
+                        )
+                    );
+                }
+
+                // Download the release
+                $tempFile = $this->tempManager->getTemporaryFile('.tar.gz');
+                $client = $this->clientService->newClient();
+                $client->get($app['releases'][0]['download'], ['save_to' => $tempFile]);
+
+                // Check if the signature actually matches the downloaded content
+                $certificate = openssl_get_publickey($app['certificate']);
+                $verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+                openssl_free_key($certificate);
+
+                if($verified === true) {
+                    // Seems to match, let's proceed
+                    $extractDir = $this->tempManager->getTemporaryFolder();
+                    $archive = new TAR($tempFile);
+
+                    if($archive) {
+                        if (!$archive->extract($extractDir)) {
+                            throw new \Exception(
+                                sprintf(
+                                    'Could not extract app %s',
+                                    $appId
+                                )
+                            );
+                        }
+                        $allFiles = scandir($extractDir);
+                        $folders = array_diff($allFiles, ['.', '..']);
+                        $folders = array_values($folders);
+
+                        if(count($folders) > 1) {
+                            throw new \Exception(
+                                sprintf(
+                                    'Extracted app %s has more than 1 folder',
+                                    $appId
+                                )
+                            );
+                        }
+
+                        // Check if appinfo/info.xml has the same app ID as well
+                        $loadEntities = libxml_disable_entity_loader(false);
+                        $xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+                        libxml_disable_entity_loader($loadEntities);
+                        if((string)$xml->id !== $appId) {
+                            throw new \Exception(
+                                sprintf(
+                                    'App for id %s has a wrong app ID in info.xml: %s',
+                                    $appId,
+                                    (string)$xml->id
+                                )
+                            );
+                        }
+
+                        // Check if the version is lower than before
+                        $currentVersion = OC_App::getAppVersion($appId);
+                        $newVersion = (string)$xml->version;
+                        if(version_compare($currentVersion, $newVersion) === 1) {
+                            throw new \Exception(
+                                sprintf(
+                                    'App for id %s has version %s and tried to update to lower version %s',
+                                    $appId,
+                                    $currentVersion,
+                                    $newVersion
+                                )
+                            );
+                        }
+
+                        $baseDir = OC_App::getInstallPath() . '/' . $appId;
+                        // Remove old app with the ID if existent
+                        OC_Helper::rmdirr($baseDir);
+                        // Move to app folder
+                        if(@mkdir($baseDir)) {
+                            $extractDir .= '/' . $folders[0];
+                            OC_Helper::copyr($extractDir, $baseDir);
+                        }
+                        OC_Helper::copyr($extractDir, $baseDir);
+                        OC_Helper::rmdirr($extractDir);
+                        return;
+                    } else {
+                        throw new \Exception(
+                            sprintf(
+                                'Could not extract app with ID %s to %s',
+                                $appId,
+                                $extractDir
+                            )
+                        );
+                    }
+                } else {
+                    // Signature does not match
+                    throw new \Exception(
+                        sprintf(
+                            'App with id %s has invalid signature',
+                            $appId
+                        )
+                    );
+                }
+            }
+        }
+
+        throw new \Exception(
+            sprintf(
+                'Could not download app %s',
+                $appId
+            )
+        );
+    }
+
+    /**
+     * Check if an update for the app is available
+     *
+     * @param string $appId
+     * @return string|false false or the version number of the update
+     */
+    public function isUpdateAvailable($appId) {
+        if ($this->isInstanceReadyForUpdates === null) {
+            $installPath = OC_App::getInstallPath();
+            if ($installPath === false || $installPath === null) {
+                $this->isInstanceReadyForUpdates = false;
+            } else {
+                $this->isInstanceReadyForUpdates = true;
+            }
+        }
+
+        if ($this->isInstanceReadyForUpdates === false) {
+            return false;
+        }
+
+        if ($this->apps === null) {
+            $apps = $this->appFetcher->get();
+        }
+
+        foreach($apps as $app) {
+            if($app['id'] === $appId) {
+                $currentVersion = OC_App::getAppVersion($appId);
+                $newestVersion = $app['releases'][0]['version'];
+                if (version_compare($newestVersion, $currentVersion, '>')) {
+                    return $newestVersion;
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if app is already downloaded
+     * @param string $name name of the application to remove
+     * @return boolean
+     *
+     * The function will check if the app is already downloaded in the apps repository
+     */
+    public function isDownloaded($name) {
+        foreach(\OC::$APPSROOTS as $dir) {
+            $dirToTest  = $dir['path'];
+            $dirToTest .= '/';
+            $dirToTest .= $name;
+            $dirToTest .= '/';
+
+            if (is_dir($dirToTest)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes an app
+     * @param string $appId ID of the application to remove
+     * @return boolean
+     *
+     *
+     * This function works as follows
+     *   -# call uninstall repair steps
+     *   -# removing the files
+     *
+     * The function will not delete preferences, tables and the configuration,
+     * this has to be done by the function oc_app_uninstall().
+     */
+    public function removeApp($appId) {
+        if($this->isDownloaded( $appId )) {
+            $appDir = OC_App::getInstallPath() . '/' . $appId;
+            OC_Helper::rmdirr($appDir);
+            return true;
+        }else{
+            \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', \OCP\Util::ERROR);
+
+            return false;
+        }
+
+    }
+
+    /**
+     * Installs the app within the bundle and marks the bundle as installed
+     *
+     * @param Bundle $bundle
+     * @throws \Exception If app could not get installed
+     */
+    public function installAppBundle(Bundle $bundle) {
+        $appIds = $bundle->getAppIdentifiers();
+        foreach($appIds as $appId) {
+            if(!$this->isDownloaded($appId)) {
+                $this->downloadApp($appId);
+            }
+            $this->installApp($appId);
+            $app = new OC_App();
+            $app->enable($appId);
+        }
+        $bundles = json_decode($this->config->getAppValue('core', 'installed.bundles', json_encode([])), true);
+        $bundles[] = $bundle->getIdentifier();
+        $this->config->setAppValue('core', 'installed.bundles', json_encode($bundles));
+    }
+
+    /**
+     * Installs shipped apps
+     *
+     * This function installs all apps found in the 'apps' directory that should be enabled by default;
+     * @param bool $softErrors When updating we ignore errors and simply log them, better to have a
+     *                         working ownCloud at the end instead of an aborted update.
+     * @return array Array of error messages (appid => Exception)
+     */
+    public static function installShippedApps($softErrors = false) {
+        $errors = [];
+        foreach(\OC::$APPSROOTS as $app_dir) {
+            if($dir = opendir( $app_dir['path'] )) {
+                while( false !== ( $filename = readdir( $dir ))) {
+                    if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ) {
+                        if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) {
+                            if(!Installer::isInstalled($filename)) {
+                                $info=OC_App::getAppInfo($filename);
+                                $enabled = isset($info['default_enable']);
+                                if (($enabled || in_array($filename, \OC::$server->getAppManager()->getAlwaysEnabledApps()))
+                                      && \OC::$server->getConfig()->getAppValue($filename, 'enabled') !== 'no') {
+                                    if ($softErrors) {
+                                        try {
+                                            Installer::installShippedApp($filename);
+                                        } catch (HintException $e) {
+                                            if ($e->getPrevious() instanceof TableExistsException) {
+                                                $errors[$filename] = $e;
+                                                continue;
+                                            }
+                                            throw $e;
+                                        }
+                                    } else {
+                                        Installer::installShippedApp($filename);
+                                    }
+                                    \OC::$server->getConfig()->setAppValue($filename, 'enabled', 'yes');
+                                }
+                            }
+                        }
+                    }
+                }
+                closedir( $dir );
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * install an app already placed in the app folder
+     * @param string $app id of the app to install
+     * @return integer
+     */
+    public static function installShippedApp($app) {
+        //install the database
+        $appPath = OC_App::getAppPath($app);
+        \OC_App::registerAutoloading($app, $appPath);
+
+        if(is_file("$appPath/appinfo/database.xml")) {
+            try {
+                OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
+            } catch (TableExistsException $e) {
+                throw new HintException(
+                    'Failed to enable app ' . $app,
+                    'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer noopener">support channels</a>.',
+                    0, $e
+                );
+            }
+        } else {
+            $ms = new \OC\DB\MigrationService($app, \OC::$server->getDatabaseConnection());
+            $ms->migrate();
+        }
+
+        //run appinfo/install.php
+        self::includeAppScript("$appPath/appinfo/install.php");
+
+        $info = OC_App::getAppInfo($app);
+        if (is_null($info)) {
+            return false;
+        }
+        \OC_App::setupBackgroundJobs($info['background-jobs']);
+
+        OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
+
+        $config = \OC::$server->getConfig();
+
+        $config->setAppValue($app, 'installed_version', OC_App::getAppVersion($app));
+        if (array_key_exists('ocsid', $info)) {
+            $config->setAppValue($app, 'ocsid', $info['ocsid']);
+        }
+
+        //set remote/public handlers
+        foreach($info['remote'] as $name=>$path) {
+            $config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
+        }
+        foreach($info['public'] as $name=>$path) {
+            $config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
+        }
+
+        OC_App::setAppTypes($info['id']);
+
+        if(isset($info['settings']) && is_array($info['settings'])) {
+            // requires that autoloading was registered for the app,
+            // as happens before running the install.php some lines above
+            \OC::$server->getSettingsManager()->setupSettings($info['settings']);
+        }
+
+        return $info['id'];
+    }
+
+    /**
+     * @param string $script
+     */
+    private static function includeAppScript($script) {
+        if ( file_exists($script) ){
+            include $script;
+        }
+    }
 }

Spacing +53 added lines, -53 removed lines

@@ -100,7 +100,7 @@ 
 	 */
 	public function installApp($appId) {
 		$app = \OC_App::findAppInDirectories($appId);
-		if($app === false) {
+		if ($app === false) {
 			throw new \Exception('App not found in any app directory');
 		}
 
@@ -109,7 +109,7 @@ 
 
 		$l = \OC::$server->getL10N('core');
 
-		if(!is_array($info)) {
+		if (!is_array($info)) {
 			throw new \Exception(
 				$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
 					[$info['name']]
@@ -132,7 +132,7 @@ 
 		\OC_App::registerAutoloading($appId, $basedir);
 
 		//install the database
-		if(is_file($basedir.'/appinfo/database.xml')) {
+		if (is_file($basedir.'/appinfo/database.xml')) {
 			if (\OC::$server->getAppConfig()->getValue($info['id'], 'installed_version') === null) {
 				OC_DB::createDbFromStructure($basedir.'/appinfo/database.xml');
 			} else {
@@ -144,13 +144,13 @@ 
 		}
 
 		\OC_App::setupBackgroundJobs($info['background-jobs']);
-		if(isset($info['settings']) && is_array($info['settings'])) {
+		if (isset($info['settings']) && is_array($info['settings'])) {
 			\OC::$server->getSettingsManager()->setupSettings($info['settings']);
 		}
 
 		//run appinfo/install.php
-		if((!isset($data['noinstall']) or $data['noinstall']==false)) {
-			self::includeAppScript($basedir . '/appinfo/install.php');
+		if ((!isset($data['noinstall']) or $data['noinstall'] == false)) {
+			self::includeAppScript($basedir.'/appinfo/install.php');
 		}
 
 		$appData = OC_App::getAppInfo($appId);
@@ -161,10 +161,10 @@ 
 		\OC::$server->getConfig()->setAppValue($info['id'], 'enabled', 'no');
 
 		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
+		foreach ($info['remote'] as $name=>$path) {
 			\OC::$server->getConfig()->setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
 		}
-		foreach($info['public'] as $name=>$path) {
+		foreach ($info['public'] as $name=>$path) {
 			\OC::$server->getConfig()->setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
 		}
 
@@ -180,7 +180,7 @@ 
 	 *
 	 * Checks whether or not an app is installed, i.e. registered in apps table.
 	 */
-	public static function isInstalled( $app ) {
+	public static function isInstalled($app) {
 		return (\OC::$server->getConfig()->getAppValue($app, "installed_version", null) !== null);
 	}
 
@@ -191,7 +191,7 @@ 
 	 * @return bool
 	 */
 	public function updateAppstoreApp($appId) {
-		if($this->isUpdateAvailable($appId)) {
+		if ($this->isUpdateAvailable($appId)) {
 			try {
 				$this->downloadApp($appId);
 			} catch (\Exception $e) {
@@ -215,18 +215,18 @@ 
 		$appId = strtolower($appId);
 
 		$apps = $this->appFetcher->get();
-		foreach($apps as $app) {
-			if($app['id'] === $appId) {
+		foreach ($apps as $app) {
+			if ($app['id'] === $appId) {
 				// Load the certificate
 				$certificate = new X509();
-				$certificate->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
+				$certificate->loadCA(file_get_contents(__DIR__.'/../../resources/codesigning/root.crt'));
 				$loadedCertificate = $certificate->loadX509($app['certificate']);
 
 				// Verify if the certificate has been revoked
 				$crl = new X509();
-				$crl->loadCA(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crt'));
-				$crl->loadCRL(file_get_contents(__DIR__ . '/../../resources/codesigning/root.crl'));
-				if($crl->validateSignature() !== true) {
+				$crl->loadCA(file_get_contents(__DIR__.'/../../resources/codesigning/root.crt'));
+				$crl->loadCRL(file_get_contents(__DIR__.'/../../resources/codesigning/root.crl'));
+				if ($crl->validateSignature() !== true) {
 					throw new \Exception('Could not validate CRL signature');
 				}
 				$csn = $loadedCertificate['tbsCertificate']['serialNumber']->toString();
@@ -241,7 +241,7 @@ 
 				}
 
 				// Verify if the certificate has been issued by the Nextcloud Code Authority CA
-				if($certificate->validateSignature() !== true) {
+				if ($certificate->validateSignature() !== true) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a certificate not issued by a trusted Code Signing Authority',
@@ -252,7 +252,7 @@ 
 
 				// Verify if the certificate is issued for the requested app id
 				$certInfo = openssl_x509_parse($app['certificate']);
-				if(!isset($certInfo['subject']['CN'])) {
+				if (!isset($certInfo['subject']['CN'])) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a cert with no CN',
@@ -260,7 +260,7 @@ 
 						)
 					);
 				}
-				if($certInfo['subject']['CN'] !== $appId) {
+				if ($certInfo['subject']['CN'] !== $appId) {
 					throw new \Exception(
 						sprintf(
 							'App with id %s has a cert issued to %s',
@@ -277,15 +277,15 @@ 
 
 				// Check if the signature actually matches the downloaded content
 				$certificate = openssl_get_publickey($app['certificate']);
-				$verified = (bool)openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
+				$verified = (bool) openssl_verify(file_get_contents($tempFile), base64_decode($app['releases'][0]['signature']), $certificate, OPENSSL_ALGO_SHA512);
 				openssl_free_key($certificate);
 
-				if($verified === true) {
+				if ($verified === true) {
 					// Seems to match, let's proceed
 					$extractDir = $this->tempManager->getTemporaryFolder();
 					$archive = new TAR($tempFile);
 
-					if($archive) {
+					if ($archive) {
 						if (!$archive->extract($extractDir)) {
 							throw new \Exception(
 								sprintf(
@@ -298,7 +298,7 @@ 
 						$folders = array_diff($allFiles, ['.', '..']);
 						$folders = array_values($folders);
 
-						if(count($folders) > 1) {
+						if (count($folders) > 1) {
 							throw new \Exception(
 								sprintf(
 									'Extracted app %s has more than 1 folder',
@@ -309,22 +309,22 @@ 
 
 						// Check if appinfo/info.xml has the same app ID as well
 						$loadEntities = libxml_disable_entity_loader(false);
-						$xml = simplexml_load_file($extractDir . '/' . $folders[0] . '/appinfo/info.xml');
+						$xml = simplexml_load_file($extractDir.'/'.$folders[0].'/appinfo/info.xml');
 						libxml_disable_entity_loader($loadEntities);
-						if((string)$xml->id !== $appId) {
+						if ((string) $xml->id !== $appId) {
 							throw new \Exception(
 								sprintf(
 									'App for id %s has a wrong app ID in info.xml: %s',
 									$appId,
-									(string)$xml->id
+									(string) $xml->id
 								)
 							);
 						}
 
 						// Check if the version is lower than before
 						$currentVersion = OC_App::getAppVersion($appId);
-						$newVersion = (string)$xml->version;
-						if(version_compare($currentVersion, $newVersion) === 1) {
+						$newVersion = (string) $xml->version;
+						if (version_compare($currentVersion, $newVersion) === 1) {
 							throw new \Exception(
 								sprintf(
 									'App for id %s has version %s and tried to update to lower version %s',
@@ -335,12 +335,12 @@ 
 							);
 						}
 
-						$baseDir = OC_App::getInstallPath() . '/' . $appId;
+						$baseDir = OC_App::getInstallPath().'/'.$appId;
 						// Remove old app with the ID if existent
 						OC_Helper::rmdirr($baseDir);
 						// Move to app folder
-						if(@mkdir($baseDir)) {
-							$extractDir .= '/' . $folders[0];
+						if (@mkdir($baseDir)) {
+							$extractDir .= '/'.$folders[0];
 							OC_Helper::copyr($extractDir, $baseDir);
 						}
 						OC_Helper::copyr($extractDir, $baseDir);
@@ -399,8 +399,8 @@ 
 			$apps = $this->appFetcher->get();
 		}
 
-		foreach($apps as $app) {
-			if($app['id'] === $appId) {
+		foreach ($apps as $app) {
+			if ($app['id'] === $appId) {
 				$currentVersion = OC_App::getAppVersion($appId);
 				$newestVersion = $app['releases'][0]['version'];
 				if (version_compare($newestVersion, $currentVersion, '>')) {
@@ -422,7 +422,7 @@ 
 	 * The function will check if the app is already downloaded in the apps repository
 	 */
 	public function isDownloaded($name) {
-		foreach(\OC::$APPSROOTS as $dir) {
+		foreach (\OC::$APPSROOTS as $dir) {
 			$dirToTest  = $dir['path'];
 			$dirToTest .= '/';
 			$dirToTest .= $name;
@@ -450,11 +450,11 @@ 
 	 * this has to be done by the function oc_app_uninstall().
 	 */
 	public function removeApp($appId) {
-		if($this->isDownloaded( $appId )) {
-			$appDir = OC_App::getInstallPath() . '/' . $appId;
+		if ($this->isDownloaded($appId)) {
+			$appDir = OC_App::getInstallPath().'/'.$appId;
 			OC_Helper::rmdirr($appDir);
 			return true;
-		}else{
+		} else {
 			\OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', \OCP\Util::ERROR);
 
 			return false;
@@ -470,8 +470,8 @@ 
 	 */
 	public function installAppBundle(Bundle $bundle) {
 		$appIds = $bundle->getAppIdentifiers();
-		foreach($appIds as $appId) {
-			if(!$this->isDownloaded($appId)) {
+		foreach ($appIds as $appId) {
+			if (!$this->isDownloaded($appId)) {
 				$this->downloadApp($appId);
 			}
 			$this->installApp($appId);
@@ -493,13 +493,13 @@ 
 	 */
 	public static function installShippedApps($softErrors = false) {
 		$errors = [];
-		foreach(\OC::$APPSROOTS as $app_dir) {
-			if($dir = opendir( $app_dir['path'] )) {
-				while( false !== ( $filename = readdir( $dir ))) {
-					if( substr( $filename, 0, 1 ) != '.' and is_dir($app_dir['path']."/$filename") ) {
-						if( file_exists( $app_dir['path']."/$filename/appinfo/info.xml" )) {
-							if(!Installer::isInstalled($filename)) {
-								$info=OC_App::getAppInfo($filename);
+		foreach (\OC::$APPSROOTS as $app_dir) {
+			if ($dir = opendir($app_dir['path'])) {
+				while (false !== ($filename = readdir($dir))) {
+					if (substr($filename, 0, 1) != '.' and is_dir($app_dir['path']."/$filename")) {
+						if (file_exists($app_dir['path']."/$filename/appinfo/info.xml")) {
+							if (!Installer::isInstalled($filename)) {
+								$info = OC_App::getAppInfo($filename);
 								$enabled = isset($info['default_enable']);
 								if (($enabled || in_array($filename, \OC::$server->getAppManager()->getAlwaysEnabledApps()))
 									  && \OC::$server->getConfig()->getAppValue($filename, 'enabled') !== 'no') {
@@ -522,7 +522,7 @@ 
 						}
 					}
 				}
-				closedir( $dir );
+				closedir($dir);
 			}
 		}
 
@@ -539,12 +539,12 @@ 
 		$appPath = OC_App::getAppPath($app);
 		\OC_App::registerAutoloading($app, $appPath);
 
-		if(is_file("$appPath/appinfo/database.xml")) {
+		if (is_file("$appPath/appinfo/database.xml")) {
 			try {
 				OC_DB::createDbFromStructure("$appPath/appinfo/database.xml");
 			} catch (TableExistsException $e) {
 				throw new HintException(
-					'Failed to enable app ' . $app,
+					'Failed to enable app '.$app,
 					'Please ask for help via one of our <a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer noopener">support channels</a>.',
 					0, $e
 				);
@@ -573,16 +573,16 @@ 
 		}
 
 		//set remote/public handlers
-		foreach($info['remote'] as $name=>$path) {
+		foreach ($info['remote'] as $name=>$path) {
 			$config->setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
-		foreach($info['public'] as $name=>$path) {
+		foreach ($info['public'] as $name=>$path) {
 			$config->setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 
 		OC_App::setAppTypes($info['id']);
 
-		if(isset($info['settings']) && is_array($info['settings'])) {
+		if (isset($info['settings']) && is_array($info['settings'])) {
 			// requires that autoloading was registered for the app,
 			// as happens before running the install.php some lines above
 			\OC::$server->getSettingsManager()->setupSettings($info['settings']);
@@ -595,7 +595,7 @@ 
 	 * @param string $script
 	 */
 	private static function includeAppScript($script) {
-		if ( file_exists($script) ){
+		if (file_exists($script)) {
 			include $script;
 		}
 	}

lib/private/Archive/Archive.php

Braces +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
 				}
 				if(is_dir($source.'/'.$file)) {
 					$this->addRecursive($path.'/'.$file, $source.'/'.$file);
-				}else{
+				} else{
 					$this->addFile($path.'/'.$file, $source.'/'.$file);
 				}
 			}

Indentation +107 added lines, -107 removed lines

@@ -33,111 +33,111 @@
 namespace OC\Archive;
 
 abstract class Archive {
-	/**
-	 * @param $source
-	 */
-	public abstract function __construct($source);
-	/**
-	 * add an empty folder to the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public abstract function addFolder($path);
-	/**
-	 * add a file to the archive
-	 * @param string $path
-	 * @param string $source either a local file or string data
-	 * @return bool
-	 */
-	public abstract function addFile($path, $source='');
-	/**
-	 * rename a file or folder in the archive
-	 * @param string $source
-	 * @param string $dest
-	 * @return bool
-	 */
-	public abstract function rename($source, $dest);
-	/**
-	 * get the uncompressed size of a file in the archive
-	 * @param string $path
-	 * @return int
-	 */
-	public abstract function filesize($path);
-	/**
-	 * get the last modified time of a file in the archive
-	 * @param string $path
-	 * @return int
-	 */
-	public abstract function mtime($path);
-	/**
-	 * get the files in a folder
-	 * @param string $path
-	 * @return array
-	 */
-	public abstract function getFolder($path);
-	/**
-	 * get all files in the archive
-	 * @return array
-	 */
-	public abstract function getFiles();
-	/**
-	 * get the content of a file
-	 * @param string $path
-	 * @return string
-	 */
-	public abstract function getFile($path);
-	/**
-	 * extract a single file from the archive
-	 * @param string $path
-	 * @param string $dest
-	 * @return bool
-	 */
-	public abstract function extractFile($path, $dest);
-	/**
-	 * extract the archive
-	 * @param string $dest
-	 * @return bool
-	 */
-	public abstract function extract($dest);
-	/**
-	 * check if a file or folder exists in the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public abstract function fileExists($path);
-	/**
-	 * remove a file or folder from the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public abstract function remove($path);
-	/**
-	 * get a file handler
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 */
-	public abstract function getStream($path, $mode);
-	/**
-	 * add a folder and all its content
-	 * @param string $path
-	 * @param string $source
-	 * @return boolean|null
-	 */
-	public function addRecursive($path, $source) {
-		$dh = opendir($source);
-		if(is_resource($dh)) {
-			$this->addFolder($path);
-			while (($file = readdir($dh)) !== false) {
-				if($file === '.' || $file === '..') {
-					continue;
-				}
-				if(is_dir($source.'/'.$file)) {
-					$this->addRecursive($path.'/'.$file, $source.'/'.$file);
-				}else{
-					$this->addFile($path.'/'.$file, $source.'/'.$file);
-				}
-			}
-		}
-	}
+    /**
+     * @param $source
+     */
+    public abstract function __construct($source);
+    /**
+     * add an empty folder to the archive
+     * @param string $path
+     * @return bool
+     */
+    public abstract function addFolder($path);
+    /**
+     * add a file to the archive
+     * @param string $path
+     * @param string $source either a local file or string data
+     * @return bool
+     */
+    public abstract function addFile($path, $source='');
+    /**
+     * rename a file or folder in the archive
+     * @param string $source
+     * @param string $dest
+     * @return bool
+     */
+    public abstract function rename($source, $dest);
+    /**
+     * get the uncompressed size of a file in the archive
+     * @param string $path
+     * @return int
+     */
+    public abstract function filesize($path);
+    /**
+     * get the last modified time of a file in the archive
+     * @param string $path
+     * @return int
+     */
+    public abstract function mtime($path);
+    /**
+     * get the files in a folder
+     * @param string $path
+     * @return array
+     */
+    public abstract function getFolder($path);
+    /**
+     * get all files in the archive
+     * @return array
+     */
+    public abstract function getFiles();
+    /**
+     * get the content of a file
+     * @param string $path
+     * @return string
+     */
+    public abstract function getFile($path);
+    /**
+     * extract a single file from the archive
+     * @param string $path
+     * @param string $dest
+     * @return bool
+     */
+    public abstract function extractFile($path, $dest);
+    /**
+     * extract the archive
+     * @param string $dest
+     * @return bool
+     */
+    public abstract function extract($dest);
+    /**
+     * check if a file or folder exists in the archive
+     * @param string $path
+     * @return bool
+     */
+    public abstract function fileExists($path);
+    /**
+     * remove a file or folder from the archive
+     * @param string $path
+     * @return bool
+     */
+    public abstract function remove($path);
+    /**
+     * get a file handler
+     * @param string $path
+     * @param string $mode
+     * @return resource
+     */
+    public abstract function getStream($path, $mode);
+    /**
+     * add a folder and all its content
+     * @param string $path
+     * @param string $source
+     * @return boolean|null
+     */
+    public function addRecursive($path, $source) {
+        $dh = opendir($source);
+        if(is_resource($dh)) {
+            $this->addFolder($path);
+            while (($file = readdir($dh)) !== false) {
+                if($file === '.' || $file === '..') {
+                    continue;
+                }
+                if(is_dir($source.'/'.$file)) {
+                    $this->addRecursive($path.'/'.$file, $source.'/'.$file);
+                }else{
+                    $this->addFile($path.'/'.$file, $source.'/'.$file);
+                }
+            }
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param string $source either a local file or string data
 	 * @return bool
 	 */
-	public abstract function addFile($path, $source='');
+	public abstract function addFile($path, $source = '');
 	/**
 	 * rename a file or folder in the archive
 	 * @param string $source
@@ -126,15 +126,15 @@ 
 	 */
 	public function addRecursive($path, $source) {
 		$dh = opendir($source);
-		if(is_resource($dh)) {
+		if (is_resource($dh)) {
 			$this->addFolder($path);
 			while (($file = readdir($dh)) !== false) {
-				if($file === '.' || $file === '..') {
+				if ($file === '.' || $file === '..') {
 					continue;
 				}
-				if(is_dir($source.'/'.$file)) {
+				if (is_dir($source.'/'.$file)) {
 					$this->addRecursive($path.'/'.$file, $source.'/'.$file);
-				}else{
+				} else {
 					$this->addFile($path.'/'.$file, $source.'/'.$file);
 				}
 			}

lib/private/NaturalSort_DefaultCollator.php

Indentation +10 added lines, -10 removed lines

@@ -25,14 +25,14 @@
 namespace OC;
 
 class NaturalSort_DefaultCollator {
-	public function compare($a, $b) {
-		$result = strcasecmp($a, $b);
-		if ($result === 0) {
-			if ($a === $b) {
-				return 0;
-			}
-			return ($a > $b) ? -1 : 1;
-		}
-		return ($result < 0) ? -1 : 1;
-	}
+    public function compare($a, $b) {
+        $result = strcasecmp($a, $b);
+        if ($result === 0) {
+            if ($a === $b) {
+                return 0;
+            }
+            return ($a > $b) ? -1 : 1;
+        }
+        return ($result < 0) ? -1 : 1;
+    }
 }