// Merge with revision 7841

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 11:43:58 +00:00
parent c945049ef1
commit ffeb22bfb9
130 changed files with 6620 additions and 18585 deletions
@@ -63,7 +63,7 @@ class AdminMondialRelay extends AdminTab
 							<span></span>
 					</div>';

-		$orders = MondialRelay::getOrders();
+		$orders = MondialRelay::getOrders(array(), MondialRelay::WITHOUT_HOME_DELIVERY);
 		if (empty($orders))
 			$html.= '<h3 style="color:red;">' . $this->l('No orders with this state.') . '</h3>';
 		else
@@ -35,13 +35,17 @@
 require_once(realpath(dirname(__FILE__).'/../../config/config.inc.php'));

 if (Tools::getValue('mrtoken') != sha1('mr'._COOKIE_KEY_.'mrAgain'))
-	die;
+	die();

 require_once(realpath(dirname(__FILE__).'/../../init.php'));
+require(dirname(__FILE__).'/mondialrelay.php');
 require(dirname(__FILE__).'/classes/MRCreateTickets.php');
 require(dirname(__FILE__).'/classes/MRGetTickets.php');
+require(dirname(__FILE__).'/classes/MRGetRelayPoint.php');
 require(dirname(__FILE__).'/classes/MRManagement.php');

+global $cookie, $cart, $customer;
+
 $method = Tools::getValue('method');
 $params = array();
 $result = array();
@@ -61,12 +65,20 @@ switch($method)
 	case 'DeleteHistory':
 		$params['historyIdList'] = Tools::getValue('history_id_list');
 		break;
-	// 1.3 compatibility to add carrier info when an user select one
+	case 'uninstallDetail':
+		$params['action'] = Tools::getValue('action');
+		break;
+	case 'MRGetRelayPoint':
+		$params['id_carrier'] = Tools::getValue('id_carrier');
+		$params['weight'] = $cart->getTotalWeight();
+		$params['id_address_delivery'] = $cart->id_address_delivery;
+		break;
 	case 'addSelectedCarrierToDB':
-		$params['cart'] = new Cart($cookie->id_cart);
-		// Sometimes the carrier id isn't set into the cart object
-		if (($id_carrier = Tools::getValue('id_carrier')))
-			$params['cart']->id_carrier = $id_carrier;
+		$params['id_carrier'] = Tools::getValue('id_carrier');
+		$params['id_cart'] = $cart->id;
+		$params['id_customer'] = $cookie->id_customer;
+		$params['id_mr_method'] = Tools::getValue('id_mr_method');
+		$params['relayPointInfo'] = Tools::getValue('relayPointInfo');
 		break;
 	default:
 }
@@ -0,0 +1,314 @@
+<?php
+/**
+ * jsmin.php - PHP implementation of Douglas Crockford's JSMin.
+ *
+ * This is a direct port of jsmin.c to PHP with a few PHP performance tweaks and
+ * modifications to preserve some comments (see below). Also, rather than using
+ * stdin/stdout, JSMin::minify() accepts a string as input and returns another
+ * string as output.
+ * 
+ * Comments containing IE conditional compilation are preserved, as are multi-line
+ * comments that begin with "/*!" (for documentation purposes). In the latter case
+ * newlines are inserted around the comment to enhance readability.
+ *
+ * PHP 5 or higher is required.
+ *
+ * Permission is hereby granted to use this version of the library under the
+ * same terms as jsmin.c, which has the following license:
+ *
+ * --
+ * Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * The Software shall be used for Good, not Evil.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * --
+ *
+ * @package JSMin
+ * @author Ryan Grove <ryan@wonko.com> (PHP port)
+ * @author Steve Clay <steve@mrclay.org> (modifications + cleanup)
+ * @author Andrea Giammarchi <http://www.3site.eu> (spaceBeforeRegExp)
+ * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c)
+ * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port)
+ * @license http://opensource.org/licenses/mit-license.php MIT License
+ * @link http://code.google.com/p/jsmin-php/
+ */
+
+class JSMin {
+    const ORD_LF            = 10;
+    const ORD_SPACE         = 32;
+    const ACTION_KEEP_A     = 1;
+    const ACTION_DELETE_A   = 2;
+    const ACTION_DELETE_A_B = 3;
+    
+    protected $a           = "\n";
+    protected $b           = '';
+    protected $input       = '';
+    protected $inputIndex  = 0;
+    protected $inputLength = 0;
+    protected $lookAhead   = null;
+    protected $output      = '';
+    
+    /**
+     * Minify Javascript
+     *
+     * @param string $js Javascript to be minified
+     * @return string
+     */
+    public static function minify($js)
+    {
+        $jsmin = new JSMin($js);
+        return $jsmin->min();
+    }
+    
+    /**
+     * Setup process
+     */
+    public function __construct($input)
+    {
+        $this->input       = str_replace("\r\n", "\n", $input);
+        $this->inputLength = strlen($this->input);
+    }
+    
+    /**
+     * Perform minification, return result
+     */
+    public function min()
+    {
+        if ($this->output !== '') { // min already run
+            return $this->output;
+        }
+        $this->action(self::ACTION_DELETE_A_B);
+        
+        while ($this->a !== null) {
+            // determine next command
+            $command = self::ACTION_KEEP_A; // default
+            if ($this->a === ' ') {
+                if (! $this->isAlphaNum($this->b)) {
+                    $command = self::ACTION_DELETE_A;
+                }
+            } elseif ($this->a === "\n") {
+                if ($this->b === ' ') {
+                    $command = self::ACTION_DELETE_A_B;
+                } elseif (false === strpos('{[(+-', $this->b) 
+                          && ! $this->isAlphaNum($this->b)) {
+                    $command = self::ACTION_DELETE_A;
+                }
+            } elseif (! $this->isAlphaNum($this->a)) {
+                if ($this->b === ' '
+                    || ($this->b === "\n" 
+                        && (false === strpos('}])+-"\'', $this->a)))) {
+                    $command = self::ACTION_DELETE_A_B;
+                }
+            }
+            $this->action($command);
+        }
+        $this->output = trim($this->output);
+        return $this->output;
+    }
+    
+    /**
+     * ACTION_KEEP_A = Output A. Copy B to A. Get the next B.
+     * ACTION_DELETE_A = Copy B to A. Get the next B.
+     * ACTION_DELETE_A_B = Get the next B.
+     */
+    protected function action($command)
+    {
+        switch ($command) {
+            case self::ACTION_KEEP_A:
+                $this->output .= $this->a;
+                // fallthrough
+            case self::ACTION_DELETE_A:
+                $this->a = $this->b;
+                if ($this->a === "'" || $this->a === '"') { // string literal
+                    $str = $this->a; // in case needed for exception
+                    while (true) {
+                        $this->output .= $this->a;
+                        $this->a       = $this->get();
+                        if ($this->a === $this->b) { // end quote
+                            break;
+                        }
+                        if (ord($this->a) <= self::ORD_LF) {
+                            throw new JSMin_UnterminatedStringException(
+                                'Unterminated String: ' . var_export($str, true));
+                        }
+                        $str .= $this->a;
+                        if ($this->a === '\\') {
+                            $this->output .= $this->a;
+                            $this->a       = $this->get();
+                            $str .= $this->a;
+                        }
+                    }
+                }
+                // fallthrough
+            case self::ACTION_DELETE_A_B:
+                $this->b = $this->next();
+                if ($this->b === '/' && $this->isRegexpLiteral()) { // RegExp literal
+                    $this->output .= $this->a . $this->b;
+                    $pattern = '/'; // in case needed for exception
+                    while (true) {
+                        $this->a = $this->get();
+                        $pattern .= $this->a;
+                        if ($this->a === '/') { // end pattern
+                            break; // while (true)
+                        } elseif ($this->a === '\\') {
+                            $this->output .= $this->a;
+                            $this->a       = $this->get();
+                            $pattern      .= $this->a;
+                        } elseif (ord($this->a) <= self::ORD_LF) {
+                            throw new JSMin_UnterminatedRegExpException(
+                                'Unterminated RegExp: '. var_export($pattern, true));
+                        }
+                        $this->output .= $this->a;
+                    }
+                    $this->b = $this->next();
+                }
+            // end case ACTION_DELETE_A_B
+        }
+    }
+    
+    protected function isRegexpLiteral()
+    {
+        if (false !== strpos("\n{;(,=:[!&|?", $this->a)) { // we aren't dividing
+            return true;
+        }
+        if (' ' === $this->a) {
+            $length = strlen($this->output);
+            if ($length < 2) { // weird edge case
+                return true;
+            }
+            // you can't divide a keyword
+            if (preg_match('/(?:case|else|in|return|typeof)$/', $this->output, $m)) {
+                if ($this->output === $m[0]) { // odd but could happen
+                    return true;
+                }
+                // make sure it's a keyword, not end of an identifier
+                $charBeforeKeyword = substr($this->output, $length - strlen($m[0]) - 1, 1);
+                if (! $this->isAlphaNum($charBeforeKeyword)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Get next char. Convert ctrl char to space.
+     */
+    protected function get()
+    {
+        $c = $this->lookAhead;
+        $this->lookAhead = null;
+        if ($c === null) {
+            if ($this->inputIndex < $this->inputLength) {
+                $c = $this->input[$this->inputIndex];
+                $this->inputIndex += 1;
+            } else {
+                return null;
+            }
+        }
+        if ($c === "\r" || $c === "\n") {
+            return "\n";
+        }
+        if (ord($c) < self::ORD_SPACE) { // control char
+            return ' ';
+        }
+        return $c;
+    }
+    
+    /**
+     * Get next char. If is ctrl character, translate to a space or newline.
+     */
+    protected function peek()
+    {
+        $this->lookAhead = $this->get();
+        return $this->lookAhead;
+    }
+    
+    /**
+     * Is $c a letter, digit, underscore, dollar sign, escape, or non-ASCII?
+     */
+    protected function isAlphaNum($c)
+    {
+        return (preg_match('/^[0-9a-zA-Z_\\$\\\\]$/', $c) || ord($c) > 126);
+    }
+    
+    protected function singleLineComment()
+    {
+        $comment = '';
+        while (true) {
+            $get = $this->get();
+            $comment .= $get;
+            if (ord($get) <= self::ORD_LF) { // EOL reached
+                // if IE conditional comment
+                if (preg_match('/^\\/@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
+                    return "/{$comment}";
+                }
+                return $get;
+            }
+        }
+    }
+    
+    protected function multipleLineComment()
+    {
+        $this->get();
+        $comment = '';
+        while (true) {
+            $get = $this->get();
+            if ($get === '*') {
+                if ($this->peek() === '/') { // end of comment reached
+                    $this->get();
+                    // if comment preserved by YUI Compressor
+                    if (0 === strpos($comment, '!')) {
+                        return "\n/*" . substr($comment, 1) . "*/\n";
+                    }
+                    // if IE conditional comment
+                    if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
+                        return "/*{$comment}*/";
+                    }
+                    return ' ';
+                }
+            } elseif ($get === null) {
+                throw new JSMin_UnterminatedCommentException('Unterminated Comment: ' . var_export('/*' . $comment, true));
+            }
+            $comment .= $get;
+        }
+    }
+    
+    /**
+     * Get the next character, skipping over comments.
+     * Some comments may be preserved.
+     */
+    protected function next()
+    {
+        $get = $this->get();
+        if ($get !== '/') {
+            return $get;
+        }
+        switch ($this->peek()) {
+            case '/': return $this->singleLineComment();
+            case '*': return $this->multipleLineComment();
+            default: return $get;
+        }
+    }
+}
+
+class JSMin_UnterminatedStringException extends Exception {}
+class JSMin_UnterminatedCommentException extends Exception {}
+class JSMin_UnterminatedRegExpException extends Exception {}
@@ -85,7 +85,8 @@ class MRCreateTickets implements IMondialRelayWSMethod
 			'Expe_CP'				=>  array(
 						'required'				=> true,
 						'value'						=> '',
-						'regexValidation' => '#^[0-9]{5}$#'),
+						'params'					=> array(),
+						'methodValidation' => 'checkZipcodeByCountry'),
 			'Expe_Pays'			=>  array(
 						'required'				=> true,
 						'value'						=> '',
@@ -129,7 +130,8 @@ class MRCreateTickets implements IMondialRelayWSMethod
 			'Dest_CP'				=>  array(
 						'required'				=> true,
 						'value'						=> '',
-						'regexValidation' => '#^[0-9]{5}$#'),
+						'params'					=> array(),
+						'methodValidation' => 'checkZipcodeByCountry'),
 			'Dest_Pays'			=>  array(
 						'required'				=> true,
 						'value'						=> '',
@@ -277,6 +279,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
 		$this->_fields['list']['Expe_Ad4']['value'] = Configuration::get('PS_SHOP_ADDR2');
 		$this->_fields['list']['Expe_Ville']['value'] = Configuration::get('PS_SHOP_CITY');
 		$this->_fields['list']['Expe_CP']['value'] = Configuration::get('PS_SHOP_CODE');
+		$this->_fields['list']['Expe_CP']['params']['id_country'] = Configuration::get('PS_COUNTRY_DEFAULT');
 		
 		if (_PS_VERSION_ >= '1.4')
 		$this->_fields['list']['Expe_Pays']['value'] = Country::getIsoById(Configuration::get('PS_SHOP_COUNTRY_ID'));
@@ -332,6 +335,7 @@ class MRCreateTickets implements IMondialRelayWSMethod
 				$tmp['Dest_Ad3']['value'] = $deliveriesAddress->address1;
 				$tmp['Dest_Ville']['value'] = $deliveriesAddress->city;
 				$tmp['Dest_CP']['value'] = $deliveriesAddress->postcode;
+				$tmp['Dest_CP']['params']['id_country'] = $deliveriesAddress->id_country;
 				$tmp['Dest_Pays']['value'] = $destIsoCode;
 				$tmp['Dest_Tel1']['value'] = $deliveriesAddress->phone;
 				$tmp['Dest_Tel2']['value'] = $deliveriesAddress->phone_mobile;
@@ -369,9 +373,18 @@ class MRCreateTickets implements IMondialRelayWSMethod
 			foreach($rootCase['list'] as $paramName => &$valueDetailed)
 				if ($paramName != 'Texte' && $paramName != 'Security')
 				{
-					$valueDetailed['value'] = strtoupper(MRManagement::replaceAccentedCharacters($valueDetailed['value']));
-					if (preg_match($valueDetailed['regexValidation'], $valueDetailed['value'], $matches))
+					$valueDetailed['value'] = strtoupper(MRTools::replaceAccentedCharacters($valueDetailed['value']));
+					// Call a pointer function if exist to do different test
+					if (isset($valueDetailed['methodValidation']) &&
+							method_exists('MRTools', $valueDetailed['methodValidation']) && 
+							isset($valueDetailed['params']) && 
+							MRTools::$valueDetailed['methodValidation']($valueDetailed['value'], $valueDetailed['params']))
 						$concatenationValue .= $valueDetailed['value'];
+					// Use simple Regex test given by MondialRelay
+					else if (isset($valueDetailed['regexValidation']) &&
+							preg_match($valueDetailed['regexValidation'], $valueDetailed['value'], $matches))
+						$concatenationValue .= $valueDetailed['value'];
+					// If the key is required, we set an error, else it's skipped 
 					else if ((!strlen($valueDetailed['value']) && $valueDetailed['required']) || strlen($valueDetailed['value']))
 					{
 						if (empty($valueDetailed['value']))
@@ -0,0 +1,238 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 7086 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+/*
+ * Interface
+ */
+require_once(dirname(__FILE__).'/IMondialRelayWSMethod.php');
+
+/*
+ * Allow to fetch relay point - 'WSI2_RecherchePointRelais'
+ */
+class MRGetRelayPoint implements IMondialRelayWSMethod
+{
+	// Params is required if you use a pointer function
+	private $_fields = array(
+		'list' => array(
+			'Enseigne'			=> array(
+						'required'				=> true,
+						'value'						=> '',
+						'regexValidation' => '#^[0-9A-Z]{2}[0-9A-Z ]{6}$#'),
+			'Pays'					=> array(
+						'required'				=> true,
+						'value'						=> '',
+						'regexValidation' => '#^[A-Z]{2}$#'),
+			'Ville'					=> array(
+						'required'				=> false,
+						'value'						=> '',
+						'regexValidation' => '#^[A-Z_\-\' ]{2,25}$#'),
+			'CP'						=> array(
+						'required'				=> false,
+						'value'						=> '',
+						'params'					=> array(),
+						'methodValidation' => 'checkZipcodeByCountry'),
+			'Taille'				=> array(
+						'required'				=> false,
+						'value'						=> '',
+						'regexValidation' => '#^(XS|S|M|L|XL|XXL|3XL)$#'),
+			'Poids'					=> array(
+						'required'				=> false,
+						'value'						=> '',
+						'regexValidation' => '#^[0-9]{1,6}$#'),
+			'Action'				=> array(
+						'required'				=> false,
+						'value'						=> '',
+						'regexValidation' => '#^(REL|24R|ESP|DRI)$#'),			
+			'Security'			=> array(
+						'required'				=> true,
+						'value'						=> '',
+						'regexValidation' => '#^[0-9A-Z]{32}$#')));
+	
+	private $_id_address_delivery = 0;
+	private $_weight = 0;
+	private $_webServiceKey = '';
+	private $_mondialRelay = NULL;
+	private $_id_carrier = 0;
+	private $_id_delivery_country = 0;
+	
+	private $_resultList = array(
+		'error' => array(),
+		'success' => array());
+	
+	private $_webserviceURL = 'http://www.mondialrelay.fr/webservice/Web_Services.asmx?WSDL';
+	
+	public function __construct($params)	
+	{	
+		$this->_id_address_delivery = (int)($params['id_address_delivery']);
+		$this->_id_carrier = (int)($params['id_carrier']);
+		$this->_weight = (float)($params['weight']);	
+		$this->_webServiceKey = Configuration::get('MR_KEY_WEBSERVICE');
+	}
+	
+	public function __destruct()
+	{
+		 unset($this->_mondialRelay);
+	}
+	
+	public function init()
+	{	
+		$this->_mondialRelay = new MondialRelay();
+		$address = new Address($this->_id_address_delivery);
+		
+		if (!$address)
+			throw new Exception($this->_mondialrelay->l('Customer address can\'t be found'));
+		
+		$this->_fields['list']['Enseigne']['value'] = Configuration::get('MR_ENSEIGNE_WEBSERVICE');
+		$this->_fields['list']['Poids']['value'] = Configuration::get('MR_WEIGHT_COEF') * $this->_weight;
+		$this->_fields['list']['Pays']['value'] = Country::getIsoById($address->id_country);
+		$this->_fields['list']['Ville']['value'] = $address->city;
+		$this->_fields['list']['CP']['value'] = $address->postcode;
+		$this->_fields['list']['CP']['params']['id_country'] = $address->id_country;
+		
+		$this->_generateMD5SecurityKey();
+		unset($address);
+	}
+	
+	/*
+	 * Generate the MD5 key for each param list
+	 */
+	private function _generateMD5SecurityKey()
+	{
+		$concatenationValue = '';
+		foreach($this->_fields['list'] as $paramName => &$valueDetailed)
+			if ($paramName != 'Texte' && $paramName != 'Security')
+			{
+				$valueDetailed['value'] = strtoupper($valueDetailed['value']);
+				// Call a pointer function if exist to do different test
+				if (isset($valueDetailed['methodValidation']) &&
+						method_exists('MRTools', $valueDetailed['methodValidation']) && 
+						isset($valueDetailed['params']) && 
+						MRTools::$valueDetailed['methodValidation']($valueDetailed['value'], $valueDetailed['params']))
+					$concatenationValue .= $valueDetailed['value'];
+				// Use simple Regex test given by MondialRelay
+				else if (isset($valueDetailed['regexValidation']) &&
+						preg_match($valueDetailed['regexValidation'], $valueDetailed['value'], $matches))
+					$concatenationValue .= $valueDetailed['value'];
+				// If the key is required, we set an error, else it's skipped 
+				else if ((!strlen($valueDetailed['value']) && $valueDetailed['required']) || strlen($valueDetailed['value']))
+				{
+					$error = $this->_mondialRelay->l('This key').' ['.$paramName.'] '.
+						$this->_mondialRelay->l('hasn\'t a valide value format').' : '.$valueDetailed['value'];
+					$this->_resultList['error'][] = $error;
+				}
+			}
+			$concatenationValue .= $this->_webServiceKey;
+			$this->_fields['list']['Security']['value'	] = strtoupper(md5($concatenationValue));	
+	}
+
+	/*
+	 * Get the values with associated fields name
+	 * @fields : array containing multiple values information
+	 */
+	private function _getSimpleParamArray($fields)
+	{
+		$params = array();
+		
+		foreach($fields as $keyName => $valueDetailed)
+			$params[$keyName] = $valueDetailed['value'];
+		return $params;
+	}
+	
+	/*
+	 * Manage the return value of the webservice, handle the errors or build the
+	 * succeed message
+	 */
+	private function _parseResult($client, $result, $params)
+	{
+		$errors = array();
+		$success = array();
+		
+		if ($client->fault)
+			$errors[$errorTotal++] = $this->_mondialRelay->l('It seems the request isn\'t valid:').
+				$result;
+		
+		$result = $result['WSI2_RecherchePointRelaisResult'];
+		if (($errorNumber = $result['STAT']) != 0)
+		{
+			$errors[] = $this->_mondialRelay->l('There is an error number : ').$errorNumber;
+			$errors[] = $this->_mondialRelay->l('Details : ').
+			$this->_mondialRelay->getErrorCodeDetail($errorNumber);
+		}
+		else
+		{
+			unset($result['STAT']);
+			
+			// Clean Content
+			foreach($result as &$relayPoint)
+				foreach ($relayPoint as $key => &$value)
+ 					$value = trim($value);
+			$success = $result;
+		}
+		$this->_resultList['error'] = $errors;
+		$this->_resultList['success'] = $success;
+	}
+	
+	/*
+	* Send one or multiple request to the webservice
+	*/
+	public function send()
+	{
+		if ($client = new nusoap_client($this->_webserviceURL, true))
+		{
+			$client->soap_defencoding = 'UTF-8';
+			$client->decode_utf8 = false;
+			
+			$params = $this->_getSimpleParamArray($this->_fields['list']);
+			$result = $client->call(
+				'WSI2_RecherchePointRelais', 
+				$params, 
+				'http://www.mondialrelay.fr/webservice/', 
+				'http://www.mondialrelay.fr/webservice/WSI2_RecherchePointRelais');
+				
+			$this->_parseResult($client, $result, $params);
+			unset($client);
+		}
+		else
+			throw new Exception($this->_mondialRelay->l('The Mondial Relay webservice isn\'t currently reliable'));
+	}
+	
+	/*
+	 * Get the values with associated fields name
+	 */
+	public function getFieldsList()
+	{
+		return $this->_fieldsList['list'];
+	}
+	
+	/*
+	 * Get the result of one or multiple send request
+	 */
+	public function getResult()
+	{
+		return $this->_resultList;
+	}
+}
@@ -56,7 +56,6 @@ class MRGetTickets implements IMondialRelayWSMethod
 	
 	private $_detailedExpeditionList = array();
 	private $_webServiceKey = '';
-	private $_markCode = '';
 	private $_mondialRelay = NULL;
 	
 	private $_resultList = array(
@@ -69,7 +68,6 @@ class MRGetTickets implements IMondialRelayWSMethod
 	{
 		$this->_detailedExpeditionList = $params['detailedExpeditionList'];
 		$this->_webServiceKey = Configuration::get('MR_KEY_WEBSERVICE');
-		$this->_markCode = Configuration::get('MR_CODE_MARQUE');
 	}
 	
 	public function __destruct()
@@ -47,22 +47,85 @@ class MRManagement extends MondialRelay
 		
 	}
 	
-	public static function replaceAccentedCharacters($string)
-	{
-		$currentLocale = setlocale(LC_ALL, NULL);
-		setlocale(LC_ALL, 'en_US.UTF8');
-		$cleanedString = iconv('UTF-8','ASCII//TRANSLIT', $string);
-		setLocale(LC_ALL, $currentLocale);
-		return $cleanedString;
-	}
-	
 	/*
-	** Retro compatibility for 1.3
 	** This method fill the database with the selected carrier
 	*/
 	public function addSelectedCarrierToDB()
 	{
-		$this->hookProcessCarrier($this->_params, false);
+		$query = 'SELECT `id_mr_selected`
+					FROM `' . _DB_PREFIX_ . 'mr_selected`
+					WHERE `id_cart` = '.(int)$this->_params['id_cart'];
+		
+		// Update if Exist else add a new entry	
+		if (Db::getInstance()->getRow($query))
+		{
+			$query = 'UPDATE `'._DB_PREFIX_.'mr_selected` 
+				SET `id_method` = '.(int)$this->_params['id_mr_method'].', ';
+			if (is_array($this->_params['relayPointInfo']))
+				foreach($this->_params['relayPointInfo'] as $nameKey => $value)
+					$query .= '`MR_Selected_'.$nameKey.'` = "'.$value.'", ';
+			else // Clean the existing relay point data
+				$query .= '
+					MR_Selected_Num = NULL,
+					MR_Selected_LgAdr1 = NULL, 
+					MR_Selected_LgAdr2 = NULL,
+					MR_Selected_LgAdr3 = NULL,
+					MR_Selected_LgAdr4 = NULL,
+					MR_Selected_CP = NULL,
+					MR_Selected_Pays = NULL,
+					MR_Selected_Ville = NULL, ';
+			$query = rtrim($query, ', ').' WHERE `id_cart` = '.(int)$this->_params['id_cart'];
+	}
+		else
+		{
+			$query = 'INSERT INTO `' . _DB_PREFIX_ . 'mr_selected`
+				(`id_customer`, `id_method`, `id_cart`, ';
+			if (is_array($this->_params['relayPointInfo']))
+				foreach($this->_params['relayPointInfo'] as $nameKey => $value)
+					$query .= '`MR_Selected_'.$nameKey.'`, ';
+			$query = rtrim($query, ', ').') VALUES (
+					'.$this->_params['id_customer'].',
+					'.$this->_params['id_mr_method'].',
+					'.$this->_params['id_cart'].', ';
+			if (is_array($this->_params['relayPointInfo']))
+				foreach($this->_params['relayPointInfo'] as $nameKey => $value)
+					$query .= '"'.$value.'", ';
+			$query = rtrim($query, ', ').')';
+		}
+		Db::getInstance()->Execute($query);
+	}
+
+	public function uninstallDetail()
+	{
+		$html = '';
+		
+		switch($this->_params['action'])
+		{
+			case 'showFancy':
+				$html .= '
+					<div id="PS_MRAskBackupContent">
+						<h2>'.$this->l('Uninstalling Mondial Relay').'</h2>
+						<div>
+							'.$this->l('You\'re attempt to uninstall the module, do you want to remove the database').' ?
+							<p id="PS_MRUninstallListSelection">
+									<input type="button" id="PS_MR_BackupAction" href="javascript:void(0)" value="'.$this->l('Keep it and uninstall').'"/>
+									<br />
+									<input type="button" id="PS_MR_UninstallAction" href="javascript:void(0)" value="'.$this->l('Remove and uninstall').'" />
+									<br />
+									<input type="button" id="PS_MR_StopUninstall" href="javascript:void(0)" value="'.$this->l('Cancel').'" />
+									<br />
+							</p>
+						</div>
+					</div>
+				';
+				$this->_resultList['html'] = $html;		
+				break;
+			case 'backupAndUninstall':
+				
+				break;
+			default:
+		}
+		return $this->_resultList;
 	}

 	public function DeleteHistory()
@@ -0,0 +1,67 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 6839 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+/*
+** Some tools using used in the module
+*/
+class MRTools
+{
+	static public function replaceAccentedCharacters($string)
+	{
+		$currentLocale = setlocale(LC_ALL, NULL);
+		setlocale(LC_ALL, 'en_US.UTF8');
+		$cleanedString = iconv('UTF-8','ASCII//TRANSLIT', $string);
+		setLocale(LC_ALL, $currentLocale);
+		return $cleanedString;
+	}
+	
+	static public function checkZipcodeByCountry($zipcode, $params)
+	{
+		$id_country = $params['id_country'];
+		
+		$zipcodeFormat = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+				SELECT `zip_code_format`
+				FROM `'._DB_PREFIX_.'country`
+				WHERE `id_country` = '.(int)$id_country);
+
+		if (!$zipcodeFormat)
+			return false;
+
+		$regxMask = str_replace(
+				array('N', 'C', 'L'),
+				array(
+					'[0-9]',
+					Country::getIsoById((int)$id_country),
+					'[a-zA-Z]'),
+				$zipcodeFormat);
+		if (preg_match('/'.$regxMask.'/', $zipcode))
+			return true;
+		return false;
+	}
+}
+
+?>
@@ -2,7 +2,7 @@
 <module>
 	<name>mondialrelay</name>
 	<displayName><![CDATA[Mondial Relay]]></displayName>
-	<version><![CDATA[1.6]]></version>
+	<version><![CDATA[1.7]]></version>
 	<description><![CDATA[Deliver in Relay points]]></description>
 	<author><![CDATA[]]></author>
 	<tab><![CDATA[shipping_logistics]]></tab>
@@ -45,7 +45,7 @@ $params = array(
 'Langue' => 'FR'
 );

-require_once('kit_mondialrelay/tools/nusoap/lib/nusoap.php');
+require_once(dirname(__FILE__).'/lib/nusoap/lib/nusoap.php');
 $client_mr = new nusoap_client("http://www.mondialrelay.fr/webservice/Web_Services.asmx?WSDL", true);
 $client_mr->soap_defencoding = 'UTF-8';
 $client_mr->decode_utf8 = false;
@@ -90,11 +90,6 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_0dbe844fb964d5eca2f51be724e4329
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c6aefd5e2191e1210a2f50416812b517'] = 'Follow-up-URL';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_61e70b58e38fd01daa254f44c4fa264b'] = 'Nb Abholpunkt:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_bba366864d25056c941b72f18ef79e7c'] = 'Dieser Fehler ist nicht bekannt :';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_2f84f9d5731852c4d07d52ef0badc42e'] = 'Problem beim Lesen der Adressen aus MondialRelay Webservice: Mondial Relay-Server kann abgeschaltet sein';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_016854c68c7122b18d89ff0f5e40502b'] = 'Es gibt keinen Relay Point in der Nähe Ihre eingegebenen Adresse. Ändern Sie die Adresse, oder wählen Sie eine andere Versandmethode';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_21034ae6d01a83e702839a72ba8a77b0'] = '(zzgl. MwSt.).';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_1f87346a16cf80c372065de3c54c86d9'] = '(Inkl. Mwst.)';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_e7a6ca4e744870d455a57b644f696457'] = 'Kostenlos!';
 $_MODULE['<{mondialrelay}prestashop>orderdetail_81b7b4587a2a3ea7a0d6bb1df3fbba54'] = 'Lieferung nach';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_a1c3470a944b9625cfb924fd15c8bdbf'] = 'Bitte mindestens eine Bestellung auswählen';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_e6940b76f045c8bc0aaaa5b2476cdaf7'] = 'Die Anfrage scheint ungültig zu sein';
@@ -109,11 +109,6 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_0dbe844fb964d5eca2f51be724e4329
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c6aefd5e2191e1210a2f50416812b517'] = 'URL de los seguimientos';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_61e70b58e38fd01daa254f44c4fa264b'] = 'Número de puntos recogida';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_bba366864d25056c941b72f18ef79e7c'] = 'Este error no se conoce:';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_2f84f9d5731852c4d07d52ef0badc42e'] = 'Problemas para obtener las direcciones de servicio web MondialRelay: los servidores de Mondial Relay pueden estar fuera de servicio';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_016854c68c7122b18d89ff0f5e40502b'] = 'No hay Punto de entrega cerca de su domicilio, por favor cambie su dirección o utilice otro modo de transporte';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_21034ae6d01a83e702839a72ba8a77b0'] = '(sin IVA)';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_1f87346a16cf80c372065de3c54c86d9'] = '(IVA incluido)';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_e7a6ca4e744870d455a57b644f696457'] = '¡Gratis!';
 $_MODULE['<{mondialrelay}prestashop>orderdetail_81b7b4587a2a3ea7a0d6bb1df3fbba54'] = 'Entregado a';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_a1c3470a944b9625cfb924fd15c8bdbf'] = 'Por favor, seleccione al menos un pedido';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_dc41aac14af17f1d19fca5e3b9439e74'] = 'La clave';
