Use 'changeTpl' for xnet pages and use handler permission instead of page restriction

[platal.git] / modules / xnetlists.php

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 50fb5bb..31ac9c3 100644 (file)
--- 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),
-            '%grp/lists/create'    => $this->make_hook('create',    AUTH_MDP),
+            '%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),
             '%grp/lists/trombi'    => $this->make_hook('trombi',    AUTH_COOKIE),
@@ -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),
@@ -75,8 +75,7 @@ class XnetListsModule extends ListsModule
             return PL_NOT_FOUND;
         }
         $this->prepare_client($page);
-
-        new_group_page('xnetlists/index.tpl');
+        $page->changeTpl('xnetlists/index.tpl');
 
         if (Get::has('del')) {
             $this->client->unsubscribe(Get::v('del'));
@@ -121,7 +120,6 @@ class XnetListsModule extends ListsModule
             return PL_NOT_FOUND;
         }
         $this->prepare_client($page);
-
         $page->changeTpl('xnetlists/create.tpl');
 
         if (!Post::has('submit')) {
@@ -136,7 +134,7 @@ class XnetListsModule extends ListsModule
         $liste = strtolower(Post::v('liste'));
 
         if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) {
-            $page->trig('le nom de la liste ne doit contenir que des lettres, chiffres et tirets');
+            $page->trig('le nom de la liste ne doit contenir que des lettres non accentuées, chiffres et tirets');
             return;
         }
 
@@ -198,7 +196,6 @@ class XnetListsModule extends ListsModule
             return PL_NOT_FOUND;
         }
         $this->prepare_client($page);
-
         $page->changeTpl('xnetlists/sync.tpl');
 
         if (Env::has('add')) {
@@ -244,8 +241,7 @@ class XnetListsModule extends ListsModule
         if (!$globals->asso('mail_domain') || is_null($lfull)) {
             return PL_NOT_FOUND;
         }
-
-        new_groupadmin_page('xnetlists/alias-admin.tpl');
+        $page->changeTpl('xnetlists/alias-admin.tpl');
 
         if (Env::has('add_member')) {
             $add = Env::v('add_member');
@@ -301,8 +297,8 @@ class XnetListsModule extends ListsModule
                          a.alias
                    FROM  x4dat.virtual_redirect AS vr
              INNER JOIN  x4dat.virtual          AS v  USING(vid)
-              LEFT JOIN  x4dat.aliases          AS a  ON(vr.redirect = CONCAT(a.alias, CONCAT('@', {?}))
-                                                        OR vr.redirect = CONCAT(a.alias, CONCAT('@', {?})))
+              LEFT JOIN  x4dat.aliases          AS a  ON(vr.redirect = CONCAT(a.alias, '@', {?})
+                                                        OR vr.redirect = CONCAT(a.alias, '@', {?}))
               LEFT JOIN  x4dat.auth_user_md5    AS u  ON(a.id = u.user_id)
               LEFT JOIN  groupex.membres        AS m2 ON(u.user_id = m2.uid AND m2.asso_id = {?})
               LEFT JOIN  groupex.membres        AS m  ON(m.email = vr.redirect AND m.asso_id = {?})
@@ -320,7 +316,7 @@ class XnetListsModule extends ListsModule
         if (!$globals->asso('mail_domain')) {
             return PL_NOT_FOUND;
         }
-        new_groupadmin_page('xnetlists/alias-create.tpl');
+        $page->changeTpl('xnetlists/alias-create.tpl');
 
         if (!Post::has('submit')) {
             return;