X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fwiki%2Ffarmconfig.php;h=a4fef9d5c2cc7f87f882cec3f0448e3d97d6cdb6;hb=c67b874fd8d442bfded35295a819e7ce11a2d6dc;hp=b867000c080063a4aa4d9f008fc3aee9250da1be;hpb=787bb3d745141f2f85bd947ad7dd775d2c63f908;p=platal.git

diff --git a/include/wiki/farmconfig.php b/include/wiki/farmconfig.php
index b867000..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 <base /> in skin
@@ -53,7 +54,7 @@ $GUIButtons['table'] = array(600,
                  '$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' => "<form action='{\$PageUrl}?action=edit' method='post'><div><input
@@ -96,16 +97,8 @@ function doBicol($column=false)
 function doPlatalLink($link, $text)
 {
     if (strlen(trim($text)) == 0) {
-        $res = XDB::query("SELECT u.nom, u.prenom, u.promo, q.profile_nick AS surnom
-                             FROM auth_user_md5   AS u
-                       INNER JOIN auth_user_quick AS q USING(user_id)
-                       INNER JOIN aliases         AS a ON u.user_id = a.id
-                            WHERE a.alias = {?}", $link);
-        $row = $res->fetchOneAssoc();
-        $text = $row['prenom'] . ' ' . $row['nom'] . ' X' . $row['promo'];
-        if ($row['surnom']) {
-            $text .= ' (alias ' . $row['surnom'] . ')';
-        }
+        $profile = Profile::get($link);
+        $text = $profile->fullName();
     }
     return '<a href="profile/' . $link . '" class="popup2">' . $text . '</a>';
 }