@@ -109,11 +109,6 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_0dbe844fb964d5eca2f51be724e4329
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c6aefd5e2191e1210a2f50416812b517'] = 'URL du suivi';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_61e70b58e38fd01daa254f44c4fa264b'] = 'Nombre de Points Relais';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_bba366864d25056c941b72f18ef79e7c'] = 'Cette erreur n\'est pas mentionnée:';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_2f84f9d5731852c4d07d52ef0badc42e'] = 'Mondial Relay est inaccessible';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_016854c68c7122b18d89ff0f5e40502b'] = 'Il n\'y a pas de point relais à proximité de votre adresse, veuillez changer votre adresse ou utiliser un autre transporteur';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_21034ae6d01a83e702839a72ba8a77b0'] = 'HT';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_1f87346a16cf80c372065de3c54c86d9'] = 'TTC';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_e7a6ca4e744870d455a57b644f696457'] = 'Gratuit !';
 $_MODULE['<{mondialrelay}prestashop>orderdetail_81b7b4587a2a3ea7a0d6bb1df3fbba54'] = 'Livraison à';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_a1c3470a944b9625cfb924fd15c8bdbf'] = 'Veuillez choisir au moins une commande';
 $_MODULE['<{mondialrelay}prestashop>mrcreatetickets_dc41aac14af17f1d19fca5e3b9439e74'] = 'Cette clé';
