Index: trunk/wb/include/captcha/captchas/calc_ttf_image.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: trunk/wb/include/captcha/captchas/calc_ttf_image.png ___________________________________________________________________ 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 614) +++ trunk/wb/include/captcha/captchas/ttf_image.php (revision 615) @@ -31,11 +31,13 @@ unset($_SESSION['captcha_time']); // get lists of fonts and backgrounds -require_once(WB_PATH.'/search/search_modext.php'); -list($fonts, $dirs) = list_files_dirs(WB_PATH.'/include/captcha/fonts', false); -list($bgs, $dirs) = list_files_dirs(WB_PATH.'/include/captcha/backgrounds', false); -$fonts = clear_filelist($fonts, '\.ttf$'); -$bgs = clear_filelist($bgs, '\.png$'); +require_once(WB_PATH.'/framework/functions.php'); +$t_fonts = file_list(WB_PATH.'/include/captcha/fonts'); +$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; // make random string if(!function_exists('randomString')) { @@ -61,15 +63,11 @@ list($width, $height, $type, $attr) = getimagesize($bg); // create image - $image = ImageCreateFromPNG($bg); // background image $grey = rand(0,50); $color = ImageColorAllocate($image, $grey, $grey, $grey); // font-color $ttf = $font; $ttfsize = 25; // fontsize -$angle = rand(-15,15); -$x = rand(10,25); -$y = rand($height-10,$height-2); if(rand(0,2)==0) { // 1 out of 3 @@ -76,8 +74,11 @@ // draw each character individualy $count = 0; $image_failed = true; + $angle = rand(-15,15); + $x = rand(10,25); + $y = rand($height-10,$height-2); do { - for($i=0;$i<5;$i++) { + for($i=0;$i0 && $res[0]<$width) && ($res[1]>0 && $res[1]<$height) && ($res[2]>0 && $res[2]<$width) && ($res[3]>0 && $res[3]<$height) && @@ -115,7 +116,7 @@ ) { $image_failed = false; } - if(++$count > 5) // too many tries! Use the image + if(++$count > 4) // too many tries! Use the image break; } while($image_failed); Index: trunk/wb/include/captcha/captchas/calc_ttf_image.php =================================================================== --- trunk/wb/include/captcha/captchas/calc_ttf_image.php (nonexistent) +++ trunk/wb/include/captcha/captchas/calc_ttf_image.php (revision 615) @@ -0,0 +1,139 @@ + + Copyright (C) 2004-2008, Ryan Djurovich + + Website Baker is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Website Baker is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Website Baker; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +require_once("../../../config.php"); +require_once(WB_PATH.'/include/captcha/captcha.php'); + +if(!isset($_SESSION['captcha_time'])) + exit; +unset($_SESSION['captcha_time']); + +// get lists of fonts and backgrounds +require_once(WB_PATH.'/framework/functions.php'); +$t_fonts = file_list(WB_PATH.'/include/captcha/fonts'); +$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; + +// Captcha +$_SESSION['captcha'] = ''; +mt_srand((double)microtime()*1000000); +$n = mt_rand(1,3); +switch ($n) { + case 1: + $x = mt_rand(1,9); + $y = mt_rand(1,9); + $_SESSION['captcha'] = $x + $y; + $cap = "$x+$y"; + break; + case 2: + $x = mt_rand(10,20); + $y = mt_rand(1,9); + $_SESSION['captcha'] = $x - $y; + $cap = "$x-$y"; + break; + case 3: + $x = mt_rand(2,10); + $y = mt_rand(2,5); + $_SESSION['captcha'] = $x * $y; + $cap = "$x*$y"; + break; +} +$text = $cap; + +// choose a font and background +$font = $fonts[array_rand($fonts)]; +$bg = $bgs[array_rand($bgs)]; +// get image-dimensions +list($width, $height, $type, $attr) = getimagesize($bg); + +// create image +$image = ImageCreateFromPNG($bg); // background image +$grey = rand(0,50); +$color = ImageColorAllocate($image, $grey, $grey, $grey); // font-color +$ttf = $font; +$ttfsize = 25; // fontsize + +if(rand(0,2)==0) { // 1 out of 3 + + // draw each character individualy + $count = 0; + $image_failed = true; + $angle = rand(-10,10); + $x = rand(20,35); + $y = rand($height-10,$height-2); + do { + for($i=0;$i $width) { + $image_failed = true; + } else { + $image_failed = false; + } + if(++$count > 4) // too many tries! Use the image + break; + } while($image_failed); + +} else { + + // draw whole string at once + $image_failed = true; + $count=0; + do { + $image = ImageCreateFromPNG($bg); // background image + $grey = rand(0,50); + $color = ImageColorAllocate($image, $grey, $grey, $grey); // font-color + $angle = rand(0,5); + $x = rand(20,35); + $y = 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) && + ($res[6]>0 && $res[6]<$width) && ($res[7]>0 && $res[7]<$height) + ) { + $image_failed = false; + } + if(++$count > 4) // too many tries! Use the image + break; + } while($image_failed); + +} + +captcha_header(); +ob_start(); +imagepng($image); +header("Content-Length: ".ob_get_length()); +ob_end_flush(); +imagedestroy($image); + +?> \ No newline at end of file Property changes on: trunk/wb/include/captcha/captchas/calc_ttf_image.php ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: trunk/wb/include/captcha/captchas/calc_image.php =================================================================== --- trunk/wb/include/captcha/captchas/calc_image.php (revision 614) +++ trunk/wb/include/captcha/captchas/calc_image.php (revision 615) @@ -32,11 +32,10 @@ // Captcha $_SESSION['captcha'] = ''; -mt_srand((double)microtime()*100000); +mt_srand((double)microtime()*1000000); $n = mt_rand(1,3); switch ($n) { case 1: - mt_srand((double)microtime()*1000000); $x = mt_rand(1,9); $y = mt_rand(1,9); $_SESSION['captcha'] = $x + $y; @@ -43,7 +42,6 @@ $cap = "$x+$y"; break; case 2: - mt_srand((double)microtime()*1000000); $x = mt_rand(10,20); $y = mt_rand(1,9); $_SESSION['captcha'] = $x - $y; @@ -50,7 +48,6 @@ $cap = "$x-$y"; break; case 3: - mt_srand((double)microtime()*1000000); $x = mt_rand(2,10); $y = mt_rand(2,5); $_SESSION['captcha'] = $x * $y; Index: trunk/wb/include/captcha/captchas/calc_text.php =================================================================== --- trunk/wb/include/captcha/captchas/calc_text.php (revision 614) +++ trunk/wb/include/captcha/captchas/calc_text.php (revision 615) @@ -27,11 +27,10 @@ if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); } $_SESSION['captcha'] = ''; -mt_srand((double)microtime()*100000); +mt_srand((double)microtime()*1000000); $n = mt_rand(1,3); switch ($n) { case 1: - mt_srand((double)microtime()*1000000); $x = mt_rand(1,9); $y = mt_rand(1,9); $_SESSION['captcha'] = $x + $y; @@ -38,7 +37,6 @@ $cap = "$x {$MOD_CAPTCHA['ADDITION']} $y"; break; case 2: - mt_srand((double)microtime()*1000000); $x = mt_rand(10,20); $y = mt_rand(1,9); $_SESSION['captcha'] = $x - $y; @@ -45,7 +43,6 @@ $cap = "$x {$MOD_CAPTCHA['SUBTRAKTION']} $y"; break; case 3: - mt_srand((double)microtime()*1000000); $x = mt_rand(2,10); $y = mt_rand(2,5); $_SESSION['captcha'] = $x * $y; Index: trunk/wb/include/captcha/captcha.php =================================================================== --- trunk/wb/include/captcha/captcha.php (revision 614) +++ trunk/wb/include/captcha/captcha.php (revision 615) @@ -23,17 +23,6 @@ */ -/* CAPTCHA - How to use: - * use - * require_once(WB_PATH.'/include/captcha/captcha.php'); - * and put - * - * into your form. - * - * captcha-code is in $_SESSION['captcha'] - * user input in $_POST['captcha'] - */ - // Must include code to stop this file being accessed directly if(!defined('WB_PATH')) { exit("Cannot access this file directly"); } @@ -70,6 +59,7 @@ $useable_captchas = array( 'calc_text'=>$MOD_CAPTCHA_CONTROL['CALC_TEXT'], 'calc_image'=>$MOD_CAPTCHA_CONTROL['CALC_IMAGE'], + 'calc_ttf_image'=>$MOD_CAPTCHA_CONTROL['CALC_TTF_IMAGE'], 'ttf_image'=>$MOD_CAPTCHA_CONTROL['TTF_IMAGE'], 'old_image'=>$MOD_CAPTCHA_CONTROL['OLD_IMAGE'] ); @@ -94,26 +84,30 @@ switch(CAPTCHA_TYPE) { // two special cases case 'calc_text': // calculation as text - ?> - = -    - + + + +
 = 
