svnno****@sourc*****
svnno****@sourc*****
2013年 5月 24日 (金) 15:04:43 JST
Revision: 945
http://sourceforge.jp/projects/p2-php/scm/svn/commits/945
Author: akid
Date: 2013-05-24 15:04:43 +0900 (Fri, 24 May 2013)
Log Message:
-----------
p2/ for version 1.8.86
Modified Paths:
--------------
p2/trunk/lib/downloadDatMachiBbs.func.php
-------------- next part --------------
Modified: p2/trunk/lib/downloadDatMachiBbs.func.php
===================================================================
--- p2/trunk/lib/downloadDatMachiBbs.func.php 2013-05-24 05:58:32 UTC (rev 944)
+++ p2/trunk/lib/downloadDatMachiBbs.func.php 2013-05-24 06:04:43 UTC (rev 945)
@@ -124,14 +124,14 @@
}
if ($tuduku) {
- if (preg_match('~^ \\]</font><br><dd>(.*) <br><br>$~i', $ml, $matches)) {
+ if (preg_match('~^ \\]</font><br><dd>(.*) ?<br><br>$~i', $ml, $matches)) {
$body = $matches[1];
} else {
$tuduku = false;
continue;
}
- } elseif (preg_match('~^<dt>(?:<a[^>]+?>)?(\d+)(?:</a>)? \x96\xBC\x91O\x81F(?:<font color="#.+?">)?(?:<a href="mailto:(.*)">)?<b> (.+) </b>(?:</a>)?(?:</font>)? ?\x93\x8A\x8De\x93\xFA\x81F (.+)<br><dd>(.*) <br><br>$~i', $ml, $matches)) {
+ } elseif (preg_match('~^<dt>(?:<a[^>]+?>)?(\d+)(?:</a>)? \x96\xBC\x91O\x81F(?:<font color="#.+?">)?(?:<a href="mailto:(.*)">)?<b> (.+) </b>(?:</a>)?(?:</font>)? ?\x93\x8A\x8De\x93\xFA\x81F (.+)<br><dd>(.*) ?<br><br>$~i', $ml, $matches)) {
$order = $matches[1];
$mail = $matches[2];
$name = preg_replace('~<font color="?#.+?"?>(.+)</font>~i', '$1', $matches[3]);
@@ -139,7 +139,7 @@
$body = $matches[5];
// IP\x95t\x82̏ꍇ\x82\xCD2\x8Ds\x82ɓn\x82\xE9
- } elseif (preg_match('~^<dt>(?:<a[^>]+?>)?(\d+)(?:</a>)? \x96\xBC\x91O\x81F(?<font color="#.+?">)?(?:<a href="mailto:(.*)">)?<b> (.+) </b>(?:</a>)?(?:</font>)? ?\x93\x8A\x8De\x93\xFA\x81F (.+) <font size=1>\[(.*)$~i', $ml, $matches)) {
+ } elseif (preg_match('~^<dt>(?:<a[^>]+?>)?(\d+)(?:</a>)? \x96\xBC\x91O\x81F(?:<font color="#.+?">)?(?:<a href="mailto:(.*)">)?<b> (.+) </b>(?:</a>)?(?:</font>)? ?\x93\x8A\x8De\x93\xFA\x81F (.+) <font size=1>\[(.*)$~i', $ml, $matches)) {
$order = $matches[1];
$mail = $matches[2];
$name = preg_replace('~<font color="?#.+?"?>(.+)</font>~i', '$1', $matches[3]);