banananetwork
/
postfixadmin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve formatting of error message; remove use of db_array (to be removed).

Browse Source
pull/229/head
David Goodwin 6 years ago
parent 2ea829eb7a
commit cdacb5697f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
config.inc.php
Unescape Escape View File

@ -104,7 +104,7 @@ $CONF['database_user'] = 'postfix';
$CONF['database_password'] = 'postfixadmin'; $CONF['database_password'] = 'postfixadmin';
$CONF['database_name'] = 'postfix'; $CONF['database_name'] = 'postfix';
// Database SSL Config // Database SSL Config (MySQLi only)
$CONF['database_use_ssl'] = false; $CONF['database_use_ssl'] = false;
$CONF['database_ssl_key'] = NULL; $CONF['database_ssl_key'] = NULL;
$CONF['database_ssl_cert'] = NULL; $CONF['database_ssl_cert'] = NULL;

12
functions.inc.php
Unescape Escape View File

@ -1494,7 +1494,7 @@ function db_connect_with_errors() {
@mysql_select_db($CONF['database_name'], $link) or $error_text .= ("<p />DEBUG INFORMATION:<br />MySQL Select Database: " . mysql_error() . "$DEBUG_TEXT"); @mysql_select_db($CONF['database_name'], $link) or $error_text .= ("<p />DEBUG INFORMATION:<br />MySQL Select Database: " . mysql_error() . "$DEBUG_TEXT");
} }
} else { } else {
$error_text .= "<p />DEBUG INFORMATION:<br />MySQL 3.x / 4.0 functions not available! (php5-mysql installed?)<br />database_type = 'mysql' in config.inc.php, are you using a different database? $DEBUG_TEXT"; $error_text .= "<p>DEBUG INFORMATION:<br />MySQL 3.x / 4.0 functions not available! (php5-mysql installed?)<br />database_type = 'mysql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
} }
} elseif ($CONF['database_type'] == "mysqli") { } elseif ($CONF['database_type'] == "mysqli") {
$is_connected = false; $is_connected = false;
@ -1505,14 +1505,14 @@ function db_connect_with_errors() {
$connected = mysqli_real_connect($link, $CONF['database_host'], $CONF['database_user'], $CONF['database_password'], $CONF['database_name'], $CONF['database_port']); $connected = mysqli_real_connect($link, $CONF['database_host'], $CONF['database_user'], $CONF['database_password'], $CONF['database_name'], $CONF['database_port']);
$is_connected = $connected; $is_connected = $connected;
} else { } else {
$error_text .= "<p />DEBUG INFORMATION:<br />MySQLi 5 functions not available! (php5-mysqli installed?)<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT"; $error_text .= "<p>DEBUG INFORMATION:<br />MySQLi 5 functions not available! (php5-mysqli installed?)<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT";
} }
} else { } else {
if (function_exists("mysqli_connect")) { if (function_exists("mysqli_connect")) {
$link = @mysqli_connect($CONF['database_host'], $CONF['database_user'], $CONF['database_password'], $CONF['database_name'], $CONF['database_port'], $CONF['database_socket']) or $error_text .= ("<p />DEBUG INFORMATION:<br />Connect: " . mysqli_connect_error() . "$DEBUG_TEXT"); $link = @mysqli_connect($CONF['database_host'], $CONF['database_user'], $CONF['database_password'], $CONF['database_name'], $CONF['database_port'], $CONF['database_socket']) or $error_text .= ("<p />DEBUG INFORMATION:<br />Connect: " . mysqli_connect_error() . "$DEBUG_TEXT");
$is_connected = $link; $is_connected = $link;
} else { } else {
$error_text .= "<p />DEBUG INFORMATION:<br />MySQL 4.1 functions not available! (php5-mysqli installed?)<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT"; $error_text .= "<p>DEBUG INFORMATION:<br />MySQL 4.1 functions not available! (php5-mysqli installed?)<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT";
} }
} }
if ($is_connected && $link instanceof mysqli) { if ($is_connected && $link instanceof mysqli) {
@ -1522,7 +1522,7 @@ function db_connect_with_errors() {
} elseif (db_sqlite()) { } elseif (db_sqlite()) {
if (class_exists("SQLite3")) { if (class_exists("SQLite3")) {
if ($CONF['database_name'] == '' || !is_dir(dirname($CONF['database_name'])) || !is_writable(dirname($CONF['database_name']))) { if ($CONF['database_name'] == '' || !is_dir(dirname($CONF['database_name'])) || !is_writable(dirname($CONF['database_name']))) {
$error_text .= ("<p />DEBUG INFORMATION<br />Connect: given database path does not exist, is not writable, or \$CONF['database_name'] is empty."); $error_text .= ("<p>DEBUG INFORMATION<br />Connect: given database path does not exist, is not writable, or \$CONF['database_name'] is empty.");
} else { } else {
$link = new SQLite3($CONF['database_name']) or $error_text .= ("<p />DEBUG INFORMATION<br />Connect: failed to connect to database. $DEBUG_TEXT"); $link = new SQLite3($CONF['database_name']) or $error_text .= ("<p />DEBUG INFORMATION<br />Connect: failed to connect to database. $DEBUG_TEXT");
if ($link instanceof SQLite3) { if ($link instanceof SQLite3) {
@ -1530,7 +1530,7 @@ function db_connect_with_errors() {
} }
} }
} else { } else {
$error_text .= "<p />DEBUG INFORMATION:<br />SQLite functions not available! (php5-sqlite installed?)<br />database_type = 'sqlite' in config.inc.php, are you using a different database? $DEBUG_TEXT"; $error_text .= "<p>DEBUG INFORMATION:<br />SQLite functions not available! (php5-sqlite installed?)<br />database_type = 'sqlite' in config.inc.php, are you using a different database? $DEBUG_TEXT";
} }
} elseif (db_pgsql()) { } elseif (db_pgsql()) {
if (function_exists("pg_pconnect")) { if (function_exists("pg_pconnect")) {
@ -1632,7 +1632,7 @@ function db_mysql() {
} }
/** /**
* returns true if PostgreSQL is used, false otherwise * @return bool true if PostgreSQL is used, false otherwise
*/ */
function db_pgsql() { function db_pgsql() {
if (Config::Read('database_type')=='pgsql') { if (Config::Read('database_type')=='pgsql') {

4
public/backup.php
Unescape Escape View File

@ -96,8 +96,8 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") {
for ($i = 0 ; $i < sizeof($tables) ; ++$i) { for ($i = 0 ; $i < sizeof($tables) ; ++$i) {
$result = db_query("SHOW CREATE TABLE " . table_by_key($tables[$i])); $result = db_query("SHOW CREATE TABLE " . table_by_key($tables[$i]));
if ($result['rows'] > 0) { if ($result['rows'] > 0) {
while ($row = db_array($result['result'])) { while ($row = db_row($result['result'])) {
fwrite($fh, "$row[1];\n\n"); fwrite($fh, "{$row[1]};\n\n");
} }
} }
} }

Write Preview
Loading…
Cancel
Save