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);
+    }
 }

settings/templates/certificates.php

Braces +5 added lines, -2 removed lines

@@ -23,8 +23,11 @@
 					<?php p($rootCert->getIssuerName()) ?>
 				</td>
 				<td <?php if ($rootCert != ''): ?>class="remove"
-					<?php else: ?>style="visibility:hidden;"
-					<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
+					<?php else {
+    : ?>style="visibility:hidden;"
+					<?php endif;
+}
+?>><img alt="<?php p($l->t('Delete')); ?>"
 										 title="<?php p($l->t('Delete')); ?>"
 										 class="action"
 										 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/>

settings/help.php

Indentation +6 added lines, -6 removed lines

@@ -36,13 +36,13 @@
 
 
 if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
-	$style1='';
-	$style2=' active';
+    $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
+    $style1='';
+    $style2=' active';
 }else{
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
-	$style1=' active';
-	$style2='';
+    $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
+    $style1=' active';
+    $style2='';
 }
 
 $url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';

Spacing +18 added lines, -18 removed lines

@@ -31,28 +31,28 @@
 OC_Util::checkLoggedIn();
 
 // Load the files we need
-OC_Util::addStyle( "settings", "settings" );
+OC_Util::addStyle("settings", "settings");
 \OC::$server->getNavigationManager()->setActiveEntry('help');
 
 
-if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
-	$style1='';
-	$style2=' active';
-}else{
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
-	$style1=' active';
-	$style2='';
+if (isset($_GET['mode']) and $_GET['mode'] === 'admin') {
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/admin/index.html');
+	$style1 = '';
+	$style2 = ' active';
+} else {
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/user/index.html');
+	$style1 = ' active';
+	$style2 = '';
 }
 
-$url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
-$url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
+$url1 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
+$url2 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
 
-$tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));
-$tmpl->assign( "url", $url );
-$tmpl->assign( "url1", $url1 );
-$tmpl->assign( "url2", $url2 );
-$tmpl->assign( "style1", $style1 );
-$tmpl->assign( "style2", $style2 );
+$tmpl = new OC_Template("settings", "help", "user");
+$tmpl->assign("admin", OC_User::isAdminUser(OC_User::getUser()));
+$tmpl->assign("url", $url);
+$tmpl->assign("url1", $url1);
+$tmpl->assign("url2", $url2);
+$tmpl->assign("style1", $style1);
+$tmpl->assign("style2", $style2);
 $tmpl->printPage();

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
 	$style1='';
 	$style2=' active';
-}else{
+} else{
 	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
 	$style1=' active';
 	$style2='';

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">