@@ -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); |
@@ -29,17 +29,17 @@ |
||
29 | 29 | // because base.php will already use 5.6 syntax. |
30 | 30 | if (version_compare(PHP_VERSION, '5.6.0') === -1) { |
31 | 31 | echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>'; |
32 | - echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; |
|
32 | + echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.'; |
|
33 | 33 | return; |
34 | 34 | } |
35 | 35 | |
36 | 36 | try { |
37 | 37 | |
38 | - require_once __DIR__ . '/lib/base.php'; |
|
38 | + require_once __DIR__.'/lib/base.php'; |
|
39 | 39 | |
40 | 40 | OC::handleRequest(); |
41 | 41 | |
42 | -} catch(\OC\ServiceUnavailableException $ex) { |
|
42 | +} catch (\OC\ServiceUnavailableException $ex) { |
|
43 | 43 | \OC::$server->getLogger()->logException($ex, array('app' => 'index')); |
44 | 44 | |
45 | 45 | //show the user a detailed error page |
@@ -1,3 +1,3 @@ |
||
1 | 1 | <div class="section"> |
2 | - <p><?php include(__DIR__ . '/../settings.development.notice.php'); ?></p> |
|
2 | + <p><?php include(__DIR__.'/../settings.development.notice.php'); ?></p> |
|
3 | 3 | </div> |
@@ -26,8 +26,8 @@ |
||
26 | 26 | |
27 | 27 | ?> |
28 | 28 | |
29 | -<?php foreach($_['forms'] as $form) { |
|
29 | +<?php foreach ($_['forms'] as $form) { |
|
30 | 30 | if (isset($form['form'])) {?> |
31 | - <div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div> |
|
31 | + <div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div> |
|
32 | 32 | <?php } |
33 | 33 | };?> |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | |
24 | 24 | style('settings', 'settings'); |
25 | -script('settings', [ 'settings', 'admin', 'log', 'certificates'] ); |
|
25 | +script('settings', ['settings', 'admin', 'log', 'certificates']); |
|
26 | 26 | script('core', ['multiselect', 'setupchecks']); |
27 | 27 | script('files', 'jquery.fileupload'); |
28 | 28 | |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | <div id="app-navigation"> |
32 | 32 | <ul> |
33 | 33 | <?php |
34 | - foreach($_['forms'] as $form) { |
|
34 | + foreach ($_['forms'] as $form) { |
|
35 | 35 | if (isset($form['anchor'])) { |
36 | 36 | $anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]); |
37 | - $class = 'nav-icon-' . $form['anchor']; |
|
37 | + $class = 'nav-icon-'.$form['anchor']; |
|
38 | 38 | $sectionName = $form['section-name']; |
39 | 39 | $active = $form['active'] ? ' class="active"' : ''; |
40 | 40 | ?> |
@@ -4,6 +4,6 @@ |
||
4 | 4 | * See the COPYING-README file. |
5 | 5 | */?> |
6 | 6 | |
7 | -<?php foreach($_['forms'] as $form) { |
|
7 | +<?php foreach ($_['forms'] as $form) { |
|
8 | 8 | print_unescaped($form); |
9 | 9 | }; |
@@ -1,15 +1,15 @@ discard block |
||
1 | -<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>"> |
|
1 | +<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']); ?>"> |
|
2 | 2 | <thead> |
3 | 3 | <tr> |
4 | 4 | <th id="headerAvatar" scope="col"></th> |
5 | 5 | <th id="headerName" scope="col"><?php p($l->t('Username'))?></th> |
6 | - <th id="headerDisplayName" scope="col"><?php p($l->t( 'Full name' )); ?></th> |
|
7 | - <th id="headerPassword" scope="col"><?php p($l->t( 'Password' )); ?></th> |
|
8 | - <th class="mailAddress" scope="col"><?php p($l->t( 'Email' )); ?></th> |
|
9 | - <th id="headerGroups" scope="col"><?php p($l->t( 'Groups' )); ?></th> |
|
10 | - <?php if(is_array($_['subadmins']) || $_['subadmins']): ?> |
|
6 | + <th id="headerDisplayName" scope="col"><?php p($l->t('Full name')); ?></th> |
|
7 | + <th id="headerPassword" scope="col"><?php p($l->t('Password')); ?></th> |
|
8 | + <th class="mailAddress" scope="col"><?php p($l->t('Email')); ?></th> |
|
9 | + <th id="headerGroups" scope="col"><?php p($l->t('Groups')); ?></th> |
|
10 | + <?php if (is_array($_['subadmins']) || $_['subadmins']): ?> |
|
11 | 11 | <th id="headerSubAdmins" scope="col"><?php p($l->t('Group admin for')); ?></th> |
12 | - <?php endif;?> |
|
12 | + <?php endif; ?> |
|
13 | 13 | <th id="headerQuota" scope="col"><?php p($l->t('Quota')); ?></th> |
14 | 14 | <th class="storageLocation" scope="col"><?php p($l->t('Storage location')); ?></th> |
15 | 15 | <th class="userBackend" scope="col"><?php p($l->t('User backend')); ?></th> |
@@ -37,26 +37,26 @@ discard block |
||
37 | 37 | <td class="groups"><div class="groupsListContainer multiselect button" |
38 | 38 | ><span class="title groupsList"></span><span class="icon-triangle-s"></span></div> |
39 | 39 | </td> |
40 | - <?php if(is_array($_['subadmins']) || $_['subadmins']): ?> |
|
40 | + <?php if (is_array($_['subadmins']) || $_['subadmins']): ?> |
|
41 | 41 | <td class="subadmins"><div class="groupsListContainer multiselect button" |
42 | 42 | ><span class="title groupsList"></span><span class="icon-triangle-s"></span></div> |
43 | 43 | </td> |
44 | - <?php endif;?> |
|
44 | + <?php endif; ?> |
|
45 | 45 | <td class="quota"> |
46 | 46 | <select class="quota-user" data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>"> |
47 | 47 | <option value='default'> |
48 | - <?php p($l->t('Default'));?> |
|
48 | + <?php p($l->t('Default')); ?> |
|
49 | 49 | </option> |
50 | 50 | <option value='none'> |
51 | - <?php p($l->t('Unlimited'));?> |
|
51 | + <?php p($l->t('Unlimited')); ?> |
|
52 | 52 | </option> |
53 | - <?php foreach($_['quota_preset'] as $preset):?> |
|
54 | - <option value='<?php p($preset);?>'> |
|
55 | - <?php p($preset);?> |
|
53 | + <?php foreach ($_['quota_preset'] as $preset):?> |
|
54 | + <option value='<?php p($preset); ?>'> |
|
55 | + <?php p($preset); ?> |
|
56 | 56 | </option> |
57 | - <?php endforeach;?> |
|
57 | + <?php endforeach; ?> |
|
58 | 58 | <option value='other' data-new> |
59 | - <?php p($l->t('Other'));?> ... |
|
59 | + <?php p($l->t('Other')); ?> ... |
|
60 | 60 | </option> |
61 | 61 | </select> |
62 | 62 | </td> |
@@ -1,35 +1,35 @@ |
||
1 | 1 | <div class="quota"> |
2 | 2 | <!-- Default storage --> |
3 | - <span><?php p($l->t('Default quota'));?></span> |
|
4 | - <?php if((bool) $_['isAdmin']): ?> |
|
3 | + <span><?php p($l->t('Default quota')); ?></span> |
|
4 | + <?php if ((bool) $_['isAdmin']): ?> |
|
5 | 5 | <select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s"> |
6 | - <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'> |
|
7 | - <?php p($l->t('Unlimited'));?> |
|
6 | + <option <?php if ($_['default_quota'] === 'none') print_unescaped('selected="selected"'); ?> value='none'> |
|
7 | + <?php p($l->t('Unlimited')); ?> |
|
8 | 8 | </option> |
9 | - <?php foreach($_['quota_preset'] as $preset):?> |
|
10 | - <?php if($preset !== 'default'):?> |
|
11 | - <option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'> |
|
12 | - <?php p($preset);?> |
|
9 | + <?php foreach ($_['quota_preset'] as $preset):?> |
|
10 | + <?php if ($preset !== 'default'):?> |
|
11 | + <option <?php if ($_['default_quota'] == $preset) print_unescaped('selected="selected"'); ?> value='<?php p($preset); ?>'> |
|
12 | + <?php p($preset); ?> |
|
13 | 13 | </option> |
14 | - <?php endif;?> |
|
15 | - <?php endforeach;?> |
|
16 | - <?php if($_['defaultQuotaIsUserDefined']):?> |
|
17 | - <option selected="selected" value='<?php p($_['default_quota']);?>'> |
|
18 | - <?php p($_['default_quota']);?> |
|
14 | + <?php endif; ?> |
|
15 | + <?php endforeach; ?> |
|
16 | + <?php if ($_['defaultQuotaIsUserDefined']):?> |
|
17 | + <option selected="selected" value='<?php p($_['default_quota']); ?>'> |
|
18 | + <?php p($_['default_quota']); ?> |
|
19 | 19 | </option> |
20 | - <?php endif;?> |
|
20 | + <?php endif; ?> |
|
21 | 21 | <option data-new value='other'> |
22 | - <?php p($l->t('Other'));?> |
|
22 | + <?php p($l->t('Other')); ?> |
|
23 | 23 | ... |
24 | 24 | </option> |
25 | 25 | </select> |
26 | 26 | <?php endif; ?> |
27 | - <?php if((bool) !$_['isAdmin']): ?> |
|
27 | + <?php if ((bool) !$_['isAdmin']): ?> |
|
28 | 28 | : |
29 | - <?php if( $_['default_quota'] === 'none'): ?> |
|
30 | - <?php p($l->t('Unlimited'));?> |
|
29 | + <?php if ($_['default_quota'] === 'none'): ?> |
|
30 | + <?php p($l->t('Unlimited')); ?> |
|
31 | 31 | <?php else: ?> |
32 | - <?php p($_['default_quota']);?> |
|
32 | + <?php p($_['default_quota']); ?> |
|
33 | 33 | <?php endif; ?> |
34 | 34 | <?php endif; ?> |
35 | 35 | </div> |