@@ -1,120 +0,0 @@
-<?php
-	require_once(dirname(__FILE__).'/../../config/config.inc.php');
-	require_once(dirname(__FILE__).'/../../init.php');
-	require_once(dirname(__FILE__).'/mondialrelay.php');
-	
-	MondialRelay::initModuleAccess();
-	echo '<script type="text/javascript" src="'.MondialRelay::$moduleURL.'jquery-1.4.4.min.js"></script>';
- ?>
-
-<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=true"></script>
-<script type="text/javascript">
-
-var geocoder;
-var map;
-var infowindow = new google.maps.InfoWindow();
-var markers = [];
-var json_addresses = null;
-
-function google_map_init() {
-	geocoder = new google.maps.Geocoder();
-	var latlng = new google.maps.LatLng(-34.397, 150.644);
-	var myOptions = {
-	  zoom: 11,
-	  center: latlng,
-	  mapTypeId: google.maps.MapTypeId.ROADMAP
-	};
-	map = new google.maps.Map(document.getElementById("map"), myOptions);
-	
-	geocoder.geocode( {'address': "<?php echo $_GET['address']; ?>"}, function(results, status)
-	{
-	  if (status == google.maps.GeocoderStatus.OK)
-	  {
-		map.setCenter(results[0].geometry.location);
-		var marker = new google.maps.Marker({
-			map: map, 
-			position: results[0].geometry.location
-		});
-		google.maps.event.addListener(marker, 'click', function() {
-			infowindow.setContent("<?php echo $_GET['address']; ?>");
-			infowindow.open(map,marker);
-		});
-	  }
-	});
-}
-
-function codeAddress(address, address_google)
-{
-	geocoder.geocode( {'address': address_google}, function(results, status)
-	{
- 		 if (status == google.maps.GeocoderStatus.OK)
-		 {
-		 	var image = new google.maps.MarkerImage('<?php echo $_GET['relativ_base_dir']; ?>modules/mondialrelay/kit_mondialrelay/marker.gif');
-			var marker = new google.maps.Marker({
-				map: map, 
-				position: results[0].geometry.location,
-				icon : image
-			});
-			google.maps.event.addListener(marker, 'click', function() {
-				infowindow.setContent('<img src="<?php echo $_GET['relativ_base_dir']; ?>modules/mondialrelay/kit_mondialrelay/MR_small.gif" />' + ' ' + address);
-				infowindow.open(map,marker);
-			});
-		}
-	});
-			
-}
-
-function recherche_MR(args)
-{
-	var ok = 1;
-	if (ok == 1)
-	{
-		$.ajax({
-			type: "POST",
-			url: 'kit_mondialrelay/RecherchePointRelais_ajax.php',
-			data: args ,
-			dataType: 'json',
-			async : false,
-			success: function(obj) {
-				json_addresses = obj;
-			},
-			error: function(XMLHttpRequest, textStatus, errorThrown) {}
-		});
-	}
-	else
-	{
-		alert('Formulaire incomplet');
-		return false;
-	}
-}
-
-</script>
-
-<div id="map" style="height:300px; width:500px; border:1px;" ></div>
-
-<?php 
-	echo '<script type="text/javascript">
-
-	$(document).ready(function ()
-	{
-	recherche_MR(\'relativ_base_dir='.$_GET['relativ_base_dir'].'&Pays='.$_GET['Pays'].'&Ville='.$_GET['Ville'].'&CP='.$_GET['CP'].'&Taille=&Poids='.$_GET['Poids'].'&Action='.$_GET['Action'].'&num='.$_GET['num'].'\');
-
-	window.onload = function()
-		{
-			var cpt = 0;
-			google_map_init();
-			if (json_addresses && json_addresses.addresses)
-				while (json_addresses.addresses[cpt])
-				{
-					if (json_addresses.addresses[cpt].address3.length)
-					{
-						address_google = json_addresses.addresses[cpt].address3+\' \'+json_addresses.addresses[cpt].postcode+\' \'+json_addresses.addresses[cpt].city+\' \'+json_addresses.addresses[cpt].iso_country;
-						address = json_addresses.addresses[cpt].address1+\'<br />\'+json_addresses.addresses[cpt].address2+\' \'+json_addresses.addresses[cpt].address3+\'<br />\'+json_addresses.addresses[cpt].postcode+\' \'+json_addresses.addresses[cpt].city+\' \'+json_addresses.addresses[cpt].iso_country;
-						codeAddress(address, address_google);
-					}
-						cpt++;
-				}
-		}
-	});
-</script>';
-?>
@@ -2,11 +2,6 @@

 global $_MODULE;
 $_MODULE = array();
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_2f84f9d5731852c4d07d52ef0badc42e'] = 'Problema per ottenere gli indirizzi da MondialRelay Webservice: i server di Mondial Relay potrebbero essere inattivi';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_016854c68c7122b18d89ff0f5e40502b'] = 'Il Relay Point non è vicino al tuo indirizzo, per favore cambia il tuo indirizzo o utilizza un altro corriere';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_21034ae6d01a83e702839a72ba8a77b0'] = '(Tasse escl.)';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_1f87346a16cf80c372065de3c54c86d9'] = '(Tasse incl.)';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_e7a6ca4e744870d455a57b644f696457'] = 'Gratis!';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_44585fcd617dce6416d8283b026714c1'] = 'Mondial Relay';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_ed4a3b96dc1f38c160775cac1f7bcd6d'] = 'Consegna nei punti Relay';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_70d70ce314f545b7c500a086f147f64b'] = 'Negozio non valido';
@@ -33,7 +28,6 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_b962d8fb95f5a439f50502152f3bad7
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_faf1247ae6846a9955a466d4f301bbe4'] = 'Pagina corriere';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_10d78806b84b97ebc774e9f6277af6ac'] = 'Per generare le etichette, è necessario disporre di un indirizzo valido e registrato per il tuo negozio sulla tua ';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_af5efea250326c1c34d69aa9364b482c'] = 'pagina contatti';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_ddcd6a653f661fd7d219d9102528b917'] = 'Vai al front office';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_fcf5b2122da1d5a5f5c7253b96a3f9d9'] = 'URL Cron task:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_362dff77f7403550e886db901404856c'] = 'Cancellazione riuscita';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_66661dacf33146201b60dc16520ddd68'] = 'Aggiungere un metodo di spedizione';
@@ -62,6 +56,7 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_907eba32d950bfab68227fd7ea22999
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_0c24ec05a02c710cedd400e3680d8b81'] = 'Elenco metodo di spedizione ';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_14039af96b01e718a9c9d9c1259b6472'] = 'Nessun metodo di spedizione creato';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_8596361cec00f8d2438d264827eee737'] = 'Config di spedizione.';
+$_MODULE['<{mondialrelay}prestashop>mondialrelay_c9cc8cce247e49bae79f15173ce97354'] = 'Salva';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_f4f70727dc34561dfde1a3c529b6205c'] = 'Impostazioni';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_d02bbc3cb147c272b0445ac5ca7d1a36'] = 'Stato ordine';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_818f954f4838ecad839c5dcbd287d291'] = 'Scegli lo stato dell\'ordine per le etichette. È possibile gestire le etichette';
@@ -72,7 +67,6 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_93cba07454f06a4a960172bbd6e2a43
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_b9f5c797ebbf55adccdd8539a65a0241'] = 'Disattivato';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_bafd7322c6e97d25b6299b5d6fe8920b'] = 'No';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_9c5c09beb32c36129b857c2a40c861b6'] = 'Visualizza una mappa di Google sul tuo operatore Mondial Relay, può rallentare il caricamento della pagina del corriere  ';
-$_MODULE['<{mondialrelay}prestashop>mondialrelay_c9cc8cce247e49bae79f15173ce97354'] = 'Salva';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_1ba3935c9858ffb8e19a35ca640b8505'] = 'Impostazioni account Mondial Relay';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_12a3fbd35c1cab4b1101b91d708efd15'] = 'Insegna WebService:';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_6f0434b67007b555dfd1201f4e0d5254'] = 'Codice marchio:';
@@ -86,5 +80,3 @@ $_MODULE['<{mondialrelay}prestashop>mondialrelay_0dbe844fb964d5eca2f51be724e4329
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_c6aefd5e2191e1210a2f50416812b517'] = 'Follow-up URL';
 $_MODULE['<{mondialrelay}prestashop>mondialrelay_61e70b58e38fd01daa254f44c4fa264b'] = 'N. Point Relay:';
 $_MODULE['<{mondialrelay}prestashop>orderdetail_81b7b4587a2a3ea7a0d6bb1df3fbba54'] = 'Consegna a';
-
-?>
@@ -1,151 +0,0 @@
-<?php 
-include(dirname(__FILE__).'/../../../config/config.inc.php');
-include(dirname(__FILE__).'/../mondialrelay.php');
-
-$mondialrelay = new mondialrelay();
-
-DEFINE('_Enseigne_webservice', Configuration::get('MR_ENSEIGNE_WEBSERVICE'));
-DEFINE('_Key_webservice', Configuration::get('MR_KEY_WEBSERVICE'));
-
-header('Content-Type: text/html; charset=utf-8');
-
-$relativ_base_dir=$_POST['relativ_base_dir'];
-$client_Num=$_POST['Num'];
-$client_Pays=$_POST['Pays'];
-$num=$_POST['num_mode'];
-
-
-function mr_horaire_fr($o1,$f1,$o2,$f2)
-{
-$mondialrelay = new mondialrelay();
-
-if ($o1=='' || $o1==null) {$o1='0000';};
-if ($f1=='' || $f1==null) {$f1='0000';};
-if ($o2=='' || $o2==null) {$o2='0000';};
-if ($f2=='' || $f2==null) {$f2='0000';};
-$o1=substr($o1, 0, 2).':'.substr($o1, 2, 2);
-$f1=substr($f1, 0, 2).':'.substr($f1, 2, 2);
-$o2=substr($o2, 0, 2).':'.substr($o2, 2, 2);
-$f2=substr($f2, 0, 2).':'.substr($f2, 2, 2);
-if ($o1=='00:00' && $f1=='00:00') {$p1=$mondialrelay->l('Closed');} else {$p1=$o1.' - '.$f1;};
-if ($o2=='00:00' && $f2=='00:00') {$p2=$mondialrelay->l('Closed');} else {$p2=$o2.' - '.$f2;};
-if ($p1=='Fermé' && $p2=='Fermé' ) {$p=$mondialrelay->l('Closed');} else {$p=$p1.'&nbsp;&nbsp;'.$p2;};
-return utf8_encode($p);
-};
-
-
-
-
-
-$k_security=strtoupper(md5(_Enseigne_webservice.$client_Num.$client_Pays._Key_webservice));
-
-require_once('tools/nusoap/lib/nusoap.php');
-$client_mr = new nusoap_client("http://www.mondialrelay.fr/webservice/Web_Services.asmx?WSDL",true);
-
-$client_mr->soap_defencoding = 'UTF-8';
-$client_mr->decode_utf8 = false;
-
-$params = array(
-'Enseigne' => _Enseigne_webservice,
-'Num' => $client_Num,
-'Pays' => $client_Pays,
-'Security' => $k_security,
-); 
-
-
-
-
-$result_mr = $client_mr->call('WSI2_DetailPointRelais', $params, 'http://www.mondialrelay.fr/webservice/', 'http://www.mondialrelay.fr/webservice/WSI2_DetailPointRelais');
-if ($client_mr->fault)
-{
-echo 'a|<h2>Fault (Expect - The request contains an invalid SOAP body)</h2><pre>';
-print_r($result);
-echo '</pre>|'.$num;
-} else
-{
-$err = $client_mr->getError();
-if ($err) { echo 'a|<h2>Error</h2><pre>' . $err . '</pre>|'.$num; }
-else
-{
-$sortie_titre="";
-$sortie_loc="";
-$sortie_info="";
-$sortie_photo="";
-$sortie_plan="";
-$sortie_horaires="";
-echo $result_mr['WSI2_DetailPointRelaisResult']['STAT'].'|';
-
-
-$sortie_horaires.="<tr>";
-$sortie_horaires.="<td>".$mondialrelay->l('Monday')."</td>";
-$sortie_horaires.="<td>".mr_horaire_fr($result_mr['WSI2_DetailPointRelaisResult']['Horaires_Lundi']['string'][0],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Lundi']['string'][1],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Lundi']['string'][2],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Lundi']['string'][3])."</td>";
-$sortie_horaires.="</tr>";
-$sortie_horaires.="<tr>";
-$sortie_horaires.="<td>".$mondialrelay->l('Tuesday')."</td>";
-$sortie_horaires.="<td>".mr_horaire_fr($result_mr['WSI2_DetailPointRelaisResult']['Horaires_Mardi']['string'][0],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Mardi']['string'][1],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Mardi']['string'][2],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Mardi']['string'][3])."</td>";
-$sortie_horaires.="</tr>";
-$sortie_horaires.="<tr>";
-$sortie_horaires.="<td>".$mondialrelay->l('Wednesday')."</td>";
-$sortie_horaires.="<td>".mr_horaire_fr($result_mr['WSI2_DetailPointRelaisResult']['Horaires_Mercredi']['string'][0],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Mercredi']['string'][1],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Mercredi']['string'][2],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Mercredi']['string'][3])."</td>";
-$sortie_horaires.="</tr>";
-$sortie_horaires.="<td>".$mondialrelay->l('Thursday')."</td>";
-$sortie_horaires.="<td>".mr_horaire_fr($result_mr['WSI2_DetailPointRelaisResult']['Horaires_Jeudi']['string'][0],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Jeudi']['string'][1],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Jeudi']['string'][2],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Jeudi']['string'][3])."</td>";
-$sortie_horaires.="</tr>";
-$sortie_horaires.="<td>".$mondialrelay->l('Friday')."</td>";
-$sortie_horaires.="<td>".mr_horaire_fr($result_mr['WSI2_DetailPointRelaisResult']['Horaires_Vendredi']['string'][0],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Vendredi']['string'][1],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Vendredi']['string'][2],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Vendredi']['string'][3])."</td>";
-$sortie_horaires.="</tr>";
-$sortie_horaires.="<td>".$mondialrelay->l('Saturday')."</td>";
-$sortie_horaires.="<td>".mr_horaire_fr($result_mr['WSI2_DetailPointRelaisResult']['Horaires_Samedi']['string'][0],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Samedi']['string'][1],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Samedi']['string'][2],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Samedi']['string'][3])."</td>";
-$sortie_horaires.="</tr>";
-$sortie_horaires.="<td>".$mondialrelay->l('Sunday')."</td>";
-$sortie_horaires.="<td>".mr_horaire_fr($result_mr['WSI2_DetailPointRelaisResult']['Horaires_Dimanche']['string'][0],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Dimanche']['string'][1],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Dimanche']['string'][2],$result_mr['WSI2_DetailPointRelaisResult']['Horaires_Dimanche']['string'][3])."</td>";
-$sortie_horaires.="</tr>";
-
-$sortie_horaires="<table border=0>".$sortie_horaires."</table>";
-
-
-$sortie_titre.="<strong>".$result_mr['WSI2_DetailPointRelaisResult']['LgAdr1']."</strong>";
-if ($result_mr['WSI2_DetailPointRelaisResult']['LgAdr2']!='') {$sortie_titre.="<br>".$result_mr['WSI2_DetailPointRelaisResult']['LgAdr2'];};
-if ($result_mr['WSI2_DetailPointRelaisResult']['LgAdr3']!='') {$sortie_titre.="<br>".$result_mr['WSI2_DetailPointRelaisResult']['LgAdr3'];};
-if ($result_mr['WSI2_DetailPointRelaisResult']['LgAdr4']!='') {$sortie_titre.="<br>".$result_mr['WSI2_DetailPointRelaisResult']['LgAdr4'];};
-if ($result_mr['WSI2_DetailPointRelaisResult']['CP']!='') {$sortie_titre.="<br>".$result_mr['WSI2_DetailPointRelaisResult']['CP'];};
-if ($result_mr['WSI2_DetailPointRelaisResult']['Ville']!='') {$sortie_titre.=" ".$result_mr['WSI2_DetailPointRelaisResult']['Ville'];};
-//if ($result_mr['WSI2_DetailPointRelaisResult']['Pays']!='') {$sortie_titre.=" - ".$result_mr['WSI2_DetailPointRelaisResult']['Pays'];};
-$sortie_titre="<p>".$sortie_titre."</p>";
-
-
-if ($result_mr['WSI2_DetailPointRelaisResult']['Localisation1']!='') {$sortie_loc.=$result_mr['WSI2_DetailPointRelaisResult']['Localisation1'];};
-if ($result_mr['WSI2_DetailPointRelaisResult']['Localisation2']!='') {$sortie_loc.="<br>".$result_mr['WSI2_DetailPointRelaisResult']['Localisation2'];};
-if ($sortie_loc!="") {$sortie_loc="<p>".$sortie_loc."</p>";}
-
-if ($result_mr['WSI2_DetailPointRelaisResult']['Information']!='') {$sortie_info="<p>".$result_mr['WSI2_DetailPointRelaisResult']['Information']."</p>";};
-
-
-if ($result_mr['WSI2_DetailPointRelaisResult']['URL_Photo']!='') {$sortie_photo="<img src=\"".$result_mr['WSI2_DetailPointRelaisResult']['URL_Photo']."\" width=\"306\" vspace=3 hspace=3>";};
-if ($result_mr['WSI2_DetailPointRelaisResult']['URL_Plan']!='') {$sortie_plan.="<iframe src=\"".$result_mr['WSI2_DetailPointRelaisResult']['URL_Plan']."\" width=\"394\" height=\"234\" border=\"0\"></iframe>";};
-$fermer="<a href=\"javascript:void(0)\" onclick=\"masque_recherche_MR_detail('".$num."');\"><img src=\"".$relativ_base_dir."modules/mondialrelay/kit_mondialrelay/close.gif\" border=\"0\" height=\"15\" align=\"right\"></a>";
-
-
-echo "<div style=\"width=740px;height:15px;\">".$fermer."</div>
-      <div style=\"width=716px;height:459px;padding:3px;overflow:auto;\">
-	  <table style='border:none;' width=100%>
-	  <tr style='border:none;'><td colspan=2 style='border:none;'><h1>Votre Point Relais</h1></td></tr>
-      <tr style='border:none;'>
-	    <td valign=top style='border:none;'>
-		<table style='border:none;' ><tr style='border:none;'><td style='border:none;'><img src=\"".$relativ_base_dir."modules/mondialrelay/kit_mondialrelay/MR.gif\" vspace=3 hspace=3></td><td style='border:none;'>".utf8_encode($sortie_titre.$sortie_loc.$sortie_info)."</td></tr></table><br>
-		".$sortie_plan."
-		</td>
-		
-		<td valign=top style='border:none;'>
-		".$sortie_horaires."<br>".$sortie_photo."
-		</td>
-	  </tr>
-      </table>
-	  <center><input name=\"select_MR_PR\" id=\"select_MR_PR\" value=\"".utf8_encode($mondialrelay->l('Select this Relay Point'))."\" type=\"button\" onclick=\"
-	  document.getElementById('MRchoixRelais".$num.'_'.$result_mr['WSI2_DetailPointRelaisResult']['Num']."').checked=true;select_PR_MR('".$result_mr['WSI2_DetailPointRelaisResult']['Num']."','".$num."');masque_recherche_MR_detail('".$num."');\"></center>
-      </div>|".$num;
-
-
-}
-}
-?>
@@ -1,101 +0,0 @@
-<?php 
-
-include(dirname(__FILE__).'/../../../config/config.inc.php');
-include(dirname(__FILE__).'/../../../init.php');
-include(dirname(__FILE__).'/../mondialrelay.php');
-include(dirname(__FILE__).'/../errorCode.php');
-
-global $cookie;
-
-$id_cart_address = Db::getInstance()->getValue('SELECT `MR_Selected_Num` FROM `'._DB_PREFIX_.'mr_selected` WHERE `id_cart` = '.$cookie->id_cart);
-
-$mondialrelay = new MondialRelay();
-
-DEFINE('_Enseigne_webservice', Configuration::get('MR_ENSEIGNE_WEBSERVICE'));
-DEFINE('_Key_webservice', Configuration::get('MR_KEY_WEBSERVICE'));
-
-header('Content-Type: text/html; charset=utf-8');
-
-$relativ_base_dir = $_POST['relativ_base_dir'];
-$client_pays_iso = $_POST['Pays'];
-$client_ville = $_POST['Ville'];
-$client_cp = $_POST['CP'];
-$card_taille = $_POST['Taille'];
-$card_weight = $_POST['Poids'];
-$client_type_exp = $_POST['Action'];
-$num = $_POST['num'];
-
-
-$k_security = strtoupper(md5(_Enseigne_webservice.$client_pays_iso.$client_ville.$client_cp.$card_taille.$card_weight.$client_type_exp._Key_webservice));
-
-require_once('tools/nusoap/lib/nusoap.php');
-$client_mr = new nusoap_client("http://www.mondialrelay.fr/webservice/Web_Services.asmx?WSDL", true);
-
-$client_mr->soap_defencoding = 'UTF-8';
-$client_mr->decode_utf8 = false;
-
-$params = array(
-'Enseigne' => _Enseigne_webservice,
-'Pays' => $client_pays_iso,
-'Ville' => $client_ville,
-'CP' => $client_cp,
-'Taille' => '',
-'Poids' => $card_weight,
-'Action' => $client_type_exp,
-'Security' => $k_security,
-); 
-
-$result_mr = $client_mr->call('WSI2_RecherchePointRelais', $params, 'http://www.mondialrelay.fr/webservice/', 'http://www.mondialrelay.fr/webservice/WSI2_RecherchePointRelais');
-if ($client_mr->fault)
-{
-	echo 'a|<h2>Fault (Expect - The request contains an invalid SOAP body)</h2><pre>';
-	print_r($result);
-	echo '</pre>|'.$num;
-}
-else
-{
-	$err = $client_mr->getError();
-	if ($err)
-		echo '{"error" : "'.$err.'"}';
-	else if (($code = $result_mr['WSI2_RecherchePointRelaisResult']['STAT']) != 0)
-		echo '{"statError": {"code": "'.$code.'", "msg": "'.
-		(array_key_exists($code, $statCode)) ? $statCode[$code] : 'Unknown error'.'}}';
-	else
-	{		
-		$tr = "";
-		echo '{';
-		for ($i = 1; $i <= 10; $i++)
-		{
-			//if ($i==1) {$checked="checked=\"checked\"" ;} else {$checked="";};
-			if($i < 10)
-				$l = '0'.$i;
-			else
-				$l = '10';
-			$numWSI2 = $result_mr['WSI2_RecherchePointRelaisResult']['PR'.$l]['Num'];
-		}
-		
-		echo '"base_dir" : "'.$relativ_base_dir.'", ';
-		echo '"addresses" : [';
-		$i = 0;
-		$total = count($result_mr['WSI2_RecherchePointRelaisResult'] );
-
-		foreach ($result_mr['WSI2_RecherchePointRelaisResult'] as $key => $val)
-		{
-			if ($key != 'STAT')
-			{
-				echo '{"address1" : "'.addslashes($val['LgAdr1']).'", 
-					"address2" : "'.addslashes($val['LgAdr2']).'", 
-					"address3" : "'.addslashes($val['LgAdr3']).'", 
-					"address4" : "'.addslashes($val['LgAdr4']).'", 
-					"postcode" : "'.addslashes($val['CP']).'", 
-					"city" : "'.addslashes($val['Ville']).'", 
-					"iso_country" : "'.addslashes($val['Pays']).'", 
-					"num" : "'.$val['Num'].'",
-					"checked" : '.($val['Num'] == $id_cart_address ? 1 : 0).'}'.(($i + 1) == $total ? '' : ', ');
-			}
-			++$i;
-		}
-		echo ']}';
-	}
-}
-?>
@@ -1,6 +0,0 @@
-<?php 
-require('config.MR.inc.php');
-header('Content-Type: text/html; charset=utf-8');
-$var_Expedition=$_POST['Expedition'];
-$k_security=strtoupper(md5('<'._Enseigne_webservice.'>'.$var_Expedition.'<'._Key_webservice.'>'));
-echo 'http://www.mondialrelay.fr/lg_fr/espaces/url/popup_exp_details.aspx?cmrq='._Enseigne_webservice.'&nexp='.$var_Expedition.'&crc='.$k_security;
@@ -1,36 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-				    	
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-						
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-						
-header("Location: ../");
-exit;
@@ -1,56 +0,0 @@
-var gl_base_dir;
-
-function set_html_MR_recherche(obj, num, base_dir, cpt)
-{
-gl_base_dir = base_dir;
-
-var html = '\
-	<div style=\'z-index:9998;cursor: wait;position:absolute; top:0; left:0; height:100%; width:100%;display:none;\
-		         background-color:#cccccc;-moz-opacity:0.8; opacity:0.8; filter:alpha(opacity=80); -khtml-opacity:0.8;\' id=\'bg_detail_md_'+num+'\'></div>\
-				 <div id=\'detail_md_'+num+'\' style=\'position: absolute; background-color:#ffffff; float:left; width:740px; height:480px; border:1px solid #89a; overflow:none; text-align:left; z-index:9999; display:none;\'></div>\
-				 <table style=\'border:none;\'>\
-	<tr style=\'border:none;\'>\
-	<td valign=top style=\'border:none;\'><img src="'+base_dir+'modules/mondialrelay/kit_mondialrelay/MR_small.gif"></td>\
-	<td valign=top style=\'border:none; width:500px;\'><strong><span id="MR_LgAdr1_'+obj.num+'">'+obj.address1+'</span></strong> - \
-<span id="MR_LgAdr2_'+obj.num+'">'+obj.address2+'</span>';
-if (obj.address2 != '')
-	html = html + ' - ';
-html = html + '<span id="MR_LgAdr3_'+obj.num+'">'+obj.address3+'</span>';
-if (obj.address3 != '')
-	html = html + ' - ';
-html = html + '<span id="MR_LgAdr4_'+obj.num+'">'+obj.address4+'</span>';
-if (obj.address4 != '')
-	html = html + ' - ';
-html = html + '<span id="MR_CP_'+obj.num+'">'+obj.postcode+'</span> \
-<span id="MR_Ville_'+obj.num+'">'+obj.city+'</span> - \
-<span id="MR_Pays_'+obj.num+'">'+obj.iso_country+'</span></td>\
-	<td valign=top style=\'border:none;\'><a href="#" onclick="recherche_MR_detail(\''+obj.num+'\',\''+obj.iso_country+'\',\''+num+'\'); return false;"><img src="'+base_dir+'modules/mondialrelay/kit_mondialrelay/loupe.gif" border="0"></a></td>\
-	<td valign=top style=\'border:none;\'><input  id="MRchoixRelais'+num+'_'+obj.num+'" name="MRchoixRelais_'+num+'" value="MR'+obj.num+'" onclick="select_PR_MR(\''+obj.num+'\',\''+num+'\')" type="radio"';
-	if (obj.checked == '1' || cpt == 0)
-		html = html + ' checked="checked" ';
-	
-	html = html + '> </td>\
-	</tr>\
-	</table>';
-	$('#mondialrelay_'+num).html($('#mondialrelay_'+num).html()+html);
-	if (obj.checked == '1' || cpt == 0)
-		select_PR_MR(obj.num, num);
-}
-
-function include_mondialrelay(num)
-{
-	$('#form_mondialrelay_'+num).html('\
-			<input id="MR_Selected_Num_'+num+'" name="MR_Selected_Num_'+num+'" type="hidden" >\
-			<input id="MR_Selected_LgAdr1_'+num+'" name="MR_Selected_LgAdr1_'+num+'" type="hidden" >\
-			<input id="MR_Selected_LgAdr2_'+num+'" name="MR_Selected_LgAdr2_'+num+'" type="hidden" >\
-			<input id="MR_Selected_LgAdr3_'+num+'" name="MR_Selected_LgAdr3_'+num+'" type="hidden" >\
-			<input id="MR_Selected_LgAdr4_'+num+'" name="MR_Selected_LgAdr4_'+num+'" type="hidden" >\
-			<input id="MR_Selected_CP_'+num+'" name="MR_Selected_CP_'+num+'" type="hidden" >\
-			<input id="MR_Selected_Ville_'+num+'" name="MR_Selected_Ville_'+num+'" type="hidden" >\
-			<input id="MR_Selected_Pays_'+num+'" name="MR_Selected_Pays_'+num+'" type="hidden" >\
-			\
-			\
-			<div id="recherche_MR_form_'+num+'" >\
-			</div>\
-			<div id="mondialprelay_'+num+'" style="padding:3px;"></div>');
-}
@@ -1,36 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-				    	
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-						
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-						
-header("Location: ../");
-exit;
@@ -1,344 +0,0 @@
-var relativ_base_dir = _PS_MR_MODULE_DIR_;
-var num_mode_actif = -1;
-
-img_loader = new Image;
-img_loader.src = _PS_MR_MODULE_DIR_+'images/loader.gif';
-
-var google_map_general = null;
-var geocoder = null;
-var recherche = 0;
-var json_addresses = null;
-
-function affiche_mydiv_mr(id_carrier, args)
-{
-	if ($('#id_carrier_mr' + id_carrier).attr("checked") == true)
-	{
-		if ($('#mondialrelay_' + id_carrier).css('display') == 'none')
-		{
-			$('#mondialrelay_' + id_carrier).toggle('slow');
-			$('#mondialrelay_' + id_carrier).show();
-			if ($('#mondialrelay_' + id_carrier).html() == '')
-				recherche_MR(id_carrier, args);
-			else
-				$("#all_mondialrelay_map_" + id_carrier).show();
-		}
-	}
-	else
-	{
-		if ($('#mondialrelay_' + id_carrier).css('display') == 'block')
-			$('#mondialrelay_' + id_carrier).toggle('slow');
-		$('#mondialrelay_' + id_carrier).hide();
-		$("#all_mondialrelay_map_" + id_carrier).hide();
-	}
-}
-
-function recherche_MR(num, args)
-{
-	$.ajax({
-		type: "POST",
-		url: _PS_MR_MODULE_DIR_ + 'kit_mondialrelay/RecherchePointRelais_ajax.php',
-		data: args ,
-		dataType: 'json',
-		beforeSend : function(params)
-		{
-			$('#loading_mr').show();
-		},
-		success: function(obj)
-			{
-				$('#loading_mr').hide();
-				$('#mondialrelay_'+num).html('');
-				$("#all_mondialrelay_map_" + num).show();
-				var cpt = 0;
-				if (obj.error)
-					$('#mondialrelay_'+num).html('<div class="error"><p>'+server_error+'</p></div>');
-				else
-				{
-					while (obj.addresses[cpt])
-					{
-						if (obj.addresses[cpt].num)
-							set_html_MR_recherche(obj.addresses[cpt], num, obj.base_dir, cpt);
-						++cpt;
-					}
-					if (!obj.addresses[0].num)
-						$('#mondialrelay_'+num).html('<div class="error"><p>'+address_error+'</p></div>');
-				}
-			},
-		error: function(xhr, ajaxOptions, thrownError)
-		{
-			
-		}
-	});
-}
-	
-	function masque_recherche_MR_detail(num)	
-	{
-		document.getElementById('bg_detail_md_'+num).style.display='none';
-		document.getElementById('detail_md_'+num).style.display='none';
-		document.getElementById('detail_md_'+num).innerHTML=''
-	} 
-	
-	function recherche_MR_detail(num, pays, num_mode)
-	{
-		oXmlhttpMR5.open('POST',_PS_MR_MODULE_DIR_ + 'kit_mondialrelay/RechercheDetailPointRelais_ajax.php');
-		oXmlhttpMR5.onreadystatechange=function() {
-			if (oXmlhttpMR5.readyState==1) {
-									var arrayPageSize = getPageSize_MR();
-									var arrayScroll = getPageScroll_MR();
-									document.getElementById('bg_detail_md_'+num_mode).style.height = (arrayPageSize[1] + 'px');
-									document.getElementById('bg_detail_md_'+num_mode).style.display='block';
-									document.getElementById('detail_md_'+num_mode).style.top = (Math.round(arrayScroll[1]+(arrayPageSize[3]-480)/2)+ 'px');
-									document.getElementById('detail_md_'+num_mode).style.left = (Math.round((arrayPageSize[2]-740)/2)+ 'px');
-									document.getElementById('detail_md_'+num_mode).innerHTML="<table width=100%><tr height=478 style='border:none;'><td valing=middle style='border:none;'><center><img class='none' src='"+img_loader.src+"' ></center></td></tr></table>";
-									document.getElementById('detail_md_'+num_mode).style.display='block';
-			}
-			/*if (oXmlhttpMR5.readyState==2) {
-									var arrayPageSize = getPageSize_MR();
-									var arrayScroll = getPageScroll_MR();
-									document.getElementById('bg_detail_md').style.height = (arrayPageSize[1] + 'px');
-									document.getElementById('bg_detail_md').style.display='block';
-									document.getElementById('detail_md').style.top = (Math.round(arrayScroll[1]+(arrayPageSize[3]-480)/2)+ 'px');
-									document.getElementById('detail_md').style.left = (Math.round((arrayPageSize[2]-740)/2)+ 'px');
-									document.getElementById('detail_md').innerHTML="<table width=100%><tr height=478 style='border:none;'><td valing=middle style='border:none;'><center><img class='none' src='"+img_loader.src+"' ></center></td></tr></table>";
-									document.getElementById('detail_md').style.display='block';
-			}*/
-			if (oXmlhttpMR5.readyState==4 && oXmlhttpMR5.status == 200) {
-			var response = oXmlhttpMR5.responseText || "z|";
-									res=response.split('|');
-									if (res[0]!=0 && res[0]!='a' && res[0]!='z') 
-										{masque_recherche_MR_detail(num_mode);
-										 message_MR(res[0]);}
-									else if (res[0]=='a') {document.getElementById('detail_md_'+res[2]).innerHTML=res[1];}	
-									else if (res[0]=='z') {masque_recherche_MR_detail(res[2]); alert('Requ�te sans r�ponse.');}
-									else {document.getElementById('detail_md_'+res[2]).innerHTML=res[1];};};
-			}
-	
-		oXmlhttpMR5.setRequestHeader("Content-type", "application/x-www-form-urlencoded; ");
-		var data = 'relativ_base_dir='+encodeURIComponent(relativ_base_dir)+'&Num='+encodeURIComponent(num)+'&Pays='+encodeURIComponent(pays)+'&num_mode='+num_mode;
-		oXmlhttpMR5.send (data);
-				
-
-	}
-	
-function select_PR_MR(num, id_carrier)
-{
-	if (num != '')
-	{
-		$('#MR_Selected_Num_'+id_carrier).val(num);
-		$('#MR_Selected_LgAdr1_'+id_carrier).val($('#MR_LgAdr1_'+num).html());
-		$('#MR_Selected_LgAdr2_'+id_carrier).val($('#MR_LgAdr2_'+num).html());
-		$('#MR_Selected_LgAdr3_'+id_carrier).val($('#MR_LgAdr3_'+num).html());
-		$('#MR_Selected_LgAdr4_'+id_carrier).val($('#MR_LgAdr4_'+num).html());
-		$('#MR_Selected_CP_'+id_carrier).val($('#MR_CP_'+num).html());
-		$('#MR_Selected_Ville_'+id_carrier).val($('#MR_Ville_'+num).html());
-		$('#MR_Selected_Pays_'+id_carrier).val($('#MR_Pays_'+num).html());
-	}
-	else 
-	{
-		$('#MR_Selected_Num_'+id_carrier).val('');
-		$('#MR_Selected_LgAdr1_'+id_carrier).val('');
-		$('#MR_Selected_LgAdr2_'+id_carrier).val('');
-		$('#MR_Selected_LgAdr3_'+id_carrier).val('');
-		$('#MR_Selected_LgAdr4_'+id_carrier).val('');
-		$('#MR_Selected_CP_'+id_carrier).val('');
-		$('#MR_Selected_Ville_'+id_carrier).val('');
-		$('#MR_Selected_Pays_'+id_carrier).val('');
-	};
-	if (one_page_checkout == true)
-	{
-		$.ajax({
-		type: 'POST',
-		url: gl_base_dir + 'modules/mondialrelay/kit_mondialrelay/mr_opc_ajax.php',
-		async: true,
-		cache: false,
-		data: 'Num='+$('#MR_Selected_Num_'+id_carrier).val()+'&LgAdr1='+$('#MR_Selected_LgAdr1_'+id_carrier).val()+'&LgAdr2='+$('#MR_Selected_LgAdr2_'+id_carrier).val()+'&LgAdr3='+$('#MR_Selected_LgAdr3_'+id_carrier).val()+'&LgAdr4='+$('#MR_Selected_LgAdr4_'+id_carrier).val()+'&CP='+	$('#MR_Selected_CP_'+id_carrier).val()+'&Ville='+$('#MR_Selected_Ville_'+id_carrier).val()+'&Pays='+$('#MR_Selected_Pays_'+id_carrier).val()
-		});
-	}
-	
-	// 1.3 compatibility, hookProcessCarrier Missing
-	// Allow to fill the database with the selected information
-	$.ajax({
-		type: 'POST',
-		url: _PS_MR_MODULE_DIR_ + 'ajax.php',
-		data: 'method=addSelectedCarrierToDB' + 
-					'&id_carrier=' + id_carrier + 
-					'&MR_Selected_Num_' + id_carrier + '=' + $('#MR_Selected_Num_' + id_carrier).val() + 
-					'&MR_Selected_LgAdr1_' + id_carrier + '=' + $('#MR_Selected_LgAdr1_' + id_carrier).val() + 
-					'&MR_Selected_LgAdr2_' + id_carrier + '=' + $('#MR_Selected_LgAdr2_' + id_carrier).val() + 
-					'&MR_Selected_LgAdr3_' + id_carrier + '=' + $('#MR_Selected_LgAdr3_' + id_carrier).val() + 
-					'&MR_Selected_LgAdr4_' + id_carrier + '=' + $('#MR_Selected_LgAdr4_' + id_carrier).val() + 
-					'&MR_Selected_CP_' + id_carrier + '=' + $('#MR_Selected_CP_' + id_carrier).val() + 
-					'&MR_Selected_Ville_' + id_carrier + '=' + $('#MR_Selected_Ville_' + id_carrier).val() + 
-					'&MR_Selected_Pays_' + id_carrier  + '=' + $('#MR_Selected_Pays_' + id_carrier).val(),
-		success: function(json) 
-		{
-			//console.log(json);
-		},
-		error: function(xhr, ajaxOptions, thrownError)
-		{
-			//console.log(xhr);
-			//console.log(thrownError);
-			//console.log(ajaxOptions);
-		}	
-	});
-	
-}
-
-function message_MR(etat)
-{
-	if (etat == 'a') {alert("R�sultat vide");}
-	if (etat == 1) {alert("Enseigne invalide");}
-	if (etat == 2) {alert("Num�ro d'enseigne vide ou inexistant");}
-	if (etat == 3) {alert("Num�ro de compte enseigne invalide");}
-	if (etat == 5) {alert("Num�ro de dossier enseigne invalide");}
-	if (etat == 7) {alert("Num�ro de client enseigne invalide");}
-	if (etat == 9) {alert("Nom de ville non reconnu ou non unique");}
-	if (etat == 10) {alert("Type de collecte invalide ou incorrect (1/D > Domicile -- 3/R > Relais)");}
-	if (etat == 11) {alert("Num�ro de Point Relais de collecte invalide");}
-	if (etat == 12) {alert("Pays du Point Relais de collecte invalide");}
-	if (etat == 13) {alert("Type de livraison invalide ou incorrect (1/D > Domicile -- 3/R > Relais)");}
-	if (etat == 14) {alert("Num�ro du Point Relais de livraison invalide");}
-	if (etat == 15) {alert("Pays du Point Relais de livraison invalide");}
-	if (etat == 16) {alert("Code pays invalide");}
-	if (etat == 17) {alert("Adresse invalide");}
-	if (etat == 18) {alert("Ville invalide");}
-	if (etat == 19) {alert("Code postal invalide");}
-	if (etat == 20) {alert("Poids du colis invalide");}
-	if (etat == 21) {alert("Taille (Longueur + Hauteur) du colis invalide");}
-	if (etat == 22) {alert("Taille du Colis invalide");}
-	if (etat == 24) {alert("Num�ro de Colis Mondial Relay invalide");}
-	if (etat == 28) {alert("Mode de collecte invalide");}
-	if (etat == 29) {alert("Mode de livraison invalide");}
-	if (etat == 30) {alert("Adresse (L1) de l'exp�diteur invalide");}
-	if (etat == 31) {alert("Adresse (L2) de l'exp�diteur invalide");}
-	if (etat == 33) {alert("Adresse (L3) de l'exp�diteur invalide");}
-	if (etat == 34) {alert("Adresse (L4) de l'exp�diteur invalide");}
-	if (etat == 35) {alert("Ville de l'exp�diteur invalide");}
-	if (etat == 36) {alert("Code postal de l'exp�diteur invalide");}
-	if (etat == 37) {alert("Pays de l'exp�diteur invalide");}
-	if (etat == 38) {alert("Num�ro de t�l�phone de l'exp�diteur invalide");}
-	if (etat == 39) {alert("Adresse e-mail de l'exp�diteur invalide");}
-	if (etat == 40) {alert("Action impossible sans ville ni code postal");}
-	if (etat == 41) {alert("Mode de livraison invalide");}
-	if (etat == 42) {alert("Montant CRT invalide");}
-	if (etat == 43) {alert("Devise CRT invalide");}
-	if (etat == 44) {alert("Valeur du colis invalide");}
-	if (etat == 45) {alert("Devise de la valeur du colis invalide");}
-	if (etat == 46) {alert("Plage de num�ro d'exp�dition epuisee");}
-	if (etat == 47) {alert("Nombre de colis invalide");}
-	if (etat == 48) {alert("Multi-colis en Point Relais Interdit");}
-	if (etat == 49) {alert("Mode de collecte ou de livraison invalide");}
-	if (etat == 50) {alert("Adresse (L1) du destinataire invalide");}
-	if (etat == 51) {alert("Adresse (L2) du destinataire invalide");}
-	if (etat == 53) {alert("Adresse (L3) du destinataire invalide");}
-	if (etat == 54) {alert("Adresse (L4) du destinataire invalide");}
-	if (etat == 55) {alert("Ville du destinataire invalide");}
-	if (etat == 56) {alert("Code postal du destinataire invalide");}
-	if (etat == 57) {alert("Pays du destinataire invalide");}
-	if (etat == 58) {alert("Num�ro de t�l�phone du destinataire invalide");}
-	if (etat == 59) {alert("Adresse e-mail du destinataire invalide");}
-	if (etat == 60) {alert("Champ texte libre invalide");}
-	if (etat == 61) {alert("Top avisage invalide");}
-	if (etat == 62) {alert("Instruction de livraison invalide");}
-	if (etat == 63) {alert("Assurance invalide ou incorrecte");}
-	if (etat == 64) {alert("Temps de montage invalide");}
-	if (etat == 65) {alert("Top rendez-vous invalide");}
-	if (etat == 66) {alert("Top reprise invalide");}
-	if (etat == 70) {alert("Num�ro de Point Relais invalide");}
-	if (etat == 72) {alert("Langue exp�diteur invalide");}
-	if (etat == 73) {alert("Langue destinataire invalide");}
-	if (etat == 74) {alert("Langue invalide");}
-	if (etat == 80) {alert("Code tracing : Colis enregistre");}
-	if (etat == 81) {alert("Code tracing : Colis en traitement chez Mondial Relay");}
-	if (etat == 82) {alert("Code tracing : Colis livre");}
-	if (etat == 83) {alert("Code tracing : Anomalie");}
-	if (etat == 84) {alert("84 (R�serv� Code Tracing)");}
-	if (etat == 85) {alert("85 (R�serv� Code Tracing)");}
-	if (etat == 86) {alert("86 (R�serv� Code Tracing)");}
-	if (etat == 87) {alert("87 (R�serv� Code Tracing)");}
-	if (etat == 88) {alert("88 (R�serv� Code Tracing)");}
-	if (etat == 89) {alert("89 (R�serv� Code Tracing)");}
-	if (etat == 90) {alert("AS400 indisponible");}
-	if (etat == 91) {alert("Num�ro d'exp�dition invalide");}
-	if (etat == 93) {alert("Aucun �l�ment retourn� par le plan de tri\n\
-							Si vous effectuez une collecte ou une livraison en Point Relais, v�rifiez que les\n\
-							Point Relais sont bien disponibles.\n\
-							Si vous effectuez une livraison � domicile, il est probable que le code postal que\n\
-							vous avez indiquez n'existe pas.");}
-	if (etat == 94) {alert("Colis Inexistant");}
-	if (etat == 95) {alert("Compte Enseigne non active");}
-	if (etat == 96) {alert("Type d'enseigne incorrect en Base");}
-	if (etat == 97) {alert("Cl� de s�curit� invalide");}
-	if (etat == 98) {alert("Service Indisponible");}
-	if (etat == 99) {alert("Erreur g�n�rique du service\n\
-							Cette erreur peut �tre d� autant � un probl�me technique du service qu'� des\n\
-							donn�es incorrectes ou inexistantes dans la Base de Donn�es. Lorsque vous avez\n\
-							cette erreur veuillez la notifier � Mondial Relay en pr�cisant la date et l'heure de la\n\
-							connexion ainsi que les informations envoy�s au WebService afin d'effectuer une\n\
-							v�rification.");}
-}
-
-
-function getPageScroll_MR()
-{
-
-	var yScroll;
-
-	if (self.pageYOffset) {
-		yScroll = self.pageYOffset;
-	} else if (document.documentElement && document.documentElement.scrollTop){	 // Explorer 6 Strict
-		yScroll = document.documentElement.scrollTop;
-	} else if (document.body) {// all other Explorers
-		yScroll = document.body.scrollTop;
-	}
-
-	arrayPageScroll = new Array('',yScroll) 
-	return arrayPageScroll;
-}
-
-
-function getPageSize_MR()
-{
-	
-	var xScroll, yScroll;
-	
-	if (window.innerHeight && window.scrollMaxY) {	
-		xScroll = document.body.scrollWidth;
-		yScroll = window.innerHeight + window.scrollMaxY;
-	} else if (document.body.scrollHeight > document.body.offsetHeight){ // all but Explorer Mac
-		xScroll = document.body.scrollWidth;
-		yScroll = document.body.scrollHeight;
-	} else { // Explorer Mac...would also work in Explorer 6 Strict, Mozilla and Safari
-		xScroll = document.body.offsetWidth;
-		yScroll = document.body.offsetHeight;
-	}
-	
-	var windowWidth, windowHeight;
-	if (self.innerHeight) {	// all except Explorer
-		windowWidth = self.innerWidth;
-		windowHeight = self.innerHeight;
-	} else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode
-		windowWidth = document.documentElement.clientWidth;
-		windowHeight = document.documentElement.clientHeight;
-	} else if (document.body) { // other Explorers
-		windowWidth = document.body.clientWidth;
-		windowHeight = document.body.clientHeight;
-	}	
-	
-	// for small pages with total height less then height of the viewport
-	if(yScroll < windowHeight){
-		pageHeight = windowHeight;
-	} else { 
-		pageHeight = yScroll;
-	}
-
-	// for small pages with total width less then width of the viewport
-	if(xScroll < windowWidth){	
-		pageWidth = windowWidth;
-	} else {
-		pageWidth = xScroll;
-	}
-
-
-	arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight) 
-	return arrayPageSize;
-}
@@ -1,27 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../../config/config.inc.php');
-include(dirname(__FILE__).'/../../../init.php');
-include(dirname(__FILE__).'/../mondialrelay.php');
-
-global $cookie;
-
-$cart = new Cart($cookie->id_cart);
-$result_MR = Db::getInstance()->ExecuteS("SELECT * FROM "._DB_PREFIX_."mr_method WHERE id_carrier='".(int)($cart->id_carrier)."' ;");
-
-Db::getInstance()->delete(_DB_PREFIX_.'mr_selected','id_cart = "'.(int)($cart->id).'"');
-$mrselected = new MondialRelayClass();
-$mrselected->id_customer = $cart->id_customer;
-$mrselected->id_method = $result_MR[0]['id_mr_method'];
-$mrselected->id_cart = $cart->id;
-$mrselected->MR_Selected_Num = $_POST['Num'];
-$mrselected->MR_Selected_LgAdr1 = $_POST['LgAdr1'];
-$mrselected->MR_Selected_LgAdr2 = $_POST['LgAdr2'];
-$mrselected->MR_Selected_LgAdr3 = $_POST['LgAdr3'];
-$mrselected->MR_Selected_LgAdr4 = $_POST['LgAdr4'];
-$mrselected->MR_Selected_CP = $_POST['CP'];
-$mrselected->MR_Selected_Ville = $_POST['Ville'];
-$mrselected->MR_Selected_Pays = $_POST['Pays'];
-$mrselected->save();
-
-
@@ -1,36 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-			    	
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-	
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-	
-header("Location: ../");
-exit;
@@ -1,36 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-			    	
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-	
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-	
-header("Location: ../");
-exit;
@@ -1,995 +0,0 @@
-<?php
-
-/*
-$Id: class.nusoap_base.php 7091 2011-06-16 11:34:02Z mMarinetti $
-
-NuSOAP - Web Services Toolkit for PHP
-
-Copyright (c) 2002 NuSphere Corporation
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-The NuSOAP project home is:
-http://sourceforge.net/projects/nusoap/
-
-The primary support for NuSOAP is the Help forum on the project home page.
-
-If you have any questions or comments, please email:
-
-Dietrich Ayala
-dietrich@ganx4.com
-http://dietrich.ganx4.com/nusoap
-
-NuSphere Corporation
-http://www.nusphere.com
-
-*/
-
-/*
- *	Some of the standards implmented in whole or part by NuSOAP:
- *
- *	SOAP 1.1 (http://www.w3.org/TR/2000/NOTE-SOAP-20000508/)
- *	WSDL 1.1 (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
- *	SOAP Messages With Attachments (http://www.w3.org/TR/SOAP-attachments)
- *	XML 1.0 (http://www.w3.org/TR/2006/REC-xml-20060816/)
- *	Namespaces in XML 1.0 (http://www.w3.org/TR/2006/REC-xml-names-20060816/)
- *	XML Schema 1.0 (http://www.w3.org/TR/xmlschema-0/)
- *	RFC 2045 Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies
- *	RFC 2068 Hypertext Transfer Protocol -- HTTP/1.1
- *	RFC 2617 HTTP Authentication: Basic and Digest Access Authentication
- */
-
-/* load classes
-
-// necessary classes
-require_once('class.soapclient.php');
-require_once('class.soap_val.php');
-require_once('class.soap_parser.php');
-require_once('class.soap_fault.php');
-
-// transport classes
-require_once('class.soap_transport_http.php');
-
-// optional add-on classes
-require_once('class.xmlschema.php');
-require_once('class.wsdl.php');
-
-// server class
-require_once('class.soap_server.php');*/
-
-// class variable emulation
-// cf. http://www.webkreator.com/php?controller=techniques/php-static-class-variables.html
-$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = 9;
-
-/**
-*
-* nusoap_base
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.nusoap_base.php 7091 2011-06-16 11:34:02Z mMarinetti $
-* @access   public
-*/
-class nusoap_base {
-	/**
-	 * Identification for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $title = 'NuSOAP';
-	/**
-	 * Version for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $version = '0.9.5';
-	/**
-	 * CVS revision for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $revision = '$Revision: 7091 $';
-    /**
-     * Current error string (manipulated by getError/setError)
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $error_str = '';
-    /**
-     * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
-	 *
-	 * @var string
-	 * @access private
-	 */
-    var $debug_str = '';
-    /**
-	 * toggles automatic encoding of special characters as entities
-	 * (should always be true, I think)
-	 *
-	 * @var boolean
-	 * @access private
-	 */
-	var $charencoding = true;
-	/**
-	 * the debug level for this instance
-	 *
-	 * @var	integer
-	 * @access private
-	 */
-	var $debugLevel;
-
-    /**
-	* set schema version
-	*
-	* @var      string
-	* @access   public
-	*/
-	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
-	
-    /**
-	* charset encoding for outgoing messages
-	*
-	* @var      string
-	* @access   public
-	*/
-    var $soap_defencoding = 'ISO-8859-1';
-	//var $soap_defencoding = 'UTF-8';
-
-	/**
-	* namespaces in an array of prefix => uri
-	*
-	* this is "seeded" by a set of constants, but it may be altered by code
-	*
-	* @var      array
-	* @access   public
-	*/
-	var $namespaces = array(
-		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
-		'xsd' => 'http://www.w3.org/2001/XMLSchema',
-		'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-		'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'
-		);
-
-	/**
-	* namespaces used in the current context, e.g. during serialization
-	*
-	* @var      array
-	* @access   private
-	*/
-	var $usedNamespaces = array();
-
-	/**
-	* XML Schema types in an array of uri => (array of xml type => php type)
-	* is this legacy yet?
-	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
-	* @var      array
-	* @access   public
-	*/
-	var $typemap = array(
-	'http://www.w3.org/2001/XMLSchema' => array(
-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',
-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',
-		// abstract "any" types
-		'anyType'=>'string','anySimpleType'=>'string',
-		// derived datatypes
-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',
-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',
-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',
-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),
-	'http://www.w3.org/2000/10/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
-	'http://www.w3.org/1999/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
-	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
-    'http://xml.apache.org/xml-soap' => array('Map')
-	);
-
-	/**
-	* XML entities to convert
-	*
-	* @var      array
-	* @access   public
-	* @deprecated
-	* @see	expandEntities
-	*/
-	var $xmlEntities = array('quot' => '"','amp' => '&',
-		'lt' => '<','gt' => '>','apos' => "'");
-
-	/**
-	* constructor
-	*
-	* @access	public
-	*/
-	function nusoap_base() {
-		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
-	}
-
-	/**
-	* gets the global debug level, which applies to future instances
-	*
-	* @return	integer	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function getGlobalDebugLevel() {
-		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
-	}
-
-	/**
-	* sets the global debug level, which applies to future instances
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function setGlobalDebugLevel($level) {
-		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;
-	}
-
-	/**
-	* gets the debug level for this instance
-	*
-	* @return	int	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function getDebugLevel() {
-		return $this->debugLevel;
-	}
-
-	/**
-	* sets the debug level for this instance
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function setDebugLevel($level) {
-		$this->debugLevel = $level;
-	}
-
-	/**
-	* adds debug data to the instance debug string with formatting
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function debug($string){
-		if ($this->debugLevel > 0) {
-			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
-		}
-	}
-
-	/**
-	* adds debug data to the instance debug string without formatting
-	*
-	* @param    string $string debug data
-	* @access   public
-	*/
-	function appendDebug($string){
-		if ($this->debugLevel > 0) {
-			// it would be nice to use a memory stream here to use
-			// memory more efficiently
-			$this->debug_str .= $string;
-		}
-	}
-
-	/**
-	* clears the current debug data for this instance
-	*
-	* @access   public
-	*/
-	function clearDebug() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		$this->debug_str = '';
-	}
-
-	/**
-	* gets the current debug data for this instance
-	*
-	* @return   debug data
-	* @access   public
-	*/
-	function &getDebug() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		return $this->debug_str;
-	}
-
-	/**
-	* gets the current debug data for this instance as an XML comment
-	* this may change the contents of the debug data
-	*
-	* @return   debug data as an XML comment
-	* @access   public
-	*/
-	function &getDebugAsXMLComment() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		while (strpos($this->debug_str, '--')) {
-			$this->debug_str = str_replace('--', '- -', $this->debug_str);
-		}
-		$ret = "<!--\n" . $this->debug_str . "\n-->";
-    	return $ret;
-	}
-
-	/**
-	* expands entities, e.g. changes '<' to '&lt;'.
-	*
-	* @param	string	$val	The string in which to expand entities.
-	* @access	private
-	*/
-	function expandEntities($val) {
-		if ($this->charencoding) {
-	    	$val = str_replace('&', '&amp;', $val);
-	    	$val = str_replace("'", '&apos;', $val);
-	    	$val = str_replace('"', '&quot;', $val);
-	    	$val = str_replace('<', '&lt;', $val);
-	    	$val = str_replace('>', '&gt;', $val);
-	    }
-	    return $val;
-	}
-
-	/**
-	* returns error string if present
-	*
-	* @return   mixed error string or false
-	* @access   public
-	*/
-	function getError(){
-		if($this->error_str != ''){
-			return $this->error_str;
-		}
-		return false;
-	}
-
-	/**
-	* sets error string
-	*
-	* @return   boolean $string error string
-	* @access   private
-	*/
-	function setError($str){
-		$this->error_str = $str;
-	}
-
-	/**
-	* detect if array is a simple array or a struct (associative array)
-	*
-	* @param	mixed	$val	The PHP array
-	* @return	string	(arraySimple|arrayStruct)
-	* @access	private
-	*/
-	function isArraySimpleOrStruct($val) {
-        $keyList = array_keys($val);
-		foreach ($keyList as $keyListValue) {
-			if (!is_int($keyListValue)) {
-				return 'arrayStruct';
-			}
-		}
-		return 'arraySimple';
-	}
-
-	/**
-	* serializes PHP values in accordance w/ section 5. Type information is
-	* not serialized if $use == 'literal'.
-	*
-	* @param	mixed	$val	The value to serialize
-	* @param	string	$name	The name (local part) of the XML element
-	* @param	string	$type	The XML schema type (local part) for the element
-	* @param	string	$name_ns	The namespace for the name of the XML element
-	* @param	string	$type_ns	The namespace for the type of the element
-	* @param	array	$attributes	The attributes to serialize as name=>value pairs
-	* @param	string	$use	The WSDL "use" (encoded|literal)
-	* @param	boolean	$soapval	Whether this is called from soapval.
-	* @return	string	The serialized element, possibly with child elements
-    * @access	public
-	*/
-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {
-		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
-		$this->appendDebug('value=' . $this->varDump($val));
-		$this->appendDebug('attributes=' . $this->varDump($attributes));
-		
-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
-    		$this->debug("serialize_val: serialize soapval");
-        	$xml = $val->serialize($use);
-			$this->appendDebug($val->getDebug());
-			$val->clearDebug();
-			$this->debug("serialize_val of soapval returning $xml");
-			return $xml;
-        }
-		// force valid name if necessary
-		if (is_numeric($name)) {
-			$name = '__numeric_' . $name;
-		} elseif (! $name) {
-			$name = 'noname';
-		}
-		// if name has ns, add ns prefix to name
-		$xmlns = '';
-        if($name_ns){
-			$prefix = 'nu'.rand(1000,9999);
-			$name = $prefix.':'.$name;
-			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
-		}
-		// if type is prefixed, create type prefix
-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
-			// need to fix this. shouldn't default to xsd if no ns specified
-		    // w/o checking against typemap
-			$type_prefix = 'xsd';
-		} elseif($type_ns){
-			$type_prefix = 'ns'.rand(1000,9999);
-			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
-		}
-		// serialize attributes if present
-		$atts = '';
-		if($attributes){
-			foreach($attributes as $k => $v){
-				$atts .= " $k=\"".$this->expandEntities($v).'"';
-			}
-		}
-		// serialize null value
-		if (is_null($val)) {
-    		$this->debug("serialize_val: serialize null");
-			if ($use == 'literal') {
-				// TODO: depends on minOccurs
-				$xml = "<$name$xmlns$atts/>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
-				if (isset($type) && isset($type_prefix)) {
-					$type_str = " xsi:type=\"$type_prefix:$type\"";
-				} else {
-					$type_str = '';
-				}
-				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
-		}
-        // serialize if an xsd built-in primitive type
-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
-    		$this->debug("serialize_val: serialize xsd built-in primitive type");
-        	if (is_bool($val)) {
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
-			} else if (is_string($val)) {
-				$val = $this->expandEntities($val);
-			}
-			if ($use == 'literal') {
-				$xml = "<$name$xmlns$atts>$val</$name>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
-				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
-        }
-		// detect type and serialize
-		$xml = '';
-		switch(true) {
-			case (is_bool($val) || $type == 'boolean'):
-		   		$this->debug("serialize_val: serialize boolean");
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";
-				}
-				break;
-			case (is_int($val) || is_long($val) || $type == 'int'):
-		   		$this->debug("serialize_val: serialize int");
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
-				}
-				break;
-			case (is_float($val)|| is_double($val) || $type == 'float'):
-		   		$this->debug("serialize_val: serialize float");
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";
-				}
-				break;
-			case (is_string($val) || $type == 'string'):
-		   		$this->debug("serialize_val: serialize string");
-				$val = $this->expandEntities($val);
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";
-				}
-				break;
-			case is_object($val):
-		   		$this->debug("serialize_val: serialize object");
-		    	if (get_class($val) == 'soapval') {
-		    		$this->debug("serialize_val: serialize soapval object");
-		        	$pXml = $val->serialize($use);
-					$this->appendDebug($val->getDebug());
-					$val->clearDebug();
-		        } else {
-					if (! $name) {
-						$name = get_class($val);
-						$this->debug("In serialize_val, used class name $name as element name");
-					} else {
-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));
-					}
-					foreach(get_object_vars($val) as $k => $v){
-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);
-					}
-				}
-				if(isset($type) && isset($type_prefix)){
-					$type_str = " xsi:type=\"$type_prefix:$type\"";
-				} else {
-					$type_str = '';
-				}
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$pXml</$name>";
-				} else {
-					$xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";
-				}
-				break;
-			break;
-			case (is_array($val) || $type):
-				// detect if struct or array
-				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
-			   		$this->debug("serialize_val: serialize array");
-					$i = 0;
-					if(is_array($val) && count($val)> 0){
-						foreach($val as $v){
-	                    	if(is_object($v) && get_class($v) ==  'soapval'){
-								$tt_ns = $v->type_ns;
-								$tt = $v->type;
-							} elseif (is_array($v)) {
-								$tt = $this->isArraySimpleOrStruct($v);
-							} else {
-								$tt = gettype($v);
-	                        }
-							$array_types[$tt] = 1;
-							// TODO: for literal, the name should be $name
-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
-							++$i;
-						}
-						if(count($array_types) > 1){
-							$array_typename = 'xsd:anyType';
-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
-							if ($tt == 'integer') {
-								$tt = 'int';
-							}
-							$array_typename = 'xsd:'.$tt;
-						} elseif(isset($tt) && $tt == 'arraySimple'){
-							$array_typename = 'SOAP-ENC:Array';
-						} elseif(isset($tt) && $tt == 'arrayStruct'){
-							$array_typename = 'unnamed_struct_use_soapval';
-						} else {
-							// if type is prefixed, create type prefix
-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){
-								 $array_typename = 'xsd:' . $tt;
-							} elseif ($tt_ns) {
-								$tt_prefix = 'ns' . rand(1000, 9999);
-								$array_typename = "$tt_prefix:$tt";
-								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";
-							} else {
-								$array_typename = $tt;
-							}
-						}
-						$array_type = $i;
-						if ($use == 'literal') {
-							$type_str = '';
-						} else if (isset($type) && isset($type_prefix)) {
-							$type_str = " xsi:type=\"$type_prefix:$type\"";
-						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";
-						}
-					// empty array
-					} else {
-						if ($use == 'literal') {
-							$type_str = '';
-						} else if (isset($type) && isset($type_prefix)) {
-							$type_str = " xsi:type=\"$type_prefix:$type\"";
-						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";
-						}
-					}
-					// TODO: for array in literal, there is no wrapper here
-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";
-				} else {
-					// got a struct
-			   		$this->debug("serialize_val: serialize struct");
-					if(isset($type) && isset($type_prefix)){
-						$type_str = " xsi:type=\"$type_prefix:$type\"";
-					} else {
-						$type_str = '';
-					}
-					if ($use == 'literal') {
-						$xml .= "<$name$xmlns$atts>";
-					} else {
-						$xml .= "<$name$xmlns$type_str$atts>";
-					}
-					foreach($val as $k => $v){
-						// Apache Map
-						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {
-							$xml .= '<item>';
-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);
-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);
-							$xml .= '</item>';
-						} else {
-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);
-						}
-					}
-					$xml .= "</$name>";
-				}
-				break;
-			default:
-		   		$this->debug("serialize_val: serialize unknown");
-				$xml .= 'not detected, got '.gettype($val).' for '.$val;
-				break;
-		}
-		$this->debug("serialize_val returning $xml");
-		return $xml;
-	}
-
-    /**
-    * serializes a message
-    *
-    * @param string $body the XML of the SOAP body
-    * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
-    * @param array $namespaces optional the namespaces used in generating the body and headers
-    * @param string $style optional (rpc|document)
-    * @param string $use optional (encoded|literal)
-    * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-    * @return string the message
-    * @access public
-    */
-    function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
-    // TODO: add an option to automatically run utf8_encode on $body and $headers
-    // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows
-    // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1
-
-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
-	$this->debug("headers:");
-	$this->appendDebug($this->varDump($headers));
-	$this->debug("namespaces:");
-	$this->appendDebug($this->varDump($namespaces));
-
-	// serialize namespaces
-    $ns_string = '';
-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
-		$ns_string .= " xmlns:$k=\"$v\"";
-	}
-	if($encodingStyle) {
-		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";
-	}
-
-	// serialize headers
-	if($headers){
-		if (is_array($headers)) {
-			$xml = '';
-			foreach ($headers as $k => $v) {
-				if (is_object($v) && get_class($v) == 'soapval') {
-					$xml .= $this->serialize_val($v, false, false, false, false, false, $use);
-				} else {
-					$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
-				}
-			}
-			$headers = $xml;
-			$this->debug("In serializeEnvelope, serialized array of headers to $headers");
-		}
-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";
-	}
-	// serialize envelope
-	return
-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".
-	'<SOAP-ENV:Envelope'.$ns_string.">".
-	$headers.
-	"<SOAP-ENV:Body>".
-		$body.
-	"</SOAP-ENV:Body>".
-	"</SOAP-ENV:Envelope>";
-    }
-
-	/**
-	 * formats a string to be inserted into an HTML stream
-	 *
-	 * @param string $str The string to format
-	 * @return string The formatted string
-	 * @access public
-	 * @deprecated
-	 */
-    function formatDump($str){
-		$str = htmlspecialchars($str);
-		return nl2br($str);
-    }
-
-	/**
-	* contracts (changes namespace to prefix) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string contracted qname
-	* @access   private
-	*/
-	function contractQname($qname){
-		// get element namespace
-		//$this->xdebug("Contract $qname");
-		if (strrpos($qname, ':')) {
-			// get unqualified name
-			$name = substr($qname, strrpos($qname, ':') + 1);
-			// get ns
-			$ns = substr($qname, 0, strrpos($qname, ':'));
-			$p = $this->getPrefixFromNamespace($ns);
-			if ($p) {
-				return $p . ':' . $name;
-			}
-			return $qname;
-		} else {
-			return $qname;
-		}
-	}
-
-	/**
-	* expands (changes prefix to namespace) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string expanded qname
-	* @access   private
-	*/
-	function expandQname($qname){
-		// get element prefix
-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
-			// get unqualified name
-			$name = substr(strstr($qname,':'),1);
-			// get ns prefix
-			$prefix = substr($qname,0,strpos($qname,':'));
-			if(isset($this->namespaces[$prefix])){
-				return $this->namespaces[$prefix].':'.$name;
-			} else {
-				return $qname;
-			}
-		} else {
-			return $qname;
-		}
-	}
-
-    /**
-    * returns the local part of a prefixed string
-    * returns the original string, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return string The local part
-    * @access public
-    */
-	function getLocalPart($str){
-		if($sstr = strrchr($str,':')){
-			// get unqualified name
-			return substr( $sstr, 1 );
-		} else {
-			return $str;
-		}
-	}
-
-	/**
-    * returns the prefix part of a prefixed string
-    * returns false, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return mixed The prefix or false if there is no prefix
-    * @access public
-    */
-	function getPrefix($str){
-		if($pos = strrpos($str,':')){
-			// get prefix
-			return substr($str,0,$pos);
-		}
-		return false;
-	}
-
-	/**
-    * pass it a prefix, it returns a namespace
-    *
-    * @param string $prefix The prefix
-    * @return mixed The namespace, false if no namespace has the specified prefix
-    * @access public
-    */
-	function getNamespaceFromPrefix($prefix){
-		if (isset($this->namespaces[$prefix])) {
-			return $this->namespaces[$prefix];
-		}
-		//$this->setError("No namespace registered for prefix '$prefix'");
-		return false;
-	}
-
-	/**
-    * returns the prefix for a given namespace (or prefix)
-    * or false if no prefixes registered for the given namespace
-    *
-    * @param string $ns The namespace
-    * @return mixed The prefix, false if the namespace has no prefixes
-    * @access public
-    */
-	function getPrefixFromNamespace($ns) {
-		foreach ($this->namespaces as $p => $n) {
-			if ($ns == $n || $ns == $p) {
-			    $this->usedNamespaces[$p] = $n;
-				return $p;
-			}
-		}
-		return false;
-	}
-
-	/**
-    * returns the time in ODBC canonical form with microseconds
-    *
-    * @return string The time in ODBC canonical form with microseconds
-    * @access public
-    */
-	function getmicrotime() {
-		if (function_exists('gettimeofday')) {
-			$tod = gettimeofday();
-			$sec = $tod['sec'];
-			$usec = $tod['usec'];
-		} else {
-			$sec = time();
-			$usec = 0;
-		}
-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);
-	}
-
-	/**
-	 * Returns a string with the output of var_dump
-	 *
-	 * @param mixed $data The variable to var_dump
-	 * @return string The output of var_dump
-	 * @access public
-	 */
-    function varDump($data) {
-		ob_start();
-		var_dump($data);
-		$ret_val = ob_get_contents();
-		ob_end_clean();
-		return $ret_val;
-	}
-
-	/**
-	* represents the object as a string
-	*
-	* @return	string
-	* @access   public
-	*/
-	function __toString() {
-		return $this->varDump($this);
-	}
-}
-
-// XML Schema Datatype Helper Functions
-
-//xsd:dateTime helpers
-
-/**
-* convert unix timestamp to ISO 8601 compliant date string
-*
-* @param    int $timestamp Unix time stamp
-* @param	boolean $utc Whether the time stamp is UTC or local
-* @return	mixed ISO 8601 date string or false
-* @access   public
-*/
-function timestamp_to_iso8601($timestamp,$utc=true){
-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);
-	$pos = strrpos($datestr, "+");
-	if ($pos === FALSE) {
-		$pos = strrpos($datestr, "-");
-	}
-	if ($pos !== FALSE) {
-		if (strlen($datestr) == $pos + 5) {
-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
-		}
-	}
-	if($utc){
-		$pattern = '/'.
-		'([0-9]{4})-'.	// centuries & years CCYY-
-		'([0-9]{2})-'.	// months MM-
-		'([0-9]{2})'.	// days DD
-		'T'.			// separator T
-		'([0-9]{2}):'.	// hours hh:
-		'([0-9]{2}):'.	// minutes mm:
-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...
-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
-		'/';
-
-		if(preg_match($pattern,$datestr,$regs)){
-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);
-		}
-		return false;
-	} else {
-		return $datestr;
-	}
-}
-
-/**
-* convert ISO 8601 compliant date string to unix timestamp
-*
-* @param    string $datestr ISO 8601 compliant date string
-* @return	mixed Unix timestamp (int) or false
-* @access   public
-*/
-function iso8601_to_timestamp($datestr){
-	$pattern = '/'.
-	'([0-9]{4})-'.	// centuries & years CCYY-
-	'([0-9]{2})-'.	// months MM-
-	'([0-9]{2})'.	// days DD
-	'T'.			// separator T
-	'([0-9]{2}):'.	// hours hh:
-	'([0-9]{2}):'.	// minutes mm:
-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...
-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
-	'/';
-	if(preg_match($pattern,$datestr,$regs)){
-		// not utc
-		if($regs[8] != 'Z'){
-			$op = substr($regs[8],0,1);
-			$h = substr($regs[8],1,2);
-			$m = substr($regs[8],strlen($regs[8])-2,2);
-			if($op == '-'){
-				$regs[4] = $regs[4] + $h;
-				$regs[5] = $regs[5] + $m;
-			} elseif($op == '+'){
-				$regs[4] = $regs[4] - $h;
-				$regs[5] = $regs[5] - $m;
-			}
-		}
-		return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-//		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");
-	} else {
-		return false;
-	}
-}
-
-/**
-* sleeps some number of microseconds
-*
-* @param    string $usec the number of microseconds to sleep
-* @access   public
-* @deprecated
-*/
-function usleepWindows($usec)
-{
-	$start = gettimeofday();
-	
-	do
-	{
-		$stop = gettimeofday();
-		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])
-		+ $stop['usec'] - $start['usec'];
-	}
-	while ($timePassed < $usec);
-}
-
-
@@ -1,89 +0,0 @@
-<?php
-
-
-
-
-/**
-* Contains information for a SOAP fault.
-* Mainly used for returning faults from deployed functions
-* in a server instance.
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @version  $Id: class.soap_fault.php 6844 2011-06-03 14:46:51Z dMetzger $
-* @access public
-*/
-class nusoap_fault extends nusoap_base {
-	/**
-	 * The fault code (client|server)
-	 * @var string
-	 * @access private
-	 */
-	var $faultcode;
-	/**
-	 * The fault actor
-	 * @var string
-	 * @access private
-	 */
-	var $faultactor;
-	/**
-	 * The fault string, a description of the fault
-	 * @var string
-	 * @access private
-	 */
-	var $faultstring;
-	/**
-	 * The fault detail, typically a string or array of string
-	 * @var mixed
-	 * @access private
-	 */
-	var $faultdetail;
-
-	/**
-	* constructor
-    *
-    * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
-    * @param string $faultactor only used when msg routed between multiple actors
-    * @param string $faultstring human readable error message
-    * @param mixed $faultdetail detail, typically a string or array of string
-	*/
-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		parent::nusoap_base();
-		$this->faultcode = $faultcode;
-		$this->faultactor = $faultactor;
-		$this->faultstring = $faultstring;
-		$this->faultdetail = $faultdetail;
-	}
-
-	/**
-	* serialize a fault
-	*
-	* @return	string	The serialization of the fault instance.
-	* @access   public
-	*/
-	function serialize(){
-		$ns_string = '';
-		foreach($this->namespaces as $k => $v){
-			$ns_string .= "\n  xmlns:$k=\"$v\"";
-		}
-		$return_msg =
-			'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?>'.
-			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"'.$ns_string.">\n".
-				'<SOAP-ENV:Body>'.
-				'<SOAP-ENV:Fault>'.
-					$this->serialize_val($this->faultcode, 'faultcode').
-					$this->serialize_val($this->faultactor, 'faultactor').
-					$this->serialize_val($this->faultstring, 'faultstring').
-					$this->serialize_val($this->faultdetail, 'detail').
-				'</SOAP-ENV:Fault>'.
-				'</SOAP-ENV:Body>'.
-			'</SOAP-ENV:Envelope>';
-		return $return_msg;
-	}
-}
-
-/**
- * Backward compatibility
- */
-class soap_fault extends nusoap_fault {
-}
-
-
@@ -1,642 +0,0 @@
-<?php
-
-
-
-
-/**
-*
-* nusoap_parser class parses SOAP XML messages into native PHP values
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.soap_parser.php 6844 2011-06-03 14:46:51Z dMetzger $
-* @access   public
-*/
-class nusoap_parser extends nusoap_base {
-
-	var $xml = '';
-	var $xml_encoding = '';
-	var $method = '';
-	var $root_struct = '';
-	var $root_struct_name = '';
-	var $root_struct_namespace = '';
-	var $root_header = '';
-    var $document = '';			// incoming SOAP body (text)
-	// determines where in the message we are (envelope,header,body,method)
-	var $status = '';
-	var $position = 0;
-	var $depth = 0;
-	var $default_namespace = '';
-	var $namespaces = array();
-	var $message = array();
-    var $parent = '';
-	var $fault = false;
-	var $fault_code = '';
-	var $fault_str = '';
-	var $fault_detail = '';
-	var $depth_array = array();
-	var $debug_flag = true;
-	var $soapresponse = NULL;	// parsed SOAP Body
-	var $soapheader = NULL;		// parsed SOAP Header
-	var $responseHeaders = '';	// incoming SOAP headers (text)
-	var $body_position = 0;
-	// for multiref parsing:
-	// array of id => pos
-	var $ids = array();
-	// array of id => hrefs => pos
-	var $multirefs = array();
-	// toggle for auto-decoding element content
-	var $decode_utf8 = true;
-
-	/**
-	* constructor that actually does the parsing
-	*
-	* @param    string $xml SOAP message
-	* @param    string $encoding character encoding scheme of message
-	* @param    string $method method for which XML is parsed (unused?)
-	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
-	* @access   public
-	*/
-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
-		parent::nusoap_base();
-		$this->xml = $xml;
-		$this->xml_encoding = $encoding;
-		$this->method = $method;
-		$this->decode_utf8 = $decode_utf8;
-
-		// Check whether content has been read.
-		if(!empty($xml)){
-			// Check XML encoding
-			$pos_xml = strpos($xml, '<?xml');
-			if ($pos_xml !== FALSE) {
-				$xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);
-				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {
-					$xml_encoding = $res[1];
-					if (strtoupper($xml_encoding) != $encoding) {
-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";
-						$this->debug($err);
-						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {
-							$this->setError($err);
-							return;
-						}
-						// when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed
-					} else {
-						$this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');
-					}
-				} else {
-					$this->debug('No encoding specified in XML declaration');
-				}
-			} else {
-				$this->debug('No XML declaration');
-			}
-			$this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);
-			// Create an XML parser - why not xml_parser_create_ns?
-			$this->parser = xml_parser_create($this->xml_encoding);
-			// Set the options for parsing the XML data.
-			//xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-			xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);
-			// Set the object for the parser.
-			xml_set_object($this->parser, $this);
-			// Set the element handlers for the parser.
-			xml_set_element_handler($this->parser, 'start_element','end_element');
-			xml_set_character_data_handler($this->parser,'character_data');
-
-			// Parse the XML file.
-			if(!xml_parse($this->parser,$xml,true)){
-			    // Display an error message.
-			    $err = sprintf('XML error parsing SOAP payload on line %d: %s',
-			    xml_get_current_line_number($this->parser),
-			    xml_error_string(xml_get_error_code($this->parser)));
-				$this->debug($err);
-				$this->debug("XML payload:\n" . $xml);
-				$this->setError($err);
-			} else {
-				$this->debug('in nusoap_parser ctor, message:');
-				$this->appendDebug($this->varDump($this->message));
-				$this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);
-				// get final value
-				$this->soapresponse = $this->message[$this->root_struct]['result'];
-				// get header value
-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){
-					$this->soapheader = $this->message[$this->root_header]['result'];
-				}
-				// resolve hrefs/ids
-				if(sizeof($this->multirefs) > 0){
-					foreach($this->multirefs as $id => $hrefs){
-						$this->debug('resolving multirefs for id: '.$id);
-						$idVal = $this->buildVal($this->ids[$id]);
-						if (is_array($idVal) && isset($idVal['!id'])) {
-							unset($idVal['!id']);
-						}
-						foreach($hrefs as $refPos => $ref){
-							$this->debug('resolving href at pos '.$refPos);
-							$this->multirefs[$id][$refPos] = $idVal;
-						}
-					}
-				}
-			}
-			xml_parser_free($this->parser);
-		} else {
-			$this->debug('xml was empty, didn\'t parse!');
-			$this->setError('xml was empty, didn\'t parse!');
-		}
-	}
-
-	/**
-	* start-element handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $name element name
-	* @param    array $attrs associative array of attributes
-	* @access   private
-	*/
-	function start_element($parser, $name, $attrs) {
-		// position in a total number of elements, starting from 0
-		// update class level pos
-		$pos = $this->position++;
-		// and set mine
-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');
-		// depth = how many levels removed from root?
-		// set mine as current global depth and increment global depth value
-		$this->message[$pos]['depth'] = $this->depth++;
-
-		// else add self as child to whoever the current parent is
-		if($pos != 0){
-			$this->message[$this->parent]['children'] .= '|'.$pos;
-		}
-		// set my parent
-		$this->message[$pos]['parent'] = $this->parent;
-		// set self as current parent
-		$this->parent = $pos;
-		// set self as current value for this depth
-		$this->depth_array[$this->depth] = $pos;
-		// get element prefix
-		if(strpos($name,':')){
-			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
-			// get unqualified name
-			$name = substr(strstr($name,':'),1);
-		}
-		// set status
-		if ($name == 'Envelope' && $this->status == '') {
-			$this->status = 'envelope';
-		} elseif ($name == 'Header' && $this->status == 'envelope') {
-			$this->root_header = $pos;
-			$this->status = 'header';
-		} elseif ($name == 'Body' && $this->status == 'envelope'){
-			$this->status = 'body';
-			$this->body_position = $pos;
-		// set method
-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {
-			$this->status = 'method';
-			$this->root_struct_name = $name;
-			$this->root_struct = $pos;
-			$this->message[$pos]['type'] = 'struct';
-			$this->debug("found root struct $this->root_struct_name, pos $this->root_struct");
-		}
-		// set my status
-		$this->message[$pos]['status'] = $this->status;
-		// set name
-		$this->message[$pos]['name'] = htmlspecialchars($name);
-		// set attrs
-		$this->message[$pos]['attrs'] = $attrs;
-
-		// loop through atts, logging ns and type declarations
-        $attstr = '';
-		foreach($attrs as $key => $value){
-        	$key_prefix = $this->getPrefix($key);
-			$key_localpart = $this->getLocalPart($key);
-			// if ns declarations, add to class level array of valid namespaces
-            if($key_prefix == 'xmlns'){
-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){
-					$this->XMLSchemaVersion = $value;
-					$this->namespaces['xsd'] = $this->XMLSchemaVersion;
-					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';
-				}
-                $this->namespaces[$key_localpart] = $value;
-				// set method namespace
-				if($name == $this->root_struct_name){
-					$this->methodNamespace = $value;
-				}
-			// if it's a type declaration, set type
-        } elseif($key_localpart == 'type'){
-        		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {
-        			// do nothing: already processed arrayType
-        		} else {
-	            	$value_prefix = $this->getPrefix($value);
-	                $value_localpart = $this->getLocalPart($value);
-					$this->message[$pos]['type'] = $value_localpart;
-					$this->message[$pos]['typePrefix'] = $value_prefix;
-	                if(isset($this->namespaces[$value_prefix])){
-	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {
-						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];
-	                }
-					// should do something here with the namespace of specified type?
-				}
-			} elseif($key_localpart == 'arrayType'){
-				$this->message[$pos]['type'] = 'array';
-				/* do arrayType ereg here
-				[1]    arrayTypeValue    ::=    atype asize
-				[2]    atype    ::=    QName rank*
-				[3]    rank    ::=    '[' (',')* ']'
-				[4]    asize    ::=    '[' length~ ']'
-				[5]    length    ::=    nextDimension* Digit+
-				[6]    nextDimension    ::=    Digit+ ','
-				*/
-				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';
-				if(preg_match($expr,$value,$regs)){
-					$this->message[$pos]['typePrefix'] = $regs[1];
-					$this->message[$pos]['arrayTypePrefix'] = $regs[1];
-	                if (isset($this->namespaces[$regs[1]])) {
-	                	$this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];
-	                } else if (isset($attrs['xmlns:'.$regs[1]])) {
-						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];
-	                }
-					$this->message[$pos]['arrayType'] = $regs[2];
-					$this->message[$pos]['arraySize'] = $regs[3];
-					$this->message[$pos]['arrayCols'] = $regs[4];
-				}
-			// specifies nil value (or not)
-			} elseif ($key_localpart == 'nil'){
-				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');
-			// some other attribute
-			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {
-				$this->message[$pos]['xattrs']['!' . $key] = $value;
-			}
-
-			if ($key == 'xmlns') {
-				$this->default_namespace = $value;
-			}
-			// log id
-			if($key == 'id'){
-				$this->ids[$value] = $pos;
-			}
-			// root
-			if($key_localpart == 'root' && $value == 1){
-				$this->status = 'method';
-				$this->root_struct_name = $name;
-				$this->root_struct = $pos;
-				$this->debug("found root struct $this->root_struct_name, pos $pos");
-			}
-            // for doclit
-            $attstr .= " $key=\"$value\"";
-		}
-        // get namespace - must be done after namespace atts are processed
-		if(isset($prefix)){
-			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];
-			$this->default_namespace = $this->namespaces[$prefix];
-		} else {
-			$this->message[$pos]['namespace'] = $this->default_namespace;
-		}
-        if($this->status == 'header'){
-        	if ($this->root_header != $pos) {
-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
-	        }
-        } elseif($this->root_struct_name != ''){
-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
-        }
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
-	function end_element($parser, $name) {
-		// position of current element is equal to the last value left in depth_array for my depth
-		$pos = $this->depth_array[$this->depth--];
-
-        // get element prefix
-		if(strpos($name,':')){
-			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
-			// get unqualified name
-			$name = substr(strstr($name,':'),1);
-		}
-		
-		// build to native type
-		if(isset($this->body_position) && $pos > $this->body_position){
-			// deal w/ multirefs
-			if(isset($this->message[$pos]['attrs']['href'])){
-				// get id
-				$id = substr($this->message[$pos]['attrs']['href'],1);
-				// add placeholder to href array
-				$this->multirefs[$id][$pos] = 'placeholder';
-				// add set a reference to it as the result value
-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];
-            // build complexType values
-			} elseif($this->message[$pos]['children'] != ''){
-				// if result has already been generated (struct/array)
-				if(!isset($this->message[$pos]['result'])){
-					$this->message[$pos]['result'] = $this->buildVal($pos);
-				}
-			// build complexType values of attributes and possibly simpleContent
-			} elseif (isset($this->message[$pos]['xattrs'])) {
-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {
-					$this->message[$pos]['xattrs']['!'] = null;
-				} elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {
-	            	if (isset($this->message[$pos]['type'])) {
-						$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-					} else {
-						$parent = $this->message[$pos]['parent'];
-						if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-							$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-						} else {
-							$this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];
-						}
-					}
-				}
-				$this->message[$pos]['result'] = $this->message[$pos]['xattrs'];
-			// set value of simpleType (or nil complexType)
-			} else {
-            	//$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);
-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {
-					$this->message[$pos]['xattrs']['!'] = null;
-				} elseif (isset($this->message[$pos]['type'])) {
-					$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				} else {
-					$parent = $this->message[$pos]['parent'];
-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-						$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-					} else {
-						$this->message[$pos]['result'] = $this->message[$pos]['cdata'];
-					}
-				}
-
-				/* add value to parent's result, if parent is struct/array
-				$parent = $this->message[$pos]['parent'];
-				if($this->message[$parent]['type'] != 'map'){
-					if(strtolower($this->message[$parent]['type']) == 'array'){
-						$this->message[$parent]['result'][] = $this->message[$pos]['result'];
-					} else {
-						$this->message[$parent]['result'][$this->message[$pos]['name']] = $this->message[$pos]['result'];
-					}
-				}
-				*/
-			}
-		}
-		
-        // for doclit
-        if($this->status == 'header'){
-        	if ($this->root_header != $pos) {
-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
-	        }
-        } elseif($pos >= $this->root_struct){
-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
-        }
-		// switch status
-		if ($pos == $this->root_struct){
-			$this->status = 'body';
-			$this->root_struct_namespace = $this->message[$pos]['namespace'];
-		} elseif ($pos == $this->root_header) {
-			$this->status = 'envelope';
-		} elseif ($name == 'Body' && $this->status == 'body') {
-			$this->status = 'envelope';
-		} elseif ($name == 'Header' && $this->status == 'header') { // will never happen
-			$this->status = 'envelope';
-		} elseif ($name == 'Envelope' && $this->status == 'envelope') {
-			$this->status = '';
-		}
-		// set parent back to my parent
-		$this->parent = $this->message[$pos]['parent'];
-	}
-
-	/**
-	* element content handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
-	function character_data($parser, $data){
-		$pos = $this->depth_array[$this->depth];
-		if ($this->xml_encoding=='UTF-8'){
-			// TODO: add an option to disable this for folks who want
-			// raw UTF-8 that, e.g., might not map to iso-8859-1
-			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");
-			if($this->decode_utf8){
-				$data = utf8_decode($data);
-			}
-		}
-        $this->message[$pos]['cdata'] .= $data;
-        // for doclit
-        if($this->status == 'header'){
-        	$this->responseHeaders .= $data;
-        } else {
-        	$this->document .= $data;
-        }
-	}
-
-	/**
-	* get the parsed message (SOAP Body)
-	*
-	* @return	mixed
-	* @access   public
-	* @deprecated	use get_soapbody instead
-	*/
-	function get_response(){
-		return $this->soapresponse;
-	}
-
-	/**
-	* get the parsed SOAP Body (NULL if there was none)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function get_soapbody(){
-		return $this->soapresponse;
-	}
-
-	/**
-	* get the parsed SOAP Header (NULL if there was none)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function get_soapheader(){
-		return $this->soapheader;
-	}
-
-	/**
-	* get the unparsed SOAP Header
-	*
-	* @return	string XML or empty if no Header
-	* @access   public
-	*/
-	function getHeaders(){
-	    return $this->responseHeaders;
-	}
-
-	/**
-	* decodes simple types into PHP variables
-	*
-	* @param    string $value value to decode
-	* @param    string $type XML type to decode
-	* @param    string $typens XML type namespace to decode
-	* @return	mixed PHP value
-	* @access   private
-	*/
-	function decodeSimple($value, $type, $typens) {
-		// TODO: use the namespace!
-		if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {
-			return (string) $value;
-		}
-		if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {
-			return (int) $value;
-		}
-		if ($type == 'float' || $type == 'double' || $type == 'decimal') {
-			return (double) $value;
-		}
-		if ($type == 'boolean') {
-			if (strtolower($value) == 'false' || strtolower($value) == 'f') {
-				return false;
-			}
-			return (boolean) $value;
-		}
-		if ($type == 'base64' || $type == 'base64Binary') {
-			$this->debug('Decode base64 value');
-			return base64_decode($value);
-		}
-		// obscure numeric types
-		if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'
-			|| $type == 'nonNegativeInteger' || $type == 'positiveInteger'
-			|| $type == 'unsignedInt'
-			|| $type == 'unsignedShort' || $type == 'unsignedByte') {
-			return (int) $value;
-		}
-		// bogus: parser treats array with no elements as a simple type
-		if ($type == 'array') {
-			return array();
-		}
-		// everything else
-		return (string) $value;
-	}
-
-	/**
-	* builds response structures for compound values (arrays/structs)
-	* and scalars
-	*
-	* @param    integer $pos position in node tree
-	* @return	mixed	PHP value
-	* @access   private
-	*/
-	function buildVal($pos){
-		if(!isset($this->message[$pos]['type'])){
-			$this->message[$pos]['type'] = '';
-		}
-		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);
-		// if there are children...
-		if($this->message[$pos]['children'] != ''){
-			$this->debug('in buildVal, there are children');
-			$children = explode('|',$this->message[$pos]['children']);
-			array_shift($children); // knock off empty
-			// md array
-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){
-            	$r=0; // rowcount
-            	$c=0; // colcount
-            	foreach($children as $child_pos){
-					$this->debug("in buildVal, got an MD array element: $r, $c");
-					$params[$r][] = $this->message[$child_pos]['result'];
-				    $c++;
-				    if($c == $this->message[$pos]['arrayCols']){
-				    	$c = 0;
-						$r++;
-				    }
-                }
-            // array
-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){
-                $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
-                	$params[] = &$this->message[$child_pos]['result'];
-                }
-            // apache Map type: java hashtable
-            } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){
-                $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
-                	$kv = explode("|",$this->message[$child_pos]['children']);
-                   	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];
-                }
-            // generic compound type
-            //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {
-		    } else {
-	    		// Apache Vector type: treat as an array
-                $this->debug('in buildVal, adding Java Vector or generic compound type '.$this->message[$pos]['name']);
-				if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {
-					$notstruct = 1;
-				} else {
-					$notstruct = 0;
-	            }
-            	//
-            	foreach($children as $child_pos){
-            		if($notstruct){
-            			$params[] = &$this->message[$child_pos]['result'];
-            		} else {
-            			if (isset($params[$this->message[$child_pos]['name']])) {
-            				// de-serialize repeated element name into an array
-            				if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {
-            					$params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);
-            				}
-            				$params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];
-            			} else {
-					    	$params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];
-					    }
-                	}
-                }
-			}
-			if (isset($this->message[$pos]['xattrs'])) {
-                $this->debug('in buildVal, handling attributes');
-				foreach ($this->message[$pos]['xattrs'] as $n => $v) {
-					$params[$n] = $v;
-				}
-			}
-			// handle simpleContent
-			if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {
-                $this->debug('in buildVal, handling simpleContent');
-            	if (isset($this->message[$pos]['type'])) {
-					$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				} else {
-					$parent = $this->message[$pos]['parent'];
-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-						$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-					} else {
-						$params['!'] = $this->message[$pos]['cdata'];
-					}
-				}
-			}
-			$ret = is_array($params) ? $params : array();
-			$this->debug('in buildVal, return:');
-			$this->appendDebug($this->varDump($ret));
-			return $ret;
-		} else {
-        	$this->debug('in buildVal, no children, building scalar');
-			$cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';
-        	if (isset($this->message[$pos]['type'])) {
-				$ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				$this->debug("in buildVal, return: $ret");
-				return $ret;
-			}
-			$parent = $this->message[$pos]['parent'];
-			if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-				$ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-				$this->debug("in buildVal, return: $ret");
-				return $ret;
-			}
-           	$ret = $this->message[$pos]['cdata'];
-			$this->debug("in buildVal, return: $ret");
-           	return $ret;
-		}
-	}
-}
-
-/**
- * Backward compatibility
- */
-class soap_parser extends nusoap_parser {
-}
-
-
@@ -1,106 +0,0 @@
-<?php
-
-
-
-
-/**
-* For creating serializable abstractions of native PHP types.  This class
-* allows element name/namespace, XSD type, and XML attributes to be
-* associated with a value.  This is extremely useful when WSDL is not
-* used, but is also useful when WSDL is used with polymorphic types, including
-* xsd:anyType and user-defined types.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @version  $Id: class.soap_val.php 6844 2011-06-03 14:46:51Z dMetzger $
-* @access   public
-*/
-class soapval extends nusoap_base {
-	/**
-	 * The XML element name
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $name;
-	/**
-	 * The XML type name (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $type;
-	/**
-	 * The PHP value
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $value;
-	/**
-	 * The XML element namespace (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $element_ns;
-	/**
-	 * The XML type namespace (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $type_ns;
-	/**
-	 * The XML element attributes (array or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $attributes;
-
-	/**
-	* constructor
-	*
-	* @param    string $name optional name
-	* @param    mixed $type optional type name
-	* @param	mixed $value optional value
-	* @param	mixed $element_ns optional namespace of value
-	* @param	mixed $type_ns optional namespace of type
-	* @param	mixed $attributes associative array of attributes to add to element serialization
-	* @access   public
-	*/
-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		parent::nusoap_base();
-		$this->name = $name;
-		$this->type = $type;
-		$this->value = $value;
-		$this->element_ns = $element_ns;
-		$this->type_ns = $type_ns;
-		$this->attributes = $attributes;
-    }
-
-	/**
-	* return serialized value
-	*
-	* @param	string $use The WSDL use value (encoded|literal)
-	* @return	string XML data
-	* @access   public
-	*/
-	function serialize($use='encoded') {
-		return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);
-    }
-
-	/**
-	* decodes a soapval object into a PHP native type
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function decode(){
-		return $this->value;
-	}
-}
-
-
-
-
@@ -1,991 +0,0 @@
-<?php
-
-
-
-
-/**
-*
-* [nu]soapclient higher level class for easy usage.
-*
-* usage:
-*
-* // instantiate client with server info
-* $soapclient = new nusoap_client( string path [ ,mixed wsdl] );
-*
-* // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
-*
-* // bye bye client
-* unset($soapclient);
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.soapclient.php 6844 2011-06-03 14:46:51Z dMetzger $
-* @access   public
-*/
-class nusoap_client extends nusoap_base  {
-
-	var $username = '';				// Username for HTTP authentication
-	var $password = '';				// Password for HTTP authentication
-	var $authtype = '';				// Type of HTTP authentication
-	var $certRequest = array();		// Certificate for HTTP SSL authentication
-	var $requestHeaders = false;	// SOAP headers in request (text)
-	var $responseHeaders = '';		// SOAP headers from response (incomplete namespace resolution) (text)
-	var $responseHeader = NULL;		// SOAP Header from response (parsed)
-	var $document = '';				// SOAP body response portion (incomplete namespace resolution) (text)
-	var $endpoint;
-	var $forceEndpoint = '';		// overrides WSDL endpoint
-    var $proxyhost = '';
-    var $proxyport = '';
-	var $proxyusername = '';
-	var $proxypassword = '';
-	var $portName = '';				// port name to use in WSDL
-    var $xml_encoding = '';			// character set encoding of incoming (response) messages
-	var $http_encoding = false;
-	var $timeout = 0;				// HTTP connection timeout
-	var $response_timeout = 30;		// HTTP response timeout
-	var $endpointType = '';			// soap|wsdl, empty for WSDL initialization error
-	var $persistentConnection = false;
-	var $defaultRpcParams = false;	// This is no longer used
-	var $request = '';				// HTTP request
-	var $response = '';				// HTTP response
-	var $responseData = '';			// SOAP payload of response
-	var $cookies = array();			// Cookies from response or for request
-    var $decode_utf8 = true;		// toggles whether the parser decodes element content w/ utf8_decode()
-	var $operations = array();		// WSDL operations, empty for WSDL initialization error
-	var $curl_options = array();	// User-specified cURL options
-	var $bindingType = '';			// WSDL operation binding type
-	var $use_curl = false;			// whether to always try to use cURL
-
-	/*
-	 * fault related variables
-	 */
-	/**
-	 * @var      fault
-	 * @access   public
-	 */
-	var $fault;
-	/**
-	 * @var      faultcode
-	 * @access   public
-	 */
-	var $faultcode;
-	/**
-	 * @var      faultstring
-	 * @access   public
-	 */
-	var $faultstring;
-	/**
-	 * @var      faultdetail
-	 * @access   public
-	 */
-	var $faultdetail;
-
-	/**
-	* constructor
-	*
-	* @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)
-	* @param    mixed $wsdl optional, set to 'wsdl' or true if using WSDL
-	* @param    string $proxyhost optional
-	* @param    string $proxyport optional
-	* @param	string $proxyusername optional
-	* @param	string $proxypassword optional
-	* @param	integer $timeout set the connection timeout
-	* @param	integer $response_timeout set the response timeout
-	* @param	string $portName optional portName in WSDL document
-	* @access   public
-	*/
-	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
-		parent::nusoap_base();
-		$this->endpoint = $endpoint;
-		$this->proxyhost = $proxyhost;
-		$this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-		$this->timeout = $timeout;
-		$this->response_timeout = $response_timeout;
-		$this->portName = $portName;
-
-		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
-		$this->appendDebug('endpoint=' . $this->varDump($endpoint));
-
-		// make values
-		if($wsdl){
-			if (is_object($endpoint) && (get_class($endpoint) == 'wsdl')) {
-				$this->wsdl = $endpoint;
-				$this->endpoint = $this->wsdl->wsdl;
-				$this->wsdlFile = $this->endpoint;
-				$this->debug('existing wsdl instance created from ' . $this->endpoint);
-				$this->checkWSDL();
-			} else {
-				$this->wsdlFile = $this->endpoint;
-				$this->wsdl = null;
-				$this->debug('will use lazy evaluation of wsdl from ' . $this->endpoint);
-			}
-			$this->endpointType = 'wsdl';
-		} else {
-			$this->debug("instantiate SOAP with endpoint at $endpoint");
-			$this->endpointType = 'soap';
-		}
-	}
-
-	/**
-	* calls method, returns PHP native type
-	*
-	* @param    string $operation SOAP server URL or path
-	* @param    mixed $params An array, associative or simple, of the parameters
-	*			              for the method call, or a string that is the XML
-	*			              for the call.  For rpc style, this call will
-	*			              wrap the XML in a tag named after the method, as
-	*			              well as the SOAP Envelope and Body.  For document
-	*			              style, this will only wrap with the Envelope and Body.
-	*			              IMPORTANT: when using an array with document style,
-	*			              in which case there
-	*                         is really one parameter, the root of the fragment
-	*                         used in the call, which encloses what programmers
-	*                         normally think of parameters.  A parameter array
-	*                         *must* include the wrapper.
-	* @param	string $namespace optional method namespace (WSDL can override)
-	* @param	string $soapAction optional SOAPAction value (WSDL can override)
-	* @param	mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
-	* @param	boolean $rpcParams optional (no longer used)
-	* @param	string	$style optional (rpc|document) the style to use when serializing parameters (WSDL can override)
-	* @param	string	$use optional (encoded|literal) the use when serializing parameters (WSDL can override)
-	* @return	mixed	response from SOAP call, normally an associative array mirroring the structure of the XML response, false for certain fatal errors
-	* @access   public
-	*/
-	function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAction='',$headers=false,$rpcParams=null,$style='rpc',$use='encoded'){
-		$this->operation = $operation;
-		$this->fault = false;
-		$this->setError('');
-		$this->request = '';
-		$this->response = '';
-		$this->responseData = '';
-		$this->faultstring = '';
-		$this->faultcode = '';
-		$this->opData = array();
-		
-		$this->debug("call: operation=$operation, namespace=$namespace, soapAction=$soapAction, rpcParams=$rpcParams, style=$style, use=$use, endpointType=$this->endpointType");
-		$this->appendDebug('params=' . $this->varDump($params));
-		$this->appendDebug('headers=' . $this->varDump($headers));
-		if ($headers) {
-			$this->requestHeaders = $headers;
-		}
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError())
-				return false;
-		}
-		// serialize parameters
-		if($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)){
-			// use WSDL for operation
-			$this->opData = $opData;
-			$this->debug("found operation");
-			$this->appendDebug('opData=' . $this->varDump($opData));
-			if (isset($opData['soapAction'])) {
-				$soapAction = $opData['soapAction'];
-			}
-			if (! $this->forceEndpoint) {
-				$this->endpoint = $opData['endpoint'];
-			} else {
-				$this->endpoint = $this->forceEndpoint;
-			}
-			$namespace = isset($opData['input']['namespace']) ? $opData['input']['namespace'] :	$namespace;
-			$style = $opData['style'];
-			$use = $opData['input']['use'];
-			// add ns to ns array
-			if($namespace != '' && !isset($this->wsdl->namespaces[$namespace])){
-				$nsPrefix = 'ns' . rand(1000, 9999);
-				$this->wsdl->namespaces[$nsPrefix] = $namespace;
-			}
-            $nsPrefix = $this->wsdl->getPrefixFromNamespace($namespace);
-			// serialize payload
-			if (is_string($params)) {
-				$this->debug("serializing param string for WSDL operation $operation");
-				$payload = $params;
-			} elseif (is_array($params)) {
-				$this->debug("serializing param array for WSDL operation $operation");
-				$payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType);
-			} else {
-				$this->debug('params must be array or string');
-				$this->setError('params must be array or string');
-				return false;
-			}
-            $usedNamespaces = $this->wsdl->usedNamespaces;
-			if (isset($opData['input']['encodingStyle'])) {
-				$encodingStyle = $opData['input']['encodingStyle'];
-			} else {
-				$encodingStyle = '';
-			}
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			if ($errstr = $this->wsdl->getError()) {
-				$this->debug('got wsdl error: '.$errstr);
-				$this->setError('wsdl error: '.$errstr);
-				return false;
-			}
-		} elseif($this->endpointType == 'wsdl') {
-			// operation not in WSDL
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->setError('operation '.$operation.' not present in WSDL.');
-			$this->debug("operation '$operation' not present in WSDL.");
-			return false;
-		} else {
-			// no WSDL
-			//$this->namespaces['ns1'] = $namespace;
-			$nsPrefix = 'ns' . rand(1000, 9999);
-			// serialize 
-			$payload = '';
-			if (is_string($params)) {
-				$this->debug("serializing param string for operation $operation");
-				$payload = $params;
-			} elseif (is_array($params)) {
-				$this->debug("serializing param array for operation $operation");
-				foreach($params as $k => $v){
-					$payload .= $this->serialize_val($v,$k,false,false,false,false,$use);
-				}
-			} else {
-				$this->debug('params must be array or string');
-				$this->setError('params must be array or string');
-				return false;
-			}
-			$usedNamespaces = array();
-			if ($use == 'encoded') {
-				$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-			} else {
-				$encodingStyle = '';
-			}
-		}
-		// wrap RPC calls with method element
-		if ($style == 'rpc') {
-			if ($use == 'literal') {
-				$this->debug("wrapping RPC request with literal method element");
-				if ($namespace) {
-					// http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace
-					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .
-								$payload .
-								"</$nsPrefix:$operation>";
-				} else {
-					$payload = "<$operation>" . $payload . "</$operation>";
-				}
-			} else {
-				$this->debug("wrapping RPC request with encoded method element");
-				if ($namespace) {
-					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .
-								$payload .
-								"</$nsPrefix:$operation>";
-				} else {
-					$payload = "<$operation>" .
-								$payload .
-								"</$operation>";
-				}
-			}
-		}
-		// serialize envelope
-		$soapmsg = $this->serializeEnvelope($payload,$this->requestHeaders,$usedNamespaces,$style,$use,$encodingStyle);
-		$this->debug("endpoint=$this->endpoint, soapAction=$soapAction, namespace=$namespace, style=$style, use=$use, encodingStyle=$encodingStyle");
-		$this->debug('SOAP message length=' . strlen($soapmsg) . ' contents (max 1000 bytes)=' . substr($soapmsg, 0, 1000));
-		// send
-		$return = $this->send($this->getHTTPBody($soapmsg),$soapAction,$this->timeout,$this->response_timeout);
-		if($errstr = $this->getError()){
-			$this->debug('Error: '.$errstr);
-			return false;
-		} else {
-			$this->return = $return;
-			$this->debug('sent message successfully and got a(n) '.gettype($return));
-           	$this->appendDebug('return=' . $this->varDump($return));
-			
-			// fault?
-			if(is_array($return) && isset($return['faultcode'])){
-				$this->debug('got fault');
-				$this->setError($return['faultcode'].': '.$return['faultstring']);
-				$this->fault = true;
-				foreach($return as $k => $v){
-					$this->$k = $v;
-					$this->debug("$k = $v<br>");
-				}
-				return $return;
-			} elseif ($style == 'document') {
-				// NOTE: if the response is defined to have multiple parts (i.e. unwrapped),
-				// we are only going to return the first part here...sorry about that
-				return $return;
-			} else {
-				// array of return values
-				if(is_array($return)){
-					// multiple 'out' parameters, which we return wrapped up
-					// in the array
-					if(sizeof($return) > 1){
-						return $return;
-					}
-					// single 'out' parameter (normally the return value)
-					$return = array_shift($return);
-					$this->debug('return shifted value: ');
-					$this->appendDebug($this->varDump($return));
-           			return $return;
-				// nothing returned (ie, echoVoid)
-				} else {
-					return "";
-				}
-			}
-		}
-	}
-
-	/**
-	* check WSDL passed as an instance or pulled from an endpoint
-	*
-	* @access   private
-	*/
-	function checkWSDL() {
-		$this->appendDebug($this->wsdl->getDebug());
-		$this->wsdl->clearDebug();
-		$this->debug('checkWSDL');
-		// catch errors
-		if ($errstr = $this->wsdl->getError()) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->debug('got wsdl error: '.$errstr);
-			$this->setError('wsdl error: '.$errstr);
-		} elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap')) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->bindingType = 'soap';
-			$this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);
-		} elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap12')) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->bindingType = 'soap12';
-			$this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);
-			$this->debug('**************** WARNING: SOAP 1.2 BINDING *****************');
-		} else {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->debug('getOperations returned false');
-			$this->setError('no operations defined in the WSDL document!');
-		}
-	}
-
-	/**
-	 * instantiate wsdl object and parse wsdl file
-	 *
-	 * @access	public
-	 */
-	function loadWSDL() {
-		$this->debug('instantiating wsdl class with doc: '.$this->wsdlFile);
-		$this->wsdl = new wsdl('',$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout,$this->curl_options,$this->use_curl);
-		$this->wsdl->setCredentials($this->username, $this->password, $this->authtype, $this->certRequest);
-		$this->wsdl->fetchWSDL($this->wsdlFile);
-		$this->checkWSDL();
-	}
-
-	/**
-	* get available data pertaining to an operation
-	*
-	* @param    string $operation operation name
-	* @return	array array of data pertaining to the operation
-	* @access   public
-	*/
-	function getOperationData($operation){
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError())
-				return false;
-		}
-		if(isset($this->operations[$operation])){
-			return $this->operations[$operation];
-		}
-		$this->debug("No data for operation: $operation");
-	}
-
-    /**
-    * send the SOAP message
-    *
-    * Note: if the operation has multiple return values
-    * the return value of this method will be an array
-    * of those values.
-    *
-	* @param    string $msg a SOAPx4 soapmsg object
-	* @param    string $soapaction SOAPAction value
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	mixed native PHP types.
-	* @access   private
-	*/
-	function send($msg, $soapaction = '', $timeout=0, $response_timeout=30) {
-		$this->checkCookies();
-		// detect transport
-		switch(true){
-			// http(s)
-			case preg_match('/^http/',$this->endpoint):
-				$this->debug('transporting via HTTP');
-				if($this->persistentConnection == true && is_object($this->persistentConnection)){
-					$http =& $this->persistentConnection;
-				} else {
-					$http = new soap_transport_http($this->endpoint, $this->curl_options, $this->use_curl);
-					if ($this->persistentConnection) {
-						$http->usePersistentConnection();
-					}
-				}
-				$http->setContentType($this->getHTTPContentType(), $this->getHTTPContentTypeCharset());
-				$http->setSOAPAction($soapaction);
-				if($this->proxyhost && $this->proxyport){
-					$http->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
-				}
-                if($this->authtype != '') {
-					$http->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
-				}
-				if($this->http_encoding != ''){
-					$http->setEncoding($this->http_encoding);
-				}
-				$this->debug('sending message, length='.strlen($msg));
-				if(preg_match('/^http:/',$this->endpoint)){
-				//if(strpos($this->endpoint,'http:')){
-					$this->responseData = $http->send($msg,$timeout,$response_timeout,$this->cookies);
-				} elseif(preg_match('/^https/',$this->endpoint)){
-				//} elseif(strpos($this->endpoint,'https:')){
-					//if(phpversion() == '4.3.0-dev'){
-						//$response = $http->send($msg,$timeout,$response_timeout);
-                   		//$this->request = $http->outgoing_payload;
-						//$this->response = $http->incoming_payload;
-					//} else
-					$this->responseData = $http->sendHTTPS($msg,$timeout,$response_timeout,$this->cookies);
-				} else {
-					$this->setError('no http/s in endpoint url');
-				}
-				$this->request = $http->outgoing_payload;
-				$this->response = $http->incoming_payload;
-				$this->appendDebug($http->getDebug());
-				$this->UpdateCookies($http->incoming_cookies);
-
-				// save transport object if using persistent connections
-				if ($this->persistentConnection) {
-					$http->clearDebug();
-					if (!is_object($this->persistentConnection)) {
-						$this->persistentConnection = $http;
-					}
-				}
-				
-				if($err = $http->getError()){
-					$this->setError('HTTP Error: '.$err);
-					return false;
-				} elseif($this->getError()){
-					return false;
-				} else {
-					$this->debug('got response, length='. strlen($this->responseData).' type='.$http->incoming_headers['content-type']);
-					return $this->parseResponse($http->incoming_headers, $this->responseData);
-				}
-			break;
-			default:
-				$this->setError('no transport found, or selected transport is not yet supported!');
-			return false;
-			break;
-		}
-	}
-
-	/**
-	* processes SOAP message returned from server
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed response data from server
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseResponse($headers, $data) {
-		$this->debug('Entering parseResponse() for data of length ' . strlen($data) . ' headers:');
-		$this->appendDebug($this->varDump($headers));
-    	if (!isset($headers['content-type'])) {
-			$this->setError('Response not of type text/xml (no content-type header)');
-			return false;
-    	}
-		if (!strstr($headers['content-type'], 'text/xml')) {
-			$this->setError('Response not of type text/xml: ' . $headers['content-type']);
-			return false;
-		}
-		if (strpos($headers['content-type'], '=')) {
-			$enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));
-			$this->debug('Got response encoding: ' . $enc);
-			if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){
-				$this->xml_encoding = strtoupper($enc);
-			} else {
-				$this->xml_encoding = 'US-ASCII';
-			}
-		} else {
-			// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-			$this->xml_encoding = 'ISO-8859-1';
-		}
-		$this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');
-		$parser = new nusoap_parser($data,$this->xml_encoding,$this->operation,$this->decode_utf8);
-		// add parser debug data to our debug
-		$this->appendDebug($parser->getDebug());
-		// if parse errors
-		if($errstr = $parser->getError()){
-			$this->setError( $errstr);
-			// destroy the parser object
-			unset($parser);
-			return false;
-		} else {
-			// get SOAP headers
-			$this->responseHeaders = $parser->getHeaders();
-			// get SOAP headers
-			$this->responseHeader = $parser->get_soapheader();
-			// get decoded message
-			$return = $parser->get_soapbody();
-            // add document for doclit support
-            $this->document = $parser->document;
-			// destroy the parser object
-			unset($parser);
-			// return decode message
-			return $return;
-		}
-	 }
-
-	/**
-	* sets user-specified cURL options
-	*
-	* @param	mixed $option The cURL option (always integer?)
-	* @param	mixed $value The cURL option value
-	* @access   public
-	*/
-	function setCurlOption($option, $value) {
-		$this->debug("setCurlOption option=$option, value=");
-		$this->appendDebug($this->varDump($value));
-		$this->curl_options[$option] = $value;
-	}
-
-	/**
-	* sets the SOAP endpoint, which can override WSDL
-	*
-	* @param	string $endpoint The endpoint URL to use, or empty string or false to prevent override
-	* @access   public
-	*/
-	function setEndpoint($endpoint) {
-		$this->debug("setEndpoint(\"$endpoint\")");
-		$this->forceEndpoint = $endpoint;
-	}
-
-	/**
-	* set the SOAP headers
-	*
-	* @param	mixed $headers String of XML with SOAP header content, or array of soapval objects for SOAP headers
-	* @access   public
-	*/
-	function setHeaders($headers){
-		$this->debug("setHeaders headers=");
-		$this->appendDebug($this->varDump($headers));
-		$this->requestHeaders = $headers;
-	}
-
-	/**
-	* get the SOAP response headers (namespace resolution incomplete)
-	*
-	* @return	string
-	* @access   public
-	*/
-	function getHeaders(){
-		return $this->responseHeaders;
-	}
-
-	/**
-	* get the SOAP response Header (parsed)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function getHeader(){
-		return $this->responseHeader;
-	}
-
-	/**
-	* set proxy info here
-	*
-	* @param    string $proxyhost
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @access   public
-	*/
-	function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '') {
-		$this->proxyhost = $proxyhost;
-		$this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-	}
-
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {
-		$this->debug("setCredentials username=$username authtype=$authtype certRequest=");
-		$this->appendDebug($this->varDump($certRequest));
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-		$this->certRequest = $certRequest;
-	}
-	
-	/**
-	* use HTTP encoding
-	*
-	* @param    string $enc HTTP encoding
-	* @access   public
-	*/
-	function setHTTPEncoding($enc='gzip, deflate'){
-		$this->debug("setHTTPEncoding(\"$enc\")");
-		$this->http_encoding = $enc;
-	}
-	
-	/**
-	* Set whether to try to use cURL connections if possible
-	*
-	* @param	boolean $use Whether to try to use cURL
-	* @access   public
-	*/
-	function setUseCURL($use) {
-		$this->debug("setUseCURL($use)");
-		$this->use_curl = $use;
-	}
-
-	/**
-	* use HTTP persistent connections if possible
-	*
-	* @access   public
-	*/
-	function useHTTPPersistentConnection(){
-		$this->debug("useHTTPPersistentConnection");
-		$this->persistentConnection = true;
-	}
-	
-	/**
-	* gets the default RPC parameter setting.
-	* If true, default is that call params are like RPC even for document style.
-	* Each call() can override this value.
-	*
-	* This is no longer used.
-	*
-	* @return boolean
-	* @access public
-	* @deprecated
-	*/
-	function getDefaultRpcParams() {
-		return $this->defaultRpcParams;
-	}
-
-	/**
-	* sets the default RPC parameter setting.
-	* If true, default is that call params are like RPC even for document style
-	* Each call() can override this value.
-	*
-	* This is no longer used.
-	*
-	* @param    boolean $rpcParams
-	* @access public
-	* @deprecated
-	*/
-	function setDefaultRpcParams($rpcParams) {
-		$this->defaultRpcParams = $rpcParams;
-	}
-	
-	/**
-	* dynamically creates an instance of a proxy class,
-	* allowing user to directly call methods from wsdl
-	*
-	* @return   object soap_proxy object
-	* @access   public
-	*/
-	function getProxy() {
-		$r = rand();
-		$evalStr = $this->_getProxyClassCode($r);
-		//$this->debug("proxy class: $evalStr");
-		if ($this->getError()) {
-			$this->debug("Error from _getProxyClassCode, so return NULL");
-			return null;
-		}
-		// eval the class
-		eval($evalStr);
-		// instantiate proxy object
-		eval("\$proxy = new nusoap_proxy_$r('');");
-		// transfer current wsdl data to the proxy thereby avoiding parsing the wsdl twice
-		$proxy->endpointType = 'wsdl';
-		$proxy->wsdlFile = $this->wsdlFile;
-		$proxy->wsdl = $this->wsdl;
-		$proxy->operations = $this->operations;
-		$proxy->defaultRpcParams = $this->defaultRpcParams;
-		// transfer other state
-		$proxy->soap_defencoding = $this->soap_defencoding;
-		$proxy->username = $this->username;
-		$proxy->password = $this->password;
-		$proxy->authtype = $this->authtype;
-		$proxy->certRequest = $this->certRequest;
-		$proxy->requestHeaders = $this->requestHeaders;
-		$proxy->endpoint = $this->endpoint;
-		$proxy->forceEndpoint = $this->forceEndpoint;
-		$proxy->proxyhost = $this->proxyhost;
-		$proxy->proxyport = $this->proxyport;
-		$proxy->proxyusername = $this->proxyusername;
-		$proxy->proxypassword = $this->proxypassword;
-		$proxy->http_encoding = $this->http_encoding;
-		$proxy->timeout = $this->timeout;
-		$proxy->response_timeout = $this->response_timeout;
-		$proxy->persistentConnection = &$this->persistentConnection;
-		$proxy->decode_utf8 = $this->decode_utf8;
-		$proxy->curl_options = $this->curl_options;
-		$proxy->bindingType = $this->bindingType;
-		$proxy->use_curl = $this->use_curl;
-		return $proxy;
-	}
-
-	/**
-	* dynamically creates proxy class code
-	*
-	* @return   string PHP/NuSOAP code for the proxy class
-	* @access   private
-	*/
-	function _getProxyClassCode($r) {
-		$this->debug("in getProxy endpointType=$this->endpointType");
-		$this->appendDebug("wsdl=" . $this->varDump($this->wsdl));
-		if ($this->endpointType != 'wsdl') {
-			$evalStr = 'A proxy can only be created for a WSDL client';
-			$this->setError($evalStr);
-			$evalStr = "echo \"$evalStr\";";
-			return $evalStr;
-		}
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError()) {
-				return "echo \"" . $this->getError() . "\";";
-			}
-		}
-		$evalStr = '';
-		foreach ($this->operations as $operation => $opData) {
-			if ($operation != '') {
-				// create param string and param comment string
-				if (sizeof($opData['input']['parts']) > 0) {
-					$paramStr = '';
-					$paramArrayStr = '';
-					$paramCommentStr = '';
-					foreach ($opData['input']['parts'] as $name => $type) {
-						$paramStr .= "\$$name, ";
-						$paramArrayStr .= "'$name' => \$$name, ";
-						$paramCommentStr .= "$type \$$name, ";
-					}
-					$paramStr = substr($paramStr, 0, strlen($paramStr)-2);
-					$paramArrayStr = substr($paramArrayStr, 0, strlen($paramArrayStr)-2);
-					$paramCommentStr = substr($paramCommentStr, 0, strlen($paramCommentStr)-2);
-				} else {
-					$paramStr = '';
-					$paramArrayStr = '';
-					$paramCommentStr = 'void';
-				}
-				$opData['namespace'] = !isset($opData['namespace']) ? 'http://testuri.com' : $opData['namespace'];
-				$evalStr .= "// $paramCommentStr
-	function " . str_replace('.', '__', $operation) . "($paramStr) {
-		\$params = array($paramArrayStr);
-		return \$this->call('$operation', \$params, '".$opData['namespace']."', '".(isset($opData['soapAction']) ? $opData['soapAction'] : '')."');
-	}
-	";
-				unset($paramStr);
-				unset($paramCommentStr);
-			}
-		}
-		$evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client {
-	'.$evalStr.'
-}';
-		return $evalStr;
-	}
-
-	/**
-	* dynamically creates proxy class code
-	*
-	* @return   string PHP/NuSOAP code for the proxy class
-	* @access   public
-	*/
-	function getProxyClassCode() {
-		$r = rand();
-		return $this->_getProxyClassCode($r);
-	}
-
-	/**
-	* gets the HTTP body for the current request.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		return $soapmsg;
-	}
-	
-	/**
-	* gets the HTTP content type for the current request.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current request.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		return 'text/xml';
-	}
-	
-	/**
-	* gets the HTTP content type charset for the current request.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current request.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		return $this->soap_defencoding;
-	}
-
-	/*
-	* whether or not parser should decode utf8 element content
-    *
-    * @return   always returns true
-    * @access   public
-    */
-    function decodeUTF8($bool){
-		$this->decode_utf8 = $bool;
-		return true;
-    }
-
-	/**
-	 * adds a new Cookie into $this->cookies array
-	 *
-	 * @param	string $name Cookie Name
-	 * @param	string $value Cookie Value
-	 * @return	boolean if cookie-set was successful returns true, else false
-	 * @access	public
-	 */
-	function setCookie($name, $value) {
-		if (strlen($name) == 0) {
-			return false;
-		}
-		$this->cookies[] = array('name' => $name, 'value' => $value);
-		return true;
-	}
-
-	/**
-	 * gets all Cookies
-	 *
-	 * @return   array with all internal cookies
-	 * @access   public
-	 */
-	function getCookies() {
-		return $this->cookies;
-	}
-
-	/**
-	 * checks all Cookies and delete those which are expired
-	 *
-	 * @return   boolean always return true
-	 * @access   private
-	 */
-	function checkCookies() {
-		if (sizeof($this->cookies) == 0) {
-			return true;
-		}
-		$this->debug('checkCookie: check ' . sizeof($this->cookies) . ' cookies');
-		$curr_cookies = $this->cookies;
-		$this->cookies = array();
-		foreach ($curr_cookies as $cookie) {
-			if (! is_array($cookie)) {
-				$this->debug('Remove cookie that is not an array');
-				continue;
-			}
-			if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
-				if (strtotime($cookie['expires']) > time()) {
-					$this->cookies[] = $cookie;
-				} else {
-					$this->debug('Remove expired cookie ' . $cookie['name']);
-				}
-			} else {
-				$this->cookies[] = $cookie;
-			}
-		}
-		$this->debug('checkCookie: '.sizeof($this->cookies).' cookies left in array');
-		return true;
-	}
-
-	/**
-	 * updates the current cookies with a new set
-	 *
-	 * @param	array $cookies new cookies with which to update current ones
-	 * @return	boolean always return true
-	 * @access	private
-	 */
-	function UpdateCookies($cookies) {
-		if (sizeof($this->cookies) == 0) {
-			// no existing cookies: take whatever is new
-			if (sizeof($cookies) > 0) {
-				$this->debug('Setting new cookie(s)');
-				$this->cookies = $cookies;
-			}
-			return true;
-		}
-		if (sizeof($cookies) == 0) {
-			// no new cookies: keep what we've got
-			return true;
-		}
-		// merge
-		foreach ($cookies as $newCookie) {
-			if (!is_array($newCookie)) {
-				continue;
-			}
-			if ((!isset($newCookie['name'])) || (!isset($newCookie['value']))) {
-				continue;
-			}
-			$newName = $newCookie['name'];
-
-			$found = false;
-			for ($i = 0; $i < count($this->cookies); $i++) {
-				$cookie = $this->cookies[$i];
-				if (!is_array($cookie)) {
-					continue;
-				}
-				if (!isset($cookie['name'])) {
-					continue;
-				}
-				if ($newName != $cookie['name']) {
-					continue;
-				}
-				$newDomain = isset($newCookie['domain']) ? $newCookie['domain'] : 'NODOMAIN';
-				$domain = isset($cookie['domain']) ? $cookie['domain'] : 'NODOMAIN';
-				if ($newDomain != $domain) {
-					continue;
-				}
-				$newPath = isset($newCookie['path']) ? $newCookie['path'] : 'NOPATH';
-				$path = isset($cookie['path']) ? $cookie['path'] : 'NOPATH';
-				if ($newPath != $path) {
-					continue;
-				}
-				$this->cookies[$i] = $newCookie;
-				$found = true;
-				$this->debug('Update cookie ' . $newName . '=' . $newCookie['value']);
-				break;
-			}
-			if (! $found) {
-				$this->debug('Add cookie ' . $newName . '=' . $newCookie['value']);
-				$this->cookies[] = $newCookie;
-			}
-		}
-		return true;
-	}
-}
-
-if (!extension_loaded('soap')) {
-	/**
-	 *	For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.
-	 */
-	class soapclient extends nusoap_client {
-	}
-}
-?>
@@ -1,209 +0,0 @@
-<?php
-/*
-The NuSOAP project home is:
-http://sourceforge.net/projects/nusoap/
-
-The primary support for NuSOAP is the mailing list:
-nusoap-general@lists.sourceforge.net
-*/
-
-/**
-* caches instances of the wsdl class
-* 
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @author	Ingo Fischer <ingo@apollon.de>
-* @version  $Id: class.wsdlcache.php 6844 2011-06-03 14:46:51Z dMetzger $
-* @access public 
-*/
-class nusoap_wsdlcache {
-	/**
-	 *	@var resource
-	 *	@access private
-	 */
-	var $fplock;
-	/**
-	 *	@var integer
-	 *	@access private
-	 */
-	var $cache_lifetime;
-	/**
-	 *	@var string
-	 *	@access private
-	 */
-	var $cache_dir;
-	/**
-	 *	@var string
-	 *	@access public
-	 */
-	var $debug_str = '';
-
-	/**
-	* constructor
-	*
-	* @param string $cache_dir directory for cache-files
-	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
-	* @access public
-	*/
-	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {
-		$this->fplock = array();
-		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';
-		$this->cache_lifetime = $cache_lifetime;
-	}
-
-	/**
-	* creates the filename used to cache a wsdl instance
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return string The filename used to cache the instance
-	* @access private
-	*/
-	function createFilename($wsdl) {
-		return $this->cache_dir.'/wsdlcache-' . md5($wsdl);
-	}
-
-	/**
-	* adds debug data to the class level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function debug($string){
-		$this->debug_str .= get_class($this).": $string\n";
-	}
-
-	/**
-	* gets a wsdl instance from the cache
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return object wsdl The cached wsdl instance, null if the instance is not in the cache
-	* @access public
-	*/
-	function get($wsdl) {
-		$filename = $this->createFilename($wsdl);
-		if ($this->obtainMutex($filename, "r")) {
-			// check for expired WSDL that must be removed from the cache
- 			if ($this->cache_lifetime > 0) {
-				if (file_exists($filename) && (time() - filemtime($filename) > $this->cache_lifetime)) {
-					unlink($filename);
-					$this->debug("Expired $wsdl ($filename) from cache");
-					$this->releaseMutex($filename);
-					return null;
-  				}
-			}
-			// see what there is to return
-			if (!file_exists($filename)) {
-				$this->debug("$wsdl ($filename) not in cache (1)");
-				$this->releaseMutex($filename);
-				return null;
-			}
-			$fp = @fopen($filename, "r");
-			if ($fp) {
-				$s = implode("", @file($filename));
-				fclose($fp);
-				$this->debug("Got $wsdl ($filename) from cache");
-			} else {
-				$s = null;
-				$this->debug("$wsdl ($filename) not in cache (2)");
-			}
-			$this->releaseMutex($filename);
-			return (!is_null($s)) ? unserialize($s) : null;
-		} else {
-			$this->debug("Unable to obtain mutex for $filename in get");
-		}
-		return null;
-	}
-
-	/**
-	* obtains the local mutex
-	*
-	* @param string $filename The Filename of the Cache to lock
-	* @param string $mode The open-mode ("r" or "w") or the file - affects lock-mode
-	* @return boolean Lock successfully obtained ?!
-	* @access private
-	*/
-	function obtainMutex($filename, $mode) {
-		if (isset($this->fplock[md5($filename)])) {
-			$this->debug("Lock for $filename already exists");
-			return false;
-		}
-		$this->fplock[md5($filename)] = fopen($filename.".lock", "w");
-		if ($mode == "r") {
-			return flock($this->fplock[md5($filename)], LOCK_SH);
-		} else {
-			return flock($this->fplock[md5($filename)], LOCK_EX);
-		}
-	}
-
-	/**
-	* adds a wsdl instance to the cache
-	*
-	* @param object wsdl $wsdl_instance The wsdl instance to add
-	* @return boolean WSDL successfully cached
-	* @access public
-	*/
-	function put($wsdl_instance) {
-		$filename = $this->createFilename($wsdl_instance->wsdl);
-		$s = serialize($wsdl_instance);
-		if ($this->obtainMutex($filename, "w")) {
-			$fp = fopen($filename, "w");
-			if (! $fp) {
-				$this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");
-				$this->releaseMutex($filename);
-				return false;
-			}
-			fputs($fp, $s);
-			fclose($fp);
-			$this->debug("Put $wsdl_instance->wsdl ($filename) in cache");
-			$this->releaseMutex($filename);
-			return true;
-		} else {
-			$this->debug("Unable to obtain mutex for $filename in put");
-		}
-		return false;
-	}
-
-	/**
-	* releases the local mutex
-	*
-	* @param string $filename The Filename of the Cache to lock
-	* @return boolean Lock successfully released
-	* @access private
-	*/
-	function releaseMutex($filename) {
-		$ret = flock($this->fplock[md5($filename)], LOCK_UN);
-		fclose($this->fplock[md5($filename)]);
-		unset($this->fplock[md5($filename)]);
-		if (! $ret) {
-			$this->debug("Not able to release lock for $filename");
-		}
-		return $ret;
-	}
-
-	/**
-	* removes a wsdl instance from the cache
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return boolean Whether there was an instance to remove
-	* @access public
-	*/
-	function remove($wsdl) {
-		$filename = $this->createFilename($wsdl);
-		if (!file_exists($filename)) {
-			$this->debug("$wsdl ($filename) not in cache to be removed");
-			return false;
-		}
-		// ignore errors obtaining mutex
-		$this->obtainMutex($filename, "w");
-		$ret = unlink($filename);
-		$this->debug("Removed ($ret) $wsdl ($filename) from cache");
-		$this->releaseMutex($filename);
-		return $ret;
-	}
-}
-
-/**
- * For backward compatibility
- */
-class wsdlcache extends nusoap_wsdlcache {
-}
-?>
@@ -1,972 +0,0 @@
-<?php
-
-
-
-
-/**
-* parses an XML Schema, allows access to it's data, other utility methods.
-* imperfect, no validation... yet, but quite functional.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @version  $Id: class.xmlschema.php 6844 2011-06-03 14:46:51Z dMetzger $
-* @access   public
-*/
-class nusoap_xmlschema extends nusoap_base  {
-	
-	// files
-	var $schema = '';
-	var $xml = '';
-	// namespaces
-	var $enclosingNamespaces;
-	// schema info
-	var $schemaInfo = array();
-	var $schemaTargetNamespace = '';
-	// types, elements, attributes defined by the schema
-	var $attributes = array();
-	var $complexTypes = array();
-	var $complexTypeStack = array();
-	var $currentComplexType = null;
-	var $elements = array();
-	var $elementStack = array();
-	var $currentElement = null;
-	var $simpleTypes = array();
-	var $simpleTypeStack = array();
-	var $currentSimpleType = null;
-	// imports
-	var $imports = array();
-	// parser vars
-	var $parser;
-	var $position = 0;
-	var $depth = 0;
-	var $depth_array = array();
-	var $message = array();
-	var $defaultNamespace = array();
-    
-	/**
-	* constructor
-	*
-	* @param    string $schema schema document URI
-	* @param    string $xml xml document URI
-	* @param	string $namespaces namespaces defined in enclosing XML
-	* @access   public
-	*/
-	function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
-		parent::nusoap_base();
-		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
-		// files
-		$this->schema = $schema;
-		$this->xml = $xml;
-
-		// namespaces
-		$this->enclosingNamespaces = $namespaces;
-		$this->namespaces = array_merge($this->namespaces, $namespaces);
-
-		// parse schema file
-		if($schema != ''){
-			$this->debug('initial schema file: '.$schema);
-			$this->parseFile($schema, 'schema');
-		}
-
-		// parse xml file
-		if($xml != ''){
-			$this->debug('initial xml file: '.$xml);
-			$this->parseFile($xml, 'xml');
-		}
-
-	}
-
-    /**
-    * parse an XML file
-    *
-    * @param string $xml path/URL to XML file
-    * @param string $type (schema | xml)
-	* @return boolean
-    * @access public
-    */
-	function parseFile($xml,$type){
-		// parse xml file
-		if($xml != ""){
-			$xmlStr = @join("",@file($xml));
-			if($xmlStr == ""){
-				$msg = 'Error reading XML from '.$xml;
-				$this->setError($msg);
-				$this->debug($msg);
-			return false;
-			} else {
-				$this->debug("parsing $xml");
-				$this->parseString($xmlStr,$type);
-				$this->debug("done parsing $xml");
-			return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* parse an XML string
-	*
-	* @param    string $xml path or URL
-    * @param	string $type (schema|xml)
-	* @access   private
-	*/
-	function parseString($xml,$type){
-		// parse xml string
-		if($xml != ""){
-
-	    	// Create an XML parser.
-	    	$this->parser = xml_parser_create();
-	    	// Set the options for parsing the XML data.
-	    	xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-
-	    	// Set the object for the parser.
-	    	xml_set_object($this->parser, $this);
-
-	    	// Set the element handlers for the parser.
-			if($type == "schema"){
-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');
-		    	xml_set_character_data_handler($this->parser,'schemaCharacterData');
-			} elseif($type == "xml"){
-				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');
-		    	xml_set_character_data_handler($this->parser,'xmlCharacterData');
-			}
-
-		    // Parse the XML file.
-		    if(!xml_parse($this->parser,$xml,true)){
-			// Display an error message.
-				$errstr = sprintf('XML error parsing XML schema on line %d: %s',
-				xml_get_current_line_number($this->parser),
-				xml_error_string(xml_get_error_code($this->parser))
-				);
-				$this->debug($errstr);
-				$this->debug("XML payload:\n" . $xml);
-				$this->setError($errstr);
-	    	}
-            
-			xml_parser_free($this->parser);
-		} else{
-			$this->debug('no xml passed to parseString()!!');
-			$this->setError('no xml passed to parseString()!!');
-		}
-	}
-
-	/**
-	 * gets a type name for an unnamed type
-	 *
-	 * @param	string	Element name
-	 * @return	string	A type name for an unnamed type
-	 * @access	private
-	 */
-	function CreateTypeName($ename) {
-		$scope = '';
-		for ($i = 0; $i < count($this->complexTypeStack); $i++) {
-			$scope .= $this->complexTypeStack[$i] . '_';
-		}
-		return $scope . $ename . '_ContainedType';
-	}
-	
-	/**
-	* start-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @param    string $attrs associative array of attributes
-	* @access   private
-	*/
-	function schemaStartElement($parser, $name, $attrs) {
-		
-		// position in the total number of elements, starting from 0
-		$pos = $this->position++;
-		$depth = $this->depth++;
-		// set self as current value for this depth
-		$this->depth_array[$depth] = $pos;
-		$this->message[$pos] = array('cdata' => ''); 
-		if ($depth > 0) {
-			$this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];
-		} else {
-			$this->defaultNamespace[$pos] = false;
-		}
-
-		// get element prefix
-		if($prefix = $this->getPrefix($name)){
-			// get unqualified name
-			$name = $this->getLocalPart($name);
-		} else {
-        	$prefix = '';
-        }
-		
-        // loop thru attributes, expanding, and registering namespace declarations
-        if(count($attrs) > 0){
-        	foreach($attrs as $k => $v){
-                // if ns declarations, add to class level array of valid namespaces
-				if(preg_match('/^xmlns/',$k)){
-                	//$this->xdebug("$k: $v");
-                	//$this->xdebug('ns_prefix: '.$this->getPrefix($k));
-                	if($ns_prefix = substr(strrchr($k,':'),1)){
-                		//$this->xdebug("Add namespace[$ns_prefix] = $v");
-						$this->namespaces[$ns_prefix] = $v;
-					} else {
-						$this->defaultNamespace[$pos] = $v;
-						if (! $this->getPrefixFromNamespace($v)) {
-							$this->namespaces['ns'.(count($this->namespaces)+1)] = $v;
-						}
-					}
-					if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema'){
-						$this->XMLSchemaVersion = $v;
-						$this->namespaces['xsi'] = $v.'-instance';
-					}
-				}
-        	}
-        	foreach($attrs as $k => $v){
-                // expand each attribute
-                $k = strpos($k,':') ? $this->expandQname($k) : $k;
-                $v = strpos($v,':') ? $this->expandQname($v) : $v;
-        		$eAttrs[$k] = $v;
-        	}
-        	$attrs = $eAttrs;
-        } else {
-        	$attrs = array();
-        }
-		// find status, register data
-		switch($name){
-			case 'all':			// (optional) compositor content for a complexType
-			case 'choice':
-			case 'group':
-			case 'sequence':
-				//$this->xdebug("compositor $name for currentComplexType: $this->currentComplexType and currentElement: $this->currentElement");
-				$this->complexTypes[$this->currentComplexType]['compositor'] = $name;
-				//if($name == 'all' || $name == 'sequence'){
-				//	$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-				//}
-			break;
-			case 'attribute':	// complexType attribute
-            	//$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']);
-            	$this->xdebug("parsing attribute:");
-            	$this->appendDebug($this->varDump($attrs));
-				if (!isset($attrs['form'])) {
-					// TODO: handle globals
-					$attrs['form'] = $this->schemaInfo['attributeFormDefault'];
-				}
-            	if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-					$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-					if (!strpos($v, ':')) {
-						// no namespace in arrayType attribute value...
-						if ($this->defaultNamespace[$pos]) {
-							// ...so use the default
-							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-						}
-					}
-            	}
-                if(isset($attrs['name'])){
-					$this->attributes[$attrs['name']] = $attrs;
-					$aname = $attrs['name'];
-				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){
-					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-	                } else {
-	                	$aname = '';
-	                }
-				} elseif(isset($attrs['ref'])){
-					$aname = $attrs['ref'];
-                    $this->attributes[$attrs['ref']] = $attrs;
-				}
-                
-				if($this->currentComplexType){	// This should *always* be
-					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;
-				}
-				// arrayType attribute
-				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){
-					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-                	$prefix = $this->getPrefix($aname);
-					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){
-						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-					} else {
-						$v = '';
-					}
-                    if(strpos($v,'[,]')){
-                        $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;
-                    }
-                    $v = substr($v,0,strpos($v,'[')); // clip the []
-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
-                        $v = $this->XMLSchemaVersion.':'.$v;
-                    }
-                    $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
-				}
-			break;
-			case 'complexContent':	// (optional) content for a complexType
-				$this->xdebug("do nothing for element $name");
-			break;
-			case 'complexType':
-				array_push($this->complexTypeStack, $this->currentComplexType);
-				if(isset($attrs['name'])){
-					// TODO: what is the scope of named complexTypes that appear
-					//       nested within other c complexTypes?
-					$this->xdebug('processing named complexType '.$attrs['name']);
-					//$this->currentElement = false;
-					$this->currentComplexType = $attrs['name'];
-					$this->complexTypes[$this->currentComplexType] = $attrs;
-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){
-						$this->xdebug('complexType is unusual array');
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					} else {
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-					}
-				} else {
-					$name = $this->CreateTypeName($this->currentElement);
-					$this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);
-					$this->currentComplexType = $name;
-					//$this->currentElement = false;
-					$this->complexTypes[$this->currentComplexType] = $attrs;
-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){
-						$this->xdebug('complexType is unusual array');
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					} else {
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-					}
-				}
-				$this->complexTypes[$this->currentComplexType]['simpleContent'] = 'false';
-			break;
-			case 'element':
-				array_push($this->elementStack, $this->currentElement);
-				if (!isset($attrs['form'])) {
-					if ($this->currentComplexType) {
-						$attrs['form'] = $this->schemaInfo['elementFormDefault'];
-					} else {
-						// global
-						$attrs['form'] = 'qualified';
-					}
-				}
-				if(isset($attrs['type'])){
-					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);
-					if (! $this->getPrefix($attrs['type'])) {
-						if ($this->defaultNamespace[$pos]) {
-							$attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];
-							$this->xdebug('used default namespace to make type ' . $attrs['type']);
-						}
-					}
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {
-						$this->xdebug('arrayType for unusual array is ' . $attrs['type']);
-						$this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];
-					}
-					$this->currentElement = $attrs['name'];
-					$ename = $attrs['name'];
-				} elseif(isset($attrs['ref'])){
-					$this->xdebug("processing element as ref to ".$attrs['ref']);
-					$this->currentElement = "ref to ".$attrs['ref'];
-					$ename = $this->getLocalPart($attrs['ref']);
-				} else {
-					$type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);
-					$this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);
-					$this->currentElement = $attrs['name'];
-					$attrs['type'] = $this->schemaTargetNamespace . ':' . $type;
-					$ename = $attrs['name'];
-				}
-				if (isset($ename) && $this->currentComplexType) {
-					$this->xdebug("add element $ename to complexType $this->currentComplexType");
-					$this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;
-				} elseif (!isset($attrs['ref'])) {
-					$this->xdebug("add element $ename to elements array");
-					$this->elements[ $attrs['name'] ] = $attrs;
-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-				}
-			break;
-			case 'enumeration':	//	restriction value list member
-				$this->xdebug('enumeration ' . $attrs['value']);
-				if ($this->currentSimpleType) {
-					$this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];
-				} elseif ($this->currentComplexType) {
-					$this->complexTypes[$this->currentComplexType]['enumeration'][] = $attrs['value'];
-				}
-			break;
-			case 'extension':	// simpleContent or complexContent type extension
-				$this->xdebug('extension ' . $attrs['base']);
-				if ($this->currentComplexType) {
-					$ns = $this->getPrefix($attrs['base']);
-					if ($ns == '') {
-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];
-					} else {
-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];
-					}
-				} else {
-					$this->xdebug('no current complexType to set extensionBase');
-				}
-			break;
-			case 'import':
-			    if (isset($attrs['schemaLocation'])) {
-					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
-				} else {
-					$this->xdebug('import namespace ' . $attrs['namespace']);
-                    $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
-					}
-				}
-			break;
-			case 'include':
-			    if (isset($attrs['schemaLocation'])) {
-					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
-				} else {
-					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');
-				}
-			break;
-			case 'list':	// simpleType value list
-				$this->xdebug("do nothing for element $name");
-			break;
-			case 'restriction':	// simpleType, simpleContent or complexContent value restriction
-				$this->xdebug('restriction ' . $attrs['base']);
-				if($this->currentSimpleType){
-					$this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];
-				} elseif($this->currentComplexType){
-					$this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];
-					if(strstr($attrs['base'],':') == ':Array'){
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					}
-				}
-			break;
-			case 'schema':
-				$this->schemaInfo = $attrs;
-				$this->schemaInfo['schemaVersion'] = $this->getNamespaceFromPrefix($prefix);
-				if (isset($attrs['targetNamespace'])) {
-					$this->schemaTargetNamespace = $attrs['targetNamespace'];
-				}
-				if (!isset($attrs['elementFormDefault'])) {
-					$this->schemaInfo['elementFormDefault'] = 'unqualified';
-				}
-				if (!isset($attrs['attributeFormDefault'])) {
-					$this->schemaInfo['attributeFormDefault'] = 'unqualified';
-				}
-			break;
-			case 'simpleContent':	// (optional) content for a complexType
-				if ($this->currentComplexType) {	// This should *always* be
-					$this->complexTypes[$this->currentComplexType]['simpleContent'] = 'true';
-				} else {
-					$this->xdebug("do nothing for element $name because there is no current complexType");
-				}
-			break;
-			case 'simpleType':
-				array_push($this->simpleTypeStack, $this->currentSimpleType);
-				if(isset($attrs['name'])){
-					$this->xdebug("processing simpleType for name " . $attrs['name']);
-					$this->currentSimpleType = $attrs['name'];
-					$this->simpleTypes[ $attrs['name'] ] = $attrs;
-					$this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';
-					$this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';
-				} else {
-					$name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);
-					$this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);
-					$this->currentSimpleType = $name;
-					//$this->currentElement = false;
-					$this->simpleTypes[$this->currentSimpleType] = $attrs;
-					$this->simpleTypes[$this->currentSimpleType]['phpType'] = 'scalar';
-				}
-			break;
-			case 'union':	// simpleType type list
-				$this->xdebug("do nothing for element $name");
-			break;
-			default:
-				$this->xdebug("do not have any logic to process element $name");
-		}
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
-	function schemaEndElement($parser, $name) {
-		// bring depth down a notch
-		$this->depth--;
-		// position of current element is equal to the last value left in depth_array for my depth
-		if(isset($this->depth_array[$this->depth])){
-        	$pos = $this->depth_array[$this->depth];
-        }
-		// get element prefix
-		if ($prefix = $this->getPrefix($name)){
-			// get unqualified name
-			$name = $this->getLocalPart($name);
-		} else {
-        	$prefix = '';
-        }
-		// move on...
-		if($name == 'complexType'){
-			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));
-			$this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));
-			$this->currentComplexType = array_pop($this->complexTypeStack);
-			//$this->currentElement = false;
-		}
-		if($name == 'element'){
-			$this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));
-			$this->currentElement = array_pop($this->elementStack);
-		}
-		if($name == 'simpleType'){
-			$this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));
-			$this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));
-			$this->currentSimpleType = array_pop($this->simpleTypeStack);
-		}
-	}
-
-	/**
-	* element content handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
-	function schemaCharacterData($parser, $data){
-		$pos = $this->depth_array[$this->depth - 1];
-		$this->message[$pos]['cdata'] .= $data;
-	}
-
-	/**
-	* serialize the schema
-	*
-	* @access   public
-	*/
-	function serializeSchema(){
-
-		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);
-		$xml = '';
-		// imports
-		if (sizeof($this->imports) > 0) {
-			foreach($this->imports as $ns => $list) {
-				foreach ($list as $ii) {
-					if ($ii['location'] != '') {
-						$xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";
-					} else {
-						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";
-					}
-				}
-			} 
-		} 
-		// complex types
-		foreach($this->complexTypes as $typeName => $attrs){
-			$contentStr = '';
-			// serialize child elements
-			if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){
-				foreach($attrs['elements'] as $element => $eParts){
-					if(isset($eParts['ref'])){
-						$contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";
-					} else {
-						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";
-						foreach ($eParts as $aName => $aValue) {
-							// handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable
-							if ($aName != 'name' && $aName != 'type') {
-								$contentStr .= " $aName=\"$aValue\"";
-							}
-						}
-						$contentStr .= "/>\n";
-					}
-				}
-				// compositor wraps elements
-				if (isset($attrs['compositor']) && ($attrs['compositor'] != '')) {
-					$contentStr = "  <$schemaPrefix:$attrs[compositor]>\n".$contentStr."  </$schemaPrefix:$attrs[compositor]>\n";
-				}
-			}
-			// attributes
-			if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){
-				foreach($attrs['attrs'] as $attr => $aParts){
-					$contentStr .= "    <$schemaPrefix:attribute";
-					foreach ($aParts as $a => $v) {
-						if ($a == 'ref' || $a == 'type') {
-							$contentStr .= " $a=\"".$this->contractQName($v).'"';
-						} elseif ($a == 'http://schemas.xmlsoap.org/wsdl/:arrayType') {
-							$this->usedNamespaces['wsdl'] = $this->namespaces['wsdl'];
-							$contentStr .= ' wsdl:arrayType="'.$this->contractQName($v).'"';
-						} else {
-							$contentStr .= " $a=\"$v\"";
-						}
-					}
-					$contentStr .= "/>\n";
-				}
-			}
-			// if restriction
-			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){
-				$contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";
-				// complex or simple content
-				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){
-					$contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";
-				}
-			}
-			// finalize complex type
-			if($contentStr != ''){
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";
-			} else {
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";
-			}
-			$xml .= $contentStr;
-		}
-		// simple types
-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){
-			foreach($this->simpleTypes as $typeName => $eParts){
-				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"".$this->contractQName($eParts['type'])."\">\n";
-				if (isset($eParts['enumeration'])) {
-					foreach ($eParts['enumeration'] as $e) {
-						$xml .= "  <$schemaPrefix:enumeration value=\"$e\"/>\n";
-					}
-				}
-				$xml .= "  </$schemaPrefix:restriction>\n </$schemaPrefix:simpleType>";
-			}
-		}
-		// elements
-		if(isset($this->elements) && count($this->elements) > 0){
-			foreach($this->elements as $element => $eParts){
-				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";
-			}
-		}
-		// attributes
-		if(isset($this->attributes) && count($this->attributes) > 0){
-			foreach($this->attributes as $attr => $aParts){
-				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";
-			}
-		}
-		// finish 'er up
-		$attr = '';
-		foreach ($this->schemaInfo as $k => $v) {
-			if ($k == 'elementFormDefault' || $k == 'attributeFormDefault') {
-				$attr .= " $k=\"$v\"";
-			}
-		}
-		$el = "<$schemaPrefix:schema$attr targetNamespace=\"$this->schemaTargetNamespace\"\n";
-		foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {
-			$el .= " xmlns:$nsp=\"$ns\"";
-		}
-		$xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";
-		return $xml;
-	}
-
-	/**
-	* adds debug data to the clas level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function xdebug($string){
-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);
-	}
-
-    /**
-    * get the PHP type of a user defined type in the schema
-    * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays
-    * returns false if no type exists, or not w/ the given namespace
-    * else returns a string that is either a native php type, or 'struct'
-    *
-    * @param string $type name of defined type
-    * @param string $ns namespace of type
-    * @return mixed
-    * @access public
-    * @deprecated
-    */
-	function getPHPType($type,$ns){
-		if(isset($this->typemap[$ns][$type])){
-			//print "found type '$type' and ns $ns in typemap<br>";
-			return $this->typemap[$ns][$type];
-		} elseif(isset($this->complexTypes[$type])){
-			//print "getting type '$type' and ns $ns from complexTypes array<br>";
-			return $this->complexTypes[$type]['phpType'];
-		}
-		return false;
-	}
-
-	/**
-    * returns an associative array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	For a complexType typeDef = array(
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'compositor' => '(sequence|all)',
-	*	'elements' => array(), // refs to elements array
-	*	'attrs' => array() // refs to attributes array
-	*	... and so on (see addComplexType)
-	*	)
-	*
-	*   For simpleType or element, the array has different keys.
-    *
-    * @param string $type
-    * @return mixed
-    * @access public
-    * @see addComplexType
-    * @see addSimpleType
-    * @see addElement
-    */
-	function getTypeDef($type){
-		//$this->debug("in getTypeDef for type $type");
-		if (substr($type, -1) == '^') {
-			$is_element = 1;
-			$type = substr($type, 0, -1);
-		} else {
-			$is_element = 0;
-		}
-
-		if((! $is_element) && isset($this->complexTypes[$type])){
-			$this->xdebug("in getTypeDef, found complexType $type");
-			return $this->complexTypes[$type];
-		} elseif((! $is_element) && isset($this->simpleTypes[$type])){
-			$this->xdebug("in getTypeDef, found simpleType $type");
-			if (!isset($this->simpleTypes[$type]['phpType'])) {
-				// get info for type to tack onto the simple type
-				// TODO: can this ever really apply (i.e. what is a simpleType really?)
-				$uqType = substr($this->simpleTypes[$type]['type'], strrpos($this->simpleTypes[$type]['type'], ':') + 1);
-				$ns = substr($this->simpleTypes[$type]['type'], 0, strrpos($this->simpleTypes[$type]['type'], ':'));
-				$etype = $this->getTypeDef($uqType);
-				if ($etype) {
-					$this->xdebug("in getTypeDef, found type for simpleType $type:");
-					$this->xdebug($this->varDump($etype));
-					if (isset($etype['phpType'])) {
-						$this->simpleTypes[$type]['phpType'] = $etype['phpType'];
-					}
-					if (isset($etype['elements'])) {
-						$this->simpleTypes[$type]['elements'] = $etype['elements'];
-					}
-				}
-			}
-			return $this->simpleTypes[$type];
-		} elseif(isset($this->elements[$type])){
-			$this->xdebug("in getTypeDef, found element $type");
-			if (!isset($this->elements[$type]['phpType'])) {
-				// get info for type to tack onto the element
-				$uqType = substr($this->elements[$type]['type'], strrpos($this->elements[$type]['type'], ':') + 1);
-				$ns = substr($this->elements[$type]['type'], 0, strrpos($this->elements[$type]['type'], ':'));
-				$etype = $this->getTypeDef($uqType);
-				if ($etype) {
-					$this->xdebug("in getTypeDef, found type for element $type:");
-					$this->xdebug($this->varDump($etype));
-					if (isset($etype['phpType'])) {
-						$this->elements[$type]['phpType'] = $etype['phpType'];
-					}
-					if (isset($etype['elements'])) {
-						$this->elements[$type]['elements'] = $etype['elements'];
-					}
-					if (isset($etype['extensionBase'])) {
-						$this->elements[$type]['extensionBase'] = $etype['extensionBase'];
-					}
-				} elseif ($ns == 'http://www.w3.org/2001/XMLSchema') {
-					$this->xdebug("in getTypeDef, element $type is an XSD type");
-					$this->elements[$type]['phpType'] = 'scalar';
-				}
-			}
-			return $this->elements[$type];
-		} elseif(isset($this->attributes[$type])){
-			$this->xdebug("in getTypeDef, found attribute $type");
-			return $this->attributes[$type];
-		} elseif (preg_match('/_ContainedType$/', $type)) {
-			$this->xdebug("in getTypeDef, have an untyped element $type");
-			$typeDef['typeClass'] = 'simpleType';
-			$typeDef['phpType'] = 'scalar';
-			$typeDef['type'] = 'http://www.w3.org/2001/XMLSchema:string';
-			return $typeDef;
-		}
-		$this->xdebug("in getTypeDef, did not find $type");
-		return false;
-	}
-
-	/**
-    * returns a sample serialization of a given type, or false if no type by the given name
-    *
-    * @param string $type name of type
-    * @return mixed
-    * @access public
-    * @deprecated
-    */
-    function serializeTypeDef($type){
-    	//print "in sTD() for type $type<br>";
-	if($typeDef = $this->getTypeDef($type)){
-		$str .= '<'.$type;
-	    if(is_array($typeDef['attrs'])){
-		foreach($typeDef['attrs'] as $attName => $data){
-		    $str .= " $attName=\"{type = ".$data['type']."}\"";
-		}
-	    }
-	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
-	    if(count($typeDef['elements']) > 0){
-		$str .= ">";
-		foreach($typeDef['elements'] as $element => $eData){
-		    $str .= $this->serializeTypeDef($element);
-		}
-		$str .= "</$type>";
-	    } elseif($typeDef['typeClass'] == 'element') {
-		$str .= "></$type>";
-	    } else {
-		$str .= "/>";
-	    }
-			return $str;
-	}
-    	return false;
-    }
-
-    /**
-    * returns HTML form elements that allow a user
-    * to enter values for creating an instance of the given type.
-    *
-    * @param string $name name for type instance
-    * @param string $type name of type
-    * @return string
-    * @access public
-    * @deprecated
-	*/
-	function typeToForm($name,$type){
-		// get typedef
-		if($typeDef = $this->getTypeDef($type)){
-			// if struct
-			if($typeDef['phpType'] == 'struct'){
-				$buffer .= '<table>';
-				foreach($typeDef['elements'] as $child => $childDef){
-					$buffer .= "
-					<tr><td align='right'>$childDef[name] (type: ".$this->getLocalPart($childDef['type'])."):</td>
-					<td><input type='text' name='parameters[".$name."][$childDef[name]]'></td></tr>";
-				}
-				$buffer .= '</table>';
-			// if array
-			} elseif($typeDef['phpType'] == 'array'){
-				$buffer .= '<table>';
-				for($i=0;$i < 3; $i++){
-					$buffer .= "
-					<tr><td align='right'>array item (type: $typeDef[arrayType]):</td>
-					<td><input type='text' name='parameters[".$name."][]'></td></tr>";
-				}
-				$buffer .= '</table>';
-			// if scalar
-			} else {
-				$buffer .= "<input type='text' name='parameters[$name]'>";
-			}
-		} else {
-			$buffer .= "<input type='text' name='parameters[$name]'>";
-		}
-		return $buffer;
-	}
-	
-	/**
-	* adds a complex type to the schema
-	* 
-	* example: array
-	* 
-	* addType(
-	* 	'ArrayOfstring',
-	* 	'complexType',
-	* 	'array',
-	* 	'',
-	* 	'SOAP-ENC:Array',
-	* 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
-	* 	'xsd:string'
-	* );
-	* 
-	* example: PHP associative array ( SOAP Struct )
-	* 
-	* addType(
-	* 	'SOAPStruct',
-	* 	'complexType',
-	* 	'struct',
-	* 	'all',
-	* 	array('myVar'=> array('name'=>'myVar','type'=>'string')
-	* );
-	* 
-	* @param name
-	* @param typeClass (complexType|simpleType|attribute)
-	* @param phpType: currently supported are array and struct (php assoc array)
-	* @param compositor (all|sequence|choice)
-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param elements = array ( name = array(name=>'',type=>'') )
-	* @param attrs = array(
-	* 	array(
-	*		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",
-	*		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"
-	* 	)
-	* )
-	* @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)
-	* @access public
-	* @see getTypeDef
-	*/
-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){
-		$this->complexTypes[$name] = array(
-	    'name'		=> $name,
-	    'typeClass'	=> $typeClass,
-	    'phpType'	=> $phpType,
-		'compositor'=> $compositor,
-	    'restrictionBase' => $restrictionBase,
-		'elements'	=> $elements,
-	    'attrs'		=> $attrs,
-	    'arrayType'	=> $arrayType
-		);
-		
-		$this->xdebug("addComplexType $name:");
-		$this->appendDebug($this->varDump($this->complexTypes[$name]));
-	}
-	
-	/**
-	* adds a simple type to the schema
-	*
-	* @param string $name
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param string $typeClass (should always be simpleType)
-	* @param string $phpType (should always be scalar)
-	* @param array $enumeration array of values
-	* @access public
-	* @see nusoap_xmlschema
-	* @see getTypeDef
-	*/
-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
-		$this->simpleTypes[$name] = array(
-	    'name'			=> $name,
-	    'typeClass'		=> $typeClass,
-	    'phpType'		=> $phpType,
-	    'type'			=> $restrictionBase,
-	    'enumeration'	=> $enumeration
-		);
-		
-		$this->xdebug("addSimpleType $name:");
-		$this->appendDebug($this->varDump($this->simpleTypes[$name]));
-	}
-
-	/**
-	* adds an element to the schema
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addElement($attrs) {
-		if (! $this->getPrefix($attrs['type'])) {
-			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];
-		}
-		$this->elements[ $attrs['name'] ] = $attrs;
-		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-		
-		$this->xdebug("addElement " . $attrs['name']);
-		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));
-	}
-}
-
-/**
- * Backward compatibility
- */
-class XMLSchema extends nusoap_xmlschema {
-}
-
-
@@ -1,36 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision$
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-				    	
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
-						
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
-						
-header("Location: ../");
-exit;
@@ -1,501 +0,0 @@
-<?php
-/*
-$Id: nusoapmime.php 6844 2011-06-03 14:46:51Z dMetzger $
-
-NuSOAP - Web Services Toolkit for PHP
-
-Copyright (c) 2002 NuSphere Corporation
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-The NuSOAP project home is:
-http://sourceforge.net/projects/nusoap/
-
-The primary support for NuSOAP is the mailing list:
-nusoap-general@lists.sourceforge.net
-
-If you have any questions or comments, please email:
-
-Dietrich Ayala
-dietrich@ganx4.com
-http://dietrich.ganx4.com/nusoap
-
-NuSphere Corporation
-http://www.nusphere.com
-
-*/
-
-/*require_once('nusoap.php');*/
-/* PEAR Mail_MIME library */
-require_once('Mail/mimeDecode.php');
-require_once('Mail/mimePart.php');
-
-/**
-* nusoap_client_mime client supporting MIME attachments defined at
-* http://www.w3.org/TR/SOAP-attachments.  It depends on the PEAR Mail_MIME library.
-*
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
-* @version  $Id: nusoapmime.php 6844 2011-06-03 14:46:51Z dMetzger $
-* @access   public
-*/
-class nusoap_client_mime extends nusoap_client {
-	/**
-	 * @var array Each array element in the return is an associative array with keys
-	 * data, filename, contenttype, cid
-	 * @access private
-	 */
-	var $requestAttachments = array();
-	/**
-	 * @var array Each array element in the return is an associative array with keys
-	 * data, filename, contenttype, cid
-	 * @access private
-	 */
-	var $responseAttachments;
-	/**
-	 * @var string
-	 * @access private
-	 */
-	var $mimeContentType;
-	
-	/**
-	* adds a MIME attachment to the current request.
-	*
-	* If the $data parameter contains an empty string, this method will read
-	* the contents of the file named by the $filename parameter.
-	*
-	* If the $cid parameter is false, this method will generate the cid.
-	*
-	* @param string $data The data of the attachment
-	* @param string $filename The filename of the attachment (default is empty string)
-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
-	* @param string $cid The content-id (cid) of the attachment (default is false)
-	* @return string The content-id (cid) of the attachment
-	* @access public
-	*/
-	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
-		if (! $cid) {
-			$cid = md5(uniqid(time()));
-		}
-
-		$info['data'] = $data;
-		$info['filename'] = $filename;
-		$info['contenttype'] = $contenttype;
-		$info['cid'] = $cid;
-		
-		$this->requestAttachments[] = $info;
-
-		return $cid;
-	}
-
-	/**
-	* clears the MIME attachments for the current request.
-	*
-	* @access public
-	*/
-	function clearAttachments() {
-		$this->requestAttachments = array();
-	}
-
-	/**
-	* gets the MIME attachments from the current response.
-	*
-	* Each array element in the return is an associative array with keys
-	* data, filename, contenttype, cid.  These keys correspond to the parameters
-	* for addAttachment.
-	*
-	* @return array The attachments.
-	* @access public
-	*/
-	function getAttachments() {
-		return $this->responseAttachments;
-	}
-
-	/**
-	* gets the HTTP body for the current request.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		if (count($this->requestAttachments) > 0) {
-			$params['content_type'] = 'multipart/related; type="text/xml"';
-			$mimeMessage = new Mail_mimePart('', $params);
-			unset($params);
-
-			$params['content_type'] = 'text/xml';
-			$params['encoding']     = '8bit';
-			$params['charset']      = $this->soap_defencoding;
-			$mimeMessage->addSubpart($soapmsg, $params);
-			
-			foreach ($this->requestAttachments as $att) {
-				unset($params);
-
-				$params['content_type'] = $att['contenttype'];
-				$params['encoding']     = 'base64';
-				$params['disposition']  = 'attachment';
-				$params['dfilename']    = $att['filename'];
-				$params['cid']          = $att['cid'];
-
-				if ($att['data'] == '' && $att['filename'] <> '') {
-					if ($fd = fopen($att['filename'], 'rb')) {
-						$data = fread($fd, filesize($att['filename']));
-						fclose($fd);
-					} else {
-						$data = '';
-					}
-					$mimeMessage->addSubpart($data, $params);
-				} else {
-					$mimeMessage->addSubpart($att['data'], $params);
-				}
-			}
-
-			$output = $mimeMessage->encode();
-			$mimeHeaders = $output['headers'];
-	
-			foreach ($mimeHeaders as $k => $v) {
-				$this->debug("MIME header $k: $v");
-				if (strtolower($k) == 'content-type') {
-					// PHP header() seems to strip leading whitespace starting
-					// the second line, so force everything to one line
-					$this->mimeContentType = str_replace("\r\n", " ", $v);
-				}
-			}
-	
-			return $output['body'];
-		}
-
-		return parent::getHTTPBody($soapmsg);
-	}
-	
-	/**
-	* gets the HTTP content type for the current request.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current request.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		if (count($this->requestAttachments) > 0) {
-			return $this->mimeContentType;
-		}
-		return parent::getHTTPContentType();
-	}
-	
-	/**
-	* gets the HTTP content type charset for the current request.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current request.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		if (count($this->requestAttachments) > 0) {
-			return false;
-		}
-		return parent::getHTTPContentTypeCharset();
-	}
-
-	/**
-	* processes SOAP message returned from server
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed response data from server
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseResponse($headers, $data) {
-		$this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
-		$this->responseAttachments = array();
-		if (strstr($headers['content-type'], 'multipart/related')) {
-			$this->debug('Decode multipart/related');
-			$input = '';
-			foreach ($headers as $k => $v) {
-				$input .= "$k: $v\r\n";
-			}
-			$params['input'] = $input . "\r\n" . $data;
-			$params['include_bodies'] = true;
-			$params['decode_bodies'] = true;
-			$params['decode_headers'] = true;
-			
-			$structure = Mail_mimeDecode::decode($params);
-
-			foreach ($structure->parts as $part) {
-				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {
-					$this->debug('Have root part of type ' . $part->headers['content-type']);
-					$root = $part->body;
-					$return = parent::parseResponse($part->headers, $part->body);
-				} else {
-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);
-					$info['data'] = $part->body;
-					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';
-					$info['contenttype'] = $part->headers['content-type'];
-					$info['cid'] = $part->headers['content-id'];
-					$this->responseAttachments[] = $info;
-				}
-			}
-		
-			if (isset($return)) {
-				$this->responseData = $root;
-				return $return;
-			}
-			
-			$this->setError('No root part found in multipart/related content');
-			return '';
-		}
-		$this->debug('Not multipart/related');
-		return parent::parseResponse($headers, $data);
-	}
-}
-
-/*
- *	For backwards compatiblity, define soapclientmime unless the PHP SOAP extension is loaded.
- */
-if (!extension_loaded('soap')) {
-	class soapclientmime extends nusoap_client_mime {
-	}
-}
-
-/**
-* nusoap_server_mime server supporting MIME attachments defined at
-* http://www.w3.org/TR/SOAP-attachments.  It depends on the PEAR Mail_MIME library.
-*
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
-* @version  $Id: nusoapmime.php 6844 2011-06-03 14:46:51Z dMetzger $
-* @access   public
-*/
-class nusoap_server_mime extends nusoap_server {
-	/**
-	 * @var array Each array element in the return is an associative array with keys
-	 * data, filename, contenttype, cid
-	 * @access private
-	 */
-	var $requestAttachments = array();
-	/**
-	 * @var array Each array element in the return is an associative array with keys
-	 * data, filename, contenttype, cid
-	 * @access private
-	 */
-	var $responseAttachments;
-	/**
-	 * @var string
-	 * @access private
-	 */
-	var $mimeContentType;
-	
-	/**
-	* adds a MIME attachment to the current response.
-	*
-	* If the $data parameter contains an empty string, this method will read
-	* the contents of the file named by the $filename parameter.
-	*
-	* If the $cid parameter is false, this method will generate the cid.
-	*
-	* @param string $data The data of the attachment
-	* @param string $filename The filename of the attachment (default is empty string)
-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
-	* @param string $cid The content-id (cid) of the attachment (default is false)
-	* @return string The content-id (cid) of the attachment
-	* @access public
-	*/
-	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
-		if (! $cid) {
-			$cid = md5(uniqid(time()));
-		}
-
-		$info['data'] = $data;
-		$info['filename'] = $filename;
-		$info['contenttype'] = $contenttype;
-		$info['cid'] = $cid;
-		
-		$this->responseAttachments[] = $info;
-
-		return $cid;
-	}
-
-	/**
-	* clears the MIME attachments for the current response.
-	*
-	* @access public
-	*/
-	function clearAttachments() {
-		$this->responseAttachments = array();
-	}
-
-	/**
-	* gets the MIME attachments from the current request.
-	*
-	* Each array element in the return is an associative array with keys
-	* data, filename, contenttype, cid.  These keys correspond to the parameters
-	* for addAttachment.
-	*
-	* @return array The attachments.
-	* @access public
-	*/
-	function getAttachments() {
-		return $this->requestAttachments;
-	}
-
-	/**
-	* gets the HTTP body for the current response.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		if (count($this->responseAttachments) > 0) {
-			$params['content_type'] = 'multipart/related; type="text/xml"';
-			$mimeMessage = new Mail_mimePart('', $params);
-			unset($params);
-
-			$params['content_type'] = 'text/xml';
-			$params['encoding']     = '8bit';
-			$params['charset']      = $this->soap_defencoding;
-			$mimeMessage->addSubpart($soapmsg, $params);
-			
-			foreach ($this->responseAttachments as $att) {
-				unset($params);
-
-				$params['content_type'] = $att['contenttype'];
-				$params['encoding']     = 'base64';
-				$params['disposition']  = 'attachment';
-				$params['dfilename']    = $att['filename'];
-				$params['cid']          = $att['cid'];
-
-				if ($att['data'] == '' && $att['filename'] <> '') {
-					if ($fd = fopen($att['filename'], 'rb')) {
-						$data = fread($fd, filesize($att['filename']));
-						fclose($fd);
-					} else {
-						$data = '';
-					}
-					$mimeMessage->addSubpart($data, $params);
-				} else {
-					$mimeMessage->addSubpart($att['data'], $params);
-				}
-			}
-
-			$output = $mimeMessage->encode();
-			$mimeHeaders = $output['headers'];
-	
-			foreach ($mimeHeaders as $k => $v) {
-				$this->debug("MIME header $k: $v");
-				if (strtolower($k) == 'content-type') {
-					// PHP header() seems to strip leading whitespace starting
-					// the second line, so force everything to one line
-					$this->mimeContentType = str_replace("\r\n", " ", $v);
-				}
-			}
-	
-			return $output['body'];
-		}
-
-		return parent::getHTTPBody($soapmsg);
-	}
-	
-	/**
-	* gets the HTTP content type for the current response.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current response.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		if (count($this->responseAttachments) > 0) {
-			return $this->mimeContentType;
-		}
-		return parent::getHTTPContentType();
-	}
-	
-	/**
-	* gets the HTTP content type charset for the current response.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current response.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		if (count($this->responseAttachments) > 0) {
-			return false;
-		}
-		return parent::getHTTPContentTypeCharset();
-	}
-
-	/**
-	* processes SOAP message received from client
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed request data from client
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseRequest($headers, $data) {
-		$this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
-		$this->requestAttachments = array();
-		if (strstr($headers['content-type'], 'multipart/related')) {
-			$this->debug('Decode multipart/related');
-			$input = '';
-			foreach ($headers as $k => $v) {
-				$input .= "$k: $v\r\n";
-			}
-			$params['input'] = $input . "\r\n" . $data;
-			$params['include_bodies'] = true;
-			$params['decode_bodies'] = true;
-			$params['decode_headers'] = true;
-			
-			$structure = Mail_mimeDecode::decode($params);
-
-			foreach ($structure->parts as $part) {
-				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {
-					$this->debug('Have root part of type ' . $part->headers['content-type']);
-					$return = parent::parseRequest($part->headers, $part->body);
-				} else {
-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);
-					$info['data'] = $part->body;
-					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';
-					$info['contenttype'] = $part->headers['content-type'];
-					$info['cid'] = $part->headers['content-id'];
-					$this->requestAttachments[] = $info;
-				}
-			}
-		
-			if (isset($return)) {
-				return $return;
-			}
-			
-			$this->setError('No root part found in multipart/related content');
-			return;
-		}
-		$this->debug('Not multipart/related');
-		return parent::parseRequest($headers, $data);
-	}
-}
-
-/*
- *	For backwards compatiblity
- */
-class nusoapservermime extends nusoap_server_mime {
-}
-
-?>
@@ -1,5 +1,21 @@
 var toggle_status_order_list = false;
 var toggle_history_order_list = false;
