pending commit, finished during MQ/S download ...

[platal.git] / include / profil / get_general.inc.php

diff --git a/include/profil/get_general.inc.php b/include/profil/get_general.inc.php
index 67ea33f..12e293f 100644 (file)
--- a/include/profil/get_general.inc.php
+++ b/include/profil/get_general.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2006 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -22,6 +22,7 @@
 // on ramène les données du profil connecté (uid paramètre de session)
 $sql = "SELECT  u.nom, u.prenom, u.nom_ini, u.prenom_ini, u.promo, u.promo_sortie, u.nom_usage, u.nationalite,
                q.profile_mobile, q.profile_mobile_pub, q.profile_web, q.profile_web_pub, q.profile_freetext, q.profile_freetext_pub, q.profile_nick,
+                q.profile_from_ax, u.matricule_ax,
                 a1.aid, a1.type, a2.aid, a2.type
           FROM  auth_user_md5   AS u
     INNER JOIN  auth_user_quick AS q  USING(user_id)
@@ -29,12 +30,13 @@ $sql = "SELECT  u.nom, u.prenom, u.nom_ini, u.prenom_ini, u.promo, u.promo_sorti
     LEFT  JOIN  applis_ins      AS a2 ON(a2.uid = u.user_id and a2.ordre = 1)
         WHERE  u.user_id = {?}";
 
-$result = $globals->xdb->query($sql, Session::getInt('uid', -1));
+$result = XDB::query($sql, S::v('uid', -1));
 list($nom, $prenom, $nom_ini, $prenom_ini, $promo, $promo_sortie, $nom_usage, $nationalite,
        $mobile, $mobile_pub, $web, $web_pub, $freetext, $freetext_pub, $nickname, 
+        $synchro_ax, $matricule_ax,
         $appli_id1,$appli_type1, $appli_id2,$appli_type2) = $result->fetchOneRow();
 
-$result = $globals->xdb->query("SELECT pub FROM photo WHERE uid = {?}", Session::getInt('uid', -1));
+$result = XDB::query("SELECT pub FROM photo WHERE uid = {?}", S::v('uid', -1));
 $photo_pub = $result->fetchOneCell();
 
 $nom_anc = $nom;
@@ -54,11 +56,12 @@ replace_ifset($appli_type1,"appli_type1");
 replace_ifset($appli_type2,"appli_type2");
 replace_ifset($nickname,"nickname");
 
-if(Env::has('modifier') || Env::has('suivant')) {
+if(Env::has('modifier') || Env::has('suivant') && $opened_tab == 'general') {
     $mobile_pub = Env::get('mobile_pub');
     $web_pub = Env::has('web_pub')?'public':'private';
     $freetext_pub = Env::has('freetext_pub')?'public':'private';
     $photo_pub = Env::has('photo_pub')?'public':'private';
+    $synchro_ax = Env::has("synchro_ax")?1:0;
 }
 
 require_once("xorg.misc.inc.php");
@@ -71,7 +74,7 @@ require_once("xorg.misc.inc.php");
     $prenom_anc_comp = replace_accent($prenom_anc);
 
 // Y a-t-il une photo en attente de confirmation ?
-$sql = $globals->xdb->query("SELECT COUNT(*) FROM requests WHERE type='photo' AND user_id = {?}", Session::getInt('uid', -1));
+$sql = XDB::query("SELECT COUNT(*) FROM requests WHERE type='photo' AND user_id = {?}", S::v('uid', -1));
 $nouvellephoto=$sql->fetchOneCell();
 
 // vim:set et sws=4 sw=4 sts=4: