Use the 'groups' perm instead of 'user' on X.net

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>

diff --git a/modules/xnet.php b/modules/xnet.php
index 738a2ce..27cd626 100644 (file)
--- a/modules/xnet.php
+++ b/modules/xnet.php
@@ -31,14 +31,14 @@ class XnetModule extends PLModule
             'groups'       => $this->make_hook('groups',       AUTH_PUBLIC),
             'groupes.php'  => $this->make_hook('groups2',      AUTH_PUBLIC),
             'plan'         => $this->make_hook('plan',         AUTH_PUBLIC),
-            'photo'        => $this->make_hook('photo',        AUTH_MDP, 'user'),
-            'autologin'    => $this->make_hook('autologin',    AUTH_MDP, 'user'),
+            'photo'        => $this->make_hook('photo',        AUTH_MDP, 'groups'),
+            'autologin'    => $this->make_hook('autologin',    AUTH_MDP, 'groups'),
             'login/ext'    => $this->make_hook('login_ext',    AUTH_PUBLIC),
             'register/ext' => $this->make_hook('register_ext', AUTH_PUBLIC),
             'recovery/ext' => $this->make_hook('recovery_ext', AUTH_PUBLIC),
             'tmpPWD/ext'   => $this->make_hook('tmpPWD_ext',   AUTH_PUBLIC),
