abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@801 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-28 04:47:33 +00:00
parent a66024c889
commit 43c957baa2
7 changed files with 23 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
db/property_manager.sql
View File

@@ -851,6 +851,8 @@ SET character_set_client = @saved_cs_client;
LOCK TABLES `pmgr_default_options` WRITE; LOCK TABLES `pmgr_default_options` WRITE;
/*!40000 ALTER TABLE `pmgr_default_options` DISABLE KEYS */; /*!40000 ALTER TABLE `pmgr_default_options` DISABLE KEYS */;
INSERT INTO `pmgr_default_options` VALUES (1,1,NULL);
INSERT INTO `pmgr_default_options` VALUES (2,3,NULL);
/*!40000 ALTER TABLE `pmgr_default_options` ENABLE KEYS */; /*!40000 ALTER TABLE `pmgr_default_options` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@@ -1682,6 +1684,8 @@ SET character_set_client = @saved_cs_client;
LOCK TABLES `pmgr_group_options` WRITE; LOCK TABLES `pmgr_group_options` WRITE;
/*!40000 ALTER TABLE `pmgr_group_options` DISABLE KEYS */; /*!40000 ALTER TABLE `pmgr_group_options` DISABLE KEYS */;
INSERT INTO `pmgr_group_options` VALUES (1,1,2,NULL);
INSERT INTO `pmgr_group_options` VALUES (2,2,4,NULL);
/*!40000 ALTER TABLE `pmgr_group_options` ENABLE KEYS */; /*!40000 ALTER TABLE `pmgr_group_options` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@@ -3700,6 +3704,10 @@ SET character_set_client = @saved_cs_client;
LOCK TABLES `pmgr_option_values` WRITE; LOCK TABLES `pmgr_option_values` WRITE;
/*!40000 ALTER TABLE `pmgr_option_values` DISABLE KEYS */; /*!40000 ALTER TABLE `pmgr_option_values` DISABLE KEYS */;
INSERT INTO `pmgr_option_values` VALUES (1,1,'0',NULL);
INSERT INTO `pmgr_option_values` VALUES (2,1,'1',NULL);
INSERT INTO `pmgr_option_values` VALUES (3,2,'0',NULL);
INSERT INTO `pmgr_option_values` VALUES (4,2,'1',NULL);
/*!40000 ALTER TABLE `pmgr_option_values` ENABLE KEYS */; /*!40000 ALTER TABLE `pmgr_option_values` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@@ -3725,6 +3733,8 @@ SET character_set_client = @saved_cs_client;
LOCK TABLES `pmgr_options` WRITE; LOCK TABLES `pmgr_options` WRITE;
/*!40000 ALTER TABLE `pmgr_options` DISABLE KEYS */; /*!40000 ALTER TABLE `pmgr_options` DISABLE KEYS */;
INSERT INTO `pmgr_options` VALUES (1,'dev','Developer Flag');
INSERT INTO `pmgr_options` VALUES (2,'admin','Administrator Flag');
/*!40000 ALTER TABLE `pmgr_options` ENABLE KEYS */; /*!40000 ALTER TABLE `pmgr_options` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;

297
db/rollup.sql
View File

@@ -1,297 +0,0 @@
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ##
-- ## GROUPS / USERS
-- ##
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_groups
DROP TABLE IF EXISTS `pmgr_groups`;
CREATE TABLE `pmgr_groups` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-- REVISIT <AP>: 20090511
-- code may not be userful
`code` VARCHAR(12) NOT NULL, -- User style "id"
`name` VARCHAR(80) NOT NULL,
-- Lower ranks are given higher priority
`rank` SMALLINT UNSIGNED NOT NULL DEFAULT 100,
`comment` VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_users
DROP TABLE IF EXISTS `pmgr_users`;
CREATE TABLE `pmgr_users` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`code` VARCHAR(12) NOT NULL, -- User style "id"
-- Login details. Passwords are not yet used (and so NULL).
`login` VARCHAR(30) NOT NULL,
`salt` CHAR(12) DEFAULT NULL,
`passhash` VARCHAR(255) DEFAULT NULL,
-- Contact information for this user
`contact_id` INT(10) UNSIGNED NOT NULL,
-- Specific comments
`comment` VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ##
-- ## OPTIONS
-- ##
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_options
DROP TABLE IF EXISTS `pmgr_options`;
CREATE TABLE `pmgr_options` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`name` VARCHAR(50) NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
UNIQUE KEY `name_key` (`name`),
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_option_values
DROP TABLE IF EXISTS `pmgr_option_values`;
CREATE TABLE `pmgr_option_values` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`option_id` INT(10) UNSIGNED NOT NULL,
`value` VARCHAR(255) NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_default_options
DROP TABLE IF EXISTS `pmgr_default_options`;
CREATE TABLE `pmgr_default_options` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`option_value_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_group_options
DROP TABLE IF EXISTS `pmgr_group_options`;
CREATE TABLE `pmgr_group_options` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`group_id` INT(10) UNSIGNED NOT NULL,
`option_value_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
KEY `group_key` (`group_id`),
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_user_options
DROP TABLE IF EXISTS `pmgr_user_options`;
CREATE TABLE `pmgr_user_options` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`user_id` INT(10) UNSIGNED NOT NULL,
`option_value_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
KEY `user_key` (`user_id`),
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_site_options
DROP TABLE IF EXISTS `pmgr_site_options`;
CREATE TABLE `pmgr_site_options` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`site_id` INT(10) UNSIGNED NOT NULL,
`option_value_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
KEY `site_key` (`site_id`),
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ##
-- ## PERMISSIONS
-- ##
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_permissions
DROP TABLE IF EXISTS `pmgr_permissions`;
CREATE TABLE `pmgr_permissions` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`name` VARCHAR(50) NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
UNIQUE KEY `name_key` (`name`),
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_permission_values
DROP TABLE IF EXISTS `pmgr_permission_values`;
CREATE TABLE `pmgr_permission_values` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`permission_id` INT(10) UNSIGNED NOT NULL,
`access` ENUM('ALLOW',
'DENY')
NOT NULL DEFAULT 'DENY',
`level` SMALLINT UNSIGNED DEFAULT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_default_permissions
DROP TABLE IF EXISTS `pmgr_default_permissions`;
CREATE TABLE `pmgr_default_permissions` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`permission_value_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_group_permissions
DROP TABLE IF EXISTS `pmgr_group_permissions`;
CREATE TABLE `pmgr_group_permissions` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`group_id` INT(10) UNSIGNED NOT NULL,
`permission_value_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
KEY `group_key` (`group_id`),
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_user_permissions
DROP TABLE IF EXISTS `pmgr_user_permissions`;
CREATE TABLE `pmgr_user_permissions` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`user_id` INT(10) UNSIGNED NOT NULL,
`permission_value_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
KEY `user_key` (`user_id`),
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_site_permissions
DROP TABLE IF EXISTS `pmgr_site_permissions`;
CREATE TABLE `pmgr_site_permissions` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`site_id` INT(10) UNSIGNED NOT NULL,
`permission_value_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
KEY `site_key` (`site_id`),
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ######################################################################
-- ##
-- ## MEMBERSHIPS
-- ##
DROP TABLE IF EXISTS `pmgr_site_memberships`;
-- ----------------------------------------------------------------------
-- ----------------------------------------------------------------------
-- TABLE pmgr_memberships
--
-- Which users are allowed to access which sites,
-- and under which set of group permissions (possibly multiple)
DROP TABLE IF EXISTS `pmgr_memberships`;
CREATE TABLE `pmgr_memberships` (
`site_id` INT(10) UNSIGNED NOT NULL,
`user_id` INT(10) UNSIGNED NOT NULL,
`group_id` INT(10) UNSIGNED NOT NULL,
`comment` VARCHAR(255) DEFAULT NULL,
PRIMARY KEY (`site_id`, `user_id`, `group_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

6
site/app_controller.php
View File

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

8
site/app_helper.php
View File

@@ -38,13 +38,5 @@ App::import('Core', 'Helper');
*/ */
class AppHelper extends 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);
}
} }
?> ?>

16
site/config/routes.php
View File

@@ -36,20 +36,4 @@ $default_path = array('controller' => 'maps', 'action' => 'view', '1');
*/ */
Router::connect('/', $default_path); 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));
?> ?>

11
site/models/option.php
View File

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

2
site/models/permission.php
View File

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