From bf420e07b6a8ed6d0a42cdaef5f3f70ad58ce7fc Mon Sep 17 00:00:00 2001
From: marknl <marknl@ispconfig3>
Date: Fri, 26 Aug 2011 09:17:19 -0400
Subject: [PATCH] FS#1516 - Text color for input fields
---
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 db23582..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';
-header('location:' . $http . '://' . $serverData['server_name'] . '/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