From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6
---
server/lib/classes/db_mysql.inc.php | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 2c113b5..3c89c74 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -34,6 +34,8 @@
var $dbUser = ''; // database authorized user
var $dbPass = ''; // user's password
var $dbCharset = 'utf8';// Database charset
+ var $dbNewLink = false; // Return a new linkID when connect is called again
+ var $dbClientFlags = 0; // MySQL Client falgs
var $linkId = 0; // last result of mysql_connect()
var $queryId = 0; // last result of mysql_query()
var $record = array(); // last record fetched
@@ -45,8 +47,7 @@
var $show_error_messages = true;
// constructor
- function db()
- {
+ public function __construct() {
global $conf;
$this->dbHost = $conf['db_host'];
@@ -54,7 +55,13 @@
$this->dbUser = $conf['db_user'];
$this->dbPass = $conf['db_password'];
$this->dbCharset = $conf['db_charset'];
+ $this->dbNewLink = $conf['db_new_link'];
+ $this->dbClientFlags = $conf['db_client_flags'];
//$this->connect();
+ }
+
+ public function __destruct() {
+ $this->closeConn();
}
// error handler
@@ -76,7 +83,7 @@
{
if($this->linkId == 0)
{
- $this->linkId = @mysql_connect($this->dbHost, $this->dbUser, $this->dbPass);
+ $this->linkId = @mysql_connect($this->dbHost, $this->dbUser, $this->dbPass, $this->dbNewLink, $this->dbClientFlags);
if(!$this->linkId)
{
$this->updateError('DB::connect()-> mysql_connect');
@@ -291,7 +298,11 @@
//print_r($diff_num);
//print_r($diffrec_full);
$diffstr = $app->db->quote(serialize($diffrec_full));
- $username = $app->db->quote($_SESSION['s']['user']['username']);
+ if(isset($_SESSION)) {
+ $username = $app->db->quote($_SESSION['s']['user']['username']);
+ } else {
+ $username = 'admin';
+ }
$dbidx = $primary_field.':'.$primary_id;
if($action == 'INSERT') $action = 'i';
--
Gitblit v1.9.1