gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-05-15 03:56:00 +02:00
commit 37cefd7a85
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog
- bug Invalid value for CURLOPT_SSL_VERIFYPEER
- bug #4367 Import status infinite loop
- bug #4902 Designer: Loading does not work
- bug #4904 Setup: Overview > Display does not work
4.4.6.1 (2015-05-13)
- bug #4899 [security] CSRF vulnerability in setup

10
setup/config.php
View File

@ -32,7 +32,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
$GLOBALS['ConfigFile']->resetConfigData();
// drop post data
header('HTTP/1.1 303 See Other');
header('Location: index.php');
header('Location: index.php' . PMA_URL_getCommon());
exit;
} elseif (PMA_ifSetOr($_POST['submit_download'], '')) {
//
@ -50,7 +50,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
ConfigGenerator::getConfigFile($GLOBALS['ConfigFile'])
);
header('HTTP/1.1 303 See Other');
header('Location: index.php?action_done=config_saved');
header('Location: index.php' . PMA_URL_getCommon() . '&action_done=config_saved');
exit;
} elseif (PMA_ifSetOr($_POST['submit_load'], '')) {
//
@ -60,7 +60,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
include_once $config_file_path;
$GLOBALS['ConfigFile']->setConfigData($cfg);
header('HTTP/1.1 303 See Other');
header('Location: index.php');
header('Location: index.php' . PMA_URL_getCommon());
exit;
} elseif (PMA_ifSetOr($_POST['submit_delete'], '')) {
//
@ -68,14 +68,14 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) {
//
@unlink($config_file_path);
header('HTTP/1.1 303 See Other');
header('Location: index.php');
header('Location: index.php' . PMA_URL_getCommon());
exit;
} else {
//
// Show generated config file in a <textarea>
//
header('HTTP/1.1 303 See Other');
header('Location: index.php?page=config');
header('Location: index.php' . PMA_URL_getCommon() . '&page=config');
exit;
}
?>

2
setup/frames/servers.inc.php
View File

@ -31,7 +31,7 @@ if ($mode == 'edit' && $server_exists) {
. ' <small>(' . htmlspecialchars($cf->getServerDSN($id)) . ')</small>';
} elseif ($mode == 'remove' && $server_exists) {
$cf->removeServer($id);
header('Location: index.php');
header('Location: index.php' . PMA_URL_getCommon());
exit;
} elseif ($mode == 'revert' && $server_exists) {
// handled by process_formset()

2
setup/lib/form_processing.lib.php
View File

@ -72,7 +72,7 @@ function PMA_generateHeader303()
{
// drop post data
header('HTTP/1.1 303 See Other');
header('Location: index.php');
header('Location: index.php' . PMA_URL_getCommon());
if (!defined('TESTSUITE')) {
exit;