simplify the design, drop login.php for now, it will come back (maybe) at some point...

[platal.git] / plugins / pmwiki.platalSkin.php

diff --git a/plugins/pmwiki.platalSkin.php b/plugins/pmwiki.platalSkin.php
index 7ac74be..634b7fa 100644 (file)
--- a/plugins/pmwiki.platalSkin.php
+++ b/plugins/pmwiki.platalSkin.php
@@ -3,32 +3,25 @@
 // set default author
 $Author = $_SESSION['forlife']."|".$_SESSION['prenom']." ".$_SESSION['nom'];
 
+$InputTags['e_form'] = array(
+  ':html' => "<form action='{\$PageUrl}?action=edit' method='post'><div><input 
+    type='hidden' name='action' value='edit' /><input 
+    type='hidden' name='n' value='{\$FullName}' /><input 
+    type='hidden' name='basetime' value='\$EditBaseTime' /></div>");
+    
 // set profiles to point to plat/al fiche
 Markup('[[~platal', '<[[~', '/\[\[~([^|\]]*)\|([^\]]*)\]\]/e',
     'PreserveText("=", \'<a href="'.$globals->baseurl
-    .'/fiche.php?user=$1" class="popup2">$2</a>\', "")');
+    .'/profile/$1" class="popup2">$2</a>\', "")');
 
-// add conditions for request vars
-// (:request topic:) then (:if topic top:) will test $_REQUEST['topic'] == 'top'
-Markup('requestVars', '<if', '/\(:request ([a-z_]+)( ([a-z_]+))?:\)/ie', 'RequestToCond("$1", "$3")');
+// prevent restorelinks before block apply (otherwise [[Sécurité]] will give
+//  .../S<span class='e9curit'>e9'>Sécurité</a>
+Markup('restorelinks','<%%',"//", '');
 
 ## [[#anchor]] in standard XHTML
 Markup('[[#','<[[','/(?>\\[\\[#([A-Za-z][-.:\\w]*))\\]\\]/e',
   "Keep(\"<a id='$1'></a>\",'L')");
   
-function RequestToCond($var, $default)
-{
-    global $Conditions;
-    $Conditions[$var] = '(!$condparm && !isset($_REQUEST["'.$var
-        .'"])) || $_REQUEST["'.$var.'"]==$condparm';
-    if ($default) {
-        $Conditions[$var] .= ' || "'.$default.'" == $_REQUEST["'.$var.'"]';
-    }
-}
-
-// add access to session vars
-Markup('sessionvars', 'inline', '/\(:session ([a-z_]+):\)/ie', 'Session::get("$1")');
-
 Markup('tablebicol', '<block', '/\(:tablebicol ?([a-z_]+)?:\)/e', 'doBicol("$1")');
 Markup('pairrows', '_end', '/class=\'pair\_pmwiki\_([0-9]+)\'/e', 
     "($1 == 1)?'':('class=\"'.(($1 % 2 == 0)?'impair':'pair').'\"')");