diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-18 05:31:54 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-18 05:31:54 +0000 |
| commit | 698f05d14f880eb4ec7866ec3a8416ee4d1f838f (patch) | |
| tree | afcfb18b11f13c1ba429612a94432fa0a64aa12c /modules/xmlrpc | |
| parent | 74201cb6158db6448ebf5d8330ace6ad4a139693 (diff) | |
| download | ampache-698f05d14f880eb4ec7866ec3a8416ee4d1f838f.tar.gz ampache-698f05d14f880eb4ec7866ec3a8416ee4d1f838f.tar.bz2 ampache-698f05d14f880eb4ec7866ec3a8416ee4d1f838f.zip | |
fixed XML-RPC mostly, uses insecure/old authentication method, needs more work
Diffstat (limited to 'modules/xmlrpc')
| -rw-r--r-- | modules/xmlrpc/xmlrpc.inc | 9 | ||||
| -rw-r--r-- | modules/xmlrpc/xmlrpcs.inc | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/modules/xmlrpc/xmlrpc.inc b/modules/xmlrpc/xmlrpc.inc index 0c3702e9..da096c1b 100644 --- a/modules/xmlrpc/xmlrpc.inc +++ b/modules/xmlrpc/xmlrpc.inc @@ -1904,7 +1904,7 @@ $cp1252_to_xmlent = if ($valtyp == '') { // user did not declare type of response value: try to guess it - if (is_object($this->val) && is_a($this->val, 'xmlrpcval')) + if (is_object($this->val) && $this->val instanceof xmlrpcval) { $this->valtyp = 'xmlrpcvals'; } @@ -1997,7 +1997,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha } else { - if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval')) + if(!is_object($this->val) || !$this->val instanceof xmlrpcval) { if (is_string($this->val) && $this->valtyp == 'xml') { @@ -2136,7 +2136,8 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha function addParam($par) { // add check: do not add to self params which are not xmlrpcvals - if(is_object($par) && is_a($par, 'xmlrpcval')) + $is_instance = $par instanceof xmlrpcval; + if(is_object($par) && $is_instance) { $this->params[]=$par; return true; @@ -3637,4 +3638,4 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha } } -?>
\ No newline at end of file +?> diff --git a/modules/xmlrpc/xmlrpcs.inc b/modules/xmlrpc/xmlrpcs.inc index 661a1b4b..d363bf7d 100644 --- a/modules/xmlrpc/xmlrpcs.inc +++ b/modules/xmlrpc/xmlrpcs.inc @@ -1061,7 +1061,7 @@ { $r = call_user_func($func, $m); } - if (!is_a($r, 'xmlrpcresp')) + if (!$r instanceof xmlrpcresp) { error_log("XML-RPC: xmlrpc_server::execute: function $func registered as method handler does not return an xmlrpcresp object"); if (is_a($r, 'xmlrpcval')) @@ -1169,4 +1169,4 @@ print $r->serialize(); } } -?>
\ No newline at end of file +?> |