More maintenance for ConfirmEdit extension.

[toast/cookiecaptcha.git] / FancyCaptcha.php

diff --git a/FancyCaptcha.php b/FancyCaptcha.php
index ec867e8739d57b850b80b71d1898306e3bc1aaa9..6de858a3f32c7e493eeaa8fe6e888dd74271c1a6 100644 (file)
--- a/FancyCaptcha.php
+++ b/FancyCaptcha.php
@@ -1,147 +1,54 @@
 <?php
 <?php

+/**
+ * Experimental image-based captcha plugin, using images generated by an
+ * external tool.
+ *
+ * Copyright (C) 2005, 2006 Brion Vibber <brion@pobox.com>
+ * http://www.mediawiki.org/
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Extensions
+ */

 
 

-if ( defined( 'MEDIAWIKI' ) ) {
+if ( !defined( 'MEDIAWIKI' ) ) {
+       exit;
+}
+
+$dir = __DIR__;
+require_once $dir . '/ConfirmEdit.php';
+$wgCaptchaClass = 'FancyCaptcha';

 
 global $wgCaptchaDirectory;
 $wgCaptchaDirectory = "$wgUploadDirectory/captcha"; // bad default :D
 
 
 global $wgCaptchaDirectory;
 $wgCaptchaDirectory = "$wgUploadDirectory/captcha"; // bad default :D
 

+global $wgCaptchaDirectoryLevels;
+$wgCaptchaDirectoryLevels = 0; // To break into subdirectories
+

 global $wgCaptchaSecret;
 $wgCaptchaSecret = "CHANGE_THIS_SECRET!";
 
 global $wgCaptchaSecret;
 $wgCaptchaSecret = "CHANGE_THIS_SECRET!";
 

+/**
+ * By default the FancyCaptcha rotates among all available captchas.
+ * Setting $wgCaptchaDeleteOnSolve to true will delete the captcha
+ * files when they are correctly solved. Thus the user will need
+ * something like a cron creating new thumbnails to avoid drying up.
+ */
+$wgCaptchaDeleteOnSolve = false;

 
 

-class FancyCaptcha extends SimpleCaptcha {
-       function keyMatch() {
-               global $wgRequest, $wgCaptchaSecret;
-               
-               if( !isset( $_SESSION['ceAnswerVar'] ) ) {
-                       wfDebug( "FancyCaptcha: no session captcha key set, this is new visitor.\n" );
-                       return false;
-               }
-               
-               $var  = @$_SESSION['ceAnswerVar'];
-               $salt = @$_SESSION['captchaSalt'];
-               $hash = @$_SESSION['captchaHash'];
-               
-               $answer = $wgRequest->getVal( $var );
-               $digest = $wgCaptchaSecret . $salt . $answer . $wgCaptchaSecret . $salt;
-               $answerHash = substr( md5( $digest ), 0, 16 );
-               
-               if( $answerHash == $hash ) {
-                       wfDebug( "FancyCaptcha: answer hash matches expected $hash\n" );
-                       return true;
-               } else {
-                       wfDebug( "FancyCaptcha: answer hashes to $answerHash, expected $hash\n" );
-                       return false;
-               }
-       }
-       
-       /**
-        * Insert the captcha prompt into the edit form.
-        */
-       function formCallback( &$out ) {
-               $dest = 'wpCaptchaWord' . mt_rand();
-               
-               $img = $this->pickImage();
-               if( !$img ) {
-                       die( "out of captcha images; this shouldn't happen" );
-               }
-               
-               $_SESSION['ceAnswerVar'] = $dest;
-               $_SESSION['captchaHash'] = $img['hash'];
-               $_SESSION['captchaSalt'] = $img['salt'];
-               $_SESSION['captchaViewed'] = false;
-               wfDebug( "Picked captcha with hash ${img['hash']}, salt ${img['salt']}.\n" );
-               
-               $title = Title::makeTitle( NS_SPECIAL, 'Captcha/image' );
-               
-               $out->addWikiText( wfMsg( "captcha-short" ) );  
-               $out->addHTML( "<p>" . 
-                       wfElement( 'img', array(
-                               'src'    => $title->getLocalUrl(),
-                               'width'  => $img['width'],
-                               'height' => $img['height'],
-                               'alt'    => '' ) ) .
-                       "</p>\n" .
-                       "<p><input name=\"$dest\" id=\"$dest\" tabindex=\"1\" /></p>" );
-       }
-       
-       /**
-        * Select a previously generated captcha image from the queue.
-        * @fixme subject to race conditions if lots of files vanish
-        * @return mixed tuple of (salt key, text hash) or false if no image to find
-        */
-       function pickImage() {
-               global $wgCaptchaDirectory;
-               $pick = mt_rand( 0, $this->countFiles( $wgCaptchaDirectory ) );
-               $dir = opendir( $wgCaptchaDirectory );
-               
-               $n = mt_rand( 0, 16 );
-               $count = 0;
-               
-               $entry = readdir( $dir );
-               $pick = false;
-               while( false !== $entry ) {
-                       $entry = readdir( $dir );
-                       if( preg_match( '/^image_([0-9a-f]+)_([0-9a-f]+)\\.png$/', $entry, $matches ) ) {
-                               $size = getimagesize( "$wgCaptchaDirectory/$entry" );
-                               $pick = array(
-                                       'salt' => $matches[1],
-                                       'hash' => $matches[2],
-                                       'width' => $size[0],
-                                       'height' => $size[1]
-                               );
-                               if( $count++ == $n ) {
-                                       break;
-                               }
-                       }
-               }
-               closedir( $dir );
-               return $pick;
-       }
-       
-       /**
-        * Count the number of files in a directory.
-        * @return int
-        */
-       function countFiles( $dirname ) {
-               $dir = opendir( $dirname );
-               $count = 0;
-               while( false !== ($entry = readdir( $dir ) ) ) {
-                       if( $dir != '.' && $dir != '..' ) {
-                               $count++;
-                       }
-               }
-               closedir( $dir );
-               return $count;
-       }
-       
-       function showImage() {
-               global $wgOut;
-               $wgOut->disable();
-               if( !empty( $_SESSION['captchaViewed'] ) ) {
-                       wfHttpError( 403, 'Access Forbidden', "Can't view captcha image a second time." );
-                       return false;
-               }
-               $_SESSION['captchaViewed'] = wfTimestamp();
-               
-               if( isset( $_SESSION['captchaSalt'] ) ) {
-                       $salt = $_SESSION['captchaSalt'];
-                       if( isset( $_SESSION['captchaHash'] ) ) {
-                               $hash = $_SESSION['captchaHash'];
-                               
-                               global $wgCaptchaDirectory;
-                               $file = $wgCaptchaDirectory . DIRECTORY_SEPARATOR . "image_{$salt}_{$hash}.png";
-                               if( file_exists( $file ) ) {
-                                       header( 'Content-type: image/png' );
-                                       readfile( $file );
-                               }
-                       }
-               } else {
-                       wfHttpError( 500, 'Internal Error', 'Requested bogus captcha image' );
-               }
-       }
-}
-
-} # End invocation guard
-
-?>
+$wgExtensionMessagesFiles['FancyCaptcha'] = $dir . '/FancyCaptcha.i18n.php';
+$wgAutoloadClasses['FancyCaptcha'] = $dir . '/FancyCaptcha.class.php';