From 40c436b6e2724e98efb51582d1ad8fad6dcf4a1c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 09 Sep 2011 08:28:25 -0400
Subject: [PATCH] - Implemented: FS#1339 - Add "disablesieve" to mail_user table - Added fields for IPv6 support and virtualhost Port Configuration to server_ip table
---
server/lib/classes/db_mysql.inc.php | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 445563e..7e0c561 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -45,8 +45,7 @@
var $show_error_messages = true;
// constructor
- function db()
- {
+ public function __construct() {
global $conf;
$this->dbHost = $conf['db_host'];
@@ -56,13 +55,17 @@
$this->dbCharset = $conf['db_charset'];
//$this->connect();
}
+
+ public function __destruct() {
+ $this->closeConn();
+ }
// error handler
function updateError($location)
{
global $app;
- $this->errorNumber = mysql_errno($this->linkId);
- $this->errorMessage = mysql_error($this->linkId);
+ $this->errorNumber = @mysql_errno($this->linkId);
+ $this->errorMessage = @mysql_error($this->linkId);
$this->errorLocation = $location;
if($this->errorNumber && $this->show_error_messages && method_exists($app,'log'))
{
@@ -76,7 +79,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);
if(!$this->linkId)
{
$this->updateError('DB::connect()-> mysql_connect');
@@ -463,7 +466,7 @@
return $this->query($sql);
}
- // gibt Array mit Tabellennamen zur�ck
+ // gibt Array mit Tabellennamen zur�ck
function getTables($database_name = '') {
if($database_name == '') $database_name = $this->dbName;
@@ -474,7 +477,7 @@
return $tb_names;
}
- // gibt Feldinformationen zur Tabelle zur�ck
+ // gibt Feldinformationen zur Tabelle zur�ck
/*
$columns = array(action => add | alter | drop
name => Spaltenname
--
Gitblit v1.9.1