From 00d96ba2cd3f93272474e51a2c7f5b1a35616ec3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 23 May 2008 13:58:42 -0400
Subject: [PATCH] Rewriting of the config files is optional during update now.
---
install/lib/mysql.lib.php | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
index 5cf4f0a..eac33e5 100644
--- a/install/lib/mysql.lib.php
+++ b/install/lib/mysql.lib.php
@@ -48,10 +48,10 @@
{
global $conf;
- $this->dbHost = $conf["mysql_server_host"];
- //$this->dbName = $conf["mysql_server_database"];
- $this->dbUser = $conf["mysql_server_admin_user"];
- $this->dbPass = $conf["mysql_server_admin_password"];
+ $this->dbHost = $conf["mysql"]["host"];
+ //$this->dbName = $conf["mysql"]["database"];
+ $this->dbUser = $conf["mysql"]["admin_user"];
+ $this->dbPass = $conf["mysql"]["admin_password"];
//$this->connect();
}
@@ -73,6 +73,7 @@
if($this->linkId == 0)
{
$this->linkId = mysql_connect($this->dbHost, $this->dbUser, $this->dbPass);
+
if(!$this->linkId)
{
$this->updateError('DB::connect()<br />mysql_connect');
@@ -348,18 +349,21 @@
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;
- $result = mysql_list_tables($database_name);
+ if($database_name == ''){
+ $database_name = $this->dbName;
+ }
+ $result = mysql_query("SHOW TABLES FROM `$database_name`");
+ $tb_names = array();
for ($i = 0; $i < mysql_num_rows($result); $i++) {
$tb_names[$i] = mysql_tablename($result, $i);
}
return $tb_names;
}
- // gibt Feldinformationen zur Tabelle zur�ck
+ // gibt Feldinformationen zur Tabelle zur�ck
/*
$columns = array(action => add | alter | drop
name => Spaltenname
@@ -481,7 +485,7 @@
return 'char';
break;
case 'varchar':
- if($typeValue < 1) die("Datenbank Fehler: F�r diesen Datentyp ist eine L�ngenangabe notwendig.");
+ if($typeValue < 1) die("Datenbank Fehler: F�r diesen Datentyp ist eine L�ngenangabe notwendig.");
return 'varchar('.$typeValue.')';
break;
case 'text':
@@ -495,4 +499,4 @@
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1