Fix : modify security table in sql structure scripts

Fix : testing existence of table name constant in the core_tables.php
Evol : adding definition of session_security in the core tables definition
Fix : fix comments in users_controler.php 
Fix : fix comments in usergroups_controler.php 
Evol : adding session_security and session_security_controler

core/trunk/core/class/SecurityControler.php

@@ -42,8 +42,10 @@ try {
 	require_once("core/core_tables.php");
 	require_once("core/class/class_db.php");
 	require_once("core/class/users_controler.php");
+	require_once("core/class/session_security_controler.php");
 	require_once("core/class/Security.php");
-	require_once("apps/".$_SESSION['businessapps'][0]['appid']."/security_bitmask.php");
+	if(!defined("_CLASSIFICATION_SCHEME_VIEW")) define("_CLASSIFICATION_SCHEME_VIEW","mr_classification_scheme_view");
+//	require_once("apps/".$_SESSION['businessapps'][0]['appid']."/security_bitmask.php"); must be called in the controler
 } catch (Exception $e){
 	echo $e->getMessage().' // ';
 }
@@ -571,13 +573,18 @@ class SecurityControler
 	 * @param bigint $object_id
 	 * @return bitmask
 	 */
-	public function getActions($user_id,$object_id){
-		// Select from security session table
-		
+	public function getActions($user_id,$object_id, $object_type = 'aggregation')
+	{
+		// Select from security session table	
+		$session_sec = session_security_controler::get($user_id);
+		if($session_sec->__get('last_object_id') == $object_id)
+			return $session_sec->__get('last_available_bitmask');
+		else
+			return setActions($user_id,$object_id, $object_type);
 		/********
 		 * FAKE *
 		 ********/
-		return ADD_RECORD+CREATE_CLASS+CREATE_OTHER_AGREGATION+DATA_MODIFICATION+DELETE_CLASS+DELETE_OTHER_AGREGATION;
+		//return ADD_RECORD+CREATE_CLASS+CREATE_OTHER_AGREGATION+DATA_MODIFICATION+DELETE_CLASS+DELETE_OTHER_AGREGATION;
 	}
 	
 	/**
@@ -589,15 +596,81 @@ class SecurityControler
 	 * @param bigint $object_id
 	 * @return bitmask
 	 */
-	public function setActions($user_id,$object_id){
+	public function setActions($user_id,$object_id, $object_type)
+	{
+
 		// Compute action bitmask 
+		$full_bitmask = 0;
+		$groups = users_controler::getGroups($user_id);
+		//print_r($groups);
+		
+		$full_where = "";
+		for($i=0; $i<count($groups); $i++)
+		{
+			$access = self::getAccessForGroup($groups[$i]['GROUP_ID']);
+			//var_dump($access);
+			for($j=0; $j<count($access);$j++)
+			{			
+				$target = $access[$j]->__get('where_target');
+				$coll_id = $access[$j]->__get('coll_id');
+				$where_clause = $access[$j]->__get('where_clause');
+				$where_clause = self::process_security_where_clause($where_clause, $user_id);
+				$where_clause = str_replace('where', '', $where_clause);
+				$bitmask = $access[$j]->__get('rights_bitmask');
+				
+				$ind = self::get_ind_collection($coll_id);
+				if(trim($where_clause) == "")
+					$where = "-1";
+				else
+					$where =  "( ".$this->show_string($where_clause)." )";
+				
+				//echo 'target : '.$target.', coll_id : '.$coll_id.', where : '.$where.', bitmask : '.decbin($bitmask).'';
+				$query = '';
+				if($object_type == 'aggregation' && ($target == 'CLASS' || $target == 'ALL'))
+				{
+					$query = "select mr_aggregation_id from "._CLASSIFICATION_SCHEME_VIEW." where (".$where.') and mr_aggregation_id = '.$object_id;
+				}
+				elseif($object_type == 'classification_scheme' && ($target == 'CLASS' || $target == 'ALL'))
+				{
+					$query = "select mr_classification_scheme_id from "._CLASSIFICATION_SCHEME_VIEW." where (".$where.') and mr_classification_scheme_id = '.$object_id;
+				}			
+				else if($object_type == 'doc' && ($target == 'DOC' || $target == 'ALL'))
+				{
+					$query = "select res_id from ".$_SESSION['collections'][$ind]['view']." where (".$where.') and res_id = '.$object_id;
+				}
+				//echo $query;
+				self::connect();
+				if(!empty($query))
+					self::$db->query($query);
+					
+				if(self::$db->nb_result() > 0)
+				{
+					if($bitmask > 0)
+					{
+						$full_bitmask = set_right($full_bitmask, $bitmask);
+					}
+					
+					if(!empty($full_where))
+						$full_where .= " and (".$where.") ";
+					else
+						$full_where .= $where;
+				}
+				self::disconnect();
+			}
+		}
 		
 		// Update security session table
+		$session_security = new session_security();
+		$session_security->setArray(array('user_id' => functions::protect_string_db($user_id), 'session_begin_date' => date("Y-m-d H:i"), 'full_where_clause' => functions::protect_string_db($full_where), 'last_available_bitmask' => $full_bitmask, 'last_object_id' => functions::protect_string_db($object_id))); // TO DO : calculate the session_end_date
 		
+		session_security_controler::save($session_security);
+		
+		return $full_bitmask;
 		/********
 		 * FAKE *
 		 ********/
-		return ADD_RECORD+CREATE_CLASS+CREATE_OTHER_AGREGATION+DATA_MODIFICATION+DELETE_CLASS+DELETE_OTHER_AGREGATION;
+		//return ADD_RECORD+CREATE_CLASS+CREATE_OTHER_AGREGATION+DATA_MODIFICATION+DELETE_CLASS+DELETE_OTHER_AGREGATION;
+		
 	}
 }
 ?>

core/trunk/core/class/session_security.php

+<?php
+/*
+*    Copyright 2008,2009,2010 Maarch
+*
+*  This file is part of Maarch Framework.
+*
+*   Maarch Framework 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 3 of the License, or
+*   (at your option) any later version.
+*
+*   Maarch Framework 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 Maarch Framework.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+* @brief  Contains the session_security Object (herits of the BaseObject class)
+* 
+* 
+* @file
+* @author Claire Figueras <dev@maarch.org>
+* @date $date$
+* @version $Revision$
+* @ingroup core
+*/
+
+// Loads the required class
+try {
+	require_once("core/class/BaseObject.php");
+} catch (Exception $e){
+	echo $e->getMessage().' // ';
+}
+
+/**
+* @brief  session_security Object, herits of the BaseObject class 
+*
+* @ingroup core
+*/
+class session_security extends BaseObject
+ {	
+	
+	/**
+	* Returns the string representing the session_security object
+	*
+	* @return string The session_security label 
+	*/
+	function __toString(){
+		return "Session security for (".$this->user_id.")" ; 
+	}	
+}
+?>

core/trunk/core/class/session_security_controler.php

+<?php
+/*
+*    Copyright 2008-2010 Maarch
+*
+*  This file is part of Maarch Framework.
+*
+*   Maarch Framework 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 3 of the License, or
+*   (at your option) any later version.
+*
+*   Maarch Framework 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 Maarch Framework.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+* @brief  Contains the controler of the session_security object (create, save, modify, etc...)
+* 
+* 
+* @file
+* @author Claire Figueras <dev@maarch.org>
+* @date $date$
+* @version $Revision$
+* @ingroup core
+*/
+
+// To activate de debug mode of the class
+$_ENV['DEBUG'] = false;
+/*
+define("_CODE_SEPARATOR","/");
+define("_CODE_INCREMENT",1);
+*/
+
+// Loads the required class
+try {
+	require_once("core/core_tables.php");
+	require_once("core/class/session_security.php");
+	require_once("core/class/ObjectControlerAbstract.php");
+	require_once("core/class/ObjectControlerIF.php");
+} catch (Exception $e){
+	echo $e->getMessage().' // ';
+}
+
+/**
+* @brief  Controler of the session_security object 
+*
+*<ul>
+*  <li>Get an session_security object for a given user_id</li>
+*  <li>Save in the database a session_security</li>
+*  <li>Manage the operation on the users related tables in the database (insert, select, update, delete)</li>
+*</ul>
+* @ingroup core
+*/
+class session_security_controler extends ObjectControler implements ObjectControlerIF
+{
+	/**
+	* Returns an session_security object based on a user identifier
+	*
+	* @param  $user_id string  User identifier
+	* @param  $comp_where string  where clause arguments (must begin with and or or)
+	* @return session_security object with properties from the database or null
+	*/
+	public function get($user_id, $comp_where = '')
+	{
+		self::set_foolish_ids(array('user_id'));
+		self::set_specific_id('user_id');
+		$session_security = self::advanced_get($user_id,SESSION_SECURITY_TABLE);	
+		
+		if(isset($session_security) )
+			return $session_security;
+		else
+			return null;
+	}
+	
+	
+	/**
+	* Saves in the database a session_security object 
+	*
+	* @param  $session_security session_security object to be saved
+	* @return bool true if the save is complete, false otherwise
+	*/
+	public function save($session_security)
+	{
+		if(!isset($session_security) )
+			return false;
+		
+		self::set_foolish_ids(array('user_id'));
+		self::set_specific_id('user_id');
+		if(self::sessionSecurityExists($session_security->user_id))
+			return self::update($session_security);
+		else
+			return self::insert($session_security);
+		
+		return false;
+	}
+	
+	/**
+	* Inserts in the database (session_security table) a session_security object
+	*
+	* @param  $session_security session_security object
+	* @return bool true if the insertion is complete, false otherwise
+	*/
+	private function insert($session_security)
+	{
+		return self::advanced_insert($session_security);
+	}
+
+	/**
+	* Updates a session_security in the database (session_security table) with a session_security object
+	*
+	* @param  $session_security session_security object
+	* @return bool true if the update is complete, false otherwise
+	*/
+	private function update($session_security)
+	{
+		return self::advanced_update($session_security);
+	}
+	
+	/**
+	* Deletes in the database a given session_security 
+	*
+	* @param  $session_security session_security object
+	* @return bool true if the deletion is complete, false otherwise
+	*/
+	public function delete($session_security)
+	{
+		self::set_foolish_ids(array('user_id'));
+		self::set_specific_id('user_id');
+		return self::advanced_delete($session_security);
+	}
+	
+	
+	/**
+	* Asserts if a session_security exists in the database for a given user (user_id)
+	* 
+	* @param  $user_id String User identifier
+	* @return bool true if the user exists, false otherwise 
+	*/
+	public function sessionSecurityExists($user_id)
+	{
+		if(!isset($user_id) || empty($user_id))
+			return false;
+
+		self::$db=new dbquery();
+		self::$db->connect();
+		$query = "select user_id from ".SESSION_SECURITY_TABLE." where user_id = '".functions::protect_string_db($user_id)."'";
+					
+		try{
+			if($_ENV['DEBUG']){echo $query.' // ';}
+			self::$db->query($query);
+		} catch (Exception $e){
+			echo _UNKNOWN.' '._USER." ".$user_id.' // ';
+		}
+		
+		if(self::$db->nb_result() > 0)
+		{
+			self::$db->disconnect();
+			return true;
+		}
+		self::$db->disconnect();
+		return false;
+	}
+	
+}
+?>

core/trunk/core/class/usergroups_controler.php

@@ -19,7 +19,7 @@
 */
 
 /**
-* @brief  Contains the controler of the usergroups object (create, save, modify, etc...)
+* @brief  Contains the controler of the usergroup object (create, save, modify, etc...)
 * 
 * 
 * @file
@@ -52,10 +52,10 @@ try {
 
 
 /**
-* @brief  Controler of the usergroups object 
+* @brief  Controler of the usergroup object 
 *
 *<ul>
-*  <li>Get an usergroups object from an id</li>
+*  <li>Get an usergroup object from an id</li>
 *  <li>Save in the database a usergroup</li>
 *  <li>Manage the operation on the usergroups related tables in the database (insert, select, update, delete)</li>
 *</ul>
@@ -65,11 +65,11 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
 {
 
 	/**
-	* Returns an usergroups object based on a usegroup identifier
+	* Returns an usergroup object based on a usegroup identifier
 	*
 	* @param  $group_id string  Usergroup identifier
 	* @param  $can_be_disabled bool  if true gets the group even if it is disabled in the database (false by default)
-	* @return usergroups object with properties from the database or null
+	* @return usergroup object with properties from the database or null
 	*/
 	public function get($group_id, $can_be_disabled = false)
 	{	
@@ -79,11 +79,11 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
 	}
 	
 	/**
-	* Returns all usergroups (enabled by default) from the database in an array of usergroups objects (ordered by group_desc by default)
+	* Returns all usergroups (enabled by default) from the database in an array of usergroup objects (ordered by group_desc by default)
 	*
 	* @param  $order_str string  Order string passed to the query ("order by group_desc asc" by default)
 	* @param  $enabled_only bool  if true returns only the enabled usergroups, otherwise returns even the disabled (true by default)
-	* @return Array of usergroups objects with properties from the database
+	* @return Array of usergroup objects with properties from the database
 	*/
 	public function getAllUsergroups($order_str = "order by group_desc asc", $enabled_only = true)
 	{
@@ -233,7 +233,7 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
 	}
 	
 	/**
-	* Saves in the database a usergroups object 
+	* Saves in the database a usergroup object 
 	*
 	* @param  $group usergroups object to be saved
 	* @return bool true if the save is complete, false otherwise
@@ -254,7 +254,7 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
 	}
 	
 	/**
-	* Inserts in the database (usergroups table) a usergroups object
+	* Inserts in the database (usergroups table) a usergroup object
 	*
 	* @param  $group usergroups object
 	* @return bool true if the insertion is complete, false otherwise
@@ -265,9 +265,9 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
 	}
 
 	/**
-	* Updates a usergroup in the database (usergroups table) with a usergroups object
+	* Updates a usergroup in the database (usergroups table) with an usergroup object
 	*
-	* @param  $group usergroups object
+	* @param  $group usergroup object
 	* @return bool true if the update is complete, false otherwise
 	*/
 	private function update($group)
@@ -276,9 +276,9 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
 	}
 	
 	/**
-	* Deletes in the database (usergroups related tables) a given usergroup (group_id)
+	* Deletes in the database (usergroups related tables) a given usergroup 
 	*
-	* @param  $group usergroups object
+	* @param  $group usergroup object
 	* @return bool true if the deletion is complete, false otherwise
 	*/
 	public function delete($group)
