nextcloud / server

core/Command/Encryption/SetDefaultModule.php

Spacing +3 added lines, -3 removed lines

@@ -59,11 +59,11 @@
 		$moduleId = $input->getArgument('module');
 
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
+			$output->writeln('"'.$moduleId.'"" is already the default module');
 		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+			$output->writeln('<info>Set default module to "'.$moduleId.'"</info>');
 		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+			$output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>');
 		}
 	}
 }

Indentation +44 added lines, -44 removed lines

@@ -31,55 +31,55 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetDefaultModule extends Command {
-	/** @var IManager */
-	protected $encryptionManager;
+    /** @var IManager */
+    protected $encryptionManager;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param IManager $encryptionManager
-	 * @param IConfig $config
-	 */
-	public function __construct(
-		IManager $encryptionManager,
-		IConfig $config
-	) {
-		parent::__construct();
-		$this->encryptionManager = $encryptionManager;
-		$this->config = $config;
-	}
+    /**
+     * @param IManager $encryptionManager
+     * @param IConfig $config
+     */
+    public function __construct(
+        IManager $encryptionManager,
+        IConfig $config
+    ) {
+        parent::__construct();
+        $this->encryptionManager = $encryptionManager;
+        $this->config = $config;
+    }
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this
-			->setName('encryption:set-default-module')
-			->setDescription('Set the encryption default module')
-			->addArgument(
-				'module',
-				InputArgument::REQUIRED,
-				'ID of the encryption module that should be used'
-			)
-		;
-	}
+        $this
+            ->setName('encryption:set-default-module')
+            ->setDescription('Set the encryption default module')
+            ->addArgument(
+                'module',
+                InputArgument::REQUIRED,
+                'ID of the encryption module that should be used'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
-		if ($isMaintenanceModeEnabled) {
-			$output->writeln("Maintenance mode must be disabled when setting default module,");
-			$output->writeln("in order to load the relevant encryption modules correctly.");
-			return;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
+        if ($isMaintenanceModeEnabled) {
+            $output->writeln("Maintenance mode must be disabled when setting default module,");
+            $output->writeln("in order to load the relevant encryption modules correctly.");
+            return;
+        }
 
-		$moduleId = $input->getArgument('module');
+        $moduleId = $input->getArgument('module');
 
-		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
-		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
-		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
-		}
-	}
+        if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
+            $output->writeln('"' . $moduleId . '"" is already the default module');
+        } else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
+            $output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+        } else {
+            $output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+        }
+    }
 }

core/Command/Group/ListCommand.php

Indentation +50 added lines, -50 removed lines

