Merge over vendor code.

git-svn-id: http://gallery.svn.sourceforge.net/svnroot/gallery/trunk/eval/gx/gallery3/trunk@18408 57fcd75e-5312-0410-8df3-f5eb6fbb1595

2 files changed, 77 insertions, 0 deletions

diff --git a/kohana/controllers/captcha.php b/kohana/controllers/captcha.php
new file mode 100644
index 00000000..60f9f401
--- /dev/null
+++ b/kohana/controllers/captcha.php
@@ -0,0 +1,23 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Outputs the dynamic Captcha resource.
+ * Usage: Call the Captcha controller from a view, e.g.
+ *        <img src="<?php echo url::site('captcha') ?>" />
+ *
+ * $Id$
+ *
+ * @package    Captcha
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2008 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+class Captcha_Controller extends Controller {
+
+	public function __call($method, $args)
+	{
+		// Output the Captcha challenge resource (no html)
+		// Pull the config group name from the URL
+		Captcha::factory($this->uri->segment(2))->render(FALSE);
+	}
+
+} // End Captcha_Controller
\ No newline at end of file
diff --git a/kohana/controllers/template.php b/kohana/controllers/template.php
new file mode 100644
index 00000000..189f2da8
--- /dev/null
+++ b/kohana/controllers/template.php
@@ -0,0 +1,54 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+/**
+ * Allows a template to be automatically loaded and displayed. Display can be
+ * dynamically turned off in the controller methods, and the template file
+ * can be overloaded.
+ *
+ * To use it, declare your controller to extend this class:
+ * `class Your_Controller extends Template_Controller`
+ *
+ * $Id$
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2008 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+abstract class Template_Controller extends Controller {
+
+	// Template view name
+	public $template = 'template';
+
+	// Default to do auto-rendering
+	public $auto_render = TRUE;
+
+	/**
+	 * Template loading and setup routine.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Load the template
+		$this->template = new View($this->template);
+
+		if ($this->auto_render == TRUE)
+		{
+			// Render the template immediately after the controller method
+			Event::add('system.post_controller', array($this, '_render'));
+		}
+	}
+
+	/**
+	 * Render the loaded template.
+	 */
+	public function _render()
+	{
+		if ($this->auto_render == TRUE)
+		{
+			// Render the template when the class is destroyed
+			$this->template->render(TRUE);
+		}
+	}
+
+} // End Template_Controller
\ No newline at end of file