X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fwiki%2Ffarmconfig.php;h=a4fef9d5c2cc7f87f882cec3f0448e3d97d6cdb6;hb=c67b874fd8d442bfded35295a819e7ce11a2d6dc;hp=d62c5c79299d4399f9546bcf49c04c94c3482b96;hpb=a2b461cee28a1cfef200039caec99158a6b906f3;p=platal.git
diff --git a/include/wiki/farmconfig.php b/include/wiki/farmconfig.php
index d62c5c7..a4fef9d 100644
--- a/include/wiki/farmconfig.php
+++ b/include/wiki/farmconfig.php
@@ -6,6 +6,7 @@ $EnableUpload = 1;
$UploadMaxSize = 500000;
$LinkWikiWords = 0; # disable WikiWord links
$EnableIMSCaching = 1; # allow browser caching
+$EnablePageListProtect = 0; # We use our own permission system.
$ScriptUrl = '.'; #\
$UploadUrlFmt = './uploads'; # } works thanks to the in skin
@@ -18,7 +19,8 @@ $InterMapFiles[] = $globals->spoolroot.'/configs/pmwiki.intermap.txt';
$Skin = 'empty';
@include_once("$FarmD/cookbook/e-protect.php");
-include_once($FarmD.'/scripts/xlpage-utf-8.php');
+include_once($FarmD.'/scripts/xlpage-utf-8.php');
+ResolvePageName();
if ($action == 'rss' || $action == 'atom' || $action == 'rdf' || $action == 'dc') {
$FmtPV['$MarkupExcerpt'] = '$page["text"]';
@@ -48,16 +50,16 @@ $GUIButtons['ul'] = array(530, '\\n* ', '\\n', '$[Unordered list]',
$GUIButtons['hr'] = array(540, '\\n----\\n', '', '',
'$GUIButtonDirUrlFmt/hr.gif"$[Horizontal rule]"');
$GUIButtons['table'] = array(600,
- '||border=1 width=80%\\n||!Hdr ||!Hdr ||!Hdr ||\\n|| || || ||\\n|| || || ||\\n', '', '',
+ '||border=1 width=80%\\n||!Hdr ||!Hdr ||!Hdr ||\\n|| || || ||\\n|| || || ||\\n', '', '',
'$GUIButtonDirUrlFmt/table.gif"$[Table]"');
// set default author
-$Author = $_SESSION['forlife'].'|'.$_SESSION['prenom'].' '.$_SESSION['nom'];
+$Author = $_SESSION['hruid'].'|'.$_SESSION['prenom'].' '.$_SESSION['nom'];
$InputTags['e_form'] = array(
- ':html' => "