@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | use Symfony\Component\Console\Input\InputInterface; |
33 | 33 | use Symfony\Component\Console\Output\OutputInterface; |
34 | 34 | |
35 | -class Import extends Command implements CompletionAwareInterface { |
|
35 | +class Import extends Command implements CompletionAwareInterface { |
|
36 | 36 | protected $validRootKeys = ['system', 'apps']; |
37 | 37 | |
38 | 38 | /** @var IConfig */ |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | try { |
70 | 70 | $configs = $this->validateFileContent($content); |
71 | 71 | } catch (\UnexpectedValueException $e) { |
72 | - $output->writeln('<error>' . $e->getMessage(). '</error>'); |
|
72 | + $output->writeln('<error>'.$e->getMessage().'</error>'); |
|
73 | 73 | return; |
74 | 74 | } |
75 | 75 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | } |
91 | 91 | |
92 | - $output->writeln('<info>Config successfully imported from: ' . $importFile . '</info>'); |
|
92 | + $output->writeln('<info>Config successfully imported from: '.$importFile.'</info>'); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -143,10 +143,10 @@ discard block |
||
143 | 143 | $additionalKeys = array_diff($arrayKeys, $this->validRootKeys); |
144 | 144 | $commonKeys = array_intersect($arrayKeys, $this->validRootKeys); |
145 | 145 | if (!empty($additionalKeys)) { |
146 | - throw new \UnexpectedValueException('Found invalid entries in root: ' . implode(', ', $additionalKeys)); |
|
146 | + throw new \UnexpectedValueException('Found invalid entries in root: '.implode(', ', $additionalKeys)); |
|
147 | 147 | } |
148 | 148 | if (empty($commonKeys)) { |
149 | - throw new \UnexpectedValueException('At least one key of the following is expected: ' . implode(', ', $this->validRootKeys)); |
|
149 | + throw new \UnexpectedValueException('At least one key of the following is expected: '.implode(', ', $this->validRootKeys)); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | if (isset($array['system'])) { |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | */ |
175 | 175 | protected function checkTypeRecursively($configValue, $configName) { |
176 | 176 | if (!is_array($configValue) && !is_bool($configValue) && !is_int($configValue) && !is_string($configValue) && !is_null($configValue)) { |
177 | - throw new \UnexpectedValueException('Invalid system config value for "' . $configName . '". Only arrays, bools, integers, strings and null (delete) are allowed.'); |
|
177 | + throw new \UnexpectedValueException('Invalid system config value for "'.$configName.'". Only arrays, bools, integers, strings and null (delete) are allowed.'); |
|
178 | 178 | } |
179 | 179 | if (is_array($configValue)) { |
180 | 180 | foreach ($configValue as $key => $value) { |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | foreach ($array as $app => $configs) { |
193 | 193 | foreach ($configs as $name => $value) { |
194 | 194 | if (!is_int($value) && !is_string($value) && !is_null($value)) { |
195 | - throw new \UnexpectedValueException('Invalid app config value for "' . $app . '":"' . $name . '". Only integers, strings and null (delete) are allowed.'); |
|
195 | + throw new \UnexpectedValueException('Invalid app config value for "'.$app.'":"'.$name.'". Only integers, strings and null (delete) are allowed.'); |
|
196 | 196 | } |
197 | 197 | } |
198 | 198 | } |
@@ -132,16 +132,16 @@ |
||
132 | 132 | $this->output->writeln(''); |
133 | 133 | break; |
134 | 134 | case '\OC\Repair::step': |
135 | - $this->output->writeln(' - ' . $event->getArgument(0)); |
|
135 | + $this->output->writeln(' - '.$event->getArgument(0)); |
|
136 | 136 | break; |
137 | 137 | case '\OC\Repair::info': |
138 | - $this->output->writeln(' - ' . $event->getArgument(0)); |
|
138 | + $this->output->writeln(' - '.$event->getArgument(0)); |
|
139 | 139 | break; |
140 | 140 | case '\OC\Repair::warning': |
141 | - $this->output->writeln(' - WARNING: ' . $event->getArgument(0)); |
|
141 | + $this->output->writeln(' - WARNING: '.$event->getArgument(0)); |
|
142 | 142 | break; |
143 | 143 | case '\OC\Repair::error': |
144 | - $this->output->writeln(' - ERROR: ' . $event->getArgument(0)); |
|
144 | + $this->output->writeln(' - ERROR: '.$event->getArgument(0)); |
|
145 | 145 | break; |
146 | 146 | } |
147 | 147 | } |
@@ -28,7 +28,7 @@ |
||
28 | 28 | use Symfony\Component\Console\Input\InputInterface; |
29 | 29 | use Symfony\Component\Console\Output\OutputInterface; |
30 | 30 | |
31 | -class ShowKeyStorageRoot extends Command{ |
|
31 | +class ShowKeyStorageRoot extends Command { |
|
32 | 32 | |
33 | 33 | /** @var Util */ |
34 | 34 | protected $util; |
@@ -70,9 +70,9 @@ |
||
70 | 70 | if ($defaultModule === null) { |
71 | 71 | $output->writeln('<error>No default module is set</error>'); |
72 | 72 | } else if (!isset($modules[$defaultModule])) { |
73 | - $output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>'); |
|
73 | + $output->writeln('<error>The current default module does not exist: '.$defaultModule.'</error>'); |
|
74 | 74 | } else { |
75 | - $output->writeln('Default module: ' . $defaultModule); |
|
75 | + $output->writeln('Default module: '.$defaultModule); |
|
76 | 76 | } |
77 | 77 | } |
78 | 78 | } |
@@ -71,7 +71,7 @@ |
||
71 | 71 | if (!$item['default']) { |
72 | 72 | $item = $item['displayName']; |
73 | 73 | } else { |
74 | - $item = $item['displayName'] . ' [default*]'; |
|
74 | + $item = $item['displayName'].' [default*]'; |
|
75 | 75 | } |
76 | 76 | }); |
77 | 77 | } |
@@ -59,11 +59,11 @@ |
||
59 | 59 | $moduleId = $input->getArgument('module'); |
60 | 60 | |
61 | 61 | if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) { |
62 | - $output->writeln('"' . $moduleId . '"" is already the default module'); |
|
62 | + $output->writeln('"'.$moduleId.'"" is already the default module'); |
|
63 | 63 | } else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) { |
64 | - $output->writeln('<info>Set default module to "' . $moduleId . '"</info>'); |
|
64 | + $output->writeln('<info>Set default module to "'.$moduleId.'"</info>'); |
|
65 | 65 | } else { |
66 | - $output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>'); |
|
66 | + $output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>'); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | protected function execute(InputInterface $input, OutputInterface $output) { |
74 | - $groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset')); |
|
74 | + $groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset')); |
|
75 | 75 | $this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups)); |
76 | 76 | } |
77 | 77 | |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | * @return array |
81 | 81 | */ |
82 | 82 | private function formatGroups(array $groups) { |
83 | - $keys = array_map(function (IGroup $group) { |
|
83 | + $keys = array_map(function(IGroup $group) { |
|
84 | 84 | return $group->getGID(); |
85 | 85 | }, $groups); |
86 | - $values = array_map(function (IGroup $group) { |
|
86 | + $values = array_map(function(IGroup $group) { |
|
87 | 87 | return array_keys($group->getUsers()); |
88 | 88 | }, $groups); |
89 | 89 | return array_combine($keys, $values); |
@@ -31,28 +31,28 @@ |
||
31 | 31 | OC_Util::checkLoggedIn(); |
32 | 32 | |
33 | 33 | // Load the files we need |
34 | -OC_Util::addStyle( "settings", "settings" ); |
|
34 | +OC_Util::addStyle("settings", "settings"); |
|
35 | 35 | \OC::$server->getNavigationManager()->setActiveEntry('help'); |
36 | 36 | |
37 | 37 | |
38 | -if(isset($_GET['mode']) and $_GET['mode'] === 'admin') { |
|
39 | - $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); |
|
40 | - $style1=''; |
|
41 | - $style2=' active'; |
|
42 | -}else{ |
|
43 | - $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); |
|
44 | - $style1=' active'; |
|
45 | - $style2=''; |
|
38 | +if (isset($_GET['mode']) and $_GET['mode'] === 'admin') { |
|
39 | + $url = \OCP\Util::linkToAbsolute('core', 'doc/admin/index.html'); |
|
40 | + $style1 = ''; |
|
41 | + $style2 = ' active'; |
|
42 | +} else { |
|
43 | + $url = \OCP\Util::linkToAbsolute('core', 'doc/user/index.html'); |
|
44 | + $style1 = ' active'; |
|
45 | + $style2 = ''; |
|
46 | 46 | } |
47 | 47 | |
48 | -$url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user'; |
|
49 | -$url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin'; |
|
48 | +$url1 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user'; |
|
49 | +$url2 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin'; |
|
50 | 50 | |
51 | -$tmpl = new OC_Template( "settings", "help", "user" ); |
|
52 | -$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser())); |
|
53 | -$tmpl->assign( "url", $url ); |
|
54 | -$tmpl->assign( "url1", $url1 ); |
|
55 | -$tmpl->assign( "url2", $url2 ); |
|
56 | -$tmpl->assign( "style1", $style1 ); |
|
57 | -$tmpl->assign( "style2", $style2 ); |
|
51 | +$tmpl = new OC_Template("settings", "help", "user"); |
|
52 | +$tmpl->assign("admin", OC_User::isAdminUser(OC_User::getUser())); |
|
53 | +$tmpl->assign("url", $url); |
|
54 | +$tmpl->assign("url1", $url1); |
|
55 | +$tmpl->assign("url2", $url2); |
|
56 | +$tmpl->assign("style1", $style1); |
|
57 | +$tmpl->assign("style2", $style2); |
|
58 | 58 | $tmpl->printPage(); |
@@ -37,7 +37,7 @@ |
||
37 | 37 | * @param string $msg the error message |
38 | 38 | * @since 7.0.0 |
39 | 39 | */ |
40 | - public function __construct($msg){ |
|
40 | + public function __construct($msg) { |
|
41 | 41 | parent::__construct($msg); |
42 | 42 | } |
43 | 43 |