@@ -438,9 +438,9 @@ discard block |
||
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | if ($_connector === 'NOT IN' || $_connector === 'IN') { |
| 441 | - $_value = '(' . implode(',', $_value) . ')'; |
|
| 441 | + $_value = '('.implode(',', $_value).')'; |
|
| 442 | 442 | } elseif ($_connector === 'NOT BETWEEN' || $_connector === 'BETWEEN') { |
| 443 | - $_value = '(' . implode(' AND ', $_value) . ')'; |
|
| 443 | + $_value = '('.implode(' AND ', $_value).')'; |
|
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | } else { |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | $_glueHelperInner = 'AND ('; // inner-loop "OR"-query glue |
| 486 | 486 | } |
| 487 | 487 | |
| 488 | - $sql .= ' ' . $_glueHelperInner . ' ' . $quoteString . ' ' . $_connector . ' ' . $valueInner . " \n"; |
|
| 488 | + $sql .= ' '.$_glueHelperInner.' '.$quoteString.' '.$_connector.' '.$valueInner." \n"; |
|
| 489 | 489 | $tmpCounter++; |
| 490 | 490 | } |
| 491 | 491 | |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | ); |
| 680 | 680 | |
| 681 | 681 | } catch (\Exception $e) { |
| 682 | - $error = 'Error connecting to mysql server: ' . $e->getMessage(); |
|
| 682 | + $error = 'Error connecting to mysql server: '.$e->getMessage(); |
|
| 683 | 683 | $this->_debug->displayError($error, true); |
| 684 | 684 | throw new DBConnectException($error, 100, $e); |
| 685 | 685 | } |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | |
| 688 | 688 | $errno = mysqli_connect_errno(); |
| 689 | 689 | if (!$this->connected || $errno) { |
| 690 | - $error = 'Error connecting to mysql server: ' . \mysqli_connect_error() . ' (' . $errno . ')'; |
|
| 690 | + $error = 'Error connecting to mysql server: '.\mysqli_connect_error().' ('.$errno.')'; |
|
| 691 | 691 | $this->_debug->displayError($error, true); |
| 692 | 692 | throw new DBConnectException($error, 101); |
| 693 | 693 | } |
@@ -728,10 +728,10 @@ discard block |
||
| 728 | 728 | } |
| 729 | 729 | |
| 730 | 730 | if ($databaseName) { |
| 731 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 731 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 732 | 732 | } |
| 733 | 733 | |
| 734 | - $sql = 'DELETE FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);"; |
|
| 734 | + $sql = 'DELETE FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);"; |
|
| 735 | 735 | |
| 736 | 736 | return $this->query($sql); |
| 737 | 737 | } |
@@ -801,8 +801,8 @@ discard block |
||
| 801 | 801 | $nameTmp = substr($name, 1); |
| 802 | 802 | } |
| 803 | 803 | |
| 804 | - $parseKeyInner = $nameTmp . '-' . $parseKey; |
|
| 805 | - $sql = str_replace(':' . $nameTmp, $parseKeyInner, $sql); |
|
| 804 | + $parseKeyInner = $nameTmp.'-'.$parseKey; |
|
| 805 | + $sql = str_replace(':'.$nameTmp, $parseKeyInner, $sql); |
|
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | foreach ($params as $name => $value) { |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | $nameTmp = substr($name, 1); |
| 812 | 812 | } |
| 813 | 813 | |
| 814 | - $parseKeyInner = $nameTmp . '-' . $parseKey; |
|
| 814 | + $parseKeyInner = $nameTmp.'-'.$parseKey; |
|
| 815 | 815 | $sqlBefore = $sql; |
| 816 | 816 | $secureParamValue = $this->secure($params[$name]); |
| 817 | 817 | |
@@ -989,7 +989,7 @@ discard block |
||
| 989 | 989 | |
| 990 | 990 | if ($useCache === true) { |
| 991 | 991 | $cache = new Cache(null, null, false, $useCache); |
| 992 | - $cacheKey = 'sql-' . md5($query); |
|
| 992 | + $cacheKey = 'sql-'.md5($query); |
|
| 993 | 993 | |
| 994 | 994 | if ( |
| 995 | 995 | $cache->getCacheIsReady() === true |
@@ -1099,7 +1099,7 @@ discard block |
||
| 1099 | 1099 | static $firstInstance = null; |
| 1100 | 1100 | |
| 1101 | 1101 | if ( |
| 1102 | - $hostname . $username . $password . $database . $port . $charset == '' |
|
| 1102 | + $hostname.$username.$password.$database.$port.$charset == '' |
|
| 1103 | 1103 | && |
| 1104 | 1104 | null !== $firstInstance |
| 1105 | 1105 | ) { |
@@ -1109,7 +1109,7 @@ discard block |
||
| 1109 | 1109 | $extra_config_string = ''; |
| 1110 | 1110 | if (is_array($extra_config) === true) { |
| 1111 | 1111 | foreach ($extra_config as $extra_config_key => $extra_config_value) { |
| 1112 | - $extra_config_string .= $extra_config_key . (string)$extra_config_value; |
|
| 1112 | + $extra_config_string .= $extra_config_key.(string)$extra_config_value; |
|
| 1113 | 1113 | } |
| 1114 | 1114 | } else { |
| 1115 | 1115 | // only for backward compatibility |
@@ -1117,7 +1117,7 @@ discard block |
||
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | 1119 | $connection = md5( |
| 1120 | - $hostname . $username . $password . $database . $port . $charset . (int)$exit_on_error . (int)$echo_on_error . $logger_class_name . $logger_level . $extra_config_string |
|
| 1120 | + $hostname.$username.$password.$database.$port.$charset.(int)$exit_on_error.(int)$echo_on_error.$logger_class_name.$logger_level.$extra_config_string |
|
| 1121 | 1121 | ); |
| 1122 | 1122 | |
| 1123 | 1123 | if (!isset($instance[$connection])) { |
@@ -1204,10 +1204,10 @@ discard block |
||
| 1204 | 1204 | $SET = $this->_parseArrayPair($data); |
| 1205 | 1205 | |
| 1206 | 1206 | if ($databaseName) { |
| 1207 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1207 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1208 | 1208 | } |
| 1209 | 1209 | |
| 1210 | - $sql = 'INSERT INTO ' . $databaseName . $this->quote_string($table) . " SET $SET;"; |
|
| 1210 | + $sql = 'INSERT INTO '.$databaseName.$this->quote_string($table)." SET $SET;"; |
|
| 1211 | 1211 | |
| 1212 | 1212 | return $this->query($sql); |
| 1213 | 1213 | } |
@@ -1521,11 +1521,11 @@ discard block |
||
| 1521 | 1521 | |
| 1522 | 1522 | // exit if we have more then 3 "DB server has gone away"-errors |
| 1523 | 1523 | if ($RECONNECT_COUNTER > 3) { |
| 1524 | - $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql, 5); |
|
| 1524 | + $this->_debug->mailToAdmin('DB-Fatal-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql, 5); |
|
| 1525 | 1525 | throw new DBGoneAwayException($errorMessage); |
| 1526 | 1526 | } |
| 1527 | 1527 | |
| 1528 | - $this->_debug->mailToAdmin('DB-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql); |
|
| 1528 | + $this->_debug->mailToAdmin('DB-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql); |
|
| 1529 | 1529 | |
| 1530 | 1530 | // reconnect |
| 1531 | 1531 | $RECONNECT_COUNTER++; |
@@ -1539,7 +1539,7 @@ discard block |
||
| 1539 | 1539 | return false; |
| 1540 | 1540 | } |
| 1541 | 1541 | |
| 1542 | - $this->_debug->mailToAdmin('SQL-Error', $errorMessage . '(' . $errorNumber . ') ' . ":\n<br />" . $sql); |
|
| 1542 | + $this->_debug->mailToAdmin('SQL-Error', $errorMessage.'('.$errorNumber.') '.":\n<br />".$sql); |
|
| 1543 | 1543 | |
| 1544 | 1544 | $force_exception_after_error = null; // auto |
| 1545 | 1545 | if ($this->_in_transaction === true) { |
@@ -1547,7 +1547,7 @@ discard block |
||
| 1547 | 1547 | } |
| 1548 | 1548 | // this query returned an error, we must display it (only for dev) !!! |
| 1549 | 1549 | |
| 1550 | - $this->_debug->displayError($errorMessage . '(' . $errorNumber . ') ' . ' | ' . $sql, $force_exception_after_error); |
|
| 1550 | + $this->_debug->displayError($errorMessage.'('.$errorNumber.') '.' | '.$sql, $force_exception_after_error); |
|
| 1551 | 1551 | |
| 1552 | 1552 | return false; |
| 1553 | 1553 | } |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | ) |
| 1571 | 1571 | ); |
| 1572 | 1572 | |
| 1573 | - return '`' . $str . '`'; |
|
| 1573 | + return '`'.$str.'`'; |
|
| 1574 | 1574 | } |
| 1575 | 1575 | |
| 1576 | 1576 | /** |
@@ -1641,10 +1641,10 @@ discard block |
||
| 1641 | 1641 | $values = implode(',', $data); |
| 1642 | 1642 | |
| 1643 | 1643 | if ($databaseName) { |
| 1644 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1644 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1645 | 1645 | } |
| 1646 | 1646 | |
| 1647 | - $sql = 'REPLACE INTO ' . $databaseName . $this->quote_string($table) . " ($columns) VALUES ($values);"; |
|
| 1647 | + $sql = 'REPLACE INTO '.$databaseName.$this->quote_string($table)." ($columns) VALUES ($values);"; |
|
| 1648 | 1648 | |
| 1649 | 1649 | return $this->query($sql); |
| 1650 | 1650 | } |
@@ -1744,7 +1744,7 @@ discard block |
||
| 1744 | 1744 | $var = $this->escape($var, false, false, null); |
| 1745 | 1745 | |
| 1746 | 1746 | if (is_string($var)) { |
| 1747 | - $var = "'" . trim($var, "'") . "'"; |
|
| 1747 | + $var = "'".trim($var, "'")."'"; |
|
| 1748 | 1748 | } |
| 1749 | 1749 | |
| 1750 | 1750 | return $var; |
@@ -1781,10 +1781,10 @@ discard block |
||
| 1781 | 1781 | } |
| 1782 | 1782 | |
| 1783 | 1783 | if ($databaseName) { |
| 1784 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 1784 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 1785 | 1785 | } |
| 1786 | 1786 | |
| 1787 | - $sql = 'SELECT * FROM ' . $databaseName . $this->quote_string($table) . " WHERE ($WHERE);"; |
|
| 1787 | + $sql = 'SELECT * FROM '.$databaseName.$this->quote_string($table)." WHERE ($WHERE);"; |
|
| 1788 | 1788 | |
| 1789 | 1789 | return $this->query($sql); |
| 1790 | 1790 | } |
@@ -1827,10 +1827,10 @@ discard block |
||
| 1827 | 1827 | $return = mysqli_set_charset($this->link, $charset); |
| 1828 | 1828 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 1829 | 1829 | /** @noinspection UsageOfSilenceOperatorInspection */ |
| 1830 | - @\mysqli_query($this->link, 'SET CHARACTER SET ' . $charset); |
|
| 1830 | + @\mysqli_query($this->link, 'SET CHARACTER SET '.$charset); |
|
| 1831 | 1831 | /** @noinspection PhpUsageOfSilenceOperatorInspection */ |
| 1832 | 1832 | /** @noinspection UsageOfSilenceOperatorInspection */ |
| 1833 | - @\mysqli_query($this->link, "SET NAMES '" . $charset . "'"); |
|
| 1833 | + @\mysqli_query($this->link, "SET NAMES '".$charset."'"); |
|
| 1834 | 1834 | |
| 1835 | 1835 | return $return; |
| 1836 | 1836 | } |
@@ -1958,7 +1958,7 @@ discard block |
||
| 1958 | 1958 | $result = call_user_func($callback, $this); |
| 1959 | 1959 | if ($result === false) { |
| 1960 | 1960 | /** @noinspection ThrowRawExceptionInspection */ |
| 1961 | - throw new \Exception('call_user_func [' . $callback . '] === false'); |
|
| 1961 | + throw new \Exception('call_user_func ['.$callback.'] === false'); |
|
| 1962 | 1962 | } |
| 1963 | 1963 | |
| 1964 | 1964 | return $this->commit(); |
@@ -2011,10 +2011,10 @@ discard block |
||
| 2011 | 2011 | } |
| 2012 | 2012 | |
| 2013 | 2013 | if ($databaseName) { |
| 2014 | - $databaseName = $this->quote_string(trim($databaseName)) . '.'; |
|
| 2014 | + $databaseName = $this->quote_string(trim($databaseName)).'.'; |
|
| 2015 | 2015 | } |
| 2016 | 2016 | |
| 2017 | - $sql = 'UPDATE ' . $databaseName . $this->quote_string($table) . " SET $SET WHERE ($WHERE);"; |
|
| 2017 | + $sql = 'UPDATE '.$databaseName.$this->quote_string($table)." SET $SET WHERE ($WHERE);"; |
|
| 2018 | 2018 | |
| 2019 | 2019 | return $this->query($sql); |
| 2020 | 2020 | } |
@@ -2028,7 +2028,7 @@ discard block |
||
| 2028 | 2028 | */ |
| 2029 | 2029 | public function table_exists($table) |
| 2030 | 2030 | { |
| 2031 | - $check = $this->query('SELECT 1 FROM ' . $this->quote_string($table)); |
|
| 2031 | + $check = $this->query('SELECT 1 FROM '.$this->quote_string($table)); |
|
| 2032 | 2032 | if ( |
| 2033 | 2033 | $check !== false |
| 2034 | 2034 | && |