@@ -330,7 +330,7 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
 	/**
 	* Disables a given usergroup
 	* 
-	* @param  $group usergroups object
+	* @param  $group usergroup object
 	* @return bool true if the disabling is complete, false otherwise 
 	*/
 	public function disable($group)
@@ -343,7 +343,7 @@ class usergroups_controler extends ObjectControler implements ObjectControlerIF
 	/**
 	* Enables a given usergroup
 	* 
-	* @param  $group usergroups object
+	* @param  $group usergroup object
 	* @return bool true if the enabling is complete, false otherwise 
 	*/
 	public function enable($group)

core/trunk/core/class/users_controler.php

@@ -19,7 +19,7 @@
 */
 
 /**
-* @brief  Contains the controler of the users object (create, save, modify, etc...)
+* @brief  Contains the controler of the user object (create, save, modify, etc...)
 * 
 * 
 * @file
@@ -47,10 +47,10 @@ try {
 }
 
 /**
-* @brief  Controler of the users object 
+* @brief  Controler of the user object 
 *
 *<ul>
-*  <li>Get an users object from an id</li>
+*  <li>Get an user object from an id</li>
 *  <li>Save in the database a user</li>
 *  <li>Manage the operation on the users related tables in the database (insert, select, update, delete)</li>
 *</ul>
@@ -59,12 +59,12 @@ try {
 class users_controler extends ObjectControler implements ObjectControlerIF
 {
 	/**
-	* Returns an users object based on a user identifier
+	* Returns an user object based on a user identifier
 	*
 	* @param  $user_id string  User identifier
 	* @param  $comp_where string  where clause arguments (must begin with and or or)
 	* @param  $can_be_disabled bool  if true gets the user even if it is disabled in the database (false by default)
-	* @return users object with properties from the database or null
+	* @return user object with properties from the database or null
 	*/
 	public function get($user_id, $comp_where = '', $can_be_disabled = false)
 	{
@@ -109,9 +109,9 @@ class users_controler extends ObjectControler implements ObjectControlerIF
 	}
 	
 	/**
-	* Saves in the database a users object 
+	* Saves in the database a user object 
 	*
-	* @param  $group users object to be saved
+	* @param  $user user object to be saved
 	* @return bool true if the save is complete, false otherwise
 	*/
 	public function save($user)
