From ed0d13acfe48f91bc4a1a6d8f9609f75c90bbc6b Mon Sep 17 00:00:00 2001
From: shizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Date: Sun, 13 Jul 2008 14:57:07 +0000
Subject: [PATCH] =?utf8?q?=E4=BB=8A=E5=BA=A6=E3=81=AF=E3=81=A1=E3=82=83?=
 =?utf8?q?=E3=82=93=E3=81=A8=E9=80=81=E4=BF=A1=E3=81=A7=E3=81=8D=E3=81=BE?=
 =?utf8?q?=E3=81=99=20=E8=A9=B3=E3=81=97=E3=81=8F=E3=81=AFweb=E3=81=A7=20h?=
 =?utf8?q?ttp://shizuki.kinezumi.net/item=5F652.html?=
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@663 1ca29b6e-896d-4ea0-84a5-967f57386b96
---
 trunk/NP_PingJP/NP_PingJP.php | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/trunk/NP_PingJP/NP_PingJP.php b/trunk/NP_PingJP/NP_PingJP.php
index 297acb0..98f3512 100644
--- a/trunk/NP_PingJP/NP_PingJP.php
+++ b/trunk/NP_PingJP/NP_PingJP.php
@@ -35,9 +35,10 @@
   *   v1.64 - Bug fix
   *   v1.65 - Add Live BG mode setting
   *   v1.66 - Typo fix
+  *   v1.67 - Bug fix
   *
-  * NP_PingJP.php ($Revision: 1.14 $)
-  * $Id: NP_PingJP.php,v 1.14 2008-07-12 17:20:03 shizuki Exp $
+  * NP_PingJP.php ($Revision: 1.15 $)
+  * $Id: NP_PingJP.php,v 1.15 2008-07-13 14:57:07 shizuki Exp $
   */
 
 
@@ -107,7 +108,7 @@ var $servers;
 	 */
 	function getVersion()
 	{
-		return '1.65';
+		return '1.67';
 	}
 
 	// }}}
@@ -438,6 +439,14 @@ var $servers;
 			if ($background == 0) {
 				echo $logMsg . "<br />\n";
 			}
+/*
+echo $target."\n<pre>";
+print_r($response);
+echo '</pre>';
+*/
+		}
+		if ($GLOBALS['xmlrpc_internalencoding'] != $this->xmlrpc_internalencoding_org) {
+			$GLOBALS['xmlrpc_internalencoding'] = $this->xmlrpc_internalencoding_org;
 		}
 	}
 
@@ -464,7 +473,10 @@ var $servers;
 		if (!class_exists('xmlrpcmsg')) {
 			global $DIR_LIBS;
 			include_once($DIR_LIBS . 'xmlrpc.inc.php');
-			$GLOBALS['xmlrpc_internalencoding'] = mb_internal_encoding();
+		}
+		if ($GLOBALS['xmlrpc_internalencoding'] != 'UTF-8') {
+			$this->xmlrpc_internalencoding_org  = $GLOBALS['xmlrpc_internalencoding'];
+			$GLOBALS['xmlrpc_internalencoding'] = 'UTF-8';
 		}
 		$b    =& $manager->getBlog($bid);
 		$name =  $b->getName();
@@ -472,22 +484,23 @@ var $servers;
 		if (!$burl) {
 			$burl = $b->getURL();
 		}
+		$data = array();
 		if (_CHARSET != 'UTF-8') {
 			mb_convert_encoding($name, 'UTF-8', _CHARSET);
 		}
-		$data[1] = new xmlrpcval($name);
-		$data[2] = new xmlrpcval($burl);
+		$data[] = new xmlrpcval($name, 'string');
+		$data[] = new xmlrpcval($burl, 'string');
 		if ($server['method'] == 'weblogUpdates.extendedPing') {
 			$feedURL = $this->getBlogOption($myBlogid, 'pingjp_feedurl');
 			if (!$feedURL) {
 				global $CONF;
 				$feedURL = $CONF['IndexURL'] . 'xml-rss2.php?blogid=' . $bid;
 			}
-			$data[3] = new xmlrpcval($burl);
-			$data[4] = new xmlrpcval($feedURL);
+			$data[] = new xmlrpcval($burl, 'string');
+			$data[] = new xmlrpcval($feedURL, 'string');
 		}
 		$message  = new xmlrpcmsg($server['method'], $data);
-		$reqestId = $this->ahttp->setRequest($server['addr'], 'POST', $header, $message->serialize());
+		$reqestId = $this->ahttp->setRequest($server['addr'], 'POST', $header, $message->serialize('UTF-8'));
 		return array($reqestId, &$message);
 	}
 
-- 
2.11.0