Changeset 630 for trunk/lib/App.inc.php

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.

File:

• trunk/lib/App.inc.php (modified) (2 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__);
     }