@@ -130,9 +130,9 @@ class users_controler extends ObjectControler implements ObjectControlerIF
 	}
 	
 	/**
-	* Inserts in the database (users table) a users object
+	* Inserts in the database (users table) a user object
 	*
-	* @param  $user users object
+	* @param  $user user object
 	* @return bool true if the insertion is complete, false otherwise
 	*/
 	private function insert($user)
@@ -141,9 +141,9 @@ class users_controler extends ObjectControler implements ObjectControlerIF
 	}
 
 	/**
-	* Updates a user in the database (users table) with a users object
+	* Updates a user in the database (users table) with a user object
 	*
-	* @param  $user users object
+	* @param  $user user object
 	* @return bool true if the update is complete, false otherwise
 	*/
 	private function update($user)
@@ -247,7 +247,7 @@ class users_controler extends ObjectControler implements ObjectControlerIF
 	/**
 	* Disables a given user
 	* 
-	* @param  $user users object 
+	* @param  $user user object 
 	* @return bool true if the disabling is complete, false otherwise 
 	*/
 	public function disable($user)
@@ -260,7 +260,7 @@ class users_controler extends ObjectControler implements ObjectControlerIF
 	/**
 	* Enables a given user
 	* 
-	* @param  $user users object 
+	* @param  $user user object 
 	* @return bool true if the enabling is complete, false otherwise 
 	*/
 	public function enable($user)

