From 5351b5b315c2fbd74a8e188696008e6d10809670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Lombra=C3=B1a=20Gonz=C3=A1lez?=
 <teleyinex@gmail.com>
Date: Thu, 14 Jul 2011 11:01:43 +0200
Subject: [PATCH] Fixed CDATA opaque parse problem.

The opaque data is surrounded by a CDATA tag that was ignored by the RPC causing to not authenticate the host and create a
new entry in the DB each time a RPC was issued by the client. This commit fixes the problem, requiring to have at least a
BOINC 6.10.x version.
---
 conf/jarifa.conf | 2 +-
 rpc.php          | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/conf/jarifa.conf b/conf/jarifa.conf
index 32f8ca3..36d132b 100644
--- a/conf/jarifa.conf
+++ b/conf/jarifa.conf
@@ -27,7 +27,7 @@
         <boinc_user_email>jarifa@unex.es</boinc_user_email> <!--BOINC user e-mail that you want to use for Jarifa (it could be an existing one)-->
         <boinc_user_name>jarifa</boinc_user_name> <!--BOINC user name that you want to use for Jarifa (it could be an existing one)-->
         <boinc_passwd>jarifa</boinc_passwd> <!--BOINC password that you want to use for Jarifa (it could be an existing one)-->
-        <min_core_client_version>600</min_core_client_version> <!--Minimum BOINC core client version required for working with Jarifa. By default 6.0-->
+        <min_core_client_version>610</min_core_client_version> <!--Minimum BOINC core client version required for working with Jarifa. By default 6.0-->
         <volunteer>1</volunteer> <!--Enables (1) or Disables (0) the Volunteer Role-->
     </account_manager>
     <gmap> <!--Google Maps integration. Add your country and a Google Map Key to enable this feature-->
diff --git a/rpc.php b/rpc.php
index f32314a..4d18e2b 100644
--- a/rpc.php
+++ b/rpc.php
@@ -22,7 +22,13 @@
 
 $rpc = new rpc;
 
-$host = simplexml_load_file("php://input");
+$host = simplexml_load_file("php://input",'SimpleXMLElement',LIBXML_NOCDATA);
+
+// Update <opaque><id></id></opaque> content as it is surrounded by CDATA:
+
+$host->opaque->addChild('id','');
+$host->opaque->id = simplexml_load_string($host->opaque, 'SimpleXMLElement',LIBXML_NOCDATA);
+
 
 if ($rpc->auth($host))
 {