Make_hook alignement.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/admin.php b/modules/admin.php
index 2666c6f..f63a6e2 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -24,37 +24,37 @@ class AdminModule extends PLModule
     function handlers()
     {
         return array(
-            'phpinfo'                      => $this->make_hook('phpinfo',                AUTH_MDP, 'admin'),
+            'phpinfo'                      => $this->make_hook('phpinfo',                AUTH_MDP,    'admin'),
             'get_rights'                   => $this->make_hook('get_rights',             AUTH_COOKIE, 'admin'),
             'set_skin'                     => $this->make_hook('set_skin',               AUTH_COOKIE, 'admin'),
-            'admin'                        => $this->make_hook('default',                AUTH_MDP, 'admin'),
-            'admin/dead-but-active'        => $this->make_hook('dead_but_active',        AUTH_MDP, 'admin'),
-            'admin/deaths'                 => $this->make_hook('deaths',                 AUTH_MDP, 'admin'),
-            'admin/downtime'               => $this->make_hook('downtime',               AUTH_MDP, 'admin'),
-            'admin/homonyms'               => $this->make_hook('homonyms',               AUTH_MDP, 'admin'),
-            'admin/logger'                 => $this->make_hook('logger',                 AUTH_MDP, 'admin'),
-            'admin/logger/actions'         => $this->make_hook('logger_actions',         AUTH_MDP, 'admin'),
-            'admin/postfix/blacklist'      => $this->make_hook('postfix_blacklist',      AUTH_MDP, 'admin'),
-            'admin/postfix/delayed'        => $this->make_hook('postfix_delayed',        AUTH_MDP, 'admin'),
-            'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_MDP, 'admin'),
-            'admin/postfix/whitelist'      => $this->make_hook('postfix_whitelist',      AUTH_MDP, 'admin'),
-            'admin/mx/broken'              => $this->make_hook('mx_broken',              AUTH_MDP, 'admin'),
-            'admin/skins'                  => $this->make_hook('skins',                  AUTH_MDP, 'admin'),
-            'admin/user'                   => $this->make_hook('user',                   AUTH_MDP, 'admin'),
-            'admin/add_accounts'           => $this->make_hook('add_accounts',           AUTH_MDP, 'admin'),
-            'admin/validate'               => $this->make_hook('validate',               AUTH_MDP, 'admin,edit_directory'),
-            'admin/validate/answers'       => $this->make_hook('validate_answers',       AUTH_MDP, 'admin'),
-            'admin/wiki'                   => $this->make_hook('wiki',                   AUTH_MDP, 'admin'),
-            'admin/ipwatch'                => $this->make_hook('ipwatch',                AUTH_MDP, 'admin'),
-            'admin/icons'                  => $this->make_hook('icons',                  AUTH_MDP, 'admin'),
-            'admin/geocoding'              => $this->make_hook('geocoding',              AUTH_MDP, 'admin'),
-            'admin/accounts'               => $this->make_hook('accounts',               AUTH_MDP, 'admin'),
-            'admin/account/watch'          => $this->make_hook('account_watch',          AUTH_MDP, 'admin'),
-            'admin/account/types'          => $this->make_hook('account_types',          AUTH_MDP, 'admin'),
-            'admin/xnet_without_group'     => $this->make_hook('xnet_without_group',     AUTH_MDP, 'admin'),
-            'admin/jobs'                   => $this->make_hook('jobs',                   AUTH_MDP, 'admin,edit_directory'),
-            'admin/profile'                => $this->make_hook('profile',                AUTH_MDP, 'admin,edit_directory'),
-            'admin/phd'                    => $this->make_hook('phd',                    AUTH_MDP, 'admin')
+            'admin'                        => $this->make_hook('default',                AUTH_MDP,    'admin'),
+            'admin/dead-but-active'        => $this->make_hook('dead_but_active',        AUTH_MDP,    'admin'),
+            'admin/deaths'                 => $this->make_hook('deaths',                 AUTH_MDP,    'admin'),
+            'admin/downtime'               => $this->make_hook('downtime',               AUTH_MDP,    'admin'),
+            'admin/homonyms'               => $this->make_hook('homonyms',               AUTH_MDP,    'admin'),
+            'admin/logger'                 => $this->make_hook('logger',                 AUTH_MDP,    'admin'),
+            'admin/logger/actions'         => $this->make_hook('logger_actions',         AUTH_MDP,    'admin'),
+            'admin/postfix/blacklist'      => $this->make_hook('postfix_blacklist',      AUTH_MDP,    'admin'),
+            'admin/postfix/delayed'        => $this->make_hook('postfix_delayed',        AUTH_MDP,    'admin'),
+            'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_MDP,    'admin'),
+            'admin/postfix/whitelist'      => $this->make_hook('postfix_whitelist',      AUTH_MDP,    'admin'),
+            'admin/mx/broken'              => $this->make_hook('mx_broken',              AUTH_MDP,    'admin'),
+            'admin/skins'                  => $this->make_hook('skins',                  AUTH_MDP,    'admin'),
+            'admin/user'                   => $this->make_hook('user',                   AUTH_MDP,    'admin'),
+            'admin/add_accounts'           => $this->make_hook('add_accounts',           AUTH_MDP,    'admin'),
+            'admin/validate'               => $this->make_hook('validate',               AUTH_MDP,    'admin,edit_directory'),
+            'admin/validate/answers'       => $this->make_hook('validate_answers',       AUTH_MDP,    'admin'),
+            'admin/wiki'                   => $this->make_hook('wiki',                   AUTH_MDP,    'admin'),
+            'admin/ipwatch'                => $this->make_hook('ipwatch',                AUTH_MDP,    'admin'),
+            'admin/icons'                  => $this->make_hook('icons',                  AUTH_MDP,    'admin'),
+            'admin/geocoding'              => $this->make_hook('geocoding',              AUTH_MDP,    'admin'),
+            'admin/accounts'               => $this->make_hook('accounts',               AUTH_MDP,    'admin'),
+            'admin/account/watch'          => $this->make_hook('account_watch',          AUTH_MDP,    'admin'),
+            'admin/account/types'          => $this->make_hook('account_types',          AUTH_MDP,    'admin'),
+            'admin/xnet_without_group'     => $this->make_hook('xnet_without_group',     AUTH_MDP,    'admin'),
+            'admin/jobs'                   => $this->make_hook('jobs',                   AUTH_MDP,    'admin,edit_directory'),
+            'admin/profile'                => $this->make_hook('profile',                AUTH_MDP,    'admin,edit_directory'),
+            'admin/phd'                    => $this->make_hook('phd',                    AUTH_MDP,    'admin')
         );
     }
 

