#490: Can open events to non-members

[platal.git] / include / xnet.inc.php

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index 8978ab0..34ea7dd 100644 (file)
--- a/include/xnet.inc.php
+++ b/include/xnet.inc.php
@@ -20,10 +20,9 @@
  ***************************************************************************/
 
 require_once('platal.inc.php');
-require_once('xnet/globals.inc.php');
+require_once('globals.inc.php');
 require_once('xnet/session.inc.php');
-XnetGlobals::init();
-XnetGlobals::setlocale();
+$globals = new PlatalGlobals('XnetSession');
 XnetSession::init();
 
 // {{{ function new_skinned_page()
@@ -42,40 +41,37 @@ function new_skinned_page($tpl_name)
 }
 
 // }}}
-// {{{ function new_group_page()
+// {{{ function new_group_open_page()
 
-function new_group_page($tpl_name)
+function new_group_open_page($tpl_name, $refuse_access = false)
 {
     global $page, $globals;
 
     new_page($tpl_name);
 
-    $page->doAuth(true);
-    if (!is_member() && !S::has_perms()) {
-        $page->kill("You have not sufficient credentials");
-    }
-
     $page->useMenu();
     $page->assign('asso', $globals->asso());
     $page->setType($globals->asso('cat'));
+
+    if ($refuse_access) {
+        $page->kill("Vous n'avez pas les droits suffisants pour accéder à cette page");
+    }
 }
 
 // }}}
-// {{{ function new_groupadmin_page()
+// {{{ function new_group_page()
 
-function new_groupadmin_page($tpl_name)
+function new_group_page($tpl_name)
 {
-    global $page, $globals;
-
-    new_page($tpl_name);
+    new_group_open_page($tpl_name, !is_member() && !S::has_perms());
+}
 
-    if (!may_update()) {
-        $page->kill("You have not sufficient credentials");
-    }
+// }}}
+// {{{ function new_groupadmin_page()
 
-    $page->useMenu();
-    $page->assign('asso', $globals->asso());
-    $page->setType($globals->asso('cat'));
+function new_groupadmin_page($tpl_name)
+{
+    new_group_open_page($tpl_name, !may_update());
 }
 
 // }}}
@@ -97,24 +93,5 @@ function new_admin_page($tpl_name)
 }
 
 // }}}
-// {{{ function new_nonhtml_page()
-
-function new_nonhtml_page($tpl_name)
-{
-    global $page, $globals;
-
-    new_page($tpl_name, NO_SKIN);
-
-    $page->doAuth(true);
-    if (!is_member() && !S::has_perms()) {
-        $page->kill("You have not sufficient credentials");
-    }
-
-    $page->useMenu();
-    $page->assign('asso', $globals->asso());
-    $page->setType($globals->asso('cat'));
-}
-
-// }}}
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>