From 8c93e18d6e527e39c9cf58f53677c1c7d31286df Mon Sep 17 00:00:00 2001
From: Moll <Moll@mhknet.de>
Date: Mon, 04 Jul 2016 09:32:09 -0400
Subject: [PATCH] Only if none there is no prefix else it's www
---
install/lib/mysql.lib.php | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
index 8e40862..7cf06ee 100644
--- a/install/lib/mysql.lib.php
+++ b/install/lib/mysql.lib.php
@@ -104,6 +104,7 @@
public function setDBName($name) {
$this->dbName = $name;
+ $this->_iConnId = mysqli_connect($this->dbHost, $this->dbUser, $this->dbPass);
if(!((bool)mysqli_query( $this->_iConnId, 'USE `' . $this->dbName . '`'))) {
$this->close();
$this->_sqlerror('Datenbank nicht gefunden / Database not found');
@@ -188,8 +189,6 @@
}
private function _query($sQuery = '') {
- global $app;
-
$this->do_connect();
if ($sQuery == '') {
@@ -206,10 +205,8 @@
if($this->errorNumber == '111') {
// server is not available
if($try > 9) {
- if(isset($app) && isset($app->forceErrorExit)) {
- $app->forceErrorExit('Database connection failure!');
- }
- // if we reach this, the app object is missing or has no exit method, so we continue as normal
+ $this->_sqlerror('DB::query -> error connecting');
+ exit;
}
sleep(30); // additional seconds, please!
}
@@ -441,18 +438,13 @@
* @return string escaped string
*/
public function escape($sString) {
- global $app;
if(!is_string($sString) && !is_numeric($sString)) {
- $app->log('NON-String given in escape function! (' . gettype($sString) . ')', LOGLEVEL_INFO);
- //$sAddMsg = getDebugBacktrace();
- $app->log($sAddMsg, LOGLEVEL_DEBUG);
$sString = '';
}
$cur_encoding = mb_detect_encoding($sString);
if($cur_encoding != "UTF-8") {
if($cur_encoding != 'ASCII') {
- $app->log('String ' . substr($sString, 0, 25) . '... is ' . $cur_encoding . '.', LOGLEVEL_INFO);
if($cur_encoding) $sString = mb_convert_encoding($sString, 'UTF-8', $cur_encoding);
else $sString = mb_convert_encoding($sString, 'UTF-8');
}
@@ -470,7 +462,7 @@
* @access private
*/
private function _sqlerror($sErrormsg = 'Unbekannter Fehler', $sAddMsg = '') {
- global $app, $conf;
+ global $conf;
$mysql_error = (is_object($this->_iConnId) ? mysqli_error($this->_iConnId) : mysqli_connect_error());
$mysql_errno = (is_object($this->_iConnId) ? mysqli_errno($this->_iConnId) : mysqli_connect_errno());
@@ -479,9 +471,7 @@
if($this->show_error_messages && $conf['demo_mode'] === false) {
echo $sErrormsg . $sAddMsg;
- } else if(is_object($app) && method_exists($app, 'log')) {
- $app->log($sErrormsg . $sAddMsg . ' -> ' . $mysql_errno . ' (' . $mysql_error . ')', LOGLEVEL_WARN);
- }
+ }
}
public function affectedRows() {
@@ -786,7 +776,7 @@
*
* @access private
*/
- public function db_result($iResId, $iConnection) {
+ public function __construct($iResId, $iConnection) {
$this->_iResId = $iResId;
$this->_iConnection = $iConnection;
}
@@ -912,7 +902,7 @@
*
* @access private
*/
- public function fakedb_result($aData) {
+ public function __construct($aData) {
$this->aResultData = $aData;
$this->aLimitedData = $aData;
reset($this->aLimitedData);
--
Gitblit v1.9.1