diff --git a/modules/api.php b/modules/api.php
index dd0bf04..edbc2cd 100644 (file)
--- a/modules/api.php
+++ b/modules/api.php
@@ -26,7 +26,7 @@ class ApiModule extends PlModule
         return array(
             // TODO(vzanotti): Extend the plat/al engine to support placeholders
             // in handler urls, for instance "api/1/user/%forlife/isRegistered".
-            'api/1/user'   => $this->make_api_hook('user', AUTH_COOKIE, 'api_user_readonly'),
+            'api/1/user'   => $this->make_api_hook('user',   AUTH_COOKIE, 'api_user_readonly'),
             'api/1/search' => $this->make_api_hook('search', AUTH_COOKIE),
         );
     }

diff --git a/modules/axletter.php b/modules/axletter.php
index 99d45ad..2c8a8d8 100644 (file)
--- a/modules/axletter.php
+++ b/modules/axletter.php
@@ -26,13 +26,13 @@ class AXLetterModule extends NewsletterModule
     function handlers()
     {
         return array(
-            'ax'                   => $this->make_hook('nl',  AUTH_COOKIE),
-            'ax/out'               => $this->make_hook('out',    AUTH_PUBLIC),
-            'ax/show'              => $this->make_hook('nl_show',   AUTH_COOKIE),
-            'ax/search'            => $this->make_hook('nl_search', AUTH_COOKIE),
-            'ax/admin'             => $this->make_hook('admin_nl', AUTH_MDP),
-            'ax/admin/edit'        => $this->make_hook('admin_nl_edit', AUTH_MDP),
-            'ax/admin/edit/valid'  => $this->make_hook('admin_nl_valid', AUTH_MDP),
+            'ax'                   => $this->make_hook('nl',              AUTH_COOKIE),
+            'ax/out'               => $this->make_hook('out',             AUTH_PUBLIC),
+            'ax/show'              => $this->make_hook('nl_show',         AUTH_COOKIE),
+            'ax/search'            => $this->make_hook('nl_search',       AUTH_COOKIE),
+            'ax/admin'             => $this->make_hook('admin_nl',        AUTH_MDP),
+            'ax/admin/edit'        => $this->make_hook('admin_nl_edit',   AUTH_MDP),
+            'ax/admin/edit/valid'  => $this->make_hook('admin_nl_valid',  AUTH_MDP),
             'ax/admin/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_MDP),
             'ax/admin/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_MDP),
         );

diff --git a/modules/bandeau.php b/modules/bandeau.php
index 50fb51c..0870348 100644 (file)
--- a/modules/bandeau.php
+++ b/modules/bandeau.php
@@ -24,9 +24,9 @@ class BandeauModule extends PLModule
     function handlers()
     {
         return array(
-            'bandeau/icone.png'  => $this->make_hook('icone', AUTH_PUBLIC, 'user', NO_HTTPS),
-            'bandeau'            => $this->make_hook('html',  AUTH_PUBLIC, 'user', NO_HTTPS),
-            'bandeau.css'                               => $this->make_hook('css',   AUTH_PUBLIC, 'user', NO_HTTPS),
+            'bandeau/icone.png' => $this->make_hook('icone', AUTH_PUBLIC, 'user', NO_HTTPS),
+            'bandeau'           => $this->make_hook('html',  AUTH_PUBLIC, 'user', NO_HTTPS),
+            'bandeau.css'       => $this->make_hook('css',   AUTH_PUBLIC, 'user', NO_HTTPS),
         );
     }
 

diff --git a/modules/carnet.php b/modules/carnet.php
index 172e654..aee2890 100644 (file)
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -24,18 +24,18 @@ class CarnetModule extends PLModule
     function handlers()
     {
         return array(
-            'carnet'                => $this->make_hook('index',      AUTH_COOKIE, 'directory_private'),
-            'carnet/panel'          => $this->make_hook('panel',      AUTH_COOKIE, 'directory_private'),
-            'carnet/notifs'         => $this->make_hook('notifs',     AUTH_COOKIE, 'directory_private'),
-
-            'carnet/contacts'       => $this->make_hook('contacts',   AUTH_COOKIE, 'directory_private'),
-            'carnet/contacts/pdf'   => $this->make_hook('pdf',        AUTH_COOKIE, 'directory_private'),
-            'carnet/contacts/vcard' => $this->make_hook('vcard',      AUTH_COOKIE, 'directory_private'),
-            'carnet/contacts/ical'  => $this->make_token_hook('ical', AUTH_COOKIE, 'directory_private'),
-            'carnet/contacts/csv'   => $this->make_token_hook('csv',  AUTH_COOKIE, 'directory_private'),
+            'carnet'                       => $this->make_hook('index',              AUTH_COOKIE, 'directory_private'),
+            'carnet/panel'                 => $this->make_hook('panel',              AUTH_COOKIE, 'directory_private'),
+            'carnet/notifs'                => $this->make_hook('notifs',             AUTH_COOKIE, 'directory_private'),
+
+            'carnet/contacts'              => $this->make_hook('contacts',           AUTH_COOKIE, 'directory_private'),
+            'carnet/contacts/pdf'          => $this->make_hook('pdf',                AUTH_COOKIE, 'directory_private'),
+            'carnet/contacts/vcard'        => $this->make_hook('vcard',              AUTH_COOKIE, 'directory_private'),
+            'carnet/contacts/ical'         => $this->make_token_hook('ical',         AUTH_COOKIE, 'directory_private'),
+            'carnet/contacts/csv'          => $this->make_token_hook('csv',          AUTH_COOKIE, 'directory_private'),
             'carnet/contacts/csv/birthday' => $this->make_token_hook('csv_birthday', AUTH_COOKIE, 'directory_private'),
 
-            'carnet/rss'            => $this->make_token_hook('rss',  AUTH_COOKIE, 'directory_private'),
+            'carnet/rss'                   => $this->make_token_hook('rss',          AUTH_COOKIE, 'directory_private'),
         );
     }
 

diff --git a/modules/epletter.php b/modules/epletter.php
index af633f8..ac4ef72 100644 (file)
--- a/modules/epletter.php
+++ b/modules/epletter.php
@@ -26,13 +26,13 @@ class EPLetterModule extends NewsletterModule
     function handlers()
     {
         return array(
-            'epletter'                   => $this->make_hook('nl',  AUTH_COOKIE),
-            'epletter/out'               => $this->make_hook('out',    AUTH_PUBLIC),
-            'epletter/show'              => $this->make_hook('nl_show',   AUTH_COOKIE),
-            'epletter/search'            => $this->make_hook('nl_search', AUTH_COOKIE),
-            'epletter/admin'             => $this->make_hook('admin_nl', AUTH_MDP),
-            'epletter/admin/edit'        => $this->make_hook('admin_nl_edit', AUTH_MDP),
-            'epletter/admin/edit/valid'  => $this->make_hook('admin_nl_valid', AUTH_MDP),
+            'epletter'                   => $this->make_hook('nl',              AUTH_COOKIE),
+            'epletter/out'               => $this->make_hook('out',             AUTH_PUBLIC),
+            'epletter/show'              => $this->make_hook('nl_show',         AUTH_COOKIE),
+            'epletter/search'            => $this->make_hook('nl_search',       AUTH_COOKIE),
+            'epletter/admin'             => $this->make_hook('admin_nl',        AUTH_MDP),
+            'epletter/admin/edit'        => $this->make_hook('admin_nl_edit',   AUTH_MDP),
+            'epletter/admin/edit/valid'  => $this->make_hook('admin_nl_valid',  AUTH_MDP),
             'epletter/admin/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_MDP),
             'epletter/admin/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_MDP),
         );

diff --git a/modules/forums.php b/modules/forums.php
index 7d197df..28ea1c8 100644 (file)
--- a/modules/forums.php
+++ b/modules/forums.php
@@ -24,9 +24,9 @@ class ForumsModule extends PLModule
     function handlers()
     {
         return array(
-            'banana'         => $this->make_hook('banana',      AUTH_COOKIE, 'forums'),
-            'banana/rss'     => $this->make_hook('rss',         AUTH_PUBLIC, 'forums', NO_HTTPS),
-            'admin/forums'   => $this->make_hook('forums_bans', AUTH_MDP,    'admin'),
+            'banana'       => $this->make_hook('banana',      AUTH_COOKIE, 'forums'),
+            'banana/rss'   => $this->make_hook('rss',         AUTH_PUBLIC, 'forums', NO_HTTPS),
+            'admin/forums' => $this->make_hook('forums_bans', AUTH_MDP,    'admin'),
         );
     }
 

diff --git a/modules/lists.php b/modules/lists.php
index ba62594..e1bfb11 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -26,24 +26,24 @@ class ListsModule extends PLModule
     function handlers()
     {
         return array(
-            'lists'           => $this->make_hook('lists',     AUTH_MDP),
-            'lists/ajax'      => $this->make_hook('ajax',      AUTH_MDP, 'user', NO_AUTH),
-            'lists/create'    => $this->make_hook('create',    AUTH_MDP, 'lists'),
-
-            'lists/members'   => $this->make_hook('members',   AUTH_COOKIE),
-            'lists/csv'       => $this->make_hook('csv',       AUTH_COOKIE),
-            'lists/annu'      => $this->make_hook('annu',      AUTH_COOKIE),
-            'lists/archives'  => $this->make_hook('archives',  AUTH_COOKIE),
-            'lists/archives/rss' => $this->make_hook('rss',    AUTH_PUBLIC, 'user', NO_HTTPS),
-
-            'lists/moderate'  => $this->make_hook('moderate',  AUTH_MDP),
-            'lists/admin'     => $this->make_hook('admin',     AUTH_MDP),
-            'lists/options'   => $this->make_hook('options',   AUTH_MDP),
-            'lists/delete'    => $this->make_hook('delete',    AUTH_MDP),
-
-            'lists/soptions'  => $this->make_hook('soptions',  AUTH_MDP),
-            'lists/check'     => $this->make_hook('check',     AUTH_MDP),
-            'admin/lists'     => $this->make_hook('admin_all', AUTH_MDP, 'admin'),
+            'lists'              => $this->make_hook('lists',     AUTH_MDP),
+            'lists/ajax'         => $this->make_hook('ajax',      AUTH_MDP,    'user', NO_AUTH),
+            'lists/create'       => $this->make_hook('create',    AUTH_MDP,    'lists'),
+
+            'lists/members'      => $this->make_hook('members',   AUTH_COOKIE),
+            'lists/csv'          => $this->make_hook('csv',       AUTH_COOKIE),
+            'lists/annu'         => $this->make_hook('annu',      AUTH_COOKIE),
+            'lists/archives'     => $this->make_hook('archives',  AUTH_COOKIE),
+            'lists/archives/rss' => $this->make_hook('rss',       AUTH_PUBLIC, 'user', NO_HTTPS),
+
+            'lists/moderate'     => $this->make_hook('moderate',  AUTH_MDP),
+            'lists/admin'        => $this->make_hook('admin',     AUTH_MDP),
+            'lists/options'      => $this->make_hook('options',   AUTH_MDP),
+            'lists/delete'       => $this->make_hook('delete',    AUTH_MDP),
+
+            'lists/soptions'     => $this->make_hook('soptions',  AUTH_MDP),
+            'lists/check'        => $this->make_hook('check',     AUTH_MDP),
+            'admin/lists'        => $this->make_hook('admin_all', AUTH_MDP,    'admin'),
         );
     }
 

diff --git a/modules/openid.php b/modules/openid.php
index 15e7565..395313b 100644 (file)
--- a/modules/openid.php
+++ b/modules/openid.php
@@ -61,12 +61,12 @@ class OpenidModule extends PLModule
     function handlers()
     {
         return array(
-            'openid'                => $this->make_hook('openid', AUTH_PUBLIC),
-            'openid/melix'          => $this->make_hook('melix', AUTH_PUBLIC),
-            'openid/xrds'           => $this->make_hook('xrds', AUTH_PUBLIC),
-            'openid/trust'          => $this->make_hook('trust', AUTH_MDP),
-            'openid/trusted'        => $this->make_hook('trusted', AUTH_MDP),
-            'admin/openid/trusted'  => $this->make_hook('admin_trusted', AUTH_MDP, 'admin'),
+            'openid'               => $this->make_hook('openid',        AUTH_PUBLIC),
+            'openid/melix'         => $this->make_hook('melix',         AUTH_PUBLIC),
+            'openid/xrds'          => $this->make_hook('xrds',          AUTH_PUBLIC),
+            'openid/trust'         => $this->make_hook('trust',         AUTH_MDP),
+            'openid/trusted'       => $this->make_hook('trusted',       AUTH_MDP),
+            'admin/openid/trusted' => $this->make_hook('admin_trusted', AUTH_MDP, 'admin'),
         );
     }
 

diff --git a/modules/poison.php b/modules/poison.php
index 27dae4c..380142c 100644 (file)
--- a/modules/poison.php
+++ b/modules/poison.php
@@ -26,9 +26,9 @@ class PoisonModule extends PLModule
     function handlers()
     {
         return array(
-            'pe'          => $this->make_hook('poison', AUTH_PUBLIC, 'user', NO_HTTPS),
-            'pem'         => $this->make_hook('mailto', AUTH_PUBLIC, 'user', NO_HTTPS),
-            'pet'         => $this->make_hook('tags',   AUTH_PUBLIC, 'user', NO_HTTPS),
+            'pe'  => $this->make_hook('poison', AUTH_PUBLIC, 'user', NO_HTTPS),
+            'pem' => $this->make_hook('mailto', AUTH_PUBLIC, 'user', NO_HTTPS),
+            'pet' => $this->make_hook('tags',   AUTH_PUBLIC, 'user', NO_HTTPS),
             // 'per'         => $this->make_hook('rand', AUTH_PUBLIC, 'user', NO_HTTPS),
         );
     }

diff --git a/modules/profile.php b/modules/profile.php
index 813028c..b0092a7 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -56,18 +56,18 @@ class ProfileModule extends PLModule
             'groupes-x/logo'             => $this->make_hook('xnetlogo',                   AUTH_PUBLIC),
 
             'vcard'                      => $this->make_hook('vcard',                      AUTH_COOKIE, 'user', NO_HTTPS),
-            'admin/binets'               => $this->make_hook('admin_binets',               AUTH_MDP, 'admin'),
-            'admin/medals'               => $this->make_hook('admin_medals',               AUTH_MDP, 'admin'),
-            'admin/education'            => $this->make_hook('admin_education',            AUTH_MDP, 'admin'),
-            'admin/education_field'      => $this->make_hook('admin_education_field',      AUTH_MDP, 'admin'),
-            'admin/education_degree'     => $this->make_hook('admin_education_degree',     AUTH_MDP, 'admin'),
-            'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_MDP, 'admin'),
-            'admin/sections'             => $this->make_hook('admin_sections',             AUTH_MDP, 'admin'),
-            'admin/networking'           => $this->make_hook('admin_networking',           AUTH_MDP, 'admin'),
-            'admin/trombino'             => $this->make_hook('admin_trombino',             AUTH_MDP, 'admin'),
-            'admin/corps_enum'           => $this->make_hook('admin_corps_enum',           AUTH_MDP, 'admin'),
-            'admin/corps_rank'           => $this->make_hook('admin_corps_rank',           AUTH_MDP, 'admin'),
-            'admin/names'                => $this->make_hook('admin_names',                AUTH_MDP, 'admin'),
+            'admin/binets'               => $this->make_hook('admin_binets',               AUTH_MDP,    'admin'),
+            'admin/medals'               => $this->make_hook('admin_medals',               AUTH_MDP,    'admin'),
+            'admin/education'            => $this->make_hook('admin_education',            AUTH_MDP,    'admin'),
+            'admin/education_field'      => $this->make_hook('admin_education_field',      AUTH_MDP,    'admin'),
+            'admin/education_degree'     => $this->make_hook('admin_education_degree',     AUTH_MDP,    'admin'),
+            'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_MDP,    'admin'),
+            'admin/sections'             => $this->make_hook('admin_sections',             AUTH_MDP,    'admin'),
+            'admin/networking'           => $this->make_hook('admin_networking',           AUTH_MDP,    'admin'),
+            'admin/trombino'             => $this->make_hook('admin_trombino',             AUTH_MDP,    'admin'),
+            'admin/corps_enum'           => $this->make_hook('admin_corps_enum',           AUTH_MDP,    'admin'),
+            'admin/corps_rank'           => $this->make_hook('admin_corps_rank',           AUTH_MDP,    'admin'),
+            'admin/names'                => $this->make_hook('admin_names',                AUTH_MDP,    'admin'),
         );
     }
 

