From a8a32889cc06a2c8daffc1b27167061379065046 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 17 Nov 2008 17:27:51 -0500
Subject: [PATCH] Create getmail cronjobs only if the getmail user exists.
---
install/lib/mysql.lib.php | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/install/lib/mysql.lib.php b/install/lib/mysql.lib.php
index dd85628..e24fcc6 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();
}
@@ -171,7 +171,7 @@
// Check der variablen
function quote($formfield)
{
- return addslashes($formfield);
+ return mysql_real_escape_string($formfield);
}
// Check der variablen
@@ -349,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
@@ -482,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':
@@ -496,4 +499,4 @@
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1