|
@@ -71,18 +71,18 @@ |
|
|
block discarded – undo |
|
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([ |