Changeset 864

Show
Ignore:
Timestamp:
04/06/08 20:35:35 (8 months ago)
Author:
laurentj
Message:

ticket #524: jAcl2, a simpler rights management

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/manifests/jelix-dev.mn

    r833 r864  
    100100  CREDITS 
    101101cd lib/jelix-scripts/commands 
     102  acl2group.cmd.php 
     103  acl2right.cmd.php 
    102104  aclgroup.cmd.php 
    103105  aclright.cmd.php 

  • trunk/build/manifests/jelix-dev.mn

    r833 r864  
    100100  CREDITS 
    101101cd lib/jelix-scripts/commands 
     102  acl2group.cmd.php 
     103  acl2right.cmd.php 
    102104  aclgroup.cmd.php 
    103105  aclright.cmd.php 

  • trunk/build/manifests/jelix-dev.mn

    r833 r864  
    100100  CREDITS 
    101101cd lib/jelix-scripts/commands 
     102  acl2group.cmd.php 
     103  acl2right.cmd.php 
    102104  aclgroup.cmd.php 
    103105  aclright.cmd.php 

  • trunk/build/manifests/jelix-lib.mn

    r862 r864  
    2424  jAclDbManager.class.php 
    2525  jAclDb.class.php 
     26  jAcl2.class.php 
     27  jAcl2DbUserGroup.class.php 
     28  jAcl2DbManager.class.php 
     29  jAcl2Db.class.php 
    2630 
    2731cd lib/jelix/controllers 
    …… 
    8589   jaclgroupsofuser.dao.xml 
    8690   jsession.dao.xml 
     91   jacl2group.dao.xml 
     92   jacl2rights.dao.xml 
     93   jacl2subject.dao.xml 
     94   jacl2usergroup.dao.xml 
     95   jacl2groupsofuser.dao.xml 
    8796cd lib/jelix/core-modules/jelix/install/sql 
    8897  delete.mysql.sql 
    8998  install_jacl.schema.mysql.sql 
    9099  install_jacl.data.mysql.sql 
     100  install_jacl2.schema.mysql.sql 
     101  install_jacl2.data.mysql.sql 
    91102  install_jsession.schema.mysql.sql 
    92103  delete.pgsql.sql 
    93104  install_jacl.schema.pgsql.sql 
    94105  install_jacl.data.pgsql.sql 
     106  install_jacl2.schema.pgsql.sql 
     107  install_jacl2.data.pgsql.sql 
    95108  install_jsession.schema.pgsql.sql 
    96109 
    …… 
    305318cd lib/jelix-modules/jacldb/classes 
    306319!  jacldb.listener.php 
     320cd lib/jelix-modules/jacl2db 
     321  module.xml 
     322  events.xml 
     323cd lib/jelix-modules/jacl2db/classes 
     324!  jacl2db.listener.php 
    307325cd lib/jelix-modules/jauth 
    308326  module.xml 
    …… 
    352370cd lib/jelix-plugins/auth/ 
    353371cd lib/jelix-plugins/acl/ 
     372cd lib/jelix-plugins/acl2/ 
    354373cd lib/jelix-plugins/coord/ 
    355374cd lib/jelix-plugins/db/ 
    …… 
    360379cd lib/jelix/plugins/acl/db 
    361380  db.acl.php 
     381cd lib/jelix/plugins/acl2/db 
     382  db.acl2.php 
    362383cd lib/jelix/plugins/auth/db 
    363384  db.auth.php 
    …… 
    386407  jacl.coord.ini.php.dist 
    387408 
     409cd lib/jelix/plugins/coord/jacl2 
     410! jacl2.coord.php 
     411  plugin.xml 
     412  jacl2.coord.ini.php.dist 
     413 
    388414cd lib/jelix/plugins/jforms/html 
    389415  html.jformscompiler.php 
    …… 
    421447  block.ifacl.php 
    422448  block.ifnotacl.php 
     449  block.ifacl2.php 
     450  block.ifnotacl2.php 
    423451  block.ifuserconnected.php 
    424452  block.ifusernotconnected.php 

  • trunk/build/manifests/jelix-lib.mn

    r862 r864  
    2424  jAclDbManager.class.php 
    2525  jAclDb.class.php 
     26  jAcl2.class.php 
     27  jAcl2DbUserGroup.class.php 
     28  jAcl2DbManager.class.php 
     29  jAcl2Db.class.php 
    2630 
    2731cd lib/jelix/controllers 
    …… 
    8589   jaclgroupsofuser.dao.xml 
    8690   jsession.dao.xml 
     91   jacl2group.dao.xml 
     92   jacl2rights.dao.xml 
     93   jacl2subject.dao.xml 
     94   jacl2usergroup.dao.xml 
     95   jacl2groupsofuser.dao.xml 
    8796cd lib/jelix/core-modules/jelix/install/sql 
    8897  delete.mysql.sql 
    8998  install_jacl.schema.mysql.sql 
    9099  install_jacl.data.mysql.sql 
     100  install_jacl2.schema.mysql.sql 
     101  install_jacl2.data.mysql.sql 
    91102  install_jsession.schema.mysql.sql 
    92103  delete.pgsql.sql 
    93104  install_jacl.schema.pgsql.sql 
    94105  install_jacl.data.pgsql.sql 
     106  install_jacl2.schema.pgsql.sql 
     107  install_jacl2.data.pgsql.sql 
    95108  install_jsession.schema.pgsql.sql 
    96109 
    …… 
    305318cd lib/jelix-modules/jacldb/classes 
    306319!  jacldb.listener.php 
     320cd lib/jelix-modules/jacl2db 
     321  module.xml 
     322  events.xml 
     323cd lib/jelix-modules/jacl2db/classes 
     324!  jacl2db.listener.php 
    307325cd lib/jelix-modules/jauth 
    308326  module.xml 
    …… 
    352370cd lib/jelix-plugins/auth/ 
    353371cd lib/jelix-plugins/acl/ 
     372cd lib/jelix-plugins/acl2/ 
    354373cd lib/jelix-plugins/coord/ 
    355374cd lib/jelix-plugins/db/ 
    …… 
    360379cd lib/jelix/plugins/acl/db 
    361380  db.acl.php 
     381cd lib/jelix/plugins/acl2/db 
     382  db.acl2.php 
    362383cd lib/jelix/plugins/auth/db 
    363384  db.auth.php 
    …… 
    386407  jacl.coord.ini.php.dist 
    387408 
     409cd lib/jelix/plugins/coord/jacl2 
     410! jacl2.coord.php 
     411  plugin.xml 
     412  jacl2.coord.ini.php.dist 
     413 
    388414cd lib/jelix/plugins/jforms/html 
    389415  html.jformscompiler.php 
    …… 
    421447  block.ifacl.php 
    422448  block.ifnotacl.php 
     449  block.ifacl2.php 
     450  block.ifnotacl2.php 
    423451  block.ifuserconnected.php 
    424452  block.ifusernotconnected.php 

  • trunk/build/manifests/jelix-lib.mn

    r862 r864  
    2424  jAclDbManager.class.php 
    2525  jAclDb.class.php 
     26  jAcl2.class.php 
     27  jAcl2DbUserGroup.class.php 
     28  jAcl2DbManager.class.php 
     29  jAcl2Db.class.php 
    2630 
    2731cd lib/jelix/controllers 
    …… 
    8589   jaclgroupsofuser.dao.xml 
    8690   jsession.dao.xml 
     91   jacl2group.dao.xml 
     92   jacl2rights.dao.xml 
     93   jacl2subject.dao.xml 
     94   jacl2usergroup.dao.xml 
     95   jacl2groupsofuser.dao.xml 
    8796cd lib/jelix/core-modules/jelix/install/sql 
    8897  delete.mysql.sql 
    8998  install_jacl.schema.mysql.sql 
    9099  install_jacl.data.mysql.sql 
     100  install_jacl2.schema.mysql.sql 
     101  install_jacl2.data.mysql.sql 
    91102  install_jsession.schema.mysql.sql 
    92103  delete.pgsql.sql 
    93104  install_jacl.schema.pgsql.sql 
    94105  install_jacl.data.pgsql.sql 
     106  install_jacl2.schema.pgsql.sql 
     107  install_jacl2.data.pgsql.sql 
    95108  install_jsession.schema.pgsql.sql 
    96109 
    …… 
    305318cd lib/jelix-modules/jacldb/classes 
    306319!  jacldb.listener.php 
     320cd lib/jelix-modules/jacl2db 
     321  module.xml 
     322  events.xml 
     323cd lib/jelix-modules/jacl2db/classes 
     324!  jacl2db.listener.php 
    307325cd lib/jelix-modules/jauth 
    308326  module.xml 
    …… 
    352370cd lib/jelix-plugins/auth/ 
    353371cd lib/jelix-plugins/acl/ 
     372cd lib/jelix-plugins/acl2/ 
    354373cd lib/jelix-plugins/coord/ 
    355374cd lib/jelix-plugins/db/ 
    …… 
    360379cd lib/jelix/plugins/acl/db 
    361380  db.acl.php 
     381cd lib/jelix/plugins/acl2/db 
     382  db.acl2.php 
    362383cd lib/jelix/plugins/auth/db 
    363384  db.auth.php 
    …… 
    386407  jacl.coord.ini.php.dist 
    387408 
     409cd lib/jelix/plugins/coord/jacl2 
     410! jacl2.coord.php 
     411  plugin.xml 
     412  jacl2.coord.ini.php.dist 
     413 
    388414cd lib/jelix/plugins/jforms/html 
    389415  html.jformscompiler.php 
    …… 
    421447  block.ifacl.php 
    422448  block.ifnotacl.php 
     449  block.ifacl2.php 
     450  block.ifnotacl2.php 
    423451  block.ifuserconnected.php 
    424452  block.ifusernotconnected.php 

  • trunk/build/manifests/testapp.mn

    r824 r864  
    138138  jacl.manager.html_cli.php 
    139139  jacl.users_and_groups.html_cli.php 
     140  jacl2.main_api.html_cli.php 
     141  jacl2.manager.html_cli.php 
     142  jacl2.users_and_groups.html_cli.php 
    140143  jdao.conditions.html_cli.php 
    141144  jdao.main_api.html_cli.php 

  • trunk/build/manifests/testapp.mn

    r824 r864  
    138138  jacl.manager.html_cli.php 
    139139  jacl.users_and_groups.html_cli.php 
     140  jacl2.main_api.html_cli.php 
     141  jacl2.manager.html_cli.php 
     142  jacl2.users_and_groups.html_cli.php 
    140143  jdao.conditions.html_cli.php 
    141144  jdao.main_api.html_cli.php 

  • trunk/build/manifests/testapp.mn

    r824 r864  
    138138  jacl.manager.html_cli.php 
    139139  jacl.users_and_groups.html_cli.php 
     140  jacl2.main_api.html_cli.php 
     141  jacl2.manager.html_cli.php 
     142  jacl2.users_and_groups.html_cli.php 
    140143  jdao.conditions.html_cli.php 
    141144  jdao.main_api.html_cli.php 

  • trunk/lib/jelix/core/defaultconfig.ini.php

    r862 r864  
    201201enableAclDbEventListener = off 
    202202 
     203[acl2] 
     204driver = db 
     205enableAclDbEventListener = off 
     206 
     207 
    203208[sessions] 
    204209shared_session = off 

  • trunk/lib/jelix/core/defaultconfig.ini.php

    r862 r864  
    201201enableAclDbEventListener = off 
    202202 
     203[acl2] 
     204driver = db 
     205enableAclDbEventListener = off 
     206 
     207 
    203208[sessions] 
    204209shared_session = off 

  • trunk/lib/jelix/core/defaultconfig.ini.php

    r862 r864  
    201201enableAclDbEventListener = off 
    202202 
     203[acl2] 
     204driver = db 
     205enableAclDbEventListener = off 
     206 
     207 
    203208[sessions] 
    204209shared_session = off 

  • trunk/lib/jelix/plugins/tpl/common/block.ifacl.php

    r662 r864  
    1414 * a special if block to test easily a right value 
    1515 * 
    16  * <pre>{ifacl 'subject',54} ..here generated content if the user has the right  {/ifacl}</pre> 
     16 * <pre>{ifacl 'subject','value', 54} ..here generated content if the user has the right  {/ifacl}</pre> 
    1717 * @param jTplCompiler $compiler the template compiler 
    1818 * @param boolean true if it is the begin of block, else false 

  • trunk/lib/jelix/plugins/tpl/common/block.ifacl.php

    r662 r864  
    1414 * a special if block to test easily a right value 
    1515 * 
    16  * <pre>{ifacl 'subject',54} ..here generated content if the user has the right  {/ifacl}</pre> 
     16 * <pre>{ifacl 'subject','value', 54} ..here generated content if the user has the right  {/ifacl}</pre> 
    1717 * @param jTplCompiler $compiler the template compiler 
    1818 * @param boolean true if it is the begin of block, else false 

  • trunk/lib/jelix/plugins/tpl/common/block.ifacl.php

    r662 r864  
    1414 * a special if block to test easily a right value 
    1515 * 
    16  * <pre>{ifacl 'subject',54} ..here generated content if the user has the right  {/ifacl}</pre> 
     16 * <pre>{ifacl 'subject','value', 54} ..here generated content if the user has the right  {/ifacl}</pre> 
    1717 * @param jTplCompiler $compiler the template compiler 
    1818 * @param boolean true if it is the begin of block, else false 

  • trunk/lib/jelix/plugins/tpl/common/block.ifnotacl.php

    r662 r864  
    1414 * a special if block to test easily a right value 
    1515 * 
    16  * <pre>{ifnotacl 'subject',54} ..here generated content if the user has NOT the right  {/ifnotacl}</pre> 
     16 * <pre>{ifnotacl 'subject','value',54} ..here generated content if the user has NOT the right  {/ifnotacl}</pre> 
    1717 * @param jTplCompiler $compiler the template compiler 
    1818 * @param boolean true if it is the begin of block, else false 

  • trunk/lib/jelix/plugins/tpl/common/block.ifnotacl.php

    r662 r864  
    1414 * a special if block to test easily a right value 
    1515 * 
    16  * <pre>{ifnotacl 'subject',54} ..here generated content if the user has NOT the right  {/ifnotacl}</pre> 
     16 * <pre>{ifnotacl 'subject','value',54} ..here generated content if the user has NOT the right  {/ifnotacl}</pre> 
    1717 * @param jTplCompiler $compiler the template compiler 
    1818 * @param boolean true if it is the begin of block, else false 

  • trunk/lib/jelix/plugins/tpl/common/block.ifnotacl.php

    r662 r864  
    1414 * a special if block to test easily a right value 
    1515 * 
    16  * <pre>{ifnotacl 'subject',54} ..here generated content if the user has NOT the right  {/ifnotacl}</pre> 
     16 * <pre>{ifnotacl 'subject','value',54} ..here generated content if the user has NOT the right  {/ifnotacl}</pre> 
    1717 * @param jTplCompiler $compiler the template compiler 
    1818 * @param boolean true if it is the begin of block, else false 

  • trunk/testapp/install/install.mysql.sql

    r661 r864  
    8383 
    8484 
     85-- Liste des groupes 
     86DROP TABLE IF EXISTS `jacl2_group`; 
     87CREATE TABLE `jacl2_group` ( 
     88  `id_aclgrp` int(11) NOT NULL auto_increment, 
     89  `name` varchar(150) NOT NULL default '', 
     90  `grouptype` tinyint(4) NOT NULL default '0', 
     91  `ownerlogin` varchar(50) default NULL, 
     92  PRIMARY KEY  (`id_aclgrp`) 
     93) TYPE=MyISAM AUTO_INCREMENT=1 ; 
     94 
     95-- liste des groupes associés à chaque utilisateur 
     96DROP TABLE IF EXISTS `jacl2_user_group`; 
     97CREATE TABLE `jacl2_user_group` ( 
     98  `login` varchar(50) NOT NULL default '', 
     99  `id_aclgrp` int(11) NOT NULL default '0', 
     100  KEY `login` (`login`,`id_aclgrp`) 
     101) TYPE=MyISAM; 
     102 
     103 
     104-- liste des sujets, avec leur appartenance à un groupe de valeurs de droits 
     105DROP TABLE IF EXISTS `jacl2_subject`; 
     106CREATE TABLE `jacl2_subject` ( 
     107  `id_aclsbj` varchar(100) NOT NULL default '', 
     108  `label_key` varchar(100) default NULL, 
     109  PRIMARY KEY  (`id_aclsbj`) 
     110) TYPE=MyISAM; 
     111 
     112-- table centrale 
     113-- valeurs du droit pour chaque couple sujet/groupe ou triplet sujet/groupe/ressource 
     114DROP TABLE IF EXISTS `jacl2_rights`; 
     115CREATE TABLE `jacl2_rights` ( 
     116  `id_aclsbj` varchar(100) NOT NULL default '', 
     117  `id_aclgrp` int(11) NOT NULL default '0', 
     118  `id_aclres` varchar(100) NOT NULL default '', 
     119  PRIMARY KEY  (`id_aclsbj`,`id_aclgrp`,`id_aclres`) 
     120) TYPE=MyISAM; 
     121 
     122 
    85123-- -------------------------------------------------------- 
    86124 

  • trunk/testapp/install/install.mysql.sql

    r661 r864  
    8383 
    8484 
     85-- Liste des groupes 
     86DROP TABLE IF EXISTS `jacl2_group`; 
     87CREATE TABLE `jacl2_group` ( 
     88  `id_aclgrp` int(11) NOT NULL auto_increment, 
     89  `name` varchar(150) NOT NULL default '', 
     90  `grouptype` tinyint(4) NOT NULL default '0', 
     91  `ownerlogin` varchar(50) default NULL, 
     92  PRIMARY KEY  (`id_aclgrp`) 
     93) TYPE=MyISAM AUTO_INCREMENT=1 ; 
     94 
     95-- liste des groupes associés à chaque utilisateur 
     96DROP TABLE IF EXISTS `jacl2_user_group`; 
     97CREATE TABLE `jacl2_user_group` ( 
     98  `login` varchar(50) NOT NULL default '', 
     99  `id_aclgrp` int(11) NOT NULL default '0', 
     100  KEY `login` (`login`,`id_aclgrp`) 
     101) TYPE=MyISAM; 
     102 
     103 
     104-- liste des sujets, avec leur appartenance à un groupe de valeurs de droits 
     105DROP TABLE IF EXISTS `jacl2_subject`; 
     106CREATE TABLE `jacl2_subject` ( 
     107  `id_aclsbj` varchar(100) NOT NULL default '', 
     108  `label_key` varchar(100) default NULL, 
     109  PRIMARY KEY  (`id_aclsbj`) 
     110) TYPE=MyISAM; 
     111 
     112-- table centrale 
     113-- valeurs du droit pour chaque couple sujet/groupe ou triplet sujet/groupe/ressource 
     114DROP TABLE IF EXISTS `jacl2_rights`; 
     115CREATE TABLE `jacl2_rights` ( 
     116  `id_aclsbj` varchar(100) NOT NULL default '', 
     117  `id_aclgrp` int(11) NOT NULL default '0', 
     118  `id_aclres` varchar(100) NOT NULL default '', 
     119  PRIMARY KEY  (`id_aclsbj`,`id_aclgrp`,`id_aclres`) 
     120) TYPE=MyISAM; 
     121 
     122 
    85123-- -------------------------------------------------------- 
    86124 

  • trunk/testapp/install/install.mysql.sql

    r661 r864  
    8383 
    8484 
     85-- Liste des groupes 
     86DROP TABLE IF EXISTS `jacl2_group`; 
     87CREATE TABLE `jacl2_group` ( 
     88  `id_aclgrp` int(11) NOT NULL auto_increment, 
     89  `name` varchar(150) NOT NULL default '', 
     90  `grouptype` tinyint(4) NOT NULL default '0', 
     91  `ownerlogin` varchar(50) default NULL, 
     92  PRIMARY KEY  (`id_aclgrp`) 
     93) TYPE=MyISAM AUTO_INCREMENT=1 ; 
     94 
     95-- liste des groupes associés à chaque utilisateur 
     96DROP TABLE IF EXISTS `jacl2_user_group`; 
     97CREATE TABLE `jacl2_user_group` ( 
     98  `login` varchar(50) NOT NULL default '', 
     99  `id_aclgrp` int(11) NOT NULL default '0', 
     100  KEY `login` (`login`,`id_aclgrp`) 
     101) TYPE=MyISAM; 
     102 
     103 
     104-- liste des sujets, avec leur appartenance à un groupe de valeurs de droits 
     105DROP TABLE IF EXISTS `jacl2_subject`; 
     106CREATE TABLE `jacl2_subject` ( 
     107  `id_aclsbj` varchar(100) NOT NULL default '', 
     108  `label_key` varchar(100) default NULL, 
     109  PRIMARY KEY  (`id_aclsbj`) 
     110) TYPE=MyISAM; 
     111 
     112-- table centrale 
     113-- valeurs du droit pour chaque couple sujet/groupe ou triplet sujet/groupe/ressource 
     114DROP TABLE IF EXISTS `jacl2_rights`; 
     115CREATE TABLE `jacl2_rights` ( 
     116  `id_aclsbj` varchar(100) NOT NULL default '', 
     117  `id_aclgrp` int(11) NOT NULL default '0', 
     118  `id_aclres` varchar(100) NOT NULL default '', 
     119  PRIMARY KEY  (`id_aclsbj`,`id_aclgrp`,`id_aclres`) 
     120) TYPE=MyISAM; 
     121 
     122 
    85123-- -------------------------------------------------------- 
    86124 

  • trunk/testapp/install/install.pgsql.sql

    r795 r864  
    157157 
    158158 
    159  
    160  
    161  
    162  
    163  
    164  
    165  
     159CREATE TABLE jacl2_group ( 
     160    id_aclgrp serial NOT NULL, 
     161    name character varying(150) NOT NULL, 
     162    grouptype smallint NOT NULL, 
     163    ownerlogin character varying(50) 
     164); 
     165 
     166SELECT pg_catalog.setval(pg_catalog.pg_get_serial_sequence('jacl2_group', 'id_aclgrp'), 1, false); 
     167 
     168CREATE TABLE jacl2_rights ( 
     169    id_aclsbj character varying(255) NOT NULL, 
     170    id_aclgrp integer NOT NULL, 
     171    id_aclres character varying(100) NOT NULL 
     172); 
     173 
     174CREATE TABLE jacl2_subject ( 
     175    id_aclsbj character varying(100) NOT NULL, 
     176    label_key character varying(100) 
     177); 
     178 
     179CREATE TABLE jacl2_user_group ( 
     180    "login" character varying(50) NOT NULL, 
     181    id_aclgrp integer NOT NULL 
     182); 
     183 
     184 
     185ALTER TABLE ONLY jacl2_group 
     186    ADD CONSTRAINT jacl2_group_pkey PRIMARY KEY (id_aclgrp); 
     187 
     188ALTER TABLE ONLY jacl2_rights 
     189    ADD CONSTRAINT jacl2_rights_pkey PRIMARY KEY (id_aclsbj, id_aclgrp, id_aclres); 
     190 
     191ALTER TABLE ONLY jacl2_subject 
     192    ADD CONSTRAINT jacl2_subject_pkey PRIMARY KEY (id_aclsbj); 
     193 
     194ALTER TABLE ONLY jacl2_user_group 
     195    ADD CONSTRAINT jacl2_user_group_pkey PRIMARY KEY ("login", id_aclgrp); 
     196 
     197ALTER TABLE ONLY jacl2_rights 
     198    ADD CONSTRAINT jacl2_rights_id_aclgrp_fkey FOREIGN KEY (id_aclgrp) REFERENCES jacl2_group(id_aclgrp); 
     199 
     200ALTER TABLE ONLY jacl2_rights 
     201    ADD CONSTRAINT jacl2_rights_id_aclsbj_fkey FOREIGN KEY (id_aclsbj) REFERENCES jacl2_subject(id_aclsbj); 
     202 
     203ALTER TABLE ONLY jacl2_user_group 
     204    ADD CONSTRAINT jacl2_user_group_id_aclgrp_fkey FOREIGN KEY (id_aclgrp) REFERENCES jacl2_group(id_aclgrp); 
     205 
     206 
     207 
     208 
     209 
     210 
     211 

  • trunk/testapp/install/install.pgsql.sql

    r795 r864  
    157157 
    158158 
    159  
    160  
    161  
    162  
    163  
    164  
    165  
     159CREATE TABLE jacl2_group ( 
     160    id_aclgrp serial NOT NULL, 
     161    name character varying(150) NOT NULL, 
     162    grouptype smallint NOT NULL, 
     163    ownerlogin character varying(50) 
     164); 
     165 
     166SELECT pg_catalog.setval(pg_catalog.pg_get_serial_sequence('jacl2_group', 'id_aclgrp'), 1, false); 
     167 
     168CREATE TABLE jacl2_rights ( 
     169    id_aclsbj character varying(255) NOT NULL, 
     170    id_aclgrp integer NOT NULL, 
     171    id_aclres character varying(100) NOT NULL 
     172); 
     173 
     174CREATE TABLE jacl2_subject ( 
     175    id_aclsbj character varying(100) NOT NULL, 
     176    label_key character varying(100) 
     177); 
     178 
     179CREATE TABLE jacl2_user_group ( 
     180    "login" character varying(50) NOT NULL, 
     181    id_aclgrp integer NOT NULL 
     182); 
     183 
     184 
     185ALTER TABLE ONLY jacl2_group 
     186    ADD CONSTRAINT jacl2_group_pkey PRIMARY KEY (id_aclgrp); 
     187 
     188ALTER TABLE ONLY jacl2_rights 
     189    ADD CONSTRAINT jacl2_rights_pkey PRIMARY KEY (id_aclsbj, id_aclgrp, id_aclres); 
     190 
     191ALTER TABLE ONLY jacl2_subject 
     192    ADD CONSTRAINT jacl2_subject_pkey PRIMARY KEY (id_aclsbj); 
     193 
     194ALTER TABLE ONLY jacl2_user_group 
     195    ADD CONSTRAINT jacl2_user_group_pkey PRIMARY KEY ("login", id_aclgrp); 
     196 
     197ALTER TABLE ONLY jacl2_rights 
     198    ADD CONSTRAINT jacl2_rights_id_aclgrp_fkey FOREIGN KEY (id_aclgrp) REFERENCES jacl2_group(id_aclgrp); 
     199 
     200ALTER TABLE ONLY jacl2_rights 
     201    ADD CONSTRAINT jacl2_rights_id_aclsbj_fkey FOREIGN KEY (id_aclsbj) REFERENCES jacl2_subject(id_aclsbj); 
     202 
     203ALTER TABLE ONLY jacl2_user_group 
     204    ADD CONSTRAINT jacl2_user_group_id_aclgrp_fkey FOREIGN KEY (id_aclgrp) REFERENCES jacl2_group(id_aclgrp); 
     205 
     206 
     207 
     208 
     209 
     210 
     211 

  • trunk/testapp/install/install.pgsql.sql

    r795 r864  
    157157 
    158158 
    159  
    160  
    161  
    162  
    163  
    164  
    165  
     159CREATE TABLE jacl2_group ( 
     160    id_aclgrp serial NOT NULL, 
     161    name character varying(150) NOT NULL, 
     162    grouptype smallint NOT NULL, 
     163    ownerlogin character varying(50) 
     164); 
     165 
     166SELECT pg_catalog.setval(pg_catalog.pg_get_serial_sequence('jacl2_group', 'id_aclgrp'), 1, false); 
     167 
     168CREATE TABLE jacl2_rights ( 
     169    id_aclsbj character varying(255) NOT NULL, 
     170    id_aclgrp integer NOT NULL, 
     171    id_aclres character varying(100) NOT NULL 
     172); 
     173 
     174CREATE TABLE jacl2_subject ( 
     175    id_aclsbj character varying(100) NOT NULL, 
     176    label_key character varying(100) 
     177); 
     178 
     179CREATE TABLE jacl2_user_group ( 
     180    "login" character varying(50) NOT NULL, 
     181    id_aclgrp integer NOT NULL 
     182); 
     183 
     184 
     185ALTER TABLE ONLY jacl2_group 
     186    ADD CONSTRAINT jacl2_group_pkey PRIMARY KEY (id_aclgrp); 
     187 
     188ALTER TABLE ONLY jacl2_rights 
     189    ADD CONSTRAINT jacl2_rights_pkey PRIMARY KEY (id_aclsbj, id_aclgrp, id_aclres); 
     190 
     191ALTER TABLE ONLY jacl2_subject 
     192    ADD CONSTRAINT jacl2_subject_pkey PRIMARY KEY (id_aclsbj); 
     193 
     194ALTER TABLE ONLY jacl2_user_group 
     195    ADD CONSTRAINT jacl2_user_group_pkey PRIMARY KEY ("login", id_aclgrp); 
     196 
     197ALTER TABLE ONLY jacl2_rights 
     198    ADD CONSTRAINT jacl2_rights_id_aclgrp_fkey FOREIGN KEY (id_aclgrp) REFERENCES jacl2_group(id_aclgrp); 
     199 
     200ALTER TABLE ONLY jacl2_rights 
     201    ADD CONSTRAINT jacl2_rights_id_aclsbj_fkey FOREIGN KEY (id_aclsbj) REFERENCES jacl2_subject(id_aclsbj); 
     202 
     203ALTER TABLE ONLY jacl2_user_group 
     204    ADD CONSTRAINT jacl2_user_group_id_aclgrp_fkey FOREIGN KEY (id_aclgrp) REFERENCES jacl2_group(id_aclgrp); 
     205 
     206 
     207 
     208 
     209 
     210 
     211 

  • trunk/testapp/modules/jelix_tests/tests/jacl.main_api.html_cli.php

    r781 r864  
    1010*/ 
    1111 
     12if(!class_exists('jAuth',false)) { 
     13    class jAuth { 
    1214 
    13 class jAuth { 
     15        static public $connect = true; 
    1416 
    15     static public $connect = true; 
     17        static function isConnected() { 
     18            return self::$connect; 
     19        } 
    1620 
    17     static function isConnected() { 
    18         return self::$connect; 
    19     } 
    20  
    21     static function getUserSession() { 
    22         return $_SESSION['JELIX_USER']; 
     21        static function getUserSession() { 
     22            return $_SESSION['JELIX_USER']; 
     23        } 
    2324    } 
    2425} 
     26 
    2527 
    2628class userTest { 

  • trunk/testapp/modules/jelix_tests/tests/jacl.main_api.html_cli.php

    r781 r864  
    1010*/ 
    1111 
     12if(!class_exists('jAuth',false)) { 
     13    class jAuth { 
    1214 
    13 class jAuth { 
     15        static public $connect = true; 
    1416 
    15     static public $connect = true; 
     17        static function isConnected() { 
     18          &n