From 206e75c35f721f74c7d412d763e4c7ec8a620a5a Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Mon, 16 Apr 2007 19:11:38 +0000
Subject: [PATCH] Fix warnings in manageurs' xmlrpc

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1707 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 include/webservices/manageurs.client.inc.php | 2 --
 include/webservices/manageurs.inc.php        | 5 ++++-
 include/webservices/manageurs.server.inc.php | 3 ---
 modules/auth.php                             | 2 +-
 templates/search/adv.form.tpl                | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/include/webservices/manageurs.client.inc.php b/include/webservices/manageurs.client.inc.php
index 18f17b5..91ece55 100644
--- a/include/webservices/manageurs.client.inc.php
+++ b/include/webservices/manageurs.client.inc.php
@@ -1,10 +1,8 @@
 <?php
 
 require_once 'webservices/manageurs.inc.php';
-require_once dirname(__FILE__).'/../../XmlrpcClient.php';
 
 function get_annuaire_infos($amicale, $id_assoce, $adresse){
-
     $url = '';
 
     $url = 'http://www.polytechniciens.org:80/manageurs.php';
diff --git a/include/webservices/manageurs.inc.php b/include/webservices/manageurs.inc.php
index ec797a3..628fb27 100644
--- a/include/webservices/manageurs.inc.php
+++ b/include/webservices/manageurs.inc.php
@@ -48,7 +48,10 @@ function manageurs_encrypt_close(){
 
 function manageurs_encrypt($message){
   global $tripledes;
-  return base64_encode(mcrypt_generic($tripledes, $message));
+  if (empty($message)) {
+      return $message;
+  }
+  return base64_encode(mcrypt_generic($tripledes, utf8_decode($message)));
 }
 
 function manageurs_decrypt($message){
diff --git a/include/webservices/manageurs.server.inc.php b/include/webservices/manageurs.server.inc.php
index 445f8a7..8fbd891 100644
--- a/include/webservices/manageurs.server.inc.php
+++ b/include/webservices/manageurs.server.inc.php
@@ -17,14 +17,11 @@ $error_key = "You didn't provide me with a valid cipher key...";
 function get_annuaire_infos($method, $params) {
     global $error_mat, $error_key, $globals;
 
-      
-
     //verif du mdp
     if(!isset($params[0]) || ($params[0] != $globals->manageurs->manageurs_pass)){return false;}
     //si on a adresse == -1 => on ne recupère aucune adresse
     if(isset($params[2]) && ($params[2] == -1)) unset($params[2]);
 
-
     if( !empty($params[1]) ){ // on verifie qu'on a bien un matricule
 
         //on ne recupere pas les adresses inutilement
diff --git a/modules/auth.php b/modules/auth.php
index 70c7e00..3781291 100644
--- a/modules/auth.php
+++ b/modules/auth.php
@@ -110,7 +110,7 @@ class AuthModule extends PLModule
             xmlrpc_server_register_method($server, 'get_annuaire_infos', 'get_annuaire_infos');
             xmlrpc_server_register_method($server, 'get_nouveau_infos', 'get_nouveau_infos');
 
-            $request  = $GLOBALS['HTTP_RAW_POST_DATA'];
+            $request  = @$GLOBALS['HTTP_RAW_POST_DATA'];
             $response = xmlrpc_server_call_method($server, $request, null);
             header('Content-Type: text/xml');
             print $response;
diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index f412da6..0dbef84 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -58,7 +58,7 @@
           $(".autocompleteTarget[@name='school']").attr('value',schoolId);
           if (schoolId) {
             $(".autocomplete[@name='schoolTxt']").addClass('hidden_valid');
-            $("[@name='diploma']").parent().load(parent + 'list/diploma/', { school:schoolId }, function() {
+            $("[@name='diploma']").parent().load(baseurl + 'list/diploma/', { school:schoolId }, function() {
               if ($("select[@name='diploma']").children("option").size() > 1) {
                 $("select[@name='diploma']").attr('value', '{/literal}{$smarty.request.diploma}{literal}');
               } else {
-- 
2.1.4