svnno****@sourc*****
svnno****@sourc*****
2009年 12月 24日 (木) 04:51:39 JST
Revision: 743
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=743
Author: akid
Date: 2009-12-24 04:51:38 +0900 (Thu, 24 Dec 2009)
Log Message:
-----------
メソッド ThreadRead->pushDownloadDatErrorMsgHtml() ã®è¿½åŠ é©ç”¨ã€‚
Modified Paths:
--------------
p2/trunk/iphone/sb_footer_k.inc.php
p2/trunk/lib/ThreadRead.php
p2/trunk/lib/downloadDatMachiBbs.func.php
p2/trunk/lib/downloadDatShitaraba.func.php
-------------- next part --------------
Modified: p2/trunk/iphone/sb_footer_k.inc.php
===================================================================
--- p2/trunk/iphone/sb_footer_k.inc.php 2009-12-21 15:30:53 UTC (rev 742)
+++ p2/trunk/iphone/sb_footer_k.inc.php 2009-12-23 19:51:38 UTC (rev 743)
@@ -126,7 +126,7 @@
$k_sb_navi_ht ‚͉º‚Ì‚R‚Æ“¯‚¶
{$sb_range_st}
*/
-$foot_sure_ht = "";
+$foot_sure_ht = '';
if ($dat_soko_ht) $foot_sure_ht .= "<span class=\"soko\">{$dat_soko_ht}</span>";
if ($buildnewthread_atag) $foot_sure_ht .= "<span class=\"build\">{$buildnewthread_atag}</span>";
if ($allfav_atag) $foot_sure_ht .= "<span class=\"all\">{$allfav_atag}</span>";
Modified: p2/trunk/lib/ThreadRead.php
===================================================================
--- p2/trunk/lib/ThreadRead.php 2009-12-21 15:30:53 UTC (rev 742)
+++ p2/trunk/lib/ThreadRead.php 2009-12-23 19:51:38 UTC (rev 743)
@@ -72,7 +72,7 @@
) {
require_once P2_LIB_DIR . '/login2ch.func.php';
if (!login2ch()) {
- $this->getdat_error_msg_ht .= $this->get2chDatError();
+ $this->pushDownloadDatErrorMsgHtml($this->get2chDatError());
$this->diedat = true;
return false;
}
@@ -101,6 +101,14 @@
}
/**
+ * @return void
+ */
+ function pushDownloadDatErrorMsgHtml($getdat_error_msg_ht)
+ {
+ $this->getdat_error_msg_ht .= $getdat_error_msg_ht;
+ }
+
+ /**
* HTTPƒwƒbƒ_ƒŒƒXƒ|ƒ“ƒX‚ð“Ç‚Ýž‚Þ
*
* @access private
@@ -474,7 +482,7 @@
{
// 2ch, bbspink, vip2ch.com ‚È‚çread.cgi‚ÅŠm”F
if (P2Util::isHost2chs($this->host) || P2Util::isHostVip2ch($this->host)) {
- $this->getdat_error_msg_ht .= $this->get2chDatError($reason);
+ $this->pushDownloadDatErrorMsgHtml($this->get2chDatError($reason));
}
$this->diedat = true;
}
@@ -647,7 +655,7 @@
file_exists($this->keydat) and unlink($this->keydat);
rename($this->keydat . ".bak", $this->keydat);
}
- $this->getdat_error_msg_ht .= "<p>p2 info - 2‚¿‚á‚ñ‚Ë‚é‰ß‹ŽƒƒO‘qŒÉ‚©‚ç‚̃XƒŒƒbƒhŽæ‚èž‚Ý‚ÍAPHP‚Ì<a href=\"http://www.php.net/manual/ja/ref.zlib.php\">zlibŠg’£ƒ‚ƒWƒ…[ƒ‹</a>‚ª‚È‚¢‚©Asystem‚ÅgzipƒRƒ}ƒ“ƒh‚ªŽg—p‰Â”\‚Å‚È‚¯‚ê‚΂ł«‚Ü‚¹‚ñB</p>";
+ $this->pushDownloadDatErrorMsgHtml("<p>p2 info - 2‚¿‚á‚ñ‚Ë‚é‰ß‹ŽƒƒO‘qŒÉ‚©‚ç‚̃XƒŒƒbƒhŽæ‚èž‚Ý‚ÍAPHP‚Ì<a href=\"http://www.php.net/manual/ja/ref.zlib.php\">zlibŠg’£ƒ‚ƒWƒ…[ƒ‹</a>‚ª‚È‚¢‚©Asystem‚ÅgzipƒRƒ}ƒ“ƒh‚ªŽg—p‰Â”\‚Å‚È‚¯‚ê‚΂ł«‚Ü‚¹‚ñB</p>");
// gztempƒtƒ@ƒCƒ‹‚ðŽÌ‚Ä‚é
file_exists($gztempfile) and unlink($gztempfile);
@@ -747,7 +755,7 @@
),
'Ď擾‚ðŽŽ‚Ý‚é'
);
- $this->getdat_error_msg_ht .= "<p>p2 info - œID‚ł̃XƒŒƒbƒhŽæ“¾‚ÉŽ¸”s‚µ‚Ü‚µ‚½B[{$remarutori_atag}]</p>";
+ $this->pushDownloadDatErrorMsgHtml("<p>p2 info - œID‚ł̃XƒŒƒbƒhŽæ“¾‚ÉŽ¸”s‚µ‚Ü‚µ‚½B[{$remarutori_atag}]</p>");
$this->diedat = true;
return false;
}
@@ -900,7 +908,7 @@
// Ž¸”s‚È‚çƒoƒbƒNƒAƒbƒv–ß‚·
rename($this->keydat . ".bak", $this->keydat);
}
- $this->getdat_error_msg_ht .= "<p>p2 info - 2‚¿‚á‚ñ‚Ë‚é‰ß‹ŽƒƒO‘qŒÉ‚©‚ç‚̃XƒŒƒbƒhŽæ‚èž‚Ý‚ÍAPHP‚Ì<a href=\"http://www.php.net/manual/ja/ref.zlib.php\">zlibŠg’£ƒ‚ƒWƒ…[ƒ‹</a>‚ª‚È‚¢‚©Asystem‚ÅgzipƒRƒ}ƒ“ƒh‚ªŽg—p‰Â”\‚Å‚È‚¯‚ê‚΂ł«‚Ü‚¹‚ñB</p>";
+ $this->pushDownloadDatErrorMsgHtml("<p>p2 info - 2‚¿‚á‚ñ‚Ë‚é‰ß‹ŽƒƒO‘qŒÉ‚©‚ç‚̃XƒŒƒbƒhŽæ‚èž‚Ý‚ÍAPHP‚Ì<a href=\"http://www.php.net/manual/ja/ref.zlib.php\">zlibŠg’£ƒ‚ƒWƒ…[ƒ‹</a>‚ª‚È‚¢‚©Asystem‚ÅgzipƒRƒ}ƒ“ƒh‚ªŽg—p‰Â”\‚Å‚È‚¯‚ê‚΂ł«‚Ü‚¹‚ñB</p>");
// gztempƒtƒ@ƒCƒ‹‚ðŽÌ‚Ä‚é
file_exists($gztempfile) and unlink($gztempfile);
$this->diedat = true;
@@ -954,8 +962,8 @@
);
$kakolog_ht = "<p>{$atag}</p>";
}
- $this->getdat_error_msg_ht .= "<p>p2 info - 2‚¿‚á‚ñ‚Ë‚é‰ß‹ŽƒƒO‘qŒÉ‚©‚ç‚̃XƒŒƒbƒhŽæ‚èž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½B</p>";
- $this->getdat_error_msg_ht .= $kakolog_ht;
+ $this->pushDownloadDatErrorMsgHtml("<p>p2 info - 2‚¿‚á‚ñ‚Ë‚é‰ß‹ŽƒƒO‘qŒÉ‚©‚ç‚̃XƒŒƒbƒhŽæ‚èž‚Ý‚ÉŽ¸”s‚µ‚Ü‚µ‚½B</p>");
+ $this->pushDownloadDatErrorMsgHtml($kakolog_ht);
$this->diedat = true;
}
@@ -1388,7 +1396,7 @@
{
// 2ch, bbspink ‚È‚çread.cgi‚ÅŠm”F
if (P2Util::isHost2chs($this->host)) {
- $this->getdat_error_msg_ht .= $this->get2chDatError();
+ $this->pushDownloadDatErrorMsgHtml($this->get2chDatError());
}
$this->diedat = true;
}
Modified: p2/trunk/lib/downloadDatMachiBbs.func.php
===================================================================
--- p2/trunk/lib/downloadDatMachiBbs.func.php 2009-12-21 15:30:53 UTC (rev 742)
+++ p2/trunk/lib/downloadDatMachiBbs.func.php 2009-12-23 19:51:38 UTC (rev 743)
@@ -58,7 +58,7 @@
// i‚Ü‚¿BBSj<html>error</html>
if (trim($mlines[0]) == '<html>error</html>') {
- $ThreadRead->getdat_error_msg_ht .= 'error';
+ $ThreadRead->pushDownloadDatErrorMsgHtml('error' . '<br>');
$ThreadRead->diedat = true;
return false;
}
Modified: p2/trunk/lib/downloadDatShitaraba.func.php
===================================================================
--- p2/trunk/lib/downloadDatShitaraba.func.php 2009-12-21 15:30:53 UTC (rev 742)
+++ p2/trunk/lib/downloadDatShitaraba.func.php 2009-12-23 19:51:38 UTC (rev 743)
@@ -71,7 +71,7 @@
/*
// iJBBSjERROR!: ƒXƒŒƒbƒh‚ª‚ ‚è‚Ü‚¹‚ñB‰ß‹ŽƒƒO‘qŒÉ‚É‚à‚ ‚è‚Ü‚¹‚ñB
if (preg_match("/^ERROR.*$/i", $mlines[0], $matches)) {
- $ThreadRead->getdat_error_msg_ht .= $matches[0];
+ $ThreadRead->pushDownloadDatErrorMsgHtml($matches[0]);
$ThreadRead->diedat = true;
return false;
}