@@ -228,7 +228,7 @@ |
||
| 228 | 228 | * @param string $username |
| 229 | 229 | * @param string $password |
| 230 | 230 | * @param string $database |
| 231 | - * @param int|string $port <p>default is (int)3306</p> |
|
| 231 | + * @param integer $port <p>default is (int)3306</p> |
|
| 232 | 232 | * @param string $charset <p>default is 'utf8' or 'utf8mb4' (if supported)</p> |
| 233 | 233 | * @param boolean|string $exit_on_error <p>Use a empty string "" or false to disable it.</p> |
| 234 | 234 | * @param boolean|string $echo_on_error <p>Use a empty string "" or false to disable it.</p> |
@@ -416,9 +416,9 @@ discard block |
||
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | if ($_connector === 'NOT IN' || $_connector === 'IN') { |
| 419 | - $_value = '(' . implode(',', $_value) . ')'; |
|
| 419 | + $_value = '('.implode(',', $_value).')'; |
|
| 420 | 420 | } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') { |
| 421 | - $_value = '(' . implode(' AND ', $_value) . ')'; |
|
| 421 | + $_value = '('.implode(' AND ', $_value).')'; |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | } else { |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue |
| 464 | 464 | } |
| 465 | 465 | |
| 466 | - $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n"; |
|
| 466 | + $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n"; |
|
| 467 | 467 | $tmpCounter++; |
| 468 | 468 | } |
| 469 | 469 | |
@@ -637,7 +637,7 @@ discard block |
||
| 637 | 637 | ); |
| 638 | 638 | |
| 639 | 639 | } catch (\Exception $e) { |
| 640 | - $error = 'Error connecting to mysql server: ' . $e->getMessage(); |
|
| 640 | + $error = 'Error connecting to mysql server: '.$e->getMessage(); |
|
| 641 | 641 | $this->_debug->displayError($error, false); |
| 642 | 642 | throw new DBConnectException($error, 100, $e); |
| 643 | 643 | } |
@@ -645,7 +645,7 @@ discard block |
||
| 645 | 645 | |
| 646 | 646 | $errno = mysqli_connect_errno(); |
| 647 | 647 | if (!$this->connected || $errno) { |
| 648 | - $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')'; |
|
| 648 | + $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')'; |
|
| 649 | 649 | $this->_debug->displayError($error, false); |
| 650 | 650 | throw new DBConnectException($error, 101); |
| 651 | 651 | } |
@@ -686,10 +686,10 @@ discard block |
||
| 686 | 686 | } |
| 687 | 687 | |
| 688 | 688 | if ($databaseName) { |
| 689 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 689 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 690 | 690 | } |
| 691 | 691 | |
| 692 | - $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);"; |
|
| 692 | + $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);"; |
|
| 693 | 693 | |
| 694 | 694 | return $this->query($sql); |
| 695 | 695 | } |
@@ -881,7 +881,7 @@ discard block |
||
| 881 | 881 | |
| 882 | 882 | if ($useCache === true) { |
| 883 | 883 | $cache = new Cache(null, null, false, $useCache); |
| 884 | - $cacheKey = 'sql-' . md5($query); |
|
| 884 | + $cacheKey = 'sql-'.md5($query); |
|
| 885 | 885 | |
| 886 | 886 | if ( |
| 887 | 887 | $cache->getCacheIsReady() === true |
@@ -989,7 +989,7 @@ discard block |
||
| 989 | 989 | static $firstInstance = null; |
| 990 | 990 | |
| 991 | 991 | if ( |
| 992 | - $hostname . $username . $password . $database . $port . $charset == '' |
|
| 992 | + $hostname.$username.$password.$database.$port.$charset == '' |
|
| 993 | 993 | && |
| 994 | 994 | null !== $firstInstance |
| 995 | 995 | ) { |
@@ -999,7 +999,7 @@ discard block |
||
| 999 | 999 | $extra_config_string = ''; |
| 1000 | 1000 | if (is_array($extra_config) === true) { |
| 1001 | 1001 | foreach ($extra_config as $extra_config_key => $extra_config_value) { |
| 1002 | - $extra_config_string .= $extra_config_key . (string)$extra_config_value; |
|
| 1002 | + $extra_config_string .= $extra_config_key.(string)$extra_config_value; |
|
| 1003 | 1003 | } |
| 1004 | 1004 | } else { |
| 1005 | 1005 | // only for backward compatibility |
@@ -1007,7 +1007,7 @@ discard block |
||
| 1007 | 1007 | } |
| 1008 | 1008 | |
| 1009 | 1009 | $connection = md5( |
| 1010 | - $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string |
|
| 1010 | + $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string |
|
| 1011 | 1011 | ); |
| 1012 | 1012 | |
| 1013 | 1013 | if (!isset($instance[$connection])) { |
@@ -1094,10 +1094,10 @@ discard block |
||
| 1094 | 1094 | $SET = $this->_parseArrayPair($data); |
| 1095 | 1095 | |
| 1096 | 1096 | if ($databaseName) { |
| 1097 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1097 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1098 | 1098 | } |
| 1099 | 1099 | |
| 1100 | - $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;"; |
|
| 1100 | + $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;"; |
|
| 1101 | 1101 | |
| 1102 | 1102 | return $this->query($sql); |
| 1103 | 1103 | } |
@@ -1419,11 +1419,11 @@ discard block |
||
| 1419 | 1419 | |
| 1420 | 1420 | // exit if we have more then 3 "DB server has gone away"-errors |
| 1421 | 1421 | if ($RECONNECT_COUNTER > 3) { |
| 1422 | - $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql, 5); |
|
| 1422 | + $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5); |
|
| 1423 | 1423 | throw new DBGoneAwayException($errorMessage); |
| 1424 | 1424 | } |
| 1425 | 1425 | |
| 1426 | - $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql); |
|
| 1426 | + $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql); |
|
| 1427 | 1427 | |
| 1428 | 1428 | // reconnect |
| 1429 | 1429 | $RECONNECT_COUNTER++; |
@@ -1437,10 +1437,10 @@ discard block |
||
| 1437 | 1437 | return false; |
| 1438 | 1438 | } |
| 1439 | 1439 | |
| 1440 | - $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber. ') ' . ":\n<br />" . $sql); |
|
| 1440 | + $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql); |
|
| 1441 | 1441 | |
| 1442 | 1442 | // this query returned an error, we must display it (only for dev) !!! |
| 1443 | - $this->_debug->displayError($errorMessage . '(' . $errorNumber. ') ' . ' | ' . $sql); |
|
| 1443 | + $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql); |
|
| 1444 | 1444 | |
| 1445 | 1445 | return false; |
| 1446 | 1446 | } |
@@ -1463,7 +1463,7 @@ discard block |
||
| 1463 | 1463 | ) |
| 1464 | 1464 | ); |
| 1465 | 1465 | |
| 1466 | - return '`' . $str . '`'; |
|
| 1466 | + return '`'.$str.'`'; |
|
| 1467 | 1467 | } |
| 1468 | 1468 | |
| 1469 | 1469 | /** |
@@ -1534,10 +1534,10 @@ discard block |
||
| 1534 | 1534 | $values = implode(',', $data); |
| 1535 | 1535 | |
| 1536 | 1536 | if ($databaseName) { |
| 1537 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1537 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1538 | 1538 | } |
| 1539 | 1539 | |
| 1540 | - $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);"; |
|
| 1540 | + $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);"; |
|
| 1541 | 1541 | |
| 1542 | 1542 | return $this->query($sql); |
| 1543 | 1543 | } |
@@ -1661,7 +1661,7 @@ discard block |
||
| 1661 | 1661 | $var = $this->escape($var, false, false, null); |
| 1662 | 1662 | |
| 1663 | 1663 | if (is_string($var)) { |
| 1664 | - $var = "'" . trim($var, "'") . "'"; |
|
| 1664 | + $var = "'".trim($var, "'")."'"; |
|
| 1665 | 1665 | } |
| 1666 | 1666 | |
| 1667 | 1667 | return $var; |
@@ -1698,10 +1698,10 @@ discard block |
||
| 1698 | 1698 | } |
| 1699 | 1699 | |
| 1700 | 1700 | if ($databaseName) { |
| 1701 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1701 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1702 | 1702 | } |
| 1703 | 1703 | |
| 1704 | - $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);"; |
|
| 1704 | + $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);"; |
|
| 1705 | 1705 | |
| 1706 | 1706 | return $this->query($sql); |
| 1707 | 1707 | } |
@@ -1728,10 +1728,10 @@ discard block |
||
| 1728 | 1728 | $return = mysqli_set_charset($this->link, $charset); |
| 1729 | 1729 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 1730 | 1730 | /** @noinspection UsageOfSilenceOperatorInspection */ |
| 1731 | - @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset); |
|
| 1731 | + @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset); |
|
| 1732 | 1732 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 1733 | 1733 | /** @noinspection UsageOfSilenceOperatorInspection */ |
| 1734 | - @\mysqli_query($this->link, "SET NAMES '" . $charset . "'"); |
|
| 1734 | + @\mysqli_query($this->link, "SET NAMES '".$charset."'"); |
|
| 1735 | 1735 | |
| 1736 | 1736 | return $return; |
| 1737 | 1737 | } |
@@ -1877,10 +1877,10 @@ discard block |
||
| 1877 | 1877 | } |
| 1878 | 1878 | |
| 1879 | 1879 | if ($databaseName) { |
| 1880 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1880 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1881 | 1881 | } |
| 1882 | 1882 | |
| 1883 | - $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);"; |
|
| 1883 | + $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);"; |
|
| 1884 | 1884 | |
| 1885 | 1885 | return $this->query($sql); |
| 1886 | 1886 | } |