From 4fe46cbd2aa0845d2ad267be6e99fd82a680a3fc Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Sat, 11 Jan 2014 20:32:45 +0100
Subject: [PATCH] [ADDED] last_login timestamp

* [RENAMED] sessionTimeoutStamp to last_login
* [UPDATE] user class to store login time after successful login
* [ADDED] SQL Upgrade file for new column
* [UPDATE] Updated base SQL file

Fixes #1162 once merged.
---
 public/include/classes/base.class.php |  2 +-
 public/include/classes/user.class.php | 11 +++++++++++
 public/include/version.inc.php        |  2 +-
 sql/000_base_structure.sql            |  2 +-
 sql/012_accounts_update.sql           |  3 +++
 5 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 sql/012_accounts_update.sql

diff --git a/public/include/classes/base.class.php b/public/include/classes/base.class.php
index 9d6bdf48..a2f8c7e1 100644
--- a/public/include/classes/base.class.php
+++ b/public/include/classes/base.class.php
@@ -238,7 +238,7 @@ class Base {
     if ($this->checkStmt($stmt) && $stmt->bind_param($field['type'].'i', $field['value'], $id) && $stmt->execute())
       return true;
     $this->debug->append("Unable to update " . $field['name'] . " with " . $field['value'] . " for ID $id");
-    $this->sqlError();
+    return $this->sqlError();
   }
 
   /**
diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php
index 27608ae5..f335f75f 100644
--- a/public/include/classes/user.class.php
+++ b/public/include/classes/user.class.php
@@ -128,6 +128,7 @@ class User extends Base {
       return false;
     }
     if ($this->checkUserPassword($username, $password)) {
+      $this->updateLoginTimestamp($this->getUserId($username));
       $this->createSession($username);
       if ($this->setUserIp($this->getUserId($username), $_SERVER['REMOTE_ADDR']))
         return true;
@@ -407,6 +408,16 @@ class User extends Base {
     $_SESSION['USERDATA'] = $this->user;
   }
 
+  /**
+   * Update users last_login timestamp
+   * @param id int UserID
+   * @return bool true of false
+   **/
+  private function updateLoginTimestamp($id) {
+    $field = array('name' => 'last_login', 'type' => 'i', 'value' => time());
+    return $this->updateSingle($id, $field);
+  }
+
   /**
    * Log out current user, destroy the session
    * @param none
diff --git a/public/include/version.inc.php b/public/include/version.inc.php
index e3f284f6..77d41b4d 100644
--- a/public/include/version.inc.php
+++ b/public/include/version.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-define('DB_VERSION', '0.0.1');
+define('DB_VERSION', '0.0.2');
 define('CONFIG_VERSION', '0.0.2');
 define('MPOS_VERSION', '0.0.1');
 
diff --git a/sql/000_base_structure.sql b/sql/000_base_structure.sql
index d2fce966..d8f3b386 100644
--- a/sql/000_base_structure.sql
+++ b/sql/000_base_structure.sql
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS `accounts` (
   `is_locked` tinyint(1) NOT NULL DEFAULT '0',
   `failed_logins` int(5) unsigned DEFAULT '0',
   `failed_pins` int(5) unsigned DEFAULT '0',
-  `sessionTimeoutStamp` int(255) DEFAULT NULL,
+  `last_login` int(10) DEFAULT NULL,
   `pin` varchar(255) NOT NULL COMMENT 'four digit pin to allow account changes',
   `api_key` varchar(255) DEFAULT NULL,
   `token` varchar(65) DEFAULT NULL,
diff --git a/sql/012_accounts_update.sql b/sql/012_accounts_update.sql
new file mode 100644
index 00000000..2ba7cbbe
--- /dev/null
+++ b/sql/012_accounts_update.sql
@@ -0,0 +1,3 @@
+ALTER TABLE  `accounts` CHANGE  `sessionTimeoutStamp`  `last_login` INT( 10 ) NULL DEFAULT NULL ;
+INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.2') ON DUPLICATE KEY UPDATE `value` = '0.0.2';
+INSERT INTO `settings` (`name`, `value`) VALUES ('db_upgrade_required', 0) ON DUPLICATE KEY UPDATE `value` = 0;