diff --git a/e107_handlers/login.php b/e107_handlers/login.php index 8af5e5354..f7e39ca15 100644 --- a/e107_handlers/login.php +++ b/e107_handlers/login.php @@ -165,12 +165,11 @@ class userlogin // Check secure image if (!$forceLogin && $pref['logcode'] && extension_loaded('gd')) { - require_once(e_HANDLER."secure_img_handler.php"); - $sec_img = new secure_image; - if (!$sec_img->verify_code($_POST['rand_num'], $_POST['code_verify'])) - { // Invalid code - return $this->invalidLogin($username,LOGIN_BAD_CODE); + if ($secImgResult = e107::getSecureImg()->invalidCode($_POST['rand_num'], $_POST['code_verify'])) // Invalid code + { + return $this->invalidLogin($username, LOGIN_BAD_CODE, $secImgResult); } + } if (empty($this->userData)) // May have retrieved user data earlier @@ -578,7 +577,7 @@ class userlogin $doCheck = true; break; case LOGIN_BAD_CODE : - $message = LAN_LOGIN_23; + $message = $extra_text; // LAN_LOGIN_23; $this->logNote('LAN_ROLL_LOG_02', $username); break; case LOGIN_NOT_ACTIVATED : diff --git a/e107_plugins/forum/forum.css b/e107_plugins/forum/forum.css index 71ce9e4cd..b611eb04a 100644 --- a/e107_plugins/forum/forum.css +++ b/e107_plugins/forum/forum.css @@ -13,9 +13,11 @@ .forum-attachment-file { margin-top:15px; } .forum-user-combo { padding-bottom:5px } +/* ul.newforumposts-menu { padding-left: 10px; } ul.newforumposts-menu li { margin-bottom: 15px; } +*/ div.forum-poll-results { padding-left:0 } .forum-viewtopic-customtitle { diff --git a/e107_web/css/backcompat.css b/e107_web/css/backcompat.css index aa17e68da..b68a96bfc 100644 --- a/e107_web/css/backcompat.css +++ b/e107_web/css/backcompat.css @@ -27,4 +27,5 @@ div.news-empty { text-align:center; font-weight: bold } div.checkboxes label.checkbox { display: block } -textarea.bbarea { margin:0; } \ No newline at end of file +textarea.bbarea { margin:0; } +#chatbox-input-block { text-align:center } \ No newline at end of file