From a45d30a5bb97cc802f14dfabdedb40a002bd40ea Mon Sep 17 00:00:00 2001
From: "jocuri%softhome.net"
 <jocuri%softhome.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 8 Sep 2004 23:29:08 +0000
Subject: [PATCH] Patch for bug 257303: convert lastused field in logincookies
 from timestamp to datetime; patch by Tomas Kopal <Tomas.Kopal@altap.cz>;
 r=vladd, a=justdave.

git-svn-id: svn://10.0.0.236/trunk@161950 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI.pm | 3 ++-
 .../bugzilla/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm       | 2 +-
 mozilla/webtools/bugzilla/checksetup.pl                  | 9 ++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI.pm
index 3b90ec6adf4..6b1761959d4 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI.pm
@@ -68,7 +68,8 @@ sub login {
         trick_taint($ipaddr);
 
         my $dbh = Bugzilla->dbh;
-        $dbh->do("INSERT INTO logincookies (userid, ipaddr) VALUES (?, ?)",
+        $dbh->do("INSERT INTO logincookies (userid, ipaddr, lastused)
+                 VALUES (?, ?, NOW())",
                  undef,
                  $userid, $ipaddr);
         my $logincookie = $dbh->selectrow_array("SELECT LAST_INSERT_ID()");
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
index 84f2b27a8d4..a8ba4f77759 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/WWW/CGI/Cookie.pm
@@ -76,7 +76,7 @@ sub authenticate {
     if ($userid) {
         # If we logged in successfully, then update the lastused time on the
         # login cookie
-        $dbh->do("UPDATE logincookies SET lastused=NULL WHERE cookie=?",
+        $dbh->do("UPDATE logincookies SET lastused=NOW() WHERE cookie=?",
                  undef,
                  $login_cookie);
 
diff --git a/mozilla/webtools/bugzilla/checksetup.pl b/mozilla/webtools/bugzilla/checksetup.pl
index 33ad92539bc..0d1ca477a6a 100755
--- a/mozilla/webtools/bugzilla/checksetup.pl
+++ b/mozilla/webtools/bugzilla/checksetup.pl
@@ -1782,7 +1782,7 @@ $table{logincookies} =
    'cookie mediumint not null auto_increment primary key,
     userid mediumint not null,
     ipaddr varchar(40) NOT NULL,
-    lastused timestamp,
+    lastused DATETIME NOT NULL,
 
     index(lastused)';
 
@@ -4465,6 +4465,13 @@ if (! $sth->rows) {
              "VALUES(1,'Unclassified','Unassigned to any classifications')");
 }
 
+# 2004-08-29 - Tomas.Kopal@altap.cz, bug 257303
+# Change logincookies.lastused type from timestamp to datetime
+if (($fielddef = GetFieldDef("logincookies", "lastused")) &&
+    $fielddef->[1] =~ /^timestamp/) {
+    ChangeFieldType ('logincookies', 'lastused', 'DATETIME NOT NULL');
+}
+
 #
 # Final checks...