From 7cb39d038a59c2322f2ee8bbd56ccbcb05bc8c51 Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Sat, 5 May 2012 23:18:03 +0200
Subject: [PATCH 1/4] remove unused variables

---
 libraries/schema/Export_Relation_Schema.class.php |  1 -
 libraries/schema/User_Schema.class.php            | 11 +++++------
 libraries/schema/Visio_Relation_Schema.class.php  |  5 +----
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php
index 39483a4402..e4ccef1b25 100644
--- a/libraries/schema/Export_Relation_Schema.class.php
+++ b/libraries/schema/Export_Relation_Schema.class.php
@@ -224,7 +224,6 @@ class PMA_Export_Relation_Schema
      */
     function dieSchema($pageNumber, $type = '', $error_message = '')
     {
-        global $cfg;
         global $db;
 
         include_once './libraries/header.inc.php';
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index e2922b46a1..fa4637ffb8 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -284,7 +284,7 @@ class PMA_User_Schema
 
             $i = 0;
             $odd_row = true;
-            foreach ($array_sh_page as $dummy_sh_page => $sh_page) {
+            foreach ($array_sh_page as $sh_page) {
                 $_mtab            =  $sh_page['table_name'];
                 $tabExist[$_mtab] =  false;
                 echo "\n" . '    <tr class="noclick ';
@@ -372,7 +372,7 @@ class PMA_User_Schema
 
     public function displaySchemaGenerationOptions()
     {
-        global $cfg,$pmaThemeImage,$db,$test_rs,$chpage;
+        global $cfg,$db,$test_rs,$chpage;
         ?>
         <form method="post" action="schema_export.php">
             <fieldset>
@@ -434,7 +434,7 @@ class PMA_User_Schema
             <br />
             <select name="paper" id="paper_opt" onchange="refreshDragOption('pdflayout');">
                 <?php
-                foreach ($cfg['PDFPageSizes'] as $key => $val) {
+                foreach ($cfg['PDFPageSizes'] as $val) {
                         echo '<option value="' . $val . '"';
                         if ($val == $cfg['PDFDefaultPageSize']) {
                             echo ' selected="selected"';
@@ -465,7 +465,6 @@ class PMA_User_Schema
     */
     private function _deleteTables($db, $chpage, $tabExist)
     {
-        global $table;
         $_strtrans  = '';
         $_strname   = '';
         $shoot      = false;
@@ -516,7 +515,7 @@ class PMA_User_Schema
         $draginit2 = '';
         $reset_draginit = '';
         $i = 0;
-        foreach ($array_sh_page as $key => $temp_sh_page) {
+        foreach ($array_sh_page as $temp_sh_page) {
             $drag_x = $temp_sh_page['x'];
             $drag_y = $temp_sh_page['y'];
 
@@ -617,7 +616,7 @@ class PMA_User_Schema
         PMA_DBI_select_db($db);
 
         include "libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php";
-        $obj_schema = eval("new PMA_" . ucfirst($export_type) . "_Relation_Schema();");
+        eval("new PMA_" . ucfirst($export_type) . "_Relation_Schema();");
     }
 
     /**
diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php
index bb4f072052..e4f1a0246e 100644
--- a/libraries/schema/Visio_Relation_Schema.class.php
+++ b/libraries/schema/Visio_Relation_Schema.class.php
@@ -315,10 +315,10 @@ class Table_Stats
      *
      * @return void
      * @see PMA_VISIO
+     * @todo function does nothing, what should it do?
      */
     private function _setWidthTable($font,$fontSize)
     {
-        global $visio;
     }
 
     /**
@@ -348,7 +348,6 @@ class Table_Stats
      */
     public function tableDraw($showColor)
     {
-        global $visio;
         //echo $this->_tableName.'<br />';
 
         foreach ($this->fields as $field) {
@@ -473,8 +472,6 @@ class Relation_Stats
      */
     public function relationDraw($changeColor)
     {
-        global $visio;
-
         if ($changeColor) {
             $listOfColors = array(
                 'red',

From 6bf46bc539f68bbb164003ce359095e8f73c15c1 Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Sat, 5 May 2012 23:26:43 +0200
Subject: [PATCH 2/4] cleanup whitespace

---
 libraries/import/mediawiki.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/import/mediawiki.php b/libraries/import/mediawiki.php
index bdfcd71b55..7f2fe50332 100644
--- a/libraries/import/mediawiki.php
+++ b/libraries/import/mediawiki.php
@@ -317,7 +317,7 @@ function PMA_setTableName(&$table_name)
  */
 function PMA_setTableHeaders(&$table_headers, $table_row)
 {
-    if ( empty($table_headers) ) {
+    if (empty($table_headers)) {
         // The first table row should contain the number of columns
         // If they are not set, generic names will be given (COL 1, COL 2, etc)
         $num_cols = count($table_row);
@@ -486,4 +486,4 @@ function PMA_explodeMarkup($text)
 
     return $items;
 }
-?>
\ No newline at end of file
+?>

From 2889689dba13b9cf3879e715b33901badd098926 Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Sun, 6 May 2012 00:09:35 +0200
Subject: [PATCH 3/4] fix typo

---
 libraries/config/ConfigFile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php
index 4a02c467b1..64bc72d7f4 100644
--- a/libraries/config/ConfigFile.class.php
+++ b/libraries/config/ConfigFile.class.php
@@ -213,7 +213,7 @@ class ConfigFile
         // value
         if (!isset($this->persistKeys[$canonical_path])) {
             $default_value = $this->getDefault($canonical_path);
-            // we need oryginal config values not overwritten by user
+            // we need original config values not overwritten by user
             // preferences to allow for overwriting options set in
             // config.inc.php with default values
             $instance_default_value = PMA_array_read(

From 3bfee1e5b7016aa657dd37c44e7283a48b906282 Mon Sep 17 00:00:00 2001
From: Dieter Adriaenssens <ruleant@users.sourceforge.net>
Date: Sun, 6 May 2012 00:10:42 +0200
Subject: [PATCH 4/4] remove unused variables

---
 libraries/export/htmlword.php                          | 2 --
 libraries/export/sql.php                               | 1 -
 libraries/export/texytext.php                          | 2 --
 libraries/export/xml.php                               | 2 --
 libraries/import/mediawiki.php                         | 2 +-
 libraries/rte/rte_routines.lib.php                     | 4 ++--
 libraries/transformations/text_plain__external.inc.php | 2 +-
 7 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index e3a114857a..ccb41d1a0f 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -240,8 +240,6 @@ if (isset($plugin_list)) {
     function PMA_getTableDefStandIn($db, $view, $crlf)
     {
         $schema_insert = '<table class="width100" cellspacing="1">';
-
-        $columns_cnt = 4;
         $schema_insert .= '<tr class="print-category">';
         $schema_insert .= '<th class="print">'
             . __('Column')
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 5cdcf96075..5fc892eca0 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -1185,7 +1185,6 @@ if (isset($plugin_list)) {
     ) {
         global $cfgRelation;
         global $sql_backquotes;
-        global $sql_constraints;
 
         $schema_create = '';
 
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index cc68d3ecbb..fd53b05a11 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -234,8 +234,6 @@ if (isset($plugin_list)) {
          * Displays the table structure
          */
 
-        $columns_cnt = 4;
-
         $text_output .= "|------\n";
         $text_output .= '|' . __('Column');
         $text_output .= '|' . __('Type');
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index c318567302..7192d8c082 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -267,7 +267,6 @@ if (isset($plugin_list)) {
                         $head .= '            </pma:function>' . $crlf;
                     }
 
-                    unset($create_func);
                     unset($function);
                     unset($functions);
                 }
@@ -293,7 +292,6 @@ if (isset($plugin_list)) {
                         $head .= '            </pma:procedure>' . $crlf;
                     }
 
-                    unset($create_proc);
                     unset($procedure);
                     unset($procedures);
                 }
diff --git a/libraries/import/mediawiki.php b/libraries/import/mediawiki.php
index 7f2fe50332..6a5bd9005a 100644
--- a/libraries/import/mediawiki.php
+++ b/libraries/import/mediawiki.php
@@ -299,7 +299,7 @@ function PMA_importDataOneTable ($table)
  */
 function PMA_setTableName(&$table_name)
 {
-    if (empty($table_name) && strlen($db)) {
+    if (empty($table_name)) {
         $result = PMA_DBI_fetch_result('SHOW TABLES');
         // todo check if the name below already exists
         $table_name = 'TABLE '.(count($result) + 1);
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 1ee9b31aa3..f6b324ed39 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -984,7 +984,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
  */
 function PMA_RTN_getQueryFromRequest()
 {
-    global $_REQUEST, $cfg, $errors, $param_sqldataaccess, $param_directions;
+    global $_REQUEST, $errors, $param_sqldataaccess, $param_directions;
 
     $_REQUEST['item_type'] = isset($_REQUEST['item_type']) ? $_REQUEST['item_type'] : '';
     $column_types = $GLOBALS['PMA_Types']->getColumns();
@@ -1134,7 +1134,7 @@ function PMA_RTN_getQueryFromRequest()
  */
 function PMA_RTN_handleExecute()
 {
-    global $_GET, $_POST, $_REQUEST, $GLOBALS, $db, $cfg;
+    global $_GET, $_POST, $_REQUEST, $GLOBALS, $db;
 
     /**
      * Handle all user requests other than the default of listing routines
diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php
index 1d535a547b..0f013bc56f 100644
--- a/libraries/transformations/text_plain__external.inc.php
+++ b/libraries/transformations/text_plain__external.inc.php
@@ -93,7 +93,7 @@ function PMA_transformation_text_plain__external($buffer, $options = array(), $m
         }
         fclose($pipes[1]);
         // we don't currently use the return value
-        $return_value = proc_close($process);
+        proc_close($process);
     }
 
     if ($options[2] == 1 || $options[2] == '2') {