Changeset 3015 for trunk/system/controllers/captcha.php

Timestamp:

07/09/2008 03:45:47 PM (5 months ago)

Author:

Geert

Message:

Revamped Captcha library big time.

• Each Captcha style has its own driver which generates and renders a Captcha challenge. The output could be an image, but could be anything else since html output is allowed. I included a Riddle driver to give you an idea of the flexibility.
  
• Config groups supported.
  
• More polished coding style and structure in general.
  
• Still needs work on the image generating part. Mostly GD2 stuff, and quite some copy and paste from the previous version. Any help appreciated. :)
  

Files:

• trunk/system/controllers/captcha.php (modified) (2 diffs)

trunk/system/controllers/captcha.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 /**
- * Allows a CAPTCHA image to be displayed dynamically.
- * Captcha library is called to output the image.
- *
- *
- * Usage: Call the captcha controller from a view.
- *        `echo html::image(url::site().'captcha');`
+ * Outputs the dynamic Captcha image.
+ * Usage: Call the Captcha controller from a view, e.g.
+ *        <img src="<?php echo url::site('captcha') ?>" />
  *
  * $Id$
  *
- * @package    Core
+ * @package    Captcha
  * @author     Kohana Team
  * @copyright  (c) 2007-2008 Kohana Team
@@ -17 +14 @@
 class Captcha_Controller extends Controller {
 
-        public $session;
-        public $captcha;
-
-        protected $captcha_code;
-
         public function index()
         {
-                $this->session = Session::instance();
-                $this->captcha = new Captcha;
-
-                // Create and store a random captcha string
-                $this->captcha_code = $this->create_code();
-                $this->captcha->set_code($this->captcha_code);
-                $this->session->set('captcha_code', $this->captcha_code);
-
-                // Output the image
-                $this->captcha->render();
-        }
-
-        private function create_code()
-        {
-                if (Config::item('captcha.style') === 'math')
-                {
-                        $code = (string) mt_rand(101, 991);
-                }
-                else
-                {
-                        $code = text::random('distinct', Config::item('captcha.num_chars'));
-                }
-
-                return $code;
+                // Output the Captcha challenge resource (no html)
+                $captcha = new Captcha;
+                $captcha->render(FALSE);
         }