Fixes: #2669 SSL check in password recovery was in the wrong place

html/class_passwordRecovery.inc

@@ -56,7 +56,7 @@ class passwordRecovery {
   /* Constructor */
   function passwordRecovery()
   {
-    global $config;
+    global $config, $ssl;
     /* Destroy old session if exists.
         Else you will get your old session back, if you not logged out correctly. */
     session::destroy();
@@ -66,6 +66,13 @@ class passwordRecovery {
     reset_errors();
 
     $config       = $this->loadConfig();
+
+    /* If SSL is forced, just forward to the SSL enabled site */
+    if (($config->get_cfg_value("forcessl") == "TRUE") && ($ssl != '')) {
+      header ("Location: $ssl");
+      exit;
+    }
+
     $this->config = $config;
 
     $this->setupSmarty();

html/recovery.php

@@ -22,15 +22,6 @@ require_once("../include/php_setup.inc");
 require_once("functions.inc");
 require_once("variables.inc");
 
-$config = session::global_get('config');
-
-/* If SSL is forced, just forward to the SSL enabled site */
-if (($config->get_cfg_value("forcessl") == "TRUE") && ($ssl != '')) {
-  header ("Location: $ssl");
-  exit;
-}
-
-
 $pwRecovery = new passwordRecovery();
 
 $pwRecovery->execute();