From 2cb656cf7af0d018c36e36eccb53240a1dd384af Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 05 Sep 2012 04:52:45 -0400
Subject: [PATCH] Fixed: "old" style folder protection without comment lines in htaccess (3.0.4.6) get removed, too.
---
interface/web/sites/database_phpmyadmin.php | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php
index baf547d..e0ab324 100644
--- a/interface/web/sites/database_phpmyadmin.php
+++ b/interface/web/sites/database_phpmyadmin.php
@@ -53,11 +53,26 @@
$serverData = $app->db->queryOneRecord(
"SELECT server_name FROM server WHERE server_id = " .
$serverId);
+
+$app->uses('getconf');
+$global_config = $app->getconf->get_global_config('sites');
+$web_config = $app->getconf->get_server_config($serverId,'web');
/*
* 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'] != '') {
+ $phpmyadmin_url = $global_config['phpmyadmin_url'];
+ $phpmyadmin_url = str_replace('[SERVERNAME]',$serverData['server_name'],$phpmyadmin_url);
+ header('Location:'.$phpmyadmin_url);
+} else {
+ isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http';
+ if($web_config['server_type'] == 'nginx') {
+ header('location:' . $http . '://' . $serverData['server_name'] . ':8081/phpmyadmin');
+ } else {
+ header('location:' . $http . '://' . $serverData['server_name'] . '/phpmyadmin');
+ }
+}
exit;
?>
\ No newline at end of file
--
Gitblit v1.9.1