Merge branch 'xorg/maint' into xorg/master

[platal.git] / classes / xorg.php

diff --git a/classes/xorg.php b/classes/xorg.php
index 83bc952..bdd1e85 100644 (file)
--- a/classes/xorg.php
+++ b/classes/xorg.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -26,9 +26,9 @@ class Xorg extends Platal
         parent::__construct('auth', 'carnet', 'email', 'events', 'forums',
                             'lists', 'marketing', 'payment', 'platal',
                             'profile', 'register', 'search', 'stats', 'admin',
-                            'newsletter', 'axletter', 'bandeau', 'survey',
+                            'newsletter', 'axletter', 'epletter', 'bandeau', 'survey',
                             'fusionax', 'gadgets', 'googleapps', 'poison',
-                            'openid', 'reminder');
+                            'openid', 'reminder', 'api', 'urlshortener');
     }
 
     public function find_hook()
@@ -39,15 +39,13 @@ class Xorg extends Platal
         return parent::find_hook();
     }
 
-    public function force_login(PlPage &$page)
+    public function force_login(PlPage $page)
     {
         header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
         if (S::logged()) {
             $page->changeTpl('core/password_prompt_logged.tpl');
-            $page->addJsLink('do_challenge_response_logged.js');
         } else {
             $page->changeTpl('core/password_prompt.tpl');
-            $page->addJsLink('do_challenge_response.js');
         }
         $page->assign_by_ref('platal', $this);
         $page->run();