Editing of multiple records at once.

This is a hook-in to the 'delete multiple records' and basically just wraps all data in some kind of Ueber-Array. It should be compatible with single records editing. I tried various combinations already and it seems to work. But this can heavily break stuff, so expect this to be EXPERIMENTAL! We should only release RC1 after this has been thoroughly tested (will do so in the next days by myself).

What maybe needs fixing is the way of evaluating $goto/ $err_url and similars. As I am not much into that redirection stuff, maybe one can see if I did something wrong in the area.

ChangeLog

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-12-04 Garvin Hicking <grinch@supergarv.de>
+    * browse_foreigner.php, mult_submits.inc.php, tbl_change.php,
+      tbl_replace.php, tbl_replace_fields.php, tbl_row_delete,
+      libraries/display_tbl.lib.php, libraries/display_tbl_links.lib.php:
+      Multi row edit via checkboxes in browse mode is now available.
+      This means, you can edit multiple records at once now.
+
 2003-12-02 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php: the constant used to check
       if the transformation function is included no longer exists

browse_foreigners.php

@@ -43,8 +43,8 @@ PMA_setFontSizes();
     <script type="text/javascript" language="javascript">
     self.focus();
     function formupdate(field, key) {
-        if (opener && opener.document && opener.document.insertForm && opener.document.insertForm.elements['field_' + field + '[]']) {
+        if (opener && opener.document && opener.document.insertForm && opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . $pk . ']' : ''); ?>[]']) {
-            opener.document.insertForm.elements['field_' + field + '[]'].value = key;
+            opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . $pk . ']' : ''); ?>[]'].value = key;
             self.close();
         } else {
             alert('<?php echo PMA_jsFormat($strWindowNotFound); ?>');
@@ -78,6 +78,16 @@ require('./libraries/get_foreign.lib.php');
 <form action="browse_foreigners.php" method="post">
 <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
 <input type="hidden" name="field" value="<?php echo urlencode($field); ?>" />
+<?php
+if (isset($pk)) {
+    $pk_uri = '&amp;pk=' . $pk;
+?>
+<input type="hidden" name="pk" value="<?php echo $pk; ?>" />
+<?php
+} else {
+    $pk_uri = '';
+}
+?>
 
 <table width="100%">
 <?php
@@ -93,7 +103,7 @@ $nbTotalPage = @ceil($the_total / $session_max_rows);
 
 if ($the_total > $per_page) {
     $gotopage = '<br />' . $GLOBALS['strPageNumber']
-              . '<select name="goToPage" onChange="goToUrl(this, \'browse_foreigners.php?field=' . urlencode($field) . '&amp;' . PMA_generate_common_url($db, $table) . '&amp;\');">';
+              . '<select name="goToPage" onChange="goToUrl(this, \'browse_foreigners.php?field=' . urlencode($field) . '&amp;' . PMA_generate_common_url($db, $table) . $pk_uri . '\');">';
     if ($nbTotalPage < 200) {
         $firstPage = 1;
         $lastPage  = $nbTotalPage;

libraries/display_tbl.lib.php

@@ -1488,7 +1488,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
 
         if (!empty($del_url)) {
             $vertical_display['row_delete'][$row_no] .= '    <td align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
-                                                     .  '        <input type="checkbox" name="rows_to_delete[]" value="' . $del_query . '" />' . "\n"
+                                                     .  '        <input type="checkbox" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
                                                      .  '    </td>' . "\n";
         } else {
             unset($vertical_display['row_delete'][$row_no]);
@@ -1862,15 +1862,22 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             /* Opera has trouble with <input type="image"> */
             /* IE has trouble with <button> */
             if (PMA_USR_BROWSER_AGENT != 'IE') {
-                echo '                    <button class="mult_submit" type="submit" name="submit_mult" value="row_delete" title="' . $delete_text . '">' . "\n"
+                echo '                    <button class="mult_submit" type="submit" name="submit_mult" value="row_edit" title="' . $GLOBALS['strEdit'] . '">' . "\n"
+                   . '<img src="./images/button_edit.png" title="' . $GLOBALS['strEdit'] . '" alt="' . $GLOBALS['strEdit'] . '" width="11" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strEdit'] : '') . "\n"
+                   . '</button>';
+
+                echo '&nbsp;<button class="mult_submit" type="submit" name="submit_mult" value="row_delete" title="' . $delete_text . '">' . "\n"
                    . '<img src="./images/button_drop.png" title="' . $delete_text . '" alt="' . $delete_text . '" width="11" height="13" />' . (($propicon == 'both') ? '&nbsp;' . $delete_text : '') . "\n"
                    . '</button>';
+
             } else {
-                echo '                    <input type="image" name="submit_mult" value="row_delete" title="' . $delete_text . '" src="./images/button_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $delete_text : '');
+                echo '                    <input type="image" name="submit_mult_edit" value="row_edit" title="' . $GLOBALS['strEdit'] . '" src="./images/button_edit.png" />' . (($propicon == 'both') ? '&nbsp;' . $GLOBALS['strEdit'] : '');
+                echo '&nbsp;<input type="image" name="submit_mult" value="row_delete" title="' . $delete_text . '" src="./images/button_drop.png" />' . (($propicon == 'both') ? '&nbsp;' . $delete_text : '');
             }
             echo "\n";
         } else {
-            echo '                    <input type="submit" name="submit_mult" value="row_delete" title="' . $delete_text . '" />' . "\n";
+            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 '<input type="hidden" name="sql_query" value="' . $sql_query . '" />' . "\n";
         echo '<input type="hidden" name="pos" value="' . $pos . '" />' . "\n";

libraries/display_tbl_links.lib.php

@@ -4,7 +4,7 @@
 
 if (!empty($del_url)) {
     echo '    <td align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
-       . '        <input type="checkbox" name="rows_to_delete[]" value="' . $del_query . '" />' . "\n"
+       . '        <input type="checkbox" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
        . '    </td>' . "\n";
 }
 if (!empty($edit_url)) {

mult_submits.inc.php

@@ -86,21 +86,23 @@ if (!empty($submit_mult) && !empty($what)) {
     // Builds the query
     $full_query     = '';
     $selected_cnt   = count($selected);
-    for ($i = 0; $i < $selected_cnt; $i++) {
+    $i = 0;
+    foreach($selected AS $idx => $sval) {
+        $i++;
         switch ($what) {
             case 'row_delete':
-                $full_query .= htmlspecialchars(urldecode($selected[$i]))
+                $full_query .= htmlspecialchars(urldecode($sval))
                             . ';<br />';
                 break;
             case 'drop_db':
                 $full_query .= 'DROP DATABASE '
-                            . PMA_backquote(htmlspecialchars(urldecode($selected[$i])))
+                            . PMA_backquote(htmlspecialchars(urldecode($sval)))
                             . ';<br />';
                 break;
 
             case 'drop_tbl':
                 $full_query .= (empty($full_query) ? 'DROP TABLE ' : ', ')
-                            . PMA_backquote(htmlspecialchars(urldecode($selected[$i])))
+                            . PMA_backquote(htmlspecialchars(urldecode($sval)))
                             . (($i == $selected_cnt - 1) ? ';<br />' : '');
                 break;
 
@@ -110,7 +112,7 @@ if (!empty($submit_mult) && !empty($what)) {
                 } else {
                     $full_query .= 'DELETE FROM ';
                 }
-                $full_query .= PMA_backquote(htmlspecialchars(urldecode($selected[$i])))
+                $full_query .= PMA_backquote(htmlspecialchars(urldecode($sval)))
                             . ';<br />';
                 break;
 
@@ -119,11 +121,11 @@ if (!empty($submit_mult) && !empty($what)) {
                     $full_query .= 'ALTER TABLE '
                                 . PMA_backquote(htmlspecialchars($table))
                                 . '<br />&nbsp;&nbsp;DROP '
-                                . PMA_backquote(htmlspecialchars(urldecode($selected[$i])))
+                                . PMA_backquote(htmlspecialchars(urldecode($sval)))
                                 . ',';
                 } else {
                     $full_query .= '<br />&nbsp;&nbsp;DROP '
-                                . PMA_backquote(htmlspecialchars(urldecode($selected[$i])))
+                                . PMA_backquote(htmlspecialchars(urldecode($sval)))
                                 . ',';
                 }
                 if ($i == $selected_cnt-1) {
@@ -148,8 +150,8 @@ if (!empty($submit_mult) && !empty($what)) {
     } else  {
         echo PMA_generate_common_hidden_inputs();
     }
-    for ($i = 0; $i < $selected_cnt; $i++) {
+    foreach($selected AS $idx => $sval) {
-        echo '    <input type="hidden" name="selected[]" value="' . htmlspecialchars($selected[$i]) . '" />' . "\n";
+        echo '    <input type="hidden" name="selected[]" value="' . htmlspecialchars($sval) . '" />' . "\n";
     }
     ?>
     <input type="hidden" name="query_type" value="<?php echo $what; ?>" />

tbl_replace.php

@@ -58,7 +58,7 @@ if (isset($err_url)) {
     $err_url = urldecode($err_url);
 } else {
     $err_url = str_replace('&', '&', $goto)
-             . (empty($primary_key) ? '' : '&primary_key=' . $primary_key);
+             . (empty($primary_key) ? '' : '&primary_key=' . (is_array($primary_key) ? $primary_key[0] : $primary_key));
 }
 
 // Resets tables defined in the configuration file
@@ -73,46 +73,60 @@ $seen_binary = FALSE;
  * Prepares the update of a row
  */
 if (isset($primary_key) && ($submit_type != $strInsertAsNewRow)) {
-    // Restore the "primary key" to a convenient format
+    $loop_array = (is_array($primary_key) ? $primary_key : array(0 => $primary_key));
-    $primary_key = urldecode($primary_key);
+    PMA_mysql_select_db($db);
-
+    $query = array();
-    // Defines the SET part of the sql query
+    $message = '';
-    $valuelist = '';
+    
-
+    foreach($loop_array AS $primary_key_index => $enc_primary_key) {
-    foreach($fields AS $key => $val) {
+        // Restore the "primary key" to a convenient format
-        $encoded_key = $key;
+        $primary_key = urldecode($enc_primary_key);
-        $key         = urldecode($key);
+    
-
+        // Defines the SET part of the sql query
-        require('./tbl_replace_fields.php');
+        $valuelist = '';
-
+        
-        // No change for this column and no MySQL function is used -> next column
+        // Map multi-edit keys to single-level arrays, dependent on how we got the fields
-        if (empty($funcs[$encoded_key])
+        $me_fields      = (isset($fields['multi_edit'])      ? $fields['multi_edit'][$enc_primary_key]      : $fields);
-            && isset($fields_prev) && isset($fields_prev[$encoded_key])
+        $me_fields_prev = (isset($fields_prev['multi_edit']) ? $fields_prev['multi_edit'][$enc_primary_key] : $fields_prev);
-            && ("'" . PMA_sqlAddslashes(urldecode($fields_prev[$encoded_key])) . "'" == $val)) {
+        $me_funcs       = (isset($funcs['multi_edit'])       ? $funcs['multi_edit'][$enc_primary_key]       : $funcs);
-            continue;
+        $me_fields_type = (isset($fields_type['multi_edit']) ? $fields_type['multi_edit'][$enc_primary_key] : $fields_type);
-        }
+        $me_fields_null = (isset($fields_null['multi_edit']) ? $fields_null['multi_edit'][$enc_primary_key] : $fields_null);
-        else if (!empty($val)) {
+    
-            if (empty($funcs[$encoded_key])) {
+        foreach($me_fields AS $key => $val) {
-                $valuelist .= PMA_backquote($key) . ' = ' . $val . ', ';
+            $encoded_key = $key;
-            } else if ($val == '\'\''
+            $key         = urldecode($key);
-                       && (preg_match('@^(NOW|CURDATE|CURTIME|UNIX_TIMESTAMP|RAND|USER|LAST_INSERT_ID)$@', $funcs[$encoded_key]))) {
+    
-                $valuelist .= PMA_backquote($key) . ' = ' . $funcs[$encoded_key] . '(), ';
+            require('./tbl_replace_fields.php');
-            } else {
+    
-                $valuelist .= PMA_backquote($key) . ' = ' . $funcs[$encoded_key] . "($val), ";
+            // No change for this column and no MySQL function is used -> next column
+            if (empty($me_funcs[$encoded_key])
+                && isset($me_fields_prev) && isset($me_fields_prev[$encoded_key])
+                && ("'" . PMA_sqlAddslashes(urldecode($me_fields_prev[$encoded_key])) . "'" == $val)) {
+                continue;
             }
+            else if (!empty($val)) {
+                if (empty($me_funcs[$encoded_key])) {
+                    $valuelist .= PMA_backquote($key) . ' = ' . $val . ', ';
+                } else if ($val == '\'\''
+                           && (preg_match('@^(NOW|CURDATE|CURTIME|UNIX_TIMESTAMP|RAND|USER|LAST_INSERT_ID)$@', $me_funcs[$encoded_key]))) {
+                    $valuelist .= PMA_backquote($key) . ' = ' . $me_funcs[$encoded_key] . '(), ';
+                } else {
+                    $valuelist .= PMA_backquote($key) . ' = ' . $me_funcs[$encoded_key] . "($val), ";
+                }
+            }
+        } // end while
+    
+        // Builds the sql update query
+        $valuelist    = preg_replace('@, $@', '', $valuelist);
+        if (!empty($valuelist)) {
+            $query[]   = 'UPDATE ' . PMA_backquote($table) . ' SET ' . $valuelist . ' WHERE' . $primary_key
+                      . ' LIMIT 1';
+            $message  = $strAffectedRows . '&nbsp;<br />';
         }
-    } // end while
-
-    // Builds the sql update query
-    $valuelist    = preg_replace('@, $@', '', $valuelist);
-    if (!empty($valuelist)) {
-        PMA_mysql_select_db($db);
-        $query    = 'UPDATE ' . PMA_backquote($table) . ' SET ' . $valuelist . ' WHERE' . $primary_key
-                  . ' LIMIT 1';
-        $message  = $strAffectedRows . '&nbsp;';
     }
-    // No change -> move back to the calling script
+    
-    else {
+    if (empty($valuelist)) {
+        // No change -> move back to the calling script
         $message = $strNoModification;
         if ($is_gotofile) {
             $js_to_run = 'functions.js';
@@ -130,41 +144,52 @@ if (isset($primary_key) && ($submit_type != $strInsertAsNewRow)) {
  *  Prepares the insert of a row
  */
 else {
+    $loop_array = (isset($primary_key) && is_array($primary_key) ? $primary_key : array(0 => (isset($primary_key) ? $primary_key : null)));
+    $query = array();
+    $message = '';
     PMA_mysql_select_db($db);
+    
+    foreach($loop_array AS $primary_key_index => $enc_primary_key) {
+        $fieldlist = '';
+        $valuelist = '';
+    
+        $me_fields      = (isset($fields['multi_edit'])      ? $fields['multi_edit'][$enc_primary_key]      : $fields);
+        $me_fields_prev = (isset($fields_prev['multi_edit']) ? $fields_prev['multi_edit'][$enc_primary_key] : $fields_prev);
+        $me_funcs       = (isset($funcs['multi_edit'])       ? $funcs['multi_edit'][$enc_primary_key]       : $funcs);
+        $me_fields_type = (isset($fields_type['multi_edit']) ? $fields_type['multi_edit'][$enc_primary_key] : $fields_type);
+        $me_fields_null = (isset($fields_null['multi_edit']) ? $fields_null['multi_edit'][$enc_primary_key] : $fields_null);
 
-    $fieldlist = '';
+        // garvin: Get, if sent, any protected fields to insert them here:
-    $valuelist = '';
+        if (isset($me_fields_type) && is_array($me_fields_type) && isset($enc_primary_key)) {
-
+            $prot_local_query = 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . urldecode($enc_primary_key);
-    // garvin: Get, if sent, any protected fields to insert them here:
+            $prot_result      = PMA_mysql_query($prot_local_query) or PMA_mysqlDie('', $prot_local_query, '', $err_url);
-    if (isset($fields_type) && is_array($fields_type) && isset($primary_key)) {
+            $prot_row         = PMA_mysql_fetch_array($prot_result);
-        $prot_local_query = 'SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . urldecode($primary_key);
-        $prot_result      = PMA_mysql_query($prot_local_query) or PMA_mysqlDie('', $prot_local_query, '', $err_url);
-        $prot_row         = PMA_mysql_fetch_array($prot_result);
-    }
-
-    foreach($fields AS $key => $val) {
-        $encoded_key = $key;
-        $key         = urldecode($key);
-        $fieldlist   .= PMA_backquote($key) . ', ';
-
-        require('./tbl_replace_fields.php');
-
-        if (empty($funcs[$encoded_key])) {
-            $valuelist .= $val . ', ';
-        } else if (($val == '\'\''
-                   && preg_match('@^(UNIX_TIMESTAMP|RAND|LAST_INSERT_ID)$@', $funcs[$encoded_key]))
-                   || preg_match('@^(NOW|CURDATE|CURTIME|USER)$@', $funcs[$encoded_key])) {
-            $valuelist .= $funcs[$encoded_key] . '(), ';
-        } else {
-            $valuelist .= $funcs[$encoded_key] . '(' . $val . '), ';
         }
-    } // end while
+    
-
+        foreach($me_fields AS $key => $val) {
-    // Builds the sql insert query
+            $encoded_key = $key;
-    $fieldlist = preg_replace('@, $@', '', $fieldlist);
+            $key         = urldecode($key);
-    $valuelist = preg_replace('@, $@', '', $valuelist);
+            $fieldlist   .= PMA_backquote($key) . ', ';
-    $query     = 'INSERT INTO ' . PMA_backquote($table) . ' (' . $fieldlist . ') VALUES (' . $valuelist . ')';
+    
-    $message   = $strInsertedRows . '&nbsp;';
+            require('./tbl_replace_fields.php');
+    
+            if (empty($me_funcs[$encoded_key])) {
+                $valuelist .= $val . ', ';
+            } else if (($val == '\'\''
+                       && preg_match('@^(UNIX_TIMESTAMP|RAND|LAST_INSERT_ID)$@', $me_funcs[$encoded_key]))
+                       || preg_match('@^(NOW|CURDATE|CURTIME|USER)$@', $me_funcs[$encoded_key])) {
+                $valuelist .= $me_funcs[$encoded_key] . '(), ';
+            } else {
+                $valuelist .= $me_funcs[$encoded_key] . '(' . $val . '), ';
+            }
+        } // end while
+    
+        // Builds the sql insert query
+        $fieldlist = preg_replace('@, $@', '', $fieldlist);
+        $valuelist = preg_replace('@, $@', '', $valuelist);
+        $query[]   = 'INSERT INTO ' . PMA_backquote($table) . ' (' . $fieldlist . ') VALUES (' . $valuelist . ')';
+        $message   = $strInsertedRows . '&nbsp;';
+    }
 } // end row insertion
 
 
@@ -172,41 +197,55 @@ else {
  * Executes the sql query and get the result, then move back to the calling
  * page
  */
-$sql_query = $query . ';';
+$sql_query = implode(';', $query) . ';';
-$result    = PMA_mysql_query($query);
+$total_affected_rows = 0;
-if (!$result) {
-    $error = PMA_mysql_error();
-    require_once('./header.inc.php');
-    PMA_mysqlDie($error, '', '', $err_url);
-} else {
-    if (@mysql_affected_rows()) {
-        $message .= @mysql_affected_rows();
-    } else {
-        $message = $strModifications;
-    }
-    $insert_id = mysql_insert_id();
-    if ($insert_id != 0) {
-        $message .= '<br />'.$strInsertedRowId . '&nbsp;' . $insert_id;
-    }
-    if ($is_gotofile) {
-        if ($goto == 'db_details.php' && !empty($table)) {
-            unset($table);
-        }
-        $js_to_run = 'functions.js';
-        $active_page = $goto;
-        require_once('./header.inc.php');
-        require('./' . preg_replace('@\.\.*@', '.', $goto));
-    } else {
-        // I don't understand this one:
-        //$add_query = (strpos(' ' . $goto, 'tbl_change') ? '&disp_query=' . urlencode($sql_query) : '');
 
-        // if we have seen binary,
+foreach($query AS $query_index => $single_query) {
-        // we do not append the query to the Location so it won't be displayed
+    $result    = PMA_mysql_query($single_query);
-        // on the resulting page
+    if (!$result) {
-        // Nijel: we also need to limit size of url...
+        if ($cfg['IgnoreMultiSubmitErrors']) {
-        $add_query = (!$seen_binary && strlen($sql_query) < 1024 ? '&disp_query=' . urlencode($sql_query) : '');
+            $message .= PMA_mysql_error();
-        header('Location: ' . $cfg['PmaAbsoluteUri'] . $goto . '&disp_message=' . urlencode($message) . $add_query);
+        } else {
+            $error = PMA_mysql_error();
+            require_once('./header.inc.php');
+            PMA_mysqlDie($error, '', '', $err_url);
+        }
+    } else {
+        if (@mysql_affected_rows()) {
+            $total_affected_rows += @mysql_affected_rows;
+        }
+
+        $insert_id = mysql_insert_id();
+        if ($insert_id != 0) {
+            $message .= '<br />'.$strInsertedRowId . '&nbsp;' . $insert_id;
+        }
+    } // end if
+}
+
+if ($total_affected_rows != 0) {
+    $message .= '<br />' . $total_affected_rows;
+} else {
+    $message .= $strModifications;
+}
+
+if ($is_gotofile) {
+    if ($goto == 'db_details.php' && !empty($table)) {
+        unset($table);
     }
-    exit();
+    $js_to_run = 'functions.js';
-} // end if
+    $active_page = $goto;
+    require_once('./header.inc.php');
+    require('./' . preg_replace('@\.\.*@', '.', $goto));
+} else {
+    // I don't understand this one:
+    //$add_query = (strpos(' ' . $goto, 'tbl_change') ? '&disp_query=' . urlencode($sql_query) : '');
+
+    // if we have seen binary,
+    // we do not append the query to the Location so it won't be displayed
+    // on the resulting page
+    // Nijel: we also need to limit size of url...
+    $add_query = (!$seen_binary && strlen($sql_query) < 1024 ? '&disp_query=' . urlencode($sql_query) : '');
+    header('Location: ' . $cfg['PmaAbsoluteUri'] . $goto . '&disp_message=' . urlencode($message) . $add_query);
+}
+exit();
 ?>

tbl_replace_fields.php

@@ -26,13 +26,18 @@ PMA_checkParameters(array('db','encoded_key'));
 // binary file is uploaded, thus bypassing further manipulation of $val.
 
 $check_stop = false;
-if (isset(${'fields_upload_' . $encoded_key}) && ${'fields_upload_' . $encoded_key} != 'none'){
+
+// Check if a multi-edit row was found
+${'me_fields_upload_' . $encoded_key}      = (isset($enc_primary_key) && isset(${'fields_upload_' . $encoded_key}['multi_edit'])      ? ${'fields_upload_' . $encoded_key}['multi_edit'][$enc_primary_key]      : ${'fields_upload_' . $encoded_key});
+${'me_fields_uploadlocal_' . $encoded_key} = (isset($enc_primary_key) && isset(${'fields_uploadlocal_' . $encoded_key}['multi_edit']) ? ${'fields_uploadlocal_' . $encoded_key}['multi_edit'][$enc_primary_key] : ${'fields_uploadlocal_' . $encoded_key});
+
+if (isset(${'me_fields_upload_' . $encoded_key}) && ${'me_fields_upload_' . $encoded_key} != 'none'){
     // garvin: This fields content is a blob-file upload.
 
-    if (!empty(${'fields_upload_' . $encoded_key})) {
+    if (!empty(${'me_fields_upload_' . $encoded_key})) {
         // garvin: The blob-field is not empty. Check what we have there.
 
-        $data_file = ${'fields_upload_' . $encoded_key};
+        $data_file = ${'me_fields_upload_' . $encoded_key};
 
         if (is_uploaded_file($data_file)) {
             // garvin: A valid uploaded file is found. Look into the file...
@@ -56,11 +61,11 @@ if (isset(${'fields_upload_' . $encoded_key}) && ${'fields_upload_' . $encoded_k
             // void
         }
 
-    } elseif (!empty(${'fields_uploadlocal_' . $encoded_key})) {
+    } elseif (!empty(${'me_fields_uploadlocal_' . $encoded_key})) {
         if (substr($cfg['UploadDir'], -1) != '/') {
             $cfg['UploadDir'] .= '/';
         }
-        $file_to_upload = $cfg['UploadDir'] . preg_replace('@\.\.*@', '.', ${'fields_uploadlocal_' . $encoded_key});
+        $file_to_upload = $cfg['UploadDir'] . preg_replace('@\.\.*@', '.', ${'me_fields_uploadlocal_' . $encoded_key});
 
         // A local file will be uploaded.
         $open_basedir = @ini_get('open_basedir');
@@ -110,8 +115,18 @@ if (!$check_stop) {
 
 // f i e l d    v a l u e    i n    t h e    f o r m
 
-    if (isset($fields_type[$encoded_key])) $type = $fields_type[$encoded_key];
+    if (isset($me_fields_type[$encoded_key])) $type = $me_fields_type[$encoded_key];
     else $type = '';
+    
+    $f = 'field_' . md5($key);
+    $t_fval = $$f;
+    
+    if (isset($t_fval['multi_edit'][$enc_primary_key])) {
+        $fval = &$t_fval['multi_edit'][$enc_primary_key];
+    } else {
+        $fval = &$t_fval;
+    }
+    
     switch (strtolower($val)) {
         // let users type NULL or null to input this string and not a NULL value
         //case 'null':
@@ -120,9 +135,8 @@ if (!$check_stop) {
             switch ($type) {
                 case 'enum':
                     // if we have an enum, then construct the value
-                        $f = 'field_' . md5($key);
+                        if (!empty($fval)) {
-                        if (!empty($$f)) {
+                            $val     = implode(',', $fval);
-                            $val     = implode(',', $$f);
                             if ($val == 'null') {
                                 // void
                             } else {
@@ -136,9 +150,8 @@ if (!$check_stop) {
                         break;
                 case 'set':
                     // if we have a set, then construct the value
-                    $f = 'field_' . md5($key);
+                    if (!empty($fval)) {
-                    if (!empty($$f)) {
+                        $val = implode(',', $fval);
-                        $val = implode(',', $$f);
                         // the data here is not urlencoded!
                         //$val = "'" . PMA_sqlAddslashes(urldecode($val)) . "'";
                         $val = "'" . PMA_sqlAddslashes($val) . "'";
@@ -148,9 +161,8 @@ if (!$check_stop) {
                     break;
                 case 'foreign':
                     // if we have a foreign key, then construct the value
-                    $f = 'field_' . md5($key);
+                    if (!empty($fval)) {
-                    if (!empty($$f)) {
+                        $val     = implode(',', $fval);
-                        $val     = implode(',', $$f);
                         if ($val == 'null') {
                             // void
                         } else {
@@ -196,7 +208,7 @@ if (!$check_stop) {
     // Was the Null checkbox checked for this field?
     // (if there is a value, we ignore the Null checkbox: this could
     // be possible if Javascript is disabled in the browser)
-    if (isset($fields_null) && isset($fields_null[$encoded_key])
+    if (isset($me_fields_null) && isset($me_fields_null[$encoded_key])
         && $val=="''") {
         $val = 'NULL';
     }

tbl_row_delete.php

@@ -13,47 +13,75 @@ require_once('./header.inc.php');
 // workaround for IE problem:
 if (isset($submit_mult_x)) {
     $submit_mult = 'row_delete';
+} elseif (isset($submit_mult_edit_x)) {
+    $submit_mult = 'row_edit';
 }
 
-if ((!empty($submit_mult) && isset($rows_to_delete) && is_array($rows_to_delete))
+// garvin: If the 'Ask for confirmation' button was pressed, this can only come from 'delete' mode,
-    || isset($mult_btn)) {
+// so we set it straight away.
-    $action = 'tbl_row_delete.php';
+if (isset($mult_btn)) {
-    $err_url = 'tbl_row_delete.php?' . PMA_generate_common_url($db, $table);
+    $submit_mult = 'row_delete';
-    if (!isset($mult_btn)) {
+}
-        $original_sql_query = $sql_query;
+
-        $original_url_query = $url_query;
+if (!empty($submit_mult)) {
-        $original_pos       = $pos;
+    switch($submit_mult) {
+        case 'row_edit':
+            if (isset($rows_to_delete) && is_array($rows_to_delete)) {
+                $primary_key = array();
+                // garvin: As we got the fields to be edited from the 'rows_to_delete' checkbox, we use the index of it as the
+                // indicating primary key. Then we built the array which is used for the tbl_change.php script.
+                foreach($rows_to_delete AS $i_primary_key => $del_query) {
+                    $primary_key[] = urldecode($i_primary_key);
+                }
+                
+                include './tbl_change.php';
+            }
+            break;
+        
+        case 'row_delete':
+        default:
+            if ((isset($rows_to_delete) && is_array($rows_to_delete))
+                || isset($mult_btn)) {
+                $action = 'tbl_row_delete.php';
+                $err_url = 'tbl_row_delete.php?' . PMA_generate_common_url($db, $table);
+                if (!isset($mult_btn)) {
+                    $original_sql_query = $sql_query;
+                    $original_url_query = $url_query;
+                    $original_pos       = $pos;
+                }
+                require('./mult_submits.inc.php');
+            }
+            $url_query = PMA_generate_common_url($db, $table)
+                       . '&goto=tbl_properties.php';
+            
+            
+            /**
+             * Show result of multi submit operation
+             */
+            if ((!empty($submit_mult) && isset($rows_to_delete))
+                || isset($mult_btn)) {
+                PMA_showMessage($strSuccess);
+            }
+            
+            if (isset($original_sql_query)) {
+                $sql_query = $original_sql_query;
+            }
+            
+            if (isset($original_url_query)) {
+                $url_query = $original_url_query;
+            }
+            
+            if (isset($original_pos)) {
+                $pos       = $original_pos;
+            }
+            
+            require('./sql.php');
+            
+            /**
+             * Displays the footer
+             */
+            require_once('./footer.inc.php');
+        break;
     }
-    require('./mult_submits.inc.php');
 }
-$url_query = PMA_generate_common_url($db, $table)
-           . '&goto=tbl_properties.php';
-
-
-/**
- * Show result of multi submit operation
- */
-if ((!empty($submit_mult) && isset($rows_to_delete))
-    || isset($mult_btn)) {
-    PMA_showMessage($strSuccess);
-}
-
-if (isset($original_sql_query)) {
-    $sql_query = $original_sql_query;
-}
-
-if (isset($original_url_query)) {
-    $url_query = $original_url_query;
-}
-
-if (isset($original_pos)) {
-    $pos       = $original_pos;
-}
-
-require('./sql.php');
-
-/**
- * Displays the footer
- */
-require_once('./footer.inc.php');
 ?>