@@ -78,10 +78,10 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | // exit if we have more then 3 "DB server has gone away"-errors |
| 80 | 80 | if ($reconnectCounter > 3) { |
| 81 | - $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5); |
|
| 81 | + $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg.":\n<br />".$sql, 5); |
|
| 82 | 82 | throw new \Exception($errorMsg); |
| 83 | 83 | } else { |
| 84 | - $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql); |
|
| 84 | + $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql); |
|
| 85 | 85 | |
| 86 | 86 | // reconnect |
| 87 | 87 | $reconnectCounter++; |
@@ -91,10 +91,10 @@ discard block |
||
| 91 | 91 | $this->execute(); |
| 92 | 92 | } |
| 93 | 93 | } else { |
| 94 | - $this->_debug->mailToAdmin('SQL-Warning', $errorMsg . ":\n<br />" . $sql); |
|
| 94 | + $this->_debug->mailToAdmin('SQL-Warning', $errorMsg.":\n<br />".$sql); |
|
| 95 | 95 | |
| 96 | 96 | // this query returned an error, we must display it (only for dev) !!! |
| 97 | - $this->_debug->displayError($errorMsg . ' | ' . $sql); |
|
| 97 | + $this->_debug->displayError($errorMsg.' | '.$sql); |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | $bool = parent::prepare($query); |
| 152 | 152 | |
| 153 | 153 | if ($bool === false) { |
| 154 | - $this->_debug->displayError('Can\'t prepare Query: ' . $query . ' | ' . $this->error, false); |
|
| 154 | + $this->_debug->displayError('Can\'t prepare Query: '.$query.' | '.$this->error, false); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | return true; |
@@ -267,12 +267,12 @@ discard block |
||
| 267 | 267 | $this->socket |
| 268 | 268 | ); |
| 269 | 269 | } catch (\Exception $e) { |
| 270 | - $this->_debug->displayError('Error connecting to mysql server: ' . $e->getMessage(), true); |
|
| 270 | + $this->_debug->displayError('Error connecting to mysql server: '.$e->getMessage(), true); |
|
| 271 | 271 | } |
| 272 | 272 | mysqli_report(MYSQLI_REPORT_OFF); |
| 273 | 273 | |
| 274 | 274 | if (!$this->connected) { |
| 275 | - $this->_debug->displayError('Error connecting to mysql server: ' . mysqli_connect_error(), true); |
|
| 275 | + $this->_debug->displayError('Error connecting to mysql server: '.mysqli_connect_error(), true); |
|
| 276 | 276 | } else { |
| 277 | 277 | $this->set_charset($this->charset); |
| 278 | 278 | } |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | static $firstInstance = null; |
| 374 | 374 | |
| 375 | 375 | if ( |
| 376 | - $hostname . $username . $password . $database . $port . $charset == '' |
|
| 376 | + $hostname.$username.$password.$database.$port.$charset == '' |
|
| 377 | 377 | && |
| 378 | 378 | null !== $firstInstance |
| 379 | 379 | ) { |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | $connection = md5( |
| 384 | - $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . (int)$session_to_db |
|
| 384 | + $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.(int)$session_to_db |
|
| 385 | 385 | ); |
| 386 | 386 | |
| 387 | 387 | if (!isset($instance[$connection])) { |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | // "string" |
| 562 | 562 | |
| 563 | 563 | if (!in_array($var, $this->mysqlDefaultTimeFunctions, true)) { |
| 564 | - $var = "'" . trim($this->escape(trim(trim((string)$var), "'")), "'") . "'"; |
|
| 564 | + $var = "'".trim($this->escape(trim(trim((string)$var), "'")), "'")."'"; |
|
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | } elseif (is_float($var)) { |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | // "DateTime"-object |
| 582 | 582 | |
| 583 | 583 | try { |
| 584 | - $var = "'" . $this->escape($var->format('Y-m-d H:i:s'), false, false) . "'"; |
|
| 584 | + $var = "'".$this->escape($var->format('Y-m-d H:i:s'), false, false)."'"; |
|
| 585 | 585 | } catch (\Exception $e) { |
| 586 | 586 | $var = null; |
| 587 | 587 | } |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | |
| 591 | 591 | // fallback ... |
| 592 | 592 | |
| 593 | - $var = "'" . trim($this->escape(trim(trim((string)$var), "'")), "'") . "'"; |
|
| 593 | + $var = "'".trim($this->escape(trim(trim((string)$var), "'")), "'")."'"; |
|
| 594 | 594 | |
| 595 | 595 | } |
| 596 | 596 | |
@@ -728,10 +728,10 @@ discard block |
||
| 728 | 728 | |
| 729 | 729 | // exit if we have more then 3 "DB server has gone away"-errors |
| 730 | 730 | if ($reconnectCounter > 3) { |
| 731 | - $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg . ":\n<br />" . $sql, 5); |
|
| 731 | + $this->_debug->mailToAdmin('SQL-Fatal-Error', $errorMsg.":\n<br />".$sql, 5); |
|
| 732 | 732 | throw new \Exception($errorMsg); |
| 733 | 733 | } else { |
| 734 | - $this->_debug->mailToAdmin('SQL-Error', $errorMsg . ":\n<br />" . $sql); |
|
| 734 | + $this->_debug->mailToAdmin('SQL-Error', $errorMsg.":\n<br />".$sql); |
|
| 735 | 735 | |
| 736 | 736 | // reconnect |
| 737 | 737 | $reconnectCounter++; |
@@ -741,10 +741,10 @@ discard block |
||
| 741 | 741 | $this->query($sql, $sqlParams); |
| 742 | 742 | } |
| 743 | 743 | } else { |
| 744 | - $this->_debug->mailToAdmin('SQL-Warning', $errorMsg . ":\n<br />" . $sql); |
|
| 744 | + $this->_debug->mailToAdmin('SQL-Warning', $errorMsg.":\n<br />".$sql); |
|
| 745 | 745 | |
| 746 | 746 | // this query returned an error, we must display it (only for dev) !!! |
| 747 | - $this->_debug->displayError($errorMsg . ' | ' . $sql); |
|
| 747 | + $this->_debug->displayError($errorMsg.' | '.$sql); |
|
| 748 | 748 | } |
| 749 | 749 | } |
| 750 | 750 | |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | |
| 811 | 811 | if ($useCache === true) { |
| 812 | 812 | $cache = new Cache(null, null, false, $useCache); |
| 813 | - $cacheKey = 'sql-' . md5($query); |
|
| 813 | + $cacheKey = 'sql-'.md5($query); |
|
| 814 | 814 | |
| 815 | 815 | if ( |
| 816 | 816 | $cache->getCacheIsReady() === true |
@@ -872,9 +872,9 @@ discard block |
||
| 872 | 872 | |
| 873 | 873 | $return = mysqli_set_charset($this->link, $charset); |
| 874 | 874 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 875 | - @mysqli_query($this->link, 'SET CHARACTER SET ' . $charset); |
|
| 875 | + @mysqli_query($this->link, 'SET CHARACTER SET '.$charset); |
|
| 876 | 876 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 877 | - @mysqli_query($this->link, "SET NAMES '" . ($charset === 'utf8' ? 'utf8mb4' : $charset) . "'"); |
|
| 877 | + @mysqli_query($this->link, "SET NAMES '".($charset === 'utf8' ? 'utf8mb4' : $charset)."'"); |
|
| 878 | 878 | |
| 879 | 879 | return $return; |
| 880 | 880 | } |
@@ -961,10 +961,10 @@ discard block |
||
| 961 | 961 | |
| 962 | 962 | if ($this->_debug->checkForDev() === true) { |
| 963 | 963 | echo "Info: maybe you have to increase your 'max_allowed_packet = 30M' in the config: 'my.conf' \n<br />"; |
| 964 | - echo 'Error:' . $errorMsg; |
|
| 964 | + echo 'Error:'.$errorMsg; |
|
| 965 | 965 | } |
| 966 | 966 | |
| 967 | - $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg . ":\n<br />" . $sql); |
|
| 967 | + $this->_debug->mailToAdmin('SQL-Error in mysqli_multi_query', $errorMsg.":\n<br />".$sql); |
|
| 968 | 968 | } |
| 969 | 969 | |
| 970 | 970 | // return the result only if there was a "SELECT"-query |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | |
| 1002 | 1002 | return false; |
| 1003 | 1003 | } elseif (mysqli_connect_errno()) { |
| 1004 | - $this->_debug->displayError('Error connecting to mysql server: ' . mysqli_connect_error(), true); |
|
| 1004 | + $this->_debug->displayError('Error connecting to mysql server: '.mysqli_connect_error(), true); |
|
| 1005 | 1005 | |
| 1006 | 1006 | return false; |
| 1007 | 1007 | } else { |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | |
| 1111 | 1111 | $SET = $this->_parseArrayPair($data); |
| 1112 | 1112 | |
| 1113 | - $sql = 'INSERT INTO ' . $this->quote_string($table) . " SET $SET;"; |
|
| 1113 | + $sql = 'INSERT INTO '.$this->quote_string($table)." SET $SET;"; |
|
| 1114 | 1114 | |
| 1115 | 1115 | return $this->query($sql); |
| 1116 | 1116 | } |
@@ -1198,9 +1198,9 @@ discard block |
||
| 1198 | 1198 | } |
| 1199 | 1199 | |
| 1200 | 1200 | if ($_connector === 'NOT IN' || $_connector === 'IN') { |
| 1201 | - $_value = '(' . implode(',', $_value) . ')'; |
|
| 1201 | + $_value = '('.implode(',', $_value).')'; |
|
| 1202 | 1202 | } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') { |
| 1203 | - $_value = '(' . implode(' AND ', $_value) . ')'; |
|
| 1203 | + $_value = '('.implode(' AND ', $_value).')'; |
|
| 1204 | 1204 | } |
| 1205 | 1205 | |
| 1206 | 1206 | } else { |
@@ -1208,7 +1208,7 @@ discard block |
||
| 1208 | 1208 | } |
| 1209 | 1209 | |
| 1210 | 1210 | $quoteString = $this->quote_string(trim(str_ireplace($_connector, '', $_key))); |
| 1211 | - $pairs[] = ' ' . $quoteString . ' ' . $_connector . ' ' . $_value . " \n"; |
|
| 1211 | + $pairs[] = ' '.$quoteString.' '.$_connector.' '.$_value." \n"; |
|
| 1212 | 1212 | } |
| 1213 | 1213 | |
| 1214 | 1214 | $sql = implode($glue, $pairs); |
@@ -1226,7 +1226,7 @@ discard block |
||
| 1226 | 1226 | */ |
| 1227 | 1227 | public function quote_string($str) |
| 1228 | 1228 | { |
| 1229 | - return '`' . $this->escape($str, false, false) . '`'; |
|
| 1229 | + return '`'.$this->escape($str, false, false).'`'; |
|
| 1230 | 1230 | } |
| 1231 | 1231 | |
| 1232 | 1232 | /** |
@@ -1280,7 +1280,7 @@ discard block |
||
| 1280 | 1280 | } |
| 1281 | 1281 | $values = implode(',', $data); |
| 1282 | 1282 | |
| 1283 | - $sql = 'REPLACE INTO ' . $this->quote_string($table) . " ($columns) VALUES ($values);"; |
|
| 1283 | + $sql = 'REPLACE INTO '.$this->quote_string($table)." ($columns) VALUES ($values);"; |
|
| 1284 | 1284 | |
| 1285 | 1285 | return $this->query($sql); |
| 1286 | 1286 | } |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | $WHERE = ''; |
| 1321 | 1321 | } |
| 1322 | 1322 | |
| 1323 | - $sql = 'UPDATE ' . $this->quote_string($table) . " SET $SET WHERE ($WHERE);"; |
|
| 1323 | + $sql = 'UPDATE '.$this->quote_string($table)." SET $SET WHERE ($WHERE);"; |
|
| 1324 | 1324 | |
| 1325 | 1325 | return $this->query($sql); |
| 1326 | 1326 | } |
@@ -1352,7 +1352,7 @@ discard block |
||
| 1352 | 1352 | $WHERE = ''; |
| 1353 | 1353 | } |
| 1354 | 1354 | |
| 1355 | - $sql = 'DELETE FROM ' . $this->quote_string($table) . " WHERE ($WHERE);"; |
|
| 1355 | + $sql = 'DELETE FROM '.$this->quote_string($table)." WHERE ($WHERE);"; |
|
| 1356 | 1356 | |
| 1357 | 1357 | return $this->query($sql); |
| 1358 | 1358 | } |
@@ -1382,7 +1382,7 @@ discard block |
||
| 1382 | 1382 | $WHERE = ''; |
| 1383 | 1383 | } |
| 1384 | 1384 | |
| 1385 | - $sql = 'SELECT * FROM ' . $this->quote_string($table) . " WHERE ($WHERE);"; |
|
| 1385 | + $sql = 'SELECT * FROM '.$this->quote_string($table)." WHERE ($WHERE);"; |
|
| 1386 | 1386 | |
| 1387 | 1387 | return $this->query($sql); |
| 1388 | 1388 | } |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | $this->logger( |
| 129 | 129 | array( |
| 130 | 130 | 'error', |
| 131 | - '<strong>' . date( |
|
| 131 | + '<strong>'.date( |
|
| 132 | 132 | 'd. m. Y G:i:s' |
| 133 | - ) . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . ') (sql-error):</strong> ' . $error . '<br>', |
|
| 133 | + ).' ('.$fileInfo['file'].' line: '.$fileInfo['line'].') (sql-error):</strong> '.$error.'<br>', |
|
| 134 | 134 | ) |
| 135 | 135 | ); |
| 136 | 136 | |
@@ -143,11 +143,11 @@ discard block |
||
| 143 | 143 | $box_bg = $this->css_mysql_box_bg; |
| 144 | 144 | |
| 145 | 145 | echo ' |
| 146 | - <div class="OBJ-mysql-box" style="border:' . $box_border . '; background:' . $box_bg . '; padding:10px; margin:10px;"> |
|
| 146 | + <div class="OBJ-mysql-box" style="border:' . $box_border.'; background:'.$box_bg.'; padding:10px; margin:10px;"> |
|
| 147 | 147 | <b style="font-size:14px;">MYSQL Error:</b> |
| 148 | 148 | <code style="display:block;"> |
| 149 | - file / line: ' . $fileInfo['file'] . ' / ' . $fileInfo['line'] . ' |
|
| 150 | - ' . $error . ' |
|
| 149 | + file / line: ' . $fileInfo['file'].' / '.$fileInfo['line'].' |
|
| 150 | + ' . $error.' |
|
| 151 | 151 | </code> |
| 152 | 152 | </div> |
| 153 | 153 | '; |
@@ -274,16 +274,16 @@ discard block |
||
| 274 | 274 | |
| 275 | 275 | $infoExtra = mysqli_info($this->_db->getLink()); |
| 276 | 276 | if ($infoExtra) { |
| 277 | - $infoExtra = ' | info => ' . $infoExtra; |
|
| 277 | + $infoExtra = ' | info => '.$infoExtra; |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | - $info = 'time => ' . round($duration, 5) . ' | results => ' . (int)$results . $infoExtra . ' | SQL => ' . UTF8::htmlentities($sql); |
|
| 280 | + $info = 'time => '.round($duration, 5).' | results => '.(int)$results.$infoExtra.' | SQL => '.UTF8::htmlentities($sql); |
|
| 281 | 281 | $fileInfo = $this->getFileAndLineFromSql(); |
| 282 | 282 | |
| 283 | 283 | $this->logger( |
| 284 | 284 | array( |
| 285 | 285 | 'debug', |
| 286 | - '<strong>' . date('d. m. Y G:i:s') . ' (' . $fileInfo['file'] . ' line: ' . $fileInfo['line'] . '):</strong> ' . $info . '<br>', |
|
| 286 | + '<strong>'.date('d. m. Y G:i:s').' ('.$fileInfo['file'].' line: '.$fileInfo['line'].'):</strong> '.$info.'<br>', |
|
| 287 | 287 | 'sql', |
| 288 | 288 | ) |
| 289 | 289 | ); |
@@ -347,21 +347,21 @@ discard block |
||
| 347 | 347 | $this->logger( |
| 348 | 348 | array( |
| 349 | 349 | 'debug', |
| 350 | - $subject . ' | ' . $htmlBody, |
|
| 350 | + $subject.' | '.$htmlBody, |
|
| 351 | 351 | ) |
| 352 | 352 | ); |
| 353 | 353 | } elseif ($priority > 3) { |
| 354 | 354 | $this->logger( |
| 355 | 355 | array( |
| 356 | 356 | 'error', |
| 357 | - $subject . ' | ' . $htmlBody, |
|
| 357 | + $subject.' | '.$htmlBody, |
|
| 358 | 358 | ) |
| 359 | 359 | ); |
| 360 | 360 | } elseif ($priority < 3) { |
| 361 | 361 | $this->logger( |
| 362 | 362 | array( |
| 363 | 363 | 'info', |
| 364 | - $subject . ' | ' . $htmlBody, |
|
| 364 | + $subject.' | '.$htmlBody, |
|
| 365 | 365 | ) |
| 366 | 366 | ); |
| 367 | 367 | } |