From 9de10059740dec45546107d82f1f278ba3497f58 Mon Sep 17 00:00:00 2001
From: Garvin Hicking <me@supergarv.de>
Date: Tue, 27 Apr 2004 09:12:26 +0000
Subject: [PATCH] bug #942356, missing localisation of multi row edit feature

---
 ChangeLog                     |  2 ++
 libraries/display_tbl.lib.php |  6 +++---
 tbl_row_delete.php            | 40 ++++++++++++++++++++++++-----------
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe7a3dbf2..664c357b5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
       calendar.
 
 2004-04-27 Garvin Hicking <pma@supergarv.de>
+    * libraries/display_tbl.lib.php, tbl_row_delete: Bug #942356,
+      missing localization for multi-row edit/delete/export feature.
     * footer.inc.php: Fixed bug #942316 - Consistent window layout for
       query window.
     * left.php: Fixed bug #942374 - Undefined indizes in left frame
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index b89c0a67d..67cf5fa17 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1816,9 +1816,9 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             }
             echo "\n";
         } else {
-            echo '                    <input type="submit" name="submit_mult" value="row_edit" title="' . $GLOBALS['strEdit'] . '" />' . "\n";
-            echo '&nbsp;<input type="submit" name="submit_mult" value="row_delete" title="' . $delete_text . '" />' . "\n";
-            echo '&nbsp;<input type="submit" name="submit_mult" value="row_export" title="' . $GLOBALS['strExport'] . '" />' . "\n";
+            echo '                    <input type="submit" name="submit_mult" value="' . htmlspecialchars($GLOBALS['strEdit']) . '" title="' . $GLOBALS['strEdit'] . '" />' . "\n";
+            echo '&nbsp;<input type="submit" name="submit_mult" value="' . htmlspecialchars($delete_text) . '" title="' . $delete_text . '" />' . "\n";
+            echo '&nbsp;<input type="submit" name="submit_mult" value="' . htmlspecialchars($GLOBALS['strExport']) . '" title="' . $GLOBALS['strExport'] . '" />' . "\n";
         }
         echo '<input type="hidden" name="sql_query" value="' . $encoded_sql_query . '" />' . "\n";
         echo '<input type="hidden" name="pos" value="' . $pos . '" />' . "\n";
diff --git a/tbl_row_delete.php b/tbl_row_delete.php
index f90ed4090..0a9dcda64 100644
--- a/tbl_row_delete.php
+++ b/tbl_row_delete.php
@@ -24,6 +24,22 @@ if (isset($mult_btn)) {
     $submit_mult = 'row_delete';
 }
 
+switch($submit_mult) {
+    case $GLOBALS['strExport']:
+        $submit_mult = 'row_export';
+        break;
+
+    case $GLOBALS['strDelete']:
+    case $GLOBALS['strKill']:
+        $submit_mult = 'row_delete';
+        break;
+
+    default:
+    case $GLOBALS['strEdit']:
+        $submit_mult = 'row_edit';
+        break;
+}
+
 if ($submit_mult == 'row_edit') {
     $js_to_run = 'tbl_change.js';
 }
@@ -44,16 +60,16 @@ if (!empty($submit_mult)) {
                 foreach($rows_to_delete AS $i_primary_key => $del_query) {
                     $primary_key[] = urldecode($i_primary_key);
                 }
-                
+
                 include './tbl_change.php';
             }
             break;
-        
+
         case 'row_export':
             if (isset($rows_to_delete) && is_array($rows_to_delete)) {
                 // Needed to allow SQL export
                 $single_table = TRUE;
-                
+
                 $primary_key = array();
                 $sql_query = urldecode($sql_query);
                 // garvin: As we got the fields to be edited from the 'rows_to_delete' checkbox, we use the index of it as the
@@ -61,11 +77,11 @@ if (!empty($submit_mult)) {
                 foreach($rows_to_delete AS $i_primary_key => $del_query) {
                     $primary_key[] = urldecode($i_primary_key);
                 }
-                
+
                 include './tbl_properties_export.php';
             }
             break;
-        
+
         case 'row_delete':
         default:
             if ((isset($rows_to_delete) && is_array($rows_to_delete))
@@ -81,8 +97,8 @@ if (!empty($submit_mult)) {
             }
             $url_query = PMA_generate_common_url($db, $table)
                        . '&amp;goto=tbl_properties.php';
-            
-            
+
+
             /**
              * Show result of multi submit operation
              */
@@ -90,26 +106,26 @@ if (!empty($submit_mult)) {
                 || isset($mult_btn)) {
                 PMA_showMessage($strSuccess);
             }
-            
+
             if (isset($original_sql_query)) {
                 $sql_query = urldecode($original_sql_query);
             }
-            
+
             if (isset($original_url_query)) {
                 $url_query = $original_url_query;
             }
-            
+
             if (isset($original_pos)) {
                 $pos       = $original_pos;
             }
-            
+
             // this is because sql.php could call tbl_properties_structure
             // which would think it needs to call mult_submits.inc.php:
             unset($submit_mult);
             unset($mult_btn);
 
             require('./sql.php');
-            
+
             /**
              * Displays the footer
              */