From 9c9382e6949e1366c6adb502b7aacae2c11023f7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 08 Sep 2011 09:42:04 -0400
Subject: [PATCH] Fixed: FS#1709 - Wrong message "Your hard-disk space is going full" in the "Monitor -> Show Disk Usage"
---
interface/web/sites/database_phpmyadmin.php | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php
index 84a31c6..1df863b 100644
--- a/interface/web/sites/database_phpmyadmin.php
+++ b/interface/web/sites/database_phpmyadmin.php
@@ -53,12 +53,18 @@
$serverData = $app->db->queryOneRecord(
"SELECT server_name FROM server WHERE server_id = " .
$serverId);
+
+$app->uses('getconf');
+$global_config = $app->getconf->get_global_config('sites');
/*
* We only redirect to the login-form, so there is no need, to check any rights
*/
-isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http';
-($_SERVER["SERVER_PORT"] != '80' and $http == 'https')? $serverPort = ':'.$_SERVER["SERVER_PORT"] : $serverPort = '';
-header('location:'.$http.'://'.$serverData['server_name'].$serverPort.'/phpmyadmin');
+if($global_config['phpmyadmin_url'] != '') {
+ header('Location:'.$global_config['phpmyadmin_url']);
+} else {
+ isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http';
+ header('location:' . $http . '://' . $serverData['server_name'] . '/phpmyadmin');
+}
exit;
?>
\ No newline at end of file
--
Gitblit v1.9.1