X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fwiki.inc.php;h=ae4c8886e9cf2414f264e6bbd53669d6bd336249;hb=cab0809050d58f8484608e91f7555ebd69dcb451;hp=b4aefcae1003e7ab4c0bfa0f2bb4ce7c81591336;hpb=0df3edb9fd85fb750c47cee19a3a6b66f370cc97;p=platal.git

diff --git a/include/wiki.inc.php b/include/wiki.inc.php
index b4aefca..ae4c888 100644
--- a/include/wiki.inc.php
+++ b/include/wiki.inc.php
@@ -22,6 +22,9 @@ $wikisites = array('xorg','xnet');
 
 function wiki_pagename() {
     $n = str_replace('/', '.', Env::get('n', false));
+    if (!$n) {
+        return null;
+    }
     $keywords = explode('.', $n);
     $count = count($keywords);
     if ($count == 1)
@@ -29,7 +32,7 @@ function wiki_pagename() {
     else
         $n = $keywords[$count - 2].".".$keywords[$count - 1];
     global $globals;
-    if ($wikiurl && ($urln = str_replace('.', '/', $n)) != Env::get('n') && $n != Env::get('n'))
+    if (($urln = str_replace('.', '/', $n)) != Env::get('n') && $n != Env::get('n'))
         redirect($globals->relurl.'/'.$urln);
     $_REQUEST['n'] = $n;
     return $n;
@@ -61,6 +64,11 @@ function wiki_clear_cache($n) {
     $wikisite = $oldwikisite;
 }
 
+function wiki_clear_all_cache()
+{
+    system("rm -f ".wiki_work_dir()."/cache_*");
+}
+
 // editing pages are not static but used templates too, so we used
 // temp template files containing result from wiki
 function wiki_create_tmp($content) {
@@ -87,56 +95,55 @@ function wiki_clean_tmp() {
 
 function wiki_assign_auth() {
     global $page, $wiki_auths;
-    $page->assign('logged', logged());
-    $page->assign('identified', identified());
-    $page->assign('has_perms', has_perms());
+    $page->assign('logged', S::logged());
+    $page->assign('identified', S::identified());
+    $page->assign('has_perms', S::has_perms());
     $page->assign('public', true);
-    $page->assign('wiki_admin', has_perms() && identified());
+    $page->assign('wiki_admin', S::has_perms() && S::identified());
 }
 
 // cannot be in a function because pmwiki use all vars as if it was globals
 //function new_wiki_page() {
-    global $page, $globals;
-	// the wiki keword is given in the n var
-	if ( $n = wiki_pagename() )
-	{
+    // the wiki keword is given in the n var
+    if ( $n = wiki_pagename() )
+    {
 
-	  $wiki_template = wiki_template($n);
-	  $tmpfile_exists = file_exists($wiki_template);
+        $wiki_template = wiki_template($n);
+        $tmpfile_exists = file_exists($wiki_template);
 
-	  // don't recreate the tpl if it already exists
-	  if (Env::get('action') || !$tmpfile_exists)
-	  {
-	    if ($tmpfile_exists) {
-	       wiki_clear_cache($n);
-	    }
+        // don't recreate the tpl if it already exists
+        if (Env::get('action') || !$tmpfile_exists)
+        {
+            if ($tmpfile_exists) {
+                wiki_clear_cache($n);
+            }
 
-	    // we leave pmwiki do whatever it wants and store everything
-	    ob_start();
-	    require_once($globals->spoolroot.'/'.$globals->wiki->wikidir.'/pmwiki.php');
+            // we leave pmwiki do whatever it wants and store everything
+            ob_start();
+            require_once($globals->spoolroot.'/'.$globals->wiki->wikidir.'/pmwiki.php');
 
-	    $wikiAll = ob_get_clean();
-	    // the pmwiki skin we are using (almost empty) has these keywords:
-	    $i = strpos($wikiAll, "<!--/HeaderText-->");
-	    $j = strpos($wikiAll, "<!--/PageLeftFmt-->", $i);
-	    
-	  }
-	  if (Env::get('action'))
-	  {
-        // clean old tmp files
-        wiki_clean_tmp();
-	    $page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
-	    // create new tmp files with editing page from wiki engine
-	    $wiki_template = wiki_create_tmp(substr($wikiAll, $j));
-	  } else {
-	    if (!$tmpfile_exists)
-	    {
-	    	$f = fopen($wiki_template, 'w');
-        	fputs($f, substr($wikiAll, $j));
-        	fclose($f);
-	    }
-	  } 
-	}
+            $wikiAll = ob_get_clean();
+            // the pmwiki skin we are using (almost empty) has these keywords:
+            $i = strpos($wikiAll, "<!--/HeaderText-->");
+            $j = strpos($wikiAll, "<!--/PageLeftFmt-->", $i);
+
+        }
+        if (Env::get('action'))
+        {
+            // clean old tmp files
+            wiki_clean_tmp();
+            $page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
+            // create new tmp files with editing page from wiki engine
+            $wiki_template = wiki_create_tmp(substr($wikiAll, $j));
+        } else {
+            if (!$tmpfile_exists)
+            {
+                $f = fopen($wiki_template, 'w');
+                fputs($f, substr($wikiAll, $j));
+                fclose($f);
+            }
+        } 
+    }
    //return $wiki_template;    
 //}
 ?>