@@ -2,17 +2,17 @@ |
||
2 | 2 | |
3 | 3 | <div class="section"> |
4 | 4 | <h2><?php p($l->t('File handling')); ?></h2> |
5 | - <label for="maxUploadSize"><?php p($l->t( 'Maximum upload size' )); ?> </label> |
|
5 | + <label for="maxUploadSize"><?php p($l->t('Maximum upload size')); ?> </label> |
|
6 | 6 | <span id="maxUploadSizeSettingsMsg" class="msg"></span> |
7 | 7 | <br /> |
8 | - <input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if(!$_['uploadChangable']) { p('disabled'); } ?> /> |
|
9 | - <?php if($_['displayMaxPossibleUploadSize']):?> |
|
8 | + <input type="text" name='maxUploadSize' id="maxUploadSize" value='<?php p($_['uploadMaxFilesize']) ?>' <?php if (!$_['uploadChangable']) { p('disabled'); } ?> /> |
|
9 | + <?php if ($_['displayMaxPossibleUploadSize']):?> |
|
10 | 10 | (<?php p($l->t('max. possible: ')); p($_['maxPossibleUploadSize']) ?>) |
11 | - <?php endif;?> |
|
11 | + <?php endif; ?> |
|
12 | 12 | <input type="hidden" value="<?php p($_['requesttoken']); ?>" name="requesttoken" /> |
13 | - <?php if($_['uploadChangable']): ?> |
|
13 | + <?php if ($_['uploadChangable']): ?> |
|
14 | 14 | <input type="submit" id="submitMaxUpload" |
15 | - value="<?php p($l->t( 'Save' )); ?>"/> |
|
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 | 17 | <?php else: ?> |
18 | 18 | <p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p> |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | } |
139 | 139 | foreach ($favorites['folders'] as $favorite) { |
140 | 140 | $limitations[] = $query->expr()->like('file', $query->createNamedParameter( |
141 | - $this->db->escapeLikeParameter($favorite . '/') . '%' |
|
141 | + $this->db->escapeLikeParameter($favorite.'/').'%' |
|
142 | 142 | )); |
143 | 143 | } |
144 | 144 | |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | |
149 | 149 | $function = $query->createFunction(' |
150 | 150 | CASE |
151 | - WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1 |
|
152 | - WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . ' |
|
153 | - AND (' . implode(' OR ', $limitations) . ') |
|
151 | + WHEN ' . $query->getColumnName('app').' <> '.$query->createNamedParameter('files').' THEN 1 |
|
152 | + WHEN ' . $query->getColumnName('app').' = '.$query->createNamedParameter('files').' |
|
153 | + AND (' . implode(' OR ', $limitations).') |
|
154 | 154 | THEN 1 |
155 | 155 | END = 1' |
156 | 156 | ); |
@@ -64,7 +64,7 @@ |
||
64 | 64 | if (!empty($nodes)) { |
65 | 65 | /** @var \OCP\Files\Node $node */ |
66 | 66 | $node = array_shift($nodes); |
67 | - $path = substr($node->getPath(), strlen($user . '/files/')); |
|
67 | + $path = substr($node->getPath(), strlen($user.'/files/')); |
|
68 | 68 | |
69 | 69 | $items[] = $path; |
70 | 70 | if ($node instanceof Folder) { |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | * @return DataResponse|FileDisplayResponse |
107 | 107 | */ |
108 | 108 | public function getThumbnail($x, $y, $file) { |
109 | - if($x < 1 || $y < 1) { |
|
109 | + if ($x < 1 || $y < 1) { |
|
110 | 110 | return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST); |
111 | 111 | } |
112 | 112 | |
@@ -167,13 +167,13 @@ discard block |
||
167 | 167 | * @return array |
168 | 168 | */ |
169 | 169 | private function formatNodes(array $nodes) { |
170 | - return array_values(array_map(function (Node $node) { |
|
170 | + return array_values(array_map(function(Node $node) { |
|
171 | 171 | /** @var \OC\Files\Node\Node $shareTypes */ |
172 | 172 | $shareTypes = $this->getShareTypes($node); |
173 | 173 | $file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo()); |
174 | 174 | $parts = explode('/', dirname($node->getPath()), 4); |
175 | 175 | if (isset($parts[3])) { |
176 | - $file['path'] = '/' . $parts[3]; |
|
176 | + $file['path'] = '/'.$parts[3]; |
|
177 | 177 | } else { |
178 | 178 | $file['path'] = '/'; |
179 | 179 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | */ |
52 | 52 | public function run($argument) { |
53 | 53 | $lockingProvider = \OC::$server->getLockingProvider(); |
54 | - if($lockingProvider instanceof DBLockingProvider) { |
|
54 | + if ($lockingProvider instanceof DBLockingProvider) { |
|
55 | 55 | $lockingProvider->cleanExpiredLocks(); |
56 | 56 | } |
57 | 57 | } |
@@ -80,12 +80,12 @@ |
||
80 | 80 | $deletedEntries = 0; |
81 | 81 | |
82 | 82 | $query = $this->connection->getQueryBuilder(); |
83 | - $query->select('t1.' . $idCol) |
|
83 | + $query->select('t1.'.$idCol) |
|
84 | 84 | ->from($table, 't1') |
85 | 85 | ->where($query->expr()->eq($typeCol, $query->expr()->literal('files'))) |
86 | 86 | ->andWhere($query->expr()->isNull('t2.fileid')) |
87 | - ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.' . $idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | - ->groupBy('t1.' . $idCol) |
|
87 | + ->leftJoin('t1', 'filecache', 't2', $query->expr()->eq($query->expr()->castColumn('t1.'.$idCol, IQueryBuilder::PARAM_INT), 't2.fileid')) |
|
88 | + ->groupBy('t1.'.$idCol) |
|
89 | 89 | ->setMaxResults(self::CHUNK_SIZE); |
90 | 90 | |
91 | 91 | $deleteQuery = $this->connection->getQueryBuilder(); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt'); |
39 | 39 | $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods'); |
40 | 40 | |
41 | -\OCA\Files\App::getNavigationManager()->add(function () use ($l) { |
|
41 | +\OCA\Files\App::getNavigationManager()->add(function() use ($l) { |
|
42 | 42 | return [ |
43 | 43 | 'id' => 'files', |
44 | 44 | 'appname' => 'files', |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | ]; |
49 | 49 | }); |
50 | 50 | |
51 | -\OCA\Files\App::getNavigationManager()->add(function () use ($l) { |
|
51 | +\OCA\Files\App::getNavigationManager()->add(function() use ($l) { |
|
52 | 52 | return [ |
53 | 53 | 'id' => 'recent', |
54 | 54 | 'appname' => 'files', |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | 'user_ldap', 'isDeleted', '1'); |
72 | 72 | |
73 | 73 | $userObjects = array(); |
74 | - foreach($deletedUsers as $user) { |
|
74 | + foreach ($deletedUsers as $user) { |
|
75 | 75 | $userObjects[] = new OfflineUser($user, $this->config, $this->db, $this->mapping); |
76 | 76 | } |
77 | 77 | $this->deletedUsers = $userObjects; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * @return \OCA\User_LDAP\User\OfflineUser[] |
85 | 85 | */ |
86 | 86 | public function getUsers() { |
87 | - if(is_array($this->deletedUsers)) { |
|
87 | + if (is_array($this->deletedUsers)) { |
|
88 | 88 | return $this->deletedUsers; |
89 | 89 | } |
90 | 90 | return $this->fetchDeletedUsers(); |
@@ -95,10 +95,10 @@ discard block |
||
95 | 95 | * @return bool |
96 | 96 | */ |
97 | 97 | public function hasUsers() { |
98 | - if($this->deletedUsers === false) { |
|
98 | + if ($this->deletedUsers === false) { |
|
99 | 99 | $this->fetchDeletedUsers(); |
100 | 100 | } |
101 | - if(is_array($this->deletedUsers) && count($this->deletedUsers) > 0) { |
|
101 | + if (is_array($this->deletedUsers) && count($this->deletedUsers) > 0) { |
|
102 | 102 | return true; |
103 | 103 | } |
104 | 104 | return false; |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | |
46 | 46 | static private $groupBE; |
47 | 47 | |
48 | - public function __construct(){ |
|
48 | + public function __construct() { |
|
49 | 49 | $this->interval = self::getRefreshInterval(); |
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
53 | 53 | * @param mixed $argument |
54 | 54 | */ |
55 | - public function run($argument){ |
|
55 | + public function run($argument) { |
|
56 | 56 | self::updateGroups(); |
57 | 57 | } |
58 | 58 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $knownGroups = array_keys(self::getKnownGroups()); |
63 | 63 | $actualGroups = self::getGroupBE()->getGroups(); |
64 | 64 | |
65 | - if(empty($actualGroups) && empty($knownGroups)) { |
|
65 | + if (empty($actualGroups) && empty($knownGroups)) { |
|
66 | 66 | \OCP\Util::writeLog('user_ldap', |
67 | 67 | 'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.', |
68 | 68 | \OCP\Util::INFO); |
@@ -94,26 +94,26 @@ discard block |
||
94 | 94 | SET `owncloudusers` = ? |
95 | 95 | WHERE `owncloudname` = ? |
96 | 96 | '); |
97 | - foreach($groups as $group) { |
|
97 | + foreach ($groups as $group) { |
|
98 | 98 | //we assume, that self::$groupsFromDB has been retrieved already |
99 | 99 | $knownUsers = unserialize(self::$groupsFromDB[$group]['owncloudusers']); |
100 | 100 | $actualUsers = self::getGroupBE()->usersInGroup($group); |
101 | 101 | $hasChanged = false; |
102 | - foreach(array_diff($knownUsers, $actualUsers) as $removedUser) { |
|
102 | + foreach (array_diff($knownUsers, $actualUsers) as $removedUser) { |
|
103 | 103 | \OCP\Util::emitHook('OC_User', 'post_removeFromGroup', array('uid' => $removedUser, 'gid' => $group)); |
104 | 104 | \OCP\Util::writeLog('user_ldap', |
105 | 105 | 'bgJ "updateGroups" – "'.$removedUser.'" removed from "'.$group.'".', |
106 | 106 | \OCP\Util::INFO); |
107 | 107 | $hasChanged = true; |
108 | 108 | } |
109 | - foreach(array_diff($actualUsers, $knownUsers) as $addedUser) { |
|
109 | + foreach (array_diff($actualUsers, $knownUsers) as $addedUser) { |
|
110 | 110 | \OCP\Util::emitHook('OC_User', 'post_addToGroup', array('uid' => $addedUser, 'gid' => $group)); |
111 | 111 | \OCP\Util::writeLog('user_ldap', |
112 | 112 | 'bgJ "updateGroups" – "'.$addedUser.'" added to "'.$group.'".', |
113 | 113 | \OCP\Util::INFO); |
114 | 114 | $hasChanged = true; |
115 | 115 | } |
116 | - if($hasChanged) { |
|
116 | + if ($hasChanged) { |
|
117 | 117 | $query->execute(array(serialize($actualUsers), $group)); |
118 | 118 | } |
119 | 119 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | INTO `*PREFIX*ldap_group_members` (`owncloudname`, `owncloudusers`) |
133 | 133 | VALUES (?, ?) |
134 | 134 | '); |
135 | - foreach($createdGroups as $createdGroup) { |
|
135 | + foreach ($createdGroups as $createdGroup) { |
|
136 | 136 | \OCP\Util::writeLog('user_ldap', |
137 | 137 | 'bgJ "updateGroups" – new group "'.$createdGroup.'" found.', |
138 | 138 | \OCP\Util::INFO); |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | FROM `*PREFIX*ldap_group_members` |
155 | 155 | WHERE `owncloudname` = ? |
156 | 156 | '); |
157 | - foreach($removedGroups as $removedGroup) { |
|
157 | + foreach ($removedGroups as $removedGroup) { |
|
158 | 158 | \OCP\Util::writeLog('user_ldap', |
159 | 159 | 'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.', |
160 | 160 | \OCP\Util::INFO); |
@@ -169,13 +169,13 @@ discard block |
||
169 | 169 | * @return \OCA\User_LDAP\Group_LDAP|\OCA\User_LDAP\Group_Proxy |
170 | 170 | */ |
171 | 171 | static private function getGroupBE() { |
172 | - if(!is_null(self::$groupBE)) { |
|
172 | + if (!is_null(self::$groupBE)) { |
|
173 | 173 | return self::$groupBE; |
174 | 174 | } |
175 | 175 | $helper = new Helper(\OC::$server->getConfig()); |
176 | 176 | $configPrefixes = $helper->getServerConfigurationPrefixes(true); |
177 | 177 | $ldapWrapper = new LDAP(); |
178 | - if(count($configPrefixes) === 1) { |
|
178 | + if (count($configPrefixes) === 1) { |
|
179 | 179 | //avoid the proxy when there is only one LDAP server configured |
180 | 180 | $dbc = \OC::$server->getDatabaseConnection(); |
181 | 181 | $userManager = new Manager( |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | * @return array |
205 | 205 | */ |
206 | 206 | static private function getKnownGroups() { |
207 | - if(is_array(self::$groupsFromDB)) { |
|
207 | + if (is_array(self::$groupsFromDB)) { |
|
208 | 208 | return self::$groupsFromDB; |
209 | 209 | } |
210 | 210 | $query = \OCP\DB::prepare(' |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | '); |
214 | 214 | $result = $query->execute()->fetchAll(); |
215 | 215 | self::$groupsFromDB = array(); |
216 | - foreach($result as $dataset) { |
|
216 | + foreach ($result as $dataset) { |
|
217 | 217 | self::$groupsFromDB[$dataset['owncloudname']] = $dataset; |
218 | 218 | } |
219 | 219 |