mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Captcha login message fix. Backward compat styling fixes.

Browse Source
This commit is contained in:
Cameron
2016-12-10 16:10:56 -08:00
parent 59cacab228
commit e974bdd665
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_handlers/login.php
View File

@@ -165,12 +165,11 @@ class userlogin
// Check secure image // Check secure image
if (!$forceLogin && $pref['logcode'] && extension_loaded('gd')) if (!$forceLogin && $pref['logcode'] && extension_loaded('gd'))
{ {
require_once(e_HANDLER."secure_img_handler.php"); if ($secImgResult = e107::getSecureImg()->invalidCode($_POST['rand_num'], $_POST['code_verify'])) // Invalid code
$sec_img = new secure_image; {
if (!$sec_img->verify_code($_POST['rand_num'], $_POST['code_verify'])) return $this->invalidLogin($username, LOGIN_BAD_CODE, $secImgResult);
{ // Invalid code
return $this->invalidLogin($username,LOGIN_BAD_CODE);
} }
} }
if (empty($this->userData)) // May have retrieved user data earlier if (empty($this->userData)) // May have retrieved user data earlier
@@ -578,7 +577,7 @@ class userlogin
$doCheck = true; $doCheck = true;
break; break;
case LOGIN_BAD_CODE : case LOGIN_BAD_CODE :
$message = LAN_LOGIN_23; $message = $extra_text; // LAN_LOGIN_23;
$this->logNote('LAN_ROLL_LOG_02', $username); $this->logNote('LAN_ROLL_LOG_02', $username);
break; break;
case LOGIN_NOT_ACTIVATED : case LOGIN_NOT_ACTIVATED :

2
e107_plugins/forum/forum.css
View File

@@ -13,9 +13,11 @@
.forum-attachment-file { margin-top:15px; } .forum-attachment-file { margin-top:15px; }
.forum-user-combo { padding-bottom:5px } .forum-user-combo { padding-bottom:5px }
/*
ul.newforumposts-menu { padding-left: 10px; } ul.newforumposts-menu { padding-left: 10px; }
ul.newforumposts-menu li { margin-bottom: 15px; } ul.newforumposts-menu li { margin-bottom: 15px; }
*/
div.forum-poll-results { padding-left:0 } div.forum-poll-results { padding-left:0 }
.forum-viewtopic-customtitle { .forum-viewtopic-customtitle {

3
e107_web/css/backcompat.css
View File

@@ -27,4 +27,5 @@ div.news-empty { text-align:center; font-weight: bold }
div.checkboxes label.checkbox { display: block } div.checkboxes label.checkbox { display: block }
textarea.bbarea { margin:0; } textarea.bbarea { margin:0; }
#chatbox-input-block { text-align:center }