http://www.atutor.ca/atutor/mantis/view.php?id=2798

diff --git a/docs/admin/admins/edit.php b/docs/admin/admins/edit.php
index b3e53be..4887fc2 100644 (file)
--- a/docs/admin/admins/edit.php
+++ b/docs/admin/admins/edit.php
@@ -63,7 +63,7 @@ if (isset($_POST['cancel'])) {
                $_POST['real_name'] = $addslashes($_POST['real_name']);\r
                $_POST['email']     = $addslashes($_POST['email']);\r
 \r
-               $sql    = "UPDATE ".TABLE_PREFIX."admins SET real_name='$_POST[real_name]', email='$_POST[email]', `privileges`=$priv WHERE login='$_POST[login]'";\r
+               $sql    = "UPDATE ".TABLE_PREFIX."admins SET real_name='$_POST[real_name]', email='$_POST[email]', `privileges`=$priv, last_login=last_login WHERE login='$_POST[login]'";\r
                $result = mysql_query($sql, $db);\r
 \r
                $sql    = "UPDATE ".TABLE_PREFIX."admins SET real_name='$_POST[real_name]', email='$_POST[email]', `privileges`=$priv WHERE login='$_POST[login]'";\r

diff --git a/docs/admin/admins/my_edit.php b/docs/admin/admins/my_edit.php
index 15e4d6d..af0ec79 100644 (file)
--- a/docs/admin/admins/my_edit.php
+++ b/docs/admin/admins/my_edit.php
@@ -45,7 +45,7 @@ if (isset($_POST['cancel'])) {
                $_POST['real_name'] = $addslashes($_POST['real_name']);\r
                $_POST['email']     = $addslashes($_POST['email']);\r
 \r
-               $sql    = "UPDATE ".TABLE_PREFIX."admins SET real_name='$_POST[real_name]', email='$_POST[email]' WHERE login='$_SESSION[login]'";\r
+               $sql    = "UPDATE ".TABLE_PREFIX."admins SET real_name='$_POST[real_name]', email='$_POST[email]', last_login=last_login WHERE login='$_SESSION[login]'";\r
                $result = mysql_query($sql, $db);\r
 \r
                $msg->addFeedback('ACTION_COMPLETED_SUCCESSFULLY');\r

diff --git a/docs/admin/admins/my_password.php b/docs/admin/admins/my_password.php
index 23c2e9f..a36e439 100644 (file)
--- a/docs/admin/admins/my_password.php
+++ b/docs/admin/admins/my_password.php
@@ -62,7 +62,7 @@ if (isset($_POST['submit'])) {
        if (!$msg->containsErrors()) {                  
                $_POST['password']   = $addslashes($_POST['password']);
 
-               $sql    = "UPDATE ".TABLE_PREFIX."admins SET password='$_POST[password]' WHERE login='$_SESSION[login]'";
+               $sql    = "UPDATE ".TABLE_PREFIX."admins SET password='$_POST[password]', last_login=last_login WHERE login='$_SESSION[login]'";
                $result = mysql_query($sql, $db);
 
                $msg->addFeedback('PASSWORD_CHANGED');

diff --git a/docs/admin/admins/password.php b/docs/admin/admins/password.php
index 451bfd5..6122d37 100644 (file)
--- a/docs/admin/admins/password.php
+++ b/docs/admin/admins/password.php
@@ -32,7 +32,7 @@ if (isset($_POST['cancel'])) {
        if (!$msg->containsErrors()) {
                $_POST['password']     = $addslashes($_POST['password']);
 
-               $sql    = "UPDATE ".TABLE_PREFIX."admins SET password='$_POST[password]' WHERE login='$_POST[login]'";
+               $sql    = "UPDATE ".TABLE_PREFIX."admins SET password='$_POST[password]', last_login=last_login WHERE login='$_POST[login]'";
                $result = mysql_query($sql, $db);
 
                $sql    = "UPDATE ".TABLE_PREFIX."admins SET password='********' WHERE login='$_POST[login]'";

diff --git a/docs/include/lib/constants.inc.php b/docs/include/lib/constants.inc.php
index b272fb1..d1f936f 100644 (file)
--- a/docs/include/lib/constants.inc.php
+++ b/docs/include/lib/constants.inc.php
@@ -181,7 +181,7 @@ define('AT_GUIDES_PATH', $_base_path . 'documentation/');
 
 define('AT_BACKUP_DIR', AT_CONTENT_DIR . 'backups/'); // where the backups get stored
 
-define('VERSION',              '1.5.3.2');
+define('VERSION',              '1.5.3.3');
 define('ONLINE_UPDATE', 3); /* update the user expiry every 3 min */
 
 /* valid date format_types:                                            */

diff --git a/docs/install/db/atutor_schema.sql b/docs/install/db/atutor_schema.sql
index ac4c490..772e176 100644 (file)
--- a/docs/install/db/atutor_schema.sql
+++ b/docs/install/db/atutor_schema.sql
@@ -7,6 +7,17 @@
 # Table structure for table `admin_log`
 # since 1.5
 
+CREATE TABLE `admins` (
+   `login` VARCHAR( 30 ) NOT NULL default '',
+   `password` VARCHAR( 30 ) NOT NULL default '',
+   `real_name` VARCHAR( 30 ) NOT NULL default '',
+   `email` VARCHAR( 50 ) NOT NULL default '',
+   `language` varchar(5) NOT NULL default '',
+   `privileges` MEDIUMINT UNSIGNED NOT NULL default 0,
+   `last_login` TIMESTAMP NOT NULL default 0,
+   PRIMARY KEY ( `login` )
+);
+
 CREATE TABLE `admin_log` (
   `login` varchar(30) NOT NULL default '',
   `time` datetime NOT NULL default '0000-00-00 00:00:00',
@@ -18,17 +29,6 @@ CREATE TABLE `admin_log` (
 );
 
 
-CREATE TABLE `admins` (
-   `login` VARCHAR( 30 ) NOT NULL default '',
-   `password` VARCHAR( 30 ) NOT NULL default '',
-   `real_name` VARCHAR( 30 ) NOT NULL default '',
-   `email` VARCHAR( 50 ) NOT NULL default '',
-   `language` varchar(5) NOT NULL default '',
-   `privileges` MEDIUMINT UNSIGNED NOT NULL default 0,
-   `last_login` DATETIME NOT NULL default '0000-00-00 00:00:00',
-   PRIMARY KEY ( `login` )
-);
-
 # --------------------------------------------------------
 # Table structure for table `assignments`
 # since 1.5.3

diff --git a/docs/install/db/atutor_upgrade_1.5.3.2_to_1.5.3.3.sql b/docs/install/db/atutor_upgrade_1.5.3.2_to_1.5.3.3.sql
new file mode 100644 (file)
index 0000000..9072227
--- /dev/null
+++ b/docs/install/db/atutor_upgrade_1.5.3.2_to_1.5.3.3.sql
@@ -0,0 +1,7 @@
+###############################################################\r
+# Database upgrade SQL from ATutor 1.5.3.2 to ATutor 1.5.3.3\r
+###############################################################\r
+\r
+# convert DATETIME fields to TIMESTAMP\r
+ALTER TABLE `admins` CHANGE `last_login` `last_login` TIMESTAMP NOT NULL;\r
+\r