X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplwikipage.php;h=4e3ce78497826a22c29fa71d547269491e1f23e9;hb=e3c131627aa03f7107709e6d44c7840c09847acd;hp=787b2932a82afc7c8c921da701c60773326a216f;hpb=eec996233a443d9d024786583c0370a54d639dde;p=platal.git

diff --git a/classes/plwikipage.php b/classes/plwikipage.php
index 787b293..4e3ce78 100644
--- a/classes/plwikipage.php
+++ b/classes/plwikipage.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -404,10 +404,11 @@ class PlWikiPage
           case 'public':
             return true;
           case 'logged':
-          case 'mdp':
             return S::logged();
+          case 'mdp':
+            return S::identified();
           case 'admin':
-            return S::has_perms();
+            return S::admin();
           default:
             return false;
         }
@@ -421,11 +422,16 @@ class PlWikiPage
           case 'public':
             return;
           case 'logged':
-            Platal::session()->start(AUTH_PUBLIC + 1);
-            return;
+            $ok = Platal::session()->start(AUTH_PUBLIC + 1);
+            break;
           default:
-            Platal::session()->start(Platal::session()->sureLevel());
-            return;
+            $ok = Platal::session()->start(Platal::session()->sureLevel());
+            break;
+        }
+        if (!$ok) {
+            global $platal;
+            $page =& Platal::page();
+            $platal->force_login($page);
         }
     }