@@ -27,7 +27,7 @@ |
||
| 27 | 27 | * {@inheritDoc} |
| 28 | 28 | */ |
| 29 | 29 | public function getName() { |
| 30 | - return (string)$this->l10n->t('Education Edition'); |
|
| 30 | + return (string) $this->l10n->t('Education Edition'); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -25,6 +25,6 @@ |
||
| 25 | 25 | |
| 26 | 26 | class PgSqlFunctionBuilder extends FunctionBuilder { |
| 27 | 27 | public function concat($x, $y) { |
| 28 | - return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); |
|
| 28 | + return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')'); |
|
| 29 | 29 | } |
| 30 | 30 | } |
@@ -87,10 +87,10 @@ discard block |
||
| 87 | 87 | $result = $query->execute(); |
| 88 | 88 | |
| 89 | 89 | if ($result) { |
| 90 | - return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable); |
|
| 90 | + return (int) $this->connection->lastInsertId('*PREFIX*'.$this->dbTable); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - $message = 'Internal failure, Could not add trusted server: ' . $url; |
|
| 93 | + $message = 'Internal failure, Could not add trusted server: '.$url; |
|
| 94 | 94 | $message_t = $this->IL10N->t('Could not add server'); |
| 95 | 95 | throw new HintException($message, $message_t); |
| 96 | 96 | } |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | $result = $query->execute()->fetchAll(); |
| 125 | 125 | |
| 126 | 126 | if (empty($result)) { |
| 127 | - throw new \Exception('No Server found with ID: ' . $id); |
|
| 127 | + throw new \Exception('No Server found with ID: '.$id); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | return $result[0]; |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | $statement->closeCursor(); |
| 202 | 202 | |
| 203 | 203 | if (!isset($result['token'])) { |
| 204 | - throw new \Exception('No token found for: ' . $url); |
|
| 204 | + throw new \Exception('No token found for: '.$url); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | return $result['token']; |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | $statement = $query->execute(); |
| 279 | 279 | $result = $statement->fetch(); |
| 280 | 280 | $statement->closeCursor(); |
| 281 | - return (int)$result['status']; |
|
| 281 | + return (int) $result['status']; |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | /** |
@@ -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([ |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <div class="ldapSettingControls"> |
| 2 | 2 | <button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection"> |
| 3 | - <?php p($l->t('Test Configuration'));?> |
|
| 3 | + <?php p($l->t('Test Configuration')); ?> |
|
| 4 | 4 | </button> |
| 5 | 5 | <a href="<?php p(link_to_docs('admin-ldap')); ?>" |
| 6 | 6 | target="_blank" rel="noreferrer noopener"> |
| 7 | 7 | <img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>" |
| 8 | 8 | style="height:1.75ex" /> |
| 9 | - <?php p($l->t('Help'));?> |
|
| 9 | + <?php p($l->t('Help')); ?> |
|
| 10 | 10 | </a> |
| 11 | 11 | </div> |
@@ -55,15 +55,15 @@ |
||
| 55 | 55 | public function getMountsForUser(IUser $user, IStorageFactory $loader) { |
| 56 | 56 | $cacheBaseDir = $this->config->getSystemValue('cache_path', ''); |
| 57 | 57 | if ($cacheBaseDir !== '') { |
| 58 | - $cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID(); |
|
| 58 | + $cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID(); |
|
| 59 | 59 | if (!file_exists($cacheDir)) { |
| 60 | 60 | mkdir($cacheDir, 0770, true); |
| 61 | - mkdir($cacheDir . '/uploads', 0770, true); |
|
| 61 | + mkdir($cacheDir.'/uploads', 0770, true); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | return [ |
| 65 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]), |
|
| 66 | - new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader]) |
|
| 65 | + new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir, $loader]), |
|
| 66 | + new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/uploads', ['datadir' => $cacheDir.'/uploads', $loader]) |
|
| 67 | 67 | ]; |
| 68 | 68 | } else { |
| 69 | 69 | return []; |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | $baseDir = $vendorDir; |
| 7 | 7 | |
| 8 | 8 | return array( |
| 9 | - 'OCA\\Files_Sharing\\' => array($baseDir . '/../lib'), |
|
| 9 | + 'OCA\\Files_Sharing\\' => array($baseDir.'/../lib'), |
|
| 10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | $baseDir = $vendorDir; |
| 7 | 7 | |
| 8 | 8 | return array( |
| 9 | - 'OCA\\AdminAudit\\' => array($baseDir . '/../lib'), |
|
| 9 | + 'OCA\\AdminAudit\\' => array($baseDir.'/../lib'), |
|
| 10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
| 6 | 6 | $baseDir = $vendorDir; |
| 7 | 7 | |
| 8 | 8 | return array( |
| 9 | - 'OCA\\DAV\\' => array($baseDir . '/../lib'), |
|
| 9 | + 'OCA\\DAV\\' => array($baseDir.'/../lib'), |
|
| 10 | 10 | ); |