X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=htdocs%2Fxnet.php;h=1f206a5db00eb9d0654389d1bd4dc3ae0d5283e8;hb=4694ce89dbace4a890f87b6d73486d05de44abeb;hp=0b067463a03fc625c9859e0541fc9214273abc51;hpb=f1ca33de3bce194c10cfa9b7fbc588fbf6b3014d;p=platal.git

diff --git a/htdocs/xnet.php b/htdocs/xnet.php
index 0b06746..1f206a5 100644
--- a/htdocs/xnet.php
+++ b/htdocs/xnet.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,15 +21,10 @@
 
 $GLOBALS['IS_XNET_SITE'] = true;
 
-require_once dirname(__FILE__).'/../classes/XDB.php';
-require_once dirname(__FILE__).'/../classes/Xnet.php';
-require_once dirname(__FILE__).'/../classes/PLModule.php';
-require_once dirname(__FILE__).'/../classes/CoreLogger.php';
-
-require 'xnet.inc.php';
+require_once dirname(__FILE__).'/../include/xnet.inc.php';
 
 if (!($path = Env::v('n')) || substr($path, 0, 4) != 'Xnet') {
-    $platal = new Xnet('xnet', 'xnetgrp', 'xnetlists', 'xnetevents', 'geoloc');
+    $platal = new Xnet('xnet', 'xnetgrp', 'xnetlists', 'xnetevents', 'geoloc', 'payment');
     $platal->run();
 
     exit;
@@ -44,23 +39,9 @@ if (!$n) {
     pl_redirect('');
 }
 
-new_skinned_page('wiki.tpl');
+new_skinned_page('core/wiki.tpl');
 $perms = wiki_get_perms($n);
 
-switch (Env::v('action')) {
-  case '':
-    wiki_apply_perms($perms[0]);
-    break;
-
-  case 'edit':
-    wiki_apply_perms($perms[1]);
-    break;
-
-  default:
-    wiki_apply_perms('admin');
-    break;
-}
-
 if ($p = Post::v('setrperms')) {
     wiki_apply_perms('admin');
     if (wiki_set_perms($n, $p, $perms[1])) {
@@ -77,7 +58,7 @@ if ($p = Post::v('setwperms')) {
     }
 }
 
-$wiki_cache   = wiki_work_dir().'/cache_'.$n.'.tpl';
+$wiki_cache   = wiki_work_dir().'/cache_'.wiki_filename($n).'.tpl';
 $cache_exists = file_exists($wiki_cache);
 
 if (Env::v('action') || !$cache_exists) {
@@ -105,6 +86,20 @@ if (Env::v('action')) {
     }
 }
 
+switch (Env::v('action')) {
+  case '': case 'search':
+    wiki_apply_perms($perms[0]);
+    break;
+
+  case 'edit':
+    wiki_apply_perms($perms[1]);
+    break;
+
+  default:
+    wiki_apply_perms('admin');
+    break;
+}
+
 $page->assign('perms', $perms);
 $page->assign('perms_opts', wiki_perms_options());
 
@@ -112,7 +107,13 @@ $page->assign('canedit',    wiki_may_have_perms($perms[1]));
 $page->assign('has_perms',  wiki_may_have_perms('admin'));
 
 $page->assign('wikipage', str_replace('.', '/', $n));
-$page->assign('pmwiki',   $wikiAll);
+$page->assign('wikipage', str_replace('.', '/', $n));
+if ($perms[1] == 'admin' && !Env::v('action')) {
+    $page->assign('pmwiki_cache', $wiki_cache);
+} else {
+    $page->assign('pmwiki',   $wikiAll);
+    $page->assign('text', true);
+}
 
 $page->addCssLink('wiki.css');
 $page->addJsLink('wiki.js');