those three backports

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.4--patch-14
   manageurs_cipher_key

 * opensource@polytechnique.org--2005/platal--release--0.9.4--patch-15
   mnemo pour acces au webservice

 * opensource@polytechnique.org--2005/platal--release--0.9.4--patch-16
   bugfix webservice server manageurs

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-428

diff --git a/hooks/manageurs.inc.php b/hooks/manageurs.inc.php
index ee223ae..6aacbe5 100644 (file)
--- a/hooks/manageurs.inc.php
+++ b/hooks/manageurs.inc.php
@@ -24,7 +24,7 @@
 
 class ManageursConfig
 {
-    var $authorized_ips = '129.104.30.32 129.104.30.33';
+    var $authorized_ips = '129.104.30.32 129.104.30.33 213.251.145.200';
     var $manageurs_cipher_key = '';
     var $manageurs_pass = '';
 }

diff --git a/include/webservices/manageurs.inc.php b/include/webservices/manageurs.inc.php
index 7e9f010..d004644 100644 (file)
--- a/include/webservices/manageurs.inc.php
+++ b/include/webservices/manageurs.inc.php
@@ -25,7 +25,7 @@ $tripledes = '';
 
 function manageurs_encrypt_init($id_assoce){
   global $tripledes, $globals;
-  $cipher_key = $globals->webservice->cipher_key;
+  $cipher_key = $globals->manageurs->manageurs_cipher_key;
   if(!$tripledes){
     if(empty($cipher_key)){
       return 1;

diff --git a/include/webservices/manageurs.server.inc.php b/include/webservices/manageurs.server.inc.php
index 6031cd7..d042380 100644 (file)
--- a/include/webservices/manageurs.server.inc.php
+++ b/include/webservices/manageurs.server.inc.php
@@ -83,7 +83,7 @@ function get_annuaire_infos($method, $params) {
             }
         }
         else { //cas où on ne veut pas d'adresse
-            $array = $res->fetchOneAssoc();
+            $array = $res->next();
         }
 
         if ($array) { // on a bien eu un résultat : le matricule etait bon