Wiki search do not require admin perms

[platal.git] / htdocs / xnet.php

diff --git a/htdocs/xnet.php b/htdocs/xnet.php
index 0b06746..410bfe4 100644 (file)
--- 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,11 +39,11 @@ 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 '':
+  case '': case 'search':
     wiki_apply_perms($perms[0]);
     break;
 
@@ -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');