- " align="middle" alt="Captcha" /> = -    - + + + +
" alt="Captcha" /> = 
- " align="middle" alt="Captcha" /> -    - + + + +
" alt="Captcha" />
\ No newline at end of file +?> Index: trunk/wb/include/captcha/readme.txt =================================================================== --- trunk/wb/include/captcha/readme.txt (revision 614) +++ trunk/wb/include/captcha/readme.txt (revision 615) @@ -26,6 +26,21 @@ - and by adding TrueType-fonts to fonts/ -The CAPTCHA-string is allways stored in $_SESSION['captcha'] -The input-field is called "captcha", too. +How to use: +use + require_once(WB_PATH.'/include/captcha/captcha.php'); // will output a table with 3 columns: |CAPTCHA|Input|Text| +and put + +into your form. + +The CAPTCHA-code is allways stored in $_SESSION['captcha'] +The user-input is in $_POST['captcha'] (or $_GET['captcha']). + + +call_captcha() will output code like this + + + + +
" alt="Captcha" />
Index: trunk/wb/modules/captcha_control/tool.php =================================================================== --- trunk/wb/modules/captcha_control/tool.php (revision 614) +++ trunk/wb/modules/captcha_control/tool.php (revision 615) @@ -74,12 +74,18 @@ pics["calc_image"] = new Image(); pics["calc_image"].src = ""; + pics["calc_ttf_image"] = new Image(); + pics["calc_ttf_image"].src = ""; + pics["old_image"] = new Image(); pics["old_image"].src = ""; pics["calc_text"] = new Image(); pics["calc_text"].src = ""; - + + function load_captcha_image() { + document.captcha_example.src = pics[document.store_settings.captcha_type.value].src; + } : - + @@ -129,6 +135,7 @@ name="enabled_captcha" value="0"> +  
: : @@ -139,6 +146,7 @@ name="enabled_asp" value="0"> +   Index: trunk/wb/modules/captcha_control/languages/EN.php =================================================================== --- trunk/wb/modules/captcha_control/languages/EN.php (revision 614) +++ trunk/wb/modules/captcha_control/languages/EN.php (revision 615) @@ -33,13 +33,16 @@ // Text and captions of form elements $MOD_CAPTCHA_CONTROL['CAPTCHA_CONF'] = 'CAPTCHA Configuration'; $MOD_CAPTCHA_CONTROL['CAPTCHA_TYPE'] = 'Type of CAPTCHA'; +$MOD_CAPTCHA_CONTROL['CAPTCHA_EXP'] = 'CAPTCHA settings for modules are located in the respective module settings'; $MOD_CAPTCHA_CONTROL['USE_SIGNUP_CAPTCHA']= 'Activate CAPTCHA for signup'; $MOD_CAPTCHA_CONTROL['ENABLED'] = 'Enabled'; $MOD_CAPTCHA_CONTROL['DISABLED'] = 'Disabled'; $MOD_CAPTCHA_CONTROL['ASP_CONF'] = 'Advanced Spam Protection Configuration'; $MOD_CAPTCHA_CONTROL['ASP_TEXT'] = 'Activate ASP (if available)'; +$MOD_CAPTCHA_CONTROL['ASP_EXP'] = 'ASP tries to determine if a form-inputs was originated from a human or a spam-bot.'; $MOD_CAPTCHA_CONTROL['CALC_TEXT'] = "Calculation as text"; -$MOD_CAPTCHA_CONTROL['CALC_IMAGE'] = "Calculation as image"; +$MOD_CAPTCHA_CONTROL['CALC_IMAGE'] = "Calculation as image"; +$MOD_CAPTCHA_CONTROL['CALC_TTF_IMAGE'] = "Calculation as image with varying fonts and backgrounds"; $MOD_CAPTCHA_CONTROL['TTF_IMAGE'] = "Image with varying fonts and backgrounds"; $MOD_CAPTCHA_CONTROL['OLD_IMAGE'] = "Old style (not recommended)"; Index: trunk/wb/modules/captcha_control/languages/DE.php =================================================================== --- trunk/wb/modules/captcha_control/languages/DE.php (revision 614) +++ trunk/wb/modules/captcha_control/languages/DE.php (revision 615) @@ -36,17 +36,20 @@ // Text and captions of form elements $MOD_CAPTCHA_CONTROL['CAPTCHA_CONF'] = 'CAPTCHA-Einstellungen'; $MOD_CAPTCHA_CONTROL['CAPTCHA_TYPE'] = 'CAPTCHA-Typ'; +$MOD_CAPTCHA_CONTROL['CAPTCHA_EXP'] = 'Die CAPTCHA-Einstellungen für die Module befinden sich in den jeweiligen Modul-Optionen'; $MOD_CAPTCHA_CONTROL['USE_SIGNUP_CAPTCHA']= 'CAPTCHA für Registrierung aktivieren'; $MOD_CAPTCHA_CONTROL['ENABLED'] = 'Aktiviert'; $MOD_CAPTCHA_CONTROL['DISABLED'] = 'Ausgeschaltet'; -$MOD_CAPTCHA_CONTROL['ASP_CONF'] = 'Advanced Spam Protection Configuration'; +$MOD_CAPTCHA_CONTROL['ASP_CONF'] = 'Erweiterter-Spam-Schutz (ASP) Einstellungen'; $MOD_CAPTCHA_CONTROL['ASP_TEXT'] = 'ASP benutzen (wenn im Modul vorhanden)'; +$MOD_CAPTCHA_CONTROL['ASP_EXP'] = 'ASP versucht anhand der verschiedenen Verhaltensweisen zu erkennen, ob eine Formular-Eingabe von einem Menschen oder einem Spam-Bot kommt.'; $MOD_CAPTCHA_CONTROL['CALC_TEXT'] = "Rechnung als Text"; -$MOD_CAPTCHA_CONTROL['CALC_IMAGE'] = "Rechnung als Bild"; +$MOD_CAPTCHA_CONTROL['CALC_IMAGE'] = "Rechnung als Bild"; +$MOD_CAPTCHA_CONTROL['CALC_TTF_IMAGE'] = "Rechnung als Bild mit wechselnden Schriften und Hintergründen"; $MOD_CAPTCHA_CONTROL['TTF_IMAGE'] = "Bild mit wechselnden Schriften und Hintergründen"; $MOD_CAPTCHA_CONTROL['OLD_IMAGE'] = "Alter Stil (nicht empfohlen)"; -$MOD_CAPTCHA['VERIFICATION'] = 'Verifizieren'; +$MOD_CAPTCHA['VERIFICATION'] = 'Prüfziffer'; $MOD_CAPTCHA['ADDITION'] = 'plus'; $MOD_CAPTCHA['SUBTRAKTION'] = 'minus'; $MOD_CAPTCHA['MULTIPLIKATION'] = 'mal';