From 6b01f835cb95cbb5c0b0eb90dd1ae65b65b835fb Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Sat, 4 Jan 2014 20:46:18 +0100
Subject: Rename too short variables. Remove useless initializations. Rename
 too long variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 setup/lib/form_processing.lib.php | 12 ++++++------
 setup/lib/index.lib.php           |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'setup')

diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index a35a3b87d0..e32a2bdd1b 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -38,17 +38,17 @@ function PMA_process_formset(FormDisplay $form_display)
     $page = filter_input(INPUT_GET, 'page');
     $formset = filter_input(INPUT_GET, 'formset');
     $formset = $formset ? "{$separator}formset=$formset" : '';
-    $id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT);
-    if ($id === null && $page == 'servers') {
+    $formId = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT);
+    if ($formId === null && $page == 'servers') {
         // we've just added a new server, get its id
-        $id = $form_display->getConfigFile()->getServerCount();
+        $formId = $form_display->getConfigFile()->getServerCount();
     }
-    $id = $id ? "{$separator}id=$id" : '';
+    $formId = $formId ? "{$separator}id=$formId" : '';
     ?>
     <div class="error">
         <h4><?php echo __('Warning') ?></h4>
         <?php echo __('Submitted form contains errors') ?><br />
-        <a href="?page=<?php echo $page . $formset . $id . $separator ?>mode=revert">
+        <a href="?page=<?php echo $page . $formset . $formId . $separator ?>mode=revert">
             <?php echo __('Try to revert erroneous fields to their default values')
             ?>
         </a>
@@ -56,7 +56,7 @@ function PMA_process_formset(FormDisplay $form_display)
     <?php $form_display->displayErrors() ?>
     <a class="btn" href="index.php"><?php echo __('Ignore errors') ?></a>
     &nbsp;
-    <a class="btn" href="?page=<?php echo $page . $formset . $id
+    <a class="btn" href="?page=<?php echo $page . $formset . $formId
         . $separator ?>mode=edit"><?php echo __('Show form') ?></a>
     <?php
 }
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index c34c58785d..5d838bf8ab 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -34,16 +34,16 @@ function PMA_messagesBegin()
  * Adds a new message to message list
  *
  * @param string $type    one of: notice, error
- * @param string $id      unique message identifier
+ * @param string $msgId   unique message identifier
  * @param string $title   language string id (in $str array)
  * @param string $message message text
  *
  * @return void
  */
-function PMA_messagesSet($type, $id, $title, $message)
+function PMA_messagesSet($type, $msgId, $title, $message)
 {
-    $fresh = ! isset($_SESSION['messages'][$type][$id]);
-    $_SESSION['messages'][$type][$id] = array(
+    $fresh = ! isset($_SESSION['messages'][$type][$msgId]);
+    $_SESSION['messages'][$type][$msgId] = array(
         'fresh' => $fresh,
         'active' => true,
         'title' => $title,
-- 
cgit v1.2.3