Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1692) +++ branches/2.8.x/CHANGELOG (revision 1693) @@ -11,6 +11,9 @@ ! = Update/Change =============================================================================== + +18 Aug-2012 Build 1693 Dietmar Woellbrink (Luisehahne) +# fixed deprecated erigi in captcha 08 Aug-2012 Build 1692 Werner v.d.Decken(DarkViper) # corrected pageID in forwarding links ! changed request of permission to ami_group_member() and is_group_match() Index: branches/2.8.x/wb/include/captcha/captchas/ttf_image.php =================================================================== --- branches/2.8.x/wb/include/captcha/captchas/ttf_image.php (revision 1692) +++ branches/2.8.x/wb/include/captcha/captchas/ttf_image.php (revision 1693) @@ -36,8 +36,8 @@ $t_bgs = file_list(WB_PATH.'/include/captcha/backgrounds'); $fonts = array(); $bgs = array(); -foreach($t_fonts as $file) if(eregi('\.ttf$',$file)) $fonts[]=$file; -foreach($t_bgs as $file) if(eregi('\.png$',$file)) $bgs[]=$file; +foreach($t_fonts as $file) { if(preg_match('/\.ttf/',$file)) { $fonts[]=$file; } } +foreach($t_bgs as $file) { if(preg_match('/\.png/',$file)) { $bgs[]=$file; } } // make random string if(!function_exists('randomString')) { @@ -96,9 +96,9 @@ if(++$count > 4) // too many tries! Use the image break; } while($image_failed); - + } else { - + // draw whole string at once $image_failed = true; $count=0; @@ -113,9 +113,9 @@ $y = mt_rand($height-10,$height-2); $res = imagettftext($image, $ttfsize, $angle, $x, $y, $color, $ttf, $text); // check if text fits into the image - if(($res[0]>0 && $res[0]<$width) && ($res[1]>0 && $res[1]<$height) && - ($res[2]>0 && $res[2]<$width) && ($res[3]>0 && $res[3]<$height) && - ($res[4]>0 && $res[4]<$width) && ($res[5]>0 && $res[5]<$height) && + if(($res[0]>0 && $res[0]<$width) && ($res[1]>0 && $res[1]<$height) && + ($res[2]>0 && $res[2]<$width) && ($res[3]>0 && $res[3]<$height) && + ($res[4]>0 && $res[4]<$width) && ($res[5]>0 && $res[5]<$height) && ($res[6]>0 && $res[6]<$width) && ($res[7]>0 && $res[7]<$height) ) { $image_failed = false; @@ -123,7 +123,7 @@ if(++$count > 4) // too many tries! Use the image break; } while($image_failed); - + } imagealphablending($reload, TRUE); @@ -137,8 +137,6 @@ captcha_header(); ob_start(); imagepng($image); -header("Content-Length: ".ob_get_length()); +header("Content-Length: ".ob_get_length()); ob_end_flush(); imagedestroy($image); - -?> \ No newline at end of file Index: branches/2.8.x/wb/include/captcha/captchas/calc_ttf_image.php =================================================================== --- branches/2.8.x/wb/include/captcha/captchas/calc_ttf_image.php (revision 1692) +++ branches/2.8.x/wb/include/captcha/captchas/calc_ttf_image.php (revision 1693) @@ -27,7 +27,7 @@ require_once(WB_PATH.'/include/captcha/captcha.php'); if(!isset($_SESSION['captcha_time'])) - exit; + exit('missing captcha_time'); //unset($_SESSION['captcha_time']); // otherwise there can't be 2 captchas on one page! // get lists of fonts and backgrounds @@ -36,8 +36,8 @@ $t_bgs = file_list(WB_PATH.'/include/captcha/backgrounds'); $fonts = array(); $bgs = array(); -foreach($t_fonts as $file) if(eregi('\.ttf$',$file)) $fonts[]=$file; -foreach($t_bgs as $file) if(eregi('\.png$',$file)) $bgs[]=$file; +foreach($t_fonts as $file) { if(preg_match('/\.ttf/',$file)) { $fonts[]=$file; } } +foreach($t_bgs as $file) { if(preg_match('/\.png/',$file)) { $bgs[]=$file; } } // Captcha $sec_id = ''; @@ -50,19 +50,19 @@ $x = mt_rand(1,9); $y = mt_rand(1,9); $_SESSION['captcha'.$sec_id] = $x + $y; - $cap = "$x+$y"; - break; + $cap = "$x+$y"; + break; case 2: $x = mt_rand(10,20); $y = mt_rand(1,9); - $_SESSION['captcha'.$sec_id] = $x - $y; - $cap = "$x-$y"; + $_SESSION['captcha'.$sec_id] = $x - $y; + $cap = "$x-$y"; break; case 3: $x = mt_rand(2,10); $y = mt_rand(2,5); - $_SESSION['captcha'.$sec_id] = $x * $y; - $cap = "$x*$y"; + $_SESSION['captcha'.$sec_id] = $x * $y; + $cap = "$x*$y"; break; } $text = $cap; @@ -104,9 +104,9 @@ if(++$count > 4) // too many tries! Use the image break; } while($image_failed); - + } else { - + // draw whole string at once $image_failed = true; $count=0; @@ -121,9 +121,9 @@ $y = mt_rand($height-10,$height-2); $res = imagettftext($image, $ttfsize, $angle, $x, $y, $color, $ttf, $text); // check if text fits into the image - if(($res[0]>0 && $res[0]<$width) && ($res[1]>0 && $res[1]<$height) && - ($res[2]>0 && $res[2]<$width) && ($res[3]>0 && $res[3]<$height) && - ($res[4]>0 && $res[4]<$width) && ($res[5]>0 && $res[5]<$height) && + if(($res[0]>0 && $res[0]<$width) && ($res[1]>0 && $res[1]<$height) && + ($res[2]>0 && $res[2]<$width) && ($res[3]>0 && $res[3]<$height) && + ($res[4]>0 && $res[4]<$width) && ($res[5]>0 && $res[5]<$height) && ($res[6]>0 && $res[6]<$width) && ($res[7]>0 && $res[7]<$height) ) { $image_failed = false; @@ -131,7 +131,7 @@ if(++$count > 4) // too many tries! Use the image break; } while($image_failed); - + } imagealphablending($reload, TRUE); @@ -145,8 +145,6 @@ captcha_header(); ob_start(); imagepng($image); -header("Content-Length: ".ob_get_length()); +header("Content-Length: ".ob_get_length()); ob_end_flush(); imagedestroy($image); - -?> \ No newline at end of file Index: branches/2.8.x/wb/include/captcha/captchas/calc_image.php =================================================================== --- branches/2.8.x/wb/include/captcha/captchas/calc_image.php (revision 1692) +++ branches/2.8.x/wb/include/captcha/captchas/calc_image.php (revision 1693) @@ -41,19 +41,19 @@ $x = mt_rand(1,9); $y = mt_rand(1,9); $_SESSION['captcha'.$sec_id] = $x + $y; - $cap = "$x+$y"; - break; + $cap = "$x+$y"; + break; case 2: $x = mt_rand(10,20); $y = mt_rand(1,9); - $_SESSION['captcha'.$sec_id] = $x - $y; - $cap = "$x-$y"; + $_SESSION['captcha'.$sec_id] = $x - $y; + $cap = "$x-$y"; break; case 3: $x = mt_rand(2,10); $y = mt_rand(2,5); - $_SESSION['captcha'.$sec_id] = $x * $y; - $cap = "$x*$y"; + $_SESSION['captcha'.$sec_id] = $x * $y; + $cap = "$x*$y"; break; } @@ -71,7 +71,7 @@ $y1 = mt_rand(0,30); $x2 = mt_rand(0,120); $y2 = mt_rand(0,30); - imageline($image, $x1, $y1, $x2, $y2 , $gray); + imageline($image, $x1, $y1, $x2, $y2 , $gray); } $x = 10; @@ -79,8 +79,8 @@ for($i = 0; $i < $l; $i++) { $fnt = mt_rand(3,5); $x = $x + mt_rand(12 , 20); - $y = mt_rand(7 , 12); - imagestring($image, $fnt, $x, $y, substr($cap, $i, 1), $darkgray); + $y = mt_rand(7 , 12); + imagestring($image, $fnt, $x, $y, substr($cap, $i, 1), $darkgray); } imagealphablending($reload, TRUE); @@ -94,5 +94,3 @@ captcha_header(); imagepng($image); imagedestroy($image); - -?> \ No newline at end of file Index: branches/2.8.x/wb/include/captcha/captchas/text.php =================================================================== --- branches/2.8.x/wb/include/captcha/captchas/text.php (revision 1692) +++ branches/2.8.x/wb/include/captcha/captchas/text.php (revision 1693) @@ -93,5 +93,3 @@ $_SESSION['captcha'.$sec_id] = $qa[$lang][$k]; echo $k; - -?> Index: branches/2.8.x/wb/include/captcha/captchas/calc_text.php =================================================================== --- branches/2.8.x/wb/include/captcha/captchas/calc_text.php (revision 1692) +++ branches/2.8.x/wb/include/captcha/captchas/calc_text.php (revision 1693) @@ -42,20 +42,19 @@ $x = mt_rand(1,9); $y = mt_rand(1,9); $_SESSION['captcha'.$sec_id] = $x + $y; - $cap = "$x {$MOD_CAPTCHA['ADDITION']} $y"; - break; + $cap = "$x {$MOD_CAPTCHA['ADDITION']} $y"; + break; case 2: $x = mt_rand(10,20); $y = mt_rand(1,9); - $_SESSION['captcha'.$sec_id] = $x - $y; - $cap = "$x {$MOD_CAPTCHA['SUBTRAKTION']} $y"; + $_SESSION['captcha'.$sec_id] = $x - $y; + $cap = "$x {$MOD_CAPTCHA['SUBTRAKTION']} $y"; break; case 3: $x = mt_rand(2,10); $y = mt_rand(2,5); - $_SESSION['captcha'.$sec_id] = $x * $y; - $cap = "$x {$MOD_CAPTCHA['MULTIPLIKATION']} $y"; + $_SESSION['captcha'.$sec_id] = $x * $y; + $cap = "$x {$MOD_CAPTCHA['MULTIPLIKATION']} $y"; break; } echo $cap; -?> \ No newline at end of file Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1692) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1693) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1692'); +if(!defined('REVISION')) define('REVISION', '1693'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/modules/captcha_control/info.php =================================================================== --- branches/2.8.x/wb/modules/captcha_control/info.php (revision 1692) +++ branches/2.8.x/wb/modules/captcha_control/info.php (revision 1693) @@ -4,7 +4,7 @@ * @category modules * @package captcha_control * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright 2009-2012, WebsiteBaker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html * @platform WebsiteBaker 2.8.x @@ -20,11 +20,11 @@ if(defined('WB_PATH') == false) { // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); + die('

Cannot access this file directly

'); } /* -------------------------------------------------------- */ $module_directory = 'captcha_control'; -$module_name = 'Captcha and Advanced-Spam-Protection (ASP) Control'; +$module_name = 'Spam-Protection Control'; $module_function = 'tool'; $module_version = '1.2.0'; $module_platform = '2.7 | 2.8.x';