From 6ccc2ac44dc49125b8fc60872c024f944a32a5e6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 24 Jun 2013 05:39:27 -0400
Subject: [PATCH] Extended FTP user path checks.
---
interface/lib/classes/db_mysql.inc.php | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 528099f..4672998 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -44,7 +44,7 @@
private $errorNumber = 0; // last error number
public $errorMessage = ''; // last error message
private $errorLocation = '';// last error location
- public $show_error_messages = true; // false in server, true in interface
+ public $show_error_messages = false; // false in server, true in interface
private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
// constructor
@@ -84,7 +84,7 @@
// error handler
public function updateError($location) {
- global $app;
+ global $app, $conf;
/*
if(!is_null($this->connect_error)) {
@@ -107,8 +107,8 @@
$this->errorLocation = $location;
if($this->errorNumber) {
$error_msg = $this->errorLocation .' '. $this->errorMessage;
- // This right here will allow us to use the samefile for server & interface
- if($this->show_error_messages && $conf['demo_mode'] != true) {
+ // This right here will allow us to use the same file for server & interface
+ if($this->show_error_messages && $conf['demo_mode'] === false) {
echo $error_msg;
} else if(is_object($app) && method_exists($app, 'log')) {
$app->log($error_msg, LOGLEVEL_WARN);
@@ -123,7 +123,8 @@
}
public function query($queryString) {
- if($this->isConnected == false) return false;
+ global $conf;
+ if($this->isConnected == false) return false;
$try = 0;
do {
$try++;
@@ -144,7 +145,7 @@
} while($ok == false);
$this->queryId = parent::query($queryString);
$this->updateError('DB::query('.$queryString.') -> mysqli_query');
- if($this->errorNumber) debug_print_backtrace();
+ if($this->errorNumber && $conf['demo_mode'] === false) debug_print_backtrace();
if(!$this->queryId) {
return false;
}
@@ -189,11 +190,11 @@
// returns number of rows returned by the last select query
public function numRows() {
- return $this->queryId->num_rows;
+ return intval($this->queryId->num_rows);
}
public function affectedRows() {
- return $this->queryId->affected_rows;
+ return intval($this->queryId->affected_rows);
}
// returns mySQL insert id
--
Gitblit v1.9.1