Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[7904] trunk
|
From: <dai...@us...> - 2018-01-06 23:15:20
|
Revision: 7904
http://sourceforge.net/p/web-erp/reponame/7904
Author: daintree
Date: 2018-01-06 23:15:16 +0000 (Sat, 06 Jan 2018)
Log Message:
-----------
Update phpxmlrpc from fithub latest
Modified Paths:
--------------
trunk/AutomaticTranslationDescriptions.php
trunk/doc/Change.log
trunk/includes/GoogleTranslator.php
trunk/xmlrpc/lib/xmlrpc.inc
trunk/xmlrpc/lib/xmlrpc_wrappers.inc
trunk/xmlrpc/lib/xmlrpcs.inc
Modified: trunk/AutomaticTranslationDescriptions.php
===================================================================
--- trunk/AutomaticTranslationDescriptions.php 2018-01-06 14:30:16 UTC (rev 7903)
+++ trunk/AutomaticTranslationDescriptions.php 2018-01-06 23:15:16 UTC (rev 7904)
@@ -7,6 +7,12 @@
$BookMark = 'Z_TranslateItemDescriptions'; // Anchor's id in the manual's html document.
include ('includes/header.php');
+if (!function_exists("curl_init")){
+ prnMsg("This script requires that the PHP curl module be available to use the Google API. Unfortunately this installation does not have the curl module available","error");
+ include('includes/footer.php');
+ exit;
+}
+
include ('includes/GoogleTranslator.php');
$SourceLanguage=mb_substr($_SESSION['Language'],0,2);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2018-01-06 14:30:16 UTC (rev 7903)
+++ trunk/doc/Change.log 2018-01-06 23:15:16 UTC (rev 7904)
@@ -1,7 +1,9 @@
webERP Change Log
6/1/18 PaulT: SelectSalesOrder.php: Fix handling to correct table heading value. (Reported in forums by Paul Becker)
-6/1/18 Phil: Attempt to avoid XSS attacks by logged in users by parsing out "script>" from all $_POST and $_GET variables - subsequentely changed to strip_tags from all $_POST and $_GETs per Tim's recommendation
+7/1/18 Phil: Update phpxmlrpc to latest from https://github.com/gggeek/phpxmlrpc
+6/1/18 Phil: Attempt to avoid XSS attacks by logged in users by parsing out "script>" from all $_POST and $_GET variables - subsequentely changed to strip_tags from all $_POST and $_GETs per Tim's recommendation
+
3/1/18: PaulT: SelectSalesOrder.php: Fix search to retain quote option and set StockLocation to the UserStockLocation to auto-load current Sales Orders.
2/1/18: PaulT: SelectSalesOrder.php: Move handling for URL Quotations parameter to top of file to avoid potential page error(s). (Reported in forums by Paul Becker) Handling move reduces code within some conditional checks. This change also includes minor whitespace improvements and removes an unused global reference.
2/1/18: PaulT: css/default/default.css: Add text alignment in a couple of styles to match the same use in other CSS to avoid formatting issues when the default theme is used. Also, set several property names to lowercase.
Modified: trunk/includes/GoogleTranslator.php
===================================================================
--- trunk/includes/GoogleTranslator.php 2018-01-06 14:30:16 UTC (rev 7903)
+++ trunk/includes/GoogleTranslator.php 2018-01-06 23:15:16 UTC (rev 7904)
@@ -4,14 +4,13 @@
// This webERP-style code is based on http://hayageek.com/google-translate-api-tutorial/
function translate_via_google_translator($text,$target,$source=false){
- $url = 'https://www.googleapis.com/language/translate/v2?key=' . $_SESSION['GoogleTranslatorAPIKey'] . '&q=' . rawurlencode($text);
- $url .= '&target='.$target;
+ $url = 'https://www.googleapis.com/language/translate/v2?key=' . $_SESSION['GoogleTranslatorAPIKey'] . '&q=' . rawurlencode($text) . '&target=' . $target;
if($source){
- $url .= '&source='.$source;
+ $url .= '&source=' . $source;
}
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
- $response = curl_exec($ch);
+ $response = curl_exec($ch);
curl_close($ch);
$obj =json_decode($response,true); //true converts stdClass to associative array.
if($obj != null){
@@ -21,13 +20,13 @@
else{
$TranslatedText = $obj['data']['translations'][0]['translatedText'];
// if(isset($obj['data']['translations'][0]['detectedSourceLanguage'])) //this is set if only source is not available.
- // echo "Detecte Source Languge : ".$obj['data']['translations'][0]['detectedSourceLanguage']."n";
+ // echo "Detecte Source Languge : ".$obj['data']['translations'][0]['detectedSourceLanguage']."n";
}
}
else{
- $TranslatedText = "UNKNOW ERROR";
+ $TranslatedText = "UNKNOW ERROR";
}
return $TranslatedText;
-}
+}
?>
\ No newline at end of file
Modified: trunk/xmlrpc/lib/xmlrpc.inc
===================================================================
--- trunk/xmlrpc/lib/xmlrpc.inc 2018-01-06 14:30:16 UTC (rev 7903)
+++ trunk/xmlrpc/lib/xmlrpc.inc 2018-01-06 23:15:16 UTC (rev 7904)
@@ -1,7 +1,6 @@
<?php
// by Edd Dumbill (C) 1999-2002
// <ed...@us...>
-// $Id: xmlrpc.inc,v 1.174 2009/03/16 19:36:38 ggiunta Exp $
// Copyright (c) 1999,2000,2002 Edd Dumbill.
// All rights reserved.
@@ -35,3742 +34,181 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
// OF THE POSSIBILITY OF SUCH DAMAGE.
- if(!function_exists('xml_parser_create'))
- {
- // For PHP 4 onward, XML functionality is always compiled-in on windows:
- // no more need to dl-open it. It might have been compiled out on *nix...
- if(strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))
- {
- dl('xml.so');
- }
- }
+/******************************************************************************
+ *
+ * *** DEPRECATED ***
+ *
+ * This file is only used to insure backwards compatibility
+ * with the API of the library <= rev. 3
+ *
+ * If it is included, the library will work without any further autoloading
+ *****************************************************************************/
- // G. Giunta 2005/01/29: declare global these variables,
- // so that xmlrpc.inc will work even if included from within a function
- // Milosch: 2005/08/07 - explicitly request these via $GLOBALS where used.
- $GLOBALS['xmlrpcI4']='i4';
- $GLOBALS['xmlrpcInt']='int';
- $GLOBALS['xmlrpcBoolean']='boolean';
- $GLOBALS['xmlrpcDouble']='double';
- $GLOBALS['xmlrpcString']='string';
- $GLOBALS['xmlrpcDateTime']='dateTime.iso8601';
- $GLOBALS['xmlrpcBase64']='base64';
- $GLOBALS['xmlrpcArray']='array';
- $GLOBALS['xmlrpcStruct']='struct';
- $GLOBALS['xmlrpcValue']='undefined';
+include_once(__DIR__.'/../src/PhpXmlRpc.php');
+include_once(__DIR__.'/../src/Value.php');
+include_once(__DIR__.'/../src/Request.php');
+include_once(__DIR__.'/../src/Response.php');
+include_once(__DIR__.'/../src/Client.php');
+include_once(__DIR__.'/../src/Encoder.php');
+include_once(__DIR__.'/../src/Helper/Charset.php');
+include_once(__DIR__.'/../src/Helper/Date.php');
+include_once(__DIR__.'/../src/Helper/Http.php');
+include_once(__DIR__.'/../src/Helper/Logger.php');
+include_once(__DIR__.'/../src/Helper/XMLParser.php');
- $GLOBALS['xmlrpcTypes']=array(
- $GLOBALS['xmlrpcI4'] => 1,
- $GLOBALS['xmlrpcInt'] => 1,
- $GLOBALS['xmlrpcBoolean'] => 1,
- $GLOBALS['xmlrpcString'] => 1,
- $GLOBALS['xmlrpcDouble'] => 1,
- $GLOBALS['xmlrpcDateTime'] => 1,
- $GLOBALS['xmlrpcBase64'] => 1,
- $GLOBALS['xmlrpcArray'] => 2,
- $GLOBALS['xmlrpcStruct'] => 3
- );
- $GLOBALS['xmlrpc_valid_parents'] = array(
- 'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT'),
- 'BOOLEAN' => array('VALUE'),
- 'I4' => array('VALUE'),
- 'INT' => array('VALUE'),
- 'STRING' => array('VALUE'),
- 'DOUBLE' => array('VALUE'),
- 'DATETIME.ISO8601' => array('VALUE'),
- 'BASE64' => array('VALUE'),
- 'MEMBER' => array('STRUCT'),
- 'NAME' => array('MEMBER'),
- 'DATA' => array('ARRAY'),
- 'ARRAY' => array('VALUE'),
- 'STRUCT' => array('VALUE'),
- 'PARAM' => array('PARAMS'),
- 'METHODNAME' => array('METHODCALL'),
- 'PARAMS' => array('METHODCALL', 'METHODRESPONSE'),
- 'FAULT' => array('METHODRESPONSE'),
- 'NIL' => array('VALUE'), // only used when extension activated
- 'EX:NIL' => array('VALUE') // only used when extension activated
- );
+/* Expose the global variables which used to be defined */
+PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'ISO-8859-1'; // old default
+PhpXmlRpc\PhpXmlRpc::exportGlobals();
- // define extra types for supporting NULL (useful for json or <NIL/>)
- $GLOBALS['xmlrpcNull']='null';
- $GLOBALS['xmlrpcTypes']['null']=1;
+/* some stuff deprecated enough that we do not want to put it in the new lib version */
- // Not in use anymore since 2.0. Shall we remove it?
- /// @deprecated
- $GLOBALS['xmlEntities']=array(
- 'amp' => '&',
- 'quot' => '"',
- 'lt' => '<',
- 'gt' => '>',
- 'apos' => "'"
- );
+/// @deprecated
+$GLOBALS['xmlEntities'] = array(
+ 'amp' => '&',
+ 'quot' => '"',
+ 'lt' => '<',
+ 'gt' => '>',
+ 'apos' => "'"
+);
- // tables used for transcoding different charsets into us-ascii xml
+// formulate backslashes for escaping regexp
+// Not in use anymore since 2.0. Shall we remove it?
+/// @deprecated
+$GLOBALS['xmlrpc_backslash'] = chr(92).chr(92);
- $GLOBALS['xml_iso88591_Entities']=array();
- $GLOBALS['xml_iso88591_Entities']['in'] = array();
- $GLOBALS['xml_iso88591_Entities']['out'] = array();
- for ($i = 0; $i < 32; $i++)
- {
- $GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);
- $GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';
- }
- for ($i = 160; $i < 256; $i++)
- {
- $GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);
- $GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';
- }
+/* Expose with the old names the classes which have been namespaced */
- /// @todo add to iso table the characters from cp_1252 range, i.e. 128 to 159?
- /// These will NOT be present in true ISO-8859-1, but will save the unwary
- /// windows user from sending junk (though no luck when reciving them...)
- /*
- $GLOBALS['xml_cp1252_Entities']=array();
- for ($i = 128; $i < 160; $i++)
- {
- $GLOBALS['xml_cp1252_Entities']['in'][] = chr($i);
- }
- $GLOBALS['xml_cp1252_Entities']['out'] = array(
- '€', '?', '‚', 'ƒ',
- '„', '…', '†', '‡',
- 'ˆ', '‰', 'Š', '‹',
- 'Œ', '?', 'Ž', '?',
- '?', '‘', '’', '“',
- '”', '•', '–', '—',
- '˜', '™', 'š', '›',
- 'œ', '?', 'ž', 'Ÿ'
- );
- */
+class xmlrpcval extends PhpXmlRpc\Value
+{
+ /**
+ * @deprecated
+ * @param xmlrpcval $o
+ * @return string
+ */
+ public function serializeval($o)
+ {
+ // add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...
+ //if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))
+ //{
+ $ar = $o->me;
+ $val = reset($ar);
+ $typ = key($ar);
- $GLOBALS['xmlrpcerr'] = array(
- 'unknown_method'=>1,
- 'invalid_return'=>2,
- 'incorrect_params'=>3,
- 'introspect_unknown'=>4,
- 'http_error'=>5,
- 'no_data'=>6,
- 'no_ssl'=>7,
- 'curl_fail'=>8,
- 'invalid_request'=>15,
- 'no_curl'=>16,
- 'server_error'=>17,
- 'multicall_error'=>18,
- 'multicall_notstruct'=>9,
- 'multicall_nomethod'=>10,
- 'multicall_notstring'=>11,
- 'multicall_recursion'=>12,
- 'multicall_noparams'=>13,
- 'multicall_notarray'=>14,
+ return '<value>' . $this->serializedata($typ, $val) . "</value>\n";
+ //}
+ }
- 'cannot_decompress'=>103,
- 'decompress_fail'=>104,
- 'dechunk_fail'=>105,
- 'server_cannot_decompress'=>106,
- 'server_decompress_fail'=>107
- );
+ /**
+ * @deprecated this code looks like it is very fragile and has not been fixed
+ * for a long long time. Shall we remove it for 2.0?
+ */
+ public function getval()
+ {
+ // UNSTABLE
+ $b = reset($this->me);
+ $a = key($this->me);
+ // contributed by I Sofer, 2001-03-24
+ // add support for nested arrays to scalarval
+ // i've created a new method here, so as to
+ // preserve back compatibility
- $GLOBALS['xmlrpcstr'] = array(
- 'unknown_method'=>'Unknown method',
- 'invalid_return'=>'Invalid return payload: enable debugging to examine incoming payload',
- 'incorrect_params'=>'Incorrect parameters passed to method',
- 'introspect_unknown'=>"Can't introspect: method unknown",
- 'http_error'=>"Didn't receive 200 OK from remote server.",
- 'no_data'=>'No data received from server.',
- 'no_ssl'=>'No SSL support compiled in.',
- 'curl_fail'=>'CURL error',
- 'invalid_request'=>'Invalid request payload',
- 'no_curl'=>'No CURL support compiled in.',
- 'server_error'=>'Internal server error',
- 'multicall_error'=>'Received from server invalid multicall response',
- 'multicall_notstruct'=>'system.multicall expected struct',
- 'multicall_nomethod'=>'missing methodName',
- 'multicall_notstring'=>'methodName is not a string',
- 'multicall_recursion'=>'recursive system.multicall forbidden',
- 'multicall_noparams'=>'missing params',
- 'multicall_notarray'=>'params is not an array',
+ if (is_array($b)) {
+ foreach($b as $id => $cont) {
+ $b[$id] = $cont->scalarval();
+ }
+ }
- 'cannot_decompress'=>'Received from server compressed HTTP and cannot decompress',
- 'decompress_fail'=>'Received from server invalid compressed HTTP',
- 'dechunk_fail'=>'Received from server invalid chunked HTTP',
- 'server_cannot_decompress'=>'Received from client compressed HTTP request and cannot decompress',
- 'server_decompress_fail'=>'Received from client invalid compressed HTTP request'
- );
+ // add support for structures directly encoding php objects
+ if (is_object($b)) {
+ $t = get_object_vars($b);
+ foreach($t as $id => $cont) {
+ $t[$id] = $cont->scalarval();
+ }
+ foreach($t as $id => $cont) {
+ @$b->$id = $cont;
+ }
+ }
+ // end contrib
+ return $b;
+ }
- // The charset encoding used by the server for received messages and
- // by the client for received responses when received charset cannot be determined
- // or is not supported
- $GLOBALS['xmlrpc_defencoding']='UTF-8';
+ /// reset functionality added by parent class: same as it would happen if no interface was declared
+ public function count()
+ {
+ return 1;
+ }
- // The encoding used internally by PHP.
- // String values received as xml will be converted to this, and php strings will be converted to xml
- // as if having been coded with this
- $GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';
+ /// reset functionality added by parent class: same as it would happen if no interface was declared
+ public function getIterator() {
+ return new ArrayIterator($this);
+ }
+}
- $GLOBALS['xmlrpcName']='XML-RPC for PHP';
- $GLOBALS['xmlrpcVersion']='3.0.0.beta';
+class xmlrpcmsg extends PhpXmlRpc\Request
+{
+}
- // let user errors start at 800
- $GLOBALS['xmlrpcerruser']=800;
- // let XML parse errors start at 100
- $GLOBALS['xmlrpcerrxml']=100;
+class xmlrpcresp extends PhpXmlRpc\Response
+{
+}
- // formulate backslashes for escaping regexp
- // Not in use anymore since 2.0. Shall we remove it?
- /// @deprecated
- $GLOBALS['xmlrpc_backslash']=chr(92).chr(92);
+class xmlrpc_client extends PhpXmlRpc\Client
+{
+}
- // set to TRUE to enable correct decoding of <NIL/> and <EX:NIL/> values
- $GLOBALS['xmlrpc_null_extension']=false;
+/* Expose as global functions the ones which are now class methods */
- // set to TRUE to enable encoding of php NULL values to <EX:NIL/> instead of <NIL/>
- $GLOBALS['xmlrpc_null_apache_encoding']=false;
+/// Wrong speling, but we are adamant on backwards compatibility!
+function xmlrpc_encode_entitites($data, $srcEncoding='', $destEncoding='')
+{
+ return PhpXmlRpc\Helper\Charset::instance()->encodeEntitites($data, $srcEncoding, $destEncoding);
+}
- // used to store state during parsing
- // quick explanation of components:
- // ac - used to accumulate values
- // isf - used to indicate a parsing fault (2) or xmlrpcresp fault (1)
- // isf_reason - used for storing xmlrpcresp fault string
- // lv - used to indicate "looking for a value": implements
- // the logic to allow values with no types to be strings
- // params - used to store parameters in method calls
- // method - used to store method name
- // stack - array with genealogy of xml elements names:
- // used to validate nesting of xmlrpc elements
- $GLOBALS['_xh']=null;
+function iso8601_encode($timeT, $utc=0)
+{
+ return PhpXmlRpc\Helper\Date::iso8601Encode($timeT, $utc);
+}
- /**
- * Convert a string to the correct XML representation in a target charset
- * To help correct communication of non-ascii chars inside strings, regardless
- * of the charset used when sending requests, parsing them, sending responses
- * and parsing responses, an option is to convert all non-ascii chars present in the message
- * into their equivalent 'charset entity'. Charset entities enumerated this way
- * are independent of the charset encoding used to transmit them, and all XML
- * parsers are bound to understand them.
- * Note that in the std case we are not sending a charset encoding mime type
- * along with http headers, so we are bound by RFC 3023 to emit strict us-ascii.
- *
- * @todo do a bit of basic benchmarking (strtr vs. str_replace)
- * @todo make usage of iconv() or recode_string() or mb_string() where available
- */
- function xmlrpc_encode_entitites($data, $src_encoding='', $dest_encoding='')
- {
- if ($src_encoding == '')
- {
- // lame, but we know no better...
- $src_encoding = $GLOBALS['xmlrpc_internalencoding'];
- }
+function iso8601_decode($iDate, $utc=0)
+{
+ return PhpXmlRpc\Helper\Date::iso8601Decode($iDate, $utc);
+}
- switch(strtoupper($src_encoding.'_'.$dest_encoding))
- {
- case 'ISO-8859-1_':
- case 'ISO-8859-1_US-ASCII':
- $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&', '"', ''', '<', '>'), $data);
- $escaped_data = str_replace($GLOBALS['xml_iso88591_Entities']['in'], $GLOBALS['xml_iso88591_Entities']['out'], $escaped_data);
- break;
- case 'ISO-8859-1_UTF-8':
- $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&', '"', ''', '<', '>'), $data);
- $escaped_data = utf8_encode($escaped_data);
- break;
- case 'ISO-8859-1_ISO-8859-1':
- case 'US-ASCII_US-ASCII':
- case 'US-ASCII_UTF-8':
- case 'US-ASCII_':
- case 'US-ASCII_ISO-8859-1':
- case 'UTF-8_UTF-8':
- //case 'CP1252_CP1252':
- $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&', '"', ''', '<', '>'), $data);
- break;
- case 'UTF-8_':
- case 'UTF-8_US-ASCII':
- case 'UTF-8_ISO-8859-1':
- // NB: this will choke on invalid UTF-8, going most likely beyond EOF
- $escaped_data = '';
- // be kind to users creating string xmlrpcvals out of different php types
- $data = (string) $data;
- $ns = strlen ($data);
- for ($nn = 0; $nn < $ns; $nn++)
- {
- $ch = $data[$nn];
- $ii = ord($ch);
- //1 7 0bbbbbbb (127)
- if ($ii < 128)
- {
- /// @todo shall we replace this with a (supposedly) faster str_replace?
- switch($ii){
- case 34:
- $escaped_data .= '"';
- break;
- case 38:
- $escaped_data .= '&';
- break;
- case 39:
- $escaped_data .= ''';
- break;
- case 60:
- $escaped_data .= '<';
- break;
- case 62:
- $escaped_data .= '>';
- break;
- default:
- $escaped_data .= $ch;
- } // switch
- }
- //2 11 110bbbbb 10bbbbbb (2047)
- else if ($ii>>5 == 6)
- {
- $b1 = ($ii & 31);
- $ii = ord($data[$nn+1]);
- $b2 = ($ii & 63);
- $ii = ($b1 * 64) + $b2;
- $ent = sprintf ('&#%d;', $ii);
- $escaped_data .= $ent;
- $nn += 1;
- }
- //3 16 1110bbbb 10bbbbbb 10bbbbbb
- else if ($ii>>4 == 14)
- {
- $b1 = ($ii & 15);
- $ii = ord($data[$nn+1]);
- $b2 = ($ii & 63);
- $ii = ord($data[$nn+2]);
- $b3 = ($ii & 63);
- $ii = ((($b1 * 64) + $b2) * 64) + $b3;
- $ent = sprintf ('&#%d;', $ii);
- $escaped_data .= $ent;
- $nn += 2;
- }
- //4 21 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
- else if ($ii>>3 == 30)
- {
- $b1 = ($ii & 7);
- $ii = ord($data[$nn+1]);
- $b2 = ($ii & 63);
- $ii = ord($data[$nn+2]);
- $b3 = ($ii & 63);
- $ii = ord($data[$nn+3]);
- $b4 = ($ii & 63);
- $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
- $ent = sprintf ('&#%d;', $ii);
- $escaped_data .= $ent;
- $nn += 3;
- }
- }
- break;
-/*
- case 'CP1252_':
- case 'CP1252_US-ASCII':
- $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&', '"', ''', '<', '>'), $data);
- $escaped_data = str_replace($GLOBALS['xml_iso88591_Entities']['in'], $GLOBALS['xml_iso88591_Entities']['out'], $escaped_data);
- $escaped_data = str_replace($GLOBALS['xml_cp1252_Entities']['in'], $GLOBALS['xml_cp1252_Entities']['out'], $escaped_data);
- break;
- case 'CP1252_UTF-8':
- $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&', '"', ''', '<', '>'), $data);
- /// @todo we could use real UTF8 chars here instead of xml entities... (note that utf_8 encode all allone will NOT convert them)
- $escaped_data = str_replace($GLOBALS['xml_cp1252_Entities']['in'], $GLOBALS['xml_cp1252_Entities']['out'], $escaped_data);
- $escaped_data = utf8_encode($escaped_data);
- break;
- case 'CP1252_ISO-8859-1':
- $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&', '"', ''', '<', '>'), $data);
- // we might as well replave all funky chars with a '?' here, but we are kind and leave it to the receiving application layer to decide what to do with these weird entities...
- $escaped_data = str_replace($GLOBALS['xml_cp1252_Entities']['in'], $GLOBALS['xml_cp1252_Entities']['out'], $escaped_data);
- break;
-*/
- default:
- $escaped_data = '';
- error_log("Converting from $src_encoding to $dest_encoding: not supported...");
- }
- return $escaped_data;
- }
+function decode_chunked($buffer)
+{
+ return PhpXmlRpc\Helper\Http::decodeChunked($buffer);
+}
- /// xml parser handler function for opening element tags
- function xmlrpc_se($parser, $name, $attrs, $accept_single_vals=false)
- {
- // if invalid xmlrpc already detected, skip all processing
- if ($GLOBALS['_xh']['isf'] < 2)
- {
- // check for correct element nesting
- // top level element can only be of 2 types
- /// @todo optimization creep: save this check into a bool variable, instead of using count() every time:
- /// there is only a single top level element in xml anyway
- if (count($GLOBALS['_xh']['stack']) == 0)
- {
- if ($name != 'METHODRESPONSE' && $name != 'METHODCALL' && (
- $name != 'VALUE' && !$accept_single_vals))
- {
- $GLOBALS['_xh']['isf'] = 2;
- $GLOBALS['_xh']['isf_reason'] = 'missing top level xmlrpc element';
- return;
- }
- else
- {
- $GLOBALS['_xh']['rt'] = strtolower($name);
- $GLOBALS['_xh']['rt'] = strtolower($name);
- }
- }
- else
- {
- // not top level element: see if parent is OK
- $parent = end($GLOBALS['_xh']['stack']);
- if (!array_key_exists($name, $GLOBALS['xmlrpc_valid_parents']) || !in_array($parent, $GLOBALS['xmlrpc_valid_parents'][$name]))
- {
- $GLOBALS['_xh']['isf'] = 2;
- $GLOBALS['_xh']['isf_reason'] = "xmlrpc element $name cannot be child of $parent";
- return;
- }
- }
+function php_xmlrpc_decode($xmlrpcVal, $options=array())
+{
+ $encoder = new PhpXmlRpc\Encoder();
+ return $encoder->decode($xmlrpcVal, $options);
+}
- switch($name)
- {
- // optimize for speed switch cases: most common cases first
- case 'VALUE':
- /// @todo we could check for 2 VALUE elements inside a MEMBER or PARAM element
- $GLOBALS['_xh']['vt']='value'; // indicator: no value found yet
- $GLOBALS['_xh']['ac']='';
- $GLOBALS['_xh']['lv']=1;
- $GLOBALS['_xh']['php_class']=null;
- break;
- case 'I4':
- case 'INT':
- case 'STRING':
- case 'BOOLEAN':
- case 'DOUBLE':
- case 'DATETIME.ISO8601':
- case 'BASE64':
- if ($GLOBALS['_xh']['vt']!='value')
- {
- //two data elements inside a value: an error occurred!
- $GLOBALS['_xh']['isf'] = 2;
- $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
- return;
- }
- $GLOBALS['_xh']['ac']=''; // reset the accumulator
- break;
- case 'STRUCT':
- case 'ARRAY':
- if ($GLOBALS['_xh']['vt']!='value')
- {
- //two data elements inside a value: an error occurred!
- $GLOBALS['_xh']['isf'] = 2;
- $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
- return;
- }
- // create an empty array to hold child values, and push it onto appropriate stack
- $cur_val = array();
- $cur_val['values'] = array();
- $cur_val['type'] = $name;
- // check for out-of-band information to rebuild php objs
- // and in case it is found, save it
- if (@isset($attrs['PHP_CLASS']))
- {
- $cur_val['php_class'] = $attrs['PHP_CLASS'];
- }
- $GLOBALS['_xh']['valuestack'][] = $cur_val;
- $GLOBALS['_xh']['vt']='data'; // be prepared for a data element next
- break;
- case 'DATA':
- if ($GLOBALS['_xh']['vt']!='data')
- {
- //two data elements inside a value: an error occurred!
- $GLOBALS['_xh']['isf'] = 2;
- $GLOBALS['_xh']['isf_reason'] = "found two data elements inside an array element";
- return;
- }
- case 'METHODCALL':
- case 'METHODRESPONSE':
- case 'PARAMS':
- // valid elements that add little to processing
- break;
- case 'METHODNAME':
- case 'NAME':
- /// @todo we could check for 2 NAME elements inside a MEMBER element
- $GLOBALS['_xh']['ac']='';
- break;
- case 'FAULT':
- $GLOBALS['_xh']['isf']=1;
- break;
- case 'MEMBER':
- $GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name']=''; // set member name to null, in case we do not find in the xml later on
- //$GLOBALS['_xh']['ac']='';
- // Drop trough intentionally
- case 'PARAM':
- // clear value type, so we can check later if no value has been passed for this param/member
- $GLOBALS['_xh']['vt']=null;
- break;
- case 'NIL':
- case 'EX:NIL':
- if ($GLOBALS['xmlrpc_null_extension'])
- {
- if ($GLOBALS['_xh']['vt']!='value')
- {
- //two data elements inside a value: an error occurred!
- $GLOBALS['_xh']['isf'] = 2;
- $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
- return;
- }
- $GLOBALS['_xh']['ac']=''; // reset the accumulator
- break;
- }
- // we do not support the <NIL/> extension, so
- // drop through intentionally
- default:
- /// INVALID ELEMENT: RAISE ISF so that it is later recognized!!!
- $GLOBALS['_xh']['isf'] = 2;
- $GLOBALS['_xh']['isf_reason'] = "found not-xmlrpc xml element $name";
- break;
- }
+function php_xmlrpc_encode($phpVal, $options=array())
+{
+ $encoder = new PhpXmlRpc\Encoder();
+ return $encoder->encode($phpVal, $options);
+}
- // Save current element name to stack, to validate nesting
- $GLOBALS['_xh']['stack'][] = $name;
+function php_xmlrpc_decode_xml($xmlVal, $options=array())
+{
+ $encoder = new PhpXmlRpc\Encoder();
+ return $encoder->decodeXml($xmlVal, $options);
+}
- /// @todo optimization creep: move this inside the big switch() above
- if($name!='VALUE')
- {
- $GLOBALS['_xh']['lv']=0;
- }
- }
- }
+function guess_encoding($httpHeader='', $xmlChunk='', $encodingPrefs=null)
+{
+ return PhpXmlRpc\Helper\XMLParser::guessEncoding($httpHeader, $xmlChunk, $encodingPrefs);
+}
- /// Used in decoding xml chunks that might represent single xmlrpc values
- function xmlrpc_se_any($parser, $name, $attrs)
- {
- xmlrpc_se($parser, $name, $attrs, true);
- }
+function has_encoding($xmlChunk)
+{
+ return PhpXmlRpc\Helper\XMLParser::hasEncoding($xmlChunk);
+}
- /// xml parser handler function for close element tags
- function xmlrpc_ee($parser, $name, $rebuild_xmlrpcvals = true)
- {
- if ($GLOBALS['_xh']['isf'] < 2)
- {
- // push this element name from stack
- // NB: if XML validates, correct opening/closing is guaranteed and
- // we do not have to check for $name == $curr_elem.
- // we also checked for proper nesting at start of elements...
- $curr_elem = array_pop($GLOBALS['_xh']['stack']);
-
- switch($name)
- {
- case 'VALUE':
- // This if() detects if no scalar was inside <VALUE></VALUE>
- if ($GLOBALS['_xh']['vt']=='value')
- {
- $GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
- $GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcString'];
- }
-
- if ($rebuild_xmlrpcvals)
- {
- // build the xmlrpc val out of the data received, and substitute it
- $temp = new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);
- // in case we got info about underlying php class, save it
- // in the object we're rebuilding
- if (isset($GLOBALS['_xh']['php_class']))
- $temp->_php_class = $GLOBALS['_xh']['php_class'];
- // check if we are inside an array or struct:
- // if value just built is inside an array, let's move it into array on the stack
- $vscount = count($GLOBALS['_xh']['valuestack']);
- if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')
- {
- $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $temp;
- }
- else
- {
- $GLOBALS['_xh']['value'] = $temp;
- }
- }
- else
- {
- /// @todo this needs to treat correctly php-serialized objects,
- /// since std deserializing is done by php_xmlrpc_decode,
- /// which we will not be calling...
- if (isset($GLOBALS['_xh']['php_class']))
- {
- }
-
- // check if we are inside an array or struct:
- // if value just built is inside an array, let's move it into array on the stack
- $vscount = count($GLOBALS['_xh']['valuestack']);
- if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')
- {
- $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $GLOBALS['_xh']['value'];
- }
- }
- break;
- case 'BOOLEAN':
- case 'I4':
- case 'INT':
- case 'STRING':
- case 'DOUBLE':
- case 'DATETIME.ISO8601':
- case 'BASE64':
- $GLOBALS['_xh']['vt']=strtolower($name);
- /// @todo: optimization creep - remove the if/elseif cycle below
- /// since the case() in which we are already did that
- if ($name=='STRING')
- {
- $GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
- }
- elseif ($name=='DATETIME.ISO8601')
- {
- if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))
- {
- error_log('XML-RPC: invalid value received in DATETIME: '.$GLOBALS['_xh']['ac']);
- }
- $GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];
- $GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
- }
- elseif ($name=='BASE64')
- {
- /// @todo check for failure of base64 decoding / catch warnings
- $GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);
- }
- elseif ($name=='BOOLEAN')
- {
- // special case here: we translate boolean 1 or 0 into PHP
- // constants true or false.
- // Strings 'true' and 'false' are accepted, even though the
- // spec never mentions them (see eg. Blogger api docs)
- // NB: this simple checks helps a lot sanitizing input, ie no
- // security problems around here
- if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)
- {
- $GLOBALS['_xh']['value']=true;
- }
- else
- {
- // log if receiveing something strange, even though we set the value to false anyway
- if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)
- error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);
- $GLOBALS['_xh']['value']=false;
- }
- }
- elseif ($name=='DOUBLE')
- {
- // we have a DOUBLE
- // we must check that only 0123456789-.<space> are characters here
- // NOTE: regexp could be much stricter than this...
- if (!preg_match('/^[+-eE0123456789 \t.]+$/', $GLOBALS['_xh']['ac']))
- {
- /// @todo: find a better way of throwing an error than this!
- error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);
- $GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
- }
- else
- {
- // it's ok, add it on
- $GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];
- }
- }
- else
- {
- // we have an I4/INT
- // we must check that only 0123456789-<space> are characters here
- if (!preg_match('/^[+-]?[0123456789 \t]+$/', $GLOBALS['_xh']['ac']))
- {
- /// @todo find a better way of throwing an error than this!
- error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);
- $GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
- }
- else
- {
- // it's ok, add it on
- $GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];
- }
- }
- //$GLOBALS['_xh']['ac']=''; // is this necessary?
- $GLOBALS['_xh']['lv']=3; // indicate we've found a value
- break;
- case 'NAME':
- $GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name'] = $GLOBALS['_xh']['ac'];
- break;
- case 'MEMBER':
- //$GLOBALS['_xh']['ac']=''; // is this necessary?
- // add to array in the stack the last element built,
- // unless no VALUE was found
- if ($GLOBALS['_xh']['vt'])
- {
- $vscount = count($GLOBALS['_xh']['valuestack']);
- $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];
- } else
- error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
- break;
- case 'DATA':
- //$GLOBALS['_xh']['ac']=''; // is this necessary?
- $GLOBALS['_xh']['vt']=null; // reset this to check for 2 data elements in a row - even if they're empty
- break;
- case 'STRUCT':
- case 'ARRAY':
- // fetch out of stack array of values, and promote it to current value
- $curr_val = array_pop($GLOBALS['_xh']['valuestack']);
- $GLOBALS['_xh']['value'] = $curr_val['values'];
- $GLOBALS['_xh']['vt']=strtolower($name);
- if (isset($curr_val['php_class']))
- {
- $GLOBALS['_xh']['php_class'] = $curr_val['php_class'];
- }
- break;
- case 'PARAM':
- // add to array of params the current value,
- // unless no VALUE was found
- if ($GLOBALS['_xh']['vt'])
- {
- $GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];
- $GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];
- }
- else
- error_log('XML-RPC: missing VALUE inside PARAM in received xml');
- break;
- case 'METHODNAME':
- $GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);
- break;
- case 'NIL':
- case 'EX:NIL':
- if ($GLOBALS['xmlrpc_null_extension'])
- {
- $GLOBALS['_xh']['vt']='null';
- $GLOBALS['_xh']['value']=null;
- $GLOBALS['_xh']['lv']=3;
- break;
- }
- // drop through intentionally if nil extension not enabled
- case 'PARAMS':
- case 'FAULT':
- case 'METHODCALL':
- case 'METHORESPONSE':
- break;
- default:
- // End of INVALID ELEMENT!
- // shall we add an assert here for unreachable code???
- break;
- }
- }
- }
-
- /// Used in decoding xmlrpc requests/responses without rebuilding xmlrpc values
- function xmlrpc_ee_fast($parser, $name)
- {
- xmlrpc_ee($parser, $name, false);
- }
-
- /// xml parser handler function for character data
- function xmlrpc_cd($parser, $data)
- {
- // skip processing if xml fault already detected
- if ($GLOBALS['_xh']['isf'] < 2)
- {
- // "lookforvalue==3" means that we've found an entire value
- // and should discard any further character data
- if($GLOBALS['_xh']['lv']!=3)
- {
- // G. Giunta 2006-08-23: useless change of 'lv' from 1 to 2
- //if($GLOBALS['_xh']['lv']==1)
- //{
- // if we've found text and we're just in a <value> then
- // say we've found a value
- //$GLOBALS['_xh']['lv']=2;
- //}
- // we always initialize the accumulator before starting parsing, anyway...
- //if(!@isset($GLOBALS['_xh']['ac']))
- //{
- // $GLOBALS['_xh']['ac'] = '';
- //}
- $GLOBALS['_xh']['ac'].=$data;
- }
- }
- }
-
- /// xml parser handler function for 'other stuff', ie. not char data or
- /// element start/end tag. In fact it only gets called on unknown entities...
- function xmlrpc_dh($parser, $data)
- {
- // skip processing if xml fault already detected
- if ($GLOBALS['_xh']['isf'] < 2)
- {
- if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')
- {
- // G. Giunta 2006-08-25: useless change of 'lv' from 1 to 2
- //if($GLOBALS['_xh']['lv']==1)
- //{
- // $GLOBALS['_xh']['lv']=2;
- //}
- $GLOBALS['_xh']['ac'].=$data;
- }
- }
- return true;
- }
-
- class xmlrpc_client
- {
- var $path;
- var $server;
- var $port=0;
- var $method='http';
- var $errno;
- var $errstr;
- var $debug=0;
- var $username='';
- var $password='';
- var $authtype=1;
- var $cert='';
- var $certpass='';
- var $cacert='';
- var $cacertdir='';
- var $key='';
- var $keypass='';
- var $verifypeer=true;
- var $verifyhost=1;
- var $no_multicall=false;
- var $proxy='';
- var $proxyport=0;
- var $proxy_user='';
- var $proxy_pass='';
- var $proxy_authtype=1;
- var $cookies=array();
- var $extracurlopts=array();
-
- /**
- * List of http compression methods accepted by the client for responses.
- * NB: PHP supports deflate, gzip compressions out of the box if compiled w. zlib
- *
- * NNB: you can set it to any non-empty array for HTTP11 and HTTPS, since
- * in those cases it will be up to CURL to decide the compression methods
- * it supports. You might check for the presence of 'zlib' in the output of
- * curl_version() to determine wheter compression is supported or not
- */
- var $accepted_compression = array();
- /**
- * Name of compression scheme to be used for sending requests.
- * Either null, gzip or deflate
- */
- var $request_compression = '';
- /**
- * CURL handle: used for keep-alive connections (PHP 4.3.8 up, see:
- * http://curl.haxx.se/docs/faq.html#7.3)
- */
- var $xmlrpc_curl_handle = null;
- /// Wheter to use persistent connections for http 1.1 and https
- var $keepalive = false;
- /// Charset encodings that can be decoded without problems by the client
- var $accepted_charset_encodings = array();
- /// Charset encoding to be used in serializing request. NULL = use ASCII
- var $request_charset_encoding = '';
- /**
- * Decides the content of xmlrpcresp objects returned by calls to send()
- * valid strings are 'xmlrpcvals', 'phpvals' or 'xml'
- */
- var $return_type = 'xmlrpcvals';
- /**
- * Sent to servers in http headers
- */
- var $user_agent;
-
- /**
- * @param string $path either the complete server URL or the PATH part of the xmlrc server URL, e.g. /xmlrpc/server.php
- * @param string $server the server name / ip address
- * @param integer $port the port the server is listening on, defaults to 80 or 443 depending on protocol used
- * @param string $method the http protocol variant: defaults to 'http', 'https' and 'http11' can be used if CURL is installed
- */
- function xmlrpc_client($path, $server='', $port='', $method='')
- {
- // allow user to specify all params in $path
- if($server == '' and $port == '' and $method == '')
- {
- $parts = parse_url($path);
- $server = $parts['host'];
- $path = isset($parts['path']) ? $parts['path'] : '';
- if(isset($parts['query']))
- {
- $path .= '?'.$parts['query'];
- }
- if(isset($parts['fragment']))
- {
- $path .= '#'.$parts['fragment'];
- }
- if(isset($parts['port']))
- {
- $port = $parts['port'];
- }
- if(isset($parts['scheme']))
- {
- $method = $parts['scheme'];
- }
- if(isset($parts['user']))
- {
- $this->username = $parts['user'];
- }
- if(isset($parts['pass']))
- {
- $this->password = $parts['pass'];
- }
- }
- if($path == '' || $path[0] != '/')
- {
- $this->path='/'.$path;
- }
- else
- {
- $this->path=$path;
- }
- $this->server=$server;
- if($port != '')
- {
- $this->port=$port;
- }
- if($method != '')
- {
- $this->method=$method;
- }
-
- // if ZLIB is enabled, let the client by default accept compressed responses
- if(function_exists('gzinflate') || (
- function_exists('curl_init') && (($info = curl_version()) &&
- ((is_string($info) && strpos($info, 'zlib') !== null) || isset($info['libz_version'])))
- ))
- {
- $this->accepted_compression = array('gzip', 'deflate');
- }
-
- // keepalives: enabled by default
- $this->keepalive = true;
-
- // by default the xml parser can support these 3 charset encodings
- $this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');
-
- // initialize user_agent string
- $this->user_agent = $GLOBALS['xmlrpcName'] . ' ' . $GLOBALS['xmlrpcVersion'];
- }
-
- /**
- * Enables/disables the echoing to screen of the xmlrpc responses received
- * @param integer $debug values 0, 1 and 2 are supported (2 = echo sent msg too, before received response)
- * @access public
- */
- function setDebug($in)
- {
- $this->debug=$in;
- }
-
- /**
- * Add some http BASIC AUTH credentials, used by the client to authenticate
- * @param string $u username
- * @param string $p password
- * @param integer $t auth type. See curl_setopt man page for supported auth types. Defaults to CURLAUTH_BASIC (basic auth)
- * @access public
- */
- function setCredentials($u, $p, $t=1)
- {
- $this->username=$u;
- $this->password=$p;
- $this->authtype=$t;
- }
-
- /**
- * Add a client-side https certificate
- * @param string $cert
- * @param string $certpass
- * @access public
- */
- function setCertificate($cert, $certpass)
- {
- $this->cert = $cert;
- $this->certpass = $certpass;
- }
-
- /**
- * Add a CA certificate to verify server with (see man page about
- * CURLOPT_CAINFO for more details
- * @param string $cacert certificate file name (or dir holding certificates)
- * @param bool $is_dir set to true to indicate cacert is a dir. defaults to false
- * @access public
- */
- function setCaCertificate($cacert, $is_dir=false)
- {
- if ($is_dir)
- {
- $this->cacertdir = $cacert;
- }
- else
- {
- $this->cacert = $cacert;
- }
- }
-
- /**
- * Set attributes for SSL communication: private SSL key
- * NB: does not work in older php/curl installs
- * Thanks to Daniel Convissor
- * @param string $key The name of a file containing a private SSL key
- * @param string $keypass The secret password needed to use the private SSL key
- * @access public
- */
- function setKey($key, $keypass)
- {
- $this->key = $key;
- $this->keypass = $keypass;
- }
-
- /**
- * Set attributes for SSL communication: verify server certificate
- * @param bool $i enable/disable verification of peer certificate
- * @access public
- */
- function setSSLVerifyPeer($i)
- {
- $this->verifypeer = $i;
- }
-
- /**
- * Set attributes for SSL communication: verify match of server cert w. hostname
- * @param int $i
- * @access public
- */
- function setSSLVerifyHost($i)
- {
- $this->verifyhost = $i;
- }
-
- /**
- * Set proxy info
- * @param string $proxyhost
- * @param string $proxyport Defaults to 8080 for HTTP and 443 for HTTPS
- * @param string $proxyusername Leave blank if proxy has public access
- * @param string $proxypassword Leave blank if proxy has public access
- * @param int $proxyauthtype set to constant CURLAUTH_NTLM to use NTLM auth with proxy
- * @access public
- */
- function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1)
- {
- $this->proxy = $proxyhost;
- $this->proxyport = $proxyport;
- $this->proxy_user = $proxyusername;
- $this->proxy_pass = $proxypassword;
- $this->proxy_authtype = $proxyauthtype;
- }
-
- /**
- * Enables/disables reception of compressed xmlrpc responses.
- * Note that enabling reception of compressed responses merely adds some standard
- * http headers to xmlrpc requests. It is up to the xmlrpc server to return
- * compressed responses when receiving such requests.
- * @param string $compmethod either 'gzip', 'deflate', 'any' or ''
- * @access public
- */
- function setAcceptedCompression($compmethod)
- {
- if ($compmethod == 'any')
- $this->accepted_compression = array('gzip', 'deflate');
- else
- $this->accepted_compression = array($compmethod);
- }
-
- /**
- * Enables/disables http compression of xmlrpc request.
- * Take care when sending compressed requests: servers might not support them
- * (and automatic fallback to uncompressed requests is not yet implemented)
- * @param string $compmethod either 'gzip', 'deflate' or ''
- * @access public
- */
- function setRequestCompression($compmethod)
- {
- $this->request_compression = $compmethod;
- }
-
- /**
- * Adds a cookie to list of cookies that will be sent to server.
- * NB: setting any param but name and value will turn the cookie into a 'version 1' cookie:
- * do not do it unless you know what you are doing
- * @param string $name
- * @param string $value
- * @param string $path
- * @param string $domain
- * @param int $port
- * @access public
- *
- * @todo check correctness of urlencoding cookie value (copied from php way of doing it...)
- */
- function setCookie($name, $value='', $path='', $domain='', $port=null)
- {
- $this->cookies[$name]['value'] = urlencode($value);
- if ($path || $domain || $port)
- {
- $this->cookies[$name]['path'] = $path;
- $this->cookies[$name]['domain'] = $domain;
- $this->cookies[$name]['port'] = $port;
- $this->cookies[$name]['version'] = 1;
- }
- else
- {
- $this->cookies[$name]['version'] = 0;
- }
- }
-
- /**
- * Directly set cURL options, for extra flexibility
- * It allows eg. to bind client to a specific IP interface / address
- * @param $options array
- */
- function SetCurlOptions( $options )
- {
- $this->extracurlopts = $options;
- }
-
- /**
- * Set user-agent string that will be used by this client instance
- * in http headers sent to the server
- */
- function SetUserAgent( $agentstring )
- {
- $this->user_agent = $agentstring;
- }
-
- /**
- * Send an xmlrpc request
- * @param mixed $msg The message object, or an array of messages for using multicall, or the complete xml representation of a request
- * @param integer $timeout Connection timeout, in seconds, If unspecified, a platform specific timeout will apply
- * @param string $method if left unspecified, the http protocol chosen during creation of the object will be used
- * @return xmlrpcresp
- * @access public
- */
- function& send($msg, $timeout=0, $method='')
- {
- // if user deos not specify http protocol, use native method of this client
- // (i.e. method set during call to constructor)
- if($method == '')
- {
- $method = $this->method;
- }
-
- if(is_array($msg))
- {
- // $msg is an array of xmlrpcmsg's
- $r = $this->multicall($msg, $timeout, $method);
- return $r;
- }
- elseif(is_string($msg))
- {
- $n = new xmlrpcmsg('');
- $n->payload = $msg;
- $msg = $n;
- }
-
- // where msg is an xmlrpcmsg
- $msg->debug=$this->debug;
-
- if($method == 'https')
- {
- $r =& $this->sendPayloadHTTPS(
- $msg,
- $this->server,
- $this->port,
- $timeout,
- $this->username,
- $this->password,
- $this->authtype,
- $this->cert,
- $this->certpass,
- $this->cacert,
- $this->cacertdir,
- $this->proxy,
- $this->proxyport,
- $this->proxy_user,
- $this->proxy_pass,
- $this->proxy_authtype,
- $this->keepalive,
- $this->key,
- $this->keypass
- );
- }
- elseif($method == 'http11')
- {
- $r =& $this->sendPayloadCURL(
- $msg,
- $this->server,
- $this->port,
- $timeout,
- $this->username,
- $this->password,
- $this->authtype,
- null,
- null,
- null,
- null,
- $this->proxy,
- $this->proxyport,
- $this->proxy_user,
- $this->proxy_pass,
- $this->proxy_authtype,
- 'http',
- $this->keepalive
- );
- }
- else
- {
- $r =& $this->sendPayloadHTTP10(
- $msg,
- $this->server,
- $this->port,
- $timeout,
- $this->username,
- $this->password,
- $this->authtype,
- $this->proxy,
- $this->proxyport,
- $this->proxy_user,
- $this->proxy_pass,
- $this->proxy_authtype
- );
- }
-
- return $r;
- }
-
- /**
- * @access private
- */
- function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,
- $username='', $password='', $authtype=1, $proxyhost='',
- $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1)
- {
- if($port==0)
- {
- $port=80;
- }
-
- // Only create the payload if it was not created previously
- if(empty($msg->payload))
- {
- $msg->createPayload($this->request_charset_encoding);
- }
-
- $payload = $msg->payload;
- // Deflate request body and set appropriate request headers
- if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
- {
- if($this->request_compression == 'gzip')
- {
- $a = @gzencode($payload);
- if($a)
- {
- $payload = $a;
- $encoding_hdr = "Content-Encoding: gzip\r\n";
- }
- }
- else
- {
- $a = @gzcompress($payload);
- if($a)
- {
- $payload = $a;
- $encoding_hdr = "Content-Encoding: deflate\r\n";
- }
- }
- }
- else
- {
- $encoding_hdr = '';
- }
-
- // thanks to Grant Rauscher <gr...@fi...> for this
- $credentials='';
- if($username!='')
- {
- $credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
- if ($authtype != 1)
- {
- error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
- }
- }
-
- $accepted_encoding = '';
- if(is_array($this->accepted_compression) && count($this->accepted_compression))
- {
- $accepted_encoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
- }
-
- $proxy_credentials = '';
- if($proxyhost)
- {
- if($proxyport == 0)
- {
- $proxyport = 8080;
- }
- $connectserver = $proxyhost;
- $connectport = $proxyport;
- $uri = 'http://'.$server.':'.$port.$this->path;
- if($proxyusername != '')
- {
- if ($proxyauthtype != 1)
- {
- error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
- }
- $proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";
- }
- }
- else
- {
- $connectserver = $server;
- $connectport = $port;
- $uri = $this->path;
- }
-
- // Cookie generation, as per rfc2965 (version 1 cookies) or
- // netscape's rules (version 0 cookies)
- $cookieheader='';
- if (count($this->cookies))
- {
- $version = '';
- foreach ($this->cookies as $name => $cookie)
- {
- if ($cookie['version'])
- {
- $version = ' $Version="' . $cookie['version'] . '";';
- $cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';
- if ($cookie['path'])
- $cookieheader .= ' $Path="' . $cookie['path'] . '";';
- if ($cookie['domain'])
- $cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
- if ($cookie['port'])
- $cookieheader .= ' $Port="' . $cookie['port'] . '";';
- }
- else
- {
- $cookieheader .= ' ' . $name . '=' . $cookie['value'] . ";";
- }
- }
- $cookieheader = 'Cookie:' . $version . substr($cookieheader, 0, -1) . "\r\n";
- }
-
- $op= 'POST ' . $uri. " HTTP/1.0\r\n" .
- 'User-Agent: ' . $this->user_agent . "\r\n" .
- 'Host: '. $server . ':' . $port . "\r\n" .
- $credentials .
- $proxy_credentials .
- $accepted_encoding .
- $encoding_hdr .
- 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .
- $cookieheader .
- 'Content-Type: ' . $msg->content_type . "\r\nContent-Length: " .
- strlen($payload) . "\r\n\r\n" .
- $payload;
-
- if($this->debug > 1)
- {
- print "<PRE>\n---SENDING---\n" . htmlentities($op) . "\n---END---\n</PRE>";
- // let the client see this now in case http times out...
- flush();
- }
-
- if($timeout>0)
- {
- $fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);
- }
- else
- {
- $fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);
- }
- if($fp)
- {
- if($timeout>0 && function_exists('stream_set_timeout'))
- {
- stream_set_timeout($fp, $timeout);
- }
- }
- else
- {
- $this->errstr='Connect error: '.$this->errstr;
- $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');
- return $r;
- }
-
- if(!fputs($fp, $op, strlen($op)))
- {
- fclose($fp);
- $this->errstr='Write error';
- $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);
- return $r;
- }
- else
- {
- // reset errno and errstr on succesful socket connection
- $this->errstr = '';
- }
- // G. Giunta 2005/10/24: close socket before parsing.
- // should yeld slightly better execution times, and make easier recursive calls (e.g. to follow http redirects)
- $ipd='';
- do
- {
- // shall we check for $data === FALSE?
- // as per the manual, it signals an error
- $ipd.=fread($fp, 32768);
- } while(!feof($fp));
- fclose($fp);
- $r =& $msg->parseResponse($ipd, false, $this->return_type);
- return $r;
-
- }
-
- /**
- * @access private
- */
- function &sendPayloadHTTPS($msg, $server, $port, $timeout=0, $username='',
- $password='', $authtype=1, $cert='',$certpass='', $cacert='', $cacertdir='',
- $proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1,
- $keepalive=false, $key='', $keypass='')
- {
- $r =& $this->sendPayloadCURL($msg, $server, $port, $timeout, $username,
- $password, $authtype, $cert, $certpass, $cacert, $cacertdir, $proxyhost, $proxyport,
- $proxyusername, $proxypassword, $proxyauthtype, 'https', $keepalive, $key, $keypass);
- return $r;
- }
-
- /**
- * Contributed by Justin Miller <ju...@vo...>
- * Requires curl to be built into PHP
- * NB: CURL versions before 7.11.10 cannot use proxy to talk to https servers!
- * @access private
- */
- function &sendPayloadCURL($msg, $server, $port, $timeout=0, $username='',
- $password='', $authtype=1, $cert='', $certpass='', $cacert='', $cacertdir='',
- $proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1, $method='https',
- $keepalive=false, $key='', $keypass='')
- {
- if(!function_exists('curl_init'))
- {
- $this->errstr='CURL unavailable on this install';
- $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_curl'], $GLOBALS['xmlrpcstr']['no_curl']);
- return $r;
- }
- if($method == 'https')
- {
- if(($info = curl_version()) &&
- ((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))
- {
- $this->errstr='SSL unavailable on this install';
- $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']);
- return $r;
- }
- }
-
- if($port == 0)
- {
- if($method == 'http')
- {
- $port = 80;
- }
- else
- {
- $port = 443;
- }
- }
-
- // Only create the payload if it was not created previously
- if(empty($msg->payload))
- {
- $msg->createPayload($this->request_charset_encoding);
- }
-
- // Deflate request body and set appropriate request headers
- $payload = $msg->payload;
- if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))
- {
- if($this->request_compression == 'gzip')
- {
- $a = @gzencode($payload);
- if($a)
- {
- $payload = $a;
- $encoding_hdr = 'Content-Encoding: gzip';
- }
- }
- else
- {
- $a = @gzcompress($payload);
- if($a)
- {
- $payload = $a;
- $encoding_hdr = 'Content-Encoding: deflate';
- }
- }
- }
- else
- {
- $encoding_hdr = '';
- }
-
- if($this->debug > 1)
- {
- print "<PRE>\n---SENDING---\n" . htmlentities($payload) . "\n---END---\n</PRE>";
- // let the client see this now in case http times out...
- flush();
- }
-
- if(!$keepalive || !$this->xmlrpc_curl_handle)
- {
- $curl = curl_init($method . '://' . $server . ':' . $port . $this->path);
- if($keepalive)
- {
- $this->xmlrpc_curl_handle = $curl;
- }
- }
- else
- {
- $curl = $this->xmlrpc_curl_handle;
- }
-
- // results into variable
- curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-
- if($this->debug)
- {
- curl_setopt($curl, CURLOPT_VERBOSE, 1);
- }
- curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
- // required for XMLRPC: post the data
- curl_setopt($curl, CURLOPT_POST, 1);
- // the data
- curl_setopt($curl, CURLOPT_POSTFIELDS, $payload);
-
- // return the header too
- curl_setopt($curl, CURLOPT_HEADER, 1);
-
- // will only work with PHP >= 5.0
- // NB: if we set an empty string, CURL will add http header indicating
- // ALL methods it is supporting. This is possibly a better option than
- // letting the user tell what curl can / cannot do...
- if(is_array($this->accepted_compression) && count($this->accepted_compression))
- {
- //curl_setopt($curl, CURLOPT_ENCODING, implode(',', $this->accepted_compression));
- // empty string means 'any supported by CURL' (shall we catch errors in case CURLOPT_SSLKEY undefined ?)
- if (count($this->accepted_compression) == 1)
- {
- curl_setopt($curl, CURLOPT_ENCODING, $this->accepted_compression[0]);
- }
- else
- curl_setopt($curl, CURLOPT_ENCODING, '');
- }
- // extra headers
- $headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
- // if no keepalive is wanted, let the server know it in advance
- if(!$keepalive)
- {
- $headers[] = 'Connection: close';
- }
- // request compression header
- if($encoding_hdr)
- {
- $headers[] = $encoding_hdr;
- }
-
- curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
- // timeout is borked
- if($timeout)
- {
- curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);
- }
-
- if($username && $password)
- {
- curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);
- if (defined('CURLOPT_HTTPAUTH'))
- {
- curl_setopt($curl, CURLOPT_HTTPAUTH, $authtype);
- }
- else if ($authtype != 1)
- {
- error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
- }
- }
-
- if($method == 'https')
- {
- // set cert file
- if($cert)
- {
- curl_setopt($curl, CURLOPT_SSLCERT, $cert);
- }
- // set cert password
- if($certpass)
- {
- curl_setopt($curl, CURLOPT_SSLCERTPASSWD, $certpass);
- }
- // whether to verify remote host's cert
- curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifypeer);
- // set ca certificates file/dir
- if($cacert)
- {
- curl_setopt($curl, CURLOPT_CAINFO, $cacert);
- }
- if($cacertdir)
- {
- curl_setopt($curl, CURLOPT_CAPATH, $cacertdir);
- }
- // set key file (shall we ...
[truncated message content] |
