Move profiling and debugging out of the scaffolding and into the

developer module.

4 files changed, 42 insertions, 34 deletions

diff --git a/core/controllers/scaffold.php b/core/controllers/scaffold.php
index c8360b58..b89c27ce 100644
--- a/core/controllers/scaffold.php
+++ b/core/controllers/scaffold.php
@@ -365,12 +365,6 @@ class Scaffold_Controller extends Template_Controller {
     return $results;
   }
 
-  public function session($key) {
-    Session::instance()->set($key, $this->input->get("value", false));
-    $this->auto_render = false;
-    url::redirect($_SERVER["HTTP_REFERER"]);
-  }
-
   private function _get_config_errors() {
     $errors = array();
     if (!file_exists(VARPATH)) {
diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php
index bd6c8596..69959ef3 100644
--- a/core/helpers/core_menu.php
+++ b/core/helpers/core_menu.php
@@ -27,30 +27,6 @@ class core_menu_Core {
                              ->id("scaffold_home")
                              ->label("Dashboard")
                              ->url(url::site("scaffold")));
-
-      if (Session::instance()->get("profiler", false)) {
-        $scaffold_menu->append(Menu::factory("link")
-                               ->id("scaffold_profiler")
-                               ->label("Profiling off")
-                               ->url(url::site("scaffold/session/profiler?value=0")));
-      } else {
-        $scaffold_menu->append(Menu::factory("link")
-                               ->id("scaffold_profiler")
-                               ->label("Profiling on")
-                               ->url(url::site("scaffold/session/profiler?value=1")));
-      }
-
-      if (Session::instance()->get("debug", false)) {
-        $scaffold_menu->append(Menu::factory("link")
-                               ->id("scaffold_debugger")
-                               ->label("Debugging off")
-                               ->url(url::site("scaffold/session/debug?value=0")));
-      } else {
-        $scaffold_menu->append(Menu::factory("link")
-                               ->id("scaffold_debugger")
-                               ->label("Debugging on")
-                               ->url(url::site("scaffold/session/debug?value=1")));
-      }
     }
 
     $menu->append(Menu::factory("link")
diff --git a/modules/developer/controllers/admin_developer.php b/modules/developer/controllers/admin_developer.php
index 0f4eb125..b961959a 100644
--- a/modules/developer/controllers/admin_developer.php
+++ b/modules/developer/controllers/admin_developer.php
@@ -86,6 +86,16 @@ class Admin_Developer_Controller extends Admin_Controller {
     }
   }
 
+  public function session($key) {
+    if (!(user::active()->admin)) {
+      throw new Exception("@todo UNAUTHORIZED", 401);
+    }
+
+    Session::instance()->set($key, $this->input->get("value", false));
+    $this->auto_render = false;
+    url::redirect($_SERVER["HTTP_REFERER"]);
+  }
+
   private function _get_module_create_content($form, $errors) {
     $config = Kohana::config("developer.methods");
 
diff --git a/modules/developer/helpers/developer_menu.php b/modules/developer/helpers/developer_menu.php
index 903464be..c8736c06 100644
--- a/modules/developer/helpers/developer_menu.php
+++ b/modules/developer/helpers/developer_menu.php
@@ -19,10 +19,38 @@
  */
 class developer_menu_Core {
   static function admin($menu, $theme) {
-    $menu
-      ->append(Menu::factory("link")
+    $developer_menu = Menu::factory("submenu")
         ->id("developer_menu")
-        ->label(t("Developer Tools"))
-        ->url(url::site("admin/developer")));
+      ->label(t("Developer Tools"));
+    $menu->append($developer_menu);
+    
+    $developer_menu
+      ->append(Menu::factory("link")
+          ->id("generate_menu")
+          ->label(t("Generate"))
+          ->url(url::site("admin/developer")));
+    if (Session::instance()->get("profiler", false)) {
+      $developer_menu->append(Menu::factory("link")
+                              ->id("scaffold_profiler")
+                              ->label("Profiling off")
+                              ->url(url::site("admin/developer/session/profiler?value=0")));
+    } else {
+      $developer_menu->append(Menu::factory("link")
+                              ->id("scaffold_profiler")
+                              ->label("Profiling on")
+                              ->url(url::site("admin/developer/session/profiler?value=1")));
+    }
+
+    if (Session::instance()->get("debug", false)) {
+      $developer_menu->append(Menu::factory("link")
+                              ->id("scaffold_debugger")
+                              ->label("Debugging off")
+                              ->url(url::site("admin/developer/session/debug?value=0")));
+    } else {
+      $developer_menu->append(Menu::factory("link")
+                              ->id("scaffold_debugger")
+                              ->label("Debugging on")
+                              ->url(url::site("admin/developer/session/debug?value=1")));
+    }
   }
 }