Changeset 630

Timestamp:

Jun 8, 2018 3:41:16 AM (6 years ago)

Author:

anonymous

Message:

Disable App::sslOn(). Better logging on Email::send() unreplaced variables. Fix the elusive 'Database table session_tbl has invalid columns' error.

Location:

trunk/lib

Files:

• App.inc.php (modified) (2 diffs)
• DB.inc.php (modified) (5 diffs)
• DBSessionHandler.inc.php (modified) (1 diff)
• Email.inc.php (modified) (5 diffs)

trunk/lib/App.inc.php

@@ -1601 +1601 @@
 
     /**
-     * Force the user to connect via https (port 443) by redirecting them to
-     * the same page but with https.
+     * This function has changed to do nothing. SSL redirection should happen at the server layer, doing so here may result in a redirect loop.
      */
     public function sslOn()
     {
-        if (function_exists('apache_get_modules')) {
-            $modules = apache_get_modules();
-        } else {
-            // It's safe to assume we have mod_ssl if we can't determine otherwise.
-            $modules = array('mod_ssl');
-        }
-
-        if (!getenv('HTTPS') && $this->getParam('ssl_enabled') && in_array('mod_ssl', $modules)) {
-            $this->raiseMsg(sprintf(_("Secure SSL connection made to %s"), $this->getParam('ssl_domain')), MSG_NOTICE, __FILE__, __LINE__);
-            // Always append session because some browsers do not send cookie when crossing to SSL URL.
-            $this->dieURL('https://' . $this->getParam('ssl_domain') . getenv('REQUEST_URI'), null, true);
-        }
+        $app =& App::getInstance();
+        $app->logMsg(sprintf('sslOn was called and ignored.', null), LOG_DEBUG, __FILE__, __LINE__);
     }
 
@@ -1626 +1615 @@
     {
         $app =& App::getInstance();
-        $app->logMsg(sprintf('sslOff was called and ignored.', null), LOG_INFO, __FILE__, __LINE__);
+        $app->logMsg(sprintf('sslOff was called and ignored.', null), LOG_DEBUG, __FILE__, __LINE__);
     }
 

trunk/lib/DB.inc.php

@@ -78 +78 @@
 
     // Caches.
-    protected $existing_tables;
-    protected $table_columns;
+    protected static $existing_tables = null;
+    protected static $table_columns = null;
 
     /**
@@ -377 +377 @@
         }
 
-        if (!isset($this->existing_tables) || !$use_cached_results) {
-            $this->existing_tables = array();
+        if (is_null(self::$existing_tables) || !$use_cached_results) {
+            self::$existing_tables = array();
             $qid = $this->query("SHOW TABLES");
             while (list($row) = mysql_fetch_row($qid)) {
-                $this->existing_tables[] = $row;
+                self::$existing_tables[] = $row;
             }
         }
-        if (in_array($table, $this->existing_tables)) {
+
+        if (in_array($table, self::$existing_tables)) {
             return true;
         } else {
@@ -421 +422 @@
         }
 
-        if (!isset($this->table_columns[$table]) || !$use_cached_results) {
+        if (!isset(self::$table_columns[$table]) || !$use_cached_results) {
             // Populate and cache array of current columns for this table.
-            $this->table_columns[$table] = array();
+            self::$table_columns[$table] = array();
             $qid = $this->query("DESCRIBE $table");
             while ($row = mysql_fetch_row($qid)) {
-                $this->table_columns[$table][] = $row[0];
+                self::$table_columns[$table][] = $row[0];
             }
         }
@@ -433 +434 @@
             // Do an exact comparison of table schemas.
             sort($columns);
-            sort($this->table_columns[$table]);
-            return $this->table_columns[$table] == $columns;
+            sort(self::$table_columns[$table]);
+            return self::$table_columns[$table] == $columns;
         } else {
             // Only check that the specified columns are available in the table.
-            $match_columns = array_intersect($this->table_columns[$table], $columns);
+            $match_columns = array_intersect(self::$table_columns[$table], $columns);
             sort($columns);
             sort($match_columns);
@@ -467 +468 @@
     public function resetCache()
     {
-        $this->existing_tables = null;
-        $this->table_columns = null;
+        self::$existing_tables = null;
+        self::$table_columns = null;
     }
 

trunk/lib/DBSessionHandler.inc.php

@@ -114 +114 @@
             )");
 
-            if (!$this->db->columnExists($this->_params['db_table'], array('session_id', 'session_data', 'last_access'))) {
+            if (!$this->db->columnExists($this->_params['db_table'], array(
+                'session_id',
+                'session_data',
+                'last_access'
+            ), false, false)) {
                 $app->logMsg(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->_params['db_table']), LOG_ALERT, __FILE__, __LINE__);
                 trigger_error(sprintf('Database table %s has invalid columns. Please update this table manually.', $this->_params['db_table']), E_USER_ERROR);

trunk/lib/Email.inc.php

@@ -78 +78 @@
     );
 
+    // String that contains filename of the template used (for logging).
+    protected $_template_filename;
+
     // String that contains the email body.
     protected $_template;
@@ -198 +201 @@
         // This could be a new template, so reset the _template_replaced.
         $this->_template_replaced = null;
+
+        $this->_template_filename = $template;
+
         return true;
     }
@@ -221 +227 @@
             // This could be a new template, so reset the _template_replaced.
             $this->_template_replaced = null;
+
+            $this->_template_filename = '(using Email::setString)';
+
             return true;
         }
@@ -281 +290 @@
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
             unset($unreplaced_match[0]);
-            $app->logMsg(sprintf('Cannot get email body. Unreplaced variables in template: %s', getDump($unreplaced_match)), LOG_ERR, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot get email body. Unreplaced variable %s in template %s', getDump($unreplaced_match)), LOG_ERR, __FILE__, __LINE__);
             return false;
         }
@@ -339 +348 @@
         if (preg_match('/({[^}]+})/', $final_body, $unreplaced_match)) {
             unset($unreplaced_match[0]);
-            $app->logMsg(sprintf('Cannot send email. Unreplaced variables in template: %s', getDump($unreplaced_match)), LOG_ERR, __FILE__, __LINE__);
-            return false;
+            $app->logMsg(sprintf('Unreplaced variable "%s" in template "%s"', getDump($unreplaced_match), $this->_template_filename), LOG_ERR, __FILE__, __LINE__);
         }