[phpwiki-checkins] SF.net SVN: phpwiki:[8217] trunk/lib/Captcha.php

[<var...@us...>]

Revision: 8217
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8217&view=rev
Author:   vargenau
Date:     2012-01-03 11:38:06 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Fix Captcha problem reported by Harold Hallikainen

Modified Paths:
--------------
    trunk/lib/Captcha.php

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2012-01-03 10:58:12 UTC (rev 8216)
+++ trunk/lib/Captcha.php	2012-01-03 11:38:06 UTC (rev 8217)
@@ -35,8 +35,8 @@
 
     function captchaword() {
         if ( ! $this->request->getSessionVar('captchaword')) {
-        $this->request->setSessionVar('captchaword', $this->get_word());
-    }
+            $this->request->setSessionVar('captchaword', $this->get_word());
+        }
         return $this->request->getSessionVar('captchaword');
     }
 
@@ -64,8 +64,9 @@
                                     'size'  => $this->length + 2,
                                     'maxlength' => 256));
             $url = WikiURL("", array("action"=>"captcha","id"=>time()), false);
-            $el['CAPTCHA_IMAGE'] = "<img src=\"$url\" alt=\"captcha\" />";
-            $el['CAPTCHA_LABEL'] = '<label for="edit-captcha_input">'._("Type word above:").' </label>';
+            $el['CAPTCHA_IMAGE'] = HTML::img(array('src' => $url, 'alt' => 'captcha'));
+            $el['CAPTCHA_LABEL'] = HTML::label(array('for' => 'edit-captcha_input'),
+                                               _("Type word above:"));
         }
         return $el;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.