Reorganise files in ConfirmEdit

[toast/cookiecaptcha.git] / QuestyCaptcha.class.php

diff --git a/QuestyCaptcha.class.php b/QuestyCaptcha.class.php
index cd9c71d05d7cd54729beb86917f324ef36694103..478fcf3480729b628c8350f4bffbb7f096d3590f 100644 (file)
--- a/QuestyCaptcha.class.php
+++ b/QuestyCaptcha.class.php
@@ -3,15 +3,20 @@
 /**
  * QuestyCaptcha class
  *
+ * @file
  * @author Benjamin Lees <emufarmers@gmail.com>
- * @addtogroup extensions
+ * @ingroup Extensions
  */
 
 class QuestyCaptcha extends SimpleCaptcha {
 
        /** Validate a captcha response */
        function keyMatch( $answer, $info ) {
-               return strtolower( $answer ) == strtolower( $info['answer'] );
+               if ( is_array( $info['answer'] ) ) {
+                       return in_array( strtolower( $answer ), $info['answer'] );
+               } else {
+                       return strtolower( $answer ) == strtolower( $info['answer'] );
+               }
        }
 
        function addCaptchaAPI( &$resultArr ) {
@@ -56,7 +61,7 @@ class QuestyCaptcha extends SimpleCaptcha {
        }
 
        function showHelp() {
-               global $wgOut, $ceAllowConfirmedEmail;
+               global $wgOut;
                $wgOut->setPageTitle( wfMsg( 'captchahelp-title' ) );
                $wgOut->addWikiText( wfMsg( 'questycaptchahelp-text' ) );
                if ( $this->storage->cookiesNeeded() ) {