diff --git a/modules/search.php b/modules/search.php
index 6033f26..cd80aeb 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -24,15 +24,15 @@ class SearchModule extends PLModule
     function handlers()
     {
         return array(
-            'search'              => $this->make_hook('quick',          AUTH_PUBLIC),
-            'search/adv'          => $this->make_hook('advanced',       AUTH_COOKIE, 'directory_ax'),
-            'advanced_search.php' => $this->make_hook('redir_advanced', AUTH_PUBLIC),
-            'search/autocomplete' => $this->make_hook('autocomplete',   AUTH_COOKIE, 'directory_ax', NO_AUTH),
-            'search/list'         => $this->make_hook('list',           AUTH_COOKIE, 'directory_ax', NO_AUTH),
-            'jobs'                => $this->make_hook('referent',       AUTH_COOKIE),
-            'emploi'              => $this->make_hook('referent',       AUTH_COOKIE),
-            'referent/search'     => $this->make_hook('referent',       AUTH_COOKIE),
-            'search/referent/countries' => $this->make_hook('referent_countries',     AUTH_COOKIE),
+            'search'                    => $this->make_hook('quick',              AUTH_PUBLIC),
+            'search/adv'                => $this->make_hook('advanced',           AUTH_COOKIE, 'directory_ax'),
+            'advanced_search.php'       => $this->make_hook('redir_advanced',     AUTH_PUBLIC),
+            'search/autocomplete'       => $this->make_hook('autocomplete',       AUTH_COOKIE, 'directory_ax', NO_AUTH),
+            'search/list'               => $this->make_hook('list',               AUTH_COOKIE, 'directory_ax', NO_AUTH),
+            'jobs'                      => $this->make_hook('referent',           AUTH_COOKIE),
+            'emploi'                    => $this->make_hook('referent',           AUTH_COOKIE),
+            'referent/search'           => $this->make_hook('referent',           AUTH_COOKIE),
+            'search/referent/countries' => $this->make_hook('referent_countries', AUTH_COOKIE),
         );
     }
 

