From c6c10b6bad0ea3d8ca0c1cb7a2ff2ab5aced73ba Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Sat, 17 Mar 2007 10:28:41 +0000 Subject: [PATCH] Set 'groupadmin' perms for group admin pages Minor fixes git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1582 839d8a87-29fc-0310-9880-83ba4fa771e5 --- include/banana/hooks.inc.php | 3 ++- modules/xnetevents.php | 2 +- modules/xnetgrp.php | 20 ++++++++++---------- modules/xnetlists.php | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/banana/hooks.inc.php b/include/banana/hooks.inc.php index 4c92e09..68a51f4 100644 --- a/include/banana/hooks.inc.php +++ b/include/banana/hooks.inc.php @@ -113,7 +113,8 @@ function hook_platalMessageLink($params) function hook_makeImg($img, $alt, $height, $width) { - $url = 'images/banana/' . $img; + global $globals; + $url = $globals->baseurl . '/images/banana/' . $img; if (!is_null($width)) { $width = ' width="' . $width . '"'; diff --git a/modules/xnetevents.php b/modules/xnetevents.php index dde6c99..f35b2f8 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -30,7 +30,7 @@ class XnetEventsModule extends PLModule '%grp/events/sub' => $this->make_hook('sub', AUTH_MDP), '%grp/events/csv' => $this->make_hook('csv', AUTH_MDP), '%grp/events/ical' => $this->make_hook('ical', AUTH_MDP), - '%grp/events/edit' => $this->make_hook('edit', AUTH_MDP), + '%grp/events/edit' => $this->make_hook('edit', AUTH_MDP, 'groupadmin'), '%grp/events/admin' => $this->make_hook('admin', AUTH_MDP), ); } diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 6517494..d16a08a 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -77,8 +77,8 @@ 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), - '%grp/mail' => $this->make_hook('mail', AUTH_MDP), + '%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), '%grp/annuaire' => $this->make_hook('annuaire', AUTH_MDP), '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_MDP), @@ -92,18 +92,18 @@ class XnetGrpModule extends PLModule => $this->make_hook('admin_annuaire', AUTH_MDP), '%grp/member' - => $this->make_hook('admin_member', AUTH_MDP), + => $this->make_hook('admin_member', AUTH_MDP, 'groupadmin'), '%grp/member/new' - => $this->make_hook('admin_member_new', AUTH_MDP), + => $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), + => $this->make_hook('admin_member_del', AUTH_MDP, 'groupadmin'), '%grp/rss' => $this->make_hook('rss', AUTH_PUBLIC), - '%grp/announce/new' => $this->make_hook('edit_announce', AUTH_MDP), - '%grp/announce/edit' => $this->make_hook('edit_announce', AUTH_MDP), - '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_MDP), + '%grp/announce/new' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), + '%grp/announce/edit' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), + '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_MDP, 'groupadmin'), ); } @@ -171,7 +171,7 @@ class XnetGrpModule extends PLModule 'rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml'); } - $page->register_modifier('url_catcher', array(MiniWiki,'WikiToHTML')); + $page->register_modifier('url_catcher', array('MiniWiki','WikiToHTML')); $page->assign('articles', $arts); $page->assign('asso', $globals->asso()); @@ -986,7 +986,7 @@ class XnetGrpModule extends PLModule { global $globals, $platal; new_groupadmin_page('xnetgrp/announce-edit.tpl'); - $page->register_modifier('url_catcher', array(MiniWiki,'WikiToHTML')); + $page->register_modifier('url_catcher', array('MiniWiki','WikiToHTML')); $page->assign('new', is_null($aid)); $art = array(); diff --git a/modules/xnetlists.php b/modules/xnetlists.php index 5d3049e..208408a 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -44,8 +44,8 @@ class XnetListsModule extends ListsModule '%grp/lists/check' => $this->make_hook('check', AUTH_MDP), '%grp/lists/sync' => $this->make_hook('sync', AUTH_MDP), - '%grp/alias/admin' => $this->make_hook('aadmin', AUTH_MDP), - '%grp/alias/create' => $this->make_hook('acreate', AUTH_MDP), + '%grp/alias/admin' => $this->make_hook('aadmin', AUTH_MDP, 'groupadmin'), + '%grp/alias/create' => $this->make_hook('acreate', AUTH_MDP, 'groupadmin'), /* hack: lists uses that */ 'profile' => $this->make_hook('profile', AUTH_PUBLIC), -- 2.1.4