X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fprofil%2Fget_general.inc.php;h=12e293fcaf3feb3ebf1fada416bed7492d3a4c8c;hb=cab0809050d58f8484608e91f7555ebd69dcb451;hp=cc78409c2e5442a6dc0d8e7a80bc2ad2132838e5;hpb=dd502514e4c52ed460753060b847df8ef155661e;p=platal.git

diff --git a/include/profil/get_general.inc.php b/include/profil/get_general.inc.php
index cc78409..12e293f 100644
--- a/include/profil/get_general.inc.php
+++ b/include/profil/get_general.inc.php
@@ -30,13 +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;
@@ -56,7 +56,7 @@ replace_ifset($appli_type1,"appli_type1");
 replace_ifset($appli_type2,"appli_type2");
 replace_ifset($nickname,"nickname");
 
-if(Env::has('modifier') || Env::has('suivant') && Env::get('old_tab') == 'general') {
+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';
@@ -74,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: