can be done in a single place

scnakandala · scnakandala · commit c7604bb00e44 · 2013-07-30T21:18:01.000+05:30
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
@@ -2398,6 +2398,25 @@ function PMA_getTableFields($db, $table)
  */
 function PMA_determineInsertOrEdit($where_clause, $db, $table)
 {
+    if (isset($_REQUEST['where_clause'])) {
+        $where_clause = $_REQUEST['where_clause'];
+    }
+    if (isset($_SESSION['edit_next'])) {
+        $where_clause = $_SESSION['edit_next'];
+        unset($_SESSION['edit_next']);
+        $after_insert = 'edit_next';
+    }
+    if (isset($_REQUEST['ShowFunctionFields'])) {
+        $GLOBALS['cfg']['ShowFunctionFields'] = $_REQUEST['ShowFunctionFields'];
+    }
+    if (isset($_REQUEST['ShowFieldTypesInDataEditView'])) {
+        $GLOBALS['cfg']['ShowFieldTypesInDataEditView'] = 
+            $_REQUEST['ShowFieldTypesInDataEditView'];
+    }
+    if (isset($_REQUEST['after_insert'])) {
+        $after_insert = $_REQUEST['after_insert'];
+    }
+    
     if (isset($where_clause)) {
         // we are editing
         $insert_mode = false;
@@ -2425,7 +2444,8 @@ function PMA_determineInsertOrEdit($where_clause, $db, $table)
     
     return array(
         $insert_mode, $where_clause, $where_clause_array, $where_clauses,
-        $result, $rows, $found_unique_key
+        $result, $rows, $found_unique_key,
+        isset($after_insert) ? $after_insert : null
     );
 }
 
diff --git a/tbl_change.php b/tbl_change.php
@@ -24,28 +24,12 @@
 require_once 'libraries/insert_edit.lib.php';
 
 /**
- * Sets global variables.
- * Here it's better to use a if, instead of the '?' operator
- * to avoid setting a variable to '' when it's not present in $_REQUEST
+ * Determine whether Insert or Edit and set global variables
  */
-
-if (isset($_REQUEST['where_clause'])) {
-    $where_clause = $_REQUEST['where_clause'];
-}
-if (isset($_SESSION['edit_next'])) {
-    $where_clause = $_SESSION['edit_next'];
-    unset($_SESSION['edit_next']);
-    $after_insert = 'edit_next';
-}
-if (isset($_REQUEST['ShowFunctionFields'])) {
-    $cfg['ShowFunctionFields'] = $_REQUEST['ShowFunctionFields'];
-}
-if (isset($_REQUEST['ShowFieldTypesInDataEditView'])) {
-    $cfg['ShowFieldTypesInDataEditView'] = $_REQUEST['ShowFieldTypesInDataEditView'];
-}
-if (isset($_REQUEST['after_insert'])) {
-    $after_insert = $_REQUEST['after_insert'];
-}
+list(
+    $insert_mode, $where_clause, $where_clause_array, $where_clauses,
+    $result, $rows, $found_unique_key, $after_insert
+) = PMA_determineInsertOrEdit($where_clause, $db, $table);
 
 
 /**
@@ -106,11 +90,6 @@
 $table_fields = PMA_getTableFields($db, $table);
 
 
-list(
-    $insert_mode, $where_clause, $where_clause_array, $where_clauses,
-    $result, $rows, $found_unique_key
-) = PMA_determineInsertOrEdit($where_clause, $db, $table);
-
 // retrieve keys into foreign fields, if any
 $foreigners = PMA_getForeigners($db, $table);
 
