From 8cd7c28c84472dc8196dd93e16325efb3048bf9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 3 Oct 2006 13:11:22 +0000
Subject: [PATCH] Sync token name, move it's definition to one place (bug
 #1569612).

---
 ChangeLog         |  5 +++++
 scripts/setup.php | 39 ++++++++++++++++++++++++---------------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbdc09918..05b9964f0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+
+2006-10-03 Michal Čihař  <michal@cihar.com>
+    * scripts/setup.php: Sync token name, move it's definition to one place
+      (bug #1569612).
+
 2006-10-01 Marc Delisle  <lem9@users.sourceforge.net>
     ### 2.9.0.1 released from MAINT_2_9_0
     * libraries/database_interface.lib.php: bug #1568341, 
diff --git a/scripts/setup.php b/scripts/setup.php
index c5f724e8a..1f16951c0 100644
--- a/scripts/setup.php
+++ b/scripts/setup.php
@@ -304,6 +304,15 @@ function get_hidden_cfg() {
     return '<input type="hidden" name="configuration" value="' . htmlspecialchars(serialize($configuration)) . '" />' . "\n";
 }
 
+/**
+ * Returns needed hidden input for forms.
+ *
+ * @return  string HTML with hidden inputs
+ */
+function get_hidden_inputs() {
+    return '<input type="hidden" name="token" value="' . $_SESSION[' PMA_token '] . '" />';
+}
+
 /**
  * Creates form for some action
  *
@@ -316,7 +325,7 @@ function get_hidden_cfg() {
 function get_action($name, $title, $added = '', $enabled = TRUE) {
     $ret = '';
     $ret .= '<form class="action" method="post" action="">';
-    $ret .= '<input type="hidden" name="token" value="' . $_SESSION['PMA_token'] . '" />';
+    $ret .= get_hidden_inputs();
     $ret .= '<input type="hidden" name="action" value="' . $name . '" />';
     $ret .= $added;
     $ret .= '<input type="submit" value="' . $title . '"';
@@ -342,7 +351,7 @@ function get_action($name, $title, $added = '', $enabled = TRUE) {
 function get_url_action($url, $title, $params = array()) {
     $ret = '';
     $ret .= '<form class="action" method="get" action="' . $url . '" target="_blank">';
-    $ret .= '<input type="hidden" name="token" value="' . $_SESSION['PMA_token'] . '" />';
+    $ret .= get_hidden_inputs();
     foreach ($params as $key => $val) {
         $ret .= '<input type="hidden" name="' . $key . '" value="' . $val . '" />';
     }
@@ -751,7 +760,7 @@ function show_config_form($list, $legend, $help, $defaults = array(), $save = ''
 function show_security_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_security_real" />
     <?php
         echo get_hidden_cfg();
@@ -782,7 +791,7 @@ function show_security_form($defaults = array()) {
 function show_manual_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_manual_real" />
     <?php
         echo get_hidden_cfg();
@@ -809,7 +818,7 @@ function show_charset_form($defaults = array()) {
     global $PMA_Config_Setup;
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_charset_real" />
     <?php
         echo get_hidden_cfg();
@@ -837,7 +846,7 @@ function show_charset_form($defaults = array()) {
 function show_extensions_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_extensions_real" />
     <?php
         echo get_hidden_cfg();
@@ -863,7 +872,7 @@ function show_relation_form($defaults = array()) {
     global $PMA_Config_Setup;
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_relation_real" />
     <?php
         echo get_hidden_cfg();
@@ -891,7 +900,7 @@ function show_relation_form($defaults = array()) {
 function show_upload_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_upload_real" />
     <?php
         echo get_hidden_cfg();
@@ -918,7 +927,7 @@ function show_upload_form($defaults = array()) {
 function show_server_form($defaults = array(), $number = FALSE) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="addserver_real" />
     <?php
         echo get_hidden_cfg();
@@ -965,7 +974,7 @@ function show_server_form($defaults = array(), $number = FALSE) {
 function show_left_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_left_real" />
     <?php
         echo get_hidden_cfg();
@@ -997,7 +1006,7 @@ function show_left_form($defaults = array()) {
 function show_tabs_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_tabs_real" />
     <?php
         echo get_hidden_cfg();
@@ -1025,7 +1034,7 @@ function show_tabs_form($defaults = array()) {
 function show_icons_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_icons_real" />
     <?php
         echo get_hidden_cfg();
@@ -1054,7 +1063,7 @@ function show_icons_form($defaults = array()) {
 function show_browse_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_browse_real" />
     <?php
         echo get_hidden_cfg();
@@ -1084,7 +1093,7 @@ function show_browse_form($defaults = array()) {
 function show_edit_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_edit_real" />
     <?php
         echo get_hidden_cfg();
@@ -1118,7 +1127,7 @@ function show_edit_form($defaults = array()) {
 function show_window_form($defaults = array()) {
     ?>
 <form method="post" action="">
-    <input type="hidden" name="token" value="<?php echo $_SESSION['PMA_token']; ?>" />
+    <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_window_real" />
     <?php
         echo get_hidden_cfg();