-            'edit'         => $this->make_hook('edit',         AUTH_MDP, 'user'),
-            'password'     => $this->make_hook('password',     AUTH_MDP, 'user'),
+            'edit'         => $this->make_hook('edit',         AUTH_MDP, 'groups'),
+            'password'     => $this->make_hook('password',     AUTH_MDP, 'groups'),
 
             'Xnet'         => $this->make_wiki_hook(),
         );

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 3d2118f..f345f13 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -26,10 +26,10 @@ class XnetEventsModule extends PLModule
     function handlers()
     {
         return array(
-            '%grp/events'       => $this->make_hook('events', AUTH_MDP, 'user'),
-            '%grp/events/sub'   => $this->make_hook('sub',    AUTH_MDP, 'user'),
-            '%grp/events/csv'   => $this->make_hook('csv',    AUTH_MDP, 'user', NO_HTTPS),
-            '%grp/events/ical'  => $this->make_hook('ical',   AUTH_MDP, 'user', NO_HTTPS),
+            '%grp/events'       => $this->make_hook('events', AUTH_MDP, 'groups'),
+            '%grp/events/sub'   => $this->make_hook('sub',    AUTH_MDP, 'groups'),
+            '%grp/events/csv'   => $this->make_hook('csv',    AUTH_MDP, 'groups', NO_HTTPS),
+            '%grp/events/ical'  => $this->make_hook('ical',   AUTH_MDP, 'groups', NO_HTTPS),
             '%grp/events/edit'  => $this->make_hook('edit',   AUTH_MDP, 'groupadmin'),
             '%grp/events/admin' => $this->make_hook('admin',  AUTH_MDP, 'groupmember'),
         );

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 0ca9e95..a1a37e2 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -40,15 +40,15 @@ class XnetGrpModule extends PLModule
             '%grp/directory/unact' => $this->make_hook('non_active',            AUTH_MDP, 'groupadmin'),
             '%grp/trombi'          => $this->make_hook('trombi',                AUTH_MDP, 'groupannu'),
             '%grp/geoloc'          => $this->make_hook('geoloc',                AUTH_MDP, 'groupannu'),
-            '%grp/subscribe'       => $this->make_hook('subscribe',             AUTH_MDP, 'user'),
+            '%grp/subscribe'       => $this->make_hook('subscribe',             AUTH_MDP, 'groups'),
             '%grp/subscribe/valid' => $this->make_hook('subscribe_valid',       AUTH_MDP, 'groupadmin'),
             '%grp/unsubscribe'     => $this->make_hook('unsubscribe',           AUTH_MDP, 'groupmember'),
 
-            '%grp/change_rights'   => $this->make_hook('change_rights',         AUTH_MDP, 'user'),
+            '%grp/change_rights'   => $this->make_hook('change_rights',         AUTH_MDP, 'groups'),
             '%grp/admin/annuaire'  => $this->make_hook('admin_annuaire',        AUTH_MDP, 'groupadmin'),
             '%grp/member'          => $this->make_hook('admin_member',          AUTH_MDP, 'groupadmin'),
             '%grp/member/new'      => $this->make_hook('admin_member_new',      AUTH_MDP, 'groupadmin'),
-            '%grp/member/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'user', NO_AUTH),
+            '%grp/member/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'groups', NO_AUTH),
             '%grp/member/del'      => $this->make_hook('admin_member_del',      AUTH_MDP, 'groupadmin'),
             '%grp/member/suggest'  => $this->make_hook('admin_member_suggest',  AUTH_MDP, 'groupadmin'),
 

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index dea081b..c0eaa38 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -31,20 +31,20 @@ class XnetListsModule extends ListsModule
             '%grp/lists'              => $this->make_hook('lists',    AUTH_MDP,    'groupmember'),
             '%grp/lists/create'       => $this->make_hook('create',   AUTH_MDP,    'groupmember'),
 
-            '%grp/lists/members'      => $this->make_hook('members',  AUTH_COOKIE, 'user'),
-            '%grp/lists/csv'          => $this->make_hook('csv',      AUTH_COOKIE, 'user'),
-            '%grp/lists/annu'         => $this->make_hook('annu',     AUTH_COOKIE, 'user'),
-            '%grp/lists/archives'     => $this->make_hook('archives', AUTH_COOKIE, 'user'),
+            '%grp/lists/members'      => $this->make_hook('members',  AUTH_COOKIE, 'groups'),
+            '%grp/lists/csv'          => $this->make_hook('csv',      AUTH_COOKIE, 'groups'),
+            '%grp/lists/annu'         => $this->make_hook('annu',     AUTH_COOKIE, 'groups'),
+            '%grp/lists/archives'     => $this->make_hook('archives', AUTH_COOKIE, 'groups'),
             '%grp/lists/archives/rss' => $this->make_hook('rss',      AUTH_PUBLIC),
 
-            '%grp/lists/moderate'     => $this->make_hook('moderate', AUTH_MDP,    'user'),
-            '%grp/lists/admin'        => $this->make_hook('admin',    AUTH_MDP,    'user'),
-            '%grp/lists/options'      => $this->make_hook('options',  AUTH_MDP,    'user'),
-            '%grp/lists/delete'       => $this->make_hook('delete',   AUTH_MDP,    'user'),
+            '%grp/lists/moderate'     => $this->make_hook('moderate', AUTH_MDP,    'groups'),
+            '%grp/lists/admin'        => $this->make_hook('admin',    AUTH_MDP,    'groups'),
+            '%grp/lists/options'      => $this->make_hook('options',  AUTH_MDP,    'groups'),
+            '%grp/lists/delete'       => $this->make_hook('delete',   AUTH_MDP,    'groups'),
 
-            '%grp/lists/soptions'     => $this->make_hook('soptions', AUTH_MDP,    'user'),
-            '%grp/lists/check'        => $this->make_hook('check',    AUTH_MDP,    'user'),
-            '%grp/lists/sync'         => $this->make_hook('sync',     AUTH_MDP,    'user'),
+            '%grp/lists/soptions'     => $this->make_hook('soptions', AUTH_MDP,    'groups'),
+            '%grp/lists/check'        => $this->make_hook('check',    AUTH_MDP,    'groups'),
+            '%grp/lists/sync'         => $this->make_hook('sync',     AUTH_MDP,    'groups'),
 
             '%grp/alias/admin'        => $this->make_hook('aadmin',   AUTH_MDP,    'groupadmin'),
             '%grp/alias/create'       => $this->make_hook('acreate',  AUTH_MDP,    'groupadmin'),

diff --git a/modules/xnetnl.php b/modules/xnetnl.php
index 8d16008..7451a07 100644 (file)
--- a/modules/xnetnl.php
+++ b/modules/xnetnl.php
@@ -26,9 +26,9 @@ class XnetNlModule extends NewsletterModule
     function handlers()
     {
         return array(
-            '%grp/nl'                   => $this->make_hook('nl',              AUTH_MDP, 'user'),
-            '%grp/nl/show'              => $this->make_hook('nl_show',         AUTH_MDP, 'user'),
-            '%grp/nl/search'            => $this->make_hook('nl_search',       AUTH_MDP, 'user'),
+            '%grp/nl'                   => $this->make_hook('nl',              AUTH_MDP, 'groups'),
+            '%grp/nl/show'              => $this->make_hook('nl_show',         AUTH_MDP, 'groups'),
+            '%grp/nl/search'            => $this->make_hook('nl_search',       AUTH_MDP, 'groups'),
             '%grp/admin/nl'             => $this->make_hook('admin_nl',        AUTH_MDP, 'groupadmin'),
             '%grp/admin/nl/sync'        => $this->make_hook('admin_nl_sync',   AUTH_MDP, 'groupadmin'),
             '%grp/admin/nl/enable'      => $this->make_hook('admin_nl_enable', AUTH_MDP, 'groupadmin'),