@@ -56,8 +56,8 @@ |
||
| 56 | 56 | */ |
| 57 | 57 | public function postConnect(ConnectionEventArgs $args) { |
| 58 | 58 | $sensitive = ($this->caseSensitiveLike) ? 'true' : 'false'; |
| 59 | - $args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive); |
|
| 60 | - $args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode); |
|
| 59 | + $args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = '.$sensitive); |
|
| 60 | + $args->getConnection()->executeUpdate('PRAGMA journal_mode = '.$this->journalMode); |
|
| 61 | 61 | /** @var \PDO $pdo */ |
| 62 | 62 | $pdo = $args->getConnection()->getWrappedConnection(); |
| 63 | 63 | $pdo->sqliteCreateFunction('md5', 'md5', 1); |
@@ -42,10 +42,10 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | public function fixupStatement($statement) { |
| 44 | 44 | $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement); |
| 45 | - $statement = str_replace( '`', '"', $statement ); |
|
| 46 | - $statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement ); |
|
| 45 | + $statement = str_replace('`', '"', $statement); |
|
| 46 | + $statement = str_ireplace('NOW()', 'datetime(\'now\')', $statement); |
|
| 47 | 47 | $statement = str_ireplace('GREATEST(', 'MAX(', $statement); |
| 48 | - $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement ); |
|
| 48 | + $statement = str_ireplace('UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement); |
|
| 49 | 49 | return $statement; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -64,14 +64,14 @@ discard block |
||
| 64 | 64 | if (empty($compare)) { |
| 65 | 65 | $compare = array_keys($input); |
| 66 | 66 | } |
| 67 | - $fieldList = '`' . implode('`,`', array_keys($input)) . '`'; |
|
| 67 | + $fieldList = '`'.implode('`,`', array_keys($input)).'`'; |
|
| 68 | 68 | $query = "INSERT INTO `$table` ($fieldList) SELECT " |
| 69 | - . str_repeat('?,', count($input)-1).'? ' |
|
| 69 | + . str_repeat('?,', count($input) - 1).'? ' |
|
| 70 | 70 | . " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE "; |
| 71 | 71 | |
| 72 | 72 | $inserts = array_values($input); |
| 73 | - foreach($compare as $key) { |
|
| 74 | - $query .= '`' . $key . '`'; |
|
| 73 | + foreach ($compare as $key) { |
|
| 74 | + $query .= '`'.$key.'`'; |
|
| 75 | 75 | if (is_null($input[$key])) { |
| 76 | 76 | $query .= ' IS NULL AND '; |
| 77 | 77 | } else { |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | <div class="warning title"> |
| 19 | 19 | <?php p($l->t('Please renew your password.')); ?><br> |
| 20 | 20 | </div> |
| 21 | - <?php foreach($_['messages'] as $message): ?> |
|
| 21 | + <?php foreach ($_['messages'] as $message): ?> |
|
| 22 | 22 | <div class="warning"> |
| 23 | 23 | <?php p($message); ?><br> |
| 24 | 24 | </div> |
@@ -31,14 +31,14 @@ discard block |
||
| 31 | 31 | <?php endif; ?> |
| 32 | 32 | <div id="message" class="hidden"> |
| 33 | 33 | <img class="float-spinner" alt="" |
| 34 | - src="<?php p(image_path('core', 'loading-dark.gif'));?>"> |
|
| 34 | + src="<?php p(image_path('core', 'loading-dark.gif')); ?>"> |
|
| 35 | 35 | <span id="messageText"></span> |
| 36 | 36 | <!-- the following div ensures that the spinner is always inside the #message div --> |
| 37 | 37 | <div style="clear: both;"></div> |
| 38 | 38 | </div> |
| 39 | 39 | <p class="grouptop"> |
| 40 | 40 | <input type="password" id="oldPassword" name="oldPassword" |
| 41 | - placeholder="<?php echo $l->t('Current password');?>" |
|
| 41 | + placeholder="<?php echo $l->t('Current password'); ?>" |
|
| 42 | 42 | autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/> |
| 43 | 43 | <label for="oldPassword" class="infield"><?php p($l->t('Current password')); ?></label> |
| 44 | 44 | </p> |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | <input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label> |
| 48 | 48 | <label id="newPassword-label" for="newPassword" class="infield"><?php p($l->t('New password')); ?></label> |
| 49 | 49 | <input type="password" id="newPassword" name="newPassword" |
| 50 | - placeholder="<?php echo $l->t('New password');?>" |
|
| 50 | + placeholder="<?php echo $l->t('New password'); ?>" |
|
| 51 | 51 | data-typetoggle="#personal-show" autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/> |
| 52 | 52 | </p> |
| 53 | 53 | |
@@ -80,22 +80,22 @@ discard block |
||
| 80 | 80 | //pass in app.php we do add here, except something else is passed e.g. |
| 81 | 81 | //in tests. |
| 82 | 82 | |
| 83 | - if(isset($arguments['helper'])) { |
|
| 83 | + if (isset($arguments['helper'])) { |
|
| 84 | 84 | $this->ldapHelper = $arguments['helper']; |
| 85 | 85 | } else { |
| 86 | 86 | $this->ldapHelper = new Helper(\OC::$server->getConfig()); |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - if(isset($arguments['ocConfig'])) { |
|
| 89 | + if (isset($arguments['ocConfig'])) { |
|
| 90 | 90 | $this->ocConfig = $arguments['ocConfig']; |
| 91 | 91 | } else { |
| 92 | 92 | $this->ocConfig = \OC::$server->getConfig(); |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - if(isset($arguments['userBackend'])) { |
|
| 95 | + if (isset($arguments['userBackend'])) { |
|
| 96 | 96 | $this->userBackend = $arguments['userBackend']; |
| 97 | 97 | } else { |
| 98 | - $this->userBackend = new User_Proxy( |
|
| 98 | + $this->userBackend = new User_Proxy( |
|
| 99 | 99 | $this->ldapHelper->getServerConfigurationPrefixes(true), |
| 100 | 100 | new LDAP(), |
| 101 | 101 | $this->ocConfig, |
@@ -103,19 +103,19 @@ discard block |
||
| 103 | 103 | ); |
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - if(isset($arguments['db'])) { |
|
| 106 | + if (isset($arguments['db'])) { |
|
| 107 | 107 | $this->db = $arguments['db']; |
| 108 | 108 | } else { |
| 109 | 109 | $this->db = \OC::$server->getDatabaseConnection(); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - if(isset($arguments['mapping'])) { |
|
| 112 | + if (isset($arguments['mapping'])) { |
|
| 113 | 113 | $this->mapping = $arguments['mapping']; |
| 114 | 114 | } else { |
| 115 | 115 | $this->mapping = new UserMapping($this->db); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - if(isset($arguments['deletedUsersIndex'])) { |
|
| 118 | + if (isset($arguments['deletedUsersIndex'])) { |
|
| 119 | 119 | $this->dui = $arguments['deletedUsersIndex']; |
| 120 | 120 | } else { |
| 121 | 121 | $this->dui = new DeletedUsersIndex( |
@@ -130,11 +130,11 @@ discard block |
||
| 130 | 130 | public function run($argument) { |
| 131 | 131 | $this->setArguments($argument); |
| 132 | 132 | |
| 133 | - if(!$this->isCleanUpAllowed()) { |
|
| 133 | + if (!$this->isCleanUpAllowed()) { |
|
| 134 | 134 | return; |
| 135 | 135 | } |
| 136 | 136 | $users = $this->mapping->getList($this->getOffset(), $this->limit); |
| 137 | - if(!is_array($users)) { |
|
| 137 | + if (!is_array($users)) { |
|
| 138 | 138 | //something wrong? Let's start from the beginning next time and |
| 139 | 139 | //abort |
| 140 | 140 | $this->setOffset(true); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | public function isCleanUpAllowed() { |
| 162 | 162 | try { |
| 163 | - if($this->ldapHelper->haveDisabledConfigurations()) { |
|
| 163 | + if ($this->ldapHelper->haveDisabledConfigurations()) { |
|
| 164 | 164 | return false; |
| 165 | 165 | } |
| 166 | 166 | } catch (\Exception $e) { |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | * @return bool |
| 178 | 178 | */ |
| 179 | 179 | private function isCleanUpEnabled() { |
| 180 | - return (bool)$this->ocConfig->getSystemValue( |
|
| 180 | + return (bool) $this->ocConfig->getSystemValue( |
|
| 181 | 181 | 'ldapUserCleanupInterval', strval($this->defaultIntervalMin)); |
| 182 | 182 | } |
| 183 | 183 | |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | * @param array $users result from getMappedUsers() |
| 187 | 187 | */ |
| 188 | 188 | private function checkUsers(array $users) { |
| 189 | - foreach($users as $user) { |
|
| 189 | + foreach ($users as $user) { |
|
| 190 | 190 | $this->checkUser($user); |
| 191 | 191 | } |
| 192 | 192 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | * @param string[] $user |
| 197 | 197 | */ |
| 198 | 198 | private function checkUser(array $user) { |
| 199 | - if($this->userBackend->userExistsOnLDAP($user['name'])) { |
|
| 199 | + if ($this->userBackend->userExistsOnLDAP($user['name'])) { |
|
| 200 | 200 | //still available, all good |
| 201 | 201 | |
| 202 | 202 | return; |
@@ -218,8 +218,7 @@ discard block |
||
| 218 | 218 | * @param bool $reset whether the offset should be set to 0 |
| 219 | 219 | */ |
| 220 | 220 | public function setOffset($reset = false) { |
| 221 | - $newOffset = $reset ? 0 : |
|
| 222 | - $this->getOffset() + $this->limit; |
|
| 221 | + $newOffset = $reset ? 0 : $this->getOffset() + $this->limit; |
|
| 223 | 222 | $this->ocConfig->setAppValue('user_ldap', 'cleanUpJobOffset', $newOffset); |
| 224 | 223 | } |
| 225 | 224 | |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | use OCP\AppFramework\IAppContainer; |
| 28 | 28 | |
| 29 | 29 | class Application extends App { |
| 30 | - public function __construct () { |
|
| 30 | + public function __construct() { |
|
| 31 | 31 | parent::__construct('user_ldap'); |
| 32 | 32 | $container = $this->getContainer(); |
| 33 | 33 | |
@@ -65,14 +65,14 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | public function __construct($storage, array $mountpoints, $arguments = null, $loader = null) { |
| 67 | 67 | $this->user = $arguments['user']; |
| 68 | - $this->recipientView = new View('/' . $this->user . '/files'); |
|
| 68 | + $this->recipientView = new View('/'.$this->user.'/files'); |
|
| 69 | 69 | |
| 70 | 70 | $this->superShare = $arguments['superShare']; |
| 71 | 71 | $this->groupedShares = $arguments['groupedShares']; |
| 72 | 72 | |
| 73 | 73 | $newMountPoint = $this->verifyMountPoint($this->superShare, $mountpoints); |
| 74 | - $absMountPoint = '/' . $this->user . '/files' . $newMountPoint; |
|
| 75 | - $arguments['ownerView'] = new View('/' . $this->superShare->getShareOwner() . '/files'); |
|
| 74 | + $absMountPoint = '/'.$this->user.'/files'.$newMountPoint; |
|
| 75 | + $arguments['ownerView'] = new View('/'.$this->superShare->getShareOwner().'/files'); |
|
| 76 | 76 | parent::__construct($storage, $absMountPoint, $arguments, $loader); |
| 77 | 77 | } |
| 78 | 78 | |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | $newMountPoint = $this->generateUniqueTarget( |
| 96 | - \OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint), |
|
| 96 | + \OC\Files\Filesystem::normalizePath($parent.'/'.$mountPoint), |
|
| 97 | 97 | $this->recipientView, |
| 98 | 98 | $mountpoints |
| 99 | 99 | ); |
@@ -130,12 +130,12 @@ discard block |
||
| 130 | 130 | */ |
| 131 | 131 | private function generateUniqueTarget($path, $view, array $mountpoints) { |
| 132 | 132 | $pathinfo = pathinfo($path); |
| 133 | - $ext = (isset($pathinfo['extension'])) ? '.' . $pathinfo['extension'] : ''; |
|
| 133 | + $ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : ''; |
|
| 134 | 134 | $name = $pathinfo['filename']; |
| 135 | 135 | $dir = $pathinfo['dirname']; |
| 136 | 136 | |
| 137 | 137 | // Helper function to find existing mount points |
| 138 | - $mountpointExists = function ($path) use ($mountpoints) { |
|
| 138 | + $mountpointExists = function($path) use ($mountpoints) { |
|
| 139 | 139 | foreach ($mountpoints as $mountpoint) { |
| 140 | 140 | if ($mountpoint->getShare()->getTarget() === $path) { |
| 141 | 141 | return true; |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $i = 2; |
| 148 | 148 | while ($view->file_exists($path) || $mountpointExists($path)) { |
| 149 | - $path = Filesystem::normalizePath($dir . '/' . $name . ' (' . $i . ')' . $ext); |
|
| 149 | + $path = Filesystem::normalizePath($dir.'/'.$name.' ('.$i.')'.$ext); |
|
| 150 | 150 | $i++; |
| 151 | 151 | } |
| 152 | 152 | |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | // it is not a file relative to data/user/files |
| 168 | 168 | if (count($split) < 3 || $split[1] !== 'files') { |
| 169 | 169 | \OCP\Util::writeLog('file sharing', |
| 170 | - 'Can not strip userid and "files/" from path: ' . $path, |
|
| 170 | + 'Can not strip userid and "files/" from path: '.$path, |
|
| 171 | 171 | \OCP\Util::ERROR); |
| 172 | 172 | throw new \OCA\Files_Sharing\Exceptions\BrokenPath('Path does not start with /user/files', 10); |
| 173 | 173 | } |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | $sliced = array_slice($split, 2); |
| 177 | 177 | $relPath = implode('/', $sliced); |
| 178 | 178 | |
| 179 | - return '/' . $relPath; |
|
| 179 | + return '/'.$relPath; |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | /** |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | $this->storage->setMountPoint($relTargetPath); |
| 199 | 199 | } catch (\Exception $e) { |
| 200 | 200 | \OCP\Util::writeLog('file sharing', |
| 201 | - 'Could not rename mount point for shared folder "' . $this->getMountPoint() . '" to "' . $target . '"', |
|
| 201 | + 'Could not rename mount point for shared folder "'.$this->getMountPoint().'" to "'.$target.'"', |
|
| 202 | 202 | \OCP\Util::ERROR); |
| 203 | 203 | } |
| 204 | 204 | |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $row = $result->fetch(); |
| 254 | 254 | $result->closeCursor(); |
| 255 | 255 | if ($row) { |
| 256 | - return (int)$row['storage']; |
|
| 256 | + return (int) $row['storage']; |
|
| 257 | 257 | } |
| 258 | 258 | return -1; |
| 259 | 259 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | $updatedEntries = $builder->execute(); |
| 73 | 73 | if ($updatedEntries > 0) { |
| 74 | - $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares'); |
|
| 74 | + $out->info('Fixed file share permissions for '.$updatedEntries.' shares'); |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | if ($deletedEntries) { |
| 110 | - $out->info('Removed ' . $deletedEntries . ' shares where the parent did not exist'); |
|
| 110 | + $out->info('Removed '.$deletedEntries.' shares where the parent did not exist'); |
|
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | public function getACL() { |
| 102 | - $acl = [ |
|
| 102 | + $acl = [ |
|
| 103 | 103 | [ |
| 104 | 104 | 'privilege' => '{DAV:}read', |
| 105 | 105 | 'principal' => $this->getOwner(), |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | 'protected' => true, |
| 112 | 112 | ]; |
| 113 | 113 | if ($this->getOwner() !== parent::getOwner()) { |
| 114 | - $acl[] = [ |
|
| 114 | + $acl[] = [ |
|
| 115 | 115 | 'privilege' => '{DAV:}read', |
| 116 | 116 | 'principal' => parent::getOwner(), |
| 117 | 117 | 'protected' => true, |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | public function delete() { |
| 172 | 172 | if (isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) { |
| 173 | - $principal = 'principal:' . parent::getOwner(); |
|
| 173 | + $principal = 'principal:'.parent::getOwner(); |
|
| 174 | 174 | $shares = $this->carddavBackend->getShares($this->getResourceId()); |
| 175 | 175 | $shares = array_filter($shares, function($share) use ($principal){ |
| 176 | 176 | return $share['href'] === $principal; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | ], |
| 55 | 55 | ]; |
| 56 | 56 | |
| 57 | - if($this->appManager->isEnabledForUser('files_sharing')) { |
|
| 57 | + if ($this->appManager->isEnabledForUser('files_sharing')) { |
|
| 58 | 58 | $services['SHARING'] = [ |
| 59 | 59 | 'version' => 1, |
| 60 | 60 | 'endpoints' => [ |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - if($this->appManager->isEnabledForUser('activity')) { |
|
| 88 | + if ($this->appManager->isEnabledForUser('activity')) { |
|
| 89 | 89 | $services['ACTIVITY'] = [ |
| 90 | 90 | 'version' => 1, |
| 91 | 91 | 'endpoints' => [ |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | ]; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - if($this->appManager->isEnabledForUser('provisioning_api')) { |
|
| 97 | + if ($this->appManager->isEnabledForUser('provisioning_api')) { |
|
| 98 | 98 | $services['PROVISIONING'] = [ |
| 99 | 99 | 'version' => 1, |
| 100 | 100 | 'endpoints' => [ |