From 9287065574ef7694af5cf731b719ef0d5a3ae4cc Mon Sep 17 00:00:00 2001
From: tekati <tekati@ispconfig3>
Date: Mon, 12 Jul 2010 01:06:35 -0400
Subject: [PATCH] - Strange fix and only temporary will figure out the root cause. - I had to reorder the variables in language_list.htm for the link URL's - Moved the lang_file var to the beginning of the URL to make it work. - For some strange reason if you have &lang_file in the url it changes it to <_file.
---
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