@@ -34,58 +34,58 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IGroupManager $groupManager) {
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IGroupManager $groupManager) {
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:list')
-			->setDescription('list configured groups')
-			->addOption(
-				'limit',
-				'l',
-				InputOption::VALUE_OPTIONAL,
-				'Number of groups to retrieve',
-				500
-			)->addOption(
-				'offset',
-				'o',
-				InputOption::VALUE_OPTIONAL,
-				'Offset for retrieving groups',
-				0
-			)->addOption(
-				'output',
-				null,
-				InputOption::VALUE_OPTIONAL,
-				'Output format (plain, json or json_pretty, default is plain)',
-				$this->defaultOutputFormat
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:list')
+            ->setDescription('list configured groups')
+            ->addOption(
+                'limit',
+                'l',
+                InputOption::VALUE_OPTIONAL,
+                'Number of groups to retrieve',
+                500
+            )->addOption(
+                'offset',
+                'o',
+                InputOption::VALUE_OPTIONAL,
+                'Offset for retrieving groups',
+                0
+            )->addOption(
+                'output',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Output format (plain, json or json_pretty, default is plain)',
+                $this->defaultOutputFormat
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
-		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+        $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
+    }
 
-	/**
-	 * @param IGroup[] $groups
-	 * @return array
-	 */
-	private function formatGroups(array $groups) {
-		$keys = array_map(function (IGroup $group) {
-			return $group->getGID();
-		}, $groups);
-		$values = array_map(function (IGroup $group) {
-			return array_keys($group->getUsers());
-		}, $groups);
-		return array_combine($keys, $values);
-	}
+    /**
+     * @param IGroup[] $groups
+     * @return array
+     */
+    private function formatGroups(array $groups) {
+        $keys = array_map(function (IGroup $group) {
+            return $group->getGID();
+        }, $groups);
+        $values = array_map(function (IGroup $group) {
+            return array_keys($group->getUsers());
+        }, $groups);
+        return array_combine($keys, $values);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+		$groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
 		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
 	}
 
@@ -80,10 +80,10 @@ 
 	 * @return array
 	 */
 	private function formatGroups(array $groups) {
-		$keys = array_map(function (IGroup $group) {
+		$keys = array_map(function(IGroup $group) {
 			return $group->getGID();
 		}, $groups);
-		$values = array_map(function (IGroup $group) {
+		$values = array_map(function(IGroup $group) {
 			return array_keys($group->getUsers());
 		}, $groups);
 		return array_combine($keys, $values);

core/Command/Group/RemoveUser.php

Indentation +40 added lines, -40 removed lines

@@ -33,47 +33,47 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class RemoveUser extends Base {
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:removeuser')
-			->setDescription('remove a user from a group')
-			->addArgument(
-				'group',
-				InputArgument::REQUIRED,
-				'group to remove the user from'
-			)->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to remove from the group'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:removeuser')
+            ->setDescription('remove a user from a group')
+            ->addArgument(
+                'group',
+                InputArgument::REQUIRED,
+                'group to remove the user from'
+            )->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to remove from the group'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$group = $this->groupManager->get($input->getArgument('group'));
-		if (is_null($group)) {
-			$output->writeln('<error>group not found</error>');
-			return 1;
-		}
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$group->removeUser($user);
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $group = $this->groupManager->get($input->getArgument('group'));
+        if (is_null($group)) {
+            $output->writeln('<error>group not found</error>');
+            return 1;
+        }
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $group->removeUser($user);
+    }
 }

core/Command/Group/AddUser.php

Indentation +40 added lines, -40 removed lines

@@ -33,47 +33,47 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class AddUser extends Base {
-	/** @var IUserManager */
-	protected $userManager;
-	/** @var IGroupManager */
-	protected $groupManager;
+    /** @var IUserManager */
+    protected $userManager;
+    /** @var IGroupManager */
+    protected $groupManager;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		parent::__construct();
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('group:adduser')
-			->setDescription('add a user to a group')
-			->addArgument(
-				'group',
-				InputArgument::REQUIRED,
-				'group to add the user to'
-			)->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'user to add to the group'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('group:adduser')
+            ->setDescription('add a user to a group')
+            ->addArgument(
+                'group',
+                InputArgument::REQUIRED,
+                'group to add the user to'
+            )->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'user to add to the group'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$group = $this->groupManager->get($input->getArgument('group'));
-		if (is_null($group)) {
-			$output->writeln('<error>group not found</error>');
-			return 1;
-		}
-		$user = $this->userManager->get($input->getArgument('user'));
-		if (is_null($user)) {
-			$output->writeln('<error>user not found</error>');
-			return 1;
-		}
-		$group->addUser($user);
-	}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $group = $this->groupManager->get($input->getArgument('group'));
+        if (is_null($group)) {
+            $output->writeln('<error>group not found</error>');
+            return 1;
+        }
+        $user = $this->userManager->get($input->getArgument('user'));
+        if (is_null($user)) {
+            $output->writeln('<error>user not found</error>');
+            return 1;
+        }
+        $group->addUser($user);
+    }
 }

lib/public/AppFramework/Db/DoesNotExistException.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 * @param string $msg the error message
 	 * @since 7.0.0
 	 */
-	public function __construct($msg){
+	public function __construct($msg) {
 		parent::__construct($msg);
 	}
 

Indentation +8 added lines, -8 removed lines

@@ -33,13 +33,13 @@
  */
 class DoesNotExistException extends \Exception implements IMapperException {
 
-	/**
-	 * Constructor
-	 * @param string $msg the error message
-	 * @since 7.0.0
-	 */
-	public function __construct($msg){
-		parent::__construct($msg);
-	}
+    /**
+     * Constructor
+     * @param string $msg the error message
+     * @since 7.0.0
+     */
+    public function __construct($msg){
+        parent::__construct($msg);
+    }
 
 }

apps/files_external/lib/Command/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 		try {
 			$mount = $this->globalService->getStorage($mountId);
 		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
 			return 404;
 		}
 

Indentation +61 added lines, -61 removed lines

@@ -37,76 +37,76 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class Delete extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var UserStoragesService
-	 */
-	protected $userService;
+    /**
+     * @var UserStoragesService
+     */
+    protected $userService;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-	}
+    function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:delete')
-			->setDescription('Delete an external mount')
-			->addArgument(
-				'mount_id',
-				InputArgument::REQUIRED,
-				'The id of the mount to edit'
-			)->addOption(
-				'yes',
-				'y',
-				InputOption::VALUE_NONE,
-				'Skip confirmation'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:delete')
+            ->setDescription('Delete an external mount')
+            ->addArgument(
+                'mount_id',
+                InputArgument::REQUIRED,
+                'The id of the mount to edit'
+            )->addOption(
+                'yes',
+                'y',
+                InputOption::VALUE_NONE,
+                'Skip confirmation'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$mountId = $input->getArgument('mount_id');
-		try {
-			$mount = $this->globalService->getStorage($mountId);
-		} catch (NotFoundException $e) {
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
-			return 404;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $mountId = $input->getArgument('mount_id');
+        try {
+            $mount = $this->globalService->getStorage($mountId);
+        } catch (NotFoundException $e) {
+            $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
+            return 404;
+        }
 
-		$noConfirm = $input->getOption('yes');
+        $noConfirm = $input->getOption('yes');
 
-		if (!$noConfirm) {
-			$listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
-			$listInput = new ArrayInput([], $listCommand->getDefinition());
-			$listInput->setOption('output', $input->getOption('output'));
-			$listCommand->listMounts(null, [$mount], $listInput, $output);
+        if (!$noConfirm) {
+            $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager);
+            $listInput = new ArrayInput([], $listCommand->getDefinition());
+            $listInput->setOption('output', $input->getOption('output'));
+            $listCommand->listMounts(null, [$mount], $listInput, $output);
 
-			$questionHelper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
+            $questionHelper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Delete this mount? [y/N] ', false);
 
-			if (!$questionHelper->ask($input, $output, $question)) {
-				return null;
-			}
-		}
+            if (!$questionHelper->ask($input, $output, $question)) {
+                return null;
+            }
+        }
 
-		$this->globalService->removeStorage($mountId);
-	}
+        $this->globalService->removeStorage($mountId);
+    }
 }

apps/files_external/templates/list.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		<tr>
 			<th id='headerName' class="hidden column-name">
 				<div id="headerName-container">
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
 				</div>
 			</th>
 			<th id="headerBackend" class="hidden column-backend">

lib/private/DB/MDB2SchemaReader.php

Spacing +21 added lines, -21 removed lines

@@ -94,7 +94,7 @@ 
 					$this->loadTable($schema, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -114,7 +114,7 @@ 
 			 */
 			switch ($child->getName()) {
 				case 'name':
-					$name = (string)$child;
+					$name = (string) $child;
 					$name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
 					$name = $this->platform->quoteIdentifier($name);
 					$table = $schema->createTable($name);
@@ -132,7 +132,7 @@ 
 					$this->loadDeclaration($table, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -156,7 +156,7 @@ 
 					$this->loadIndex($table, $child);
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -168,18 +168,18 @@ 
 	 * @throws \DomainException
 	 */
 	private function loadField($table, $xml) {
-		$options = array( 'notnull' => false );
+		$options = array('notnull' => false);
 		foreach ($xml->children() as $child) {
 			/**
 			 * @var \SimpleXMLElement $child
 			 */
 			switch ($child->getName()) {
 				case 'name':
-					$name = (string)$child;
+					$name = (string) $child;
 					$name = $this->platform->quoteIdentifier($name);
 					break;
 				case 'type':
-					$type = (string)$child;
+					$type = (string) $child;
 					switch ($type) {
 						case 'text':
 							$type = 'string';
@@ -196,7 +196,7 @@ 
 					}
 					break;
 				case 'length':
-					$length = (string)$child;
+					$length = (string) $child;
 					$options['length'] = $length;
 					break;
 				case 'unsigned':
@@ -212,11 +212,11 @@ 
 					$options['autoincrement'] = $autoincrement;
 					break;
 				case 'default':
-					$default = (string)$child;
+					$default = (string) $child;
 					$options['default'] = $default;
 					break;
 				case 'comments':
-					$comment = (string)$child;
+					$comment = (string) $child;
 					$options['comment'] = $comment;
 					break;
 				case 'primary':
@@ -224,15 +224,15 @@ 
 					$options['primary'] = $primary;
 					break;
 				case 'precision':
-					$precision = (string)$child;
+					$precision = (string) $child;
 					$options['precision'] = $precision;
 					break;
 				case 'scale':
-					$scale = (string)$child;
+					$scale = (string) $child;
 					$options['scale'] = $scale;
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -254,7 +254,7 @@ 
 				}
 			}
 			if ($type === 'integer' && isset($options['default'])) {
-				$options['default'] = (int)$options['default'];
+				$options['default'] = (int) $options['default'];
 			}
 			if ($type === 'integer' && isset($options['length'])) {
 				$length = $options['length'];
@@ -293,7 +293,7 @@ 
 			 */
 			switch ($child->getName()) {
 				case 'name':
-					$name = (string)$child;
+					$name = (string) $child;
 					break;
 				case 'primary':
 					$primary = $this->asBool($child);
@@ -308,20 +308,20 @@ 
 						 */
 						switch ($field->getName()) {
 							case 'name':
-								$field_name = (string)$field;
+								$field_name = (string) $field;
 								$field_name = $this->platform->quoteIdentifier($field_name);
 								$fields[] = $field_name;
 								break;
 							case 'sorting':
 								break;
 							default:
-								throw new \DomainException('Unknown element: ' . $field->getName());
+								throw new \DomainException('Unknown element: '.$field->getName());
 
 						}
 					}
 					break;
 				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+					throw new \DomainException('Unknown element: '.$child->getName());
 
 			}
 		}
@@ -339,7 +339,7 @@ 
 				}
 			}
 		} else {
-			throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
+			throw new \DomainException('Empty index definition: '.$name.' options:'.print_r($fields, true));
 		}
 	}
 
@@ -348,13 +348,13 @@ 
 	 * @return bool
 	 */
 	private function asBool($xml) {
-		$result = (string)$xml;
+		$result = (string) $xml;
 		if ($result == 'true') {
 			$result = true;
 		} elseif ($result == 'false') {
 			$result = false;
 		}
-		return (bool)$result;
+		return (bool) $result;
 	}
 
 }

