From 69ba0bfef2f4ebd29c8a6148a4763c075a8f4db0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Aug 2013 10:25:02 -0400
Subject: [PATCH] Updated german language files.
---
interface/web/sites/database_phpmyadmin.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php
index 51b8820..e77c5df 100644
--- a/interface/web/sites/database_phpmyadmin.php
+++ b/interface/web/sites/database_phpmyadmin.php
@@ -45,7 +45,7 @@
/*
* Get the data to connect to the database
*/
-$dbData = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = " . $databaseId);
+$dbData = $app->db->queryOneRecord("SELECT server_id, database_name FROM web_database WHERE database_id = " . $databaseId);
$serverId = $app->functions->intval($dbData['server_id']);
if ($serverId == 0){
die ("No DB-Server found!");
@@ -64,14 +64,14 @@
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);
+ $phpmyadmin_url = str_replace(array('[SERVERNAME]', '[DATABASENAME]'),array($serverData['server_name'], $dbData['database_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');
+ header('Location: http://' . $serverData['server_name'] . ':8081/phpmyadmin');
} else {
- header('location:' . $http . '://' . $serverData['server_name'] . '/phpmyadmin');
+ header('Location: ' . $http . '://' . $serverData['server_name'] . '/phpmyadmin');
}
}
exit;
--
Gitblit v1.9.1