diff --git a/modules/survey.php b/modules/survey.php
index 8ea5817..f23dc7b 100644 (file)
--- a/modules/survey.php
+++ b/modules/survey.php
@@ -25,15 +25,15 @@ class SurveyModule extends PLModule
     function handlers()
     {
         return array(
-            'survey'              => $this->make_hook('index',         AUTH_PUBLIC),
-            'survey/vote'         => $this->make_hook('vote',          AUTH_PUBLIC),
-            'survey/result'       => $this->make_hook('result',        AUTH_PUBLIC),
-            'survey/edit'         => $this->make_hook('edit',          AUTH_COOKIE),
-            'survey/ajax'         => $this->make_hook('ajax',          AUTH_COOKIE),
-            'survey/admin'        => $this->make_hook('admin',         AUTH_MDP, 'admin'),
-            'survey/admin/edit'   => $this->make_hook('adminEdit',     AUTH_MDP, 'admin'),
-            'survey/admin/valid'  => $this->make_hook('adminValidate', AUTH_MDP, 'admin'),
-            'survey/admin/del'    => $this->make_hook('adminDelete',   AUTH_MDP, 'admin'),
+            'survey'             => $this->make_hook('index',         AUTH_PUBLIC),
+            'survey/vote'        => $this->make_hook('vote',          AUTH_PUBLIC),
+            'survey/result'      => $this->make_hook('result',        AUTH_PUBLIC),
+            'survey/edit'        => $this->make_hook('edit',          AUTH_COOKIE),
+            'survey/ajax'        => $this->make_hook('ajax',          AUTH_COOKIE),
+            'survey/admin'       => $this->make_hook('admin',         AUTH_MDP, 'admin'),
+            'survey/admin/edit'  => $this->make_hook('adminEdit',     AUTH_MDP, 'admin'),
+            'survey/admin/valid' => $this->make_hook('adminValidate', AUTH_MDP, 'admin'),
+            'survey/admin/del'   => $this->make_hook('adminDelete',   AUTH_MDP, 'admin'),
         );
     }
     // }}}

