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

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

diff --git a/include/synchro_ax.inc.php b/include/synchro_ax.inc.php
index b0b5b2f..208272f 100644 (file)
--- a/include/synchro_ax.inc.php
+++ b/include/synchro_ax.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,17 +24,20 @@ require_once("xorg.inc.php");
 
 require_once('user.func.inc.php');
 
+function is_ax_key_missing() {
+    global $globals;
+    return !isset($globals->webservice->private_key_ax) || !is_file($globals->webservice->private_key_ax);
+}
+
 function get_user_ax($matricule_ax, $raw=false)
 {
     require_once('webservices/ax/client.inc');
 
-    global $globals;
-
     $ancien = recupere_infos_ancien($matricule_ax);
 
     $userax = Array();
     $userax['matricule_ax'] = $matricule_ax;
-    
+
     $userax['nom'] = strtoupper($ancien->Nom_patr());
     $userax['nom_usage'] = strtoupper($ancien->Nom_usuel());
     if ($userax['nom_usage'] == $userax['nom']) $userax['nom_usage'] = '';
@@ -42,7 +45,7 @@ function get_user_ax($matricule_ax, $raw=false)
     $userax['sexe'] = ($ancien->Civilite() != 'M')?1:0;
     $userax['promo'] = $ancien->Promo();
 /*    $userax['nationalite'] = $ancien->Nationalite();
-    if ($userax['nationalite'] == 'F') $userax['nationalite'] = 'Français'; */
+    if ($userax['nationalite'] == 'F') $userax['nationalite'] = 'Français'; */
     //$userax['date'] = substr($ancien[12], 0, 10);
     $userax['mobile'] = trim($ancien->Mobile(0));
 /*    if ($ancien->Corps() == 'D' || $ancien->Corps() == 'Z') {
@@ -51,8 +54,8 @@ function get_user_ax($matricule_ax, $raw=false)
         $userax['corps'] = $ancien->Corps();
         $userax['corps_grade'] = $ancien->Grade();
     } */
-    $userax['adr_pro'] = array(); 
-    
+    $userax['adr_pro'] = array();
+
     for ($i = 0; $i < $ancien->Num_Activite(); $i++) {
         $jobax = array();
         $jobax['entreprise'] = $ancien->Entreprise($i);
@@ -90,14 +93,14 @@ function get_user_ax($matricule_ax, $raw=false)
         if ($ancien->Tel($i) || $ancien->Fax($i)) {
             $adrax['tels'] = array();
             if ($tel = $ancien->Tel($i))
-                $adrax['tels'][] = array('tel' => $tel, 'tel_type' => 'Tél.', 'tel_pub' => 'ax');
+                $adrax['tels'][] = array('tel' => $tel, 'tel_type' => 'Tél.', 'tel_pub' => 'ax');
             if ($tel = $ancien->Fax($i))
                 $adrax['tels'][] = array('tel' => $tel, 'tel_type' => 'Fax', 'tel_pub' => 'ax');
         }
         if ($ancien->Mobile($i)) $userax['mobile'] = $ancien->Mobile($i);
         $userax['adr'][$i] = $adrax;
     }
-    
+
 /*    $userax['formation'] = array();
     for($i=$ancien->Num_formation() - 1; $i >= 0; $i--)
         $userax['formation'][$i] = $ancien->Formation($i);*/
@@ -114,5 +117,5 @@ function ax_synchronize($login, $uid) {
     $diff = diff_user_details($userax, $user, 'ax');
     set_user_details($user['user_id'], $diff);
 }
-// vim:set et sw=4 sts=4 sws=4:
+// vim:set et sw=4 sts=4 sws=4 enc=utf-8:
 ?>