Changeset 1161

Timestamp:

02/21/10 01:09:23 (3 years ago)

Author:

GneX

Message:

reCaptcha wird nun richtig angezeigt

Location:

org.gnex.reCaptcha

Files:

• files/lib/system/event/listener/ReCaptchaListener.class.php (modified) (2 diffs)
• package.xml (modified) (2 diffs)

org.gnex.reCaptcha/files/lib/system/event/listener/ReCaptchaListener.class.php

@@ -11 +11 @@
  */
 class ReCaptchaListener implements EventListener {
-        public $eventObj;
+        public $useCaptcha = null;
         
         /**
@@ -17 +17 @@
          */
         public function execute($eventObj, $className, $eventName) {
-    // break
-    if(!MODULE_RECAPTCHA || !RECAPTCHA_KEY_PUBLIC || !RECAPTCHA_KEY_PRIVATE || !isset($eventObj->useCaptcha) || !$eventObj->useCaptcha) {
-      return;
+    if ($this->useCaptcha === null) {
+      if (isset($eventObj->useCaptcha)) {
+        $this->useCaptcha = $eventObj->useCaptcha;
+        $eventObj->useCaptcha = false;
+      } else {
+        $this->useCaptcha = true;
+      }
     }
     
-    // completely disable parent handler
-    $eventObj->useCaptcha = false;
-    
-    // bind
-    $this->eventObj = $eventObj;
-    
-    // call our handler, if method is implemented
-    if(method_exists($this, $eventName)) {
-      $this->$eventName();
+    if ($this->useCaptcha) {
+      switch ($eventName) {
+        case 'validate':
+                $eventObj->captcha->validate($eventObj->captchaString);
+          $eventObj->captcha = new ReCaptcha($eventObj->captchaID);
+          $eventObj->captcha->validate($_SERVER['REMOTE_ADDR'], $_REQUEST['recaptcha_challenge_field'], $_REQUEST['recaptcha_response_field']);
+                $this->useCaptcha = false;
+        break;
+
+        case 'assignVariables':
+                        $eventObj->captchaID = ReCaptcha::create();
+          $eventObj->captcha = new ReCaptcha($eventObj->captchaID);
+          WCF::getTPL()->assign('captcha', $eventObj->captcha->getCode());
+        break;
+      }
     }
-  }
-  
-        public function readData() {
-          ###
-        }
-  
-        public function validate() {
-          $this->eventObj->captcha = new ReCaptcha($this->eventObj->captchaID);
-    $this->eventObj->captcha->validate($_SERVER['REMOTE_ADDR'], $_REQUEST['recaptcha_challenge_field'], $_REQUEST['recaptcha_response_field']);
-        }
-  
-        public function assignVariables() {
-    $this->eventObj->captchaID = ReCaptcha::create();
-    $this->eventObj->captcha = new ReCaptcha($this->eventObj->captchaID);
-          WCF::getTPL()->assign('captcha', $this->eventObj->captcha->getCode());
         }
 }

org.gnex.reCaptcha/package.xml

@@ -6 +6 @@
                 <packagedescription><![CDATA[Ersetzt das Sicherheitsbild mit dem bekannten ReCaptcha]]></packagedescription>
                 <isunique>1</isunique>
-                <version>1.0.3</version>
-                <date>2009-12-22</date>
+                <version>1.0.4</version>
+                <date>2010-02-17</date>
                 <plugin>com.woltlab.wcf</plugin>
                 <packageurl><![CDATA[http://GneX.org]]></packageurl>
@@ -43 +43 @@
                 <templates>templates.tar</templates>
         </instructions>
+        <instructions type="update" fromversion="1.0.3">
+                <eventlistener>eventlistener.xml</eventlistener>
+                <files>files.tar</files>
+        </instructions>
 </package>