@@ -122,7 +122,7 @@ |
||
122 | 122 | protected function addROWrapper() { |
123 | 123 | // FIXME: should not add storage wrappers outside of preSetup, need to find a better way |
124 | 124 | $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false); |
125 | - \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) { |
|
125 | + \OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) { |
|
126 | 126 | return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE)); |
127 | 127 | }); |
128 | 128 | \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog); |
@@ -67,7 +67,7 @@ |
||
67 | 67 | ); |
68 | 68 | |
69 | 69 | $shares = $qb->execute(); |
70 | - while($share = $shares->fetch()) { |
|
70 | + while ($share = $shares->fetch()) { |
|
71 | 71 | \OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']); |
72 | 72 | } |
73 | 73 | $shares->closeCursor(); |
@@ -37,7 +37,7 @@ |
||
37 | 37 | $this |
38 | 38 | ->setIdentifier($invalidId) |
39 | 39 | ->setScheme(self::SCHEME_NULL) |
40 | - ->setText('Unknown auth mechanism backend ' . $invalidId) |
|
40 | + ->setText('Unknown auth mechanism backend '.$invalidId) |
|
41 | 41 | ; |
42 | 42 | } |
43 | 43 |
@@ -7,17 +7,17 @@ discard block |
||
7 | 7 | ?> |
8 | 8 | <form id="ocDefaultEncryptionModule" class="sub-section"> |
9 | 9 | <h3><?php p($l->t("Default encryption module")); ?></h3> |
10 | - <?php if(!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?> |
|
10 | + <?php if (!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?> |
|
11 | 11 | <?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?> |
12 | 12 | <?php else: ?> |
13 | 13 | <p id="encryptHomeStorageSetting"> |
14 | 14 | <input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage" |
15 | 15 | value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> /> |
16 | - <label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br> |
|
17 | - <em><?php p( $l->t( "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" ) ); ?></em> |
|
16 | + <label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage')); ?></label></br> |
|
17 | + <em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em> |
|
18 | 18 | </p> |
19 | 19 | <br /> |
20 | - <?php if($_['masterKeyEnabled'] === false): ?> |
|
20 | + <?php if ($_['masterKeyEnabled'] === false): ?> |
|
21 | 21 | <p id="encryptionSetRecoveryKey"> |
22 | 22 | <?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?> |
23 | 23 | <span class="msg"></span> |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | </p> |
43 | 43 | <br/><br/> |
44 | 44 | |
45 | - <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>> |
|
45 | + <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"'); ?>> |
|
46 | 46 | <?php p($l->t("Change recovery key password:")); ?> |
47 | 47 | <span class="msg"></span> |
48 | 48 | <br/> |
@@ -43,6 +43,6 @@ |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public function getPath() { |
46 | - return $this->getMountPoint() . $this->getInternalPath(); |
|
46 | + return $this->getMountPoint().$this->getInternalPath(); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | \ No newline at end of file |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $this->doFind($resource); |
76 | 76 | } catch (ResourceNotFoundException $e) { |
77 | 77 | $resourceApp = substr($resource, 0, strpos($resource, '/')); |
78 | - $this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]); |
|
78 | + $this->logger->debug('Could not find resource file "'.$e->getResourcePath().'"', ['app' => $resourceApp]); |
|
79 | 79 | } |
80 | 80 | } |
81 | 81 | if (!empty($this->theme)) { |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $this->doFindTheme($resource); |
85 | 85 | } catch (ResourceNotFoundException $e) { |
86 | 86 | $resourceApp = substr($resource, 0, strpos($resource, '/')); |
87 | - $this->logger->debug('Could not find resource file in theme "' . $e->getResourcePath() . '"', ['app' => $resourceApp]); |
|
87 | + $this->logger->debug('Could not find resource file in theme "'.$e->getResourcePath().'"', ['app' => $resourceApp]); |
|
88 | 88 | } |
89 | 89 | } |
90 | 90 | } |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | } |
186 | 186 | $this->resources[] = array($root, $webRoot, $file); |
187 | 187 | |
188 | - if ($throw && !is_file($root . '/' . $file)) { |
|
188 | + if ($throw && !is_file($root.'/'.$file)) { |
|
189 | 189 | throw new ResourceNotFoundException($file, $webRoot); |
190 | 190 | } |
191 | 191 | } |
@@ -46,15 +46,15 @@ |
||
46 | 46 | const CREATE_GROUP = 0x00000001; |
47 | 47 | const DELETE_GROUP = 0x00000010; |
48 | 48 | const ADD_TO_GROUP = 0x00000100; |
49 | - const REMOVE_FROM_GOUP = 0x00001000; // oops |
|
50 | - const REMOVE_FROM_GROUP = 0x00001000; |
|
49 | + const REMOVE_FROM_GOUP = 0x00001000; // oops |
|
50 | + const REMOVE_FROM_GROUP = 0x00001000; |
|
51 | 51 | //OBSOLETE const GET_DISPLAYNAME = 0x00010000; |
52 | - const COUNT_USERS = 0x00100000; |
|
53 | - const GROUP_DETAILS = 0x01000000; |
|
52 | + const COUNT_USERS = 0x00100000; |
|
53 | + const GROUP_DETAILS = 0x01000000; |
|
54 | 54 | /** |
55 | 55 | * @since 13.0.0 |
56 | 56 | */ |
57 | - const IS_ADMIN = 0x10000000; |
|
57 | + const IS_ADMIN = 0x10000000; |
|
58 | 58 | |
59 | 59 | /** |
60 | 60 | * Check if backend implements actions |
@@ -71,18 +71,18 @@ |
||
71 | 71 | $errorMessage = $this->getLastError(); |
72 | 72 | if ($errorMessage) { |
73 | 73 | throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'), |
74 | - $errorMessage . ' Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME') |
|
75 | - . ' ORACLE_SID=' . getenv('ORACLE_SID') |
|
76 | - . ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH') |
|
77 | - . ' NLS_LANG=' . getenv('NLS_LANG') |
|
78 | - . ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable'); |
|
74 | + $errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME') |
|
75 | + . ' ORACLE_SID='.getenv('ORACLE_SID') |
|
76 | + . ' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH') |
|
77 | + . ' NLS_LANG='.getenv('NLS_LANG') |
|
78 | + . ' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable'); |
|
79 | 79 | } |
80 | 80 | throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'), |
81 | - 'Check environment: ORACLE_HOME=' . getenv('ORACLE_HOME') |
|
82 | - . ' ORACLE_SID=' . getenv('ORACLE_SID') |
|
83 | - . ' LD_LIBRARY_PATH=' . getenv('LD_LIBRARY_PATH') |
|
84 | - . ' NLS_LANG=' . getenv('NLS_LANG') |
|
85 | - . ' tnsnames.ora is ' . (is_readable(getenv('ORACLE_HOME') . '/network/admin/tnsnames.ora') ? '' : 'not ') . 'readable'); |
|
81 | + 'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME') |
|
82 | + . ' ORACLE_SID='.getenv('ORACLE_SID') |
|
83 | + . ' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH') |
|
84 | + . ' NLS_LANG='.getenv('NLS_LANG') |
|
85 | + . ' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora') ? '' : 'not ').'readable'); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | $this->config->setValues([ |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $searchResult = $this->c->resolve(SearchResult::class); |
48 | 48 | |
49 | 49 | foreach ($shareTypes as $type) { |
50 | - if(!isset($this->pluginList[$type])) { |
|
50 | + if (!isset($this->pluginList[$type])) { |
|
51 | 51 | continue; |
52 | 52 | } |
53 | 53 | foreach ($this->pluginList[$type] as $plugin) { |
@@ -70,18 +70,18 @@ discard block |
||
70 | 70 | // that the exact same email address and federated cloud id exists |
71 | 71 | $emailType = new SearchResultType('emails'); |
72 | 72 | $remoteType = new SearchResultType('remotes'); |
73 | - if($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) { |
|
73 | + if ($searchResult->hasExactIdMatch($emailType) && !$searchResult->hasExactIdMatch($remoteType)) { |
|
74 | 74 | $searchResult->unsetResult($remoteType); |
75 | 75 | } elseif (!$searchResult->hasExactIdMatch($emailType) && $searchResult->hasExactIdMatch($remoteType)) { |
76 | 76 | $searchResult->unsetResult($emailType); |
77 | 77 | } |
78 | 78 | |
79 | - return [$searchResult->asArray(), (bool)$hasMoreResults]; |
|
79 | + return [$searchResult->asArray(), (bool) $hasMoreResults]; |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | public function registerPlugin(array $pluginInfo) { |
83 | - $shareType = constant(Share::class . '::' . $pluginInfo['shareType']); |
|
84 | - if($shareType === null) { |
|
83 | + $shareType = constant(Share::class.'::'.$pluginInfo['shareType']); |
|
84 | + if ($shareType === null) { |
|
85 | 85 | throw new \InvalidArgumentException('Provided ShareType is invalid'); |
86 | 86 | } |
87 | 87 | $this->pluginList[$shareType][] = $pluginInfo['class']; |