Changeset 339
- Timestamp:
- 12/23/06 15:40:38 (2 years ago)
- Files:
-
- trunk/build/manifests/jelix-lib.mn (modified) (3 diffs)
- trunk/build/manifests/jelix-modules.mn (modified) (1 diff)
- trunk/demoxul/var/config/defaultconfig.ini.php.dist (modified) (1 diff)
- trunk/lib/jelix-modules/jauth (added)
- trunk/lib/jelix-modules/jauth/classes (added)
- trunk/lib/jelix-modules/jauth/classes/jauth.listener.php (added)
- trunk/lib/jelix-modules/jauth/controllers (added)
- trunk/lib/jelix-modules/jauth/controllers/login.classic.php (added)
- trunk/lib/jelix-modules/jauth/controllers/loginsw.classic.php (added)
- trunk/lib/jelix-modules/jauth/events.xml (added)
- trunk/lib/jelix-modules/jauth/install (added)
- trunk/lib/jelix-modules/jauth/install/var (added)
- trunk/lib/jelix-modules/jauth/install/var/config (added)
- trunk/lib/jelix-modules/jauth/install/var/config/auth.plugin.ini.php (added)
- trunk/lib/jelix-modules/jauth/install/var/config/authsw.plugin.ini.php (added)
- trunk/lib/jelix-modules/jauth/install/www (added)
- trunk/lib/jelix-modules/jauth/locales (added)
- trunk/lib/jelix-modules/jauth/locales/en_US (added)
- trunk/lib/jelix-modules/jauth/locales/en_US/auth.ISO-8859-1.properties (added)
- trunk/lib/jelix-modules/jauth/locales/en_US/autherror.ISO-8859-1.properties (added)
- trunk/lib/jelix-modules/jauth/locales/fr_FR (added)
- trunk/lib/jelix-modules/jauth/locales/fr_FR/auth.ISO-8859-1.properties (added)
- trunk/lib/jelix-modules/jauth/locales/fr_FR/auth.UTF-8.properties (added)
- trunk/lib/jelix-modules/jauth/locales/fr_FR/autherror.ISO-8859-1.properties (added)
- trunk/lib/jelix-modules/jauth/locales/fr_FR/autherror.UTF-8.properties (added)
- trunk/lib/jelix-modules/jauth/module.xml (added)
- trunk/lib/jelix-modules/jauth/templates (added)
- trunk/lib/jelix-modules/jauth/templates/index.tpl (added)
- trunk/lib/jelix-modules/jauth/templates/login.form.tpl (added)
- trunk/lib/jelix-modules/jauth/zones (added)
- trunk/lib/jelix-modules/jauth/zones/loginform.zone.php (added)
- trunk/lib/jelix-modules/jelix/daos (added)
- trunk/lib/jelix-modules/jelix/daos/jaclgroup.dao.xml (added)
- trunk/lib/jelix-modules/jelix/daos/jaclgroupsofuser.dao.xml (added)
- trunk/lib/jelix-modules/jelix/daos/jaclrights.dao.xml (added)
- trunk/lib/jelix-modules/jelix/daos/jaclrightvalues.dao.xml (added)
- trunk/lib/jelix-modules/jelix/daos/jaclrightvaluesandgroup.dao.xml (added)
- trunk/lib/jelix-modules/jelix/daos/jaclrightvaluesgroup.dao.xml (added)
- trunk/lib/jelix-modules/jelix/daos/jaclsubject.dao.xml (added)
- trunk/lib/jelix-modules/jelix/daos/jaclusergroup.dao.xml (added)
- trunk/lib/jelix-modules/jelix/install/sql (added)
- trunk/lib/jelix-modules/jelix/install/sql/delete.mysql.sql (added)
- trunk/lib/jelix-modules/jelix/install/sql/install.datas.mysql.sql (added)
- trunk/lib/jelix-modules/jelix/install/sql/install.schema.mysql.sql (added)
- trunk/lib/jelix-modules/jelix/plugins (added)
- trunk/lib/jelix-modules/jelix/plugins/auth (added)
- trunk/lib/jelix-modules/jelix/plugins/auth/auth.plugin.ini.php.dist (added)
- trunk/lib/jelix-modules/jelix/plugins/auth/auth.plugin.php (added)
- trunk/lib/jelix-modules/jelix/plugins/auth/plugin.xml (added)
- trunk/lib/jelix-modules/jxacl/classes/acl.listener.php (modified) (1 diff)
- trunk/lib/jelix-modules/jxacl/classes/aclservice.class.php (modified) (1 diff)
- trunk/lib/jelix-modules/jxacl/classes/rights.class.php (modified) (1 diff)
- trunk/lib/jelix-modules/jxacl/controllers/admin.classic.php (modified) (2 diffs)
- trunk/lib/jelix-modules/jxacl/controllers/admin.rdf.php (modified) (1 diff)
- trunk/lib/jelix-modules/jxacl/controllers/xul.classic.php (modified) (1 diff)
- trunk/lib/jelix-modules/jxacl/controllers/xuladmin.classic.php (modified) (3 diffs)
- trunk/lib/jelix-modules/jxacl/daos/jaclgroup.dao.xml (deleted)
- trunk/lib/jelix-modules/jxacl/daos/jaclgroupsofuser.dao.xml (deleted)
- trunk/lib/jelix-modules/jxacl/daos/jaclrights.dao.xml (deleted)
- trunk/lib/jelix-modules/jxacl/daos/jaclrightvalues.dao.xml (deleted)
- trunk/lib/jelix-modules/jxacl/daos/jaclrightvaluesandgroup.dao.xml (deleted)
- trunk/lib/jelix-modules/jxacl/daos/jaclrightvaluesgroup.dao.xml (deleted)
- trunk/lib/jelix-modules/jxacl/daos/jaclsubject.dao.xml (deleted)
- trunk/lib/jelix-modules/jxacl/daos/jaclusergroup.dao.xml (deleted)
- trunk/lib/jelix-modules/jxacl/install/sql/delete.mysql.sql (deleted)
- trunk/lib/jelix-modules/jxacl/install/sql/install.datas.mysql.sql (deleted)
- trunk/lib/jelix-modules/jxacl/install/sql/install.schema.mysql.sql (deleted)
- trunk/lib/jelix-modules/jxauth/classes/jxauth.listener.php (moved) (moved from trunk/lib/jelix-modules/jxauth/classes/auth.listener.php) (2 diffs)
- trunk/lib/jelix-modules/jxauth/controllers/admin.jsonrpc.php (modified) (1 diff)
- trunk/lib/jelix-modules/jxauth/controllers/admin.rdf.php (modified) (1 diff)
- trunk/lib/jelix-modules/jxauth/controllers/login.classic.php (deleted)
- trunk/lib/jelix-modules/jxauth/controllers/login.jsonrpc.php (modified) (2 diffs)
- trunk/lib/jelix-modules/jxauth/controllers/loginsw.classic.php (deleted)
- trunk/lib/jelix-modules/jxauth/controllers/xuladmin.classic.php (modified) (2 diffs)
- trunk/lib/jelix-modules/jxauth/events.xml (modified) (1 diff)
- trunk/lib/jelix-modules/jxauth/install/var (added)
- trunk/lib/jelix-modules/jxauth/install/var/config (added)
- trunk/lib/jelix-modules/jxauth/install/var/config/auth.plugin.ini.php (added)
- trunk/lib/jelix-modules/jxauth/locales/en_US/auth.ISO-8859-1.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jxauth/locales/fr_FR/auth.ISO-8859-1.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jxauth/locales/fr_FR/auth.UTF-8.properties (modified) (1 diff)
- trunk/lib/jelix-modules/jxauth/plugins/auth (deleted)
- trunk/lib/jelix-modules/jxauth/templates/index.tpl (deleted)
- trunk/lib/jelix-modules/jxauth/templates/login.form.tpl (deleted)
- trunk/lib/jelix-modules/jxauth/templates/xuladmin.tpl (modified) (10 diffs)
- trunk/lib/jelix-modules/jxauth/zones/loginform.zone.php (deleted)
- trunk/lib/jelix-modules/jxxulapp/controllers/default.classic.php (modified) (1 diff)
- trunk/lib/jelix-modules/jxxulapp/install/var/config/auth.plugin.ini.php (modified) (3 diffs)
- trunk/lib/jelix-modules/jxxulapp/install/var/config/auth.plugin.jsonrpc.ini.php (modified) (3 diffs)
- trunk/lib/jelix-modules/jxxulapp/install/var/config/auth.plugin.rdf.ini.php (modified) (3 diffs)
- trunk/lib/jelix-modules/jxxulapp/install/var/config/auth.plugin.xul.ini.php (modified) (3 diffs)
- trunk/lib/jelix/acl/jAcl.class.php (modified) (2 diffs)
- trunk/lib/jelix/acl/jAclManager.class.php (modified) (6 diffs)
- trunk/lib/jelix/acl/jAclUserGroup.class.php (modified) (11 diffs)
- trunk/lib/jelix/auth/jAuth.class.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/manifests/jelix-lib.mn
r335 r339 179 179 cd lib/jelix-modules/jelix 180 180 module.xml 181 cd lib/jelix-modules/jelix/controllers 182 ! help.cmdline.php 183 ! error.classic.php 184 ! error.xul.php 185 ! error.jsonrpc.php 186 ! error.xmlrpc.php 187 ! error.rdf.php 188 cd lib/jelix-modules/jelix/daos 189 jaclgroup.dao.xml 190 jaclrights.dao.xml 191 jaclrightvalues.dao.xml 192 jaclrightvaluesgroup.dao.xml 193 jaclrightvaluesandgroup.dao.xml 194 jaclsubject.dao.xml 195 jaclusergroup.dao.xml 196 jaclgroupsofuser.dao.xml 197 cd lib/jelix-modules/jelix/install/sql 198 delete.mysql.sql 199 install.schema.mysql.sql 200 install.datas.mysql.sql 181 201 cd lib/jelix-modules/jelix/locales/en_US 182 202 dao.ISO-8859-1.properties … … 208 228 ui.UTF-8.properties 209 229 auth.UTF-8.properties 210 cd lib/jelix-modules/jelix/controllers 211 ! help.cmdline.php 212 ! error.classic.php 213 ! error.xul.php 214 ! error.jsonrpc.php 215 ! error.xmlrpc.php 216 ! error.rdf.php 230 cd lib/jelix-modules/jelix/plugins/auth 231 ! auth.plugin.php 232 plugin.xml 233 auth.plugin.ini.php.dist 217 234 cd lib/jelix-modules/jelix/templates 218 235 404.xul.tpl … … 221 238 atom10.tpl 222 239 223 cd lib/jelix-modules/j xauth240 cd lib/jelix-modules/jauth 224 241 module.xml 225 242 events.xml 226 cd lib/jelix-modules/jxauth/plugins/auth 227 ! auth.plugin.php 228 plugin.xml 229 auth.plugin.ini.php.dist 230 cd lib/jelix-modules/jxauth/locales/en_US 243 cd lib/jelix-modules/jauth/classes 244 ! jauth.listener.php 245 cd lib/jelix-modules/jauth/controllers 246 ! login.classic.php 247 ! loginsw.classic.php 248 cd lib/jelix-modules/jauth/install/var/config 249 auth.plugin.ini.php 250 authsw.plugin.ini.php 251 cd lib/jelix-modules/jauth/locales/en_US 231 252 auth.ISO-8859-1.properties 232 253 autherror.ISO-8859-1.properties 233 cd lib/jelix-modules/j xauth/locales/fr_FR254 cd lib/jelix-modules/jauth/locales/fr_FR 234 255 auth.ISO-8859-1.properties 235 256 autherror.ISO-8859-1.properties 236 257 auth.UTF-8.properties 237 258 autherror.UTF-8.properties 238 cd lib/jelix-modules/jxauth/install/scripts 239 delete.postgresql.sql 240 install.postgresql.sql 241 delete.mysql.sql 242 install.schema.mysql.sql 243 install.datas.mysql.sql 244 cd lib/jelix-modules/jxauth/classes 245 ! auth.listener.php 246 cd lib/jelix-modules/jxauth/controllers 247 ! login.classic.php 248 ! loginsw.classic.php 249 ! login.jsonrpc.php 250 ! xuladmin.classic.php 251 ! admin.jsonrpc.php 252 ! admin.rdf.php 253 cd lib/jelix-modules/jxauth/zones 259 cd lib/jelix-modules/jauth/templates 260 login.form.tpl 261 index.tpl 262 cd lib/jelix-modules/jauth/zones 254 263 ! loginform.zone.php 255 cd lib/jelix-modules/jxauth/templates256 login.form.tpl257 xaovlay.tpl258 xuladmin.tpl259 index.tpl260 cd lib/jelix-modules/jxauth/daos261 jelixuser.dao.xml262 263 cd lib/jelix-modules/jxacl264 module.xml265 events.xml266 cd lib/jelix-modules/jxacl/classes267 ! acl.listener.php268 ! aclservice.class.php269 cd lib/jelix-modules/jxacl/controllers270 ! xuladmin.classic.php271 ! admin.rdf.php272 ! admin.jsonrpc.php273 ! admin.classic.php274 cd lib/jelix-modules/jxacl/daos275 jaclgroup.dao.xml276 jaclrights.dao.xml277 jaclrightvalues.dao.xml278 jaclrightvaluesgroup.dao.xml279 jaclrightvaluesandgroup.dao.xml280 jaclsubject.dao.xml281 jaclusergroup.dao.xml282 jaclgroupsofuser.dao.xml283 cd lib/jelix-modules/jxacl/install/sql284 delete.mysql.sql285 install.schema.mysql.sql286 install.datas.mysql.sql287 cd lib/jelix-modules/jxacl/install/www/themes/default288 jxacl.css289 no_right.png290 right_ok.png291 cd lib/jelix-modules/jxacl/locales/fr_FR292 db.ISO-8859-1.properties293 cd lib/jelix-modules/jxacl/templates294 xaovlay.tpl295 xuladmin.tpl296 jxauthovlay.tpl297 rights.rdf.tpl298 299 264 300 265 cd lib/jelix-plugins trunk/build/manifests/jelix-modules.mn
r323 r339 25 25 cd jxxulapp/install/www/themes/default/ 26 26 xulpage.css 27 28 cd jxauth 29 module.xml 30 events.xml 31 cd jxauth/classes 32 ! jxauth.listener.php 33 cd jxauth/controllers 34 ! login.jsonrpc.php 35 ! xuladmin.classic.php 36 ! admin.jsonrpc.php 37 ! admin.rdf.php 38 cd jxauth/daos 39 jelixuser.dao.xml 40 cd jxauth/install/scripts 41 delete.mysql.sql 42 delete.postgresql.sql 43 install.datas.mysql.sql 44 install.postgresql.sql 45 install.schema.mysql.sql 46 cd jxauth/install/var/config 47 auth.plugin.ini.php 48 cd jxauth/locales/en_US 49 auth.ISO-8859-1.properties 50 autherror.ISO-8859-1.properties 51 cd jxauth/locales/fr_FR 52 auth.ISO-8859-1.properties 53 autherror.ISO-8859-1.properties 54 auth.UTF-8.properties 55 autherror.UTF-8.properties 56 cd jxauth/templates 57 xaovlay.tpl 58 xuladmin.tpl 59 60 61 cd jxacl 62 module.xml 63 events.xml 64 cd jxacl/classes 65 ! acl.listener.php 66 ! aclservice.class.php 67 cd jxacl/controllers 68 ! xuladmin.classic.php 69 ! admin.rdf.php 70 ! admin.jsonrpc.php 71 ! admin.classic.php 72 cd jxacl/install/www/themes/default 73 jxacl.css 74 no_right.png 75 right_ok.png 76 cd jxacl/locales/fr_FR 77 db.ISO-8859-1.properties 78 cd jxacl/templates 79 xaovlay.tpl 80 xuladmin.tpl 81 jxauthovlay.tpl 82 rights.rdf.tpl trunk/demoxul/var/config/defaultconfig.ini.php.dist
r269 r339 13 13 trustedModules = 14 14 15 pluginsPath = lib:jelix-plugins/,app:plugins/,lib:jelix-modules/j xauth/plugins/15 pluginsPath = lib:jelix-plugins/,app:plugins/,lib:jelix-modules/jelix/plugins/ 16 16 modulesPath = lib:jelix-modules/,app:modules/ 17 17 tplpluginsPath = lib:jelix/tpl/plugins/ trunk/lib/jelix-modules/jxacl/classes/acl.listener.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxacl 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor neolao trunk/lib/jelix-modules/jxacl/classes/aclservice.class.php
r325 r339 15 15 16 16 function getGroupRights($grpid){ 17 $rv_dao = jDao::get('j xacl~jaclrightvalues');17 $rv_dao = jDao::get('jelix~jaclrightvalues'); 18 18 $sql = 'SELECT s.id_aclsbj, s.id_aclvalgrp, s.label_key, r.value as right_value, r.id_aclres, 19 19 rv.label_key label_value, rv.value value trunk/lib/jelix-modules/jxacl/classes/rights.class.php
r259 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxacl 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor trunk/lib/jelix-modules/jxacl/controllers/admin.classic.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxacl 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor … … 19 18 $grpid = $this->intParam('grpid'); 20 19 21 $dao = jDao::create('j aclusergroup');20 $dao = jDao::create('jelix~jaclusergroup'); 22 21 23 22 $rep = $this->getResponse('text'); trunk/lib/jelix-modules/jxacl/controllers/admin.rdf.php
r323 r339 42 42 $count= $this->intParam('count'); 43 43 44 $dao = jDao::create('j aclusergroup');44 $dao = jDao::create('jelix~jaclusergroup'); 45 45 $rep->datas = $dao->getUsersGroupLimit($grpid, $offset, $count); 46 46 trunk/lib/jelix-modules/jxacl/controllers/xul.classic.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxacl 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor trunk/lib/jelix-modules/jxacl/controllers/xuladmin.classic.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxacl 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor … … 16 15 */ 17 16 function index() { 18 $daogroup = jDao::get('j aclgroup');19 $daovaluegroups = jDao::get('j aclrightvaluesandgroup');17 $daogroup = jDao::get('jelix~jaclgroup'); 18 $daovaluegroups = jDao::get('jelix~jaclrightvaluesandgroup'); 20 19 21 20 $rep = $this->getResponse('xulpage'); … … 37 36 $rep = $this->getResponse('xuloverlay'); 38 37 $rep->bodyTpl = 'jxacl~jxauthovlay'; 39 $daogroup = jDao::get('j aclgroup');38 $daogroup = jDao::get('jelix~jaclgroup'); 40 39 $rep->body->assign('groups', $daogroup->findAllPublicGroup()); 41 40 return $rep; trunk/lib/jelix-modules/jxauth/classes/jxauth.listener.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxauth 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor … … 11 10 */ 12 11 13 class authListener extends jEventListener{12 class jxauthListener extends jEventListener{ 14 13 15 14 /** trunk/lib/jelix-modules/jxauth/controllers/admin.jsonrpc.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxauth 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor trunk/lib/jelix-modules/jxauth/controllers/admin.rdf.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxauth 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor trunk/lib/jelix-modules/jxauth/controllers/login.jsonrpc.php
r318 r339 1 1 <?php 2 2 /** 3 * @package jelix 3 * @package jelix-modules 4 4 * @subpackage jxauth 5 * @version $Id:$6 5 * @author Laurent Jouanneau 7 6 * @contributor … … 46 45 47 46 $rep = $this->getResponse('jsonrpc'); 48 $rep->response = ' OK';47 $rep->response = 'LOGOUT'; 49 48 return $rep; 50 49 } trunk/lib/jelix-modules/jxauth/controllers/xuladmin.classic.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxauth 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor … … 27 26 $rep->bodyTpl = 'jxauth~xaovlay'; 28 27 return $rep; 29 30 28 } 31 29 trunk/lib/jelix-modules/jxauth/events.xml
r185 r339 1 1 <?xml version="1.0" encoding="iso-8859-1"?> 2 2 <events xmlns="http://jelix.org/ns/events/1.0"> 3 <listener name=" auth">3 <listener name="jxauth"> 4 4 <event name="AuthCanLogin" /> 5 5 <event name="FetchXulOverlay" /> trunk/lib/jelix-modules/jxauth/locales/en_US/auth.ISO-8859-1.properties
r187 r339 1 description = Authentification system. 2 longdescription = Allow users to identify themself, manage the connection. 1 page.title = Users management 3 2 4 login = login 5 connect = connect 6 password = password 7 key = key 8 buttons.login = login 9 buttons.logout = logout 10 failedToLogin = Failed to login 3 form.error = fill the login, the email and eventualy the password 4 search.label = Login beginning by 5 userlist.logincol = Login 6 userlist.emailcol = Email 11 7 12 titlePage.failedToLogin = Failed to login 13 titlePage.login = Login 14 15 lostPassword = Password lost ? 8 userform.title = User details 9 userform.login = Login 10 userform.email = Email 11 userform.password = Password 12 userform.password.new = New 13 userform.password.repeat = Repeat 14 userform.save = Save 15 userform.cancel = Cancel trunk/lib/jelix-modules/jxauth/locales/fr_FR/auth.ISO-8859-1.properties
r187 r339 1 description = Authentification. 2 longdescription = Permet l'authentification des utilisateurs, g� la phase de connexion. 1 page.title = Gestion des utilisateurs 3 2 4 login = Identifiant 5 connect = se connecter 6 password = Mot de passe 7 key = Cl�uttons.login = valider 8 buttons.logout = d�nnexion 9 failedToLogin = Echec de l'authentification 3 form.error = Saisissez correctement le login, l'email et �ntuellement le mot de passe 4 search.label = Login commen�t par 5 userlist.logincol = Login 6 userlist.emailcol = Email 10 7 11 titlePage.failedToLogin = Echec de l'authentification 12 titlePage.login = Connexion 13 14 lostPassword = Mot de passe perdu ? 8 userform.title = D�ils sur l'utilisateur 9 userform.login = Login 10 userform.email = Email 11 userform.password = Mot de passe 12 userform.password.new = Nouveau 13 userform.password.repeat = R�tez 14 userform.save = Sauvegarder 15 userform.cancel = Annuler trunk/lib/jelix-modules/jxauth/locales/fr_FR/auth.UTF-8.properties
r187 r339 1 description = Authentification. 2 longdescription = Permet l'authentification des utilisateurs, gère la phase de connexion. 1 page.title = Gestion des utilisateurs 3 2 4 login = Identifiant 5 connect = se connecter 6 password = Mot de passe 7 key = Clé 8 buttons.login = valider 9 buttons.logout = déconnexion 10 failedToLogin = Echec de l'authentification 3 form.error = Saisissez correctement le login, l'email et éventuellement le mot de passe 4 search.label = Login commençant par 5 userlist.logincol = Login 6 userlist.emailcol = Email 11 7 12 titlePage.failedToLogin = Echec de l'authentification 13 titlePage.login = Connexion 14 15 lostPassword = Mot de passe perdu ? 8 userform.title = Détails sur l'utilisateur 9 userform.login = Login 10 userform.email = Email 11 userform.password = Mot de passe 12 userform.password.new = Nouveau 13 userform.password.repeat = Répétez 14 userform.save = Sauvegarder 15 userform.cancel = Annuler trunk/lib/jelix-modules/jxauth/templates/xuladmin.tpl
r323 r339 14 14 var gEmailTb; 15 15 var dsUrl = '{jurl 'jxauth~admin_userslist@rdf',array(),false}'; 16 16 var gFormErrorMsg = "{@jxauth~auth.form.error@}" 17 17 18 {literal} 18 19 function init(){ … … 105 106 {/literal} 106 107 ]]></script> 107 <description class="title-page"> Gestion des utilisateurs</description>108 <description class="title-page">{@jxauth~auth.page.title@}</description> 108 109 109 110 <jx:submission id="userform" action="{jurl '@jsonrpc'}" method="POST" … … 111 112 onsubmit="return verifPwd()" 112 113 onresult="onUserFormSaved()" 113 onhttperror="alert(' erreur http:' + event.errorCode)"114 oninvalidate="alert( 'Saisissez correctement le login, l\'email et �ntuellement le mot de passe')"114 onhttperror="alert('http error :' + event.errorCode)" 115 oninvalidate="alert(gFormErrorMsg)" 115 116 onrpcerror="alert(this.jsonResponse.error.toSource())" 116 117 onerror="alert(this.httpreq.responseText);" … … 119 120 <vbox flex="1"> 120 121 <jx:templatecriterion uri="{jurl 'jxauth~admin_userslist@rdf'}" target="userslist" id="criteres"> 121 <label control="letter" value=" Login commen�t par"/>122 <label control="letter" value="{@jxauth~auth.search.label@}"/> 122 123 <textbox id="letter" name="letter" /> 123 124 </jx:templatecriterion> … … 127 128 > 128 129 <treecols> 129 <treecol id="login-col" label=" Login" primary="true" flex="1"130 <treecol id="login-col" label="{@jxauth~auth.userlist.logincol@}" primary="true" flex="1" 130 131 class="sortDirectionIndicator" sortActive="false" 131 132 sortDirection="ascending" 132 133 sort="rdf:http://jelix.org/ns/users#login"/> 133 134 <splitter class="tree-splitter"/> 134 <treecol id="email-col" label=" Email" flex="1"135 <treecol id="email-col" label="{@jxauth~auth.userlist.emailcol@}" flex="1" 135 136 class="sortDirectionIndicator" sortActive="true" 136 137 sortDirection="ascending" … … 151 152 <!--<hbox pack="right"><button id="createuser-btn" label="Nouvel Utilisateur" oncommand="prepareNewUser()" /></hbox>--> 152 153 <groupbox> 153 <caption label=" D�ils sur l'utilisateur"/>154 <caption label="{@jxauth~auth.userform.title@}"/> 154 155 <grid> 155 156 <columns> … … 159 160 <rows id="userdata-rows" oninput="modificationUserForm()"> 160 161 <row> 161 <label control="login" value=" Login" style="text-align:right;"/>162 <label control="login" value="{@jxauth~auth.userform.login@}" style="text-align:right;"/> 162 163 <textbox id="login" name="login" flex="1" form="userform pwdform" 163 164 required="true" readonly="true"/> 164 165 </row> 165 166 <row> 166 <label control="email" value=" Email" style="text-align:right;"/>167 <label control="email" value="{@jxauth~auth.userform.email@}" style="text-align:right;"/> 167 168 <textbox id="email" name="email" flex="1" form="userform" 168 169 required="true"/> … … 172 173 </groupbox> 173 174 <groupbox> 174 <caption label=" Mot de passe"/>175 <caption label="{@jxauth~auth.userform.password@}"/> 175 176 <grid> 176 177 <columns> … … 180 181 <rows oninput="modificationUserForm()"> 181 182 <row> 182 <label control="pwd1" value=" Nouveau" style="text-align:right;"/>183 <label control="pwd1" value="{@jxauth~auth.userform.password.new@}" style="text-align:right;"/> 183 184 <textbox id="pwd" name="pwd" flex="1" type="password" 184 185 form="userform" /> 185 186 </row> 186 187 <row> 187 <label control="pwd2" value=" R�tez" style="text-align:right;"/>188 <label control="pwd2" value="{@jxauth~auth.userform.password.repeat@}" style="text-align:right;"/> 188 189 <textbox id="pwd2" flex="1" type="password" /> 189 190 </row> … … 191 192 </grid> 192 193 </groupbox> 193 <hbox><jx:submit id="userdata" form="userform" label=" Sauvegarder"/>194 <button id="userdata-cancel" label=" Annuler" oncommand="loadUserForm()" /></hbox>194 <hbox><jx:submit id="userdata" form="userform" label="{@jxauth~auth.userform.save@}"/> 195 <button id="userdata-cancel" label="{@jxauth~auth.userform.cancel@}" oncommand="loadUserForm()" /></hbox> 195 196 </vbox> 196 197 </hbox> trunk/lib/jelix-modules/jxxulapp/controllers/default.classic.php
r318 r339 3 3 * @package jelix-modules 4 4 * @subpackage jxxulapp 5 * @version $Id$6 5 * @author Jouanneau Laurent 7 6 * @contributor trunk/lib/jelix-modules/jxxulapp/install/var/config/auth.plugin.ini.php
r259 r339 2 2 ;for security reasons , don't remove or modify the first line 3 3 4 ; Db ou Ldap 4 ;============= Param�es g�raux 5 6 ; Db, Class ou LDS ( respecter la casse des caract�s) 5 7 driver = Db 6 8 7 ; nom de la fonction globale qui sert �rypter le mot de passe 8 ; peut �e vide, dans le cas o�driver prend en charge le cryptage 9 password_crypt_function = md5 10 11 ; indique si il faut absolument ou non une authentification 12 ; on = authentification necessaire pour toute action 13 ; sauf celles qui l'indiquent sp�fiquement (parametre action auth.required=false) 14 ; off = authentification non requise pour toute action 15 ; sauf celles qui l'indiquent sp�fiquement (parametre action auth.required=true) 16 auth_required = on 17 18 19 ;Timeout. Permet de forcer une authentification apr�un certain temps �ul�sans action . temps en minutes. 0 = pas de timeout. 20 21 timeout = 0 22 23 ; indique quoi faire en cas de d�ut d'authentification 24 ; 1 = erreur. Valeur �ettre imp�tivement pour les web services 25 ; 2 = redirection vers une action 26 on_error = 2 27 28 ; action �xecuter en cas de d�ut d'authentification quand onError = 2 29 on_error_action = "jxxulapp~default_login" 30 31 ; nombre de secondes d'attentes apr�un d�ut d'authentification 32 on_error_sleep = 3 33 34 ;selecteur de la locale 35 error_message = "jxauth~autherror.notlogged" 36 9 ;============ Param�es pour le plugin 37 10 ; indique si on effectue un contr�sur l'adresse ip 38 11 ; qui a d�rr�a session. … … 42 15 bad_ip_action = "jxxulapp~default_login" 43 16 17 ;Timeout. Permet de forcer une authentification apr�un certain temps �ul�sans action . temps en minutes. 0 = pas de timeout. 18 timeout = 0 19 20 ; indique si il faut absolument ou non une authentification pour chaque action 21 ; on = authentification necessaire pour toute action 22 ; sauf celles qui l'indiquent sp�fiquement (parametre action auth.required=false) 23 ; off = authentification non requise pour toute action 24 ; sauf celles qui l'indiquent sp�fiquement (parametre action auth.required=true) 25 auth_required = on 26 27 ; indique quoi faire en cas de d�ut d'authentification 28 ; 1 = erreur. Valeur �ettre imp�tivement pour les web services (xmlrpc, jsonrpc...) 29 ; 2 = redirection vers une action 30 on_error = 2 31 32 ; action �xecuter en cas de d�ut d'authentification quand on_error = 2 33 on_error_action = "jxxulapp~default_login" 34 35 ;selecteur de la cl�e locale du message d'erreur 36 error_message = "jxauth~autherror.notlogged" 37 38 39 ;=========== Param�es pour le module jauth 40 41 ; nombre de secondes d'attentes apr�un d�ut d'authentification 42 on_error_sleep = 3 43 44 44 enable_after_login_override = off 45 after_login = 45 after_login = "" 46 46 47 47 enable_after_logout_override = off 48 48 after_logout = "jxxulapp~default_login" 49 49 50 login_template = "jxauth~login.form" 50 ;=========== Param�es pour les drivers 51 51 52 52 ; param�es pour le driver db … … 54 54 dao = "jxauth~jelixuser" 55 55 56 ; nom de la fonction globale qui sert �rypter le mot de passe 57 password_crypt_function = md5 58 59 ; param�es pour le driver class 60 [Class] 61 class = "" 62 password_crypt_function = md5 63 64 [LDS] 65 trunk/lib/jelix-modules/jxxulapp/install/var/config/auth.plugin.jsonrpc.ini.php
r259 r339 2 2 ;for security reasons , don't remove or modify the first line 3 3 4 ; Db ou Ldap 4 ;============= Param�es g�raux 5 ; Db, Class ou LDS ( respecter la casse des caract�s) 5 6 driver = Db 6 7 7 ; nom de la fonction globale qui sert �rypter le mot de passe 8 ; peut �e vide, dans le cas o�driver prend en charge le cryptage 9 password_crypt_function = md5 10 11 ; indique si il faut absolument ou non une authentification 12 ; on = authentification necessaire pour toute action 13 ; sauf celles qui l'indiquent sp�fiquement (parametre action auth.required=false) 14 ; off = authentification non requise pour toute action 15 ; sauf celles qui l'indiquent sp�fiquement (parametre action auth.required=true) 16 auth_required = on 17 18 19 ;Timeout. Permet de forcer une authentification apr�un certain temps �ul�sans action . temps en minutes. 0 = pas de timeout. 20 21 timeout = 0 22 23 ; indique quoi faire en cas de d�ut d'authentification 24 ; 1 = erreur. Valeur �ettre imp�tivement pour les web services 25 ; 2 = redirection vers une action 26 on_error = 1 27 28 ; action �xecuter en cas de d�ut d'authentification quand onError = 2 29 on_error_action = "jxxulapp~xul_badlogin" 30 31 ; nombre de secondes d'attentes apr�un d�ut d'authentification 32 on_error_sleep = 3 33 34 ;selecteur de la locale 35 error_message = "jxauth~autherror.notlogged" 36 8 ;============ Param�es pour le plugin 37 9 ; indique si on effectue un contr�sur l'adresse ip 38 10 ; qui a d�rr�a session. … … 42 14 bad_ip_action = "jxxulapp~xul_badlogin" 43 15 16 ;Timeout. Permet de forcer une authentification apr�un certain temps �ul�sans action . temps en minutes. 0 = pas de timeout. 17 timeout = 0 18 19 ; indique si il faut absolument ou non une authentification pour chaque action 20 ; on = authentification necessaire pour toute action 21 ; sauf celles qui l'indiquent sp�fiquement (parametre action auth.required=false) 22 ; off = authentification non requise pour toute action 23 ; sauf celles qui l'indiquent sp�fiquement (parametre action auth.required=true) 24 auth_required = on 25 26 ; indique quoi faire en cas de d�ut d'authentification 27 ; 1 = erreur. Valeur �ettre imp�tivement pour l
