From 0fc7bd09ffc5a8cf97e2b6495447b5f35e828d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20M=C3=BCller?= <om@omnis.ch>
Date: Wed, 18 Jul 2001 14:19:53 +0000
Subject: [PATCH]         * set current version number to 2.2.0rc3 (which
 should become 2.2.0-final)         * tbl_change.php3: feature #442402: while
 editing a record, the function           of the first timestamp field will be
 set by default to "NOW()" :           same behaviour as the command line
 mysql client.

---
 ChangeLog        |  6 ++++++
 defines.inc.php3 |  2 +-
 tbl_change.php3  | 28 +++++++++++++++++++++++++---
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29cce0ac9..15403dcf5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$ 
 $Source$
 
+2001-07-18  Olivier Müller  <om@omnis.ch>
+	* set current version number to 2.2.0rc3 (which should become 2.2.0-final)
+	* tbl_change.php3: feature #442402: while editing a record, the function
+	  of the first timestamp field will be set by default to "NOW()" :
+	  same behaviour as the command line mysql client. 
+
 2001-07-17  Loïc Chapeaux  <lolo@phpheaven.net>
 	* added credits for Benjamin Gandon <gandon@isia.cma.fr> in this file,
 	  credits and documentation.
diff --git a/defines.inc.php3 b/defines.inc.php3
index 80824ac00..eaf4b9cc8 100755
--- a/defines.inc.php3
+++ b/defines.inc.php3
@@ -10,7 +10,7 @@
 //	PMA_WINDOWS					(bool)	- mark if phpMyAdmin running on windows server
 
 
-define("PHPMYADMIN_VERSION", "2.2.0rc2"); 
+define("PHPMYADMIN_VERSION", "2.2.0rc3"); 
 
 if (!ereg("([0-9]).([0-9]).([0-9])", phpversion(), $match))
 	$result=ereg("([0-9]).([0-9])",phpversion(),$match);
diff --git a/tbl_change.php3 b/tbl_change.php3
index eed2285fc..ff0aa0acf 100755
--- a/tbl_change.php3
+++ b/tbl_change.php3
@@ -45,6 +45,9 @@ if(isset($primary_key))
 </tr>
 <?php
 
+
+$timestamp_seen = 0;   // set if we passed the first timestamp field.
+
 for($i=0;$i<mysql_num_rows($table_def);$i++)
 {
     $row_table_def = mysql_fetch_array($table_def);
@@ -53,6 +56,7 @@ for($i=0;$i<mysql_num_rows($table_def);$i++)
         $row[$field] = date("Y-m-d H:i:s", time());
     $len = @mysql_field_len($result,$i);
 
+    $first_timestamp = 0;
     $bgcolor = $cfgBgcolorOne;
     $i % 2  ? 0: $bgcolor = $cfgBgcolorTwo;
     echo "<tr bgcolor=".$bgcolor.">\n";
@@ -65,6 +69,13 @@ for($i=0;$i<mysql_num_rows($table_def);$i++)
         case "enum":
             $type = "enum";
             break;
+        case "timestamp":
+            if (!$timestamp_seen) {   // can only occur once per table
+                $timestamp_seen = 1;
+                $first_timestamp = 1;
+            }
+            $type = $row_table_def['Type'];
+            break;
         default:
             $type = $row_table_def['Type'];
             break;
@@ -91,10 +102,21 @@ for($i=0;$i<mysql_num_rows($table_def);$i++)
     }
     else
     {
-
     	echo "<td><select name=\"funcs[$field]\"><option>\n";
-    	for($j=0; $j<count($cfgFunctions); $j++)
-        	echo "<option>$cfgFunctions[$j]\n";
+
+        if (!$first_timestamp) {
+    	    for($j=0; $j<count($cfgFunctions); $j++)
+         	    echo "<option>$cfgFunctions[$j]\n";
+	} else {
+            // for default function = NOW() on first timestamp field --swix/18jul01
+    	    for($j=0; $j<count($cfgFunctions); $j++) {
+                if ($cfgFunctions[$j] == "NOW") {
+        	    echo "<option selected>$cfgFunctions[$j]\n";
+		} else {
+        	    echo "<option>$cfgFunctions[$j]\n";
+		}
+            }
+	}
     	echo "</select></td>\n";
     }