From db5aa62b7faa2685f29215d4d08e13d28fd481a1 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Mon, 15 Dec 2008 04:22:20 -0500 Subject: [PATCH] - Added a global system settings storage in ini format. - Updated the user and database prefixes to use this storage. --- interface/web/sites/database_phpmyadmin.php | 43 +++++++++---------------------------------- 1 files changed, 9 insertions(+), 34 deletions(-) diff --git a/interface/web/sites/database_phpmyadmin.php b/interface/web/sites/database_phpmyadmin.php index eeb840f..db23582 100644 --- a/interface/web/sites/database_phpmyadmin.php +++ b/interface/web/sites/database_phpmyadmin.php @@ -34,7 +34,9 @@ //* Check permissions for module $app->auth->check_module_permissions('sites'); -/* get the id of the database (must be int!) */ +/* + * get the id of the database (must be int!) + */ if (!isset($_GET['id'])){ die ("No DB selected!"); } @@ -43,47 +45,20 @@ /* * Get the data to connect to the database */ -$dbData = $app->dbmaster->queryOneRecord( - "SELECT sys_userid, sys_groupid, sys_perm_user, sys_perm_group, server_id, database_name, database_user, database_password FROM web_database WHERE database_id = " . - $databaseId); - -/* - * We also need the data of the server - */ +$dbData = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = " . $databaseId); $serverId = intval($dbData['server_id']); if ($serverId == 0){ die ("No DB-Server found!"); } - -$serverData = $app->dbmaster->queryOneRecord( +$serverData = $app->db->queryOneRecord( "SELECT server_name FROM server WHERE server_id = " . $serverId); /* - * Check if the user has the right to open phpmyadmin with this database - * (we will check only users, not admins) + * We only redirect to the login-form, so there is no need, to check any rights */ -if($_SESSION["s"]["user"]["typ"] == 'user') { - /* Get the group of the client */ - $client_group_id = $_SESSION["s"]["user"]["default_group"]; - /* compare both */ - if ($dbData['sys_groupid'] != $client_group_id){ - die ("You don't have the right to access this db!"); - } -} +isset($_SERVER['HTTPS'])? $http = 'https' : $http = 'http'; +header('location:' . $http . '://' . $serverData['server_name'] . '/phpmyadmin'); +exit; -/* - * Now generate the login-Form - */ -echo ' -starting phpMyAdmin...<br> -<form method="post" action="http://' . $serverData['server_name'] . '/phpmyadmin/index.php" name="login_form" target="_top" style="visibility:hidden"> - <input type="text" name="pma_username" id="input_username" value="' . $dbData['database_user'] . '" /> - <input type="password" name="pma_password" id="input_password" value="' . $dbData['database_password'] . '" size="24" class="textfield" /> -</form> -<script type="text/javascript" language="javascript"> -<!-- -document.forms["login_form"].submit(); -//--> -</script>'; ?> \ No newline at end of file -- Gitblit v1.9.1