Changeset 601 for trunk/lib/Auth_SQL.inc.php

Timestamp:

Apr 27, 2017 4:43:35 PM (7 years ago)

Author:

anonymous

Message:

Updated every instance of 'zero' date 0000-00-00 to use 1000-01-01 if mysql version >= 5.7.4

File:

• trunk/lib/Auth_SQL.inc.php (modified) (3 diffs)

trunk/lib/Auth_SQL.inc.php

@@ -175 +175 @@
 
             // The minimal columns for a table compatible with the Auth_SQL class.
-            $db->query("CREATE TABLE IF NOT EXISTS " . $db->escapeString($this->getParam('db_table')) . " (
-                " . $this->getParam('db_primary_key') . " MEDIUMINT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-                " . $this->getParam('db_username_column') . " varchar(255) NOT NULL default '',
-                userpass VARCHAR(255) NOT NULL DEFAULT '',
-                userpass_hashtype TINYINT UNSIGNED NOT NULL DEFAULT '0',
-                first_name VARCHAR(50) NOT NULL DEFAULT '',
-                last_name VARCHAR(50) NOT NULL DEFAULT '',
-                email VARCHAR(255) NOT NULL DEFAULT '',
-                login_abuse_exempt ENUM('true') DEFAULT NULL,
-                blocked ENUM('true') DEFAULT NULL,
-                blocked_reason VARCHAR(255) NOT NULL DEFAULT '',
-                abuse_warning_level TINYINT NOT NULL DEFAULT '0',
-                seconds_online INT NOT NULL DEFAULT '0',
-                last_login_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-                last_access_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-                last_login_ip VARCHAR(45) NOT NULL DEFAULT '0.0.0.0',
-                added_by_user_id SMALLINT DEFAULT NULL,
-                modified_by_user_id SMALLINT DEFAULT NULL,
-                added_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-                modified_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-                KEY " . $this->getParam('db_username_column') . " (" . $this->getParam('db_username_column') . "),
-                KEY userpass (userpass),
-                KEY email (email),
-                KEY last_login_datetime (last_login_datetime),
-                KEY last_access_datetime (last_access_datetime)
-            )");
+            $db->query(sprintf(
+                "CREATE TABLE IF NOT EXISTS %1\$s (
+                    %2\$s MEDIUMINT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+                    %3\$s varchar(255) NOT NULL default '',
+                    userpass VARCHAR(255) NOT NULL DEFAULT '',
+                    userpass_hashtype TINYINT UNSIGNED NOT NULL DEFAULT '0',
+                    first_name VARCHAR(50) NOT NULL DEFAULT '',
+                    last_name VARCHAR(50) NOT NULL DEFAULT '',
+                    email VARCHAR(255) NOT NULL DEFAULT '',
+                    login_abuse_exempt ENUM('true') DEFAULT NULL,
+                    blocked ENUM('true') DEFAULT NULL,
+                    blocked_reason VARCHAR(255) NOT NULL DEFAULT '',
+                    abuse_warning_level TINYINT NOT NULL DEFAULT '0',
+                    seconds_online INT NOT NULL DEFAULT '0',
+                    last_login_datetime DATETIME NOT NULL DEFAULT '%4\$s 00:00:00',
+                    last_access_datetime DATETIME NOT NULL DEFAULT '%4\$s 00:00:00',
+                    last_login_ip VARCHAR(45) NOT NULL DEFAULT '0.0.0.0',
+                    added_by_user_id SMALLINT DEFAULT NULL,
+                    modified_by_user_id SMALLINT DEFAULT NULL,
+                    added_datetime DATETIME NOT NULL DEFAULT '%4\$s 00:00:00',
+                    modified_datetime DATETIME NOT NULL DEFAULT '%4\$s 00:00:00',
+                    KEY %5\$s (%5\$s),
+                    KEY userpass (userpass),
+                    KEY email (email),
+                    KEY last_login_datetime (last_login_datetime),
+                    KEY last_access_datetime (last_access_datetime)
+                )",
+                $db->escapeString($this->getParam('db_table')),
+                $this->getParam('db_primary_key'),
+                $this->getParam('db_username_column'),
+                $db->getParam('zero_date'),
+                $this->getParam('db_username_column')
+            ));
 
             if (!$db->columnExists($this->getParam('db_table'), array(
@@ -232 +239 @@
                     $app->logMsg(sprintf('Dropping and recreating table %s.', $this->getParam('db_login_table')), LOG_INFO, __FILE__, __LINE__);
                 }
-                $db->query("CREATE TABLE IF NOT EXISTS " . $this->getParam('db_login_table') . " (
-                    " . $this->getParam('db_primary_key') . " MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
-                    login_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-                    remote_ip_binary CHAR(32) NOT NULL DEFAULT '',
-                    KEY " . $this->getParam('db_primary_key') . " (" . $this->getParam('db_primary_key') . "),
-                    KEY login_datetime (login_datetime),
-                    KEY remote_ip_binary (remote_ip_binary)
-                )");
+                $db->query(sprintf(
+                    "CREATE TABLE IF NOT EXISTS %1\$s (
+                        %2\$s MEDIUMINT UNSIGNED NOT NULL DEFAULT '0',
+                        login_datetime DATETIME NOT NULL DEFAULT '%3\$s 00:00:00',
+                        remote_ip_binary CHAR(32) NOT NULL DEFAULT '',
+                        KEY %4\$s (%4\$s),
+                        KEY login_datetime (login_datetime),
+                        KEY remote_ip_binary (remote_ip_binary)
+                    )",
+                    $this->getParam('db_login_table'),
+                    $this->getParam('db_primary_key'),
+                    $db->getParam('zero_date'),
+                    $this->getParam('db_primary_key')
+                ));
 
                 if (!$db->columnExists($this->getParam('db_login_table'), array(
@@ -327 +340 @@
 
             // FIX ME: Should we check if the session is active?
-            $db->query("
-                UPDATE " . $this->_params['db_table'] . " SET
-                seconds_online = seconds_online + ABS(UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_access_datetime)),
-                last_login_datetime = '0000-00-00 00:00:00'
-                WHERE " . $this->_params['db_primary_key'] . " = '" . $this->get('user_id') . "'
-            ");
+            $db->query(sprintf(
+                "UPDATE %s SET
+                    seconds_online = seconds_online + ABS(UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_access_datetime)),
+                    last_login_datetime = '%s 00:00:00'
+                    WHERE %s = '%s'
+                ",
+                $this->_params['db_table'],
+                $db->getParam('zero_date'),
+                $this->_params['db_primary_key'],
+                $this->get('user_id')
+            ));
         }
         $_SESSION['_auth_sql'][$this->_ns] = array(