diff --git a/modules/xnet.php b/modules/xnet.php
index 3645faa..a5993f8 100644 (file)
--- a/modules/xnet.php
+++ b/modules/xnet.php
@@ -24,23 +24,23 @@ class XnetModule extends PLModule
     function handlers()
     {
         return array(
-            'index'       => $this->make_hook('index',     AUTH_PUBLIC),
-            'exit'        => $this->make_hook('exit',      AUTH_PUBLIC),
-
-            'admin'       => $this->make_hook('admin',     AUTH_MDP, 'admin'),
-            '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),
-            'autologin'   => $this->make_hook('autologin', AUTH_MDP),
-            'login/ext'   => $this->make_hook('login_ext', AUTH_PUBLIC),
+            'index'        => $this->make_hook('index',        AUTH_PUBLIC),
+            'exit'         => $this->make_hook('exit',         AUTH_PUBLIC),
+
+            'admin'        => $this->make_hook('admin',        AUTH_MDP, 'admin'),
+            '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),
+            'autologin'    => $this->make_hook('autologin',    AUTH_MDP),
+            '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'),
+            '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'),
 
-            'Xnet'        => $this->make_wiki_hook(),
+            'Xnet'         => $this->make_wiki_hook(),
         );
     }
 

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index ba12305..bf975e1 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -26,12 +26,12 @@ class XnetEventsModule extends PLModule
     function handlers()
     {
         return array(
-            '%grp/events'       => $this->make_hook('events',  AUTH_MDP),
-            '%grp/events/sub'   => $this->make_hook('sub',     AUTH_MDP),
-            '%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/edit'  => $this->make_hook('edit',    AUTH_MDP, 'groupadmin'),
-            '%grp/events/admin' => $this->make_hook('admin',   AUTH_MDP, 'groupmember'),
+            '%grp/events'       => $this->make_hook('events', AUTH_MDP),
+            '%grp/events/sub'   => $this->make_hook('sub',    AUTH_MDP),
+            '%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/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 b004fde..c59dc8f 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -29,31 +29,31 @@ class XnetGrpModule extends PLModule
             '%grp/asso.php'        => $this->make_hook('index',                 AUTH_PUBLIC),
             '%grp/logo'            => $this->make_hook('logo',                  AUTH_PUBLIC),
             '%grp/site'            => $this->make_hook('site',                  AUTH_PUBLIC),
-            '%grp/edit'            => $this->make_hook('edit',                  AUTH_MDP,    'groupadmin'),
-            '%grp/mail'            => $this->make_hook('mail',                  AUTH_MDP,    'groupadmin'),
-            '%grp/forum'           => $this->make_hook('forum',                 AUTH_MDP,    'groupmember'),
-            '%grp/annuaire'        => $this->make_hook('annuaire',              AUTH_MDP,    'groupannu'),
-            '%grp/annuaire/vcard'  => $this->make_hook('vcard',                 AUTH_MDP,    'groupmember:groupannu'),
-            '%grp/annuaire/csv'    => $this->make_hook('csv',                   AUTH_MDP,    'groupmember:groupannu'),
-            '%grp/trombi'          => $this->make_hook('trombi',                AUTH_MDP,    'groupannu'),
-            '%grp/geoloc'          => $this->make_hook('geoloc',                AUTH_MDP,    'groupannu'),
+            '%grp/edit'            => $this->make_hook('edit',                  AUTH_MDP, 'groupadmin'),
+            '%grp/mail'            => $this->make_hook('mail',                  AUTH_MDP, 'groupadmin'),
+            '%grp/forum'           => $this->make_hook('forum',                 AUTH_MDP, 'groupmember'),
+            '%grp/annuaire'        => $this->make_hook('annuaire',              AUTH_MDP, 'groupannu'),
+            '%grp/annuaire/vcard'  => $this->make_hook('vcard',                 AUTH_MDP, 'groupmember:groupannu'),
+            '%grp/annuaire/csv'    => $this->make_hook('csv',                   AUTH_MDP, 'groupmember:groupannu'),
+            '%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),
-            '%grp/subscribe/valid' => $this->make_hook('subscribe_valid',       AUTH_MDP,    'groupadmin'),
-            '%grp/unsubscribe'     => $this->make_hook('unsubscribe',           AUTH_MDP,    'groupmember'),
+            '%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),
-            '%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/del'      => $this->make_hook('admin_member_del',      AUTH_MDP,    'groupadmin'),
-            '%grp/member/suggest'  => $this->make_hook('admin_member_suggest',  AUTH_MDP,    'groupadmin'),
+            '%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/del'      => $this->make_hook('admin_member_del',      AUTH_MDP, 'groupadmin'),
+            '%grp/member/suggest'  => $this->make_hook('admin_member_suggest',  AUTH_MDP, 'groupadmin'),
 
             '%grp/rss'             => $this->make_token_hook('rss',             AUTH_PUBLIC),
-            '%grp/announce/new'    => $this->make_hook('edit_announce',         AUTH_MDP,    'groupadmin'),
-            '%grp/announce/edit'   => $this->make_hook('edit_announce',         AUTH_MDP,    'groupadmin'),
+            '%grp/announce/new'    => $this->make_hook('edit_announce',         AUTH_MDP, 'groupadmin'),
+            '%grp/announce/edit'   => $this->make_hook('edit_announce',         AUTH_MDP, 'groupadmin'),
             '%grp/announce/photo'  => $this->make_hook('photo_announce',        AUTH_PUBLIC),
-            '%grp/admin/announces' => $this->make_hook('admin_announce',        AUTH_MDP,    'groupadmin'),
+            '%grp/admin/announces' => $this->make_hook('admin_announce',        AUTH_MDP, 'groupadmin'),
         );
     }
 

