diff --git a/core/common/Auth.class.php b/core/common/Auth.class.php index 1c2f3e8e..6d701515 100644 --- a/core/common/Auth.class.php +++ b/core/common/Auth.class.php @@ -278,7 +278,9 @@ public static function ProcessLogin($useridoremail, $password) { $hash = md5($password . $userinfo->salt); if ($hash == $userinfo->password) { - self::$userinfo = $userinfo; + + self::$userinfo = $userinfo; #deprecated + self::$pilot = self::$userinfo; self::update_session(self::$session_id, self::$userinfo->pilotid); diff --git a/core/modules/Login/Login.php b/core/modules/Login/Login.php index 7ecf3188..18d0167a 100644 --- a/core/modules/Login/Login.php +++ b/core/modules/Login/Login.php @@ -109,6 +109,7 @@ public function ProcessLogin() $this->render('login_form.tpl'); return false; } else { + if(Auth::$pilot->confirmed == PILOT_PENDING) { $this->render('login_unconfirmed.tpl'); Auth::LogOut(); @@ -117,9 +118,7 @@ public function ProcessLogin() } elseif(Auth::$pilot->confirmed == PILOT_REJECTED) { $this->render('login_rejected.tpl'); Auth::LogOut(); - } - else - { + } else { $pilotid = Auth::$pilot->pilotid; $session_id = Auth::$session_id; diff --git a/core/templates/pireps_airportdropdown.tpl b/core/templates/pireps_airportdropdown.tpl new file mode 100644 index 00000000..547d42a0 --- /dev/null +++ b/core/templates/pireps_airportdropdown.tpl @@ -0,0 +1,16 @@ +'; + return; +} +?> + \ No newline at end of file