Normalize our Admin controllers so that functions always print out

their results, as opposed to having them return their view back
upstream.  This is a little more code in every controller, but it's
much less magical and more consistent.

Look up the active_theme and active_admin_theme inside the view
itself, no need to do that in the controllers.  This makes view
initialization easier in the controllers.

3 files changed, 15 insertions, 11 deletions

diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 94890639..d87ab8e8 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -21,7 +21,6 @@ class Tags_Controller extends REST_Controller {
   protected $resource_type = "tag";
 
   public function _show($tag) {
-    $theme_name = module::get_var("core", "active_theme", "default");
     $page_size = module::get_var("core", "page_size", 9);
     $page = $this->input->get("page", "1");
     $children_count = $tag->items_count();
@@ -32,7 +31,7 @@ class Tags_Controller extends REST_Controller {
       Kohana::show_404();
     }
 
-    $template = new Theme_View("page.html", "tag", $theme_name);
+    $template = new Theme_View("page.html", "tag");
     $template->set_global('page_size', $page_size);
     $template->set_global('tag', $tag);
     $template->set_global('children', $tag->items($page_size, $offset));
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 38e4e43a..ac328780 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -19,9 +19,10 @@
  */
 class Admin_Users_Controller extends Controller {
   public function index() {
-    $view = new View("admin_users.html");
-    $view->users = ORM::factory("user")->find_all();
-    return $view;
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_users.html");
+    $view->content->users = ORM::factory("user")->find_all();
+    print $view;
   }
 
   public function edit($id) {
@@ -40,6 +41,8 @@ class Admin_Users_Controller extends Controller {
       url::redirect("admin/users/edit/$id");
     }
 
-    return $form;
+    $view = new Admin_View("admin.html");
+    $view->content = $form;
+    print $view;
   }
 }
diff --git a/modules/watermark/controllers/admin_watermarks.php b/modules/watermark/controllers/admin_watermarks.php
index 972e506e..469f14fe 100644
--- a/modules/watermark/controllers/admin_watermarks.php
+++ b/modules/watermark/controllers/admin_watermarks.php
@@ -41,17 +41,19 @@ class Admin_Watermarks_Controller extends Admin_Controller {
           $watermark->height = $image_info[1];
           $watermark->mime_type = $image_info["mime"];
           $watermark->save();
+
           message::add(_("Watermark saved"));
-          url::redirect("admin/watermarks");
+          response::redirect("admin/watermarks");
         }
       }
       @unlink($file);
     }
 
-    $view = new View("admin_watermarks.html");
-    $view->watermarks = ORM::factory("watermark")->find_all();
-    $view->form = watermark::get_watermark_form();
-    return $view;
+    $view = new Admin_View("admin.html");
+    $view->content = new View("admin_watermarks.html");
+    $view->content->watermarks = ORM::factory("watermark")->find_all();
+    $view->content->form = watermark::get_watermark_form();
+    print $view;
   }
 
   public function get_form($user_id) {