Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 857) +++ trunk/CHANGELOG (revision 858) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.7.1 ------------------------------------- +18-Sep-2008 Thomas Hornik ++ Added captcha-reload 16-Sep-2008 Thomas Hornik # search: fixed windows-related regex issue 19-Aug-2008 Matthias Gallas Index: trunk/wb/include/captcha/reload_140_40.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/include/captcha/reload_140_40.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Index: trunk/wb/include/captcha/captchas/ttf_image.php =================================================================== --- trunk/wb/include/captcha/captchas/ttf_image.php (revision 857) +++ trunk/wb/include/captcha/captchas/ttf_image.php (revision 858) @@ -62,16 +62,17 @@ // get image-dimensions list($width, $height, $type, $attr) = getimagesize($bg); -// create image -$image = ImageCreateFromPNG($bg); // background image -$grey = mt_rand(0,50); -$color = ImageColorAllocate($image, $grey, $grey, $grey); // font-color -$ttf = $font; -$ttfsize = 25; // fontsize +// create reload-image +$reload = ImageCreateFromPNG(WB_PATH.'/include/captcha/reload_140_40.png'); // reload-overlay if(mt_rand(0,2)==0) { // 1 out of 3 // draw each character individualy + $image = ImageCreateFromPNG($bg); // background image + $grey = mt_rand(0,50); + $color = ImageColorAllocate($image, $grey, $grey, $grey); // font-color + $ttf = $font; + $ttfsize = 25; // fontsize $count = 0; $image_failed = true; $angle = mt_rand(-15,15); @@ -122,6 +123,14 @@ } +imagealphablending($reload, TRUE); +imagesavealpha($reload, TRUE); + +// overlay +imagecopy($reload, $image, 0,0,0,0, 140,40); +imagedestroy($image); +$image = $reload; + captcha_header(); ob_start(); imagepng($image); Index: trunk/wb/include/captcha/captchas/old_image.php =================================================================== --- trunk/wb/include/captcha/captchas/old_image.php (revision 857) +++ trunk/wb/include/captcha/captchas/old_image.php (revision 858) @@ -34,6 +34,9 @@ srand((double)microtime()*100000); $_SESSION['captcha'] = rand(10000,99999); +// create reload-image +$reload = ImageCreateFromPNG(WB_PATH.'/include/captcha/reload_120_30.png'); // reload-overlay + $w=120; $h=30; $image = imagecreate($w, $h); @@ -58,6 +61,14 @@ imagestring($image, $fnt, $x, $y, substr($_SESSION['captcha'], $i, 1), $darkgray); } +imagealphablending($reload, TRUE); +imagesavealpha($reload, TRUE); + +// overlay +imagecopy($reload, $image, 0,0,0,0, 120,30); +imagedestroy($image); +$image = $reload; + captcha_header(); ob_start(); imagepng($image); Index: trunk/wb/include/captcha/captchas/calc_ttf_image.php =================================================================== --- trunk/wb/include/captcha/captchas/calc_ttf_image.php (revision 857) +++ trunk/wb/include/captcha/captchas/calc_ttf_image.php (revision 858) @@ -71,16 +71,17 @@ // get image-dimensions list($width, $height, $type, $attr) = getimagesize($bg); -// create image -$image = ImageCreateFromPNG($bg); // background image -$grey = mt_rand(0,50); -$color = ImageColorAllocate($image, $grey, $grey, $grey); // font-color -$ttf = $font; -$ttfsize = 25; // fontsize +// create reload-image +$reload = ImageCreateFromPNG(WB_PATH.'/include/captcha/reload_140_40.png'); // reload-overlay if(mt_rand(0,2)==0) { // 1 out of 3 // draw each character individualy + $image = ImageCreateFromPNG($bg); // background image + $grey = mt_rand(0,50); + $color = ImageColorAllocate($image, $grey, $grey, $grey); // font-color + $ttf = $font; + $ttfsize = 25; // fontsize $count = 0; $image_failed = true; $angle = mt_rand(-10,10); @@ -111,6 +112,8 @@ $image = ImageCreateFromPNG($bg); // background image $grey = mt_rand(0,50); $color = ImageColorAllocate($image, $grey, $grey, $grey); // font-color + $ttf = $font; + $ttfsize = 25; // fontsize $angle = mt_rand(0,5); $x = mt_rand(20,35); $y = mt_rand($height-10,$height-2); @@ -129,6 +132,14 @@ } +imagealphablending($reload, TRUE); +imagesavealpha($reload, TRUE); + +// overlay +imagecopy($reload, $image, 0,0,0,0, 140,40); +imagedestroy($image); +$image = $reload; + captcha_header(); ob_start(); imagepng($image); Index: trunk/wb/include/captcha/captchas/calc_image.php =================================================================== --- trunk/wb/include/captcha/captchas/calc_image.php (revision 857) +++ trunk/wb/include/captcha/captchas/calc_image.php (revision 858) @@ -55,21 +55,24 @@ break; } -$image = imagecreate(100, 30); +// create reload-image +$reload = ImageCreateFromPNG(WB_PATH.'/include/captcha/reload_120_30.png'); // reload-overlay +$image = imagecreate(120, 30); + $white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF); $gray = imagecolorallocate($image, 0xC0, 0xC0, 0xC0); $darkgray = imagecolorallocate($image, 0x30, 0x30, 0x30); for($i = 0; $i < 30; $i++) { - $x1 = mt_rand(0,100); + $x1 = mt_rand(0,120); $y1 = mt_rand(0,30); - $x2 = mt_rand(0,100); + $x2 = mt_rand(0,120); $y2 = mt_rand(0,30); imageline($image, $x1, $y1, $x2, $y2 , $gray); } -$x = 0; +$x = 10; $l = strlen($cap); for($i = 0; $i < $l; $i++) { $fnt = mt_rand(3,5); @@ -78,6 +81,14 @@ imagestring($image, $fnt, $x, $y, substr($cap, $i, 1), $darkgray); } +imagealphablending($reload, TRUE); +imagesavealpha($reload, TRUE); + +// overlay +imagecopy($reload, $image, 0,0,0,0, 120,30); +imagedestroy($image); +$image = $reload; + captcha_header(); imagepng($image); imagedestroy($image); Index: trunk/wb/include/captcha/captchas/calc_text.php =================================================================== --- trunk/wb/include/captcha/captchas/calc_text.php (revision 857) +++ trunk/wb/include/captcha/captchas/calc_text.php (revision 858) @@ -26,6 +26,14 @@ // Must include code to stop this file being accessed directly if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } +if(!file_exists(WB_PATH.'/modules/captcha_control/languages/'.LANGUAGE .'.php')) { + // no module language file exists for the language set by the user, include default module language file EN.php + require_once(WB_PATH.'/modules/captcha_control/languages/EN.php'); +} else { + // a module language file exists for the language defined by the user, load it + require_once(WB_PATH.'/modules/captcha_control/languages/'.LANGUAGE .'.php'); +} + $_SESSION['captcha'] = ''; mt_srand((double)microtime()*1000000); $n = mt_rand(1,3); @@ -50,4 +58,4 @@ break; } echo $cap; -?> \ No newline at end of file +?> Index: trunk/wb/include/captcha/captcha.php =================================================================== --- trunk/wb/include/captcha/captcha.php (revision 857) +++ trunk/wb/include/captcha/captcha.php (revision 858) @@ -23,7 +23,43 @@ */ -// Must include code to stop this file being accessed directly +// displays the image or text inside an + +  =  - + ?>
" alt="Captcha" /> = 
+ +
+ +  = 
- + +
" alt="Captcha" /> + +
"; break; } + } elseif($action=='image_iframe') { + switch(CAPTCHA_TYPE) { + case 'text': // text-captcha + echo ($style?"":''); + include(WB_PATH.'/include/captcha/captchas/'.CAPTCHA_TYPE.'.php'); + echo ($style?'':''); + break; + case 'calc_text': // calculation as text + ?> + Index: trunk/wb/include/captcha/reload_120_30.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/include/captcha/reload_120_30.png ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property