Added users and groups and a couple basic options (dev & admin) for testing. Since dev/admin is now a database option, the special routing mechanism has been removed.

git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@801 97e9348a-65ac-dc4b-aefc-98561f571b83

site/app_controller.php

@@ -279,10 +279,8 @@ class AppController extends Controller {
    */
 
   function beforeFilter() {
-    $this->params['dev'] =
-      (!empty($this->params['dev_route']));
-    $this->params['admin'] =
-      (!empty($this->params['admin_route']) || !empty($this->params['dev_route']));
+    $this->params['dev']   = $this->Option->enabled('dev');
+    $this->params['admin'] = $this->Option->enabled('admin');
 
     if (!$this->params['dev'])
       Configure::write('debug', '0');

site/app_helper.php

@@ -38,13 +38,5 @@ App::import('Core', 'Helper');
  */
 class AppHelper extends Helper {
 
-  function url($url = null, $full = false) {
-    foreach(array('admin_route', 'dev_route') AS $mod) {
-      if (isset($this->params[$mod]) && is_array($url) && !isset($url[$mod]))
-            $url[$mod] = $this->params[$mod];
-    }
-    return parent::url($url, $full);
-  }
-
 }
 ?>

site/config/routes.php

@@ -36,20 +36,4 @@ $default_path = array('controller' => 'maps', 'action' => 'view', '1');
  */
 Router::connect('/', $default_path);
 
-/*
- * Route for admin functionality
- */
-Router::connect('/admin',
-		array('admin_route' => true) + $default_path);
-Router::connect('/admin/:controller/:action/*',
-		array('admin_route' => true, 'action' => null));
-
-/*
- * Route for development functionality
- */
-Router::connect('/dev',
-		array('dev_route' => true) + $default_path);
-Router::connect('/dev/:controller/:action/*',
-		array('dev_route' => true, 'action' => null));
-
 ?>

site/models/option.php

@@ -12,7 +12,7 @@ class Option extends AppModel {
   static $option_set = array();
 
   function getAll($name) {
-    $this->prClassLevel(30);
+/*     $this->prClassLevel(30); */
 /*     //$this->OptionValue->prClassLevel(30); */
 /*     $this->Group->Membership->prClassLevel(30); */
 /*     $this->OptionValue->SiteOption->prClassLevel(30); */
@@ -64,4 +64,13 @@ class Option extends AppModel {
     return $this->prReturn($values[0]);
   }
 
+  function enabled($name) {
+    $val = $this->get($name);
+    return (!empty($val));
+  }
+
+  function disabled($name) {
+    return (!$this->enabled($name));
+  }
+
 }

site/models/permission.php

@@ -11,7 +11,7 @@ class Permission extends AppModel {
   static $permission_set = array();
 
   function getAll($name, $force = false) {
-    $this->prClassLevel(30);
+/*     $this->prClassLevel(30); */
 /*     $this->PermissionValue->prClassLevel(30); */
 /*     $this->Group->Membership->prClassLevel(30); */
 /*     $this->PermissionValue->SitePermission->prClassLevel(30); */