drop the wiki for the moment, it does not plays nice with X.net ...

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@498 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/hooks/xnet.inc.php b/hooks/xnet.inc.php
index 1694bab..10e0df4 100644 (file)
--- a/hooks/xnet.inc.php
+++ b/hooks/xnet.inc.php
@@ -27,7 +27,6 @@ class XnetConfig
 {
     var $secret       = '';
     var $evts_domain  = '';
-    var $wiki         = false;
 }
 
 // }}}

diff --git a/htdocs.net/wiki.php b/htdocs.net/wiki.php
deleted file mode 100644 (file)
index 383a48d..0000000
--- a/htdocs.net/wiki.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************/
-
-require_once("xnet.inc.php");
-
-// this page is to create a smarty template page from a wiki file
-// the wiki engine used is pmwiki.
-// the templates created are stored in wiki.d/cache_wikiword.tpl
-
-new_page('wiki.tpl');
-
-if ($globals->wiki->wikidir && $globals->xnet->wiki) {
-    $wikisite = 'xnet';
-    function more_wiki_config() {
-        global $Conditions, $DefaultPasswords;
-        $Conditions['has_perms'] = has_perms() || may_update();
-        $Conditions['is_member'] = is_member();
-        $DefaultPasswords['read'] = 'is_member:';
-    }
-    require_once("wiki.inc.php");
-    $page->changeTpl($wiki_template);
-    $page->setType($globals->asso('cat'));
-    $page->addCssLink('css/wiki.css');
-    $page->useMenu();
-    wiki_assign_auth();
-}
-
-if (!Env::get('action')) {
-    $page->addJsLink('javascript/wiki.js');
-}
-
-$page->assign('is_member', is_member());
-$page->assign('has_perms', has_perms() || may_update());
-
-$page->run();
-?>

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 4c30410..597219a 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -93,8 +93,6 @@ class XnetPage extends PlatalPage
         if (logged() && may_update()) {
             $sub = array();
             $sub['modifier l\'accueil'] = "$dim/edit";
-            if ($globals->wiki->wikidir && $globals->xnet->wiki)
-                $sub['wiki'] = "$dim/Accueil";
             if ($globals->asso('mail_domain')) {
                 $sub['envoyer un mail']     = "$dim/mail";
                 $sub['créer une liste']     = "$dim/lists/create";