@@ -14,7 +14,10 @@ |
||
14 | 14 | <input type="submit" id="submitMaxUpload" |
15 | 15 | value="<?php p($l->t( 'Save' )); ?>"/> |
16 | 16 | <p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p> |
17 | - <?php else: ?> |
|
18 | - <p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p> |
|
17 | + <?php else { |
|
18 | + : ?> |
|
19 | + <p><em><?php p($l->t('Missing permissions to edit from here.')); |
|
20 | +} |
|
21 | +?></em></p> |
|
19 | 22 | <?php endif; ?> |
20 | 23 | </div> |
@@ -75,7 +75,7 @@ |
||
75 | 75 | } elseif ($file->isMounted()) { |
76 | 76 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external'); |
77 | 77 | } |
78 | - }else{ |
|
78 | + } else{ |
|
79 | 79 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype()); |
80 | 80 | } |
81 | 81 |
@@ -41,44 +41,44 @@ |
||
41 | 41 | $is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL); |
42 | 42 | |
43 | 43 | switch ($parameter->getType()) { |
44 | - case DefinitionParameter::VALUE_PASSWORD: ?> |
|
45 | - <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
|
46 | - <input type="password" |
|
44 | + case DefinitionParameter::VALUE_PASSWORD: ?> |
|
45 | + <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
|
46 | + <input type="password" |
|
47 | 47 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
48 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
48 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
49 | 49 | value="<?php p($value); ?>" |
50 | 50 | placeholder="<?php p($placeholder); ?>" |
51 | 51 | /> |
52 | 52 | <?php |
53 | - break; |
|
54 | - case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
55 | - <?php $checkboxId = uniqid("checkbox_"); ?> |
|
53 | + break; |
|
54 | + case DefinitionParameter::VALUE_BOOLEAN: ?> |
|
55 | + <?php $checkboxId = uniqid("checkbox_"); ?> |
|
56 | 56 | <div> |
57 | 57 | <label> |
58 | 58 | <input type="checkbox" |
59 | 59 | id="<?php p($checkboxId); ?>" |
60 | 60 | <?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
61 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
61 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
62 | 62 | <?php if ($value === true): ?> checked="checked"<?php endif; ?> |
63 | - /> |
|
63 | + /> |
|
64 | 64 | <?php p($placeholder); ?> |
65 | 65 | </label> |
66 | 66 | </div> |
67 | 67 | <?php |
68 | - break; |
|
69 | - case DefinitionParameter::VALUE_HIDDEN: ?> |
|
70 | - <input type="hidden" |
|
68 | + break; |
|
69 | + case DefinitionParameter::VALUE_HIDDEN: ?> |
|
70 | + <input type="hidden" |
|
71 | 71 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
72 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
72 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
73 | 73 | value="<?php p($value); ?>" |
74 | 74 | /> |
75 | 75 | <?php |
76 | - break; |
|
77 | - default: ?> |
|
78 | - <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
|
79 | - <input type="text" |
|
76 | + break; |
|
77 | + default: ?> |
|
78 | + <?php if ($is_optional) { $classes[] = 'optional'; } ?> |
|
79 | + <input type="text" |
|
80 | 80 | <?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?> |
81 | - data-parameter="<?php p($parameter->getName()); ?>" |
|
81 | + data-parameter="<?php p($parameter->getName()); ?>" |
|
82 | 82 | value="<?php p($value); ?>" |
83 | 83 | placeholder="<?php p($placeholder); ?>" |
84 | 84 | /> |
@@ -89,7 +89,10 @@ discard block |
||
89 | 89 | |
90 | 90 | <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>"> |
91 | 91 | <h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2> |
92 | - <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?> |
|
92 | + <?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) { |
|
93 | + print_unescaped(''.$_['dependencies'].''); |
|
94 | +} |
|
95 | +?> |
|
93 | 96 | <table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'> |
94 | 97 | <thead> |
95 | 98 | <tr> |
@@ -98,7 +101,10 @@ discard block |
||
98 | 101 | <th><?php p($l->t('External storage')); ?></th> |
99 | 102 | <th><?php p($l->t('Authentication')); ?></th> |
100 | 103 | <th><?php p($l->t('Configuration')); ?></th> |
101 | - <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?> |
|
104 | + <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) { |
|
105 | + print_unescaped('<th>'.$l->t('Available for').'</th>'); |
|
106 | +} |
|
107 | +?> |
|
102 | 108 | <th> </th> |
103 | 109 | <th> </th> |
104 | 110 | </tr> |
@@ -130,7 +136,10 @@ discard block |
||
130 | 136 | }); |
131 | 137 | ?> |
132 | 138 | <?php foreach ($sortedBackends as $backend): ?> |
133 | - <?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?> |
|
139 | + <?php if ($backend->getDeprecateTo()) { |
|
140 | + continue; |
|
141 | +} |
|
142 | +// ignore deprecated backends ?> |
|
134 | 143 | <option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option> |
135 | 144 | <?php endforeach; ?> |
136 | 145 | </select> |
@@ -169,7 +178,10 @@ discard block |
||
169 | 178 | |
170 | 179 | <?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?> |
171 | 180 | <input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox" |
172 | - value="1" <?php if ($_['allowUserMounting']) print_unescaped(' checked="checked"'); ?> /> |
|
181 | + value="1" <?php if ($_['allowUserMounting']) { |
|
182 | + print_unescaped(' checked="checked"'); |
|
183 | +} |
|
184 | +?> /> |
|
173 | 185 | <label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span> |
174 | 186 | |
175 | 187 | <p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>> |
@@ -182,8 +194,14 @@ discard block |
||
182 | 194 | <?php $i = 0; foreach ($userBackends as $backend): ?> |
183 | 195 | <?php if ($deprecateTo = $backend->getDeprecateTo()): ?> |
184 | 196 | <input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" /> |
185 | - <?php else: ?> |
|
186 | - <input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> /> |
|
197 | + <?php else { |
|
198 | + : ?> |
|
199 | + <input type="checkbox" id="allowUserMountingBackends<?php p($i); |
|
200 | +} |
|
201 | +?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) { |
|
202 | + print_unescaped(' checked="checked"'); |
|
203 | +} |
|
204 | +?> /> |
|
187 | 205 | <label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br /> |
188 | 206 | <?php endif; ?> |
189 | 207 | <?php $i++; ?> |
@@ -93,8 +93,7 @@ |
||
93 | 93 | public function unlink($path) { |
94 | 94 | if ($this->is_dir($path)) { |
95 | 95 | return $this->rmdir($path); |
96 | - } |
|
97 | - else { |
|
96 | + } else { |
|
98 | 97 | $url = $this->constructUrl($path); |
99 | 98 | $result = unlink($url); |
100 | 99 | clearstatcache(true, $url); |
@@ -62,8 +62,7 @@ |
||
62 | 62 | if (substr($root, 0, 1) !== '/'){ |
63 | 63 | $root = '/' . $root; |
64 | 64 | } |
65 | - } |
|
66 | - else{ |
|
65 | + } else{ |
|
67 | 66 | $root = '/'; |
68 | 67 | } |
69 | 68 |
@@ -62,18 +62,18 @@ |
||
62 | 62 | $placeholder = substr($placeholder, 1); |
63 | 63 | } |
64 | 64 | switch ($placeholder[0]) { |
65 | - case '!': |
|
66 | - $type = DefinitionParameter::VALUE_BOOLEAN; |
|
67 | - $placeholder = substr($placeholder, 1); |
|
68 | - break; |
|
69 | - case '*': |
|
70 | - $type = DefinitionParameter::VALUE_PASSWORD; |
|
71 | - $placeholder = substr($placeholder, 1); |
|
72 | - break; |
|
73 | - case '#': |
|
74 | - $type = DefinitionParameter::VALUE_HIDDEN; |
|
75 | - $placeholder = substr($placeholder, 1); |
|
76 | - break; |
|
65 | + case '!': |
|
66 | + $type = DefinitionParameter::VALUE_BOOLEAN; |
|
67 | + $placeholder = substr($placeholder, 1); |
|
68 | + break; |
|
69 | + case '*': |
|
70 | + $type = DefinitionParameter::VALUE_PASSWORD; |
|
71 | + $placeholder = substr($placeholder, 1); |
|
72 | + break; |
|
73 | + case '#': |
|
74 | + $type = DefinitionParameter::VALUE_HIDDEN; |
|
75 | + $placeholder = substr($placeholder, 1); |
|
76 | + break; |
|
77 | 77 | } |
78 | 78 | $this->addParameter((new DefinitionParameter($name, $placeholder)) |
79 | 79 | ->setType($type) |
@@ -335,7 +335,7 @@ |
||
335 | 335 | } |
336 | 336 | if($quota === 0) { |
337 | 337 | $quota = 'default'; |
338 | - }else if($quota === -1) { |
|
338 | + } else if($quota === -1) { |
|
339 | 339 | $quota = 'none'; |
340 | 340 | } else { |
341 | 341 | $quota = \OCP\Util::humanFileSize($quota); |
@@ -348,8 +348,9 @@ |
||
348 | 348 | $systemMountPoints = $this->getSystemMountPoints(); |
349 | 349 | foreach ($systemMountPoints as $mountPoint) { |
350 | 350 | $normalizedMountPoint = \OC\Files\Filesystem::normalizePath($mountPoint['mountpoint']) . '/'; |
351 | - if (strpos($normalized, $normalizedMountPoint) === 0) |
|
352 | - return $targetDir; |
|
351 | + if (strpos($normalized, $normalizedMountPoint) === 0) { |
|
352 | + return $targetDir; |
|
353 | + } |
|
353 | 354 | } |
354 | 355 | } else if ($trash === false && $this->view->file_exists('/' . $user. '/files/' . $filePath)) { |
355 | 356 | return $targetDir; |
@@ -40,8 +40,7 @@ |
||
40 | 40 | $list[] = $folder; |
41 | 41 | $folder = dirname($folder); |
42 | 42 | } |
43 | -} |
|
44 | -else { |
|
43 | +} else { |
|
45 | 44 | $deleteAll = false; |
46 | 45 | $files = (string)$_POST['files']; |
47 | 46 | $list = json_decode($files); |