nextcloud / server

lib/private/Repair/Owncloud/SaveAccountsTableData.php

Indentation +132 added lines, -132 removed lines

@@ -38,137 +38,137 @@
  */
 class SaveAccountsTableData implements IRepairStep {
 
-	const BATCH_SIZE = 75;
-
-	/** @var IDBConnection */
-	protected $db;
-
-	/** @var IConfig */
-	protected $config;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param IConfig $config
-	 */
-	public function __construct(IDBConnection $db, IConfig $config) {
-		$this->db = $db;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Copy data from accounts table when migrating from ownCloud';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->shouldRun()) {
-			return;
-		}
-
-		$offset = 0;
-		$numUsers = $this->runStep($offset);
-
-		while ($numUsers === self::BATCH_SIZE) {
-			$offset += $numUsers;
-			$numUsers = $this->runStep($offset);
-		}
-
-		// Remove the table
-		$this->db->dropTable('accounts');
-	}
-
-	/**
-	 * @return bool
-	 */
-	protected function shouldRun() {
-		$schema = $this->db->createSchema();
-
-		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
-		if (!$schema->hasTable($tableName)) {
-			return false;
-		}
-
-		$table = $schema->getTable($tableName);
-		return $table->hasColumn('user_id');
-	}
-
-	/**
-	 * @param int $offset
-	 * @return int Number of copied users
-	 */
-	protected function runStep($offset) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('*')
-			->from('accounts')
-			->orderBy('id')
-			->setMaxResults(self::BATCH_SIZE);
-
-		if ($offset > 0) {
-			$query->setFirstResult($offset);
-		}
-
-		$result = $query->execute();
-
-		$update = $this->db->getQueryBuilder();
-		$update->update('users')
-			->set('displayname', $update->createParameter('displayname'))
-			->where($update->expr()->eq('uid', $update->createParameter('userid')));
-
-		$updatedUsers = 0;
-		while ($row = $result->fetch()) {
-			try {
-				$this->migrateUserInfo($update, $row);
-			} catch (PreConditionNotMetException $e) {
-				// Ignore and continue
-			} catch (\UnexpectedValueException $e) {
-				// Ignore and continue
-			}
-			$updatedUsers++;
-		}
-		$result->closeCursor();
-
-		return $updatedUsers;
-	}
-
-	/**
-	 * @param IQueryBuilder $update
-	 * @param array $userdata
-	 * @throws PreConditionNotMetException
-	 * @throws \UnexpectedValueException
-	 */
-	protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
-		$state = (int) $userdata['state'];
-		if ($state === 3) {
-			// Deleted user, ignore
-			return;
-		}
-
-		if ($userdata['email'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
-		}
-		if ($userdata['quota'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
-		}
-		if ($userdata['last_login'] !== null) {
-			$this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
-		}
-		if ($state === 1) {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
-		} else if ($state === 2) {
-			$this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
-		}
-
-		if ($userdata['display_name'] !== null) {
-			$update->setParameter('displayname', $userdata['display_name'])
-				->setParameter('userid', $userdata['user_id']);
-			$update->execute();
-		}
-
-	}
+    const BATCH_SIZE = 75;
+
+    /** @var IDBConnection */
+    protected $db;
+
+    /** @var IConfig */
+    protected $config;
+
+    /**
+     * @param IDBConnection $db
+     * @param IConfig $config
+     */
+    public function __construct(IDBConnection $db, IConfig $config) {
+        $this->db = $db;
+        $this->config = $config;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Copy data from accounts table when migrating from ownCloud';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->shouldRun()) {
+            return;
+        }
+
+        $offset = 0;
+        $numUsers = $this->runStep($offset);
+
+        while ($numUsers === self::BATCH_SIZE) {
+            $offset += $numUsers;
+            $numUsers = $this->runStep($offset);
+        }
+
+        // Remove the table
+        $this->db->dropTable('accounts');
+    }
+
+    /**
+     * @return bool
+     */
+    protected function shouldRun() {
+        $schema = $this->db->createSchema();
+
+        $tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
+        if (!$schema->hasTable($tableName)) {
+            return false;
+        }
+
+        $table = $schema->getTable($tableName);
+        return $table->hasColumn('user_id');
+    }
+
+    /**
+     * @param int $offset
+     * @return int Number of copied users
+     */
+    protected function runStep($offset) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('*')
+            ->from('accounts')
+            ->orderBy('id')
+            ->setMaxResults(self::BATCH_SIZE);
+
+        if ($offset > 0) {
+            $query->setFirstResult($offset);
+        }
+
+        $result = $query->execute();
+
+        $update = $this->db->getQueryBuilder();
+        $update->update('users')
+            ->set('displayname', $update->createParameter('displayname'))
+            ->where($update->expr()->eq('uid', $update->createParameter('userid')));
+
+        $updatedUsers = 0;
+        while ($row = $result->fetch()) {
+            try {
+                $this->migrateUserInfo($update, $row);
+            } catch (PreConditionNotMetException $e) {
+                // Ignore and continue
+            } catch (\UnexpectedValueException $e) {
+                // Ignore and continue
+            }
+            $updatedUsers++;
+        }
+        $result->closeCursor();
+
+        return $updatedUsers;
+    }
+
+    /**
+     * @param IQueryBuilder $update
+     * @param array $userdata
+     * @throws PreConditionNotMetException
+     * @throws \UnexpectedValueException
+     */
+    protected function migrateUserInfo(IQueryBuilder $update, $userdata) {
+        $state = (int) $userdata['state'];
+        if ($state === 3) {
+            // Deleted user, ignore
+            return;
+        }
+
+        if ($userdata['email'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'settings', 'email', $userdata['email']);
+        }
+        if ($userdata['quota'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'files', 'quota', $userdata['quota']);
+        }
+        if ($userdata['last_login'] !== null) {
+            $this->config->setUserValue($userdata['user_id'], 'login', 'lastLogin', $userdata['last_login']);
+        }
+        if ($state === 1) {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'true');
+        } else if ($state === 2) {
+            $this->config->setUserValue($userdata['user_id'], 'core', 'enabled', 'false');
+        }
+
+        if ($userdata['display_name'] !== null) {
+            $update->setParameter('displayname', $userdata['display_name'])
+                ->setParameter('userid', $userdata['user_id']);
+            $update->execute();
+        }
+
+    }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 	protected function shouldRun() {
 		$schema = $this->db->createSchema();
 
-		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_') . 'accounts';
+		$tableName = $this->config->getSystemValue('dbtableprefix', 'oc_').'accounts';
 		if (!$schema->hasTable($tableName)) {
 			return false;
 		}

lib/private/Collaboration/Collaborators/RemotePlugin.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 							$searchResult->markExactIdMatch($resultType);
 						}
 						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -88,7 +88,7 @@ 
 						];
 					} else {
 						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
+							'label' => $contact['FN']." ($cloudId)",
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,

Indentation +92 added lines, -92 removed lines

@@ -33,107 +33,107 @@
 use OCP\Share;
 
 class RemotePlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
+    protected $shareeEnumeration;
 
-	/** @var IManager */
-	private $contactsManager;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var IConfig */
-	private $config;
+    /** @var IManager */
+    private $contactsManager;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config) {
-		$this->contactsManager = $contactsManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->config = $config;
+    public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config) {
+        $this->contactsManager = $contactsManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->config = $config;
 
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remotes');
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remotes');
 
-		// Search in contacts
-		//@todo Pagination missing
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (!is_array($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					try {
-						list(, $serverUrl) = $this->splitUserRemote($cloudId);
-					} catch (\InvalidArgumentException $e) {
-						continue;
-					}
+        // Search in contacts
+        //@todo Pagination missing
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (!is_array($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    try {
+                        list(, $serverUrl) = $this->splitUserRemote($cloudId);
+                    } catch (\InvalidArgumentException $e) {
+                        continue;
+                    }
 
-					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$searchResult->markExactIdMatch($resultType);
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'value' => [
-								'shareType' => Share::SHARE_TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
+                    if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $searchResult->markExactIdMatch($resultType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'value' => [
+                                'shareType' => Share::SHARE_TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
 
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		} else {
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-		}
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        } else {
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+        }
 
-		if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			$result['exact'][] = [
-				'label' => $search,
-				'value' => [
-					'shareType' => Share::SHARE_TYPE_REMOTE,
-					'shareWith' => $search,
-				],
-			];
-		}
+        if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            $result['exact'][] = [
+                'label' => $search,
+                'value' => [
+                    'shareType' => Share::SHARE_TYPE_REMOTE,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

lib/private/Collaboration/Collaborators/Search.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 		$searchResult = $this->c->resolve(SearchResult::class);
 
 		foreach ($shareTypes as $type) {
-			if(!isset($this->pluginList[$type])) {
+			if (!isset($this->pluginList[$type])) {
 				continue;
 			}
 			foreach ($this->pluginList[$type] as $plugin) {
@@ -70,18 +70,18 @@ 
 		// that the exact same email address and federated cloud id exists
 		$emailType = new SearchResultType('emails');
 		$remoteType = new SearchResultType('remotes');
-		if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
+		if ($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
 			$searchResult->unsetResult($remoteType);
 		} elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
 			$searchResult->unsetResult($emailType);
 		}
 
-		return [$searchResult->asArray(), (bool)$hasMoreResults];
+		return [$searchResult->asArray(), (bool) $hasMoreResults];
 	}
 
 	public function registerPlugin(array $pluginInfo) {
-		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
-		if($shareType === null) {
+		$shareType = constant(Share::class.'::'.$pluginInfo['shareType']);
+		if ($shareType === null) {
 			throw new \InvalidArgumentException('Provided ShareType is invalid');
 		}
 		$this->pluginList[$shareType][] = $pluginInfo['class'];

Indentation +54 added lines, -54 removed lines

@@ -31,68 +31,68 @@
 use OCP\Share;
 
 class Search implements ISearch {
-	/** @var IContainer */
-	private $c;
+    /** @var IContainer */
+    private $c;
 
-	protected $pluginList = [];
+    protected $pluginList = [];
 
-	public function __construct(IContainer $c) {
-		$this->c = $c;
-	}
+    public function __construct(IContainer $c) {
+        $this->c = $c;
+    }
 
-	/**
-	 * @param string $search
-	 * @param array $shareTypes
-	 * @param bool $lookup
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array
-	 * @throws \OCP\AppFramework\QueryException
-	 */
-	public function search($search, array $shareTypes, $lookup, $limit, $offset) {
-		$hasMoreResults = false;
+    /**
+     * @param string $search
+     * @param array $shareTypes
+     * @param bool $lookup
+     * @param int|null $limit
+     * @param int|null $offset
+     * @return array
+     * @throws \OCP\AppFramework\QueryException
+     */
+    public function search($search, array $shareTypes, $lookup, $limit, $offset) {
+        $hasMoreResults = false;
 
-		/** @var ISearchResult $searchResult */
-		$searchResult = $this->c->resolve(SearchResult::class);
+        /** @var ISearchResult $searchResult */
+        $searchResult = $this->c->resolve(SearchResult::class);
 
-		foreach ($shareTypes as $type) {
-			if(!isset($this->pluginList[$type])) {
-				continue;
-			}
-			foreach ($this->pluginList[$type] as $plugin) {
-				/** @var ISearchPlugin $searchPlugin */
-				$searchPlugin = $this->c->resolve($plugin);
-				$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
-			}
-		}
+        foreach ($shareTypes as $type) {
+            if(!isset($this->pluginList[$type])) {
+                continue;
+            }
+            foreach ($this->pluginList[$type] as $plugin) {
+                /** @var ISearchPlugin $searchPlugin */
+                $searchPlugin = $this->c->resolve($plugin);
+                $hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
+            }
+        }
 
-		// Get from lookup server, not a separate share type
-		if ($lookup) {
-			$searchPlugin = $this->c->resolve(LookupPlugin::class);
-			$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
-		}
+        // Get from lookup server, not a separate share type
+        if ($lookup) {
+            $searchPlugin = $this->c->resolve(LookupPlugin::class);
+            $hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
+        }
 
-		// sanitizing, could go into the plugins as well
+        // sanitizing, could go into the plugins as well
 
-		// if we have a exact match, either for the federated cloud id or for the
-		// email address we only return the exact match. It is highly unlikely
-		// that the exact same email address and federated cloud id exists
-		$emailType = new SearchResultType('emails');
-		$remoteType = new SearchResultType('remotes');
-		if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
-			$searchResult->unsetResult($remoteType);
-		} elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
-			$searchResult->unsetResult($emailType);
-		}
+        // if we have a exact match, either for the federated cloud id or for the
+        // email address we only return the exact match. It is highly unlikely
+        // that the exact same email address and federated cloud id exists
+        $emailType = new SearchResultType('emails');
+        $remoteType = new SearchResultType('remotes');
+        if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) {
+            $searchResult->unsetResult($remoteType);
+        } elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) {
+            $searchResult->unsetResult($emailType);
+        }
 
-		return [$searchResult->asArray(), (bool)$hasMoreResults];
-	}
+        return [$searchResult->asArray(), (bool)$hasMoreResults];
+    }
 
-	public function registerPlugin(array $pluginInfo) {
-		$shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
-		if($shareType === null) {
-			throw new \InvalidArgumentException('Provided ShareType is invalid');
-		}
-		$this->pluginList[$shareType][] = $pluginInfo['class'];
-	}
+    public function registerPlugin(array $pluginInfo) {
+        $shareType = constant(Share::class . '::' . $pluginInfo['shareType']);
+        if($shareType === null) {
+            throw new \InvalidArgumentException('Provided ShareType is invalid');
+        }
+        $this->pluginList[$shareType][] = $pluginInfo['class'];
+    }
 }

apps/files_trashbin/lib/Events/MoveToTrashEvent.php

Indentation +30 added lines, -30 removed lines

@@ -35,39 +35,39 @@
  */
 class MoveToTrashEvent extends Event {
 
-	/** @var bool */
-	private $moveToTrashBin;
+    /** @var bool */
+    private $moveToTrashBin;
 
-	/** @var Node */
-	private $node;
+    /** @var Node */
+    private $node;
 
-	public function __construct(Node $node) {
-		$this->moveToTrashBin = true;
-		$this->node = $node;
-	}
+    public function __construct(Node $node) {
+        $this->moveToTrashBin = true;
+        $this->node = $node;
+    }
 
-	/**
-	 * get Node which will be deleted
-	 *
-	 * @return Node
-	 */
-	public function getNode() {
-		return $this->node;
-	}
+    /**
+     * get Node which will be deleted
+     *
+     * @return Node
+     */
+    public function getNode() {
+        return $this->node;
+    }
 
-	/**
-	 * disable trash bin for this operation
-	 */
-	public function disableTrashBin() {
-		$this->moveToTrashBin = false;
-	}
+    /**
+     * disable trash bin for this operation
+     */
+    public function disableTrashBin() {
+        $this->moveToTrashBin = false;
+    }
 
-	/**
-	 * should the file be moved to the trash bin?
-	 *
-	 * @return bool
-	 */
-	public function shouldMoveToTrashBin() {
-		return $this->moveToTrashBin;
-	}
+    /**
+     * should the file be moved to the trash bin?
+     *
+     * @return bool
+     */
+    public function shouldMoveToTrashBin() {
+        return $this->moveToTrashBin;
+    }
 }

settings/Hooks.php

Spacing +2 added lines, -2 removed lines

@@ -126,7 +126,7 @@ 
 			$template->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
 			$template->addHeader();
 			$template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+			$template->addBodyText($text.' '.$this->l->t('If you did not request this, please contact an administrator.'));
 			$template->addFooter();
 
 
@@ -196,7 +196,7 @@ 
 			$template->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
 			$template->addHeader();
 			$template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+			$template->addBodyText($text.' '.$this->l->t('If you did not request this, please contact an administrator.'));
 			if ($user->getEMailAddress()) {
 				$template->addBodyText($this->l->t('The new email address is %s', [$user->getEMailAddress()]));
 			}

Indentation +172 added lines, -172 removed lines

@@ -38,176 +38,176 @@
 
 class Hooks {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IUserSession */
-	protected $userSession;
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-	/** @var IMailer */
-	protected $mailer;
-	/** @var IConfig */
-	protected $config;
-	/** @var IFactory */
-	protected $languageFactory;
-	/** @var IL10N */
-	protected $l;
-
-	public function __construct(IActivityManager $activityManager,
-								IUserManager $userManager,
-								IUserSession $userSession,
-								IURLGenerator $urlGenerator,
-								IMailer $mailer,
-								IConfig $config,
-								IFactory $languageFactory,
-								IL10N $l) {
-		$this->activityManager = $activityManager;
-		$this->userManager = $userManager;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-		$this->mailer = $mailer;
-		$this->config = $config;
-		$this->languageFactory = $languageFactory;
-		$this->l = $l;
-	}
-
-	/**
-	 * @param string $uid
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 * @throws \Exception
-	 */
-	public function onChangePassword($uid) {
-		$user = $this->userManager->get($uid);
-
-		if (!$user instanceof IUser || $user->getLastLogin() === 0) {
-			// User didn't login, so don't create activities and emails.
-			return;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('personal_settings')
-			->setAffectedUser($user->getUID());
-
-		$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			if ($actor->getUID() !== $user->getUID()) {
-				$this->l = $this->languageFactory->get(
-					'settings',
-					$this->config->getUserValue(
-						$user->getUID(), 'core', 'lang',
-						$this->config->getSystemValue('default_language', 'en')
-					)
-				);
-
-				$text = $this->l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
-			} else {
-				$text = $this->l->t('Your password on %s was changed.', [$instanceUrl]);
-				$event->setAuthor($actor->getUID())
-					->setSubject(Provider::PASSWORD_CHANGED_SELF);
-			}
-		} else {
-			$text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
-			$event->setSubject(Provider::PASSWORD_RESET);
-		}
-
-		$this->activityManager->publish($event);
-
-		if ($user->getEMailAddress() !== null) {
-			$template = $this->mailer->createEMailTemplate('settings.PasswordChanged', [
-				'displayname' => $user->getDisplayName(),
-				'emailAddress' => $user->getEMailAddress(),
-				'instanceUrl' => $instanceUrl,
-			]);
-
-			$template->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
-			$template->addHeader();
-			$template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
-			$template->addFooter();
-
-
-			$message = $this->mailer->createMessage();
-			$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
-			$message->useTemplate($template);
-			$this->mailer->send($message);
-		}
-	}
-
-	/**
-	 * @param IUser $user
-	 * @param string|null $oldMailAddress
-	 * @throws \InvalidArgumentException
-	 * @throws \BadMethodCallException
-	 */
-	public function onChangeEmail(IUser $user, $oldMailAddress) {
-
-		if ($oldMailAddress === $user->getEMailAddress() ||
-			$user->getLastLogin() === 0) {
-			// Email didn't really change or user didn't login,
-			// so don't create activities and emails.
-			return;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('settings')
-			->setType('personal_settings')
-			->setAffectedUser($user->getUID());
-
-		$instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
-
-		$actor = $this->userSession->getUser();
-		if ($actor instanceof IUser) {
-			$subject = Provider::EMAIL_CHANGED_SELF;
-			if ($actor->getUID() !== $user->getUID()) {
-				$this->l = $this->languageFactory->get(
-					'settings',
-					$this->config->getUserValue(
-						$user->getUID(), 'core', 'lang',
-						$this->config->getSystemValue('default_language', 'en')
-					)
-				);
-				$subject = Provider::EMAIL_CHANGED;
-			}
-			$text = $this->l->t('Your email address on %s was changed.', [$instanceUrl]);
-			$event->setAuthor($actor->getUID())
-				->setSubject($subject);
-		} else {
-			$text = $this->l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
-			$event->setSubject(Provider::EMAIL_CHANGED);
-		}
-		$this->activityManager->publish($event);
-
-
-		if ($oldMailAddress !== null) {
-			$template = $this->mailer->createEMailTemplate('settings.EmailChanged', [
-				'displayname' => $user->getDisplayName(),
-				'newEMailAddress' => $user->getEMailAddress(),
-				'oldEMailAddress' => $oldMailAddress,
-				'instanceUrl' => $instanceUrl,
-			]);
-
-			$template->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
-			$template->addHeader();
-			$template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
-			$template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
-			if ($user->getEMailAddress()) {
-				$template->addBodyText($this->l->t('The new email address is %s', [$user->getEMailAddress()]));
-			}
-			$template->addFooter();
-
-
-			$message = $this->mailer->createMessage();
-			$message->setTo([$oldMailAddress => $user->getDisplayName()]);
-			$message->useTemplate($template);
-			$this->mailer->send($message);
-		}
-	}
+    /** @var IActivityManager */
+    protected $activityManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IUserSession */
+    protected $userSession;
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+    /** @var IMailer */
+    protected $mailer;
+    /** @var IConfig */
+    protected $config;
+    /** @var IFactory */
+    protected $languageFactory;
+    /** @var IL10N */
+    protected $l;
+
+    public function __construct(IActivityManager $activityManager,
+                                IUserManager $userManager,
+                                IUserSession $userSession,
+                                IURLGenerator $urlGenerator,
+                                IMailer $mailer,
+                                IConfig $config,
+                                IFactory $languageFactory,
+                                IL10N $l) {
+        $this->activityManager = $activityManager;
+        $this->userManager = $userManager;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+        $this->mailer = $mailer;
+        $this->config = $config;
+        $this->languageFactory = $languageFactory;
+        $this->l = $l;
+    }
+
+    /**
+     * @param string $uid
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     * @throws \Exception
+     */
+    public function onChangePassword($uid) {
+        $user = $this->userManager->get($uid);
+
+        if (!$user instanceof IUser || $user->getLastLogin() === 0) {
+            // User didn't login, so don't create activities and emails.
+            return;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('personal_settings')
+            ->setAffectedUser($user->getUID());
+
+        $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            if ($actor->getUID() !== $user->getUID()) {
+                $this->l = $this->languageFactory->get(
+                    'settings',
+                    $this->config->getUserValue(
+                        $user->getUID(), 'core', 'lang',
+                        $this->config->getSystemValue('default_language', 'en')
+                    )
+                );
+
+                $text = $this->l->t('%1$s changed your password on %2$s.', [$actor->getDisplayName(), $instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::PASSWORD_CHANGED_BY, [$actor->getUID()]);
+            } else {
+                $text = $this->l->t('Your password on %s was changed.', [$instanceUrl]);
+                $event->setAuthor($actor->getUID())
+                    ->setSubject(Provider::PASSWORD_CHANGED_SELF);
+            }
+        } else {
+            $text = $this->l->t('Your password on %s was reset by an administrator.', [$instanceUrl]);
+            $event->setSubject(Provider::PASSWORD_RESET);
+        }
+
+        $this->activityManager->publish($event);
+
+        if ($user->getEMailAddress() !== null) {
+            $template = $this->mailer->createEMailTemplate('settings.PasswordChanged', [
+                'displayname' => $user->getDisplayName(),
+                'emailAddress' => $user->getEMailAddress(),
+                'instanceUrl' => $instanceUrl,
+            ]);
+
+            $template->setSubject($this->l->t('Password for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+            $template->addHeader();
+            $template->addHeading($this->l->t('Password changed for %s', [$user->getDisplayName()]), false);
+            $template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+            $template->addFooter();
+
+
+            $message = $this->mailer->createMessage();
+            $message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
+            $message->useTemplate($template);
+            $this->mailer->send($message);
+        }
+    }
+
+    /**
+     * @param IUser $user
+     * @param string|null $oldMailAddress
+     * @throws \InvalidArgumentException
+     * @throws \BadMethodCallException
+     */
+    public function onChangeEmail(IUser $user, $oldMailAddress) {
+
+        if ($oldMailAddress === $user->getEMailAddress() ||
+            $user->getLastLogin() === 0) {
+            // Email didn't really change or user didn't login,
+            // so don't create activities and emails.
+            return;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('settings')
+            ->setType('personal_settings')
+            ->setAffectedUser($user->getUID());
+
+        $instanceUrl = $this->urlGenerator->getAbsoluteURL('/');
+
+        $actor = $this->userSession->getUser();
+        if ($actor instanceof IUser) {
+            $subject = Provider::EMAIL_CHANGED_SELF;
+            if ($actor->getUID() !== $user->getUID()) {
+                $this->l = $this->languageFactory->get(
+                    'settings',
+                    $this->config->getUserValue(
+                        $user->getUID(), 'core', 'lang',
+                        $this->config->getSystemValue('default_language', 'en')
+                    )
+                );
+                $subject = Provider::EMAIL_CHANGED;
+            }
+            $text = $this->l->t('Your email address on %s was changed.', [$instanceUrl]);
+            $event->setAuthor($actor->getUID())
+                ->setSubject($subject);
+        } else {
+            $text = $this->l->t('Your email address on %s was changed by an administrator.', [$instanceUrl]);
+            $event->setSubject(Provider::EMAIL_CHANGED);
+        }
+        $this->activityManager->publish($event);
+
+
+        if ($oldMailAddress !== null) {
+            $template = $this->mailer->createEMailTemplate('settings.EmailChanged', [
+                'displayname' => $user->getDisplayName(),
+                'newEMailAddress' => $user->getEMailAddress(),
+                'oldEMailAddress' => $oldMailAddress,
+                'instanceUrl' => $instanceUrl,
+            ]);
+
+            $template->setSubject($this->l->t('Email address for %1$s changed on %2$s', [$user->getDisplayName(), $instanceUrl]));
+            $template->addHeader();
+            $template->addHeading($this->l->t('Email address changed for %s', [$user->getDisplayName()]), false);
+            $template->addBodyText($text . ' ' . $this->l->t('If you did not request this, please contact an administrator.'));
+            if ($user->getEMailAddress()) {
+                $template->addBodyText($this->l->t('The new email address is %s', [$user->getEMailAddress()]));
+            }
+            $template->addFooter();
+
+
+            $message = $this->mailer->createMessage();
+            $message->setTo([$oldMailAddress => $user->getDisplayName()]);
+            $message->useTemplate($template);
+            $this->mailer->send($message);
+        }
+    }
 }

apps/files_versions/lib/Events/CreateVersionEvent.php

Indentation +35 added lines, -35 removed lines

@@ -37,45 +37,45 @@
 class CreateVersionEvent extends Event {
 
 
-	/** @var bool */
-	private $createVersion;
+    /** @var bool */
+    private $createVersion;
 
-	/** @var Node */
-	private $node;
+    /** @var Node */
+    private $node;
 
-	/**
-	 * CreateVersionEvent constructor.
-	 *
-	 * @param Node $node
-	 */
-	public function __construct(Node $node) {
-		$this->createVersion = true;
-		$this->node = $node;
-	}
+    /**
+     * CreateVersionEvent constructor.
+     *
+     * @param Node $node
+     */
+    public function __construct(Node $node) {
+        $this->createVersion = true;
+        $this->node = $node;
+    }
 
-	/**
-	 * get Node of the file which should be versioned
-	 *
-	 * @return Node
-	 */
-	public function getNode() {
-		return $this->node;
-	}
+    /**
+     * get Node of the file which should be versioned
+     *
+     * @return Node
+     */
+    public function getNode() {
+        return $this->node;
+    }
 
-	/**
-	 * disable versions for this file
-	 */
-	public function disableVersions() {
-		$this->createVersion = false;
-	}
+    /**
+     * disable versions for this file
+     */
+    public function disableVersions() {
+        $this->createVersion = false;
+    }
 
-	/**
-	 * should a version be created for this file?
-	 *
-	 * @return bool
-	 */
-	public function shouldCreateVersion() {
-		return $this->createVersion;
-	}
+    /**
+     * should a version be created for this file?
+     *
+     * @return bool
+     */
+    public function shouldCreateVersion() {
+        return $this->createVersion;
+    }
 
 }

apps/theming/lib/IconBuilder.php

Spacing +18 added lines, -18 removed lines

@@ -63,19 +63,19 @@ 
 			$icon->setImageFormat("png32");
 
 			$clone = clone $icon;
-			$clone->scaleImage(16,0);
+			$clone->scaleImage(16, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(32,0);
+			$clone->scaleImage(32, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(64,0);
+			$clone->scaleImage(64, 0);
 			$favicon->addImage($clone);
 
 			$clone = clone $icon;
-			$clone->scaleImage(128,0);
+			$clone->scaleImage(128, 0);
 			$favicon->addImage($clone);
 
 			$data = $favicon->getImagesBlob();
@@ -117,7 +117,7 @@ 
 	 */
 	public function renderAppIcon($app, $size) {
 		$appIcon = $this->util->getAppIcon($app);
-		if($appIcon === false) {
+		if ($appIcon === false) {
 			return false;
 		}
 		if ($appIcon instanceof ISimpleFile) {
@@ -128,20 +128,20 @@ 
 			$mime = mime_content_type($appIcon);
 		}
 
-		if($appIconContent === false || $appIconContent === "") {
+		if ($appIconContent === false || $appIconContent === "") {
 			return false;
 		}
 
 		$color = $this->themingDefaults->getColorPrimary();
 
 		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+		$background = '<?xml version="1.0" encoding="UTF-8"?>'.
+			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
+			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
 			'</svg>';
 		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
+		if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+			if (substr($appIconContent, 0, 5) !== "<?xml") {
 				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
 			} else {
 				$svg = $appIconContent;
@@ -153,7 +153,7 @@ 
 			$res = $tmp->getImageResolution();
 			$tmp->destroy();
 
-			if($x>$y) {
+			if ($x > $y) {
 				$max = $x;
 			} else {
 				$max = $y;
@@ -161,8 +161,8 @@ 
 
 			// convert svg to resized image
 			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
+			$resX = (int) (512 * $res['x'] / $max * 2.53);
+			$resY = (int) (512 * $res['y'] / $max * 2.53);
 			$appIconFile->setResolution($resX, $resY);
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
 			$appIconFile->readImageBlob($svg);
@@ -185,10 +185,10 @@ 
 			$appIconFile->scaleImage(512, 512, true);
 		}
 		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+		$border_w = (int) ($appIconFile->getImageWidth() * 0.05);
+		$border_h = (int) ($appIconFile->getImageHeight() * 0.05);
+		$innerWidth = (int) ($appIconFile->getImageWidth() - $border_w * 2);
+		$innerHeight = (int) ($appIconFile->getImageHeight() - $border_h * 2);
 		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
 		// center icon
 		$offset_w = 512 / 2 - $innerWidth / 2;

Indentation +206 added lines, -206 removed lines

@@ -31,211 +31,211 @@
 use OCP\Files\SimpleFS\ISimpleFile;
 
 class IconBuilder {
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var Util */
-	private $util;
-	/** @var ImageManager */
-	private $imageManager;
-
-	/**
-	 * IconBuilder constructor.
-	 *
-	 * @param ThemingDefaults $themingDefaults
-	 * @param Util $util
-	 * @param ImageManager $imageManager
-	 */
-	public function __construct(
-		ThemingDefaults $themingDefaults,
-		Util $util,
-		ImageManager $imageManager
-	) {
-		$this->themingDefaults = $themingDefaults;
-		$this->util = $util;
-		$this->imageManager = $imageManager;
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getFavicon($app) {
-		if (!$this->imageManager->shouldReplaceIcons()) {
-			return false;
-		}
-		try {
-			$favicon = new Imagick();
-			$favicon->setFormat("ico");
-			$icon = $this->renderAppIcon($app, 128);
-			if ($icon === false) {
-				return false;
-			}
-			$icon->setImageFormat("png32");
-
-			$clone = clone $icon;
-			$clone->scaleImage(16,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(32,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(64,0);
-			$favicon->addImage($clone);
-
-			$clone = clone $icon;
-			$clone->scaleImage(128,0);
-			$favicon->addImage($clone);
-
-			$data = $favicon->getImagesBlob();
-			$favicon->destroy();
-			$icon->destroy();
-			$clone->destroy();
-			return $data;
-		} catch (\ImagickException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param $app string app name
-	 * @return string|false image blob
-	 */
-	public function getTouchIcon($app) {
-		try {
-			$icon = $this->renderAppIcon($app, 512);
-			if ($icon === false) {
-				return false;
-			}
-			$icon->setImageFormat("png32");
-			$data = $icon->getImageBlob();
-			$icon->destroy();
-			return $data;
-		} catch (\ImagickException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Render app icon on themed background color
-	 * fallback to logo
-	 *
-	 * @param $app string app name
-	 * @param $size int size of the icon in px
-	 * @return Imagick|false
-	 */
-	public function renderAppIcon($app, $size) {
-		$appIcon = $this->util->getAppIcon($app);
-		if($appIcon === false) {
-			return false;
-		}
-		if ($appIcon instanceof ISimpleFile) {
-			$appIconContent = $appIcon->getContent();
-			$mime = $appIcon->getMimeType();
-		} else {
-			$appIconContent = file_get_contents($appIcon);
-			$mime = mime_content_type($appIcon);
-		}
-
-		if($appIconContent === false || $appIconContent === "") {
-			return false;
-		}
-
-		$color = $this->themingDefaults->getColorPrimary();
-
-		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
-			'</svg>';
-		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
-				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
-			} else {
-				$svg = $appIconContent;
-			}
-			$tmp = new Imagick();
-			$tmp->readImageBlob($svg);
-			$x = $tmp->getImageWidth();
-			$y = $tmp->getImageHeight();
-			$res = $tmp->getImageResolution();
-			$tmp->destroy();
-
-			if($x>$y) {
-				$max = $x;
-			} else {
-				$max = $y;
-			}
-
-			// convert svg to resized image
-			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
-			$appIconFile->setResolution($resX, $resY);
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($svg);
-
-			/**
-			 * invert app icons for bright primary colors
-			 * the default nextcloud logo will not be inverted to black
-			 */
-			if ($this->util->invertTextColor($color)
-				&& !$appIcon instanceof ISimpleFile
-				&& $app !== "core"
-			) {
-				$appIconFile->negateImage(false);
-			}
-			$appIconFile->scaleImage(512, 512, true);
-		} else {
-			$appIconFile = new Imagick();
-			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-			$appIconFile->readImageBlob($appIconContent);
-			$appIconFile->scaleImage(512, 512, true);
-		}
-		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
-		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
-		// center icon
-		$offset_w = 512 / 2 - $innerWidth / 2;
-		$offset_h = 512 / 2 - $innerHeight / 2;
-
-		$finalIconFile = new Imagick();
-		$finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
-		$finalIconFile->readImageBlob($background);
-		$finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
-		$finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
-		$finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
-		$finalIconFile->setImageFormat('png24');
-		if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
-			$filter = Imagick::INTERPOLATE_BICUBIC;
-		} else {
-			$filter = Imagick::FILTER_LANCZOS;
-		}
-		$finalIconFile->resizeImage($size, $size, $filter, 1, false);
-
-		$appIconFile->destroy();
-		return $finalIconFile;
-	}
-
-	public function colorSvg($app, $image) {
-		try {
-			$imageFile = $this->util->getAppImage($app, $image);
-		} catch (AppPathNotFoundException $e) {
-			return false;
-		}
-		$svg = file_get_contents($imageFile);
-		if ($svg !== false && $svg !== "") {
-			$color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
-			$svg = $this->util->colorizeSvg($svg, $color);
-			return $svg;
-		} else {
-			return false;
-		}
-	}
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var Util */
+    private $util;
+    /** @var ImageManager */
+    private $imageManager;
+
+    /**
+     * IconBuilder constructor.
+     *
+     * @param ThemingDefaults $themingDefaults
+     * @param Util $util
+     * @param ImageManager $imageManager
+     */
+    public function __construct(
+        ThemingDefaults $themingDefaults,
+        Util $util,
+        ImageManager $imageManager
+    ) {
+        $this->themingDefaults = $themingDefaults;
+        $this->util = $util;
+        $this->imageManager = $imageManager;
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getFavicon($app) {
+        if (!$this->imageManager->shouldReplaceIcons()) {
+            return false;
+        }
+        try {
+            $favicon = new Imagick();
+            $favicon->setFormat("ico");
+            $icon = $this->renderAppIcon($app, 128);
+            if ($icon === false) {
+                return false;
+            }
+            $icon->setImageFormat("png32");
+
+            $clone = clone $icon;
+            $clone->scaleImage(16,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(32,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(64,0);
+            $favicon->addImage($clone);
+
+            $clone = clone $icon;
+            $clone->scaleImage(128,0);
+            $favicon->addImage($clone);
+
+            $data = $favicon->getImagesBlob();
+            $favicon->destroy();
+            $icon->destroy();
+            $clone->destroy();
+            return $data;
+        } catch (\ImagickException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param $app string app name
+     * @return string|false image blob
+     */
+    public function getTouchIcon($app) {
+        try {
+            $icon = $this->renderAppIcon($app, 512);
+            if ($icon === false) {
+                return false;
+            }
+            $icon->setImageFormat("png32");
+            $data = $icon->getImageBlob();
+            $icon->destroy();
+            return $data;
+        } catch (\ImagickException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Render app icon on themed background color
+     * fallback to logo
+     *
+     * @param $app string app name
+     * @param $size int size of the icon in px
+     * @return Imagick|false
+     */
+    public function renderAppIcon($app, $size) {
+        $appIcon = $this->util->getAppIcon($app);
+        if($appIcon === false) {
+            return false;
+        }
+        if ($appIcon instanceof ISimpleFile) {
+            $appIconContent = $appIcon->getContent();
+            $mime = $appIcon->getMimeType();
+        } else {
+            $appIconContent = file_get_contents($appIcon);
+            $mime = mime_content_type($appIcon);
+        }
+
+        if($appIconContent === false || $appIconContent === "") {
+            return false;
+        }
+
+        $color = $this->themingDefaults->getColorPrimary();
+
+        // generate background image with rounded corners
+        $background = '<?xml version="1.0" encoding="UTF-8"?>' .
+            '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
+            '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+            '</svg>';
+        // resize svg magic as this seems broken in Imagemagick
+        if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+            if(substr($appIconContent, 0, 5) !== "<?xml") {
+                $svg = "<?xml version=\"1.0\"?>".$appIconContent;
+            } else {
+                $svg = $appIconContent;
+            }
+            $tmp = new Imagick();
+            $tmp->readImageBlob($svg);
+            $x = $tmp->getImageWidth();
+            $y = $tmp->getImageHeight();
+            $res = $tmp->getImageResolution();
+            $tmp->destroy();
+
+            if($x>$y) {
+                $max = $x;
+            } else {
+                $max = $y;
+            }
+
+            // convert svg to resized image
+            $appIconFile = new Imagick();
+            $resX = (int)(512 * $res['x'] / $max * 2.53);
+            $resY = (int)(512 * $res['y'] / $max * 2.53);
+            $appIconFile->setResolution($resX, $resY);
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($svg);
+
+            /**
+             * invert app icons for bright primary colors
+             * the default nextcloud logo will not be inverted to black
+             */
+            if ($this->util->invertTextColor($color)
+                && !$appIcon instanceof ISimpleFile
+                && $app !== "core"
+            ) {
+                $appIconFile->negateImage(false);
+            }
+            $appIconFile->scaleImage(512, 512, true);
+        } else {
+            $appIconFile = new Imagick();
+            $appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+            $appIconFile->readImageBlob($appIconContent);
+            $appIconFile->scaleImage(512, 512, true);
+        }
+        // offset for icon positioning
+        $border_w = (int)($appIconFile->getImageWidth() * 0.05);
+        $border_h = (int)($appIconFile->getImageHeight() * 0.05);
+        $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
+        $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+        $appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
+        // center icon
+        $offset_w = 512 / 2 - $innerWidth / 2;
+        $offset_h = 512 / 2 - $innerHeight / 2;
+
+        $finalIconFile = new Imagick();
+        $finalIconFile->setBackgroundColor(new ImagickPixel('transparent'));
+        $finalIconFile->readImageBlob($background);
+        $finalIconFile->setImageVirtualPixelMethod(Imagick::VIRTUALPIXELMETHOD_TRANSPARENT);
+        $finalIconFile->setImageArtifact('compose:args', "1,0,-0.5,0.5");
+        $finalIconFile->compositeImage($appIconFile, Imagick::COMPOSITE_ATOP, $offset_w, $offset_h);
+        $finalIconFile->setImageFormat('png24');
+        if (defined("Imagick::INTERPOLATE_BICUBIC") === true) {
+            $filter = Imagick::INTERPOLATE_BICUBIC;
+        } else {
+            $filter = Imagick::FILTER_LANCZOS;
+        }
+        $finalIconFile->resizeImage($size, $size, $filter, 1, false);
+
+        $appIconFile->destroy();
+        return $finalIconFile;
+    }
+
+    public function colorSvg($app, $image) {
+        try {
+            $imageFile = $this->util->getAppImage($app, $image);
+        } catch (AppPathNotFoundException $e) {
+            return false;
+        }
+        $svg = file_get_contents($imageFile);
+        if ($svg !== false && $svg !== "") {
+            $color = $this->util->elementColor($this->themingDefaults->getColorPrimary());
+            $svg = $this->util->colorizeSvg($svg, $color);
+            return $svg;
+        } else {
+            return false;
+        }
+    }
 
 }

lib/public/ICacheFactory.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
  * @package OCP
  * @since 7.0.0
  */
-interface ICacheFactory{
+interface ICacheFactory {
 	/**
 	 * Get a distributed memory cache instance
 	 *

Indentation +49 added lines, -49 removed lines

@@ -31,58 +31,58 @@
  * @since 7.0.0
  */
 interface ICacheFactory{
-	/**
-	 * Get a distributed memory cache instance
-	 *
-	 * All entries added trough the cache instance will be namespaced by $prefix to prevent collisions between apps
-	 *
-	 * @param string $prefix
-	 * @return ICache
-	 * @since 7.0.0
-	 * @deprecated 13.0.0 Use either createLocking, createDistributed or createLocal
-	 */
-	public function create(string $prefix = ''): ICache;
+    /**
+     * Get a distributed memory cache instance
+     *
+     * All entries added trough the cache instance will be namespaced by $prefix to prevent collisions between apps
+     *
+     * @param string $prefix
+     * @return ICache
+     * @since 7.0.0
+     * @deprecated 13.0.0 Use either createLocking, createDistributed or createLocal
+     */
+    public function create(string $prefix = ''): ICache;
 
-	/**
-	 * Check if any memory cache backend is available
-	 *
-	 * @return bool
-	 * @since 7.0.0
-	 */
-	public function isAvailable(): bool;
+    /**
+     * Check if any memory cache backend is available
+     *
+     * @return bool
+     * @since 7.0.0
+     */
+    public function isAvailable(): bool;
 
-	/**
-	 * Check if a local memory cache backend is available
-	 *
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function isLocalCacheAvailable(): bool;
+    /**
+     * Check if a local memory cache backend is available
+     *
+     * @return bool
+     * @since 14.0.0
+     */
+    public function isLocalCacheAvailable(): bool;
 
-	/**
-	 * create a cache instance for storing locks
-	 *
-	 * @param string $prefix
-	 * @return IMemcache
-	 * @since 13.0.0
-	 */
-	public function createLocking(string $prefix = ''): IMemcache;
+    /**
+     * create a cache instance for storing locks
+     *
+     * @param string $prefix
+     * @return IMemcache
+     * @since 13.0.0
+     */
+    public function createLocking(string $prefix = ''): IMemcache;
 
-	/**
-	 * create a distributed cache instance
-	 *
-	 * @param string $prefix
-	 * @return ICache
-	 * @since 13.0.0
-	 */
-	public function createDistributed(string $prefix = ''): ICache;
+    /**
+     * create a distributed cache instance
+     *
+     * @param string $prefix
+     * @return ICache
+     * @since 13.0.0
+     */
+    public function createDistributed(string $prefix = ''): ICache;
 
-	/**
-	 * create a local cache instance
-	 *
-	 * @param string $prefix
-	 * @return ICache
-	 * @since 13.0.0
-	 */
-	public function createLocal(string $prefix = ''): ICache;
+    /**
+     * create a local cache instance
+     *
+     * @param string $prefix
+     * @return ICache
+     * @since 13.0.0
+     */
+    public function createLocal(string $prefix = ''): ICache;
 }

lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php

Indentation +72 added lines, -72 removed lines

@@ -31,76 +31,76 @@
 
 class SameSiteCookieMiddleware extends Middleware {
 
-	/** @var Request */
-	private $request;
-
-	/** @var ControllerMethodReflector */
-	private $reflector;
-
-	public function __construct(Request $request,
-								ControllerMethodReflector $reflector) {
-		$this->request = $request;
-		$this->reflector = $reflector;
-	}
-
-	public function beforeController($controller, $methodName) {
-		$requestUri = $this->request->getScriptName();
-		$processingScript = explode('/', $requestUri);
-		$processingScript = $processingScript[count($processingScript)-1];
-
-		if ($processingScript !== 'index.php') {
-			return;
-		}
-
-		$noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
-		if ($noSSC) {
-			return;
-		}
-
-		if (!$this->request->passesLaxCookieCheck()) {
-			throw new LaxSameSiteCookieFailedException();
-		}
-	}
-
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof LaxSameSiteCookieFailedException) {
-			$respone = new Response();
-			$respone->setStatus(Http::STATUS_FOUND);
-			$respone->addHeader('Location', $this->request->getRequestUri());
-
-			$this->setSameSiteCookie();
-
-			return $respone;
-		}
-
-		throw $exception;
-	}
-
-	protected function setSameSiteCookie() {
-		$cookieParams = $this->request->getCookieParams();
-		$secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
-		$policies = [
-			'lax',
-			'strict',
-		];
-
-		// Append __Host to the cookie if it meets the requirements
-		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
-			$cookiePrefix = '__Host-';
-		}
-
-		foreach($policies as $policy) {
-			header(
-				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
-					$cookiePrefix,
-					$policy,
-					$cookieParams['path'],
-					$policy
-				),
-				false
-			);
-		}
-	}
+    /** @var Request */
+    private $request;
+
+    /** @var ControllerMethodReflector */
+    private $reflector;
+
+    public function __construct(Request $request,
+                                ControllerMethodReflector $reflector) {
+        $this->request = $request;
+        $this->reflector = $reflector;
+    }
+
+    public function beforeController($controller, $methodName) {
+        $requestUri = $this->request->getScriptName();
+        $processingScript = explode('/', $requestUri);
+        $processingScript = $processingScript[count($processingScript)-1];
+
+        if ($processingScript !== 'index.php') {
+            return;
+        }
+
+        $noSSC = $this->reflector->hasAnnotation('NoSameSiteCookieRequired');
+        if ($noSSC) {
+            return;
+        }
+
+        if (!$this->request->passesLaxCookieCheck()) {
+            throw new LaxSameSiteCookieFailedException();
+        }
+    }
+
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof LaxSameSiteCookieFailedException) {
+            $respone = new Response();
+            $respone->setStatus(Http::STATUS_FOUND);
+            $respone->addHeader('Location', $this->request->getRequestUri());
+
+            $this->setSameSiteCookie();
+
+            return $respone;
+        }
+
+        throw $exception;
+    }
+
+    protected function setSameSiteCookie() {
+        $cookieParams = $this->request->getCookieParams();
+        $secureCookie = ($cookieParams['secure'] === true) ? 'secure; ' : '';
+        $policies = [
+            'lax',
+            'strict',
+        ];
+
+        // Append __Host to the cookie if it meets the requirements
+        $cookiePrefix = '';
+        if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+            $cookiePrefix = '__Host-';
+        }
+
+        foreach($policies as $policy) {
+            header(
+                sprintf(
+                    'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+                    $cookiePrefix,
+                    $policy,
+                    $cookieParams['path'],
+                    $policy
+                ),
+                false
+            );
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
 	public function beforeController($controller, $methodName) {
 		$requestUri = $this->request->getScriptName();
 		$processingScript = explode('/', $requestUri);
-		$processingScript = $processingScript[count($processingScript)-1];
+		$processingScript = $processingScript[count($processingScript) - 1];
 
 		if ($processingScript !== 'index.php') {
 			return;
@@ -86,14 +86,14 @@ 
 
 		// Append __Host to the cookie if it meets the requirements
 		$cookiePrefix = '';
-		if($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
+		if ($cookieParams['secure'] === true && $cookieParams['path'] === '/') {
 			$cookiePrefix = '__Host-';
 		}
 
-		foreach($policies as $policy) {
+		foreach ($policies as $policy) {
 			header(
 				sprintf(
-					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;' . $secureCookie . 'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
+					'Set-Cookie: %snc_sameSiteCookie%s=true; path=%s; httponly;'.$secureCookie.'expires=Fri, 31-Dec-2100 23:59:59 GMT; SameSite=%s',
 					$cookiePrefix,
 					$policy,
 					$cookieParams['path'],