Melix alias visibility in VCards should be user's visibility, and not viewer's alias...

[platal.git] / include / xorg.inc.php

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index 6aa6cbf..0d4274c 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,7 +23,8 @@ require_once('platal.inc.php');
 require_once('globals.inc.php');
 require_once('xorg/session.inc.php');
 $globals = new PlatalGlobals('XorgSession');
-XorgSession::init();
+$globals->bootstrap(array('NbIns'), 'update_NbIns');
+$globals->bootstrap(array('NbValid'), 'update_NbValid');
 
 // {{{ class XorgPage
 
@@ -39,9 +40,9 @@ class XorgPage extends PlatalPage
         global $globals, $platal;
         $this->assign('globals', $globals);
         if (isset($platal) && $platal->path == 'register') {
-            $skin = 'register.tpl';
+            $skin = $globals->register_skin . ".tpl";
         } else {
-            $skin = S::v('skin', 'default.tpl');
+            $skin = S::v('skin', $globals->skin . ".tpl");
         }
         $this->_run('skin/' . $skin);
     }
@@ -53,11 +54,13 @@ function new_skinned_page($tpl_name)
 {
     global $page;
     if (!$page instanceof XorgPage) {
-        $page = new XorgPage($tpl_name, $type);
+        $page = new XorgPage($tpl_name);
     } else {
-        $page->changeTpl($tpl_name, $type);
+        $page->changeTpl($tpl_name);
     }
 }
 
+XorgSession::init();
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>