From 75bde1b8b1d46a2a5e5c20d1c22d362b2b8510dd Mon Sep 17 00:00:00 2001
From: wyrie <wyrie@ispconfig3>
Date: Mon, 11 Oct 2010 04:55:12 -0400
Subject: [PATCH] Helper script Bug fix updated layman path • Bug fix include soap flag when installing php for web • Bug fix use flags duplicated in is_package_installed • Bug fix checking for mysql emerged line 543 • Bug fix substring match for quota package • Improved use flag detection • Moved layman install to meta_web as it's only required for jailkit • Added prompt for courier or dovecot • Added baselayout check • Added apache module checks and configuration • Added packages awstats & mod_ruby
---
interface/web/sites/database_phpmyadmin.php | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php
index baf547d..1df863b 100644
--- a/interface/web/sites/database_phpmyadmin.php
+++ b/interface/web/sites/database_phpmyadmin.php
@@ -53,11 +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