Merged revisions 3596-3670 from 3.0.5 stable branch.

tbrehm

2012-11-14 bfcdef6bc91753cb2044e3626f522b5b1aec129f

 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,7 +64,7 @@
 
if($global_config['phpmyadmin_url'] != '') {
   $phpmyadmin_url = $global_config['phpmyadmin_url'];
   $phpmyadmin_url = str_replace('[SERVERNAME]',$serverData['server_name'],$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';