Merge remote branch 'origin/xorg/maint' into xorg/master

[platal.git] / classes / xorg.php

diff --git a/classes/xorg.php b/classes/xorg.php
index 593af76..9ff621c 100644 (file)
--- a/classes/xorg.php
+++ b/classes/xorg.php
@@ -28,7 +28,7 @@ class Xorg extends Platal
                             'profile', 'register', 'search', 'stats', 'admin',
                             'newsletter', 'axletter', 'epletter', 'bandeau', 'survey',
                             'fusionax', 'gadgets', 'googleapps', 'poison',
                             'profile', 'register', 'search', 'stats', 'admin',
                             'newsletter', 'axletter', 'epletter', 'bandeau', 'survey',
                             'fusionax', 'gadgets', 'googleapps', 'poison',

-                            'openid', 'reminder');
+                            'openid', 'reminder', 'api');

     }
 
     public function find_hook()
     }
 
     public function find_hook()


@@ -44,10 +44,8 @@ class Xorg extends Platal
         header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
         if (S::logged()) {
             $page->changeTpl('core/password_prompt_logged.tpl');
         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');
         } else {
             $page->changeTpl('core/password_prompt.tpl');

-            $page->addJsLink('do_challenge_response.js');

         }
         $page->assign_by_ref('platal', $this);
         $page->run();
         }
         $page->assign_by_ref('platal', $this);
         $page->run();