X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fprofil.func.inc.php;h=8a5edbf6a7618fcda33875150e118d85f25bd456;hb=b2c6bf975ecf150db121ffd72f4cdf8cb084e33b;hp=a20ce4cc6111904745d4a068b8644ceb5c18ef29;hpb=dd502514e4c52ed460753060b847df8ef155661e;p=platal.git

diff --git a/include/profil.func.inc.php b/include/profil.func.inc.php
index a20ce4c..8a5edbf 100644
--- a/include/profil.func.inc.php
+++ b/include/profil.func.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,7 +24,7 @@ require_once('applis.func.inc.php');
 
 function replace_ifset(&$var,$req) {
     if (Env::has($req)){
-        $var = Env::get($req);
+        $var = Env::v($req);
     }
 }
 
@@ -46,7 +46,7 @@ function put_in_db($string){
 }
 
 // example of use for diff_user_details : get $b from database, $a from other site
-//  calculate diff $c and add $c in database (with set_user_details)            
+//  calculate diff $c and add $c in database (with set_user_details)
 function diff_user_details(&$a, &$b, $view = 'private') { // compute $c = $a - $b
 //    if (!isset($b) || !$b || !is_array($b) || count($b) == 0)
 //        return $a;
@@ -131,11 +131,11 @@ function diff_user_address($a, $b) {
         $a['pub'] = $b['pub'];
     if (isset($b['tels'])) {
         $bvar = $b['tels'];
-        
+
         $telids_b = array();
-        foreach ($bvar as $i => $telb) $telids_b[$telb['telid']] = $i; 
+        foreach ($bvar as $i => $telb) $telids_b[$telb['telid']] = $i;
 
-        if (isset($a['tels']))            
+        if (isset($a['tels']))
             $avar = $a['tels'];
         else
             $avar = array();
@@ -161,7 +161,7 @@ function diff_user_address($a, $b) {
                 }
             }
         }
-        
+
         foreach ($telids_b as $telidb => $i)
             $ctels[] = array('telid' => $telidb, 'remove' => 1);
 
@@ -183,8 +183,8 @@ function diff_user_address($a, $b) {
 function diff_user_addresses(&$a, &$b) {
     $c = $a;
     $adrids_b = array();
-    foreach ($b as $i => $adrb) $adrids_b[$adrb['adrid']] = $i; 
-    
+    foreach ($b as $i => $adrb) $adrids_b[$adrb['adrid']] = $i;
+
     foreach ($a as $j => $adra) {
         if (isset($adra['adrid'])) {
             // if b has an address with the same adrid, compute diff
@@ -284,4 +284,5 @@ function diff_user_pros(&$a, &$b, $view = 'private') {
     return $c;
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>