7 files changed, 70 insertions, 25 deletions
diff --git a/core/config/routes.php b/core/config/routes.php
index 9a802a27..cf1a9e0d 100644
--- a/core/config/routes.php
+++ b/core/config/routes.php
@@ -21,10 +21,11 @@
 // The abstract REST_Controller is not directly routable.
 $config["^rest\b.*"] = null;
 
+// Admin controllers are not available, except via /admin
+$config["^admin_.*"] = null;
+
 // Redirect /form/add and /form/edit to REST_Controller.
 $config["^form/(edit|add)/(\w+)/(.*)$"] = "$2/form_$1/$3";
 
-$config["^admin/(\w+)/(.*)$"] = "$1_admin/$2";
-
 // For now our default page is the scaffolding.
 $config["_default"] = "welcome";
diff --git a/core/controllers/admin.php b/core/controllers/admin.php
index 9147059b..30e65886 100644
--- a/core/controllers/admin.php
+++ b/core/controllers/admin.php
@@ -25,32 +25,25 @@ class Admin_Controller extends Controller {
     parent::__construct();
   }
 
-  public function index() {
-    $theme_name = module::get_var("core", "active_admin_theme", "admin_default");
-    $template = new Admin_View("admin.html", $theme_name);
-    $template->content = new View("dashboard.html");
-    print $template;
-  }
-
-  public function __call($page_name, $args) {
-    $theme_name = module::get_var("core", "active_admin_theme", "admin_default");
-    // For now, we have only two legal pages.
-    // @todo get these pages from the modules
-    switch($page_name) {
-    case "users":
-      $view = new Admin_View("users.html", $theme_name);
-      $view->users = ORM::factory("user")->find_all();
-      break;
+  public function __call($controller_name, $args) {
+    if ($controller_name == "index") {
+      $controller_name = "dashboard";
+    }
 
-    case "dashboard":
-      $view = new Admin_View("dashboard.html", $theme_name);
-      break;
+    $controller = "Admin_{$controller_name}_Controller";
+    $controller = new $controller;
 
-    default:
-      Kohana::show_404();
+    if ($args) {
+      $method = array_unshift($args);
+    } else {
+      $method = "index";
     }
 
-    print $view;
+    $theme_name = module::get_var("core", "active_admin_theme", "admin_default");
+    $template = new Admin_View("admin.html", $theme_name);
+    $template->content =
+      call_user_func_array(array(new $controller, $method), $args);
+    print $template;
   }
 }
 
diff --git a/core/controllers/admin_dashboard.php b/core/controllers/admin_dashboard.php
new file mode 100644
index 00000000..7d752495
--- /dev/null
+++ b/core/controllers/admin_dashboard.php
@@ -0,0 +1,25 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Admin_Dashboard_Controller extends Controller {
+  public function index() {
+    return new View("admin_dashboard.html");
+  }
+}
+
diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php
index 674c73e2..284bb10d 100644
--- a/core/helpers/core_menu.php
+++ b/core/helpers/core_menu.php
@@ -70,7 +70,7 @@ class core_menu_Core {
       ->append(Menu::factory("link")
                ->id("dashboard")
                ->label(_("Dashboard"))
-               ->url(url::site("admin/dashboard")))
+               ->url(url::site("admin")))
       ->append(Menu::factory("link")
                ->id("general_settings")
                ->label(_("General Settings"))
diff --git a/themes/admin_default/views/dashboard.html.php b/core/views/admin_dashboard.html.php
index 1cfd8e23..1cfd8e23 100644
--- a/themes/admin_default/views/dashboard.html.php
+++ b/core/views/admin_dashboard.html.php
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
new file mode 100644
index 00000000..7325455c
--- /dev/null
+++ b/modules/user/controllers/admin_users.php
@@ -0,0 +1,26 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Admin_Users_Controller extends Controller {
+  public function index() {
+    $view = new View("admin_users.html");
+    $view->users = ORM::factory("user")->find_all();
+    return $view;
+  }
+}
diff --git a/themes/admin_default/views/users.html.php b/modules/user/views/admin_users.html.php
index 5e43fae9..5e43fae9 100644
--- a/themes/admin_default/views/users.html.php
+++ b/modules/user/views/admin_users.html.php