From bfe9f4c752e8889ab5a269bddd27ea43b31d567e Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Tue, 13 Sep 2011 10:47:47 +0200 Subject: [PATCH] Renames AUTH_MDP to AUTH_PASSWD (Closes #1523). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- ChangeLog | 5 ++++ classes/xnetsession.php | 6 ++--- classes/xorgsession.php | 6 ++--- modules/admin.php | 60 +++++++++++++++++++++--------------------- modules/auth.php | 2 +- modules/axletter.php | 12 ++++----- modules/email.php | 16 +++++------ modules/epletter.php | 12 ++++----- modules/events.php | 6 ++--- modules/forums.php | 2 +- modules/fusionax.php | 26 +++++++++--------- modules/googleapps.php | 8 +++--- modules/lists.php | 22 ++++++++-------- modules/marketing.php | 12 ++++----- modules/newsletter.php | 18 ++++++------- modules/openid.php | 6 ++--- modules/payment.php | 22 ++++++++-------- modules/platal.php | 30 ++++++++++----------- modules/profile.php | 28 ++++++++++---------- modules/register.php | 2 +- modules/survey.php | 8 +++--- modules/urlshortener.php | 2 +- modules/xnet.php | 8 +++--- modules/xnetevents.php | 12 ++++----- modules/xnetgrp.php | 50 +++++++++++++++++------------------ modules/xnetlists.php | 22 ++++++++-------- modules/xnetnl.php | 20 +++++++------- templates/skin/common.menu.tpl | 2 +- 28 files changed, 215 insertions(+), 210 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee8eb11..59071bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ ================================================================================ VERSION 1.1.4 XX XX XXXX +Bug/Wish: + + * Core: + - #1523: Rename AUTH_MDP to AUTH_PASSWD -JAC + ================================================================================ VERSION 1.1.3 10 09 2011 diff --git a/classes/xnetsession.php b/classes/xnetsession.php index b6fe1f7..b7a8c1f 100644 --- a/classes/xnetsession.php +++ b/classes/xnetsession.php @@ -29,7 +29,7 @@ class XnetSession extends XorgSession public function startAvailableAuth() { if (!S::logged() && Get::has('auth')) { - if (!$this->start(AUTH_MDP)) { + if (!$this->start(AUTH_PASSWD)) { return false; } } @@ -88,7 +88,7 @@ class XnetSession extends XorgSession return null; } Get::kill('auth'); - S::set('auth', AUTH_MDP); + S::set('auth', AUTH_PASSWD); return User::getSilentWithValues(null, array('uid' => Get::i('uid'))); } @@ -100,7 +100,7 @@ class XnetSession extends XorgSession } if ($level == AUTH_SUID) { - S::set('auth', AUTH_MDP); + S::set('auth', AUTH_PASSWD); } S::set('uid', $user->uid); diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 73bdb9f..d0efe9d 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -145,7 +145,7 @@ class XorgSession extends PlSession } if ($success) { - S::set('auth', AUTH_MDP); + S::set('auth', AUTH_PASSWD); S::kill('challenge'); S::logger($user->id())->log('auth_ok'); } @@ -161,7 +161,7 @@ class XorgSession extends PlSession return true; } if ($level == AUTH_SUID) { - S::set('auth', AUTH_MDP); + S::set('auth', AUTH_PASSWD); } // Loads uid and hruid into the session for developement conveniance. @@ -301,7 +301,7 @@ class XorgSession extends PlSession public function sureLevel() { - return AUTH_MDP; + return AUTH_PASSWD; } diff --git a/modules/admin.php b/modules/admin.php index ad07d0e..c6a9852 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -24,38 +24,38 @@ class AdminModule extends PLModule function handlers() { return array( - 'phpinfo' => $this->make_hook('phpinfo', AUTH_MDP, 'admin'), + 'phpinfo' => $this->make_hook('phpinfo', AUTH_PASSWD, '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/add_secondary_edu' => $this->make_hook('add_secondary_edu', AUTH_MDP, 'admin') + 'admin' => $this->make_hook('default', AUTH_PASSWD, 'admin'), + 'admin/dead-but-active' => $this->make_hook('dead_but_active', AUTH_PASSWD, 'admin'), + 'admin/deaths' => $this->make_hook('deaths', AUTH_PASSWD, 'admin'), + 'admin/downtime' => $this->make_hook('downtime', AUTH_PASSWD, 'admin'), + 'admin/homonyms' => $this->make_hook('homonyms', AUTH_PASSWD, 'admin'), + 'admin/logger' => $this->make_hook('logger', AUTH_PASSWD, 'admin'), + 'admin/logger/actions' => $this->make_hook('logger_actions', AUTH_PASSWD, 'admin'), + 'admin/postfix/blacklist' => $this->make_hook('postfix_blacklist', AUTH_PASSWD, 'admin'), + 'admin/postfix/delayed' => $this->make_hook('postfix_delayed', AUTH_PASSWD, 'admin'), + 'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_PASSWD, 'admin'), + 'admin/postfix/whitelist' => $this->make_hook('postfix_whitelist', AUTH_PASSWD, 'admin'), + 'admin/mx/broken' => $this->make_hook('mx_broken', AUTH_PASSWD, 'admin'), + 'admin/skins' => $this->make_hook('skins', AUTH_PASSWD, 'admin'), + 'admin/user' => $this->make_hook('user', AUTH_PASSWD, 'admin'), + 'admin/add_accounts' => $this->make_hook('add_accounts', AUTH_PASSWD, 'admin'), + 'admin/validate' => $this->make_hook('validate', AUTH_PASSWD, 'admin,edit_directory'), + 'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_PASSWD, 'admin'), + 'admin/wiki' => $this->make_hook('wiki', AUTH_PASSWD, 'admin'), + 'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_PASSWD, 'admin'), + 'admin/icons' => $this->make_hook('icons', AUTH_PASSWD, 'admin'), + 'admin/geocoding' => $this->make_hook('geocoding', AUTH_PASSWD, 'admin'), + 'admin/accounts' => $this->make_hook('accounts', AUTH_PASSWD, 'admin'), + 'admin/account/watch' => $this->make_hook('account_watch', AUTH_PASSWD, 'admin'), + 'admin/account/types' => $this->make_hook('account_types', AUTH_PASSWD, 'admin'), + 'admin/xnet_without_group' => $this->make_hook('xnet_without_group', AUTH_PASSWD, 'admin'), + 'admin/jobs' => $this->make_hook('jobs', AUTH_PASSWD, 'admin,edit_directory'), + 'admin/profile' => $this->make_hook('profile', AUTH_PASSWD, 'admin,edit_directory'), + 'admin/phd' => $this->make_hook('phd', AUTH_PASSWD, 'admin'), + 'admin/add_secondary_edu' => $this->make_hook('add_secondary_edu', AUTH_PASSWD, 'admin') ); } diff --git a/modules/auth.php b/modules/auth.php index 0d03dbf..635c8f1 100644 --- a/modules/auth.php +++ b/modules/auth.php @@ -32,7 +32,7 @@ class AuthModule extends PLModule 'auth-redirect.php' => $this->make_hook('redirect', AUTH_COOKIE, 'user'), 'auth-groupex.php' => $this->make_hook('groupex_old', AUTH_COOKIE, 'user'), 'auth-groupex' => $this->make_hook('groupex', AUTH_PUBLIC), - 'admin/auth-groupes-x' => $this->make_hook('admin_authgroupesx', AUTH_MDP, 'admin'), + 'admin/auth-groupes-x' => $this->make_hook('admin_authgroupesx', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/axletter.php b/modules/axletter.php index d6a63be..4ebf134 100644 --- a/modules/axletter.php +++ b/modules/axletter.php @@ -30,12 +30,12 @@ class AXLetterModule extends NewsletterModule 'ax/out' => $this->make_hook('out', AUTH_PUBLIC), 'ax/show' => $this->make_hook('nl_show', AUTH_COOKIE, 'user'), 'ax/search' => $this->make_hook('nl_search', AUTH_COOKIE, 'user'), - 'ax/admin' => $this->make_hook('admin_nl', AUTH_MDP, 'user'), - 'ax/admin/edit' => $this->make_hook('admin_nl_edit', AUTH_MDP, 'user'), - 'ax/admin/edit/valid' => $this->make_hook('admin_nl_valid', AUTH_MDP, 'user'), - 'ax/admin/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_MDP, 'user'), - 'ax/admin/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_MDP, 'user'), - 'ax/admin/categories' => $this->make_hook('admin_nl_cat', AUTH_MDP, 'user'), + 'ax/admin' => $this->make_hook('admin_nl', AUTH_PASSWD, 'user'), + 'ax/admin/edit' => $this->make_hook('admin_nl_edit', AUTH_PASSWD, 'user'), + 'ax/admin/edit/valid' => $this->make_hook('admin_nl_valid', AUTH_PASSWD, 'user'), + 'ax/admin/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_PASSWD, 'user'), + 'ax/admin/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_PASSWD, 'user'), + 'ax/admin/categories' => $this->make_hook('admin_nl_cat', AUTH_PASSWD, 'user'), ); } diff --git a/modules/email.php b/modules/email.php index e5049c5..457157f 100644 --- a/modules/email.php +++ b/modules/email.php @@ -25,11 +25,11 @@ class EmailModule extends PLModule { return array( 'emails' => $this->make_hook('emails', AUTH_COOKIE, 'mail'), - 'emails/alias' => $this->make_hook('alias', AUTH_MDP, 'mail'), - 'emails/antispam' => $this->make_hook('antispam', AUTH_MDP, 'mail'), + 'emails/alias' => $this->make_hook('alias', AUTH_PASSWD, 'mail'), + 'emails/antispam' => $this->make_hook('antispam', AUTH_PASSWD, 'mail'), 'emails/broken' => $this->make_hook('broken', AUTH_COOKIE, 'user'), - 'emails/redirect' => $this->make_hook('redirect', AUTH_MDP, 'mail'), - 'emails/send' => $this->make_hook('send', AUTH_MDP, 'mail'), + 'emails/redirect' => $this->make_hook('redirect', AUTH_PASSWD, 'mail'), + 'emails/send' => $this->make_hook('send', AUTH_PASSWD, 'mail'), 'emails/antispam/submit' => $this->make_hook('submit', AUTH_COOKIE, 'user'), 'emails/test' => $this->make_hook('test', AUTH_COOKIE, 'mail', NO_AUTH), @@ -38,10 +38,10 @@ class EmailModule extends PLModule 'emails/imap/in' => $this->make_hook('imap_in', AUTH_PUBLIC), - 'admin/emails/duplicated' => $this->make_hook('duplicated', AUTH_MDP, 'admin'), - 'admin/emails/watch' => $this->make_hook('duplicated', AUTH_MDP, 'admin'), - 'admin/emails/lost' => $this->make_hook('lost', AUTH_MDP, 'admin'), - 'admin/emails/broken' => $this->make_hook('broken_addr', AUTH_MDP, 'admin'), + 'admin/emails/duplicated' => $this->make_hook('duplicated', AUTH_PASSWD, 'admin'), + 'admin/emails/watch' => $this->make_hook('duplicated', AUTH_PASSWD, 'admin'), + 'admin/emails/lost' => $this->make_hook('lost', AUTH_PASSWD, 'admin'), + 'admin/emails/broken' => $this->make_hook('broken_addr', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/epletter.php b/modules/epletter.php index b914893..f3667d3 100644 --- a/modules/epletter.php +++ b/modules/epletter.php @@ -30,12 +30,12 @@ class EPLetterModule extends NewsletterModule 'epletter/out' => $this->make_hook('out', AUTH_PUBLIC), 'epletter/show' => $this->make_hook('nl_show', AUTH_COOKIE, 'user'), 'epletter/search' => $this->make_hook('nl_search', AUTH_COOKIE, 'user'), - 'epletter/admin' => $this->make_hook('admin_nl', AUTH_MDP, 'user'), - 'epletter/admin/edit' => $this->make_hook('admin_nl_edit', AUTH_MDP, 'user'), - 'epletter/admin/edit/valid' => $this->make_hook('admin_nl_valid', AUTH_MDP, 'user'), - 'epletter/admin/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_MDP, 'user'), - 'epletter/admin/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_MDP, 'user'), - 'epletter/admin/categories' => $this->make_hook('admin_nl_cat', AUTH_MDP, 'user'), + 'epletter/admin' => $this->make_hook('admin_nl', AUTH_PASSWD, 'user'), + 'epletter/admin/edit' => $this->make_hook('admin_nl_edit', AUTH_PASSWD, 'user'), + 'epletter/admin/edit/valid' => $this->make_hook('admin_nl_valid', AUTH_PASSWD, 'user'), + 'epletter/admin/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_PASSWD, 'user'), + 'epletter/admin/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_PASSWD, 'user'), + 'epletter/admin/categories' => $this->make_hook('admin_nl_cat', AUTH_PASSWD, 'user'), ); } diff --git a/modules/events.php b/modules/events.php index b1f6482..7395568 100644 --- a/modules/events.php +++ b/modules/events.php @@ -27,12 +27,12 @@ class EventsModule extends PLModule 'events' => $this->make_hook('ev', AUTH_COOKIE, 'user'), 'events/preview' => $this->make_hook('preview', AUTH_PUBLIC, 'user', NO_AUTH), 'events/photo' => $this->make_hook('photo', AUTH_PUBLIC), - 'events/submit' => $this->make_hook('ev_submit', AUTH_MDP, 'user'), - 'admin/events' => $this->make_hook('admin_events', AUTH_MDP, 'admin'), + 'events/submit' => $this->make_hook('ev_submit', AUTH_PASSWD, 'user'), + 'admin/events' => $this->make_hook('admin_events', AUTH_PASSWD, 'admin'), 'rss' => $this->make_token_hook('rss', AUTH_COOKIE, 'user'), 'ajax/tips' => $this->make_hook('tips', AUTH_COOKIE, 'user', NO_AUTH), - 'admin/tips' => $this->make_hook('admin_tips', AUTH_MDP, 'admin'), + 'admin/tips' => $this->make_hook('admin_tips', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/forums.php b/modules/forums.php index 28ea1c8..22604b1 100644 --- a/modules/forums.php +++ b/modules/forums.php @@ -26,7 +26,7 @@ class ForumsModule extends PLModule 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'), + 'admin/forums' => $this->make_hook('forums_bans', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/fusionax.php b/modules/fusionax.php index 65a692b..b30fcb4 100644 --- a/modules/fusionax.php +++ b/modules/fusionax.php @@ -35,22 +35,22 @@ class FusionAxModule extends PLModule { if (Platal::globals()->merge->state == 'pending') { return array( - 'fusionax' => $this->make_hook('index', AUTH_MDP, 'admin'), - 'fusionax/import' => $this->make_hook('import', AUTH_MDP, 'admin'), - 'fusionax/view' => $this->make_hook('view', AUTH_MDP, 'admin'), - 'fusionax/ids' => $this->make_hook('ids', AUTH_MDP, 'admin'), - 'fusionax/deceased' => $this->make_hook('deceased', AUTH_MDP, 'admin'), - 'fusionax/promo' => $this->make_hook('promo', AUTH_MDP, 'admin'), - 'fusionax/names' => $this->make_hook('names', AUTH_MDP, 'admin'), - 'fusionax/edu' => $this->make_hook('edu', AUTH_MDP, 'admin'), - 'fusionax/corps' => $this->make_hook('corps', AUTH_MDP, 'admin') + 'fusionax' => $this->make_hook('index', AUTH_PASSWD, 'admin'), + 'fusionax/import' => $this->make_hook('import', AUTH_PASSWD, 'admin'), + 'fusionax/view' => $this->make_hook('view', AUTH_PASSWD, 'admin'), + 'fusionax/ids' => $this->make_hook('ids', AUTH_PASSWD, 'admin'), + 'fusionax/deceased' => $this->make_hook('deceased', AUTH_PASSWD, 'admin'), + 'fusionax/promo' => $this->make_hook('promo', AUTH_PASSWD, 'admin'), + 'fusionax/names' => $this->make_hook('names', AUTH_PASSWD, 'admin'), + 'fusionax/edu' => $this->make_hook('edu', AUTH_PASSWD, 'admin'), + 'fusionax/corps' => $this->make_hook('corps', AUTH_PASSWD, 'admin') ); } elseif (Platal::globals()->merge->state == 'done') { return array( - 'fusionax' => $this->make_hook('index', AUTH_MDP, 'admin,edit_directory'), - 'fusionax/issues' => $this->make_hook('issues', AUTH_MDP, 'admin,edit_directory'), - 'fusionax/issues/deathdate' => $this->make_hook('issues_deathdate', AUTH_MDP, 'admin,edit_directory'), - 'fusionax/issues/promo' => $this->make_hook('issues_promo', AUTH_MDP, 'admin,edit_directory'), + 'fusionax' => $this->make_hook('index', AUTH_PASSWD, 'admin,edit_directory'), + 'fusionax/issues' => $this->make_hook('issues', AUTH_PASSWD, 'admin,edit_directory'), + 'fusionax/issues/deathdate' => $this->make_hook('issues_deathdate', AUTH_PASSWD, 'admin,edit_directory'), + 'fusionax/issues/promo' => $this->make_hook('issues_promo', AUTH_PASSWD, 'admin,edit_directory'), ); } } diff --git a/modules/googleapps.php b/modules/googleapps.php index b4900b9..bad3836 100644 --- a/modules/googleapps.php +++ b/modules/googleapps.php @@ -29,10 +29,10 @@ class GoogleAppsModule extends PLModule } return array( - 'googleapps' => $this->make_hook('index', AUTH_MDP, 'gapps'), - 'admin/googleapps' => $this->make_hook('admin', AUTH_MDP, 'admin'), - 'admin/googleapps/job' => $this->make_hook('admin_job', AUTH_MDP, 'admin'), - 'admin/googleapps/user' => $this->make_hook('admin_user', AUTH_MDP, 'admin'), + 'googleapps' => $this->make_hook('index', AUTH_PASSWD, 'gapps'), + 'admin/googleapps' => $this->make_hook('admin', AUTH_PASSWD, 'admin'), + 'admin/googleapps/job' => $this->make_hook('admin_job', AUTH_PASSWD, 'admin'), + 'admin/googleapps/user' => $this->make_hook('admin_user', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/lists.php b/modules/lists.php index 688b0b0..f73598f 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -26,9 +26,9 @@ class ListsModule extends PLModule function handlers() { return array( - 'lists' => $this->make_hook('lists', AUTH_MDP, 'user'), - 'lists/ajax' => $this->make_hook('ajax', AUTH_MDP, 'user', NO_AUTH), - 'lists/create' => $this->make_hook('create', AUTH_MDP, 'lists'), + 'lists' => $this->make_hook('lists', AUTH_PASSWD, 'user'), + 'lists/ajax' => $this->make_hook('ajax', AUTH_PASSWD, 'user', NO_AUTH), + 'lists/create' => $this->make_hook('create', AUTH_PASSWD, 'lists'), 'lists/members' => $this->make_hook('members', AUTH_COOKIE, 'user'), 'lists/csv' => $this->make_hook('csv', AUTH_COOKIE, 'user'), @@ -36,15 +36,15 @@ class ListsModule extends PLModule 'lists/archives' => $this->make_hook('archives', AUTH_COOKIE, 'user'), 'lists/archives/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), - 'lists/moderate' => $this->make_hook('moderate', AUTH_MDP, 'user'), - 'lists/admin' => $this->make_hook('admin', AUTH_MDP, 'user'), - 'lists/options' => $this->make_hook('options', AUTH_MDP, 'user'), - 'lists/delete' => $this->make_hook('delete', AUTH_MDP, 'user'), + 'lists/moderate' => $this->make_hook('moderate', AUTH_PASSWD, 'user'), + 'lists/admin' => $this->make_hook('admin', AUTH_PASSWD, 'user'), + 'lists/options' => $this->make_hook('options', AUTH_PASSWD, 'user'), + 'lists/delete' => $this->make_hook('delete', AUTH_PASSWD, 'user'), - 'lists/soptions' => $this->make_hook('soptions', AUTH_MDP, 'user'), - 'lists/check' => $this->make_hook('check', AUTH_MDP, 'user'), - 'admin/lists' => $this->make_hook('admin_all', AUTH_MDP, 'admin'), - 'admin/aliases' => $this->make_hook('aaliases', AUTH_MDP, 'admin') + 'lists/soptions' => $this->make_hook('soptions', AUTH_PASSWD, 'user'), + 'lists/check' => $this->make_hook('check', AUTH_PASSWD, 'user'), + 'admin/lists' => $this->make_hook('admin_all', AUTH_PASSWD, 'admin'), + 'admin/aliases' => $this->make_hook('aaliases', AUTH_PASSWD, 'admin') ); } diff --git a/modules/marketing.php b/modules/marketing.php index 5086e96..d1d8372 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -24,13 +24,13 @@ class MarketingModule extends PLModule function handlers() { return array( - 'marketing' => $this->make_hook('marketing', AUTH_MDP, 'admin'), - 'marketing/promo' => $this->make_hook('promo', AUTH_MDP, 'admin'), - 'marketing/relance' => $this->make_hook('relance', AUTH_MDP, 'admin'), - 'marketing/this_week' => $this->make_hook('week', AUTH_MDP, 'admin'), - 'marketing/volontaire' => $this->make_hook('volontaire', AUTH_MDP, 'admin'), + 'marketing' => $this->make_hook('marketing', AUTH_PASSWD, 'admin'), + 'marketing/promo' => $this->make_hook('promo', AUTH_PASSWD, 'admin'), + 'marketing/relance' => $this->make_hook('relance', AUTH_PASSWD, 'admin'), + 'marketing/this_week' => $this->make_hook('week', AUTH_PASSWD, 'admin'), + 'marketing/volontaire' => $this->make_hook('volontaire', AUTH_PASSWD, 'admin'), - 'marketing/private' => $this->make_hook('private', AUTH_MDP, 'admin'), + 'marketing/private' => $this->make_hook('private', AUTH_PASSWD, 'admin'), 'marketing/public' => $this->make_hook('public', AUTH_COOKIE, 'user'), 'marketing/broken' => $this->make_hook('broken', AUTH_COOKIE, 'user'), ); diff --git a/modules/newsletter.php b/modules/newsletter.php index 6603bc8..7ea958e 100644 --- a/modules/newsletter.php +++ b/modules/newsletter.php @@ -27,16 +27,16 @@ class NewsletterModule extends PLModule 'nl' => $this->make_hook('nl', AUTH_COOKIE, 'user'), 'nl/show' => $this->make_hook('nl_show', AUTH_COOKIE, 'user'), 'nl/search' => $this->make_hook('nl_search', AUTH_COOKIE, 'user'), - 'nl/submit' => $this->make_hook('nl_submit', AUTH_MDP, 'user'), - 'nl/remaining' => $this->make_hook('nl_remaining', AUTH_MDP, 'user'), - 'admin/nls' => $this->make_hook('admin_nl_groups', AUTH_MDP, 'admin'), - 'admin/newsletter' => $this->make_hook('admin_nl', AUTH_MDP, 'admin'), - 'admin/newsletter/categories' => $this->make_hook('admin_nl_cat', AUTH_MDP, 'admin'), - 'admin/newsletter/edit' => $this->make_hook('admin_nl_edit', AUTH_MDP, 'admin'), - 'admin/newsletter/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_MDP, 'admin'), + 'nl/submit' => $this->make_hook('nl_submit', AUTH_PASSWD, 'user'), + 'nl/remaining' => $this->make_hook('nl_remaining', AUTH_PASSWD, 'user'), + 'admin/nls' => $this->make_hook('admin_nl_groups', AUTH_PASSWD, 'admin'), + 'admin/newsletter' => $this->make_hook('admin_nl', AUTH_PASSWD, 'admin'), + 'admin/newsletter/categories' => $this->make_hook('admin_nl_cat', AUTH_PASSWD, 'admin'), + 'admin/newsletter/edit' => $this->make_hook('admin_nl_edit', AUTH_PASSWD, 'admin'), + 'admin/newsletter/edit/delete' => $this->make_hook('admin_nl_delete', AUTH_PASSWD, 'admin'), // Automatic mailing is disabled for X.org NL -// 'admin/newsletter/edit/cancel' => $this->make_hook('cancel', AUTH_MDP, 'admin'), -// 'admin/newsletter/edit/valid' => $this->make_hook('valid', AUTH_MDP, 'admin'), +// 'admin/newsletter/edit/cancel' => $this->make_hook('cancel', AUTH_PASSWD, 'admin'), +// 'admin/newsletter/edit/valid' => $this->make_hook('valid', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/openid.php b/modules/openid.php index fa4c1d5..826c78c 100644 --- a/modules/openid.php +++ b/modules/openid.php @@ -64,9 +64,9 @@ class OpenidModule extends PLModule '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, 'user'), - 'openid/trusted' => $this->make_hook('trusted', AUTH_MDP, 'user'), - 'admin/openid/trusted' => $this->make_hook('admin_trusted', AUTH_MDP, 'admin'), + 'openid/trust' => $this->make_hook('trust', AUTH_PASSWD, 'user'), + 'openid/trusted' => $this->make_hook('trusted', AUTH_PASSWD, 'user'), + 'admin/openid/trusted' => $this->make_hook('admin_trusted', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/payment.php b/modules/payment.php index ef0ed1a..2641b42 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -105,21 +105,21 @@ class PaymentModule extends PLModule function handlers() { return array( - 'payment' => $this->make_hook('payment', AUTH_MDP, 'payment'), + 'payment' => $this->make_hook('payment', AUTH_PASSWD, 'payment'), 'payment/cyber2_return' => $this->make_hook('cyber2_return', AUTH_PUBLIC, 'user', NO_HTTPS), 'payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC, 'user', NO_HTTPS), - '%grp/paiement' => $this->make_hook('xnet_payment', AUTH_MDP, 'user'), - '%grp/payment' => $this->make_hook('xnet_payment', AUTH_MDP, 'user'), - '%grp/payment/csv' => $this->make_hook('payment_csv', AUTH_MDP, 'groupadmin'), + '%grp/paiement' => $this->make_hook('xnet_payment', AUTH_PASSWD, 'user'), + '%grp/payment' => $this->make_hook('xnet_payment', AUTH_PASSWD, 'user'), + '%grp/payment/csv' => $this->make_hook('payment_csv', AUTH_PASSWD, 'groupadmin'), '%grp/payment/cyber2_return' => $this->make_hook('cyber2_return', AUTH_PUBLIC, 'user', NO_HTTPS), '%grp/payment/paypal_return' => $this->make_hook('paypal_return', AUTH_PUBLIC, 'user', NO_HTTPS), - 'admin/payments' => $this->make_hook('admin', AUTH_MDP, 'admin'), - 'admin/payments/methods' => $this->make_hook('adm_methods', AUTH_MDP, 'admin'), - 'admin/payments/transactions' => $this->make_hook('adm_transactions', AUTH_MDP, 'admin'), - 'admin/reconcile' => $this->make_hook('adm_reconcile', AUTH_MDP, 'admin'), - 'admin/reconcile/importlogs' => $this->make_hook('adm_importlogs', AUTH_MDP, 'admin'), - 'admin/reconcile/transfers' => $this->make_hook('adm_transfers', AUTH_MDP, 'admin'), - 'admin/reconcile/bankaccounts' => $this->make_hook('adm_bankaccounts', AUTH_MDP, 'admin'), + 'admin/payments' => $this->make_hook('admin', AUTH_PASSWD, 'admin'), + 'admin/payments/methods' => $this->make_hook('adm_methods', AUTH_PASSWD, 'admin'), + 'admin/payments/transactions' => $this->make_hook('adm_transactions', AUTH_PASSWD, 'admin'), + 'admin/reconcile' => $this->make_hook('adm_reconcile', AUTH_PASSWD, 'admin'), + 'admin/reconcile/importlogs' => $this->make_hook('adm_importlogs', AUTH_PASSWD, 'admin'), + 'admin/reconcile/transfers' => $this->make_hook('adm_transfers', AUTH_PASSWD, 'admin'), + 'admin/reconcile/bankaccounts' => $this->make_hook('adm_bankaccounts', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/platal.php b/modules/platal.php index b7a641d..1dee07e 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -38,26 +38,26 @@ class PlatalModule extends PLModule function handlers() { return array( - 'index' => $this->make_hook('index', AUTH_PUBLIC), - 'cacert.pem' => $this->make_hook('cacert', AUTH_PUBLIC), - 'changelog' => $this->make_hook('changelog', AUTH_PUBLIC), + 'index' => $this->make_hook('index', AUTH_PUBLIC), + 'cacert.pem' => $this->make_hook('cacert', AUTH_PUBLIC), + 'changelog' => $this->make_hook('changelog', AUTH_PUBLIC), // Preferences thingies - 'prefs' => $this->make_hook('prefs', AUTH_COOKIE, 'user,groups'), - 'prefs/rss' => $this->make_hook('prefs_rss', AUTH_COOKIE, 'user'), - 'prefs/webredirect' => $this->make_hook('webredir', AUTH_MDP, 'mail'), - 'prefs/skin' => $this->make_hook('skin', AUTH_COOKIE, 'user'), + 'prefs' => $this->make_hook('prefs', AUTH_COOKIE, 'user,groups'), + 'prefs/rss' => $this->make_hook('prefs_rss', AUTH_COOKIE, 'user'), + 'prefs/webredirect' => $this->make_hook('webredir', AUTH_PASSWD, 'mail'), + 'prefs/skin' => $this->make_hook('skin', AUTH_COOKIE, 'user'), // password related thingies - 'password' => $this->make_hook('password', AUTH_MDP, 'user,groups'), - 'tmpPWD' => $this->make_hook('tmpPWD', AUTH_PUBLIC), - 'password/smtp' => $this->make_hook('smtppass', AUTH_MDP, 'mail'), - 'recovery' => $this->make_hook('recovery', AUTH_PUBLIC), + 'password' => $this->make_hook('password', AUTH_PASSWD, 'user,groups'), + 'password/smtp' => $this->make_hook('smtppass', AUTH_PASSWD, 'mail'), + 'tmpPWD' => $this->make_hook('tmpPWD', AUTH_PUBLIC), + 'recovery' => $this->make_hook('recovery', AUTH_PUBLIC), 'recovery/ext' => $this->make_hook('recovery_ext', AUTH_PUBLIC), 'register/ext' => $this->make_hook('register_ext', AUTH_PUBLIC), - 'exit' => $this->make_hook('exit', AUTH_PUBLIC), - 'review' => $this->make_hook('review', AUTH_PUBLIC), - 'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC), + 'exit' => $this->make_hook('exit', AUTH_PUBLIC), + 'review' => $this->make_hook('review', AUTH_PUBLIC), + 'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC), ); } @@ -416,7 +416,7 @@ Adresse de secours : ' . $to)); // Try to start a session (so the user don't have to log in); we will use // the password available in Post:: to authenticate the user. - Platal::session()->start(AUTH_MDP); + Platal::session()->start(AUTH_PASSWD); $page->changeTpl('platal/tmpPWD.success.tpl'); } else { diff --git a/modules/profile.php b/modules/profile.php index c780786..93fc9f3 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -25,15 +25,15 @@ class ProfileModule extends PLModule { return array( 'photo' => $this->make_hook('photo', AUTH_PUBLIC), - 'photo/change' => $this->make_hook('photo_change', AUTH_MDP, 'user'), + 'photo/change' => $this->make_hook('photo_change', AUTH_PASSWD, 'user'), 'fiche.php' => $this->make_hook('fiche', AUTH_PUBLIC), 'profile' => $this->make_hook('profile', AUTH_PUBLIC), 'profile/private' => $this->make_hook('profile', AUTH_COOKIE, 'user'), 'profile/ax' => $this->make_hook('ax', AUTH_COOKIE, 'admin,edit_directory'), - 'profile/edit' => $this->make_hook('p_edit', AUTH_MDP, 'user'), + 'profile/edit' => $this->make_hook('p_edit', AUTH_PASSWD, 'user'), 'profile/ajax/address' => $this->make_hook('ajax_address', AUTH_COOKIE, 'user', NO_AUTH), - 'profile/ajax/address/del' => $this->make_hook('ajax_address_del', AUTH_MDP, 'user'), + 'profile/ajax/address/del' => $this->make_hook('ajax_address_del', AUTH_PASSWD, 'user'), 'profile/ajax/tel' => $this->make_hook('ajax_tel', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/edu' => $this->make_hook('ajax_edu', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/medal' => $this->make_hook('ajax_medal', AUTH_COOKIE, 'user', NO_AUTH), @@ -57,17 +57,17 @@ 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/binets' => $this->make_hook('admin_binets', AUTH_PASSWD, 'admin'), + 'admin/medals' => $this->make_hook('admin_medals', AUTH_PASSWD, 'admin'), + 'admin/education' => $this->make_hook('admin_education', AUTH_PASSWD, 'admin'), + 'admin/education_field' => $this->make_hook('admin_education_field', AUTH_PASSWD, 'admin'), + 'admin/education_degree' => $this->make_hook('admin_education_degree', AUTH_PASSWD, 'admin'), + 'admin/education_degree_set' => $this->make_hook('admin_education_degree_set', AUTH_PASSWD, 'admin'), + 'admin/sections' => $this->make_hook('admin_sections', AUTH_PASSWD, 'admin'), + 'admin/networking' => $this->make_hook('admin_networking', AUTH_PASSWD, 'admin'), + 'admin/trombino' => $this->make_hook('admin_trombino', AUTH_PASSWD, 'admin'), + 'admin/corps_enum' => $this->make_hook('admin_corps_enum', AUTH_PASSWD, 'admin'), + 'admin/corps_rank' => $this->make_hook('admin_corps_rank', AUTH_PASSWD, 'admin'), ); } diff --git a/modules/register.php b/modules/register.php index 83169e8..d2825dd 100644 --- a/modules/register.php +++ b/modules/register.php @@ -381,7 +381,7 @@ class RegisterModule extends PLModule // Try to start a session (so the user don't have to log in); we will use // the password available in Post:: to authenticate the user. - Platal::session()->start(AUTH_MDP); + Platal::session()->start(AUTH_PASSWD); // Subscribe the user to the services she did request at registration time. require_once 'newsletter.inc.php'; diff --git a/modules/survey.php b/modules/survey.php index eaef664..26af2d4 100644 --- a/modules/survey.php +++ b/modules/survey.php @@ -30,10 +30,10 @@ class SurveyModule extends PLModule 'survey/result' => $this->make_hook('result', AUTH_PUBLIC), 'survey/edit' => $this->make_hook('edit', AUTH_COOKIE, 'user'), 'survey/ajax' => $this->make_hook('ajax', AUTH_COOKIE, 'user'), - '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/admin' => $this->make_hook('admin', AUTH_PASSWD, 'admin'), + 'survey/admin/edit' => $this->make_hook('adminEdit', AUTH_PASSWD, 'admin'), + 'survey/admin/valid' => $this->make_hook('adminValidate', AUTH_PASSWD, 'admin'), + 'survey/admin/del' => $this->make_hook('adminDelete', AUTH_PASSWD, 'admin'), ); } // }}} diff --git a/modules/urlshortener.php b/modules/urlshortener.php index 33b5153..b9da82e 100644 --- a/modules/urlshortener.php +++ b/modules/urlshortener.php @@ -25,7 +25,7 @@ class UrlShortenerModule extends PLModule { return array( 'url' => $this->make_hook('url', AUTH_PUBLIC), - 'admin/url' => $this->make_hook('admin_url', AUTH_MDP, 'admin') + 'admin/url' => $this->make_hook('admin_url', AUTH_PASSWD, 'admin') ); } diff --git a/modules/xnet.php b/modules/xnet.php index 44094d8..ae6edc4 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -27,15 +27,15 @@ class XnetModule extends PLModule 'index' => $this->make_hook('index', AUTH_PUBLIC), 'exit' => $this->make_hook('exit', AUTH_PUBLIC), - 'admin' => $this->make_hook('admin', AUTH_MDP, 'admin'), + 'admin' => $this->make_hook('admin', AUTH_PASSWD, 'admin'), 'groups' => $this->make_hook('groups', AUTH_PUBLIC), 'groupes.php' => $this->make_hook('groups2', AUTH_PUBLIC), 'plan' => $this->make_hook('plan', AUTH_PUBLIC), // Should be removed in a future release as links will have expired anyway. 'register/ext' => $this->make_hook('register_ext', AUTH_PUBLIC), - 'photo' => $this->make_hook('photo', AUTH_MDP, 'groups'), - 'autologin' => $this->make_hook('autologin', AUTH_MDP, 'groups'), - 'edit' => $this->make_hook('edit', AUTH_MDP, 'groups'), + 'photo' => $this->make_hook('photo', AUTH_PASSWD, 'groups'), + 'autologin' => $this->make_hook('autologin', AUTH_PASSWD, 'groups'), + 'edit' => $this->make_hook('edit', AUTH_PASSWD, 'groups'), 'Xnet' => $this->make_wiki_hook(), ); } diff --git a/modules/xnetevents.php b/modules/xnetevents.php index f345f13..ba0a815 100644 --- 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, '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'), + '%grp/events' => $this->make_hook('events', AUTH_PASSWD, 'groups'), + '%grp/events/sub' => $this->make_hook('sub', AUTH_PASSWD, 'groups'), + '%grp/events/csv' => $this->make_hook('csv', AUTH_PASSWD, 'groups', NO_HTTPS), + '%grp/events/ical' => $this->make_hook('ical', AUTH_PASSWD, 'groups', NO_HTTPS), + '%grp/events/edit' => $this->make_hook('edit', AUTH_PASSWD, 'groupadmin'), + '%grp/events/admin' => $this->make_hook('admin', AUTH_PASSWD, 'groupmember'), ); } diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index a1a37e2..0049ae0 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -29,34 +29,34 @@ 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/former_users' => $this->make_hook('former_users', AUTH_MDP, 'admin'), - '%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/directory/sync' => $this->make_hook('directory_sync', AUTH_MDP, 'groupadmin'), - '%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, '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, '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, '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'), + '%grp/edit' => $this->make_hook('edit', AUTH_PASSWD, 'groupadmin'), + '%grp/mail' => $this->make_hook('mail', AUTH_PASSWD, 'groupadmin'), + '%grp/forum' => $this->make_hook('forum', AUTH_PASSWD, 'groupmember'), + '%grp/former_users' => $this->make_hook('former_users', AUTH_PASSWD, 'admin'), + '%grp/annuaire' => $this->make_hook('annuaire', AUTH_PASSWD, 'groupannu'), + '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_PASSWD, 'groupmember:groupannu'), + '%grp/annuaire/csv' => $this->make_hook('csv', AUTH_PASSWD, 'groupmember:groupannu'), + '%grp/directory/sync' => $this->make_hook('directory_sync', AUTH_PASSWD, 'groupadmin'), + '%grp/directory/unact' => $this->make_hook('non_active', AUTH_PASSWD, 'groupadmin'), + '%grp/trombi' => $this->make_hook('trombi', AUTH_PASSWD, 'groupannu'), + '%grp/geoloc' => $this->make_hook('geoloc', AUTH_PASSWD, 'groupannu'), + '%grp/subscribe' => $this->make_hook('subscribe', AUTH_PASSWD, 'groups'), + '%grp/subscribe/valid' => $this->make_hook('subscribe_valid', AUTH_PASSWD, 'groupadmin'), + '%grp/unsubscribe' => $this->make_hook('unsubscribe', AUTH_PASSWD, 'groupmember'), + + '%grp/change_rights' => $this->make_hook('change_rights', AUTH_PASSWD, 'groups'), + '%grp/admin/annuaire' => $this->make_hook('admin_annuaire', AUTH_PASSWD, 'groupadmin'), + '%grp/member' => $this->make_hook('admin_member', AUTH_PASSWD, 'groupadmin'), + '%grp/member/new' => $this->make_hook('admin_member_new', AUTH_PASSWD, 'groupadmin'), + '%grp/member/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_PASSWD, 'groups', NO_AUTH), + '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_PASSWD, 'groupadmin'), + '%grp/member/suggest' => $this->make_hook('admin_member_suggest', AUTH_PASSWD, '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_PASSWD, 'groupadmin'), + '%grp/announce/edit' => $this->make_hook('edit_announce', AUTH_PASSWD, '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_PASSWD, 'groupadmin'), ); } diff --git a/modules/xnetlists.php b/modules/xnetlists.php index c0eaa38..6a06b26 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -28,8 +28,8 @@ class XnetListsModule extends ListsModule function handlers() { return array( - '%grp/lists' => $this->make_hook('lists', AUTH_MDP, 'groupmember'), - '%grp/lists/create' => $this->make_hook('create', AUTH_MDP, 'groupmember'), + '%grp/lists' => $this->make_hook('lists', AUTH_PASSWD, 'groupmember'), + '%grp/lists/create' => $this->make_hook('create', AUTH_PASSWD, 'groupmember'), '%grp/lists/members' => $this->make_hook('members', AUTH_COOKIE, 'groups'), '%grp/lists/csv' => $this->make_hook('csv', AUTH_COOKIE, 'groups'), @@ -37,17 +37,17 @@ class XnetListsModule extends ListsModule '%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, '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/moderate' => $this->make_hook('moderate', AUTH_PASSWD, 'groups'), + '%grp/lists/admin' => $this->make_hook('admin', AUTH_PASSWD, 'groups'), + '%grp/lists/options' => $this->make_hook('options', AUTH_PASSWD, 'groups'), + '%grp/lists/delete' => $this->make_hook('delete', AUTH_PASSWD, 'groups'), - '%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/lists/soptions' => $this->make_hook('soptions', AUTH_PASSWD, 'groups'), + '%grp/lists/check' => $this->make_hook('check', AUTH_PASSWD, 'groups'), + '%grp/lists/sync' => $this->make_hook('sync', AUTH_PASSWD, 'groups'), - '%grp/alias/admin' => $this->make_hook('aadmin', AUTH_MDP, 'groupadmin'), - '%grp/alias/create' => $this->make_hook('acreate', AUTH_MDP, 'groupadmin'), + '%grp/alias/admin' => $this->make_hook('aadmin', AUTH_PASSWD, 'groupadmin'), + '%grp/alias/create' => $this->make_hook('acreate', AUTH_PASSWD, 'groupadmin'), /* hack: lists uses that */ 'profile' => $this->make_hook('profile', AUTH_PUBLIC), diff --git a/modules/xnetnl.php b/modules/xnetnl.php index 7451a07..f8e9150 100644 --- a/modules/xnetnl.php +++ b/modules/xnetnl.php @@ -26,16 +26,16 @@ class XnetNlModule extends NewsletterModule function handlers() { return array( - '%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'), - '%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_PASSWD, 'groups'), + '%grp/nl/show' => $this->make_hook('nl_show', AUTH_PASSWD, 'groups'), + '%grp/nl/search' => $this->make_hook('nl_search', AUTH_PASSWD, 'groups'), + '%grp/admin/nl' => $this->make_hook('admin_nl', AUTH_PASSWD, 'groupadmin'), + '%grp/admin/nl/sync' => $this->make_hook('admin_nl_sync', AUTH_PASSWD, 'groupadmin'), + '%grp/admin/nl/enable' => $this->make_hook('admin_nl_enable', AUTH_PASSWD, 'groupadmin'), + '%grp/admin/nl/edit' => $this->make_hook('admin_nl_edit', AUTH_PASSWD, 'groupadmin'), + '%grp/admin/nl/edit/cancel' => $this->make_hook('admin_nl_cancel', AUTH_PASSWD, 'groupadmin'), + '%grp/admin/nl/edit/valid' => $this->make_hook('admin_nl_valid', AUTH_PASSWD, 'groupadmin'), + '%grp/admin/nl/categories' => $this->make_hook('admin_nl_cat', AUTH_PASSWD, 'groupadmin'), ); } diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl index a07bb56..c883869 100644 --- a/templates/skin/common.menu.tpl +++ b/templates/skin/common.menu.tpl @@ -38,7 +38,7 @@ {else} -{if $smarty.session.auth == AUTH_MDP} +{if $smarty.session.auth == AUTH_PASSWD}
Déconnexion
{elseif $smarty.cookies.ORGaccess}
Déconnexion totale
-- 2.1.4