Changeset 1325

Show
Ignore:
Timestamp:
08/12/08 14:08:23 (4 months ago)
Author:
scitech
Message:

Fixed #1466: Login protection activated even BRUTEFORCE=0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/CHANGELOG

    r1324 r1325  
    11ispCP ω 1.0.0 Changelog 
    22~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
     3 
     42008-08-11 Daniel Andreca 
     5        - GUI: 
     6                * Fixed #1466: Login protection activated even BRUTEFORCE=0. 
    37 
    482008-08-11 Benedikt Heintel 
  • trunk/gui/include/login-functions.php

    r1246 r1325  
    185185        $captchacount = $data['captcha_count']; 
    186186 
    187         if ($type == 'bruteforce' && $logincount > Config::get('BRUTEFORCE_MAX_LOGIN')) { 
     187        if ($type == 'bruteforce' && Config::get('BRUTEFORCE') && $logincount > Config::get('BRUTEFORCE_MAX_LOGIN')) { 
    188188            block_ipaddr($ipaddr, 'Login'); 
    189189        } 
    190190 
    191         if ($type == 'captcha' && $captchacount > Config::get('BRUTEFORCE_MAX_CAPTCHA')) { 
     191        if ($type == 'captcha' && Config::get('BRUTEFORCE') && $captchacount > Config::get('BRUTEFORCE_MAX_CAPTCHA') && Config::get('BRUTEFORCE')) { 
    192192            block_ipaddr($ipaddr, 'CAPTCHA'); 
    193193        }