Changeset 409

Timestamp:

08/26/07 13:44:14 (12 months ago)

Author:

Shadowhand

Message:

Fixing View to allow $this to be used in views (and refer to the controller), and enabling view-in-view loading to work. Also updated the Welcome controller to demonstrate how it's done.

Location:

branches/devel

Files:

• application/controllers/welcome.php (modified) (1 diff)
• system/libraries/Controller.php (modified) (2 diffs)
• system/libraries/View.php (modified) (1 diff)

branches/devel/application/controllers/welcome.php

@@ -1 +1 @@
 <?php
 
-class Welcome extends Controller {
+class Welcome_Controller extends Controller {
 
     function index()
     {
-        $this->load->view('welcome')->set('message', 'testing')->render(TRUE);
-        print "hi";
+        print new View('welcome', array('message' => 'testing calls back to the controller'));
+        
+        // $db = new Database();
+        // print_r ($db);
     }
 
-    function _index()
+    function say_hello()
     {
-        $this->load->helper('url');
-        print "<p>Welcome to ".url::site('welcome')."!</p>\n";
-        
-        $this->load->model('users');
-        print "<p>Model test: ".$this->users->hi()."!</p>\n";
-
-        print "<p>Rendered in {execution_time} seconds</p>\n";
+        return '<strong>OMG HI!!!!1</strong>';
     }
 
 }
-
-?>

branches/devel/system/libraries/Controller.php

@@ -2 +2 @@
 
 class Controller_Core extends Kohana {
-    
+
     public function __construct()
     {
@@ -10 +10 @@
         // Loader should always be available
         $this->load = new Loader();
-        
+
         // URI should always be available
         $this->uri = new URI();
     }
 
+    public function kohana_include_view($kohana_view_filename, $kohana_input_data)
+    {
+        // Buffering on
+        ob_start();
+
+        // Import the input variables to local namespace
+        extract($kohana_input_data, EXTR_SKIP);
+
+        // Views are straight HTML pages with embedded PHP, so importing them
+        // this way insures that $this can be accessed as if the user was in
+        // the controller, which gives the easiest access to libraries in views
+        include $kohana_view_filename;
+
+        // Fetch the HTML output
+        $kohana_view_output = ob_get_contents();
+
+        // Flush the buffer
+        ob_end_clean();
+
+        // Return the view, yay!
+        return $kohana_view_output;
+    }
+
 } // End Controller Class

branches/devel/system/libraries/View.php

@@ -82 +82 @@
     }
 
-    public function render($kohana_display_output = FALSE, $kohana_render_function = FALSE)
+    public function render($print = FALSE, $callback = FALSE)
     {
-        ob_start();
-        extract($this->data);
-        include $this->kohana_view_filename;
-        $kohana_view_output = ob_get_contents();
-        ob_end_clean();
+        $output = Kohana::instance()->kohana_include_view($this->kohana_view_filename, $this->data);
 
-        if ($kohana_render_function != FALSE AND function_exists($kohana_render_function))
+        if ($callback != FALSE)
         {
-            $kohana_view_output = $kohana_render_function($kohana_view_output);
+            $output = Kohana::callback($callback, $output);
         }
 
-        if ($kohana_display_output == TRUE)
+        if ($print == TRUE)
         {
-            print $kohana_view_output;
+            print $output;
         }
         else
         {
-            return $kohana_view_output;
+            return $output;
         }
     }
 
-}
-
-class NOT_Core_View {
-
-    var $load     = '';
-    var $data     = array();
-    var $template = 'template';
-
-    /**
-     * Constructor
-     */
-    function Core_View()
-    {
-        $CORE =& get_instance();
-        $this->load =& $CORE->load;
-    }
-
-    /**
-     * Get Variable
-     *
-     * @access  public
-     * @return  string
-     */
-    function get($key)
-    {
-        return (isset($this->data[$key]) ? $this->data[$key] : '');
-    }
-
-    /**
-     * Set Variable(s)
-     *
-     * @access  public
-     * @param   mixed
-     * @param   mixed
-     * @return  void
-     */
-    function set($key, $data = FALSE)
-    {
-        if (is_array($key))
-        {
-            $this->data = array_merge($this->data, $key);
-        }
-        else
-        {
-            $this->data[$key] = $data;
-        }
-    }
-
-    /**
-     * Add to a Variable(s)
-     *
-     * @access  public
-     * @param   string
-     * @param   string
-     * @return  void
-     */
-    function add($key, $data)
-    {
-        if (! is_string($key) OR ! is_string($data))
-            return;
-
-        if (isset($this->data[$key]))
-        {
-            $this->data[$key] .= $data;
-        }
-        else
-        {
-            $this->set($key, $data);
-        }
-    }
-
-    /**
-     * Delete Variables
-     *
-     * @access  public
-     * @param   string
-     * @return  void
-     */
-    function del($key)
-    {
-        if (isset($this->data[$key]))
-        {
-            unset($this->data[$key]);
-        }
-    }
-
-    /**
-     * Load a View
-     *
-     * Loads a template for inclusion into the template, or displays the template
-     *
-     * EXAMPLES:
-     * Load the "blog_content" view into the "body" variable:
-     *   load('blog_content', 'body')
-     * Load the "blog_content" view into the "blog_content" variable:
-     *   load('blog_content', TRUE)
-     * Load the currently set template and return it as a string:
-     *   load(TRUE)
-     * Load the current template and display it:
-     *   load()
-     *
-     * @access  public
-     * @param   string
-     * @param   string
-     * @return  void
-     */
-    function load($view = FALSE, $partial = FALSE)
-    {
-        if ($view == FALSE)
-        {
-            $view = $this->template;
-        }
-        elseif ($view === TRUE)
-        {
-            return $this->load->view($this->template, $this->data, TRUE);
-        }
-
-        if ($partial != FALSE)
-        {
-            $key = ($partial === TRUE) ? $view : $partial;
-            $this->data[$key] = $this->load->view($view, $this->data, TRUE);
-
-            return $this->data[$key];
-        }
-        else
-        {
-            $this->load->view($view, $this->data);
-        }
-    }
 } // End View Class