X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Fpmwiki.config.php;h=d3ca4208f8391dd00683b889b9ad4036e50e4875;hb=053126b2a8e3ab9336c55adf5981bb458ca04dbe;hp=15858ed77d4d05d0ca50e94493e062cb1f78fc3f;hpb=5dbdcb8c3d57a2e825e00e37d17ddf0ac969fce3;p=platal.git

diff --git a/plugins/pmwiki.config.php b/plugins/pmwiki.config.php
index 15858ed..d3ca420 100644
--- a/plugins/pmwiki.config.php
+++ b/plugins/pmwiki.config.php
@@ -1,46 +1,25 @@
 <?php if (!defined('PmWiki')) exit();
 
-$ScriptUrl       = $globals->baseurl;
-$UploadUrlFmt    = $ScriptUrl."/uploads";
-$WorkDir         = '../spool/wiki.d';
-$WikiDir         = new PageStore('$FarmD/'.$WorkDir.'/$FullName');
-$PubDirUrl       = $globals->baseurl.'/wiki';
-$InterMapFiles[] = $globals->spoolroot.'plugins/pmwiki.intermap.txt';
-
-# Authorize group name to start with a number (for promo groups)
-$GroupPattern = '[[:upper:]0-9][\\w]*(?:-\\w+)*';
-
-$EnablePathInfo = 1;
-
-$Skin = 'empty';
-
-XLSDV('en', array('EnterAttributes' =>
-    "Entre ici les différents droit pour la page. Les champs laissés en blanc ne seront pas modifiés.
-    Pour enlever une restriction ou une autorisation entre <strong>clear</strong>.
-    Les différentes restrictions possibles sont :
-    <ul>
-        <li><strong>public:</strong> (pour tout le monde)</li>
-        <li><strong>logged:</strong> (pour ceux qui ont rentré leur mot de passe ou qui ont un cookie permanent)</li>
-        <li><strong>identified:</strong> (exige une identification par mot de passe)</li>
-        <li><strong>has_perms:</strong> (pour les administrateurs de la page)</li>
-    </ul>
-    Le <strong>:</strong> à la fin de chaque mot clef est important. Tu peux également combiner plusieurs mots clefs avec <strong>and:</strong>
-    ou des espaces (qui remplace le <em>ou</em> logique)<br/>"));
-
-include_once($globals->spoolroot."/plugins/pmwiki.platalAuth.php");
-@include_once("$FarmD/cookbook/e-protect.php");
-
-$DefaultPasswords['read']   = 'has_perms: and: identified:';
-$DefaultPasswords['edit']   = 'has_perms: and: identified:';
-$DefaultPasswords['attr']   = 'has_perms: and: identified:';
-$DefaultPasswords['admin']  = 'has_perms: and: identified:';
-$DefaultPasswords['upload'] = 'has_perms: and: identified:';
-
+$EnablePathInfo   = 1;   # in fact works with apache rewrite, name is misleading
 $EnableGUIButtons = 1;
 $EnableUpload     = 1;
 $LinkWikiWords    = 0;   # disable WikiWord links
 $EnableIMSCaching = 1;   # allow browser caching
 
+$ScriptUrl        = '.';          #\
+$UploadUrlFmt     = './uploads';  # } works thanks to the <base /> in skin
+$PubDirUrl        = './wiki';     #/
+
+$WorkDir          = '../spool/wiki.d';
+$WikiDir          = new PageStore('$FarmD/'.$WorkDir.'/$FullName');
+$InterMapFiles[]  = $globals->spoolroot.'plugins/pmwiki.intermap.txt';
+
+$Skin             = 'empty';
+
+@include_once("$FarmD/cookbook/e-protect.php");
+
+// Theme-ing {{{
+
 ##  The following lines make additional editing buttons appear in the
 ##  edit page for subheadings, lists, tables, etc.
 $GUIButtons['h2'] = array(400, '\\n!! ', '\\n', '$[Heading]',
@@ -62,7 +41,7 @@ $GUIButtons['table'] = array(600,
                  '$GUIButtonDirUrlFmt/table.gif"$[Table]"');
 
 // set default author
-$Author = $_SESSION['forlife']."|".$_SESSION['prenom']." ".$_SESSION['nom'];
+$Author = $_SESSION['forlife'].'|'.$_SESSION['prenom'].' '.$_SESSION['nom'];
 
 $InputTags['e_form'] = array(
   ':html' => "<form action='{\$PageUrl}?action=edit' method='post'><div><input 
@@ -97,4 +76,12 @@ function doBicol($column=false)
         $TableCellAttrFmt = "class='$column'";
     }
 }
+
+// }}}
+
+$AuthFunction = 'ReadPage';
+
+$HandleAuth['diff']   = 'edit';
+$HandleAuth['source'] = 'edit';
+
 ?>