core/trunk/core/core_tables.php

 <?php
-define( 'ACTIONS_TABLE', 'actions');
-define( 'AUTHORS_TABLE', 'authors');
-define( 'DOCSERVER_TABLE', 'docservers');
-define( 'DOCTYPES_TABLE', 'doctypes');
-define( 'EXT_DOCSERVER_TABLE', 'ext_docserver');
-define( 'FULLTEXT_TABLE', 'fulltext');
-define( 'GROUPSECURITY_TABLE', 'groupsecurity');
-define( 'HISTORY_TABLE', 'history');
-define( 'HISTORY_BATCH_TABLE', 'history_batch');
-define( 'PARAM_TABLE', 'parameters');
-define( 'RESGROUPS_TABLE', 'resgroups');
-define( 'RESGROUP_CONTENT_TABLE', 'resgroup_content');
-define( 'SECURITY_TABLE', 'security');
-define( 'STATUS_TABLE', 'status');
-define( 'USERGROUPS_TABLE', 'usergroups');
-define( 'USERGROUP_CONTENT_TABLE', 'usergroup_content');
-define( 'USERGROUPS_SERVICES_TABLE', 'usergroups_services');
-define( 'USERS_TABLE', 'users');
+if(!defined('ACTIONS_TABLE')) define( 'ACTIONS_TABLE', 'actions');
+if(!defined('AUTHORS_TABLE')) define( 'AUTHORS_TABLE', 'authors');
+if(!defined('DOCSERVER_TABLE')) define( 'DOCSERVER_TABLE', 'docservers');
+if(!defined('DOCTYPES_TABLE')) define( 'DOCTYPES_TABLE', 'doctypes');
+if(!defined('EXT_DOCSERVER_TABLE')) define( 'EXT_DOCSERVER_TABLE', 'ext_docserver');
+if(!defined('FULLTEXT_TABLE')) define( 'FULLTEXT_TABLE', 'fulltext');
+if(!defined('GROUPSECURITY_TABLE')) define( 'GROUPSECURITY_TABLE', 'groupsecurity');
+if(!defined('HISTORY_TABLE')) define( 'HISTORY_TABLE', 'history');
+if(!defined('HISTORY_BATCH_TABLE')) define( 'HISTORY_BATCH_TABLE', 'history_batch');
+if(!defined('PARAM_TABLE')) define( 'PARAM_TABLE', 'parameters');
+if(!defined('RESGROUPS_TABLE')) define( 'RESGROUPS_TABLE', 'resgroups');
+if(!defined('RESGROUP_CONTENT_TABLE')) define( 'RESGROUP_CONTENT_TABLE', 'resgroup_content');
+if(!defined('SECURITY_TABLE')) define( 'SECURITY_TABLE', 'security');
+if(!defined('SESSION_SECURITY_TABLE')) define('SESSION_SECURITY_TABLE','session_security');
+if(!defined('STATUS_TABLE')) define( 'STATUS_TABLE', 'status');
+if(!defined('USERGROUPS_TABLE')) define( 'USERGROUPS_TABLE', 'usergroups');
+if(!defined('USERGROUP_CONTENT_TABLE')) define( 'USERGROUP_CONTENT_TABLE', 'usergroup_content');
+if(!defined('USERGROUPS_SERVICES_TABLE')) define( 'USERGROUPS_SERVICES_TABLE', 'usergroups_services');
+if(!defined('USERS_TABLE')) define( 'USERS_TABLE', 'users');
 
 ?>

