nextcloud / server

apps/files_sharing/lib/Collaboration/ShareRecipientSorter.php

Indentation +64 added lines, -64 removed lines

@@ -33,78 +33,78 @@
 
 class ShareRecipientSorter implements ISorter {
 
-	/** @var IManager */
-	private $shareManager;
-	/** @var Folder */
-	private $rootFolder;
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IManager */
+    private $shareManager;
+    /** @var Folder */
+    private $rootFolder;
+    /** @var IUserSession */
+    private $userSession;
 
-	public function __construct(IManager $shareManager, IRootFolder $rootFolder, IUserSession $userSession) {
-		$this->shareManager = $shareManager;
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-	}
+    public function __construct(IManager $shareManager, IRootFolder $rootFolder, IUserSession $userSession) {
+        $this->shareManager = $shareManager;
+        $this->rootFolder = $rootFolder;
+        $this->userSession = $userSession;
+    }
 
-	public function getId() {
-		return 'share-recipients';
-	}
+    public function getId() {
+        return 'share-recipients';
+    }
 
-	public function sort(array &$sortArray, array $context) {
-		// let's be tolerant. Comments  uses "files" by default, other usages are often singular
-		if($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
-			return;
-		}
-		$user = $this->userSession->getUser();
-		if($user === null) {
-			return;
-		}
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		/** @var Node[] $nodes */
-		$nodes = $userFolder->getById((int)$context['itemId']);
-		if(count($nodes) === 0) {
-			return;
-		}
-		$al = $this->shareManager->getAccessList($nodes[0]);
+    public function sort(array &$sortArray, array $context) {
+        // let's be tolerant. Comments  uses "files" by default, other usages are often singular
+        if($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
+            return;
+        }
+        $user = $this->userSession->getUser();
+        if($user === null) {
+            return;
+        }
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        /** @var Node[] $nodes */
+        $nodes = $userFolder->getById((int)$context['itemId']);
+        if(count($nodes) === 0) {
+            return;
+        }
+        $al = $this->shareManager->getAccessList($nodes[0]);
 
-		foreach ($sortArray as $type => &$byType) {
-			if(!isset($al[$type]) || !is_array($al[$type])) {
-				continue;
-			}
+        foreach ($sortArray as $type => &$byType) {
+            if(!isset($al[$type]) || !is_array($al[$type])) {
+                continue;
+            }
 
-			// at least on PHP 5.6 usort turned out to be not stable. So we add
-			// the current index to the value and compare it on a draw
-			$i = 0;
-			$workArray = array_map(function($element) use (&$i) {
-				return [$i++, $element];
-			}, $byType);
+            // at least on PHP 5.6 usort turned out to be not stable. So we add
+            // the current index to the value and compare it on a draw
+            $i = 0;
+            $workArray = array_map(function($element) use (&$i) {
+                return [$i++, $element];
+            }, $byType);
 
-			usort($workArray, function ($a, $b) use ($al, $type) {
-				$result = $this->compare($a[1], $b[1], $al[$type]);
-				if($result === 0) {
-					$result = $a[0] - $b[0];
-				}
-				return $result;
-			});
+            usort($workArray, function ($a, $b) use ($al, $type) {
+                $result = $this->compare($a[1], $b[1], $al[$type]);
+                if($result === 0) {
+                    $result = $a[0] - $b[0];
+                }
+                return $result;
+            });
 
-			// and remove the index values again
-			$byType = array_column($workArray, 1);
-		}
-	}
+            // and remove the index values again
+            $byType = array_column($workArray, 1);
+        }
+    }
 
-	/**
-	 * @param array $a
-	 * @param array $b
-	 * @param array $al
-	 * @return int
-	 */
-	protected function compare(array $a, array $b, array $al) {
-		$a = $a['value']['shareWith'];
-		$b = $b['value']['shareWith'];
+    /**
+     * @param array $a
+     * @param array $b
+     * @param array $al
+     * @return int
+     */
+    protected function compare(array $a, array $b, array $al) {
+        $a = $a['value']['shareWith'];
+        $b = $b['value']['shareWith'];
 
-		$valueA = (int)in_array($a, $al, true);
-		$valueB = (int)in_array($b, $al, true);
+        $valueA = (int)in_array($a, $al, true);
+        $valueB = (int)in_array($b, $al, true);
 
-		return $valueB - $valueA;
-	}
+        return $valueB - $valueA;
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -52,23 +52,23 @@ 
 
 	public function sort(array &$sortArray, array $context) {
 		// let's be tolerant. Comments  uses "files" by default, other usages are often singular
-		if($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
+		if ($context['itemType'] !== 'files' && $context['itemType'] !== 'file') {
 			return;
 		}
 		$user = $this->userSession->getUser();
-		if($user === null) {
+		if ($user === null) {
 			return;
 		}
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		/** @var Node[] $nodes */
-		$nodes = $userFolder->getById((int)$context['itemId']);
-		if(count($nodes) === 0) {
+		$nodes = $userFolder->getById((int) $context['itemId']);
+		if (count($nodes) === 0) {
 			return;
 		}
 		$al = $this->shareManager->getAccessList($nodes[0]);
 
 		foreach ($sortArray as $type => &$byType) {
-			if(!isset($al[$type]) || !is_array($al[$type])) {
+			if (!isset($al[$type]) || !is_array($al[$type])) {
 				continue;
 			}
 
@@ -79,9 +79,9 @@ 
 				return [$i++, $element];
 			}, $byType);
 
-			usort($workArray, function ($a, $b) use ($al, $type) {
+			usort($workArray, function($a, $b) use ($al, $type) {
 				$result = $this->compare($a[1], $b[1], $al[$type]);
-				if($result === 0) {
+				if ($result === 0) {
 					$result = $a[0] - $b[0];
 				}
 				return $result;
@@ -102,8 +102,8 @@ 
 		$a = $a['value']['shareWith'];
 		$b = $b['value']['shareWith'];
 
-		$valueA = (int)in_array($a, $al, true);
-		$valueB = (int)in_array($b, $al, true);
+		$valueA = (int) in_array($a, $al, true);
+		$valueB = (int) in_array($b, $al, true);
 
 		return $valueB - $valueA;
 	}

apps/comments/lib/Collaboration/CommentersSorter.php

Indentation +83 added lines, -83 removed lines

@@ -29,87 +29,87 @@
 
 class CommentersSorter implements ISorter {
 
-	/** @var ICommentsManager */
-	private $commentsManager;
-
-	public function __construct(ICommentsManager $commentsManager) {
-		$this->commentsManager = $commentsManager;
-	}
-
-	public function getId() {
-		return 'commenters';
-	}
-
-	/**
-	 * Sorts people who commented on the given item atop (descelating) of the
-	 * others
-	 *
-	 * @param array $sortArray
-	 * @param array $context
-	 */
-	public function sort(array &$sortArray, array $context) {
-		$commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
-		if(count($commenters) === 0) {
-			return;
-		}
-
-		foreach ($sortArray as $type => &$byType) {
-			if(!isset($commenters[$type])) {
-				continue;
-			}
-
-			// at least on PHP 5.6 usort turned out to be not stable. So we add
-			// the current index to the value and compare it on a draw
-			$i = 0;
-			$workArray = array_map(function($element) use (&$i) {
-				return [$i++, $element];
-			}, $byType);
-
-			usort($workArray, function ($a, $b) use ($commenters, $type) {
-				$r = $this->compare($a[1], $b[1], $commenters[$type]);
-				if($r === 0) {
-					$r = $a[0] - $b[0];
-				}
-				return $r;
-			});
-
-			// and remove the index values again
-			$byType = array_column($workArray, 1);
-		}
-	}
-
-	/**
-	 * @param $type
-	 * @param $id
-	 * @return array
-	 */
-	protected function retrieveCommentsInformation($type, $id) {
-		$comments = $this->commentsManager->getForObject($type, $id);
-		if(count($comments) === 0) {
-			return [];
-		}
-
-		$actors = [];
-		foreach ($comments as $comment) {
-			if(!isset($actors[$comment->getActorType()])) {
-				$actors[$comment->getActorType()] = [];
-			}
-			if(!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
-				$actors[$comment->getActorType()][$comment->getActorId()] = 1;
-			} else {
-				$actors[$comment->getActorType()][$comment->getActorId()]++;
-			}
-		}
-		return $actors;
-	}
-
-	protected function compare(array $a, array $b, array $commenters) {
-		$a = $a['value']['shareWith'];
-		$b = $b['value']['shareWith'];
-
-		$valueA = isset($commenters[$a]) ? $commenters[$a] : 0;
-		$valueB = isset($commenters[$b]) ? $commenters[$b] : 0;
-
-		return $valueB - $valueA;
-	}
+    /** @var ICommentsManager */
+    private $commentsManager;
+
+    public function __construct(ICommentsManager $commentsManager) {
+        $this->commentsManager = $commentsManager;
+    }
+
+    public function getId() {
+        return 'commenters';
+    }
+
+    /**
+     * Sorts people who commented on the given item atop (descelating) of the
+     * others
+     *
+     * @param array $sortArray
+     * @param array $context
+     */
+    public function sort(array &$sortArray, array $context) {
+        $commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
+        if(count($commenters) === 0) {
+            return;
+        }
+
+        foreach ($sortArray as $type => &$byType) {
+            if(!isset($commenters[$type])) {
+                continue;
+            }
+
+            // at least on PHP 5.6 usort turned out to be not stable. So we add
+            // the current index to the value and compare it on a draw
+            $i = 0;
+            $workArray = array_map(function($element) use (&$i) {
+                return [$i++, $element];
+            }, $byType);
+
+            usort($workArray, function ($a, $b) use ($commenters, $type) {
+                $r = $this->compare($a[1], $b[1], $commenters[$type]);
+                if($r === 0) {
+                    $r = $a[0] - $b[0];
+                }
+                return $r;
+            });
+
+            // and remove the index values again
+            $byType = array_column($workArray, 1);
+        }
+    }
+
+    /**
+     * @param $type
+     * @param $id
+     * @return array
+     */
+    protected function retrieveCommentsInformation($type, $id) {
+        $comments = $this->commentsManager->getForObject($type, $id);
+        if(count($comments) === 0) {
+            return [];
+        }
+
+        $actors = [];
+        foreach ($comments as $comment) {
+            if(!isset($actors[$comment->getActorType()])) {
+                $actors[$comment->getActorType()] = [];
+            }
+            if(!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
+                $actors[$comment->getActorType()][$comment->getActorId()] = 1;
+            } else {
+                $actors[$comment->getActorType()][$comment->getActorId()]++;
+            }
+        }
+        return $actors;
+    }
+
+    protected function compare(array $a, array $b, array $commenters) {
+        $a = $a['value']['shareWith'];
+        $b = $b['value']['shareWith'];
+
+        $valueA = isset($commenters[$a]) ? $commenters[$a] : 0;
+        $valueB = isset($commenters[$b]) ? $commenters[$b] : 0;
+
+        return $valueB - $valueA;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -49,12 +49,12 @@ 
 	 */
 	public function sort(array &$sortArray, array $context) {
 		$commenters = $this->retrieveCommentsInformation($context['itemType'], $context['itemId']);
-		if(count($commenters) === 0) {
+		if (count($commenters) === 0) {
 			return;
 		}
 
 		foreach ($sortArray as $type => &$byType) {
-			if(!isset($commenters[$type])) {
+			if (!isset($commenters[$type])) {
 				continue;
 			}
 
@@ -65,9 +65,9 @@ 
 				return [$i++, $element];
 			}, $byType);
 
-			usort($workArray, function ($a, $b) use ($commenters, $type) {
+			usort($workArray, function($a, $b) use ($commenters, $type) {
 				$r = $this->compare($a[1], $b[1], $commenters[$type]);
-				if($r === 0) {
+				if ($r === 0) {
 					$r = $a[0] - $b[0];
 				}
 				return $r;
@@ -85,16 +85,16 @@ 
 	 */
 	protected function retrieveCommentsInformation($type, $id) {
 		$comments = $this->commentsManager->getForObject($type, $id);
-		if(count($comments) === 0) {
+		if (count($comments) === 0) {
 			return [];
 		}
 
 		$actors = [];
 		foreach ($comments as $comment) {
-			if(!isset($actors[$comment->getActorType()])) {
+			if (!isset($actors[$comment->getActorType()])) {
 				$actors[$comment->getActorType()] = [];
 			}
-			if(!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
+			if (!isset($actors[$comment->getActorType()][$comment->getActorId()])) {
 				$actors[$comment->getActorType()][$comment->getActorId()] = 1;
 			} else {
 				$actors[$comment->getActorType()][$comment->getActorId()]++;

lib/private/DB/OracleMigrator.php

Indentation +189 added lines, -189 removed lines

@@ -34,194 +34,194 @@
 
 class OracleMigrator extends Migrator {
 
-	/**
-	 * Quote a column's name but changing the name requires recreating
-	 * the column instance and copying over all properties.
-	 *
-	 * @param Column $column old column
-	 * @return Column new column instance with new name
-	 */
-	protected function quoteColumn(Column $column) {
-		$newColumn = new Column(
-			$this->connection->quoteIdentifier($column->getName()),
-			$column->getType()
-		);
-		$newColumn->setAutoincrement($column->getAutoincrement());
-		$newColumn->setColumnDefinition($column->getColumnDefinition());
-		$newColumn->setComment($column->getComment());
-		$newColumn->setDefault($column->getDefault());
-		$newColumn->setFixed($column->getFixed());
-		$newColumn->setLength($column->getLength());
-		$newColumn->setNotnull($column->getNotnull());
-		$newColumn->setPrecision($column->getPrecision());
-		$newColumn->setScale($column->getScale());
-		$newColumn->setUnsigned($column->getUnsigned());
-		$newColumn->setPlatformOptions($column->getPlatformOptions());
-		$newColumn->setCustomSchemaOptions($column->getPlatformOptions());
-		return $newColumn;
-	}
-
-	/**
-	 * Quote an index's name but changing the name requires recreating
-	 * the index instance and copying over all properties.
-	 *
-	 * @param Index $index old index
-	 * @return Index new index instance with new name
-	 */
-	protected function quoteIndex($index) {
-		return new Index(
-		//TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()),
-			$index->getName(),
-			array_map(function($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $index->getColumns()),
-			$index->isUnique(),
-			$index->isPrimary(),
-			$index->getFlags(),
-			$index->getOptions()
-		);
-	}
-
-	/**
-	 * Quote an ForeignKeyConstraint's name but changing the name requires recreating
-	 * the ForeignKeyConstraint instance and copying over all properties.
-	 *
-	 * @param ForeignKeyConstraint $fkc old fkc
-	 * @return ForeignKeyConstraint new fkc instance with new name
-	 */
-	protected function quoteForeignKeyConstraint($fkc) {
-		return new ForeignKeyConstraint(
-			array_map(function($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $fkc->getLocalColumns()),
-			$this->connection->quoteIdentifier($fkc->getForeignTableName()),
-			array_map(function($columnName) {
-				return $this->connection->quoteIdentifier($columnName);
-			}, $fkc->getForeignColumns()),
-			$fkc->getName(),
-			$fkc->getOptions()
-		);
-	}
-
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 * @throws DBALException
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
-
-		// oracle forces us to quote the identifiers
-		$schemaDiff->newTables = array_map(function(Table $table) {
-			return new Table(
-				$this->connection->quoteIdentifier($table->getName()),
-				array_map(function(Column $column) {
-					return $this->quoteColumn($column);
-				}, $table->getColumns()),
-				array_map(function(Index $index) {
-					return $this->quoteIndex($index);
-				}, $table->getIndexes()),
-				array_map(function(ForeignKeyConstraint $fck) {
-					return $this->quoteForeignKeyConstraint($fck);
-				}, $table->getForeignKeys()),
-				0,
-				$table->getOptions()
-			);
-		}, $schemaDiff->newTables);
-
-		$schemaDiff->removedTables = array_map(function(Table $table) {
-			return new Table(
-				$this->connection->quoteIdentifier($table->getName()),
-				$table->getColumns(),
-				$table->getIndexes(),
-				$table->getForeignKeys(),
-				0,
-				$table->getOptions()
-			);
-		}, $schemaDiff->removedTables);
-
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
-
-			$tableDiff->addedColumns = array_map(function(Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->addedColumns);
-
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
-				// auto increment is not relevant for oracle and can anyhow not be applied on change
-				$column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
-			}
-			// remove columns that no longer have changed (because autoincrement and unsigned are not supported)
-			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
-				return count($column->changedProperties) > 0;
-			});
-
-			$tableDiff->removedColumns = array_map(function(Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->removedColumns);
-
-			$tableDiff->renamedColumns = array_map(function(Column $column) {
-				return $this->quoteColumn($column);
-			}, $tableDiff->renamedColumns);
-
-			$tableDiff->addedIndexes = array_map(function(Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->addedIndexes);
-
-			$tableDiff->changedIndexes = array_map(function(Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->changedIndexes);
-
-			$tableDiff->removedIndexes = array_map(function(Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->removedIndexes);
-
-			$tableDiff->renamedIndexes = array_map(function(Index $index) {
-				return $this->quoteIndex($index);
-			}, $tableDiff->renamedIndexes);
-
-			$tableDiff->addedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->addedForeignKeys);
-
-			$tableDiff->changedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->changedForeignKeys);
-
-			$tableDiff->removedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
-				return $this->quoteForeignKeyConstraint($fkc);
-			}, $tableDiff->removedForeignKeys);
-		}
-
-		return $schemaDiff;
-	}
-
-	/**
-	 * @param string $name
-	 * @return string
-	 */
-	protected function generateTemporaryTableName($name) {
-		return 'oc_' . uniqid();
-	}
-
-	/**
-	 * @param $statement
-	 * @return string
-	 */
-	protected function convertStatementToScript($statement) {
-		if (substr($statement, -1) === ';') {
-			return $statement . PHP_EOL . '/' . PHP_EOL;
-		}
-		$script = $statement . ';';
-		$script .= PHP_EOL;
-		$script .= PHP_EOL;
-		return $script;
-	}
-
-	protected function getFilterExpression() {
-		return '/^"' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-	}
+    /**
+     * Quote a column's name but changing the name requires recreating
+     * the column instance and copying over all properties.
+     *
+     * @param Column $column old column
+     * @return Column new column instance with new name
+     */
+    protected function quoteColumn(Column $column) {
+        $newColumn = new Column(
+            $this->connection->quoteIdentifier($column->getName()),
+            $column->getType()
+        );
+        $newColumn->setAutoincrement($column->getAutoincrement());
+        $newColumn->setColumnDefinition($column->getColumnDefinition());
+        $newColumn->setComment($column->getComment());
+        $newColumn->setDefault($column->getDefault());
+        $newColumn->setFixed($column->getFixed());
+        $newColumn->setLength($column->getLength());
+        $newColumn->setNotnull($column->getNotnull());
+        $newColumn->setPrecision($column->getPrecision());
+        $newColumn->setScale($column->getScale());
+        $newColumn->setUnsigned($column->getUnsigned());
+        $newColumn->setPlatformOptions($column->getPlatformOptions());
+        $newColumn->setCustomSchemaOptions($column->getPlatformOptions());
+        return $newColumn;
+    }
+
+    /**
+     * Quote an index's name but changing the name requires recreating
+     * the index instance and copying over all properties.
+     *
+     * @param Index $index old index
+     * @return Index new index instance with new name
+     */
+    protected function quoteIndex($index) {
+        return new Index(
+        //TODO migrate existing uppercase indexes, then $this->connection->quoteIdentifier($index->getName()),
+            $index->getName(),
+            array_map(function($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $index->getColumns()),
+            $index->isUnique(),
+            $index->isPrimary(),
+            $index->getFlags(),
+            $index->getOptions()
+        );
+    }
+
+    /**
+     * Quote an ForeignKeyConstraint's name but changing the name requires recreating
+     * the ForeignKeyConstraint instance and copying over all properties.
+     *
+     * @param ForeignKeyConstraint $fkc old fkc
+     * @return ForeignKeyConstraint new fkc instance with new name
+     */
+    protected function quoteForeignKeyConstraint($fkc) {
+        return new ForeignKeyConstraint(
+            array_map(function($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $fkc->getLocalColumns()),
+            $this->connection->quoteIdentifier($fkc->getForeignTableName()),
+            array_map(function($columnName) {
+                return $this->connection->quoteIdentifier($columnName);
+            }, $fkc->getForeignColumns()),
+            $fkc->getName(),
+            $fkc->getOptions()
+        );
+    }
+
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     * @throws DBALException
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
+
+        // oracle forces us to quote the identifiers
+        $schemaDiff->newTables = array_map(function(Table $table) {
+            return new Table(
+                $this->connection->quoteIdentifier($table->getName()),
+                array_map(function(Column $column) {
+                    return $this->quoteColumn($column);
+                }, $table->getColumns()),
+                array_map(function(Index $index) {
+                    return $this->quoteIndex($index);
+                }, $table->getIndexes()),
+                array_map(function(ForeignKeyConstraint $fck) {
+                    return $this->quoteForeignKeyConstraint($fck);
+                }, $table->getForeignKeys()),
+                0,
+                $table->getOptions()
+            );
+        }, $schemaDiff->newTables);
+
+        $schemaDiff->removedTables = array_map(function(Table $table) {
+            return new Table(
+                $this->connection->quoteIdentifier($table->getName()),
+                $table->getColumns(),
+                $table->getIndexes(),
+                $table->getForeignKeys(),
+                0,
+                $table->getOptions()
+            );
+        }, $schemaDiff->removedTables);
+
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
+
+            $tableDiff->addedColumns = array_map(function(Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->addedColumns);
+
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
+                // auto increment is not relevant for oracle and can anyhow not be applied on change
+                $column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
+            }
+            // remove columns that no longer have changed (because autoincrement and unsigned are not supported)
+            $tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
+                return count($column->changedProperties) > 0;
+            });
+
+            $tableDiff->removedColumns = array_map(function(Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->removedColumns);
+
+            $tableDiff->renamedColumns = array_map(function(Column $column) {
+                return $this->quoteColumn($column);
+            }, $tableDiff->renamedColumns);
+
+            $tableDiff->addedIndexes = array_map(function(Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->addedIndexes);
+
+            $tableDiff->changedIndexes = array_map(function(Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->changedIndexes);
+
+            $tableDiff->removedIndexes = array_map(function(Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->removedIndexes);
+
+            $tableDiff->renamedIndexes = array_map(function(Index $index) {
+                return $this->quoteIndex($index);
+            }, $tableDiff->renamedIndexes);
+
+            $tableDiff->addedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->addedForeignKeys);
+
+            $tableDiff->changedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->changedForeignKeys);
+
+            $tableDiff->removedForeignKeys = array_map(function(ForeignKeyConstraint $fkc) {
+                return $this->quoteForeignKeyConstraint($fkc);
+            }, $tableDiff->removedForeignKeys);
+        }
+
+        return $schemaDiff;
+    }
+
+    /**
+     * @param string $name
+     * @return string
+     */
+    protected function generateTemporaryTableName($name) {
+        return 'oc_' . uniqid();
+    }
+
+    /**
+     * @param $statement
+     * @return string
+     */
+    protected function convertStatementToScript($statement) {
+        if (substr($statement, -1) === ';') {
+            return $statement . PHP_EOL . '/' . PHP_EOL;
+        }
+        $script = $statement . ';';
+        $script .= PHP_EOL;
+        $script .= PHP_EOL;
+        return $script;
+    }
+
+    protected function getFilterExpression() {
+        return '/^"' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -154,7 +154,7 @@ 
 				$column->changedProperties = array_diff($column->changedProperties, ['autoincrement', 'unsigned']);
 			}
 			// remove columns that no longer have changed (because autoincrement and unsigned are not supported)
-			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function (ColumnDiff $column) {
+			$tableDiff->changedColumns = array_filter($tableDiff->changedColumns, function(ColumnDiff $column) {
 				return count($column->changedProperties) > 0;
 			});
 
@@ -203,7 +203,7 @@ 
 	 * @return string
 	 */
 	protected function generateTemporaryTableName($name) {
-		return 'oc_' . uniqid();
+		return 'oc_'.uniqid();
 	}
 
 	/**
@@ -212,16 +212,16 @@ 
 	 */
 	protected function convertStatementToScript($statement) {
 		if (substr($statement, -1) === ';') {
-			return $statement . PHP_EOL . '/' . PHP_EOL;
+			return $statement.PHP_EOL.'/'.PHP_EOL;
 		}
-		$script = $statement . ';';
+		$script = $statement.';';
 		$script .= PHP_EOL;
 		$script .= PHP_EOL;
 		return $script;
 	}
 
 	protected function getFilterExpression() {
-		return '/^"' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+		return '/^"'.preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')).'/';
 	}
 
 }

lib/private/DB/MDB2SchemaManager.php

Indentation +121 added lines, -121 removed lines

@@ -37,136 +37,136 @@
 use OCP\IDBConnection;
 
 class MDB2SchemaManager {
-	/** @var \OC\DB\Connection $conn */
-	protected $conn;
+    /** @var \OC\DB\Connection $conn */
+    protected $conn;
 
-	/**
-	 * @param IDBConnection $conn
-	 */
-	public function __construct($conn) {
-		$this->conn = $conn;
-	}
+    /**
+     * @param IDBConnection $conn
+     */
+    public function __construct($conn) {
+        $this->conn = $conn;
+    }
 
-	/**
-	 * saves database scheme to xml file
-	 * @param string $file name of file
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public function getDbStructure($file) {
-		return \OC\DB\MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
-	}
+    /**
+     * saves database scheme to xml file
+     * @param string $file name of file
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public function getDbStructure($file) {
+        return \OC\DB\MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
+    }
 
-	/**
-	 * Creates tables from XML file
-	 * @param string $file file to read structure from
-	 * @return bool
-	 *
-	 * TODO: write more documentation
-	 */
-	public function createDbFromStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		$toSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
-		return $this->executeSchemaChange($toSchema);
-	}
+    /**
+     * Creates tables from XML file
+     * @param string $file file to read structure from
+     * @return bool
+     *
+     * TODO: write more documentation
+     */
+    public function createDbFromStructure($file) {
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        $toSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
+        return $this->executeSchemaChange($toSchema);
+    }
 
-	/**
-	 * @return \OC\DB\Migrator
-	 */
-	public function getMigrator() {
-		$random = \OC::$server->getSecureRandom();
-		$platform = $this->conn->getDatabasePlatform();
-		$config = \OC::$server->getConfig();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		if ($platform instanceof SqlitePlatform) {
-			return new SQLiteMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof OraclePlatform) {
-			return new OracleMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof MySqlPlatform) {
-			return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
-		} else if ($platform instanceof PostgreSqlPlatform) {
-			return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
-		} else {
-			return new Migrator($this->conn, $random, $config, $dispatcher);
-		}
-	}
+    /**
+     * @return \OC\DB\Migrator
+     */
+    public function getMigrator() {
+        $random = \OC::$server->getSecureRandom();
+        $platform = $this->conn->getDatabasePlatform();
+        $config = \OC::$server->getConfig();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        if ($platform instanceof SqlitePlatform) {
+            return new SQLiteMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof OraclePlatform) {
+            return new OracleMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof MySqlPlatform) {
+            return new MySQLMigrator($this->conn, $random, $config, $dispatcher);
+        } else if ($platform instanceof PostgreSqlPlatform) {
+            return new PostgreSqlMigrator($this->conn, $random, $config, $dispatcher);
+        } else {
+            return new Migrator($this->conn, $random, $config, $dispatcher);
+        }
+    }
 
-	/**
-	 * Reads database schema from file
-	 *
-	 * @param string $file file to read from
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 */
-	private function readSchemaFromFile($file) {
-		$platform = $this->conn->getDatabasePlatform();
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		return $schemaReader->loadSchemaFromFile($file, $toSchema);
-	}
+    /**
+     * Reads database schema from file
+     *
+     * @param string $file file to read from
+     * @return \Doctrine\DBAL\Schema\Schema
+     */
+    private function readSchemaFromFile($file) {
+        $platform = $this->conn->getDatabasePlatform();
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        return $schemaReader->loadSchemaFromFile($file, $toSchema);
+    }
 
-	/**
-	 * update the database scheme
-	 * @param string $file file to read structure from
-	 * @param bool $generateSql only return the sql needed for the upgrade
-	 * @return string|boolean
-	 */
-	public function updateDbFromStructure($file, $generateSql = false) {
-		$toSchema = $this->readSchemaFromFile($file);
-		$migrator = $this->getMigrator();
+    /**
+     * update the database scheme
+     * @param string $file file to read structure from
+     * @param bool $generateSql only return the sql needed for the upgrade
+     * @return string|boolean
+     */
+    public function updateDbFromStructure($file, $generateSql = false) {
+        $toSchema = $this->readSchemaFromFile($file);
+        $migrator = $this->getMigrator();
 
-		if ($generateSql) {
-			return $migrator->generateChangeScript($toSchema);
-		} else {
-			$migrator->migrate($toSchema);
-			return true;
-		}
-	}
+        if ($generateSql) {
+            return $migrator->generateChangeScript($toSchema);
+        } else {
+            $migrator->migrate($toSchema);
+            return true;
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
-	 * @return string
-	 */
-	public function generateChangeScript($schema) {
-		$migrator = $this->getMigrator();
-		return $migrator->generateChangeScript($schema);
-	}
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     * @return string
+     */
+    public function generateChangeScript($schema) {
+        $migrator = $this->getMigrator();
+        return $migrator->generateChangeScript($schema);
+    }
 
-	/**
-	 * remove all tables defined in a database structure xml file
-	 *
-	 * @param string $file the xml file describing the tables
-	 */
-	public function removeDBStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
-		$toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
-		$fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
-		$toSchema = clone $fromSchema;
-		/** @var $table \Doctrine\DBAL\Schema\Table */
-		foreach ($toSchema->getTables() as $table) {
-			$toSchema->dropTable($table->getName());
-		}
-		$comparator = new \Doctrine\DBAL\Schema\Comparator();
-		$schemaDiff = $comparator->compare($fromSchema, $toSchema);
-		$this->executeSchemaChange($schemaDiff);
-	}
+    /**
+     * remove all tables defined in a database structure xml file
+     *
+     * @param string $file the xml file describing the tables
+     */
+    public function removeDBStructure($file) {
+        $schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
+        $toSchema = new Schema([], [], $this->conn->getSchemaManager()->createSchemaConfig());
+        $fromSchema = $schemaReader->loadSchemaFromFile($file, $toSchema);
+        $toSchema = clone $fromSchema;
+        /** @var $table \Doctrine\DBAL\Schema\Table */
+        foreach ($toSchema->getTables() as $table) {
+            $toSchema->dropTable($table->getName());
+        }
+        $comparator = new \Doctrine\DBAL\Schema\Comparator();
+        $schemaDiff = $comparator->compare($fromSchema, $toSchema);
+        $this->executeSchemaChange($schemaDiff);
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
-	 * @return bool
-	 */
-	private function executeSchemaChange($schema) {
-		$this->conn->beginTransaction();
-		foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
-			$this->conn->query($sql);
-		}
-		$this->conn->commit();
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
+     * @return bool
+     */
+    private function executeSchemaChange($schema) {
+        $this->conn->beginTransaction();
+        foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
+            $this->conn->query($sql);
+        }
+        $this->conn->commit();
 
-		if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
-			$this->conn->close();
-			$this->conn->connect();
-		}
-		return true;
-	}
+        if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
+            $this->conn->close();
+            $this->conn->connect();
+        }
+        return true;
+    }
 }

lib/private/Repair/RepairMimeTypes.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
 	private function updateMimetypes($updatedMimetypes) {
 		if (empty($this->folderMimeTypeId)) {
 			$result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory'));
-			$this->folderMimeTypeId = (int)$result->fetchOne();
+			$this->folderMimeTypeId = (int) $result->fetchOne();
 		}
 
 		$count = 0;
@@ -107,7 +107,7 @@ 
 			$mimetypeId = $result->fetchOne();
 
 			// change mimetype for files with x extension
-			$count += \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension));
+			$count += \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.'.$extension));
 		}
 
 		return $count;

Indentation +174 added lines, -174 removed lines

@@ -34,196 +34,196 @@
 use OCP\Migration\IRepairStep;
 
 class RepairMimeTypes implements IRepairStep {
-	/**
-	 * @var \OCP\IConfig
-	 */
-	protected $config;
-
-	/**
-	 * @var int
-	 */
-	protected $folderMimeTypeId;
-
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
-
-	public function getName() {
-		return 'Repair mime types';
-	}
-
-	private static function existsStmt() {
-		return \OC_DB::prepare('
+    /**
+     * @var \OCP\IConfig
+     */
+    protected $config;
+
+    /**
+     * @var int
+     */
+    protected $folderMimeTypeId;
+
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
+
+    public function getName() {
+        return 'Repair mime types';
+    }
+
+    private static function existsStmt() {
+        return \OC_DB::prepare('
 			SELECT count(`mimetype`)
 			FROM   `*PREFIX*mimetypes`
 			WHERE  `mimetype` = ?
 		');
-	}
+    }
 
-	private static function getIdStmt() {
-		return \OC_DB::prepare('
+    private static function getIdStmt() {
+        return \OC_DB::prepare('
 			SELECT `id`
 			FROM   `*PREFIX*mimetypes`
 			WHERE  `mimetype` = ?
 		');
-	}
+    }
 
-	private static function insertStmt() {
-		return \OC_DB::prepare('
+    private static function insertStmt() {
+        return \OC_DB::prepare('
 			INSERT INTO `*PREFIX*mimetypes` ( `mimetype` )
 			VALUES ( ? )
 		');
-	}
+    }
 
-	private static function updateByNameStmt() {
-		return \OC_DB::prepare('
+    private static function updateByNameStmt() {
+        return \OC_DB::prepare('
 			UPDATE `*PREFIX*filecache`
 			SET `mimetype` = ?
 			WHERE `mimetype` <> ? AND `mimetype` <> ? AND `name` ILIKE ?
 		');
-	}
-
-	private function updateMimetypes($updatedMimetypes) {
-		if (empty($this->folderMimeTypeId)) {
-			$result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory'));
-			$this->folderMimeTypeId = (int)$result->fetchOne();
-		}
-
-		$count = 0;
-		foreach ($updatedMimetypes as $extension => $mimetype) {
-			$result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype));
-			$exists = $result->fetchOne();
-
-			if (!$exists) {
-				// insert mimetype
-				\OC_DB::executeAudited(self::insertStmt(), array($mimetype));
-			}
-
-			// get target mimetype id
-			$result = \OC_DB::executeAudited(self::getIdStmt(), array($mimetype));
-			$mimetypeId = $result->fetchOne();
-
-			// change mimetype for files with x extension
-			$count += \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension));
-		}
-
-		return $count;
-	}
-
-	private function introduceImageTypes() {
-		$updatedMimetypes = array(
-			'jp2' => 'image/jp2',
-			'webp' => 'image/webp',
-		);
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceWindowsProgramTypes() {
-		$updatedMimetypes = array(
-			'htaccess' => 'text/plain',
-			'bat' => 'application/x-msdos-program',
-			'cmd' => 'application/cmd',
-		);
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceLocationTypes() {
-		$updatedMimetypes = [
-			'gpx' => 'application/gpx+xml',
-			'kml' => 'application/vnd.google-earth.kml+xml',
-			'kmz' => 'application/vnd.google-earth.kmz',
-			'tcx' => 'application/vnd.garmin.tcx+xml',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceInternetShortcutTypes() {
-		$updatedMimetypes = [
-			'url' => 'application/internet-shortcut',
-			'webloc' => 'application/internet-shortcut'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceStreamingTypes() {
-		$updatedMimetypes = [
-			'm3u' => 'audio/mpegurl',
-			'm3u8' => 'audio/mpegurl',
-			'pls' => 'audio/x-scpls'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceVisioTypes() {
-		$updatedMimetypes = [
-			'vsdm' => 'application/vnd.visio',
-			'vsdx' => 'application/vnd.visio',
-			'vssm' => 'application/vnd.visio',
-			'vssx' => 'application/vnd.visio',
-			'vstm' => 'application/vnd.visio',
-			'vstx' => 'application/vnd.visio',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceComicbookTypes() {
-		$updatedMimetypes = [
-			'cb7' => 'application/comicbook+7z',
-			'cba' => 'application/comicbook+ace',
-			'cbr' => 'application/comicbook+rar',
-			'cbt' => 'application/comicbook+tar',
-			'cbtc' => 'application/comicbook+truecrypt',
-			'cbz' => 'application/comicbook+zip',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $out) {
-
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-
-		// NOTE TO DEVELOPERS: when adding new mime types, please make sure to
-		// add a version comparison to avoid doing it every time
-
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) {
-			$out->info('Fixed image mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
-			$out->info('Fixed windows program mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
-			$out->info('Fixed geospatial mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
-			$out->info('Fixed internet-shortcut mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
-			$out->info('Fixed streaming mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
-			$out->info('Fixed visio mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
-			$out->info('Fixed comicbook mime types');
-		}
-	}
+    }
+
+    private function updateMimetypes($updatedMimetypes) {
+        if (empty($this->folderMimeTypeId)) {
+            $result = \OC_DB::executeAudited(self::getIdStmt(), array('httpd/unix-directory'));
+            $this->folderMimeTypeId = (int)$result->fetchOne();
+        }
+
+        $count = 0;
+        foreach ($updatedMimetypes as $extension => $mimetype) {
+            $result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype));
+            $exists = $result->fetchOne();
+
+            if (!$exists) {
+                // insert mimetype
+                \OC_DB::executeAudited(self::insertStmt(), array($mimetype));
+            }
+
+            // get target mimetype id
+            $result = \OC_DB::executeAudited(self::getIdStmt(), array($mimetype));
+            $mimetypeId = $result->fetchOne();
+
+            // change mimetype for files with x extension
+            $count += \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetypeId, $this->folderMimeTypeId, $mimetypeId, '%.' . $extension));
+        }
+
+        return $count;
+    }
+
+    private function introduceImageTypes() {
+        $updatedMimetypes = array(
+            'jp2' => 'image/jp2',
+            'webp' => 'image/webp',
+        );
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceWindowsProgramTypes() {
+        $updatedMimetypes = array(
+            'htaccess' => 'text/plain',
+            'bat' => 'application/x-msdos-program',
+            'cmd' => 'application/cmd',
+        );
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceLocationTypes() {
+        $updatedMimetypes = [
+            'gpx' => 'application/gpx+xml',
+            'kml' => 'application/vnd.google-earth.kml+xml',
+            'kmz' => 'application/vnd.google-earth.kmz',
+            'tcx' => 'application/vnd.garmin.tcx+xml',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceInternetShortcutTypes() {
+        $updatedMimetypes = [
+            'url' => 'application/internet-shortcut',
+            'webloc' => 'application/internet-shortcut'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceStreamingTypes() {
+        $updatedMimetypes = [
+            'm3u' => 'audio/mpegurl',
+            'm3u8' => 'audio/mpegurl',
+            'pls' => 'audio/x-scpls'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceVisioTypes() {
+        $updatedMimetypes = [
+            'vsdm' => 'application/vnd.visio',
+            'vsdx' => 'application/vnd.visio',
+            'vssm' => 'application/vnd.visio',
+            'vssx' => 'application/vnd.visio',
+            'vstm' => 'application/vnd.visio',
+            'vstx' => 'application/vnd.visio',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceComicbookTypes() {
+        $updatedMimetypes = [
+            'cb7' => 'application/comicbook+7z',
+            'cba' => 'application/comicbook+ace',
+            'cbr' => 'application/comicbook+rar',
+            'cbt' => 'application/comicbook+tar',
+            'cbtc' => 'application/comicbook+truecrypt',
+            'cbz' => 'application/comicbook+zip',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $out) {
+
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+
+        // NOTE TO DEVELOPERS: when adding new mime types, please make sure to
+        // add a version comparison to avoid doing it every time
+
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) {
+            $out->info('Fixed image mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
+            $out->info('Fixed windows program mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
+            $out->info('Fixed geospatial mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
+            $out->info('Fixed internet-shortcut mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
+            $out->info('Fixed streaming mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
+            $out->info('Fixed visio mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
+            $out->info('Fixed comicbook mime types');
+        }
+    }
 }

apps/user_ldap/lib/ILDAPUserPlugin.php

Indentation +56 added lines, -56 removed lines

@@ -26,68 +26,68 @@
 
 interface ILDAPUserPlugin {
 
-	/**
-	 * Check if plugin implements actions
-	 * @return int
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with OC_USER_BACKEND_CREATE_USER etc.
-	 */
-	public function respondToActions();
+    /**
+     * Check if plugin implements actions
+     * @return int
+     *
+     * Returns the supported actions as int to be
+     * compared with OC_USER_BACKEND_CREATE_USER etc.
+     */
+    public function respondToActions();
 
-	/**
-	 * Create a new user in LDAP Backend
-	 *
-	 * @param string $uid The UID of the user to create
-	 * @param string $password The password of the new user
-	 * @return bool
-	 */
-	public function createUser($uid, $password);
+    /**
+     * Create a new user in LDAP Backend
+     *
+     * @param string $uid The UID of the user to create
+     * @param string $password The password of the new user
+     * @return bool
+     */
+    public function createUser($uid, $password);
 
-	/**
-	 * Set password
-	 *
-	 * @param string $uid The username
-	 * @param string $password The new password
-	 * @return bool
-	 *
-	 * Change the password of a user
-	 */
-	public function setPassword($uid, $password);
+    /**
+     * Set password
+     *
+     * @param string $uid The username
+     * @param string $password The new password
+     * @return bool
+     *
+     * Change the password of a user
+     */
+    public function setPassword($uid, $password);
 
-	/**
-	 * get the user's home directory
-	 * @param string $uid the username
-	 * @return boolean
-	 */
-	public function getHome($uid);
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function getHome($uid);
 
-	/**
-	 * get display name of the user
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 */
-	public function getDisplayName($uid);
+    /**
+     * get display name of the user
+     * @param string $uid user ID of the user
+     * @return string display name
+     */
+    public function getDisplayName($uid);
 
-	/**
-	 * set display name of the user
-	 * @param string $uid user ID of the user
-	 * @param string $displayName new user's display name
-	 * @return string display name
-	 */
-	public function setDisplayName($uid, $displayName);
+    /**
+     * set display name of the user
+     * @param string $uid user ID of the user
+     * @param string $displayName new user's display name
+     * @return string display name
+     */
+    public function setDisplayName($uid, $displayName);
 
-	/**
-	 * checks whether the user is allowed to change his avatar in Nextcloud
-	 * @param string $uid the Nextcloud user name
-	 * @return boolean either the user can or cannot
-	 */
-	public function canChangeAvatar($uid);
+    /**
+     * checks whether the user is allowed to change his avatar in Nextcloud
+     * @param string $uid the Nextcloud user name
+     * @return boolean either the user can or cannot
+     */
+    public function canChangeAvatar($uid);
 
-	/**
-	 * Count the number of users
-	 * @return int|bool
-	 */
-	public function countUsers();
+    /**
+     * Count the number of users
+     * @return int|bool
+     */
+    public function countUsers();
 
 }

apps/user_ldap/lib/LDAPProvider.php

Spacing +16 added lines, -16 removed lines

@@ -54,7 +54,7 @@ 
 		$this->deletedUsersIndex = $deletedUsersIndex;
 		$userBackendFound = false;
 		$groupBackendFound = false;
-		foreach ($serverContainer->getUserManager()->getBackends() as $backend){
+		foreach ($serverContainer->getUserManager()->getBackends() as $backend) {
 			$this->logger->debug('instance '.get_class($backend).' user backend.', ['app' => 'user_ldap']);
 			if ($backend instanceof IUserLDAP) {
 				$this->userBackend = $backend;
@@ -62,7 +62,7 @@ 
 				break;
 			}
         }
-		foreach ($serverContainer->getGroupManager()->getBackends() as $backend){
+		foreach ($serverContainer->getGroupManager()->getBackends() as $backend) {
 			$this->logger->debug('instance '.get_class($backend).' group backend.', ['app' => 'user_ldap']);
 			if ($backend instanceof IGroupLDAP) {
 				$this->groupBackend = $backend;
@@ -83,11 +83,11 @@ 
 	 * @throws \Exception if translation was unsuccessful
 	 */
 	public function getUserDN($uid) {
-		if(!$this->userBackend->userExists($uid)){
+		if (!$this->userBackend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		$result = $this->userBackend->getLDAPAccess($uid)->username2dn($uid);
-		if(!$result){
+		if (!$result) {
 			throw new \Exception('Translation to LDAP DN unsuccessful');
 		}
 		return $result;
@@ -100,11 +100,11 @@ 
 	 * @throws \Exception
 	 */
 	public function getGroupDN($gid) {
-		if(!$this->groupBackend->groupExists($gid)){
+		if (!$this->groupBackend->groupExists($gid)) {
 			throw new \Exception('Group id not found in LDAP');
 		}
 		$result = $this->groupBackend->getLDAPAccess($gid)->groupname2dn($gid);
-		if(!$result){
+		if (!$result) {
 			throw new \Exception('Translation to LDAP DN unsuccessful');
 		}
 		return $result;	
@@ -119,7 +119,7 @@ 
 	 */
 	public function getUserName($dn) {
 		$result = $this->userBackend->dn2UserName($dn);
-		if(!$result){
+		if (!$result) {
 			throw new \Exception('Translation to internal user name unsuccessful');
 		}
 		return $result;
@@ -151,7 +151,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPConnection($uid) {
-		if(!$this->userBackend->userExists($uid)){
+		if (!$this->userBackend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		return $this->userBackend->getNewLDAPConnection($uid);
@@ -165,7 +165,7 @@ 
 	 * @throws \Exception if group id was not found in LDAP
 	 */
 	public function getGroupLDAPConnection($gid) {
-		if(!$this->groupBackend->groupExists($gid)){
+		if (!$this->groupBackend->groupExists($gid)) {
 			throw new \Exception('Group id not found in LDAP');
 		}
 		return $this->groupBackend->getNewLDAPConnection($gid);
@@ -178,7 +178,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPBaseUsers($uid) {
-		if(!$this->userBackend->userExists($uid)){
+		if (!$this->userBackend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}	
 		return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
@@ -191,7 +191,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPBaseGroups($uid) {
-		if(!$this->userBackend->userExists($uid)){
+		if (!$this->userBackend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
@@ -203,7 +203,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function clearCache($uid) {
-		if(!$this->userBackend->userExists($uid)){
+		if (!$this->userBackend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		$this->userBackend->getLDAPAccess($uid)->getConnection()->clearCache();
@@ -216,7 +216,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function clearGroupCache($gid) {
-		if(!$this->groupBackend->groupExists($gid)){
+		if (!$this->groupBackend->groupExists($gid)) {
 			throw new \Exception('Group id not found in LDAP');
 		}
 		$this->groupBackend->getLDAPAccess($gid)->getConnection()->clearCache();
@@ -255,7 +255,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPDisplayNameField($uid) {
-		if(!$this->userBackend->userExists($uid)){
+		if (!$this->userBackend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_display_name'];
@@ -268,7 +268,7 @@ 
 	 * @throws \Exception if user id was not found in LDAP
 	 */
 	public function getLDAPEmailField($uid) {
-		if(!$this->userBackend->userExists($uid)){
+		if (!$this->userBackend->userExists($uid)) {
 			throw new \Exception('User id not found in LDAP');
 		}
 		return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_email_attr'];
@@ -281,7 +281,7 @@ 
 	 * @throws \Exception if group id was not found in LDAP
 	 */
 	public function getLDAPGroupMemberAssoc($gid) {
-		if(!$this->groupBackend->groupExists($gid)){
+		if (!$this->groupBackend->groupExists($gid)) {
 			throw new \Exception('Group id not found in LDAP');
 		}
 		return $this->groupBackend->getLDAPAccess($gid)->getConnection()->getConfiguration()['ldap_group_member_assoc_attribute'];

Indentation +230 added lines, -230 removed lines

@@ -37,256 +37,256 @@
  */
 class LDAPProvider implements ILDAPProvider, IDeletionFlagSupport {
 
-	private $userBackend;
-	private $groupBackend;
-	private $logger;
-	private $helper;
-	private $deletedUsersIndex;
+    private $userBackend;
+    private $groupBackend;
+    private $logger;
+    private $helper;
+    private $deletedUsersIndex;
 	
-	/**
-	 * Create new LDAPProvider
-	 * @param \OCP\IServerContainer $serverContainer
-	 * @param Helper $helper
-	 * @param DeletedUsersIndex $deletedUsersIndex
-	 * @throws \Exception if user_ldap app was not enabled
-	 */
-	public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) {
-		$this->logger = $serverContainer->getLogger();
-		$this->helper = $helper;
-		$this->deletedUsersIndex = $deletedUsersIndex;
-		$userBackendFound = false;
-		$groupBackendFound = false;
-		foreach ($serverContainer->getUserManager()->getBackends() as $backend){
-			$this->logger->debug('instance '.get_class($backend).' user backend.', ['app' => 'user_ldap']);
-			if ($backend instanceof IUserLDAP) {
-				$this->userBackend = $backend;
-				$userBackendFound = true;
-				break;
-			}
+    /**
+     * Create new LDAPProvider
+     * @param \OCP\IServerContainer $serverContainer
+     * @param Helper $helper
+     * @param DeletedUsersIndex $deletedUsersIndex
+     * @throws \Exception if user_ldap app was not enabled
+     */
+    public function __construct(IServerContainer $serverContainer, Helper $helper, DeletedUsersIndex $deletedUsersIndex) {
+        $this->logger = $serverContainer->getLogger();
+        $this->helper = $helper;
+        $this->deletedUsersIndex = $deletedUsersIndex;
+        $userBackendFound = false;
+        $groupBackendFound = false;
+        foreach ($serverContainer->getUserManager()->getBackends() as $backend){
+            $this->logger->debug('instance '.get_class($backend).' user backend.', ['app' => 'user_ldap']);
+            if ($backend instanceof IUserLDAP) {
+                $this->userBackend = $backend;
+                $userBackendFound = true;
+                break;
+            }
+        }
+        foreach ($serverContainer->getGroupManager()->getBackends() as $backend){
+            $this->logger->debug('instance '.get_class($backend).' group backend.', ['app' => 'user_ldap']);
+            if ($backend instanceof IGroupLDAP) {
+                $this->groupBackend = $backend;
+                $groupBackendFound = true;
+                break;
+            }
         }
-		foreach ($serverContainer->getGroupManager()->getBackends() as $backend){
-			$this->logger->debug('instance '.get_class($backend).' group backend.', ['app' => 'user_ldap']);
-			if ($backend instanceof IGroupLDAP) {
-				$this->groupBackend = $backend;
-				$groupBackendFound = true;
-				break;
-			}
-		}
 
         if (!$userBackendFound or !$groupBackendFound) {
-			throw new \Exception('To use the LDAPProvider, user_ldap app must be enabled');
-		}
-	}
+            throw new \Exception('To use the LDAPProvider, user_ldap app must be enabled');
+        }
+    }
 	
-	/**
-	 * Translate an user id to LDAP DN
-	 * @param string $uid user id
-	 * @return string with the LDAP DN
-	 * @throws \Exception if translation was unsuccessful
-	 */
-	public function getUserDN($uid) {
-		if(!$this->userBackend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		$result = $this->userBackend->getLDAPAccess($uid)->username2dn($uid);
-		if(!$result){
-			throw new \Exception('Translation to LDAP DN unsuccessful');
-		}
-		return $result;
-	}
+    /**
+     * Translate an user id to LDAP DN
+     * @param string $uid user id
+     * @return string with the LDAP DN
+     * @throws \Exception if translation was unsuccessful
+     */
+    public function getUserDN($uid) {
+        if(!$this->userBackend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        $result = $this->userBackend->getLDAPAccess($uid)->username2dn($uid);
+        if(!$result){
+            throw new \Exception('Translation to LDAP DN unsuccessful');
+        }
+        return $result;
+    }
 
-	/**
-	 * Translate a group id to LDAP DN.
-	 * @param string $gid group id
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function getGroupDN($gid) {
-		if(!$this->groupBackend->groupExists($gid)){
-			throw new \Exception('Group id not found in LDAP');
-		}
-		$result = $this->groupBackend->getLDAPAccess($gid)->groupname2dn($gid);
-		if(!$result){
-			throw new \Exception('Translation to LDAP DN unsuccessful');
-		}
-		return $result;	
-	}
+    /**
+     * Translate a group id to LDAP DN.
+     * @param string $gid group id
+     * @return string
+     * @throws \Exception
+     */
+    public function getGroupDN($gid) {
+        if(!$this->groupBackend->groupExists($gid)){
+            throw new \Exception('Group id not found in LDAP');
+        }
+        $result = $this->groupBackend->getLDAPAccess($gid)->groupname2dn($gid);
+        if(!$result){
+            throw new \Exception('Translation to LDAP DN unsuccessful');
+        }
+        return $result;	
+    }
 
-	/**
-	 * Translate a LDAP DN to an internal user name. If there is no mapping between 
-	 * the DN and the user name, a new one will be created.
-	 * @param string $dn LDAP DN
-	 * @return string with the internal user name
-	 * @throws \Exception if translation was unsuccessful
-	 */
-	public function getUserName($dn) {
-		$result = $this->userBackend->dn2UserName($dn);
-		if(!$result){
-			throw new \Exception('Translation to internal user name unsuccessful');
-		}
-		return $result;
-	}
+    /**
+     * Translate a LDAP DN to an internal user name. If there is no mapping between 
+     * the DN and the user name, a new one will be created.
+     * @param string $dn LDAP DN
+     * @return string with the internal user name
+     * @throws \Exception if translation was unsuccessful
+     */
+    public function getUserName($dn) {
+        $result = $this->userBackend->dn2UserName($dn);
+        if(!$result){
+            throw new \Exception('Translation to internal user name unsuccessful');
+        }
+        return $result;
+    }
 	
-	/**
-	 * Convert a stored DN so it can be used as base parameter for LDAP queries.
-	 * @param string $dn the DN in question
-	 * @return string
-	 */
-	public function DNasBaseParameter($dn) {
-		return $this->helper->DNasBaseParameter($dn);
-	}
+    /**
+     * Convert a stored DN so it can be used as base parameter for LDAP queries.
+     * @param string $dn the DN in question
+     * @return string
+     */
+    public function DNasBaseParameter($dn) {
+        return $this->helper->DNasBaseParameter($dn);
+    }
 	
-	/**
-	 * Sanitize a DN received from the LDAP server.
-	 * @param array $dn the DN in question
-	 * @return array the sanitized DN
-	 */
-	public function sanitizeDN($dn) {
-		return $this->helper->sanitizeDN($dn);
-	}
+    /**
+     * Sanitize a DN received from the LDAP server.
+     * @param array $dn the DN in question
+     * @return array the sanitized DN
+     */
+    public function sanitizeDN($dn) {
+        return $this->helper->sanitizeDN($dn);
+    }
 	
-	/**
-	 * Return a new LDAP connection resource for the specified user. 
-	 * The connection must be closed manually.
-	 * @param string $uid user id
-	 * @return resource of the LDAP connection
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPConnection($uid) {
-		if(!$this->userBackend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		return $this->userBackend->getNewLDAPConnection($uid);
-	}
+    /**
+     * Return a new LDAP connection resource for the specified user. 
+     * The connection must be closed manually.
+     * @param string $uid user id
+     * @return resource of the LDAP connection
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPConnection($uid) {
+        if(!$this->userBackend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        return $this->userBackend->getNewLDAPConnection($uid);
+    }
 
-	/**
-	 * Return a new LDAP connection resource for the specified user.
-	 * The connection must be closed manually.
-	 * @param string $gid group id
-	 * @return resource of the LDAP connection
-	 * @throws \Exception if group id was not found in LDAP
-	 */
-	public function getGroupLDAPConnection($gid) {
-		if(!$this->groupBackend->groupExists($gid)){
-			throw new \Exception('Group id not found in LDAP');
-		}
-		return $this->groupBackend->getNewLDAPConnection($gid);
-	}
+    /**
+     * Return a new LDAP connection resource for the specified user.
+     * The connection must be closed manually.
+     * @param string $gid group id
+     * @return resource of the LDAP connection
+     * @throws \Exception if group id was not found in LDAP
+     */
+    public function getGroupLDAPConnection($gid) {
+        if(!$this->groupBackend->groupExists($gid)){
+            throw new \Exception('Group id not found in LDAP');
+        }
+        return $this->groupBackend->getNewLDAPConnection($gid);
+    }
 	
-	/**
-	 * Get the LDAP base for users.
-	 * @param string $uid user id
-	 * @return string the base for users
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPBaseUsers($uid) {
-		if(!$this->userBackend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}	
-		return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
-	}
+    /**
+     * Get the LDAP base for users.
+     * @param string $uid user id
+     * @return string the base for users
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPBaseUsers($uid) {
+        if(!$this->userBackend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }	
+        return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users'];
+    }
 	
-	/**
-	 * Get the LDAP base for groups.
-	 * @param string $uid user id
-	 * @return string the base for groups
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPBaseGroups($uid) {
-		if(!$this->userBackend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
-	}
+    /**
+     * Get the LDAP base for groups.
+     * @param string $uid user id
+     * @return string the base for groups
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPBaseGroups($uid) {
+        if(!$this->userBackend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups'];
+    }
 	
-	/**
-	 * Clear the cache if a cache is used, otherwise do nothing.
-	 * @param string $uid user id
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function clearCache($uid) {
-		if(!$this->userBackend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		$this->userBackend->getLDAPAccess($uid)->getConnection()->clearCache();
-	}
+    /**
+     * Clear the cache if a cache is used, otherwise do nothing.
+     * @param string $uid user id
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function clearCache($uid) {
+        if(!$this->userBackend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        $this->userBackend->getLDAPAccess($uid)->getConnection()->clearCache();
+    }
 
-	/**
-	 * Clear the cache if a cache is used, otherwise do nothing.
-	 * Acts on the LDAP connection of a group
-	 * @param string $gid group id
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function clearGroupCache($gid) {
-		if(!$this->groupBackend->groupExists($gid)){
-			throw new \Exception('Group id not found in LDAP');
-		}
-		$this->groupBackend->getLDAPAccess($gid)->getConnection()->clearCache();
-	}
+    /**
+     * Clear the cache if a cache is used, otherwise do nothing.
+     * Acts on the LDAP connection of a group
+     * @param string $gid group id
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function clearGroupCache($gid) {
+        if(!$this->groupBackend->groupExists($gid)){
+            throw new \Exception('Group id not found in LDAP');
+        }
+        $this->groupBackend->getLDAPAccess($gid)->getConnection()->clearCache();
+    }
 	
-	/**
-	 * Check whether a LDAP DN exists
-	 * @param string $dn LDAP DN
-	 * @return bool whether the DN exists
-	 */
-	public function dnExists($dn) {
-		$result = $this->userBackend->dn2UserName($dn);
-		return !$result ? false : true;
-	}
+    /**
+     * Check whether a LDAP DN exists
+     * @param string $dn LDAP DN
+     * @return bool whether the DN exists
+     */
+    public function dnExists($dn) {
+        $result = $this->userBackend->dn2UserName($dn);
+        return !$result ? false : true;
+    }
 	
-	/**
-	 * Flag record for deletion.
-	 * @param string $uid user id
-	 */
-	public function flagRecord($uid) {
-		$this->deletedUsersIndex->markUser($uid);
-	}
+    /**
+     * Flag record for deletion.
+     * @param string $uid user id
+     */
+    public function flagRecord($uid) {
+        $this->deletedUsersIndex->markUser($uid);
+    }
 	
-	/**
-	 * Unflag record for deletion.
-	 * @param string $uid user id
-	 */
-	public function unflagRecord($uid) {
-		//do nothing
-	}
+    /**
+     * Unflag record for deletion.
+     * @param string $uid user id
+     */
+    public function unflagRecord($uid) {
+        //do nothing
+    }
 
-	/**
-	 * Get the LDAP attribute name for the user's display name
-	 * @param string $uid user id
-	 * @return string the display name field
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPDisplayNameField($uid) {
-		if(!$this->userBackend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_display_name'];
-	}
+    /**
+     * Get the LDAP attribute name for the user's display name
+     * @param string $uid user id
+     * @return string the display name field
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPDisplayNameField($uid) {
+        if(!$this->userBackend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_display_name'];
+    }
 
-	/**
-	 * Get the LDAP attribute name for the email
-	 * @param string $uid user id
-	 * @return string the email field
-	 * @throws \Exception if user id was not found in LDAP
-	 */
-	public function getLDAPEmailField($uid) {
-		if(!$this->userBackend->userExists($uid)){
-			throw new \Exception('User id not found in LDAP');
-		}
-		return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_email_attr'];
-	}
+    /**
+     * Get the LDAP attribute name for the email
+     * @param string $uid user id
+     * @return string the email field
+     * @throws \Exception if user id was not found in LDAP
+     */
+    public function getLDAPEmailField($uid) {
+        if(!$this->userBackend->userExists($uid)){
+            throw new \Exception('User id not found in LDAP');
+        }
+        return $this->userBackend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_email_attr'];
+    }
 
-	/**
-	 * Get the LDAP type of association between users and groups
-	 * @param string $gid group id
-	 * @return string the configuration, one of: 'memberUid', 'uniqueMember', 'member', 'gidNumber'
-	 * @throws \Exception if group id was not found in LDAP
-	 */
-	public function getLDAPGroupMemberAssoc($gid) {
-		if(!$this->groupBackend->groupExists($gid)){
-			throw new \Exception('Group id not found in LDAP');
-		}
-		return $this->groupBackend->getLDAPAccess($gid)->getConnection()->getConfiguration()['ldap_group_member_assoc_attribute'];
-	}
+    /**
+     * Get the LDAP type of association between users and groups
+     * @param string $gid group id
+     * @return string the configuration, one of: 'memberUid', 'uniqueMember', 'member', 'gidNumber'
+     * @throws \Exception if group id was not found in LDAP
+     */
+    public function getLDAPGroupMemberAssoc($gid) {
+        if(!$this->groupBackend->groupExists($gid)){
+            throw new \Exception('Group id not found in LDAP');
+        }
+        return $this->groupBackend->getLDAPAccess($gid)->getConnection()->getConfiguration()['ldap_group_member_assoc_attribute'];
+    }
 
 }

core/Controller/WalledGardenController.php

Indentation +11 added lines, -11 removed lines

@@ -28,15 +28,15 @@
 
 class WalledGardenController extends Controller {
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @return Response
-	 */
-	function get() {
-		$resp = new Response();
-		$resp->setStatus(Http::STATUS_NO_CONTENT);
-		return $resp;
-	}
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @return Response
+     */
+    function get() {
+        $resp = new Response();
+        $resp->setStatus(Http::STATUS_NO_CONTENT);
+        return $resp;
+    }
 }

apps/user_ldap/lib/ILDAPGroupPlugin.php

Indentation +50 added lines, -50 removed lines

@@ -26,61 +26,61 @@
 
 interface ILDAPGroupPlugin {
 
-	/**
-	 * Check if plugin implements actions
-	 * @return int
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
-	 */
-	public function respondToActions();
+    /**
+     * Check if plugin implements actions
+     * @return int
+     *
+     * Returns the supported actions as int to be
+     * compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
+     */
+    public function respondToActions();
 
-	/**
-	 * @param string $gid
-	 * @return string|null The group DN if group creation was successful.
-	 */
-	public function createGroup($gid);
+    /**
+     * @param string $gid
+     * @return string|null The group DN if group creation was successful.
+     */
+    public function createGroup($gid);
 
-	/**
-	 * delete a group
-	 * @param string $gid gid of the group to delete
-	 * @return bool
-	 */
-	public function deleteGroup($gid);
+    /**
+     * delete a group
+     * @param string $gid gid of the group to delete
+     * @return bool
+     */
+    public function deleteGroup($gid);
 
-	/**
-	 * Add a user to a group
-	 * @param string $uid Name of the user to add to group
-	 * @param string $gid Name of the group in which add the user
-	 * @return bool
-	 *
-	 * Adds a user to a group.
-	 */
-	public function addToGroup($uid, $gid);
+    /**
+     * Add a user to a group
+     * @param string $uid Name of the user to add to group
+     * @param string $gid Name of the group in which add the user
+     * @return bool
+     *
+     * Adds a user to a group.
+     */
+    public function addToGroup($uid, $gid);
 
-	/**
-	 * Removes a user from a group
-	 * @param string $uid Name of the user to remove from group
-	 * @param string $gid Name of the group from which remove the user
-	 * @return bool
-	 *
-	 * removes the user from a group.
-	 */
-	public function removeFromGroup($uid, $gid);
+    /**
+     * Removes a user from a group
+     * @param string $uid Name of the user to remove from group
+     * @param string $gid Name of the group from which remove the user
+     * @return bool
+     *
+     * removes the user from a group.
+     */
+    public function removeFromGroup($uid, $gid);
 
-	/**
-	 * get the number of all users matching the search string in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @return int|false
-	 */
-	public function countUsersInGroup($gid, $search = '');
+    /**
+     * get the number of all users matching the search string in a group
+     * @param string $gid
+     * @param string $search
+     * @return int|false
+     */
+    public function countUsersInGroup($gid, $search = '');
 
-	/**
-	 * get an array with group details
-	 * @param string $gid
-	 * @return array|false
-	 */
-	public function getGroupDetails($gid);
+    /**
+     * get an array with group details
+     * @param string $gid
+     * @return array|false
+     */
+    public function getGroupDetails($gid);
 
 }