diff --git a/modules/xnetnl.php b/modules/xnetnl.php
index a5a25ed..1979087 100644 (file)
--- a/modules/xnetnl.php
+++ b/modules/xnetnl.php
@@ -26,14 +26,14 @@ class XnetNlModule extends NewsletterModule
     function handlers()
     {
         return array(
-            '%grp/nl'                   => $this->make_hook('nl',                    AUTH_MDP),
-            '%grp/nl/show'              => $this->make_hook('nl_show',               AUTH_MDP),
-            '%grp/nl/search'            => $this->make_hook('nl_search',             AUTH_MDP),
-            '%grp/admin/nl'             => $this->make_hook('admin_nl',              AUTH_MDP,    'groupadmin'),
-            '%grp/admin/nl/edit'        => $this->make_hook('admin_nl_edit',         AUTH_MDP,    'groupadmin'),
-            '%grp/admin/nl/edit/cancel' => $this->make_hook('admin_nl_cancel',       AUTH_MDP,    'groupadmin'),
-            '%grp/admin/nl/edit/valid'  => $this->make_hook('admin_nl_valid',        AUTH_MDP,    'groupadmin'),
-            '%grp/admin/nl/categories'  => $this->make_hook('admin_nl_cat',          AUTH_MDP,    'groupadmin'),
+            '%grp/nl'                   => $this->make_hook('nl',              AUTH_MDP),
+            '%grp/nl/show'              => $this->make_hook('nl_show',         AUTH_MDP),
+            '%grp/nl/search'            => $this->make_hook('nl_search',       AUTH_MDP),
+            '%grp/admin/nl'             => $this->make_hook('admin_nl',        AUTH_MDP, 'groupadmin'),
+            '%grp/admin/nl/edit'        => $this->make_hook('admin_nl_edit',   AUTH_MDP, 'groupadmin'),
+            '%grp/admin/nl/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_MDP, 'groupadmin'),
+            '%grp/admin/nl/edit/valid'  => $this->make_hook('admin_nl_valid',  AUTH_MDP, 'groupadmin'),
+            '%grp/admin/nl/categories'  => $this->make_hook('admin_nl_cat',    AUTH_MDP, 'groupadmin'),
         );
     }