svnno****@sourc*****
svnno****@sourc*****
2013年 12月 12日 (木) 23:10:20 JST
Revision: 969
http://sourceforge.jp/projects/p2-php/scm/svn/commits/969
Author: akid
Date: 2013-12-12 23:10:19 +0900 (Thu, 12 Dec 2013)
Log Message:
-----------
p2/ for version 1.8.94
Modified Paths:
--------------
p2/trunk/conf/conf_admin.inc.php
p2/trunk/conf/conf_system.inc.php
p2/trunk/doc/ChangeLog.txt
p2/trunk/lib/ThreadRead.php
-------------- next part --------------
Modified: p2/trunk/conf/conf_admin.inc.php
===================================================================
--- p2/trunk/conf/conf_admin.inc.php 2013-12-11 23:14:45 UTC (rev 968)
+++ p2/trunk/conf/conf_admin.inc.php 2013-12-12 14:10:19 UTC (rev 969)
@@ -53,6 +53,7 @@
// }}}
// ----------------------------------------------------------------------
+$_conf['enable_shirokuma'] = 1; // \x81\x9CID\x82̑\xE3\x82\xED\x82\xE8\x82\xC9offlaw2.so\x82\xCCshiro=kuma\x82ʼnߋ\x8E\x83\x8D\x83O\x82\xF0\x8E擾\x81i\x82\xB7\x82\xE9:1, \x82\xB5\x82Ȃ\xA2:0\x81j
// \x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x8Fꍇ\x82́APHP\x82̐ݒ\xE8\x82\xC5 session.use_trans_sid \x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82邱\x82Ƃ𐄏\xA7\x81B
// \x81\xA6$_conf['use_session']\x82\xF00\x82ɂ\xB7\x82\xE9\x82\xC6docomo\x82̌ŗL\x92[\x96\x96\x94F\x8F͎g\x82\xA6\x82Ȃ\xAD\x82Ȃ\xE9\x82̂Œ\x8D\x88ӁB
Modified: p2/trunk/conf/conf_system.inc.php
===================================================================
--- p2/trunk/conf/conf_system.inc.php 2013-12-11 23:14:45 UTC (rev 968)
+++ p2/trunk/conf/conf_system.inc.php 2013-12-12 14:10:19 UTC (rev 969)
@@ -3,7 +3,7 @@
// \x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82́A\x93\xC1\x82ɗ\x9D\x97R\x82̖\xB3\x82\xA2\x8C\xC0\x82\xE8\x95ύX\x82\xB5\x82Ȃ\xA2\x82ʼn\xBA\x82\xB3\x82\xA2\x81B
// include from conf.inc.php
-$_conf['p2version'] = '1.8.92'; // rep2\x82̃o\x81[\x83W\x83\x87\x83\x93
+$_conf['p2version'] = '1.8.94'; // rep2\x82̃o\x81[\x83W\x83\x87\x83\x93
$_conf['p2name'] = 'rep2'; // rep2\x82̖\xBC\x91O\x81B
Modified: p2/trunk/doc/ChangeLog.txt
===================================================================
--- p2/trunk/doc/ChangeLog.txt 2013-12-11 23:14:45 UTC (rev 968)
+++ p2/trunk/doc/ChangeLog.txt 2013-12-12 14:10:19 UTC (rev 969)
@@ -1,4 +1,13 @@
2013/12/12
+ * rep2 version 1.8.94
+
+ [\x8DX\x90V] \x81\x9CID\x82̑\xE3\x82\xED\x82\xE8\x82\xC9offlaw2.so\x82\xCCshiro=kuma\x82ʼnߋ\x8E\x83\x8D\x83O\x82\xF0\x8E擾\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B
+ \x81ihttp://qb5.2ch.net/test/read.cgi/operate/1381326468/76\x81j
+ \x81iconf_admin.inc.php \x82\xCC $_conf['enable_shirokuma'] \x82Őݒ\xE8\x95ύX\x81j
+
+ [\x8FC\x90\xB3] \x83o\x81[\x83W\x83\x87\x83\x93\x8BL\x8Dڂ\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+
+2013/12/12
* rep2 version 1.8.93
[\x8DX\x90V] \x82\xB5\x82\xBD\x82\xE7\x82Όf\x8E\xA6\x94‚̃h\x83\x81\x83C\x83\x93\x95ύX\x82ɑΉ\x9E\x82\xB5\x82\xBD\x81B\x81ijbbs.livedoor.jp \x81\xA8 jbbs.shitaraba.net\x81j
Modified: p2/trunk/lib/ThreadRead.php
===================================================================
--- p2/trunk/lib/ThreadRead.php 2013-12-11 23:14:45 UTC (rev 968)
+++ p2/trunk/lib/ThreadRead.php 2013-12-12 14:10:19 UTC (rev 969)
@@ -62,22 +62,22 @@
// 2ch bbspink\x81\x9C\x93ǂ\xDD
if (P2Util::isHost2chs($this->host) && !empty($_GET['maru'])) {
-
- // \x83\x8D\x83O\x83C\x83\x93\x82\xB5\x82ĂȂ\xAF\x82\xEA\x82\xCE or \x83\x8D\x83O\x83C\x83\x93\x8C\xE3\x81A24\x8E\x9E\x8AԈȏ\xE3\x8Co\x89߂\xB5\x82Ă\xA2\x82\xBD\x82玩\x93\xAE\x8Dă\x8D\x83O\x83C\x83\x93
- if (
- (!file_exists($_conf['sid2ch_php']) || !empty($_REQUEST['relogin2ch']))
- or (filemtime($_conf['sid2ch_php']) < time() - 60*60*24)
- ) {
- require_once P2_LIB_DIR . '/login2ch.func.php';
- if (!login2ch()) {
- $this->pushDownloadDatErrorMsgHtml($this->get2chDatError());
- $this->diedat = true;
- return false;
+ if (!$_conf['enable_shirokuma']) {
+ // \x83\x8D\x83O\x83C\x83\x93\x82\xB5\x82ĂȂ\xAF\x82\xEA\x82\xCE or \x83\x8D\x83O\x83C\x83\x93\x8C\xE3\x81A24\x8E\x9E\x8AԈȏ\xE3\x8Co\x89߂\xB5\x82Ă\xA2\x82\xBD\x82玩\x93\xAE\x8Dă\x8D\x83O\x83C\x83\x93
+ if (
+ (!file_exists($_conf['sid2ch_php']) || !empty($_REQUEST['relogin2ch']))
+ or (filemtime($_conf['sid2ch_php']) < time() - 60*60*24)
+ ) {
+ require_once P2_LIB_DIR . '/login2ch.func.php';
+ if (!login2ch()) {
+ $this->pushDownloadDatErrorMsgHtml($this->get2chDatError());
+ $this->diedat = true;
+ return false;
+ }
}
}
+ $this->downloadDat2chMaru($_conf['enable_shirokuma'] ? 'shirokuma' : null);
- $this->downloadDat2chMaru();
-
// 2ch\x82̉ߋ\x8E\x83\x8D\x83O\x91q\x8Cɓǂ\xDD
} elseif (!empty($_GET['kakolog']) && !empty($_GET['kakoget'])) {
if ($_GET['kakoget'] == 1) {
@@ -513,18 +513,29 @@
return false;
}
- include $_conf['sid2ch_php']; // $uaMona, $SID2ch \x82\xAA\x83Z\x83b\x83g\x82\xB3\x82\xEA\x82\xE9 @see login2ch()
- if (!$uaMona || !$SID2ch) {
- return false;
+ $p2ua = null;
+
+ // 2013/10/11 http://qb5.2ch.net/test/read.cgi/operate/1381326468/76
+ if ($type == 'shirokuma') {
+ $p2ua = P2Util::getP2UA($withMonazilla = true);
+ $url = sprintf('http://%s/test/offlaw2.so?shiro=kuma&bbs=%s&key=%s&sid=ERROR',
+ $this->host, $this->bbs, $this->key
+ );
+
+ } else {
+ include $_conf['sid2ch_php']; // $uaMona, $SID2ch \x82\xAA\x83Z\x83b\x83g\x82\xB3\x82\xEA\x82\xE9 @see login2ch()
+ if (!$uaMona || !$SID2ch) {
+ return false;
+ }
+
+ $p2ua = sprintf('%s (%s)', $uaMona, P2Util::getP2UA($withMonazilla = false));
+
+ // GET /test/offlaw.cgi?bbs=\x94–\xBC&key=\x83X\x83\x8C\x83b\x83h\x94ԍ\x86&sid=\x83Z\x83b\x83V\x83\x87\x83\x93ID HTTP/1.1
+ $url = sprintf('http://%s/test/offlaw.cgi/%s/%s/?raw=0.0&sid=%s',
+ $this->host, $this->bbs, $this->key, urlencode($SID2ch)
+ );
}
- $p2ua = sprintf('%s (%s)', $uaMona, P2Util::getP2UA($withMonazilla = false));
-
- // GET /test/offlaw.cgi?bbs=\x94–\xBC&key=\x83X\x83\x8C\x83b\x83h\x94ԍ\x86&sid=\x83Z\x83b\x83V\x83\x87\x83\x93ID HTTP/1.1
- $url = sprintf('http://%s/test/offlaw.cgi/%s/%s/?raw=0.0&sid=%s',
- $this->host, $this->bbs, $this->key, urlencode($SID2ch)
- );
-
$purl = parse_url($url);
$purl['query'] = isset($purl['query']) ? '?' . $purl['query'] : '';
@@ -1174,7 +1185,7 @@
UA::getQueryKey() => UA::getQueryValue()
)
),
- hs('\x81\x9CID\x82\xC5p2\x82Ɏ\xE6\x82荞\x82\xDE')
+ hs(sprintf('%s\x82\xC5p2\x82ɓǂݍ\x9E\x82\xDE', $_conf['enable_shirokuma'] ? 'shiro=kuma' : '\x81\x9CID'))
);
return "[$marutori_atag]";
}