From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 14 Nov 2013 09:01:22 -0500 Subject: [PATCH] Cleaning up code to match coding guidelines --- interface/web/sites/database_phpmyadmin.php | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php index e77c5df..5e640df 100644 --- a/interface/web/sites/database_phpmyadmin.php +++ b/interface/web/sites/database_phpmyadmin.php @@ -28,8 +28,8 @@ */ -require_once('../../lib/config.inc.php'); -require_once('../../lib/app.inc.php'); +require_once '../../lib/config.inc.php'; +require_once '../../lib/app.inc.php'; //* Check permissions for module $app->auth->check_module_permissions('sites'); @@ -38,7 +38,7 @@ * get the id of the database (must be int!) */ if (!isset($_GET['id'])){ - die ("No DB selected!"); + die ("No DB selected!"); } $databaseId = $app->functions->intval($_GET['id']); @@ -48,23 +48,23 @@ $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!"); + die ("No DB-Server found!"); } $serverData = $app->db->queryOneRecord( - "SELECT server_name FROM server WHERE server_id = " . - $serverId); - + "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'); +$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 */ - + if($global_config['phpmyadmin_url'] != '') { $phpmyadmin_url = $global_config['phpmyadmin_url']; - $phpmyadmin_url = str_replace(array('[SERVERNAME]', '[DATABASENAME]'),array($serverData['server_name'], $dbData['database_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'; @@ -75,4 +75,4 @@ } } exit; -?> \ No newline at end of file +?> -- Gitblit v1.9.1