+var relay_point_max = 10;
+
+// /!\ All the following list data could be store into the same variable
+// But for a better reading of the code, there are separated
+
+// List of the supplier id which the user trying to fetch the relay
+var fetchingRelayPoint = new Array();
+
+// List of the relay point object
+var relayPointDataContainers = new Array();
+
+// List of the google map object
+var GmapList = new Object();
+
+// List the marker liable to the relay pint
+var markerList = new Object();

 function toggleOrderListSelection()
 {
@@ -72,15 +88,14 @@ function checkOtherErrors(json)
 {
 	$('#otherErrors').fadeOut('fast', function()
 	{
-		
 		if (json && json.other && json.other.error)
-		for (numError in json.other.error)
-			if (json.other.error[numError])
-			{
-				$('#otherErrors').fadeIn('slow');
-				$('#otherErrors').children('span').html('');
-				$('#otherErrors').children('span').append(json.other.error[numError]);
-			}
+			for (numError in json.other.error)
+				if (json.other.error[numError])
+				{
+					$('#otherErrors').fadeIn('slow');
+					$('#otherErrors').children('span').html('');
+					$('#otherErrors').children('span').append(json.other.error[numError]);
+				}
 	});
 }

@@ -101,7 +116,8 @@ function checkSucceedGenerateTickets(json)
 					$('#successCreatingTicket_' + id_order).fadeIn('slow');
 					detailedExpeditionList.push({'id_order':id_order, 'expeditionNumber':json.success[id_order].expeditionNumber});
 					
-					if (!$('#detailHistory_' + id_order).length)
+					if (!$('#detailHistory_' + id_order).length) 
+					{
 						$('#PS_MRHistoriqueTableList').append('\
 							<tr id="detailHistory_' + id_order + '">\
 								<td><input type="checkbox" class="history_id_list" name="history_id_list[]" value="' + id_order + '" /></td>\
@@ -110,8 +126,9 @@ function checkSucceedGenerateTickets(json)
 								<td id="URLA4_' + id_order + '"><img src="' + _PS_MR_MODULE_DIR_ + 'images/getTickets.gif" /></td>\
 								<td id="URLA5_' + id_order + '"><img src="' + _PS_MR_MODULE_DIR_ + 'images/getTickets.gif" /></td>\
 							</tr>');
-					else
-					{	
+					} 
+					else 
+					{
 						$('#detailHistory_' + id_order).children('#URLA4_' + id_order).html('<img src="' + _PS_MR_MODULE_DIR_ + 'images/getTickets.gif" />');
 						$('#detailHistory_' + id_order).children('#URLA5_' + id_order).html('<img src="' + _PS_MR_MODULE_DIR_ + 'images/getTickets.gif" />');
 						$('#detailHistory_' + id_order).children('#expeditionNumber_' + id_order).html('<img src="' + _PS_MR_MODULE_DIR_ + 'images/getTickets.gif" />');
@@ -184,9 +201,6 @@ function generateTicketsAjax()

 function displayDeletedHistoryInformation()
 {
-  :x
-
-
 	$('input[name="history_id_list[]"]:checked').each(function()
 	{
 		$(this).parent().parent().css('background-color', '#FFE2E3');
@@ -194,13 +208,16 @@ function displayDeletedHistoryInformation()
 	displayBackHistoriesSubmitButton();
 }

+/*
+** Manage the removed histories id
+*/
 function checkDeletedHistoriesId(json)
 {
 	if (json && json.success)
 	{
 		// Allow to wait the end of the loop to manage unremoved item
 		i = 0;
-		for (numberHistoryId in json.success.deletedListId)
+		for (numberHistoryId in json.success.deletedListId) 
 		{
 			$('#PS_MRHistoryId_' + json.success.deletedListId[numberHistoryId]).parent().parent().fadeOut('fast', function()
 			{
@@ -218,6 +235,9 @@ function checkDeletedHistoriesId(json)
 		displayBackHistoriesSubmitButton();
 }

+/*
+** Delete the histories selected by the merchant 
+*/
 function deleteSelectedHistories()
 {
 	var history_id_list = new Array();
@@ -252,6 +272,471 @@ function deleteSelectedHistories()
 	});
 }

+/*
+** Display a fancy box displaying details about the 
+** backup of the database
+*/
+function PS_MRGetUninstallDetail()
+{
+	$.ajax(
+	{
+		type: 'POST',
+		url: _PS_MR_MODULE_DIR_ + 'ajax.php',
+		data: {'method' : 'uninstallDetail',
+						'action' : 'showFancy',
+						'href' : targetButton,
+						'mrtoken' : mrtoken},
+		dataType: 'json',
+		success: function(json) 
+		{
+			((json.html.length) ?
+				$.fancybox(json.html, 
+				{
+					'autoDimensions'	: false,
+					'width'						: 450,
+					'height'					: 'auto',
+					'transitionIn'		: 'none',
+					'transitionOut'		: 'none',
+					'onComplete'			: function()
+						{
+							PS_MRHandleUninstallButton();
+							
+							// Rewrite some css properties of Fancybox 
+							$('#fancybox-wrap').css('width', '');
+							$('#fancybox-content').css('background-color', '');
+							$('#fancybox-content').css('border', '');
+						}
+				})
+				: '');
+		},
+		error: function(xhr, ajaxOptions, thrownError) 
+		{
+			//console.log(thrownError);
+			// Put debug to see error detail
+		}
+	});
+	return false;
+}
+
+/*
+** Handle the button when a user clicked on the uninstall button
+*/
+function PS_MRHandleUninstallButton()
+{
+	$('#PS_MR_BackupAction').click(function()
+	{
+		$.fancybox.close();
+		PS_MRBackupDatabase();
+	});
+	
+	$('#PS_MR_UninstallAction').click(function()
+	{
+		window.location.href = targetButton;
+		$.fancybox.close();
+		return true;
+	});
+	
+	$('#PS_MR_StopUninstall').click(function()
+	{
+		$.fancybox.close();
+		return false;
+	});
+}
+
+/*
+** ajax call to keep the database of the module safe
+*/
+function PS_MRBackupDatabase()
+{	
+	$.ajax(
+	{
+		type: 'POST',
+		url: _PS_MR_MODULE_DIR_ + 'ajax.php',
+		data: {'method' : 'uninstallDetail',
+					'action' : 'backupAndUninstall',
+					'mrtoken' : mrtoken},
+		dataType: 'json',
+		success: function(json) 
+		{
+			targetButton += '&keepDatabase=true';
+			window.location.href = targetButton;		
+		},
+		error: function(xhr, ajaxOptions, thrownError) 
+		{
+			//console.log(thrownError);
+			// Put debug to see error detail
+		}
+	});
+}
+
+/*
+** Add / update a entry to the selected carrier to the mr_selected table
+** with the selected relay point information
+*/
+function PS_MRAddSelectedRelayPointInDB(relayPointNumber, id_carrier)
+{
+	// Ajax call to add the selection in the database (compatibility for 1.3)
+	// But keep this way to add a selection better that the hook
+	$.ajax({
+		type: 'POST',
+    url: _PS_MR_MODULE_DIR_ + 'ajax.php',
+    data: {'method' : 'addSelectedCarrierToDB',
+    	'relayPointInfo' : relayPointDataContainers[relayPointNumber],
+    	'id_carrier' : id_carrier,
+    	'id_mr_method' : PS_MRCarrierMethodList[id_carrier],
+    	'mrtoken' : mrtoken},
+    success: function(json)
+    {
+    // 	console.log(json);
+    },
+    error: function(xhr, ajaxOptions, thrownError)
+    {
+     	//console.log(xhr);
+     	//console.log(thrownError);
+     	//console.log(ajaxOptions);
+    }
+	});
+}
+
+/*
+** Add / update a entry to the selected carrier to the mr_selected table
+** Without relay point information
+*/
+function PS_MRAddSelectedCarrierInDB(id_carrier)
+{
+	PS_MRHideLastRelayPointList();
+	// Make the request
+	$.ajax({
+		type: 'POST',
+    url: _PS_MR_MODULE_DIR_ + 'ajax.php',
+    data: {'method' : 'addSelectedCarrierToDB',
+    	'id_carrier' : id_carrier,
+    	'id_mr_method' : PS_MRCarrierMethodList[id_carrier],
+    	'mrtoken' : mrtoken},
+    success: function(json)
+    {
+     	//console.log(json);
+    },
+    error: function(xhr, ajaxOptions, thrownError)
+    {
+     	//console.log(xhr);
+     	//console.log(thrownError);
+     	//console.log(ajaxOptions);
+    }
+	});
+}
+
+function PS_MRCarrierSelectedProcess(carrierSelected, id_carrier, MRLivraisonType)
+{
+	if (MRLivraisonType != 'LD1' &&	MRLivraisonType != 'LDS')
+		// Seek Relay point if it doesn't a home delivery mode
+		PS_MRGetRelayPoint(carrierSelected);
+	else
+		// Simply add the selected carrier to the db, relay information will be empty
+		PS_MRAddSelectedCarrierInDB(id_carrier);
+}
+
+/*
+** Hide the last displayed relay point list
+*/
+function PS_MRHideLastRelayPointList()
+{
+	$('.PS_MRSelectedCarrier').fadeOut('fast');
+}
+
+/*
+** Link the generated relay point to an handle click
+** Allow to add the selected relay point in the database
+*/
+function PS_MRHandleSelectedRelayPoint()
+{	
+	// Link all new generated relay point Selected button to an action
+	$('.PS_MRSelectRelayPointButton').click(function()
+	{
+		// Unselect all previous selection (normaly juste one)
+		$('.PS_MRFloatRelayPointSelected').each(function()
+		{
+			$(this).attr('class', 'PS_MRFloatRelayPointSelecteIt');
+			$(this).children('a').text(PS_MRTranslationList['Select']);
+		});
+		// Make the Selection
+		$(this).text(PS_MRTranslationList['Selected']);
+		$(this).parent().attr('class', 'PS_MRFloatRelayPointSelected');
+		
+		// Get the info about the relay point (relayPoint_RelayPointNumber_IdCarrier)
+		tab = $(this).parent().parent().attr('id').split('_');
+		
+		// Store Separated data for the ajax query
+		if (tab.length == 3)
+		{
+			relayPointNumber = tab[1];
+			id_carrier = tab[2];
+			PS_MRAddSelectedRelayPointInDB(relayPointNumber, id_carrier);
+		}
+	});	
+}
+
+
+// Display the relay point fetched
+function PS_MRDisplayRelayPoint(json, blockContent, carrier_id)
+{
+	if (typeof json != 'undefined' && typeof blockContent != 'undefined')
+	{
+		numberDisplayed = 0;
+		
+		PS_MRCreateGmap(carrier_id);
+		blockContent.fadeOut('fast', function()
+		{
+			$(this).children('td').html('');
+			for (relayPoint in json.success)
+			{
+				// Check if the the content wasn't already displayed
+				contentBlockid =  'relayPoint_' + json.success[relayPoint].Num + '_' + carrier_id;
+				if (!$('#' + contentBlockid).size())
+				{
+					$('<div class="PS_MRRelayPointInfo clearfix" id="' + contentBlockid + '"> \
+						<img src="' + _PS_MR_MODULE_DIR_ + 'logo_hd.png" /> \
+						<p><b>' + json.success[relayPoint].LgAdr1 + '</b><br /> ' +  json.success[relayPoint].LgAdr3
+						+ ' - ' + json.success[relayPoint].CP + ' - ' + json.success[relayPoint].Ville
+						+ ' ' + json.success[relayPoint].Pays + '</p> \
+						<div class="PS_MRFloatRelayPointSelecteIt"> \
+							<a class="PS_MRSelectRelayPointButton">' + PS_MRTranslationList['Select'] + '</a> \
+						</div> \
+					</div>').appendTo($(this).children('td'));
+					
+					// Store all the object content to prevent an ajax request
+					relayPointDataContainers[json.success[relayPoint].Num] = json.success[relayPoint];
+					++numberDisplayed;
+					PS_MRAddGMapMarker(carrier_id, json.success[relayPoint].Num, contentBlockid);
+				}
+			}
+			PS_MRHandleSelectedRelayPoint();
+			$(this).fadeIn('fast');
+		});
+	}
+}
+
+// Fetch the relay point
+function PS_MRFetchRelayPoint(carrierSelected)
+{
+	carrier_id = carrierSelected.val();
+	
+	// Block is an input, we need the 'tr' element
+	blockTR = carrierSelected.parent().parent();
+	// Add a new line to the table after the clicked parent element
+	blockTR.after(' \
+		<tr class="PS_MRSelectedCarrier" id="PS_MRSelectedCarrier_' + carrier_id + '"> \
+			<td colspan="4"><div> \
+				<img src="' + _PS_MR_MODULE_DIR_ + 'images/loader.gif" /> \
+			</div> \
+		</td></tr>');
+	
+	fetchingRelayPoint[carrier_id] = $('#PS_MRSelectedCarrier_' + carrier_id);
+	$.ajax(
+	{
+		type: 'POST',
+		url: _PS_MR_MODULE_DIR_ + 'ajax.php',
+		data: {'method' : 'MRGetRelayPoint',
+					'id_carrier' : carrier_id,
+					'mrtoken' : mrtoken},
+		dataType: 'json',
+		success: function(json) 
+		{
+			if (json && json.success)
+				PS_MRDisplayRelayPoint(json, $('#PS_MRSelectedCarrier_' + carrier_id), carrier_id);					
+		},
+		error: function(xhr, ajaxOptions, thrownError) 
+		{
+			//console.log(thrownError);
+			// Put debug to see error detail
+		}
+	});
+}
+
+// Display the relay point of a selected Carrier and keep fetched data
+// in the html page (cache)
+function PS_MRGetRelayPoint(carrierSelected)
+{
+	carrier_id = carrierSelected.val();
+	
+	// Init back the inital view, hide existing element, (keep cached)
+	element = 0;
+	totalElement = $('.PS_MRSelectedCarrier').size();
+	
+	// Check if the element has already been fetched
+	if (totalElement)
+		// It Works like a foreach
+		$('.PS_MRSelectedCarrier').fadeOut('fast', function()
+		{
+			if ((element + 1) >= totalElement)
+			{
+				// Check if the user already clicked and if the process is done
+				if (typeof fetchingRelayPoint[carrier_id] != 'undefined')
+				{
+					fetchingRelayPoint[carrier_id].fadeIn('fast');
+					return ;
+				}
+				// If the element isn't cached, we fetch it
+				PS_MRFetchRelayPoint(carrierSelected);
+			}
+			++element;
+		});
+	else
+		PS_MRFetchRelayPoint(carrierSelected);
+}
+
+/*
+** Create the Gmap Block and cache the js object for the carrier
+*/
+function PS_MRCreateGmap(id_carrier)
+{
+	$('body').prepend('\
+		<tr id="PS_MRGmapDefaultPosition_' + id_carrier + '" class="PS_MRGmapDefaultPosition">\
+			<td colspan="4"> \
+				<div id="PS_MRGmap_' + id_carrier + '" class="PS_MRGmapStyle">\
+		</div></td</tr>');
+	 $('#PS_MRGmap_' + id_carrier).gmap3(
+		{
+			action: 'init',
+			callback: function(result)
+			{
+				GmapList[id_carrier] = $(this);
+				// Can't set the display to none by default (bug due to
+				// navigator that tell to google that content size = 0
+				//$(this).toggle('fast');
+			}
+		}
+	);
+}
+
+/*
+** Resize the map when the div got changement about dimension / position and displaying
+*/
+function PS_MRGmapResizeEvent($map)
+{
+	gmap = $map.gmap3({action:'get'});	
+	google.maps.event.trigger(gmap, 'resize');
+}
+
+/*
+** Move the view of the gmap to a marker 
+** liable to the relay point 
+*/
+function PS_MRGmapPlaceViewOnMarker($map, marker)
+{
+	$map.gmap3(
+	{
+			action:'panTo',
+			args:[marker.position],
+			callback: function()
+			{
+				(function(m)
+				{
+      		setTimeout(function() 
+      		{
+          	m.setAnimation(google.maps.Animation.BOUNCE);
+        	}, 200);
+    		})(marker);
+			//	marker.setAnimation(google.maps.Animation.BOUNCE);
+			}
+	});
+}
+
+/*
+** Stop all dancing marker of the current selected carrier
+*/
+function PS_MRStopDancingMarkers(currentMarkerList)
+{
+	for (markerNumber in currentMarkerList)
+		if (currentMarkerList[markerNumber] != undefined)
+			if (currentMarkerList[markerNumber].getAnimation() != null)
+		 		currentMarkerList[markerNumber].setAnimation(null);
+}
+
+/*
+** Display the Gmap of the selected relay point 
+*/
+function PS_MRDisplayGmap(contentBlockid, $map)
+{	
+	tab = contentBlockid.split('_');
+	relayPointNumber = tab[1];
+	id_carrier = tab[2];
+	
+	// Stop the dancing marker of the current carrier
+	PS_MRStopDancingMarkers(markerList[id_carrier]);
+	if ($('#PS_MRGmap_' + id_carrier).css('display') == 'none')
+	{
+		$('#' + contentBlockid).after($('#PS_MRGmap_' + id_carrier));
+		$('#PS_MRGmap_' + id_carrier).slideDown('fast', function()
+		{
+			PS_MRGmapResizeEvent($map);
+			PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber]);
+		});
+	}
+	else
+	{
+		previousElem = $('#PS_MRGmap_' + id_carrier).prev();	
+		//$('#' + contentBlockid).after($('#PS_MRGmap_' + id_carrier));	
+		$('#PS_MRGmap_' + id_carrier).toggle('fast', function()
+		{
+			if (previousElem.attr('id') != contentBlockid)
+			{
+				$('#' + contentBlockid).after($(this));	
+				$('#PS_MRGmap_' + id_carrier).slideDown('fast', function()
+				{
+					PS_MRGmapPlaceViewOnMarker($map, markerList[id_carrier][relayPointNumber]);
+				});
+			}
+		});
+	}
+}
+
+/*
+** Add a new Marker to a Gmap for a carrier using the 
+** relay point information 
+*/
+function PS_MRAddGMapMarker(id_carrier, relayPointNumber, contentBlockid)
+{
+	// Check if the gmap has been properly created
+	if (GmapList[id_carrier] == undefined)
+		return ;
+	relayInfo = relayPointDataContainers[relayPointNumber];
+	
+	// Add Marker to the map
+	fullFormatedAddress = relayInfo.LgAdr1 + ' ' + relayInfo.LgAdr3 + ' ' + 
+		relayInfo.CP + ' ' + relayInfo.Ville + ' ' + relayInfo.Pays;
+	GmapList[id_carrier].gmap3(
+	{ 
+		action: 'addMarker',
+		address: fullFormatedAddress,
+		map:
+		{
+    	center: true,
+    	zoom: 14
+  	},
+		callback: function(marker)
+		{
+			if (marker)
+			{
+				// Check if the a marker list exist for the carrier,
+				if (markerList[id_carrier] == undefined)
+					markerList[id_carrier] = new Object();
+
+				// Store the marker in the markerList of the carrier
+				markerList[id_carrier][relayPointNumber] = marker;
+				
+				// Link all relay point line info to an action
+				$('#' + contentBlockid).children('p').click(function()
+				{
+					PS_MRDisplayGmap($(this).parent().attr('id'), GmapList[id_carrier]);
+				});
+				return true;
+			}
+		}
+	});
+	return false;
+}	
+
 $(document).ready(function()
 {
 	$('#toggleStatusOrderList').click(function()
@@ -271,3 +756,5 @@ $(document).ready(function()
 		deleteSelectedHistories();
 	});
 });
+
+
@@ -24,10 +24,12 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
+
 if (!defined('_CAN_LOAD_FILES_'))
 	exit;

 require_once(_PS_MODULE_DIR_.'mondialrelay/classes/MondialRelayClass.php');
+require_once(_PS_MODULE_DIR_.'mondialrelay/classes/MRTools.php');

 class MondialRelay extends Module
 {
@@ -37,6 +39,7 @@ class MondialRelay extends Module
 	
 	public static $modulePath = '';
 	public static $moduleURL = '';
+	static public $MRToken = '';

 	// Added for 1.3 compatibility
 	const ONLY_PRODUCTS = 1;
@@ -47,11 +50,15 @@ class MondialRelay extends Module
 	const ONLY_WRAPPING = 6;
 	const ONLY_PRODUCTS_WITHOUT_SHIPPING = 7;

+	// SQL FILTER ORDER
+	const NO_FILTER = 0;
+	const WITHOUT_HOME_DELIVERY = 1;
+
 	public function __construct()
 	{
 		$this->name		= 'mondialrelay';
 		$this->tab		= 'shipping_logistics';
-		$this->version	= '1.6';
+		$this->version	= '1.7';

 		parent::__construct();

@@ -61,7 +68,7 @@ class MondialRelay extends Module
 		
 		self::initModuleAccess();
 		
-		// Call everytime if the merchant make a replace file update
+		// Call everytime to prevent the changement of the module by a recent one
 		$this->_updateProcess();
 	}
 	
@@ -105,7 +112,6 @@ class MondialRelay extends Module
 		if (!$result)
 		{
 			/*tab install */
-
 			$result = Db::getInstance()->getRow('
 				SELECT position 
 				FROM `' . _DB_PREFIX_ . 'tab` 
@@ -135,11 +141,13 @@ class MondialRelay extends Module
 				(`id_profile`,`id_tab`,`view`,`add`,`edit`,`delete`)
 				VALUES('.$profile['id_profile'].', '.(int)($id_tab).', 1, 1, 1, 1)');

-			@copy(_PS_MODULE_DIR_.'mondialrelay/AdminMondialRelay.gif', _PS_IMG_DIR_.'t/AdminMondialRelay.gif');
+			@copy(_PS_MODULE_DIR_.'mondialrelay/AdminMondialRelay.gif', _PS_IMG_DIR_.'/AdminMondialRelay.gif');
 		}	

-		Configuration::updateValue('MONDIAL_RELAY_1_4', '1');
-		Configuration::updateValue('MONDIAL_RELAY_INSTALL_UPDATE_1', 1);
+		// If module isn't installed, set default value
+		if (!Configuration::get('MONDIAL_RELAY'))
+		{
+			Configuration::updateValue('MONDIAL_RELAY', $this->version);
 		Configuration::updateValue('MONDIAL_RELAY_ORDER_STATE', 3);
 		Configuration::updateValue('MONDIAL_RELAY_SECURE_KEY', md5(time().rand(0,10)));
 		Configuration::updateValue('MR_GOOGLE_MAP', '1');
@@ -149,6 +157,17 @@ class MondialRelay extends Module
 		Configuration::updateValue('MR_LANGUAGE', '');
 		Configuration::updateValue('MR_WEIGHT_COEF', '');
 		Configuration::updateValue('PS_MR_SHOP_NAME', Configuration::get('PS_SHOP_NAME'));
+		}
+		else 
+		{
+			// Reactive transport if database wasn't remove at the last uninstall
+			Db::getInstance()->ExecuteS('
+				UPDATE `'._DB_PREFIX_.'carrier` c, `'._DB_PREFIX_.'mr_method` m
+					SET `deleted` = 0
+					WHERE c.id_carrier = m.id_carrier');
+			if (Configuration::get('MONDIAL_RELAY') < $this->version)
+				;// TODO : ADD upgrade process depending of the last and new version
+		}		 
 		return true;
 	}
 	
@@ -173,25 +192,62 @@ class MondialRelay extends Module
 		return true;
 	}
 	
-	public function uninstall()
+	public function uninstallCommonData()
 	{
-		if (!parent::uninstall())
-			return false;
+		// Tab uninstall
+		$result = Db::getInstance()->getRow('
+			SELECT id_tab  
+			FROM `' . _DB_PREFIX_ . 'tab`
+			WHERE class_name="AdminMondialRelay"');
 		
-	/* Tab uninstallation */
-		$result = Db::getInstance()->getRow('SELECT id_tab FROM `'._DB_PREFIX_.'tab` WHERE class_name = "AdminMondialRelay"');
 		if ($result)
 		{
 			$id_tab = $result['id_tab'];
 			if (isset($id_tab) && !empty($id_tab))
 			{	
-				Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'tab WHERE id_tab = '.(int)$id_tab);
-				Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'tab_lang WHERE id_tab = '.(int)$id_tab);
-				Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'access WHERE id_tab = '.(int)$id_tab);
+				Db::getInstance()->Execute('DELETE FROM ' . _DB_PREFIX_ . 'tab WHERE id_tab = '.(int)($id_tab));
+				Db::getInstance()->Execute('DELETE FROM ' . _DB_PREFIX_ . 'tab_lang WHERE id_tab = '.(int)($id_tab));
+				Db::getInstance()->Execute('DELETE FROM ' . _DB_PREFIX_ . 'access WHERE id_tab = '.(int)($id_tab));
 			}
 		}

-		if (!Configuration::deleteByName('MONDIAL_RELAY_1_4') ||
+		if (_PS_VERSION_ >= '1.4' && 
+				!Db::getInstance()->Execute('
+					UPDATE  '._DB_PREFIX_ .'carrier  
+					SET `active` = 0, `deleted` = 1 
+					WHERE `external_module_name` = "mondialrelay"'))
+			return false;
+		else if (!Db::getInstance()->Execute('
+					UPDATE  '._DB_PREFIX_ .'carrier  
+					SET `active` = 0, `deleted` = 1 
+					WHERE `name` = "mondialrelay"'))
+			return false;
+		return true;
+	}
+	
+	public function uninstall()
+	{
+		if (!parent::uninstall())
+			return false;
+		
+		// Uninstall data that doesn't need to be keep	
+		if (!$this->uninstallCommonData())
+			return false;
+			
+		if (Tools::getValue('keepDatabase'))
+		{
+			// Retro Compatibility for older Version than 1.7
+			if (Configuration::get('MONDIAL_RELAY_1_4'))
+			{
+				Configuration::updateValue('MONDIAL_RELAY', '1.6');
+				Configuration::deleteByName('MONDIAL_RELAY_1_4');
+				Configuration::deleteByName('MONDIAL_RELAY_INSTALL_UPDATE_1');
+			}
+			return true;
+		}
+		
+		// MondialRelay Configuration
+		if (!Configuration::deleteByName('MONDIAL_RELAY') ||
 				!Configuration::deleteByName('MONDIAL_RELAY_INSTALL_UPDATE') ||
 				!Configuration::deleteByName('MONDIAL_RELAY_SECURE_KEY') ||
 				!Configuration::deleteByName('MONDIAL_RELAY_ORDER_STATE') ||
@@ -200,11 +256,15 @@ class MondialRelay extends Module
 				!Configuration::deleteByName('MR_CODE_MARQUE') ||
 				!Configuration::deleteByName('MR_KEY_WEBSERVICE') ||
 				!Configuration::deleteByName('MR_WEIGHT_COEF') ||
-				!Configuration::deleteByName('PS_MR_SHOP_NAME') || 
-				!Db::getInstance()->Execute('DROP TABLE '._DB_PREFIX_ .'mr_historique, '._DB_PREFIX_ .'mr_method, '._DB_PREFIX_ .'mr_selected'))
+				!Configuration::deleteByName('PS_MR_SHOP_NAME'))
 			return false;
 			
-		if (_PS_VERSION_ >= '1.4' && !Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'carrier SET `active` = 0, `deleted` = 1 WHERE `external_module_name` = "mondialrelay"'))
+		// Drop databases
+		if (!Db::getInstance()->Execute('
+					DROP TABLE 
+					'._DB_PREFIX_ .'mr_historique, 
+					'._DB_PREFIX_ .'mr_method, 
+					'._DB_PREFIX_ .'mr_selected'))
 			return false;
 		else if (!Db::getInstance()->Execute('UPDATE '._DB_PREFIX_.'carrier SET `active` = 0, `deleted` = 1 WHERE `name` = "mondialrelay"'))
 			return false; 
@@ -212,18 +272,37 @@ class MondialRelay extends Module
 		return true;
 	}
 	
+	/*
+	** UpdateProcess if merchant update the module without a 
+	** normal installation
+	*/
 	private function _updateProcess()
 	{
+		if (Module::isInstalled('mondialrelay') &&
+			(($installedVersion = Configuration::get('MONDIAL_RELAY')) ||
+			$installedVersion = Configuration::get('MONDIAL_RELAY_1_4'))
+			&& $installedVersion < $this->version)
+		{
+			if ($installedVersion < '1.4')
 		$this->_update_v1_4();
+			if ($installedVersion < '1.4.2')
 		$this->_update_v1_4_2();
 	}
 	
+		// Process update done just try to update the new configuration value
+		if (Configuration::get('MONDIAL_RELAY_1_4'))
+		{
+			Configuration::updateValue('MONDIAL_RELAY', $this->version);
+			Configuration::deleteByName('MONDIAL_RELAY_1_4');
+		}
+	}
+	
+	/*
+	** Use if the mechant was using Prestashop 1.3 and 
+	** now use 1.4 or more recent
+	*/
 	private function _update_v1_4()
 	{
-		if (Module::isInstalled('mondialrelay') && 
-			!Configuration::get('MONDIAL_RELAY_1_4'))
-		{
-			Configuration::updateValue('MONDIAL_RELAY_1_4', 1);
 			Db::getInstance()->Execute('
 				UPDATE `'._DB_PREFIX_.'carrier` 
 				SET 
@@ -232,12 +311,14 @@ class MondialRelay extends Module
 					`external_module_name` = 
 					"mondialrelay", 
 					`shipping_method` = 1 
-				WHERE `id_carrier` IN (SELECT `id_mr_method` FROM `'._DB_PREFIX_.'mr_method`)');
-			return true;
+			WHERE `id_carrier` 
+			IN (SELECT `id_mr_method` 
+					FROM `'._DB_PREFIX_.'mr_method`)');
 		}
-		return false;
-	}
 	
+	/*
+	** Add new Hook for the last recent version >= 1.4.2 
+	*/
 	private function _update_v1_4_2()
 	{
 		if (!$this->isRegisteredInHook('newOrder'))
@@ -246,6 +327,38 @@ class MondialRelay extends Module
 			$this->registerHook('BackOfficeHeader');
 	}
 	
+	/*
+	** Get the content to ask for a backup of the database
+	*/ 
+	private function askForBackup($href)
+	{
+		return 'targetButton = \''.$href.'\';
+			PS_MRGetUninstallDetail();';
+	}
+	
+	/*
+	** OnClick for input fields under the module list fields action
+	*/
+	public function onclickOption($type, $href = false)
+	{
+		$content = '';
+		
+		switch($type)
+		{
+			case 'desactive':
+				break;
+			case 'reset':
+				break;
+			case 'delete':
+				break;
+			case 'uninstall':
+				$content = $this->askForBackup($href);
+				break;
+			default:
+		}
+		return $content;
+	}
+	
 	/*
 	** Init the access directory module for URL and file system
 	** Allow a compatibility for Presta < 1.4
@@ -253,6 +366,7 @@ class MondialRelay extends Module
 	public static function initModuleAccess()
 	{
 		self::$modulePath =	_PS_MODULE_DIR_. 'mondialrelay/';
+		self::$MRToken = sha1('mr'._COOKIE_KEY_.'mrAgain');
 	
 		$protocol = (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) 
 			&& strtolower($_SERVER['HTTPS']) != 'off')) ? 'https://' : 'http://';
@@ -282,21 +396,20 @@ class MondialRelay extends Module
 	{
 		DB::getInstance()->Execute('
 			UPDATE `'._DB_PREFIX_.'mr_selected`
-			SET `id_order` = '.(int)$params['order']->id.'
-			WHERE `id_cart` = '.(int)$params['cart']->id);
+			SET `id_order` = '.$params['order']->id.'
+			WHERE `id_cart` = '.$params['cart']->id);
 	}
 	
 	public function hookBackOfficeHeader()
 	{
 		$cssFilePath = $this->_path.'style.css';
 		$jsFilePath= $this->_path.'mondialrelay.js';
-		$mrtoken = sha1('mr'._COOKIE_KEY_.'mrAgain');
 		
 		return '
 			<link type="text/css" rel="stylesheet" href="'.$cssFilePath.'" />
 			<script type="text/javascript">
 				var _PS_MR_MODULE_DIR_ = "'.self::$moduleURL.'";
-				var mrtoken = "'.$mrtoken.'";
+				var mrtoken = "'.self::$MRToken.'";
 			</script>
 			<script type="text/javascript" src="'.$jsFilePath.'"></script>';
 	}
@@ -372,34 +485,7 @@ class MondialRelay extends Module
 			$this->_html .= '<div class="conf confirm"><img src="'._PS_ADMIN_IMG_.'/ok.gif" alt="" /> '.$this->l('Settings updated').'</div>';
 		}
 	}
-	
-	public function getmrth($id_lang, $active = false, $id_zone = false, $id_iso_code = false)
-	{
-		if (!Validate::isBool($active))
-			die(Tools::displayError());

-		$carriers = Db::getInstance()->ExecuteS('
-			SELECT c.*, cl.delay
-			FROM `'._DB_PREFIX_.'mr_method` m
-			LEFT JOIN `'._DB_PREFIX_.'carrier` c ON (c.`id_carrier` = m.`id_carrier` and c.`deleted` = 0)
-			LEFT JOIN `'._DB_PREFIX_.'carrier_lang` cl ON (c.`id_carrier` = cl.`id_carrier` AND cl.`id_lang` = '.(int)$id_lang.Context::getContext()->shop->sqlLang('cl').')
-			LEFT JOIN `'._DB_PREFIX_.'carrier_zone` cz  ON (cz.`id_carrier` = c.`id_carrier`)'.
-			($id_zone ? 'LEFT JOIN `'._DB_PREFIX_.'zone` z  ON (z.`id_zone` = '.(int)$id_zone.')' : '').'
-			WHERE 1  '.
-			($id_iso_code ? ' AND m.`mr_Pays_list` LIKE \'%'.pSQL($id_iso_code).'%\'' : '').
-			($active ? ' AND c.`active` = 1' : '').
-			($id_zone ? ' AND cz.`id_zone` = '.(int)$id_zone.'
-			AND z.`active` = 1' : '').'
-			GROUP BY c.`id_carrier`');
-		
-		if (!is_array($carriers))
-			$carriers = array();
-		foreach ($carriers as $key => $carrier)
-			if ($carrier['name'] == '0')
-				$carriers[$key]['name'] = Configuration::get('PS_SHOP_NAME');
-		return $carriers;
-	}
-	
 	public function hookOrderDetail($params)
 	{
 		$carrier = $params['carrier'];
@@ -428,52 +514,11 @@ class MondialRelay extends Module
 		return $this->display(__FILE__, 'orderDetail.tpl');
 	}
 	
-	public function hookProcessCarrier($params, $redirect = true)
+	/*
+	** No need anymore
+	*/
+	public function hookProcessCarrier($params)
 	{
-		$cart = $params['cart'];
-		$result_MR = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'mr_method` WHERE `id_carrier` = '.(int)($cart->id_carrier));
-		if (count($result_MR) > 0) 
-		{
-			$mr_mode_liv = $result_MR[0]['mr_ModeLiv'];
-			if ($mr_mode_liv == 'LDS' || $mr_mode_liv == 'LD1')
-			{
-				$deliveryAddressLDS = new Address((int)($cart->id_address_delivery));
-				if (Validate::isLoadedObject($deliveryAddressLDS) AND ($deliveryAddressLDS->id_customer == $cart->id_customer))
-     			{
-	 				Db::getInstance()->delete(_DB_PREFIX_.'mr_selected','id_cart = "'.(int)($cart->id).'"');
-					$mrselected = new MondialRelayClass();
-					$mrselected->id_customer = $cart->id_customer;
-					$mrselected->id_method = $result_MR[0]['id_mr_method'];
-					$mrselected->id_cart = $cart->id;
-					$mrselected->MR_Selected_Num = $mr_mode_liv;
-					$mrselected->save();
-	 			}
-			}
-			else if (!Configuration::get('PS_ORDER_PROCESS_TYPE'))
-			{
-				// Redirect is set to false in Presta 1.3 for compatibility 
-				// when this method is called under an ajax process
-				if (empty($_POST['MR_Selected_Num_'.$cart->id_carrier]) && $redirect) // Case error : the customer didn't choose a 'relais' but selected Relais Colis TNT as a carrier 
-					Tools::redirect('index.php?controller=order&step=2&mr_null');
-				else
-				{
-					Db::getInstance()->delete(_DB_PREFIX_.'mr_selected','id_cart = "'.(int)($cart->id).'"');
-					$mrselected = new MondialRelayClass();
-					$mrselected->id_customer = $cart->id_customer;
-					$mrselected->id_method = $result_MR[0]['id_mr_method'];
-					$mrselected->id_cart = $cart->id;
-					$mrselected->MR_Selected_Num = $_POST['MR_Selected_Num_'.$cart->id_carrier];
-					$mrselected->MR_Selected_LgAdr1 = $_POST['MR_Selected_LgAdr1_'.$cart->id_carrier];
-					$mrselected->MR_Selected_LgAdr2 = $_POST['MR_Selected_LgAdr2_'.$cart->id_carrier];
-					$mrselected->MR_Selected_LgAdr3 = $_POST['MR_Selected_LgAdr3_'.$cart->id_carrier];
-					$mrselected->MR_Selected_LgAdr4 = $_POST['MR_Selected_LgAdr4_'.$cart->id_carrier];
-					$mrselected->MR_Selected_CP = $_POST['MR_Selected_CP_'.$cart->id_carrier];
-					$mrselected->MR_Selected_Ville = $_POST['MR_Selected_Ville_'.$cart->id_carrier];
-					$mrselected->MR_Selected_Pays = $_POST['MR_Selected_Pays_'.$cart->id_carrier];
-					$mrselected->save();
-				}
-			}
-		}
 	}
 	
 	public function hookupdateCarrier($params)
@@ -501,92 +546,82 @@ class MondialRelay extends Module
 		}
 	}
 	
+	/*
+	** Get a carrier list liable to the module
+	*/
+	public function _getCarriers()
+	{
+		global $cookie;
+		
+		$id_lang = (int)$cookie->id_lang;
+	
+		// Query don't use the external_module_name to keep the 
+		// 1.3 compatibility	
+		$carriers = Db::getInstance()->ExecuteS('
+			SELECT 
+				c.id_carrier,
+				c.range_behavior,
+				m.id_mr_method,
+				m.mr_ModeLiv,
+				cl.delay
+			FROM `'._DB_PREFIX_.'mr_method` m
+			LEFT JOIN `'._DB_PREFIX_.'carrier` c 
+			ON c.`id_carrier` = m.`id_carrier`
+			LEFT JOIN `'._DB_PREFIX_.'carrier_lang` cl 
+			ON c.`id_carrier` = cl.`id_carrier`
+			WHERE  c.`deleted` = 0
+			AND c.active = 1');
+		
+		if (!is_array($carriers))
+			$carriers = array();
+		return $carriers;
+	}
+	
 	public function hookextraCarrier($params)
 	{	
 		global $nbcarriers;

-		if (Configuration::get('MR_ENSEIGNE_WEBSERVICE') == '' OR
-			Configuration::get('MR_CODE_MARQUE') == '' OR
-			Configuration::get('MR_KEY_WEBSERVICE') == '' OR
+		if (Configuration::get('MR_ENSEIGNE_WEBSERVICE') == '' ||
+			Configuration::get('MR_CODE_MARQUE') == '' ||
+			Configuration::get('MR_KEY_WEBSERVICE') == '' ||
 			Configuration::get('MR_LANGUAGE') == '')
 			return '';

-		$totalweight = Configuration::get('MR_WEIGHT_COEF') * $this->context->cart->getTotalWeight();
-	
-		if (Validate::isUnsignedInt($this->context->cart->id_carrier))
-		{
-			$carrier = new Carrier((int)($this->context->cart->id_carrier));
-			if ($carrier->active AND !$carrier->deleted)
-				$checked = (int)($this->context->cart->id_carrier);
-		}
-		if (!isset($checked) OR $checked == 0)
-			$checked = (int)(Configuration::get('PS_CARRIER_DEFAULT'));
-
 		$address = new Address((int)($this->context->cart->id_address_delivery));
 		$id_zone = Address::getZoneById((int)($address->id));
-		$country = new Country((int)($address->id_country));
+		//$country = new Country((int)($address->id_country));
+		$carriersList = self::_getCarriers();
 	
-		$query = self::getmrth($this->context->language->id, true, (int)($country->id_zone), $country->iso_code);
-
-		$resultsArray = array();
-		$i = 0;
-		foreach ($query AS $k => $row)
+		// Check if the defined carrier are ok
+		foreach ($carriersList as $k => $row)
 		{
 			$carrier = new Carrier((int)($row['id_carrier']));
-			if ((Configuration::get('PS_SHIPPING_METHOD') AND $carrier->getMaxDeliveryPriceByWeight($id_zone) === false) OR
+			if ((Configuration::get('PS_SHIPPING_METHOD') AND $carrier->getMaxDeliveryPriceByWeight($id_zone) === false) ||
 				(!Configuration::get('PS_SHIPPING_METHOD') AND $carrier->getMaxDeliveryPriceByPrice($id_zone) === false))
-			{
-				unset($result[$k]);
-				continue ;
-			}
-
-			if ($row['range_behavior'])
+				unset($carriersList[$k]);
+			else if ($row['range_behavior'])
 			{
 				// Get id zone
-				if (isset($this->context->cart->id_address_delivery) AND $this->context->cart->id_address_delivery)
-					$id_zone = Address::getZoneById((int)($this->context->cart->id_address_delivery));
-				else
-					$id_zone = (int)$this->context->country->id_zone;
+				$id_zone = (isset($this->context->cart->id_address_delivery) AND $this->context->cart->id_address_delivery) ?
+					Address::getZoneById((int)$this->context->cart->id_address_delivery) :
+					(int)$this->context->country->id_zone;				
 				if ((Configuration::get('PS_SHIPPING_METHOD') AND (!Carrier::checkDeliveryPriceByWeight($row['id_carrier'], $this->context->cart->getTotalWeight(), $id_zone))) OR
 					(!Configuration::get('PS_SHIPPING_METHOD') AND (!Carrier::checkDeliveryPriceByPrice($row['id_carrier'], $this->context->cart->getOrderTotal(true, self::BOTH_WITHOUT_SHIPPING), $id_zone, $this->context->cart->id_currency))))
-					{
-						unset($result[$k]);
-						continue ;
+						unset($carriersList[$k]);
 					}
 			}

-			$settings = Db::getInstance()->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'mr_method` WHERE `id_carrier` = '.(int)($row['id_carrier']));
-			$row['name'] = $settings[0]['mr_Name'];
-			$row['col'] = $settings[0]['mr_ModeCol'];
-			$row['liv'] = $settings[0]['mr_ModeLiv'];
-			$row['ass'] = $settings[0]['mr_ModeAss'];
-			$row['price'] = $this->context->cart->getOrderShippingCost((int)($row['id_carrier']));
-			$row['img'] = file_exists(_PS_SHIP_IMG_DIR_.(int)($row['id_carrier']).'.jpg') ? _THEME_SHIP_DIR_.(int)($row['id_carrier']).'.jpg' : '';
-
-			$resultsArray[] = $row;
-			$i++;
-	 	}
-
-		if ($i > 0)
-		{
-			include_once(_PS_MODULE_DIR_.'mondialrelay/page_iso.php');
+	//	$address_map = $address->address1.', '.$address->postcode.', '.
+		//	MRTools::replaceAccentedCharacters($address->city).', '.$country->iso_code;

 			$this->context->smarty->assign( array(
-							'address_map' => $address->address1.', '.$address->postcode.', '.ote_accent($address->city).', '.$country->iso_code,
-							'input_cp'  => $address->postcode,
-							'input_ville'  => ote_accent($address->city),
-							'input_pays'  => $country->iso_code,
-							'input_poids'  => Configuration::get('MR_WEIGHT_COEF') * $this->context->cart->getTotalWeight(),
-							'nbcarriers' => $nbcarriers,
-							'checked' => (int)($checked),
-							'google_api_key' => Configuration::get('MR_GOOGLE_MAP'),
 							'one_page_checkout' => (Configuration::get('PS_ORDER_PROCESS_TYPE') ? Configuration::get('PS_ORDER_PROCESS_TYPE') : 0),
 							'new_base_dir' => self::$moduleURL,
-							'carriersextra' => $resultsArray));
-			$nbcarriers = $nbcarriers + $i;
+			'MRToken' => self::$MRToken,
+			'carriersextra' => $carriersList));
+			
 			return $this->display(__FILE__, 'mondialrelay.tpl');
 		}
-	}
 	
 	public function getContent()
 	{	
@@ -1133,7 +1168,7 @@ class MondialRelay extends Module
 			return self::ordersSQLQuery1_3($id_order_state);
 	}
 	
-	public static function getOrders($orderIdList = array())
+	public static function getOrders($orderIdList = array(), $filterEntries = self::NO_FILTER)
 	{
 		$id_order_state = Configuration::get('MONDIAL_RELAY_ORDER_STATE');
 		$sql = self::getBaseOrdersSQLQuery($id_order_state);
@@ -1145,6 +1180,14 @@ class MondialRelay extends Module
 				$sql .= (int)$id_order.', ';
 			$sql = rtrim($sql, ', ').')';
 		}
+		switch($filterEntries)
+		{
+			case self::WITHOUT_HOME_DELIVERY:
+				$sql .= 'AND mr.mr_ModeLiv != "LD1" AND mr.mr_ModeLiv != "LDS"';
+				break;
+			default:
+				break;
+		}
 		$sql .= '
 			GROUP BY o.`id_order`
 			ORDER BY o.`date_add` ASC';
@@ -24,72 +24,46 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}

-<script type="text/javascript">var _PS_MR_MODULE_DIR_ = "{$new_base_dir}";</script>
-<script type="text/javascript" src="{$new_base_dir}kit_mondialrelay/js/include_MR.js"></script>
-<script type="text/javascript" src="{$new_base_dir}kit_mondialrelay/js/ressources_MR.js"></script>
+<link href="{$new_base_dir}/style.css" rel="stylesheet" type="text/css" media="all" /> 
+
 <script type="text/javascript">
+	// Global JS Value
+	var _PS_MR_MODULE_DIR_ = "{$new_base_dir}";
+	var mrtoken = "{$MRToken}";
 	var one_page_checkout = {$one_page_checkout};
-	var server_error = "{l s='Problem getting addresses from MondialRelay Webservice : Mondial Relay servers\' may be down' mod='mondialrelay'}";
-	var address_error = "{l s='There is no Relay Point close to your address, please change your address or use another shipping' mod='mondialrelay'}";
+	var PS_MRTranslationList = new Array();
+	var PS_MRCarrierMethodList =  new Array();
+	
+	PS_MRTranslationList['Select'] = "{l s='Select' mod='mondialrelay'}";
+	PS_MRTranslationList['Selected'] = "{l s='Selected' mod='mondialrelay'}";
 </script>

-{foreach from=$carriersextra item=carrier name=myLoop}
+<script type="text/javascript" src="{$new_base_dir}mondialrelay.js"></script>
+<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
+<script type="text/javascript" src="{$new_base_dir}js/gmap.js"></script>

-	<script type="text/javascript">{literal}
+<script type="text/javascript">
 	$(document).ready(function() 
 	{
-		$('input[name$=id_carrier]').click(function() {
-			{/literal}affiche_mydiv_mr({$carrier.id_carrier|intval}, 'relativ_base_dir={$base_dir}&Pays={$input_pays}&Ville={$input_ville}&CP={$input_cp}&Taille=&Poids={$input_poids}&Action={$carrier.liv|escape:'htmlall':'UTF-8'}&num={$carrier.id_carrier|intval}');{literal}
+		// Bind id_carrierX to an ajax call 
+		{foreach from=$carriersextra item=carrier name=myLoop}
+			$('#id_carrier' + {$carrier.id_carrier}).click(function()
+			{
+				PS_MRCarrierSelectedProcess($(this), {$carrier.id_carrier}, '{$carrier.mr_ModeLiv}');
 		});
+			PS_MRCarrierMethodList[{$carrier.id_carrier}] = {$carrier.id_mr_method};
+			if ($('#id_carrier' + {$carrier.id_carrier}).attr('checked'))
+			{
+				PS_MRCarrierSelectedProcess($('#id_carrier' + {$carrier.id_carrier}), {$carrier.id_carrier}, '{$carrier.mr_ModeLiv}');
+			}
+		{/foreach}
+		// Handle input click of the other input to hide the previous relay point list displayed
+		$('input[name=id_carrier]').click(function()
+		{
+			// Hide MR input if one of them is not selected
+			if (PS_MRCarrierMethodList[$(this).val()] == undefined)
+				PS_MRHideLastRelayPointList();
+		})
 	});
-	{/literal}</script>
-	
-	<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{/if} {if ($nbcarriers+$smarty.foreach.myLoop.index) % 2}alternate_item{else}item{/if}">
-
-					<td class="carrier_action radio">
-						<input type="radio" name="id_carrier" value="{$carrier.id_carrier|intval}" id="id_carrier_mr{$carrier.id_carrier|intval}" onchange="affiche_mydiv_mr({$carrier.id_carrier|intval}, 
-   'relativ_base_dir={$base_dir}&Pays={$input_pays}&Ville={$input_ville}&CP={$input_cp}&Taille=&Poids={$input_poids}&Action={$carrier.liv|escape:'htmlall':'UTF-8'}&num={$carrier.id_carrier|intval}'
-						);" {if ($carrier.id_carrier == $checked)} checked="checked" {/if} {if $one_page_checkout}onclick="updateCarrierSelectionAndGift();" {/if} />
-					</td>
-					<td class="carrier_name">
-						<label for="id_carrier_mr{$carrier.id_carrier|intval}">
-						{if $carrier.img}<img src="{$carrier.img|escape:'htmlall':'UTF-8'}" alt="{$carrier.name|escape:'htmlall':'UTF-8'}">{else}{$carrier.name|escape:'htmlall':'UTF-8'}{/if}
-							
-						</label>
-					</td>
-					<td class="carrier_infos">{$carrier.delay|escape:'htmlall':'UTF-8'}</td>
-					<td class="carrier_price">
-						{if $carrier.price}
-							<span class="price">
-								{if $priceDisplay == 1}{convertPrice price=$carrier.price_tax_exc}{else}{convertPrice price=$carrier.price}{/if}
-							</span>
-							{if $priceDisplay == 1} {l s='(tax excl.)' mod='mondialrelay'}{else} {l s='(tax incl.)' mod='mondialrelay'}{/if}
-						{else}
-							{l s='Free!' mod='mondialrelay'}
-						{/if}
-					</td>
-			</tr>		
-	{if $carrier.liv !='LDR' && $carrier.liv != 'LD1' && $carrier.liv != 'LDS'}
-				<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{/if} {if ($nbcarriers+$smarty.foreach.myLoop.index) % 2}alternate_item{else}item{/if}">
-					<td colspan="4" align="center">
-						<div style="display:none;" id="form_mondialrelay_{$carrier.id_carrier|intval}"></div>
-						{if ($google_api_key)}
-						<iframe style="display:none;" id="all_mondialrelay_map_{$carrier.id_carrier|intval}" width="517px" height="317px" frameborder="0" scrolling="no" src="{$base_dir}modules/mondialrelay/googlemap.php?relativ_base_dir={$base_dir}&Pays={$input_pays}&Ville={$input_ville}&CP={$input_cp}&Taille=&Poids={$input_poids}&Action={$carrier.liv|escape:'htmlall':'UTF-8'}&num={$carrier.id_carrier|intval}&address={$address_map}"></iframe>
-						{/if}
-						<img src="{$new_base_dir}images/loader.gif" style="display:none;" id="loading_mr"/>
-						<div style="display:none;" id="mondialrelay_{$carrier.id_carrier|intval}"></div>		 
-					</td>
-				</tr>
-	{/if}
-	<script type="text/javascript" >
-		if ($("#id_carrier{$carrier.id_carrier|intval}").attr('checked') == true)
-			$("#id_carrier_mr{$carrier.id_carrier|intval}").attr('checked', "checked")
-		$("#id_carrier{$carrier.id_carrier|intval}").parent().parent().remove();
-		include_mondialrelay({$carrier.id_carrier|intval});
-		
-		if ($("#id_carrier_mr{$carrier.id_carrier|intval}").attr('checked') == true)
-		affiche_mydiv_mr({$carrier.id_carrier|intval}, 'relativ_base_dir={$base_dir}&Pays={$input_pays}&Ville={$input_ville}&CP={$input_cp}&Taille=&Poids={$input_poids}&Action={$carrier.liv|escape:'htmlall':'UTF-8'}&num={$carrier.id_carrier|intval}');
 	</script>
-{/foreach}
-

@@ -174,3 +174,138 @@ div.PS_MRLoader
 {
 	display:none;
 }
+
+div#PS_MRAskBackupContent
+{
+	border:1px solid #000;
+	background: url(logo_hd.png) no-repeat 10px 50px #BEBEBE;
+	line-height:18px;
+	font-size:14px;
+	height:190px;	
+}
+
+div#PS_MRAskBackupContent div
+{
+	width:290px;
+	float:right;
+	margin-right:20px;
+	text-align: center;
+}
+
+div#PS_MRAskBackupContent div > p
+{
+	line-height: 30px;
+}
+
+div#PS_MRAskBackupContent h2
+{
+	padding-top:10px;
+}
+
+tr.PS_MRSelectedCarrier > td
+{
+	text-align: center;
+	border-bottom: 1px black;
+}
+
+.PS_MRWarn
+{
+	border: 1px solid #D3C200;
+	background-color: #FFFAC6;
+	line-height: 20px;
+}
+
+.PS_MRRelayPointInfo
+{
+	text-align: left;
+	vertical-align: top;
+	margin: 10px 0;
+	cursor: pointer;
+}
+
+.PS_MRRelayPointInfo:hover
+{
+	background-color: #f4f4f4;
+}
+
+.PS_MRRelayPointInfo img
+{
+	height: 40px;
+	float:left;
+}
+
+.PS_MRRelayPointInfo p
+{
+ float:left;
+ width:380px;
+ text-align: justify;
+}
+
+.PS_MRFloatRelayPointSelecteIt
+{
+	display:none;
+}
+
+.PS_MRRelayPointInfo:hover .PS_MRFloatRelayPointSelecteIt
+{
+	display:block;
+}
+
+.PS_MRRelayPointInfo .PS_MRFloatRelayPointSelected
+{
+	color:#333333;
+	background:url(images/selectRelayPoint.png) no-repeat 0px -25px;
+}
+
+.PS_MRFloatRelayPointSelected
+{
+	display:block;
+}
+
+.PS_MRFloatRelayPointSelecteIt a.PS_MRSelectRelayPointButton 
+{
+	float:right;
+	display: block;
+	width: 60px;
+	height: 20px;
+	padding: 5px 20px 0px 25px;
+	color:#666666;
+	text-decoration: none;
+	margin-top: 8px;
+	background:url(images/selectRelayPoint.png) no-repeat 0px 0px;
+}
+
+.PS_MRFloatRelayPointSelected a.PS_MRSelectRelayPointButton 
+{
+	float:right;
+	display: block;
+	width: 60px;
+	height: 20px;
+	padding: 5px 20px 0px 25px;
+	text-decoration: none;
+	margin-top: 8px;
+	color:#333333;
+	background:url(images/selectRelayPoint.png) no-repeat 0px -25px;
+}
+
+a.PS_MRSelectRelayPointButton:hover 
+{
+	color:#333333;
+	background:url(images/selectRelayPoint.png) no-repeat 0px -25px;
+}
+
+.PS_MRGmapDefaultPosition
+{
+}
+
+.PS_MRGmapDefaultPosition
+{
+	display:none;
+}
+
+div.PS_MRGmapStyle
+{
+	width: 550px;
+	height:250px;
+	display: none;
+}