svnno****@sourc*****
svnno****@sourc*****
2010年 1月 1日 (金) 03:52:35 JST
Revision: 755
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=755
Author: rsk
Date: 2010-01-01 03:52:34 +0900 (Fri, 01 Jan 2010)
Log Message:
-----------
expack:
- A Happy New Year!
- rev.100101.0345.
- ホストã®ç§»è»¢é€†æ¤œå‡ºãŒã§ãるよã†ã«ãªã£ãŸã€‚
(datを走査ã—ã¦ã‚ªãƒªã‚¸ãƒŠãƒ«ã¨æ€ã‚れるホストを抽出ã™ã‚‹)
- å…¬å¼p2ã‹ã‚‰datをダウンãƒãƒ¼ãƒ‰ã§ãるよã†ã«ãªã£ãŸã€‚
-- datå–得権é™ã®ãªã„スレッドã§ã¯è‡ªå‹•çš„ã«ãƒ¢ãƒªã‚¿ãƒã‚’消費ã—ã¦
権é™ã‚’購入ã™ã‚‹ã®ã§æ³¨æ„ã—ã¦ãã ã•ã„。
ダウンãƒãƒ¼ãƒ‰ã«å¤±æ•—ã—ãŸã‚Šã€æ„図ã›ãšå¤§é‡ã®ãƒ¢ãƒªã‚¿ãƒã‚’
使ã£ã¦ã—ã¾ã£ã¦ã‚‚自己責任ã§ã™ã€‚
-- 有効ã«ã™ã‚‹æ–¹æ³•ã¯å…¬å¼p2を使ã£ã¦ã®æ›¸ãè¾¼ã¿ã¨åŒã˜ã€‚
Modified Paths:
--------------
p2ex/trunk/conf/conf.inc.php
p2ex/trunk/lib/P2Client.php
p2ex/trunk/lib/P2Util.php
p2ex/trunk/lib/ThreadRead.php
p2ex/trunk/lib/read_header.inc.php
p2ex/trunk/lib/read_header_k.inc.php
p2ex/trunk/post.php
-------------- next part --------------
Modified: p2ex/trunk/conf/conf.inc.php
===================================================================
--- p2ex/trunk/conf/conf.inc.php 2009-12-31 15:42:37 UTC (rev 754)
+++ p2ex/trunk/conf/conf.inc.php 2009-12-31 18:52:34 UTC (rev 755)
@@ -7,7 +7,7 @@
// ƒo[ƒWƒ‡ƒ“î•ñ
$_conf = array(
'p2version' => '1.7.29+1.8.x', // rep2‚̃o[ƒWƒ‡ƒ“
- 'p2expack' => '091231.1900', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
+ 'p2expack' => '100101.0345', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
'p2name' => 'expack', // rep2‚Ì–¼‘O
);
Modified: p2ex/trunk/lib/P2Client.php
===================================================================
--- p2ex/trunk/lib/P2Client.php 2009-12-31 15:42:37 UTC (rev 754)
+++ p2ex/trunk/lib/P2Client.php 2009-12-31 18:52:34 UTC (rev 755)
@@ -260,6 +260,7 @@
// uƒ‚ƒŠƒ^ƒ|‚Åp2‚ÉŽæ‚èž‚ÞvƒŠƒ“ƒN‚Ì—L–³‚𒲂ׂéB
// –³‚¢ê‡‚ÍdatŽæ“¾Œ ŒÀ‚ª‚ ‚é‚à‚Ì‚Æ‚·‚éB
+ // datŽæ“¾Œ ŒÀ‚ª‚È‚¢ê‡‚⃂ƒŠƒ^ƒ|’Ê’ ‚ÌŽc‚‚ª‘«‚è‚È‚¢ê‡‚̈—‚Í’[Ü‚éB
$dom = new P2DOM($html);
$expression = './/a[contains(@href, "' . self::SCRIPT_NAME_READ . '")'
. ' and contains(@href, "&moritapodat=")]';
@@ -272,7 +273,6 @@
}
// dat‚ðŽæ“¾‚·‚éB
- // datŽæ“¾Œ ŒÀ‚ª‚È‚¢ê‡‚⃂ƒŠƒ^ƒ|’Ê’ ‚ÌŽc‚‚ª‘«‚è‚È‚¢ê‡‚̈—‚Í’[Ü‚éB
$getData = array(
self::REQUEST_PARAMETER_HOST => (string)$host,
self::REQUEST_PARAMETER_BBS => (string)$bbs,
Modified: p2ex/trunk/lib/P2Util.php
===================================================================
--- p2ex/trunk/lib/P2Util.php 2009-12-31 15:42:37 UTC (rev 754)
+++ p2ex/trunk/lib/P2Util.php 2009-12-31 18:52:34 UTC (rev 755)
@@ -1782,6 +1782,30 @@
}
// }}}
+ // {{{ getP2Client()
+
+ /**
+ * P2ClientƒNƒ‰ƒX‚̃Cƒ“ƒXƒ^ƒ“ƒX‚𶬂·‚é
+ *
+ * @param void
+ * @return P2Client
+ */
+ static public function getP2Client()
+ {
+ global $_conf;
+
+ if (!class_exists('P2Client', false)) {
+ require P2_LIB_DIR . '/P2Client.php';
+ }
+
+ try {
+ return new P2Client($_conf['p2_2ch_mail'], $_conf['p2_2ch_pass'], $_conf['cookie_dir']);
+ } catch (P2Exception $e) {
+ p2die($e->getMessage());
+ }
+ }
+
+ // }}}
// {{{ debug()
/*
static public function debug()
Modified: p2ex/trunk/lib/ThreadRead.php
===================================================================
--- p2ex/trunk/lib/ThreadRead.php 2009-12-31 15:42:37 UTC (rev 754)
+++ p2ex/trunk/lib/ThreadRead.php 2009-12-31 18:52:34 UTC (rev 755)
@@ -84,6 +84,12 @@
include $_conf['sid2ch_php'];
$this->_downloadDat2chMaru($uaMona, $SID2ch);
+ // 2ch bbspink ƒ‚ƒŠƒ^ƒ|“Ç‚Ý
+ } elseif (P2Util::isHost2chs($this->host) && !empty($_GET['moritapodat']) &&
+ $_conf['p2_2ch_mail'] && $_conf['p2_2ch_pass'])
+ {
+ $this->_downloadDat2chMoritapo();
+
// 2ch‚̉ߋŽƒƒO‘qŒÉ“Ç‚Ý
} elseif (!empty($_GET['kakolog']) && !empty($_GET['kakoget'])) {
if ($_GET['kakoget'] == 1) {
@@ -110,7 +116,7 @@
*
* @return mix Žæ“¾‚Å‚«‚½‚©AXV‚ª‚È‚©‚Á‚½ê‡‚Ítrue‚ð•Ô‚·
*/
- private function _downloadDat2ch($from_bytes)
+ protected function _downloadDat2ch($from_bytes)
{
global $_conf, $_info_msg_ht;
global $debug;
@@ -245,8 +251,7 @@
// ƒXƒŒƒbƒh‚ª‚È‚¢‚Æ”»’f
} else {
fclose($fp);
- $this->_downloadDat2chNotFound();
- return false;
+ return $this->_downloadDat2chNotFound();
}
} else {
@@ -270,8 +275,7 @@
return $this->_downloadDat2ch($from_bytes);
} else {
fclose($fp);
- $this->_downloadDat2chNotFound();
- return false;
+ return $this->_downloadDat2chNotFound();
}
} elseif ($code == "304") { // Not Modified
@@ -288,8 +292,7 @@
} else {
fclose($fp);
- $this->_downloadDat2chNotFound();
- return false;
+ return $this->_downloadDat2chNotFound();
}
}
@@ -325,7 +328,7 @@
/**
* 2ch DAT‚ðƒ_ƒEƒ“ƒ[ƒh‚Å‚«‚È‚©‚Á‚½‚Æ‚«‚ɌĂÑo‚³‚ê‚é
*/
- private function _downloadDat2chNotFound()
+ protected function _downloadDat2chNotFound()
{
// 2ch, bbspink ‚È‚çread.cgi‚ÅŠm”F
if (P2Util::isHost2chs($this->host)) {
@@ -346,7 +349,7 @@
* @return bool
* @see lib/login2ch.inc.php
*/
- private function _downloadDat2chMaru($uaMona, $SID2ch)
+ protected function _downloadDat2chMaru($uaMona, $SID2ch)
{
global $_conf;
@@ -558,7 +561,7 @@
/**
* œID‚ł̎擾‚ª‚Å‚«‚È‚©‚Á‚½‚Æ‚«‚ɌĂÑo‚³‚ê‚é
*/
- private function _downloadDat2chMaruNotFound()
+ protected function _downloadDat2chMaruNotFound()
{
global $_conf;
@@ -567,8 +570,9 @@
$_REQUEST['relogin2ch'] = true;
return $this->downloadDat();
} else {
- $remarutori_ht = "<a href=\"{$_conf['read_php']}?host={$this->host}&bbs={$this->bbs}&key={$this->key}&ls={$this->ls}&maru=true&relogin2ch=true\">Ď擾‚ðŽŽ‚Ý‚é</a>";
- $this->getdat_error_msg_ht .= "<p>p2 info - œID‚ł̃XƒŒƒbƒhŽæ“¾‚ÉŽ¸”s‚µ‚Ü‚µ‚½B[{$remarutori_ht}]</p>";
+ $remarutori_ht = " [<a href=\"{$_conf['read_php']}?host={$this->host}&bbs={$this->bbs}&key={$this->key}&ls={$this->ls}&maru=true&relogin2ch=true\">Ď擾‚ðŽŽ‚Ý‚é</a>]";
+ $moritori_ht = $this->_generateMoritapoDatLink();
+ $this->getdat_error_msg_ht .= "<p>p2 info - œID‚ł̃XƒŒƒbƒhŽæ“¾‚ÉŽ¸”s‚µ‚Ü‚µ‚½B{$remarutori_ht}{$moritori_ht}</p>";
$this->diedat = true;
return false;
}
@@ -580,7 +584,7 @@
/**
* 2ch‚̉ߋŽƒƒO‘qŒÉ‚©‚çdat.gz‚ðƒ_ƒEƒ“ƒ[ƒh•‰ð“€‚·‚é
*/
- private function _downloadDat2chKako($uri, $ext)
+ protected function _downloadDat2chKako($uri, $ext)
{
global $_conf, $_info_msg_ht;
@@ -735,10 +739,8 @@
/**
* ‰ß‹ŽƒƒO‚ðŽæ“¾‚Å‚«‚È‚©‚Á‚½‚Æ‚«‚ɌĂÑo‚³‚ê‚é
- *
- * @private
*/
- private function _downloadDat2chKakoNotFound($uri, $ext)
+ protected function _downloadDat2chKakoNotFound($uri, $ext)
{
global $_conf;
@@ -823,11 +825,12 @@
if (preg_match($kakosoko_match, $read_response_html, $matches)) {
$dat_response_status = "‚±‚̃XƒŒƒbƒh‚͉ߋŽƒƒO‘qŒÉ‚ÉŠi”[‚³‚ê‚Ä‚¢‚Ü‚·B";
//if (file_exists($_conf['idpw2ch_php']) || file_exists($_conf['sid2ch_php'])) {
- $marutori_ht = "<a href=\"{$_conf['read_php']}?host={$this->host}&bbs={$this->bbs}&key={$this->key}&ls={$this->ls}&maru=true\">œID‚Åp2‚ÉŽæ‚èž‚Þ</a>";
+ $marutori_ht = " [<a href=\"{$_conf['read_php']}?host={$this->host}&bbs={$this->bbs}&key={$this->key}&ls={$this->ls}&maru=true\">œID‚Åp2‚ÉŽæ‚èž‚Þ</a>]";
//} else {
- // $marutori_ht = "<a href=\"login2ch.php\" target=\"subject\">œIDƒƒOƒCƒ“</a>";
+ // $marutori_ht = " [<a href=\"login2ch.php\" target=\"subject\">œIDƒƒOƒCƒ“</a>]";
//}
- $dat_response_msg = "<p>2ch info - ‚±‚̃XƒŒƒbƒh‚͉ߋŽƒƒO‘qŒÉ‚ÉŠi”[‚³‚ê‚Ä‚¢‚Ü‚·B [{$marutori_ht}]</p>";
+ $moritori_ht = $this->_generateMoritapoDatLink();
+ $dat_response_msg = "<p>2ch info - ‚±‚̃XƒŒƒbƒh‚͉ߋŽƒƒO‘qŒÉ‚ÉŠi”[‚³‚ê‚Ä‚¢‚Ü‚·B{$marutori_ht}{$moritori_ht}</p>";
//
// <title>‚ª‚»‚ñ‚È”ÂorƒXƒŒƒbƒh‚È‚¢‚Å‚·Bor error 3939
@@ -843,8 +846,9 @@
} elseif (preg_match($waithtml_match, $read_response_html, $matches)) {
$dat_response_status = "‘à’·! ƒXƒŒƒbƒh‚Íhtml‰»‚³‚ê‚é‚Ì‚ð‘Ò‚Á‚Ä‚¢‚é‚悤‚Å‚·B";
- $marutori_ht = "<a href=\"{$_conf['read_php']}?host={$this->host}&bbs={$this->bbs}&key={$this->key}&ls={$this->ls}&maru=true\">œID‚Åp2‚ÉŽæ‚èž‚Þ</a>";
- $dat_response_msg = "<p>2ch info - ‘à’·! ƒXƒŒƒbƒh‚Íhtml‰»‚³‚ê‚é‚Ì‚ð‘Ò‚Á‚Ä‚¢‚é‚悤‚Å‚·B [{$marutori_ht}]</p>";
+ $marutori_ht = " [<a href=\"{$_conf['read_php']}?host={$this->host}&bbs={$this->bbs}&key={$this->key}&ls={$this->ls}&maru=true\">œID‚Åp2‚ÉŽæ‚èž‚Þ</a>]";
+ $moritori_ht = $this->_generateMoritapoDatLink();
+ $dat_response_msg = "<p>2ch info - ‘à’·! ƒXƒŒƒbƒh‚Íhtml‰»‚³‚ê‚é‚Ì‚ð‘Ò‚Á‚Ä‚¢‚é‚悤‚Å‚·B{$marutori_ht}{$moritori_ht}</p>";
} else {
if ($_GET['kakolog']) {
@@ -1229,7 +1233,7 @@
/**
* ˆê‚‚̃XƒŒ“à‚Å‚ÌIDoŒ»”‚ðƒZƒbƒg‚·‚é
*/
- private function _setIdCount()
+ protected function _setIdCount()
{
if (!$this->datlines) {
return;
@@ -1276,6 +1280,192 @@
}
// }}}
+ // {{{ scanOriginalHosts()
+
+ /**
+ * dat‚ð‘–¸‚µ‚ăXƒŒ—§‚ÄŽž‚̃zƒXƒgŒó•â‚ðŒŸo‚·‚é
+ *
+ * @param void
+ * @return array
+ */
+ public function scanOriginalHosts()
+ {
+ if (file_exists($this->keydat) && $dat = file_get_contents($this->keydat)) {
+ $bbs_re = preg_quote($this->bbs, '@');
+ if (preg_match_all("@/(\\w+\\.(?:2ch\\.net|bbspink\\.com))(?:/test/read\\.cgi)?/{$bbs_re}\\b@", $dat, $matches, PREG_PATTERN_ORDER)) {
+ $hosts = array_unique($matches[1]);
+ $arKey = array_search($this->host, $hosts);
+ if ($arKey !== false && array_key_exists($arKey, $hosts)) {
+ unset($hosts[$arKey]);
+ }
+
+ return $hosts;
+ }
+ }
+
+ return array();
+ }
+
+ // }}}
+ // {{{ getDefaultGetDatErrorMessageHTML()
+
+ /**
+ * ƒfƒtƒHƒ‹ƒg‚ÌdatŽæ“¾Ž¸”sƒGƒ‰[ƒƒbƒZ[ƒWHTML‚ðŽæ“¾‚·‚é
+ *
+ * @param void
+ * @return string
+ */
+ public function getDefaultGetDatErrorMessageHTML()
+ {
+ global $_conf;
+
+ $diedat_msg = '<p><b>p2 info - ”ƒT[ƒo‚©‚çÅV‚̃XƒŒƒbƒhî•ñ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B</b>';
+ if ($hosts = $this->scanOriginalHosts()) {
+ $common_q = '&bbs=' . rawurldecode($this->bbs)
+ . '&key=' . rawurldecode($this->key)
+ . '&ls=' . rawurldecode($this->ls);
+ $diedat_msg .= '<br>dat‚©‚瑼‚̃zƒXƒgŒó•â‚ðŒŸo‚µ‚Ü‚µ‚½B';
+ foreach ($hosts as $host) {
+ $diedat_msg .= " [<a href=\"{$_conf['read_php']}?host={$host}{$common_q}\">{$host}</a>]";
+ }
+ }
+ $diedat_msg .= '</p>';
+
+ return $diedat_msg;
+ }
+
+ // }}}
+ // {{{ _generateMoritapoDatLink()
+
+ /**
+ * ŒöŽ®p2‚Å(datŽæ“¾Œ ŒÀ‚ª‚È‚¢ê‡‚̓‚ƒŠƒ^ƒ|‚ðÁ”‚Ä)dat‚ðŽæ“¾‚·‚邽‚߂̃Šƒ“ƒN‚𶬂·‚éB
+ *
+ * @param void
+ * @return string
+ */
+ protected function _generateMoritapoDatLink()
+ {
+ global $_conf;
+
+ if ($_conf['p2_2ch_mail'] && $_conf['p2_2ch_pass']) {
+ return " [<a href=\"{$_conf['read_php']}?host={$this->host}&bbs={$this->bbs}&key={$this->key}&ls={$this->ls}&moritapodat=true\">ƒ‚ƒŠƒ^ƒ|‚Åp2‚ÉŽæ‚èž‚Þ</a>]";
+ } else {
+ return '';
+ }
+ }
+
+ // }}}
+ // {{{ _downloadDat2chMoritapo()
+
+ /**
+ * ŒöŽ®p2‚Å(datŽæ“¾Œ ŒÀ‚ª‚È‚¢ê‡‚̓‚ƒŠƒ^ƒ|‚ðÁ”‚Ä)dat‚ðŽæ“¾‚·‚é
+ *
+ * @param void
+ * @return bool
+ */
+ protected function _downloadDat2chMoritapo()
+ {
+ global $_conf;
+
+ // dat‚ðƒ_ƒEƒ“ƒ[ƒh
+ try {
+ $client = P2Util::getP2Client();
+ $body = $client->downloadDat($this->host, $this->bbs, $this->key, $response);
+ // DEBUG
+ /*
+ $GLOBALS['_downloadDat2chMoritapo_response_dump'] = '<pre>' . htmlspecialchars(print_r($response, true)) . '</pre>';
+ register_shutdown_function(create_function('', 'echo $GLOBALS[\'_downloadDat2chMoritapo_response_dump\'];'));
+ */
+ } catch (P2Exception $e) {
+ p2die($e->getMessage());
+ }
+
+ // ƒf[ƒ^ŒŸØ‚»‚Ì1
+ if (!$body || (strpos($body, '<>') === false && strpos($body, ',') === false)) {
+ return $this->_downloadDat2chMoritapoNotFound();
+ }
+
+ // ‰üsˆÊ’u‚ðŒŸo
+ $posCR = strpos($body, "\r");
+ $posLF = strpos($body, "\n");
+ if ($posCR === false && $posLF === false) {
+ $pos = strlen($body);
+ } elseif ($posCR === false) {
+ $pos = $posLF;
+ } elseif ($posLF === false) {
+ $pos = $posCR;
+ } else {
+ $pos = min($posLF, $posCR);
+ }
+
+ // 1s–ڂ̎擾‚ƃf[ƒ^ŒŸØ‚»‚Ì2
+ $firstLine = rtrim(substr($body, 0, $pos));
+ if (strpos($firstLine, '<>') !== false) {
+ $this->dat_type = '2ch';
+ } elseif (strpos($firstLine, ',') !== false) {
+ $this->dat_type = '2ch_old';
+ } else {
+ return $this->_downloadDat2chMoritapoNotFound();
+ }
+
+ // ƒf[ƒ^ŒŸØ‚»‚Ì3 (ƒ^ƒCƒgƒ‹ = $ar[4])
+ $ar = $this->explodeDatLine($firstLine);
+ if (count($ar) < 5) {
+ return $this->_downloadDat2chMoritapoNotFound();
+ }
+
+ // ƒ[ƒJƒ‹dat‚É‘‚«ž‚Ý
+ FileCtl::make_datafile($this->keydat, $_conf['dat_perm']);
+ if (FileCtl::file_write_contents($this->keydat, $body) === false) {
+ p2die('cannot write file. downloadDat2chMoritapo()');
+ }
+
+ return true;
+ }
+
+ // }}}
+ // {{{ _downloadDat2chMoritapoNotFound()
+
+ /**
+ * ƒ‚ƒŠƒ^ƒ|‚ł̎擾‚ª‚Å‚«‚È‚©‚Á‚½‚Æ‚«‚ɌĂÑo‚³‚ê‚é
+ *
+ * @param void
+ * @return bool
+ */
+ protected function _downloadDat2chMoritapoNotFound()
+ {
+ global $_conf;
+
+ $marutori_ht = " [<a href=\"{$_conf['read_php']}?host={$this->host}&bbs={$this->bbs}&key={$this->key}&ls={$this->ls}&maru=true\">œID‚Åp2‚ÉŽæ‚èž‚Þ</a>]";
+
+ if ($hosts = $this->scanOriginalHosts()) {
+ $hosts_ht = '<br>dat‚©‚瑼‚̃zƒXƒgŒó•â‚ðŒŸo‚µ‚Ü‚µ‚½B';
+ foreach ($hosts as $host) {
+ $hosts_ht .= " [<a href=\"#\" onclick=\"this.parentNode.elements['host'].value='{$host}';return false;\">{$host}</a>]";
+ }
+ } else {
+ $hosts_ht = '';
+ }
+
+ $this->getdat_error_msg_ht .= <<<EOF
+<p>p2 info - ƒ‚ƒŠƒ^ƒ|‚ł̃XƒŒƒbƒhŽæ“¾‚ÉŽ¸”s‚µ‚Ü‚µ‚½B{$marutori_ht}</p>
+<form action="{$_conf['read_php']}" method="get">
+ ƒzƒXƒg‚ð
+ <input type="text" name="host" value="{$this->host}" size="12">
+ <input type="hidden" name="bbs" value="{$this->bbs}">
+ <input type="hidden" name="key" value="{$this->key}">
+ <input type="hidden" name="ls" value="{$this->ls}">
+ ‚É•Ï‚¦‚Ä
+ <input type="submit" name="moritapodat" value="ƒ‚ƒŠƒ^ƒ|‚Åp2‚ÉŽæ‚èž‚ñ‚Å‚Ý‚é">
+ {$hosts_ht}
+</form>\n
+EOF;
+ $this->diedat = true;
+
+ return false;
+ }
+
+ // }}}
}
// }}}
Modified: p2ex/trunk/lib/read_header.inc.php
===================================================================
--- p2ex/trunk/lib/read_header.inc.php 2009-12-31 15:42:37 UTC (rev 754)
+++ p2ex/trunk/lib/read_header.inc.php 2009-12-31 18:52:34 UTC (rev 755)
@@ -283,7 +283,7 @@
if ($aThread->getdat_error_msg_ht) {
$diedat_msg = $aThread->getdat_error_msg_ht;
} else {
- $diedat_msg = "<p><b>p2 info - ”ƒT[ƒo‚©‚çÅV‚̃XƒŒƒbƒhî•ñ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B</b></p>";
+ $diedat_msg = $aThread->getDefaultGetDatErrorMessageHTML();
}
$motothre_popup = " onmouseover=\"showHtmlPopUp('{$motothre_url}',event,{$_conf['iframe_popup_delay']})\" onmouseout=\"offHtmlPopUp()\"";
Modified: p2ex/trunk/lib/read_header_k.inc.php
===================================================================
--- p2ex/trunk/lib/read_header_k.inc.php 2009-12-31 15:42:37 UTC (rev 754)
+++ p2ex/trunk/lib/read_header_k.inc.php 2009-12-31 18:52:34 UTC (rev 755)
@@ -225,7 +225,7 @@
if ($aThread->getdat_error_msg_ht) {
$diedat_msg = $aThread->getdat_error_msg_ht;
} else {
- $diedat_msg = "<p><b>p2 info - ”ƒT[ƒo‚©‚çÅV‚̃XƒŒƒbƒhî•ñ‚ðŽæ“¾‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½B</b></p>";
+ $diedat_msg = $aThread->getDefaultGetDatErrorMessageHTML();
}
$motothre_ht = "<a href=\"{$motothre_url}\" target=\"_blank\">{$motothre_url}</a>";
Modified: p2ex/trunk/post.php
===================================================================
--- p2ex/trunk/post.php 2009-12-31 15:42:37 UTC (rev 754)
+++ p2ex/trunk/post.php 2009-12-31 18:52:34 UTC (rev 755)
@@ -538,9 +538,6 @@
{
global $_conf;
- if (!class_exists('P2Client', false)) {
- include P2_LIB_DIR . '/P2Client.php';
- }
if (!is_dir($_conf['cookie_dir'])) {
FileCtl::mkdir_r($_conf['cookie_dir']);
}
@@ -552,8 +549,9 @@
}
try {
- $client = new P2Client($_conf['p2_2ch_mail'], $_conf['p2_2ch_pass'], $_conf['cookie_dir']);
- $posted = $client->post($host, $bbs, $key, $FROM, $mail, $MESSAGE, $beRes, $response);
+ $posted = P2Util::getP2Client()->post($host, $bbs, $key,
+ $FROM, $mail, $MESSAGE,
+ $beRes, $response);
} catch (P2Exception $e) {
p2die('ŒöŽ®p2ƒ|ƒXƒgŽ¸”s', $e->getMessage());
}