@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | // if an error occurs before a locale is established, |
102 | 102 | // we still need messages, so check and deal with it |
103 | 103 | |
104 | - $msg = ': ' . sprintf( |
|
104 | + $msg = ': '.sprintf( |
|
105 | 105 | (class_exists('\XoopsLocale', false) ? \XoopsLocale::EF_LOGGER_FILELINE : "%s in file %s line %s"), |
106 | 106 | $this->sanitizePath($errorString), |
107 | 107 | $this->sanitizePath($errorFile), |
@@ -110,23 +110,23 @@ discard block |
||
110 | 110 | |
111 | 111 | switch ($errorNumber) { |
112 | 112 | case E_USER_NOTICE: |
113 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:') . $msg; |
|
113 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:').$msg; |
|
114 | 114 | $this->log(LogLevel::NOTICE, $msg); |
115 | 115 | break; |
116 | 116 | case E_NOTICE: |
117 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_NOTICE : '*Notice:') . $msg; |
|
117 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_NOTICE : '*Notice:').$msg; |
|
118 | 118 | $this->log(LogLevel::NOTICE, $msg); |
119 | 119 | break; |
120 | 120 | case E_WARNING: |
121 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_WARNING : '*Warning:') . $msg; |
|
121 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_WARNING : '*Warning:').$msg; |
|
122 | 122 | $this->log(LogLevel::WARNING, $msg); |
123 | 123 | break; |
124 | 124 | case E_STRICT: |
125 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_STRICT : '*Strict:') . $msg; |
|
125 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_STRICT : '*Strict:').$msg; |
|
126 | 126 | $this->log(LogLevel::WARNING, $msg); |
127 | 127 | break; |
128 | 128 | case E_USER_ERROR: |
129 | - $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:') . $msg; |
|
129 | + $msg = (class_exists('\XoopsLocale', false) ? \XoopsLocale::E_LOGGER_ERROR : '*Error:').$msg; |
|
130 | 130 | @$this->log(LogLevel::CRITICAL, $msg); |
131 | 131 | break; |
132 | 132 | case E_USER_DEPRECATED: |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | \Xoops::getInstance()->events()->triggerEvent('core.deprecated', array($msg)); |
135 | 135 | break; |
136 | 136 | default: |
137 | - $msg = $this->getReadableErrorType($errorNumber) . $msg; |
|
137 | + $msg = $this->getReadableErrorType($errorNumber).$msg; |
|
138 | 138 | $this->log(LogLevel::ERROR, $msg); |
139 | 139 | break; |
140 | 140 | } |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | } |
158 | 158 | } |
159 | 159 | } else { |
160 | - echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>" . _XOOPS_FATAL_BACKTRACE . ":<br />"; |
|
160 | + echo "<div style='color:#f0f0f0;background-color:#f0f0f0'>"._XOOPS_FATAL_BACKTRACE.":<br />"; |
|
161 | 161 | foreach ($trace as $step) { |
162 | 162 | if (isset($step['file'])) { |
163 | 163 | printf("%s (%d)\n<br />", $this->sanitizePath($step['file']), $step['line']); |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | */ |
180 | 180 | protected function getReadableErrorType(int $errorNumber) |
181 | 181 | { |
182 | - switch($errorNumber) |
|
182 | + switch ($errorNumber) |
|
183 | 183 | { |
184 | 184 | case E_ERROR: |
185 | 185 | return 'E_ERROR'; |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | */ |
252 | 252 | private function reportFatalError($msg) |
253 | 253 | { |
254 | - $msg=$this->sanitizePath($msg); |
|
254 | + $msg = $this->sanitizePath($msg); |
|
255 | 255 | if ('cli' === php_sapi_name()) { |
256 | 256 | fprintf(STDERR, "\nError : %s\n", $msg); |
257 | 257 | } else { |
@@ -274,18 +274,18 @@ discard block |
||
274 | 274 | public function sanitizePath($message) |
275 | 275 | { |
276 | 276 | $cleaners = [ |
277 | - ['\\', '/',], |
|
278 | - [\XoopsBaseConfig::get('var-path'), 'VAR',], |
|
279 | - [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('var-path'))), 'VAR',], |
|
280 | - [\XoopsBaseConfig::get('lib-path'), 'LIB',], |
|
281 | - [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('lib-path'))), 'LIB',], |
|
282 | - [\XoopsBaseConfig::get('root-path'), 'ROOT',], |
|
283 | - [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('root-path'))), 'ROOT',], |
|
284 | - [\XoopsBaseConfig::get('db-name') . '.', '',], |
|
285 | - [\XoopsBaseConfig::get('db-name'), '',], |
|
286 | - [\XoopsBaseConfig::get('db-prefix') . '_', '',], |
|
287 | - [\XoopsBaseConfig::get('db-user'), '***',], |
|
288 | - [\XoopsBaseConfig::get('db-pass'), '***',], |
|
277 | + ['\\', '/', ], |
|
278 | + [\XoopsBaseConfig::get('var-path'), 'VAR', ], |
|
279 | + [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('var-path'))), 'VAR', ], |
|
280 | + [\XoopsBaseConfig::get('lib-path'), 'LIB', ], |
|
281 | + [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('lib-path'))), 'LIB', ], |
|
282 | + [\XoopsBaseConfig::get('root-path'), 'ROOT', ], |
|
283 | + [str_replace('\\', '/', realpath(\XoopsBaseConfig::get('root-path'))), 'ROOT', ], |
|
284 | + [\XoopsBaseConfig::get('db-name').'.', '', ], |
|
285 | + [\XoopsBaseConfig::get('db-name'), '', ], |
|
286 | + [\XoopsBaseConfig::get('db-prefix').'_', '', ], |
|
287 | + [\XoopsBaseConfig::get('db-user'), '***', ], |
|
288 | + [\XoopsBaseConfig::get('db-pass'), '***', ], |
|
289 | 289 | ]; |
290 | 290 | $stringsToClean = array_column($cleaners, 0); |
291 | 291 | $replacementStings = array_column($cleaners, 1); |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | { |
491 | 491 | $this->deprecatedMessage(); |
492 | 492 | // legacy compatibility: turn off logger display for $xoopsLogger->activated = false; usage |
493 | - if ($var==='activated' && !$val) { |
|
493 | + if ($var === 'activated' && !$val) { |
|
494 | 494 | $this->quiet(); |
495 | 495 | } |
496 | 496 |