Indentation +292 added lines, -292 removed lines

@@ -39,313 +39,313 @@
 
 class MDB2SchemaReader {
 
-	/**
-	 * @var string $DBTABLEPREFIX
-	 */
-	protected $DBTABLEPREFIX;
+    /**
+     * @var string $DBTABLEPREFIX
+     */
+    protected $DBTABLEPREFIX;
 
-	/**
-	 * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 */
-	protected $platform;
+    /**
+     * @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+     */
+    protected $platform;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
-	 */
-	public function __construct(IConfig $config, AbstractPlatform $platform) {
-		$this->platform = $platform;
-		$this->config = $config;
-		$this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
-	}
+    /**
+     * @param \OCP\IConfig $config
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
+     */
+    public function __construct(IConfig $config, AbstractPlatform $platform) {
+        $this->platform = $platform;
+        $this->config = $config;
+        $this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
+    }
 
-	/**
-	 * @param string $file
-	 * @param Schema $schema
-	 * @return Schema
-	 * @throws \DomainException
-	 */
-	public function loadSchemaFromFile($file, Schema $schema) {
-		$loadEntities = libxml_disable_entity_loader(false);
-		$xml = simplexml_load_file($file);
-		libxml_disable_entity_loader($loadEntities);
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-				case 'create':
-				case 'overwrite':
-				case 'charset':
-					break;
-				case 'table':
-					$this->loadTable($schema, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param string $file
+     * @param Schema $schema
+     * @return Schema
+     * @throws \DomainException
+     */
+    public function loadSchemaFromFile($file, Schema $schema) {
+        $loadEntities = libxml_disable_entity_loader(false);
+        $xml = simplexml_load_file($file);
+        libxml_disable_entity_loader($loadEntities);
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                case 'create':
+                case 'overwrite':
+                case 'charset':
+                    break;
+                case 'table':
+                    $this->loadTable($schema, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		return $schema;
-	}
+            }
+        }
+        return $schema;
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadTable($schema, $xml) {
-		$table = null;
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					$name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
-					$name = $this->platform->quoteIdentifier($name);
-					$table = $schema->createTable($name);
-					break;
-				case 'create':
-				case 'overwrite':
-				case 'charset':
-					break;
-				case 'declaration':
-					if (is_null($table)) {
-						throw new \DomainException('Table declaration before table name');
-					}
-					$this->loadDeclaration($table, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Schema $schema
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadTable($schema, $xml) {
+        $table = null;
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    $name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
+                    $name = $this->platform->quoteIdentifier($name);
+                    $table = $schema->createTable($name);
+                    break;
+                case 'create':
+                case 'overwrite':
+                case 'charset':
+                    break;
+                case 'declaration':
+                    if (is_null($table)) {
+                        throw new \DomainException('Table declaration before table name');
+                    }
+                    $this->loadDeclaration($table, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadDeclaration($table, $xml) {
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'field':
-					$this->loadField($table, $child);
-					break;
-				case 'index':
-					$this->loadIndex($table, $child);
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadDeclaration($table, $xml) {
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'field':
+                    $this->loadField($table, $child);
+                    break;
+                case 'index':
+                    $this->loadIndex($table, $child);
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadField($table, $xml) {
-		$options = array( 'notnull' => false );
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					$name = $this->platform->quoteIdentifier($name);
-					break;
-				case 'type':
-					$type = (string)$child;
-					switch ($type) {
-						case 'text':
-							$type = 'string';
-							break;
-						case 'clob':
-							$type = 'text';
-							break;
-						case 'timestamp':
-							$type = 'datetime';
-							break;
-						case 'numeric':
-							$type = 'decimal';
-							break;
-					}
-					break;
-				case 'length':
-					$length = (string)$child;
-					$options['length'] = $length;
-					break;
-				case 'unsigned':
-					$unsigned = $this->asBool($child);
-					$options['unsigned'] = $unsigned;
-					break;
-				case 'notnull':
-					$notnull = $this->asBool($child);
-					$options['notnull'] = $notnull;
-					break;
-				case 'autoincrement':
-					$autoincrement = $this->asBool($child);
-					$options['autoincrement'] = $autoincrement;
-					break;
-				case 'default':
-					$default = (string)$child;
-					$options['default'] = $default;
-					break;
-				case 'comments':
-					$comment = (string)$child;
-					$options['comment'] = $comment;
-					break;
-				case 'primary':
-					$primary = $this->asBool($child);
-					$options['primary'] = $primary;
-					break;
-				case 'precision':
-					$precision = (string)$child;
-					$options['precision'] = $precision;
-					break;
-				case 'scale':
-					$scale = (string)$child;
-					$options['scale'] = $scale;
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadField($table, $xml) {
+        $options = array( 'notnull' => false );
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    $name = $this->platform->quoteIdentifier($name);
+                    break;
+                case 'type':
+                    $type = (string)$child;
+                    switch ($type) {
+                        case 'text':
+                            $type = 'string';
+                            break;
+                        case 'clob':
+                            $type = 'text';
+                            break;
+                        case 'timestamp':
+                            $type = 'datetime';
+                            break;
+                        case 'numeric':
+                            $type = 'decimal';
+                            break;
+                    }
+                    break;
+                case 'length':
+                    $length = (string)$child;
+                    $options['length'] = $length;
+                    break;
+                case 'unsigned':
+                    $unsigned = $this->asBool($child);
+                    $options['unsigned'] = $unsigned;
+                    break;
+                case 'notnull':
+                    $notnull = $this->asBool($child);
+                    $options['notnull'] = $notnull;
+                    break;
+                case 'autoincrement':
+                    $autoincrement = $this->asBool($child);
+                    $options['autoincrement'] = $autoincrement;
+                    break;
+                case 'default':
+                    $default = (string)$child;
+                    $options['default'] = $default;
+                    break;
+                case 'comments':
+                    $comment = (string)$child;
+                    $options['comment'] = $comment;
+                    break;
+                case 'primary':
+                    $primary = $this->asBool($child);
+                    $options['primary'] = $primary;
+                    break;
+                case 'precision':
+                    $precision = (string)$child;
+                    $options['precision'] = $precision;
+                    break;
+                case 'scale':
+                    $scale = (string)$child;
+                    $options['scale'] = $scale;
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		if (isset($name) && isset($type)) {
-			if (isset($options['default']) && empty($options['default'])) {
-				if (empty($options['notnull']) || !$options['notnull']) {
-					unset($options['default']);
-					$options['notnull'] = false;
-				} else {
-					$options['default'] = '';
-				}
-				if ($type == 'integer' || $type == 'decimal') {
-					$options['default'] = 0;
-				} elseif ($type == 'boolean') {
-					$options['default'] = false;
-				}
-				if (!empty($options['autoincrement']) && $options['autoincrement']) {
-					unset($options['default']);
-				}
-			}
-			if ($type === 'integer' && isset($options['default'])) {
-				$options['default'] = (int)$options['default'];
-			}
-			if ($type === 'integer' && isset($options['length'])) {
-				$length = $options['length'];
-				if ($length < 4) {
-					$type = 'smallint';
-				} else if ($length > 4) {
-					$type = 'bigint';
-				}
-			}
-			if ($type === 'boolean' && isset($options['default'])) {
-				$options['default'] = $this->asBool($options['default']);
-			}
-			if (!empty($options['autoincrement'])
-				&& !empty($options['notnull'])
-			) {
-				$options['primary'] = true;
-			}
+            }
+        }
+        if (isset($name) && isset($type)) {
+            if (isset($options['default']) && empty($options['default'])) {
+                if (empty($options['notnull']) || !$options['notnull']) {
+                    unset($options['default']);
+                    $options['notnull'] = false;
+                } else {
+                    $options['default'] = '';
+                }
+                if ($type == 'integer' || $type == 'decimal') {
+                    $options['default'] = 0;
+                } elseif ($type == 'boolean') {
+                    $options['default'] = false;
+                }
+                if (!empty($options['autoincrement']) && $options['autoincrement']) {
+                    unset($options['default']);
+                }
+            }
+            if ($type === 'integer' && isset($options['default'])) {
+                $options['default'] = (int)$options['default'];
+            }
+            if ($type === 'integer' && isset($options['length'])) {
+                $length = $options['length'];
+                if ($length < 4) {
+                    $type = 'smallint';
+                } else if ($length > 4) {
+                    $type = 'bigint';
+                }
+            }
+            if ($type === 'boolean' && isset($options['default'])) {
+                $options['default'] = $this->asBool($options['default']);
+            }
+            if (!empty($options['autoincrement'])
+                && !empty($options['notnull'])
+            ) {
+                $options['primary'] = true;
+            }
 
-			$table->addColumn($name, $type, $options);
-			if (!empty($options['primary']) && $options['primary']) {
-				$table->setPrimaryKey(array($name));
-			}
-		}
-	}
+            $table->addColumn($name, $type, $options);
+            if (!empty($options['primary']) && $options['primary']) {
+                $table->setPrimaryKey(array($name));
+            }
+        }
+    }
 
-	/**
-	 * @param \Doctrine\DBAL\Schema\Table $table
-	 * @param \SimpleXMLElement $xml
-	 * @throws \DomainException
-	 */
-	private function loadIndex($table, $xml) {
-		$name = null;
-		$fields = array();
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var \SimpleXMLElement $child
-			 */
-			switch ($child->getName()) {
-				case 'name':
-					$name = (string)$child;
-					break;
-				case 'primary':
-					$primary = $this->asBool($child);
-					break;
-				case 'unique':
-					$unique = $this->asBool($child);
-					break;
-				case 'field':
-					foreach ($child->children() as $field) {
-						/**
-						 * @var \SimpleXMLElement $field
-						 */
-						switch ($field->getName()) {
-							case 'name':
-								$field_name = (string)$field;
-								$field_name = $this->platform->quoteIdentifier($field_name);
-								$fields[] = $field_name;
-								break;
-							case 'sorting':
-								break;
-							default:
-								throw new \DomainException('Unknown element: ' . $field->getName());
+    /**
+     * @param \Doctrine\DBAL\Schema\Table $table
+     * @param \SimpleXMLElement $xml
+     * @throws \DomainException
+     */
+    private function loadIndex($table, $xml) {
+        $name = null;
+        $fields = array();
+        foreach ($xml->children() as $child) {
+            /**
+             * @var \SimpleXMLElement $child
+             */
+            switch ($child->getName()) {
+                case 'name':
+                    $name = (string)$child;
+                    break;
+                case 'primary':
+                    $primary = $this->asBool($child);
+                    break;
+                case 'unique':
+                    $unique = $this->asBool($child);
+                    break;
+                case 'field':
+                    foreach ($child->children() as $field) {
+                        /**
+                         * @var \SimpleXMLElement $field
+                         */
+                        switch ($field->getName()) {
+                            case 'name':
+                                $field_name = (string)$field;
+                                $field_name = $this->platform->quoteIdentifier($field_name);
+                                $fields[] = $field_name;
+                                break;
+                            case 'sorting':
+                                break;
+                            default:
+                                throw new \DomainException('Unknown element: ' . $field->getName());
 
-						}
-					}
-					break;
-				default:
-					throw new \DomainException('Unknown element: ' . $child->getName());
+                        }
+                    }
+                    break;
+                default:
+                    throw new \DomainException('Unknown element: ' . $child->getName());
 
-			}
-		}
-		if (!empty($fields)) {
-			if (isset($primary) && $primary) {
-				if ($table->hasPrimaryKey()) {
-					return;
-				}
-				$table->setPrimaryKey($fields, $name);
-			} else {
-				if (isset($unique) && $unique) {
-					$table->addUniqueIndex($fields, $name);
-				} else {
-					$table->addIndex($fields, $name);
-				}
-			}
-		} else {
-			throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
-		}
-	}
+            }
+        }
+        if (!empty($fields)) {
+            if (isset($primary) && $primary) {
+                if ($table->hasPrimaryKey()) {
+                    return;
+                }
+                $table->setPrimaryKey($fields, $name);
+            } else {
+                if (isset($unique) && $unique) {
+                    $table->addUniqueIndex($fields, $name);
+                } else {
+                    $table->addIndex($fields, $name);
+                }
+            }
+        } else {
+            throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
+        }
+    }
 
-	/**
-	 * @param \SimpleXMLElement|string $xml
-	 * @return bool
-	 */
-	private function asBool($xml) {
-		$result = (string)$xml;
-		if ($result == 'true') {
-			$result = true;
-		} elseif ($result == 'false') {
-			$result = false;
-		}
-		return (bool)$result;
-	}
+    /**
+     * @param \SimpleXMLElement|string $xml
+     * @return bool
+     */
+    private function asBool($xml) {
+        $result = (string)$xml;
+        if ($result == 'true') {
+            $result = true;
+        } elseif ($result == 'false') {
+            $result = false;
+        }
+        return (bool)$result;
+    }
 
 }

lib/private/Contacts/ContactsMenu/ActionFactory.php

Indentation +22 added lines, -22 removed lines

@@ -30,28 +30,28 @@
 
 class ActionFactory implements IActionFactory {
 
-	/**
-	 * @param string $icon
-	 * @param string $name
-	 * @param string $href
-	 * @return ILinkAction
-	 */
-	public function newLinkAction($icon, $name, $href) {
-		$action = new LinkAction();
-		$action->setName($name);
-		$action->setIcon($icon);
-		$action->setHref($href);
-		return $action;
-	}
+    /**
+     * @param string $icon
+     * @param string $name
+     * @param string $href
+     * @return ILinkAction
+     */
+    public function newLinkAction($icon, $name, $href) {
+        $action = new LinkAction();
+        $action->setName($name);
+        $action->setIcon($icon);
+        $action->setHref($href);
+        return $action;
+    }
 
-	/**
-	 * @param string $icon
-	 * @param string $name
-	 * @param string $email
-	 * @return ILinkAction
-	 */
-	public function newEMailAction($icon, $name, $email) {
-		return $this->newLinkAction($icon, $name, 'mailto:' . urlencode($email));
-	}
+    /**
+     * @param string $icon
+     * @param string $name
+     * @param string $email
+     * @return ILinkAction
+     */
+    public function newEMailAction($icon, $name, $email) {
+        return $this->newLinkAction($icon, $name, 'mailto:' . urlencode($email));
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 * @return ILinkAction
 	 */
 	public function newEMailAction($icon, $name, $email) {
-		return $this->newLinkAction($icon, $name, 'mailto:' . urlencode($email));
+		return $this->newLinkAction($icon, $name, 'mailto:'.urlencode($email));
 	}
 
 }