Changeset 4929

Timestamp:

Jan 12, 2008, 6:35:02 AM (15 years ago)

Author:

ebihara

Message:

#1755:KCAPTCHAのバージョンを1.2.3から1.2.5に上げた

Location:

OpenPNE/trunk/lib/include/kcaptcha

Files:

• kcaptcha.php (modified) (14 diffs)
• util (added)
• util/font_preparer.php (added)

OpenPNE/trunk/lib/include/kcaptcha/kcaptcha.php

@@ -1 +1 @@
 <?php
 
-# KCAPTCHA PROJECT VERSION 1.2.3
+# KCAPTCHA PROJECT VERSION 1.2.5
 
 # Automatic test to tell computers and humans apart
 
-# Copyright by Kruglov Sergei, 2006
+# Copyright by Kruglov Sergei, 2006, 2007
 # www.captcha.ru, www.kruglov.ru
 
-# System requirements: PHP w/ GD
+# System requirements: PHP 4.0.6+ w/ GD
 
 # KCAPTCHA is a free software. You can freely use it for building own site or software.
@@ -21 +21 @@
         // generates keystring and image
         function KCAPTCHA(){
+
                 require(dirname(__FILE__).'/kcaptcha_config.php');
                 $fonts=array();
@@ -42 +43 @@
                                         $this->keystring.=$allowed_symbols{mt_rand(0,strlen($allowed_symbols)-1)};
                                 }
-                                if(!preg_match('/cp|cb|ck|c6|c9|rn|rm|co|do/',$this->keystring)) break;
+                                if(!preg_match('/cp|cb|ck|c6|c9|rn|rm|mm|co|do|cl|db|qp|qb|dp/', $this->keystring)) break;
                         }
                 
-                        $font_file=$fonts[mt_rand(0,count($fonts)-1)];
+                        $font_file=$fonts[mt_rand(0, count($fonts)-1)];
                         $font=imagecreatefrompng($font_file);
-                        $black=imagecolorallocate($font,0,0,0);
+                        imagealphablending($font, true);
                         $fontfile_width=imagesx($font);
                         $fontfile_height=imagesy($font)-1;
@@ -72 +73 @@
                         }
 
-                        $img=imagecreatetruecolor($width,$height);
-                        $white=imagecolorallocate($img,255,255,255);
-                        $black=imagecolorallocate($img,0,0,0);
-
-                        imagefilledrectangle ($img,0,0,$width-1,$height-1,$white);
+                        $img=imagecreatetruecolor($width, $height);
+                        imagealphablending($img, true);
+                        $white=imagecolorallocate($img, 255, 255, 255);
+                        $black=imagecolorallocate($img, 0, 0, 0);
+
+                        imagefilledrectangle($img, 0, 0, $width-1, $height-1, $white);
 
                         // draw text
@@ -89 +91 @@
                                         if($i>0){
                                                 $shift=1000;
-                                                for($sy=1;$sy<$fontfile_height-15;$sy+=2){
-                                                        for($sx=$m['start']-1;$sx<$m['end'];$sx++){
+                                                for($sy=7;$sy<$fontfile_height-20;$sy+=1){
+                                                        //for($sx=$m['start']-1;$sx<$m['end'];$sx+=1){
+                                                        for($sx=$m['start']-1;$sx<$m['end'];$sx+=1){
                                                         $rgb=imagecolorat($font, $sx, $sy);
                                                         $opacity=$rgb>>24;
@@ -96 +99 @@
                                                                         $left=$sx-$m['start']+$x;
                                                                         $py=$sy+$y;
-                                                                        for($px=min($left,$width-1);$px>$left-15 && $px>=0;$px--){
+                                                                        if($py>$height) break;
+                                                                        for($px=min($left,$width-1);$px>$left-12 && $px>=0;$px-=1){
                                                                         $color=imagecolorat($img, $px, $py) & 0xff;
                                                                                 if($color+$opacity<190){
@@ -109 +113 @@
                                                         }
                                                 }
+                                                if($shift==1000){
+                                                        $shift=mt_rand(4,6);
+                                                }
+
                                         }
                                 }else{
@@ -122 +130 @@
 
                 // credits. To remove, see configuration file
-                $img2=imagecreatetruecolor($width, $height+($show_credits?'12':0));
+                $img2=imagecreatetruecolor($width, $height+($show_credits?12:0));
                 $foreground=imagecolorallocate($img2, $foreground_color[0], $foreground_color[1], $foreground_color[2]);
                 $background=imagecolorallocate($img2, $background_color[0], $background_color[1], $background_color[2]);
+                imagefilledrectangle($img2, 0, 0, $width-1, $height-1, $background);            
                 imagefilledrectangle($img2, 0, $height, $width-1, $height+12, $foreground);
                 $credits=empty($credits)?$_SERVER['HTTP_HOST']:$credits;
@@ -135 +144 @@
                 $rand4=mt_rand(750000,1200000)/10000000;
                 // phases
-                $rand5=mt_rand(0,3141592)/500000;
-                $rand6=mt_rand(0,3141592)/500000;
-                $rand7=mt_rand(0,3141592)/500000;
-                $rand8=mt_rand(0,3141592)/500000;
+                $rand5=mt_rand(0,31415926)/10000000;
+                $rand6=mt_rand(0,31415926)/10000000;
+                $rand7=mt_rand(0,31415926)/10000000;
+                $rand8=mt_rand(0,31415926)/10000000;
                 // amplitudes
                 $rand9=mt_rand(330,420)/110;
@@ -144 +153 @@
 
                 //wave distortion
+
                 for($x=0;$x<$width;$x++){
                         for($y=0;$y<$height;$y++){
                                 $sx=$x+(sin($x*$rand1+$rand5)+sin($y*$rand3+$rand6))*$rand9-$width/2+$center+1;
                                 $sy=$y+(sin($x*$rand2+$rand7)+sin($y*$rand4+$rand8))*$rand10;
-                
+
                                 if($sx<0 || $sy<0 || $sx>=$width-1 || $sy>=$height-1){
-                                        $color=255;
-                                        $color_x=255;
-                                        $color_y=255;
-                                        $color_xy=255;
+                                        continue;
                                 }else{
                                         $color=imagecolorat($img, $sx, $sy) & 0xFF;
@@ -161 +168 @@
                                 }
 
-                                if($color==0 && $color_x==0 && $color_y==0 && $color_xy==0){
+                                if($color==255 && $color_x==255 && $color_y==255 && $color_xy==255){
+                                        continue;
+                                }else if($color==0 && $color_x==0 && $color_y==0 && $color_xy==0){
                                         $newred=$foreground_color[0];
                                         $newgreen=$foreground_color[1];
                                         $newblue=$foreground_color[2];
-                                }else if($color==255 && $color_x==255 && $color_y==255 && $color_xy==255){
-                                        $newred=$background_color[0];
-                                        $newgreen=$background_color[1];
-                                        $newblue=$background_color[2];  
                                 }else{
                                         $frsx=$sx-floor($sx);
@@ -174 +179 @@
                                         $frsx1=1-$frsx;
                                         $frsy1=1-$frsy;
+
                                         $newcolor=(
                                                 $color*$frsx1*$frsy1+
@@ -189 +195 @@
                                 }
 
-                                imagesetpixel($img2, $x, $y, imagecolorallocate($img2,$newred,$newgreen,$newblue));
+                                imagesetpixel($img2, $x, $y, imagecolorallocate($img2, $newred, $newgreen, $newblue));
                         }
                 }
@@ -211 +217 @@
 }
 
-
 ?>