From 7cd9971f543f12a5fb60b67631190712d0d9788e Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Thu, 05 May 2011 14:57:13 -0400
Subject: [PATCH] First upload of the email quota reporting. All parts are disabled at the moment. Please help update the language files.
---
server/lib/classes/db_mysql.inc.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index c2a5a35..2c113b5 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -33,6 +33,7 @@
var $dbName = ''; // logical database name on that server
var $dbUser = ''; // database authorized user
var $dbPass = ''; // user's password
+ var $dbCharset = 'utf8';// Database charset
var $linkId = 0; // last result of mysql_connect()
var $queryId = 0; // last result of mysql_query()
var $record = array(); // last record fetched
@@ -60,8 +61,8 @@
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'))
{
@@ -75,7 +76,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');
@@ -462,7 +463,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;
@@ -473,7 +474,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