From 7ee69918eda2557077e69959f80ebec89e630db4 Mon Sep 17 00:00:00 2001 From: shizuki Date: Wed, 16 Jul 2008 13:24:38 +0000 Subject: [PATCH] =?utf8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E3=83=A2?= =?utf8?q?=E3=83=BC=E3=83=89=E3=81=A7=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=AE?= =?utf8?q?=E5=A4=89=E6=9B=B4=20=E3=83=BB=E3=83=AA=E3=82=AF=E3=82=A8?= =?utf8?q?=E3=82=B9=E3=83=88XML=E3=81=AE=E8=A1=A8=E7=A4=BA=20=E3=83=BB?= =?utf8?q?=E3=83=AC=E3=82=B9=E3=83=9D=E3=83=B3=E3=82=B9XML=E3=81=AE?= =?utf8?q?=E8=A1=A8=E7=A4=BA(=E3=82=A8=E3=83=A9=E3=83=BC=E6=99=82=E3=81=AE?= =?utf8?q?=E3=81=BF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/plugin@666 1ca29b6e-896d-4ea0-84a5-967f57386b96 --- trunk/NP_PingJP/NP_PingJP.php | 58 +++++++++++++++++++---- trunk/NP_PingJP/pingjp/language/english.php | 33 +++++++++++-- trunk/NP_PingJP/pingjp/language/japanese-euc.php | 29 ++++++++++++ trunk/NP_PingJP/pingjp/language/japanese-utf8.php | 30 +++++++++++- 4 files changed, 138 insertions(+), 12 deletions(-) diff --git a/trunk/NP_PingJP/NP_PingJP.php b/trunk/NP_PingJP/NP_PingJP.php index 98f3512..610b592 100644 --- a/trunk/NP_PingJP/NP_PingJP.php +++ b/trunk/NP_PingJP/NP_PingJP.php @@ -36,9 +36,10 @@ * v1.65 - Add Live BG mode setting * v1.66 - Typo fix * v1.67 - Bug fix + * v1.68 - Debug development * - * NP_PingJP.php ($Revision: 1.15 $) - * $Id: NP_PingJP.php,v 1.15 2008-07-13 14:57:07 shizuki Exp $ + * NP_PingJP.php ($Revision: 1.16 $) + * $Id: NP_PingJP.php,v 1.16 2008-07-16 13:24:37 shizuki Exp $ */ @@ -55,6 +56,7 @@ var $ahttp; var $debug = false; var $bgping = false; var $servers; +var $faltMessageSet; // {{{ function getName() @@ -108,7 +110,7 @@ var $servers; */ function getVersion() { - return '1.67'; + return '1.68'; } // }}} @@ -438,16 +440,18 @@ var $servers; } if ($background == 0) { echo $logMsg . "
\n"; + if ($results['error'] && $response->errno == 2 && $this->debug) { + $resultXML = $response->raw_data; + echo '-------------------- ' . $target . ' receive data --------------------
'; + echo '
' . htmlspecialchars($resultXML, ENT_NOQUOTES, _CHARSET, false) . '
'; + echo '-------------------- ' . $target . ' receive data --------------------
'; + } } -/* -echo $target."\n
";
-print_r($response);
-echo '
'; -*/ } if ($GLOBALS['xmlrpc_internalencoding'] != $this->xmlrpc_internalencoding_org) { $GLOBALS['xmlrpc_internalencoding'] = $this->xmlrpc_internalencoding_org; } + $this->faltMessageSet = false; } // }}} @@ -478,6 +482,37 @@ echo ''; $this->xmlrpc_internalencoding_org = $GLOBALS['xmlrpc_internalencoding']; $GLOBALS['xmlrpc_internalencoding'] = 'UTF-8'; } + + if (!$this->faltMessageSet) { + $GLOBALS['xmlrpcstr']['unknown_method'] = _PINGJP_XMLRPCFAULT_UNKNOWN_METHOD; + $GLOBALS['xmlrpcstr']['invalid_return'] = _PINGJP_XMLRPCFAULT_INVALID_RETURN; + $GLOBALS['xmlrpcstr']['incorrect_params'] = _PINGJP_XMLRPCFAULT_INCORRECT_PARAMS; + $GLOBALS['xmlrpcstr']['introspect_unknown'] = _PINGJP_XMLRPCFAULT_INTROSPECT_UNKNOWN; + $GLOBALS['xmlrpcstr']['http_error'] = _PINGJP_XMLRPCFAULT_HTTP_ERROR; + $GLOBALS['xmlrpcstr']['no_data'] = _PINGJP_XMLRPCFAULT_NO_DATA; + $GLOBALS['xmlrpcstr']['no_ssl'] = _PINGJP_XMLRPCFAULT_NO_SSL; + $GLOBALS['xmlrpcstr']['curl_fail'] = _PINGJP_XMLRPCFAULT_CURL_FAIL; + $GLOBALS['xmlrpcstr']['invalid_request'] = _PINGJP_XMLRPCFAULT_INVALID_REQUEST; + $GLOBALS['xmlrpcstr']['no_curl'] = _PINGJP_XMLRPCFAULT_NO_CURL; + $GLOBALS['xmlrpcstr']['server_error'] = _PINGJP_XMLRPCFAULT_SERVER_ERROR; + $GLOBALS['xmlrpcstr']['multicall_error'] = _PINGJP_XMLRPCFAULT_MULTICALL_ERROR; + + $GLOBALS['xmlrpcstr']['multicall_notstruct'] = _PINGJP_XMLRPCFAULT_MULTICALL_NOTSTRUCT; + $GLOBALS['xmlrpcstr']['multicall_nomethod'] = _PINGJP_XMLRPCFAULT_MULTICALL_NOMETHOD; + $GLOBALS['xmlrpcstr']['multicall_notstring'] = _PINGJP_XMLRPCFAULT_MULTICALL_NOTSTRING; + $GLOBALS['xmlrpcstr']['multicall_recursion'] = _PINGJP_XMLRPCFAULT_MULTICALL_RECURSION; + $GLOBALS['xmlrpcstr']['multicall_noparams'] = _PINGJP_XMLRPCFAULT_MULTICALL_NOPARAMS; + $GLOBALS['xmlrpcstr']['multicall_notarray'] = _PINGJP_XMLRPCFAULT_MULTICALL_NOTARRAY; + + $GLOBALS['xmlrpcstr']['cannot_decompress'] = _PINGJP_XMLRPCFAULT_CANNOT_DECOMPRESS; + $GLOBALS['xmlrpcstr']['decompress_fail'] = _PINGJP_XMLRPCFAULT_DECOMPRESS_FAIL; + $GLOBALS['xmlrpcstr']['dechunk_fail'] = _PINGJP_XMLRPCFAULT_DECHUNK_FAIL; + $GLOBALS['xmlrpcstr']['server_cannot_decompress'] = _PINGJP_XMLRPCFAULT_SERVER_CANNOT_DECOMPRESS; + $GLOBALS['xmlrpcstr']['server_decompress_fail'] = _PINGJP_XMLRPCFAULT_SERVER_DECOMPRESS_FAIL; + + $this->faltMessageSet = true; + } + $b =& $manager->getBlog($bid); $name = $b->getName(); $burl = $this->getBlogOption($bid, 'pingjp_updateurl'); @@ -500,6 +535,12 @@ echo ''; $data[] = new xmlrpcval($feedURL, 'string'); } $message = new xmlrpcmsg($server['method'], $data); + if ($this->debug) { + $requestXML = htmlspecialchars(mb_convert_encoding($message->serialize('UTF-8'), _CHARSET, 'UTF-8'), ENT_NOQUOTES, _CHARSET, false); + echo '-------------------- ' . $server['name'] . ' send data --------------------
'; + echo '
' . $requestXML . '
'; + echo '-------------------- ' . $server['name'] . ' send data --------------------
'; + } $reqestId = $this->ahttp->setRequest($server['addr'], 'POST', $header, $message->serialize('UTF-8')); return array($reqestId, &$message); } @@ -604,6 +645,7 @@ echo ''; $targets[] = $target; } } +// print_r($targets); return $targets; } } diff --git a/trunk/NP_PingJP/pingjp/language/english.php b/trunk/NP_PingJP/pingjp/language/english.php index ef60af0..4a5dfeb 100644 --- a/trunk/NP_PingJP/pingjp/language/english.php +++ b/trunk/NP_PingJP/pingjp/language/english.php @@ -1,6 +1,6 @@