core/trunk/core/sql/structure/core.mysql.sql

@@ -145,6 +145,7 @@ CREATE TABLE IF NOT EXISTS resgroups (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS security (
+  security_id int(8) NOT NULL,
   group_id varchar(32) collate utf8_unicode_ci NOT NULL,
   coll_id varchar(32) collate utf8_unicode_ci NOT NULL,
   where_clause varchar(255) collate utf8_unicode_ci default NULL,
@@ -152,7 +153,11 @@ CREATE TABLE IF NOT EXISTS security (
   can_insert char(1) collate utf8_unicode_ci NOT NULL default 'N',
   can_update char(1) collate utf8_unicode_ci NOT NULL default 'N',
   can_delete char(1) collate utf8_unicode_ci NOT NULL default 'N',
-  PRIMARY KEY  (group_id,coll_id)
+  rights_bitmask int(8) NOT NULL,
+  mr_start_date date DEFAULT NULL,
+  mr_stop_date date DEFAULT NULL,
+  where_target varchar(15) DEFAULT 'DOC',
+  PRIMARY KEY  (security_id)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 CREATE TABLE status

core/trunk/core/sql/structure/core.oracle.sql

@@ -182,14 +182,19 @@
 --------------------------------------------------------
 
   CREATE TABLE "SECURITY"
-   (	"GROUP_ID" VARCHAR2(32) NOT NULL ENABLE,
+   (	"SECURITY_ID" NUMBER NOT NULL ENABLE,   
+    "GROUP_ID" VARCHAR2(32) NOT NULL ENABLE,
 	"COLL_ID" VARCHAR2(32) NOT NULL ENABLE,
 	"WHERE_CLAUSE" VARCHAR2(255) DEFAULT NULL,
 	"MAARCH_COMMENT" VARCHAR2(1000),
 	"CAN_INSERT" VARCHAR2(1) DEFAULT 'N',
 	"CAN_UPDATE" VARCHAR2(1) DEFAULT 'N',
 	"CAN_DELETE" VARCHAR2(1) DEFAULT 'N',
-	 PRIMARY KEY ("GROUP_ID", "COLL_ID") ENABLE
+	"RIGHTS_BITMASK" NUMBER NOT NULL,
+    "MR_START_DATE" DATE DEFAULT NULL,
+    "MR_STOP_DATE" DATE DEFAULT NULL,
+    "WHERE_TARGET" VARCHAR2(15) DEFAULT 'DOC',
+	 PRIMARY KEY ("SECURIY_ID") ENABLE
    ) ;
 
 --------------------------------------------------------
@@ -300,6 +305,15 @@ FOR EACH ROW
 BEGIN
   SELECT SEQ_HISTORY.NEXTVAL INTO :NEW.ID FROM DUAL;
 END;
+/
+
+ CREATE SEQUENCE  "SEQ_SECURITY"  MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 START WITH 20 CACHE 20 NOORDER  NOCYCLE ;
+ create or replace TRIGGER TRG_SECURITY
+ BEFORE INSERT ON SECURITY
+FOR EACH ROW
+BEGIN
+  SELECT SEQ_SECURITY.NEXTVAL INTO :NEW.ID FROM DUAL;
+END;
 /
 
  CREATE SEQUENCE  "SEQ_HISTORY_BATCH"  MINVALUE 1 MAXVALUE 999999999999999999999999999 INCREMENT BY 1 START WITH 1 CACHE 20 NOORDER  NOCYCLE ;

core/trunk/core/sql/structure/core.postgresql.sql

@@ -215,6 +215,7 @@ ALTER TABLE resgroups OWNER TO postgres;
 
 CREATE TABLE "security"
 (
+  security_id bigint NOT NULL DEFAULT nextval('security_security_id_seq'::regclass),
   group_id character varying(32) NOT NULL,
   coll_id character varying(32) NOT NULL,
   where_clause text,
@@ -222,11 +223,23 @@ CREATE TABLE "security"
   can_insert character(1) NOT NULL DEFAULT 'N'::bpchar,
   can_update character(1) NOT NULL DEFAULT 'N'::bpchar,
   can_delete character(1) NOT NULL DEFAULT 'N'::bpchar,
-  CONSTRAINT security_pkey PRIMARY KEY (group_id, coll_id)
+  rights_bitmask integer NOT NULL,
+  mr_start_date timestamp without time zone DEFAULT NULL,
+  mr_stop_date timestamp without time zone DEFAULT NULL,
+  where_target character varying(15) DEFAULT 'DOC'::character varying,
+  CONSTRAINT security_pkey PRIMARY KEY (security_id)
 )
 WITH (OIDS=FALSE);
 ALTER TABLE "security" OWNER TO postgres;
 
+CREATE SEQUENCE security_security_id_seq
+  INCREMENT 1
+  MINVALUE 1
+  MAXVALUE 9223372036854775807
+  START 20
+  CACHE 1;
+ALTER TABLE security_security_id_seq OWNER TO postgres;
+
 CREATE TABLE status
 (
   id character varying(10) NOT NULL,