svnno****@sourc*****
svnno****@sourc*****
2012年 2月 26日 (日) 14:08:22 JST
Revision: 928
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=928
Author: akid
Date: 2012-02-26 14:08:21 +0900 (Sun, 26 Feb 2012)
Log Message:
-----------
p2/ for version 1.8.74
Modified Paths:
--------------
p2/trunk/conf/conf.inc.php
p2/trunk/conf/conf_system.inc.php
p2/trunk/cookie.php
p2/trunk/doc/ChangeLog.txt
p2/trunk/edit_conf_user_i.php
p2/trunk/edit_indexmenui.php
p2/trunk/editfavita_i.php
p2/trunk/editpref_i.php
p2/trunk/info_i.php
p2/trunk/iphone/ShowThreadK.php
p2/trunk/iphone/index_print_k.inc.php
p2/trunk/iphone/post_form.inc.php
p2/trunk/iphone/post_form_popup.inc.php
p2/trunk/iphone/read_footer_k.inc.php
p2/trunk/iphone/read_header_k.inc.php
p2/trunk/iphone/sb_header_k.inc.php
p2/trunk/iui/iui.css
p2/trunk/lib/BbsMap.php
p2/trunk/lib/BrdMenu.php
p2/trunk/lib/HostCheck.php
p2/trunk/lib/Login.php
p2/trunk/lib/P2Util.php
p2/trunk/lib/P2View.php
p2/trunk/lib/ShowThread.php
p2/trunk/lib/ShowThreadPc.php
p2/trunk/lib/UA.php
p2/trunk/lib/login_first.inc.php
p2/trunk/lib/read_footer.inc.php
p2/trunk/lib/sb_header_k.inc.php
p2/trunk/login.php
p2/trunk/menu_i.php
p2/trunk/post_form_i.php
p2/trunk/read.php
p2/trunk/read_new.php
p2/trunk/read_new_i.php
Added Paths:
-----------
p2/trunk/iui/iui_wpie.css
-------------- next part --------------
Modified: p2/trunk/conf/conf.inc.php
===================================================================
--- p2/trunk/conf/conf.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/conf/conf.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -100,7 +100,7 @@
$_conf['k_filter_marker'] = null;
}
-_obStart();
+_obStart(); // \x83Z\x83b\x83V\x83\x87\x83\x93\x82\xCCoutput_add_rewrite_var()\x82\xE6\x82\xE8\x82\xE0\x90\xE6\x82ɍs\x82\xA4
//======================================================================
@@ -314,7 +314,7 @@
) {
//if (!defined('SID') || !strlen(SID)) {
if ($_conf['enable_ob_gzhandler'] != 2 || UA::isK()) {
- ob_start('ob_gzhandler');
+ ob_start('ob_gzhandler'); // \x93\xFC\x82\xEA\x8Eq\x82̈\xEA\x94ԊO\x91\xA4\x82Ŏ\xC0\x8Ds\x82\xB7\x82ׂ\xB5\x81B
}
//}
}
Modified: p2/trunk/conf/conf_system.inc.php
===================================================================
--- p2/trunk/conf/conf_system.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/conf/conf_system.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -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.73'; // rep2\x82̃o\x81[\x83W\x83\x87\x83\x93
+$_conf['p2version'] = '1.8.74'; // rep2\x82̃o\x81[\x83W\x83\x87\x83\x93
$_conf['p2name'] = 'rep2'; // rep2\x82̖\xBC\x91O\x81B
@@ -99,7 +99,7 @@
// 2010/06/09 cookie\x82\xC9b\x8Ew\x92\xE8\x82\xF0\x83Z\x83b\x83g\x82\xB5\x82Ă݂\xE9
if ($v = UA::getQueryValue()) {
- P2Util::setCookie(UA::getQueryKey(), $v);
+ P2Util::setCookie(UA::getQueryKey(), $v, 0);
}
// output_add_rewrite_var() \x82͕֗\x98\x82\xBE\x82\xAA\x81A\x8Fo\x97͂\xAA\x83o\x83b\x83t\x83@\x82\xB3\x82\xEA\x82đ̊\xB4\x91\xAC\x93x\x82\xAA\x97\x8E\x82\xBF\x82\xE9\x82̂\xAA\x93\xEF\x93_\x81B\x81B
@@ -575,6 +575,9 @@
// \x8B\xAD\x90\xA7\x8Cg\x91уr\x83\x85\x81[\x8Ew\x92\xE8\x81ib=k\x81j
} elseif (UA::isMobileByQuery()) {
$_conf['ktai'] = true;
+
+ } elseif (UA::isK()) {
+ $_conf['ktai'] = true;
}
// \x81\xABk_at_a, k_at_q, k_input_ht \x82͎g\x82\xED\x82Ȃ\xA2\x95\xFB\x8C\xFC\x81B
Modified: p2/trunk/cookie.php
===================================================================
--- p2/trunk/cookie.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/cookie.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -22,8 +22,8 @@
function _getCookieLocationUri()
{
$qs = array(
- 'check_regist_cookie' => '1',
- 'regist_cookie' => intval(geti($_REQUEST['regist_cookie'])),
+ 'check_register_cookie' => '1',
+ 'register_cookie' => intval(geti($_REQUEST['register_cookie'])),
UA::getQueryKey() => UA::getQueryValue()
);
if (defined('SID') && strlen(SID)) {
Modified: p2/trunk/doc/ChangeLog.txt
===================================================================
--- p2/trunk/doc/ChangeLog.txt 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/doc/ChangeLog.txt 2012-02-26 05:08:21 UTC (rev 928)
@@ -1,3 +1,16 @@
+2012/02/26
+ * rep2 version 1.8.74
+
+ [\x8FC\x90\xB3] \x8DŋߓǂX\x83\x8C\x82\xAA\x90\xB3\x8F\xED\x82ɋL\x98^\x82\xB3\x82\xEA\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xC1\x82\xBD\x82̂\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B\x81i\x93\xAF\x88\xEAkey\x82̃X\x83\x8C\x81j
+ [\x8FC\x90\xB3] iPhone\x97pCSS\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+ [\x8DX\x90V] \x8Cg\x91т\xCCIP\x83A\x83h\x83\x8C\x83X\x91ш\xE6\x82\xF0\x8DX\x90V
+ [\x8DX\x90V] Android\x94\xC5Firefox\x82ł̕\\x8E\xA6\x82\xAE\x82\xB5\x82\xBD\x81B\x81\xAB\x8F\xEE\x95\xD3
+ http://anago.2ch.net/test/read.cgi/software/1327333606/93
+ http://anago.2ch.net/test/read.cgi/software/1327333606/100
+ [\x8DX\x90V] Android\x82\xC5YouTube\x82̃T\x83\x80\x83l\x83C\x83\x8B\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B
+ [\x8DX\x90V] \x95\\x8E\xA6\x83\x82\x81[\x83h\x8Ew\x92\xE8\x81i\x88\xF8\x90\x94b=X\x81j\x82\xCCcookie\x97L\x8C\xF8\x8A\xFA\x8C\xC0\x82\xF0\x83Z\x83b\x83V\x83\x87\x83\x93\x92\x86\x82݂̂ɕύX\x82\xB5\x82\xBD\x81B
+ [\x8DX\x90V] \x82\xBB\x82̑\xBC\x81A\x8Dׂ\xA9\x82ȍX\x90V\x81B
+
2011/10/01
* rep2 version 1.8.73
Modified: p2/trunk/edit_conf_user_i.php
===================================================================
--- p2/trunk/edit_conf_user_i.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/edit_conf_user_i.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -97,14 +97,16 @@
?>
<html lang="ja">
<head>
- <?php P2View::printExtraHeadersHtml(); ?>
- <script type="text/javascript" src="./iui/smooth.pack.js"></script>
-<style type="text/css" media="screen">@import "./iui/iui.css";
-body{background:url(iui/pinstripes.png)}input,select {float: right;}
+<?php P2View::printExtraHeadersHtml(); ?>
+<script type="text/javascript" src="./iui/smooth.pack.js"></script>
+<?php P2View::printStyleTagImportIuiCss(); ?>
+<style type="text/css" media="screen">
+body{ background:url(iui/pinstripes.png); }
+input,select{ float: right; }
</style>
- <title><?php eh($ptitle); ?></title>
+<title><?php eh($ptitle); ?></title>
+</head>
-</head>
<body onLoad="top.document.title=self.document.title;">
<div class="toolbar">
<h1 id="pageTitle"><?php eh($ptitle); ?></h1>
Modified: p2/trunk/edit_indexmenui.php
===================================================================
--- p2/trunk/edit_indexmenui.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/edit_indexmenui.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -55,7 +55,7 @@
?>
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
-<style type="text/css" media="screen">@import "./iui/iui.css";</style>
+<?php P2View::printStyleTagImportIuiCss(); ?>
</head>
<body<?php echo $body_at; ?>>
<?php
Modified: p2/trunk/editfavita_i.php
===================================================================
--- p2/trunk/editfavita_i.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/editfavita_i.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -50,9 +50,8 @@
<head>
<?php
P2View::printExtraHeadersHtml();
-?>
- <style type="text/css" media="screen">@import "./iui/iui.css";</style>
- <title>p2 - \x82\xA8\x8BC\x82ɔ‚̕\xC0\x82ёւ\xA6</title>
+P2View::printStyleTagImportIuiCss(); ?>
+<title>p2 - \x82\xA8\x8BC\x82ɔ‚̕\xC0\x82ёւ\xA6</title>
<script type="text/javascript" src="js/yui/YAHOO.js" ></script>
<script type="text/javascript" src="js/yui/log.js" ></script>
<script type="text/javascript" src="js/yui/event.js" ></script>
Modified: p2/trunk/editpref_i.php
===================================================================
--- p2/trunk/editpref_i.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/editpref_i.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -98,9 +98,9 @@
?>
<html lang="ja">
<head>
- <?php P2View::printExtraHeadersHtml(); ?>
- <style type="text/css" media="screen">@import "./iui/iui.css";</style>
- <title><?php eh($ptitle); ?></title>
+<?php P2View::printExtraHeadersHtml(); ?>
+<?php P2View::printStyleTagImportIuiCss(); ?>
+<title><?php eh($ptitle); ?></title>
<?php
if (!$_conf['ktai']) {
Modified: p2/trunk/info_i.php
===================================================================
--- p2/trunk/info_i.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/info_i.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -264,8 +264,8 @@
<head>
<?php
P2View::printExtraHeadersHtml();
+P2View::printStyleTagImportIuiCss();
echo <<<EOHEADER
- <link rel="stylesheet" type="text/css" href="./iui/iui.css">
<title>{$hs['title']}</title>\n
EOHEADER;
Modified: p2/trunk/iphone/ShowThreadK.php
===================================================================
--- p2/trunk/iphone/ShowThreadK.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/iphone/ShowThreadK.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -1288,9 +1288,9 @@
return false;
}
+
/**
* YouTube\x83\x8A\x83\x93\x83N\x95ϊ\xB7\x83v\x83\x89\x83O\x83C\x83\x93
- * [wish] YouTube API\x82𗘗p\x82\xB5\x82āA\x89摜\x83T\x83\x80\x83l\x83C\x83\x8B\x82݂̂ɂ\xB5\x82\xBD\x82\xA2
*
* @access private
* @return string|false
@@ -1299,27 +1299,33 @@
{
global $_conf;
- // Android\x82\xCD youtube:\x83\x8A\x83\x93\x83N\x82ɔ\xF1\x91Ή\x9E
- if (UA::isAndroidWebKit()) {
- return false;
- }
-
// http://www.youtube.com/watch?v=Mn8tiFnAUAI
// http://m.youtube.com/watch?v=OhcX0xJsDK8&client=mv-google&gl=JP&hl=ja&guid=ON&warned=True
if (preg_match('{^http://(www|jp|m)\\.youtube\\.com/watch\\?(?:.+&)?v=([0-9a-zA-Z_\\-]+)}', $url, $m)) {
+ $videoid = $m[2];
/*
if ($m[1] == 'm') {
- $url = "http://www.youtube.com/watch?v={$m[2]}";
+ $url = "http://www.youtube.com/watch?v={$videoid}";
}
$url = P2Util::throughIme($url);
*/
+ $linkUri = $url;
+ /*
+ if (UA::isAndroidWebKit()) {
+ $linkUri = $url;
+ } else {
+ $linkUri = 'youtube:' . $videoid;
+ }
+ */
+ $thumbnailUri = $this->getYouTubeThumbnailUri($videoid);
return sprintf(
- '<a href="youtube:%s"><img src="http://i.ytimg.com/vi/%s/default.jpg">%s</a><br>',
- hs($m[2]), hs($m[2]), $html
+ '<a href="%s"><img src="%s">%s</a><br>',
+ hs($linkUri), hs($thumbnailUri), $html
);
}
return false;
}
+
// }}}
/**
Modified: p2/trunk/iphone/index_print_k.inc.php
===================================================================
--- p2/trunk/iphone/index_print_k.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/iphone/index_print_k.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -96,16 +96,16 @@
}
// -->
</script>
-<style type="text/css" media="screen">@import "./iui/iui.css";</style>
- <title><?php eh($ptitle); ?></title>
+<? P2View::printStyleTagImportIuiCss(); ?>
+<title><?php eh($ptitle); ?></title>
</head>
<body>
- <div class="toolbar">
-<h1 id="pageTitle"><?php eh($ptitle); ?></h1>
- <a class="button" href="<?php eh($narabikae_uri); ?>">\x95\xC0\x91\xD6</a>
- </div>
- <ul id="home">
- <li class="group">\x83\x81\x83j\x83\x85\x81[</li>
+<div class="toolbar">
+ <h1 id="pageTitle"><?php eh($ptitle); ?></h1>
+ <a class="button" href="<?php eh($narabikae_uri); ?>">\x95\xC0\x91\xD6</a>
+</div>
+<ul id="home">
+ <li class="group">\x83\x81\x83j\x83\x85\x81[</li>
<?php
P2Util::printInfoHtml();
Modified: p2/trunk/iphone/post_form.inc.php
===================================================================
--- p2/trunk/iphone/post_form.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/iphone/post_form.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -66,7 +66,7 @@
</form>\n
EOP;
-if (!$_conf['ktai']) {
+if (!UA::isK()) {
$htm['post_form'] .= <<<EOP
<script type="text/javascript">
<!--
Modified: p2/trunk/iphone/post_form_popup.inc.php
===================================================================
--- p2/trunk/iphone/post_form_popup.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/iphone/post_form_popup.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -70,7 +70,7 @@
EOP;
-if (!$_conf['ktai']) {
+if (!UA::isK()) {
$htm['post_form'] .= <<<EOP
<script type="text/javascript">
<!--
Modified: p2/trunk/iphone/read_footer_k.inc.php
===================================================================
--- p2/trunk/iphone/read_footer_k.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/iphone/read_footer_k.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -80,8 +80,8 @@
<li class="home"><a href="<?php eh($index_uri); ?>">TOP</a></li>
<?php echo $read_navi_previous_tab_ht; ?>
<?php echo $new_btm_ht; ?>
- <li class="res" id="writeId" title="off"><a onclick="popUpFootbarFormIPhone(1); all.item('footbar02').style.visibility='hidden';">\x8F\x91\x82\xAB\x8D\x9E\x82\xDD</a></li>
- <li class="other"><a onclick="all.item('footbar02').style.visibility='visible'; popUpFootbarFormIPhone(0, 1);popUpFootbarFormIPhone(1, 1);">\x82\xBB\x82̑\xBC</a></li>
+ <li class="res" id="writeId" title="off"><a onclick="popUpFootbarFormIPhone(1); document.getElementById('footbar02').style.visibility='hidden';">\x8F\x91\x82\xAB\x8D\x9E\x82\xDD</a></li>
+ <li class="other"><a onclick="document.getElementById('footbar02').style.visibility='visible'; popUpFootbarFormIPhone(0, 1);popUpFootbarFormIPhone(1, 1);">\x82\xBB\x82̑\xBC</a></li>
<?php echo $read_navi_next_btm_tab_ht; ?>
</ul>
</div>
@@ -90,9 +90,9 @@
<div id="footbar02" class="dialog_other">
<filedset>
<ul>
- <li class="whiteButton" id="serchId" title="off" onclick="popUpFootbarFormIPhone(0); all.item('footbar02').style.visibility='hidden'">\x83\x8C\x83X\x8C\x9F\x8D\xF5</li>
+ <li class="whiteButton" id="serchId" title="off" onclick="popUpFootbarFormIPhone(0); document.getElementById('footbar02').style.visibility='hidden'">\x83\x8C\x83X\x8C\x9F\x8D\xF5</li>
<?php echo $toolbar_right_ht; ?>
- <li class="grayButton" onclick="all.item('footbar02').style.visibility='hidden'">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li>
+ <li class="grayButton" onclick="document.getElementById('footbar02').style.visibility='hidden'">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li>
</ul>
</filedset>
</div>
Modified: p2/trunk/iphone/read_header_k.inc.php
===================================================================
--- p2/trunk/iphone/read_header_k.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/iphone/read_header_k.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -326,7 +326,7 @@
+ "rescount=" + document.frmresrange.rescount.value + "&"
+ "ttitle_en=" + document.frmresrange.ttitle_en.value + "&"
+ "ls=" + document.frmresrange.ls.value + "&";
- document.frmresrange.reset();
+ //document.frmresrange.reset();
window.location.assign(uriValue);
}
// -->
@@ -398,7 +398,7 @@
echo "<span class=\"setfav\" style=\"white-space: nowrap;\"><a class=\"favbutton\" href=\"info_i.php?host={$aThread->host}{$bbs_q}{$key_q}{$ttitle_en_q}{$setfav_q}{$sid_q}\" target=\"info\" onClick=\"return setFavJs('host={$aThread->host}{$bbs_q}{$key_q}{$ttitle_en_q}{$sid_q}', '{$favvalue}', {$STYLE['info_pop_size']}, 'read', this);\" accesskey=\"f\" title=\"{$favtitle}\">{$favmark}</a></span>";
echo <<< EOP
-<a class="button" href="javascript:window.scrollBy(0, document.height)" target="_self">\x81\xA5</a>
+<a class="button" href="javascript:window.scrollBy(0, document.documentElement.clientHeight)" target="_self">\x81\xA5</a>
</div>
EOP;
Modified: p2/trunk/iphone/sb_header_k.inc.php
===================================================================
--- p2/trunk/iphone/sb_header_k.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/iphone/sb_header_k.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -37,7 +37,7 @@
$ptitle_url = $ptitle_url . 'index2.html';
// PC
- } elseif (empty($_conf['ktai'])) {
+ } elseif (UA::isPC()) {
$ptitle_url = "http://{$aThreadList->host}/{$aThreadList->bbs}/i/";
// \x8Cg\x91\xD1
} else {
@@ -135,8 +135,7 @@
<head>
<?php
P2View::printExtraHeadersHtml();
-?>
-<style type="text/css" media="screen">@import "./iui/iui.css";</style>
+P2View::printStyleTagImportIuiCss(); ?>
<script type="text/javascript" src="iphone/js/setfavjs.iphone.js?v=20061206"></script>
<script type="text/javascript" src="js/basic.js?v=20090429"></script>
Modified: p2/trunk/iui/iui.css
===================================================================
--- p2/trunk/iui/iui.css 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/iui/iui.css 2012-02-26 05:08:21 UTC (rev 928)
@@ -6,13 +6,6 @@
\x89\xA1\x83u\x83\x8C\x96h\x8E~\x81A\x83t\x83H\x81[\x83\x80\x83{\x83^\x83\x93\x97p
*/
-/* for Windows Phone IE Mobile */
-* {
- margin: 0;
- padding: 0;
- border: 0;
-}
-
body {
margin: 0;
font-family: Helvetica;
@@ -23,6 +16,11 @@
-webkit-text-size-adjust: none;
}
+/* http://anago.2ch.net/test/read.cgi/software/1327333606/93 */
+pre {
+ white-space: pre-wrap;
+}
+
body > *:not(.toolbar) {
/*display: none;
position: absolute;
Added: p2/trunk/iui/iui_wpie.css
===================================================================
--- p2/trunk/iui/iui_wpie.css (rev 0)
+++ p2/trunk/iui/iui_wpie.css 2012-02-26 05:08:21 UTC (rev 928)
@@ -0,0 +1,6 @@
+/* for Windows Phone IE Mobile */
+* {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
Modified: p2/trunk/lib/BbsMap.php
===================================================================
--- p2/trunk/lib/BbsMap.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/BbsMap.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -274,7 +274,7 @@
{
global $_conf;
- $noMsg = $_conf['ktai'] ? true : false;
+ $noMsg = UA::isK() ? true : false;
BbsMap::syncBrd($_conf['favita_path'], $noMsg);
BbsMap::syncIdx($_conf['favlist_file'], $noMsg);
Modified: p2/trunk/lib/BrdMenu.php
===================================================================
--- p2/trunk/lib/BrdMenu.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/BrdMenu.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -129,7 +129,7 @@
$GLOBALS['ita_mikke']['itaj_en'] = $aBrdMenuIta->itaj_en;
// \x83}\x81[\x83L\x83\x93\x83O
- if ($_conf['ktai'] && is_string($_conf['k_filter_marker'])) {
+ if (UA::isK() && is_string($_conf['k_filter_marker'])) {
$aBrdMenuIta->itaj_ht = StrCtl::filterMarking($GLOBALS['word_fm'], $aBrdMenuIta->itaj, $_conf['k_filter_marker']);
} else {
$aBrdMenuIta->itaj_ht = StrCtl::filterMarking($GLOBALS['word_fm'], $aBrdMenuIta->itaj);
@@ -142,7 +142,7 @@
// \x8C\x9F\x8D\x{142A8C}\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xAD\x82āA\x82\xB3\x82\xE7\x82Ɍg\x91т̎\x9E
} else {
- if ($_conf['ktai']) {
+ if (UA::isK()) {
continue;
}
}
Modified: p2/trunk/lib/HostCheck.php
===================================================================
--- p2/trunk/lib/HostCheck.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/HostCheck.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -196,7 +196,7 @@
|| ( $flag == $_HOSTCHKCONF['host_type']['custom'] && $custom && HostCheck::isAddrInBand($custom) )
|| ( $flag == $_HOSTCHKCONF['host_type']['docomo'] && HostCheck::isAddrDocomo() )
|| ( $flag == $_HOSTCHKCONF['host_type']['au'] && HostCheck::isAddrAu() )
- || ( $flag == $_HOSTCHKCONF['host_type']['SoftBank'] && HostCheck::isAddrSoftBank() )
+ || ( $flag == $_HOSTCHKCONF['host_type']['SoftBank'] && (HostCheck::isAddrSoftBank() || HostCheck::isAddrSoftBankPcSiteBrowser()) )
|| ( $flag == $_HOSTCHKCONF['host_type']['AirH'] && HostCheck::isAddrWillcom() )
|| ( $flag == $_HOSTCHKCONF['host_type']['iPhone'] && HostCheck::isAddrIPhone() )
) {
@@ -483,7 +483,7 @@
//$regHost = '/^wb\d+proxy\d\d\.ezweb\.ne\.jp$/';
$regHost = '/\.ezweb\.ne\.jp$/';
- // @updated 2011/05/31
+ // @updated 2012/02/26
$bands = array(
// EZ\x8C\x93PCSV
'111.107.116.0/26',
@@ -548,6 +548,7 @@
'111.86.140.52/30',
'111.86.140.56/30',
'111.86.140.60/30',
+ '111.87.241.128/28'
*/
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
@@ -569,19 +570,23 @@
}
// 2007/11/09 .jp-k.ne.jp/.jp-c.ne.jp/.jp-t.ne.jp/.jp-q.ne.jp/.softbank.ne.jp
- $regHost = '/\.(jp-[kctq]|\.softbank|pcsitebrowser)\.ne\.jp$/';
+ $regHost = '/\.(jp-[kctq]|\.softbank)\.ne\.jp$/';
- // 2010\x94N4\x8C\x8E16\x93\xFA\x8C\xBB\x8D\xDD
+ // 2012/02/26
$bands = array(
- '123.108.237.0/27',
- '202.253.96.224/27',
- '210.146.7.192/26',
-
- // PC\x83T\x83C\x83g\x83u\x83\x89\x83E\x83U
- '123.108.237.224/27',
- '202.253.96.0/27',
+ // 2012\x94N5\x8C\x8E\x92\x86\x8F{\x88ȍ~
+ '123.108.237.112/28',
+ '123.108.239.224/28',
+ '202.253.96.144/28',
+ '202.253.99.144/28',
+ '210.228.189.188/30',
- //'210.146.60.128/25', // \x94\xF1\x8C\x{18EB82}Ȃ\xAA\x82\xE7\x92lj\xC1
+ // 2012\x94N7\x8C\x8E\x89\xBA\x8F{\x82܂\xC5
+ '123.108.237.0/27',
+ '202.253.96.224/27',
+ '210.146.7.192/26'
+
+ // pcsitebrowser\x82͊܂܂Ȃ\xA2
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
}
@@ -604,11 +609,18 @@
// ml7ts005v11c.pcsitebrowser.ne.jp
$regHost = '/\.(pcsitebrowser)\.ne\.jp$/';
- // 2011/05/01
+ //
$bands = array(
- // PC\x83T\x83C\x83g\x83u\x83\x89\x83E\x83U
+ // PC\x83T\x83C\x83g\x83u\x83\x89\x83E\x83U\x81imobile_ip_diff.pl\x82ł͏E\x82\xC1\x82Ă\xB1\x82Ȃ\xA2\x81j
+ // 2012\x94N5\x8C\x8E\x92\x86\x8F{\x88ȍ~
+ '123.108.237.128/28',
+ '123.108.239.240/28',
+ '202.253.96.160/28',
+ '202.253.99.160/28',
+ '210.228.189.196/30',
+ // \x81`2012\x94N7\x8C\x8E\x89\xBA\x8F{\x82܂\xC5
'123.108.237.224/27',
- '202.253.96.0/27',
+ '202.253.96.0/27'
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
}
@@ -630,8 +642,11 @@
//$regHost = '/\.panda-world\.ne\.jp$/';
// \x8C\x{18EB94}\xAD\x95\\x83f\x81[\x83^\x82ł͂Ȃ\xA2
- // @updated 2011/05/28
+ // @updated 2011/10/15
$bands = array(
+ '126.95.0.0/16',
+ '126.140.0.0/16',
+ '126.141.0.0/16',
'126.142.0.0/16',
'126.143.0.0/16',
'126.144.0.0/16',
@@ -643,6 +658,7 @@
'126.150.0.0/16',
'126.151.0.0/16',
'126.152.0.0/16',
+ '126.153.0.0/16',
'126.154.0.0/15',
'126.156.0.0/14',
'126.160.0.0/12',
@@ -673,7 +689,7 @@
$regHost = '/^[Pp]\d{12}\.ppp\.prin\.ne\.jp$/';
- // @updated 2010/10/06
+ // @updated 2012/02/26
$bands = array(
'61.198.128.0/24',
'61.198.129.0/24',
@@ -685,10 +701,6 @@
'61.198.135.0/24',
'61.198.136.0/24',
'61.198.137.0/24',
- '61.198.138.100/32',
- '61.198.138.101/32',
- '61.198.138.102/32',
- '61.198.138.103/32',
'61.198.139.0/29',
'61.198.139.128/27',
'61.198.139.160/28',
@@ -751,6 +763,28 @@
'114.20.65.0/24',
'114.20.66.0/24',
'114.20.67.0/24',
+ '114.21.128.0/24',
+ '114.21.129.0/24',
+ '114.21.130.0/24',
+ '114.21.131.0/24',
+ '114.21.132.0/24',
+ '114.21.133.0/24',
+ '114.21.134.0/24',
+ '114.21.135.0/24',
+ '114.21.136.0/24',
+ '114.21.137.0/24',
+ '114.21.138.0/24',
+ '114.21.139.0/24',
+ '114.21.140.0/24',
+ '114.21.141.0/24',
+ '114.21.142.0/24',
+ '114.21.143.0/24',
+ '114.21.144.0/24',
+ '114.21.145.0/24',
+ '114.21.146.0/24',
+ '114.21.147.0/24',
+ '114.21.148.0/24',
+ '114.21.149.0/24',
'125.28.0.0/24',
'125.28.1.0/24',
'125.28.15.0/24',
@@ -771,6 +805,7 @@
'210.169.97.0/24',
'210.169.98.0/24',
'210.169.99.0/24',
+ '210.255.190.0/24',
'211.126.192.128/25',
'211.18.232.0/24',
'211.18.233.0/24',
@@ -818,7 +853,6 @@
'114.21.147.0/24',
'114.21.148.0/24',
'114.21.149.0/24',
- '114.21.254.0/27',
'210.255.190.0/24',
'114.20.49.0/24',
'114.20.50.0/24',
@@ -839,6 +873,11 @@
'114.20.66.0/24',
'114.20.67.0/24',
'114.21.255.0/27',
+ '61.198.138.100/32',
+ '61.198.138.101/32',
+ '61.198.138.102/32',
+ '61.198.138.103/32',
+ '114.21.254.0/27',
'114.21.255.0/27',
'219.108.2.0/24',
'219.108.3.0/24',
@@ -853,7 +892,7 @@
'219.108.4.0/24',
'219.108.5.0/24',
'219.108.6.0/24',
- '221.119.5.0/24',
+ '221.119.5.0/24'
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
}
Modified: p2/trunk/lib/Login.php
===================================================================
--- p2/trunk/lib/Login.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/Login.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -179,19 +179,19 @@
$mobile = &Net_UserAgent_Mobile::singleton();
if (isset($_SERVER['HTTP_X_UP_SUBNO'])) {
- $this->removeRegistedAuthCarrier('EZWEB');
+ $this->removeRegisteredAuthCarrier('EZWEB');
} elseif ($mobile->isSoftBank()) {
- $this->removeRegistedAuthCarrier('SOFTBANK');
+ $this->removeRegisteredAuthCarrier('SOFTBANK');
/* docomo\x82̓\x8D\x83O\x83C\x83\x93\x89\xE6\x96ʂ\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x82̂ŁA\x95⏕\x94F\x8F؏\xEE\x95\xF1\x82\xF0\x8E\xA9\x93\xAE\x94j\x8A\xFC\x82\xB5\x82Ȃ\xA2
} elseif ($mobile->isDoCoMo()) {
- $this->removeRegistedAuthCarrier('DOCOMO');
+ $this->removeRegisteredAuthCarrier('DOCOMO');
*/
}
- // $user_u_q = empty($_conf['ktai']) ? '' : '?user=' . $this->user_u;
-
+ // $user_u_q = UA::isK() ? '?user=' . $this->user_u : '';
+
// index\x83y\x81[\x83W\x82ɓ]\x91\x97
$url = rtrim(dirname(UriUtil::getMyUri()), '/') . '/'; // . $user_u_q;
@@ -212,8 +212,8 @@
// }}}
// \x97v\x8B\x81\x82\xAA\x82\xA0\x82\xEA\x82A\x95⏕\x94F\x8F\xF0\x93o\x98^
- $this->registCookie();
- $this->registKtaiId();
+ $this->registerCookie();
+ $this->registerKtaiId();
// \x94F\x8F،\xE3\x82̓Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x95‚\xB6\x82\xE9
session_write_close();
@@ -311,8 +311,8 @@
// \x81\xA1EZweb\x94F\x8FX\x83\x8B\x81[\x83p\x83X \x83T\x83u\x83X\x83N\x83\x89\x83C\x83oID
if ($mobile->isEZweb() && isset($_SERVER['HTTP_X_UP_SUBNO']) and HostCheck::isAddrAu()) {
- if ($registed_ez = $this->getRegistedAuthCarrier('EZWEB')) {
- if ($_SERVER['HTTP_X_UP_SUBNO'] == $registed_ez) {
+ if ($registered_ez = $this->getRegisteredAuthCarrier('EZWEB')) {
+ if ($_SERVER['HTTP_X_UP_SUBNO'] == $registered_ez) {
if (isset($_p2session)) {
//$_p2session->regenerateId();
$_p2session->updateSecure();
@@ -325,9 +325,9 @@
// \x81\xA1SoftBank(J-PHONE)\x94F\x8FX\x83\x8B\x81[\x83p\x83X
// \x83p\x83P\x83b\x83g\x91Ή\x9E\x8B@ \x97v\x83\x86\x81[\x83UID\x92ʒmON\x82̐ݒ\xE8 \x92[\x96\x96\x83V\x83\x8A\x83A\x83\x8B\x94ԍ\x86
// http://www.dp.j-phone.com/dp/tool_dl/web/useragent.php
- if (HostCheck::isAddrSoftBank() and $sn = P2Util::getSoftBankID() and HostCheck::isAddrSoftBank()) {
- if ($registed_jp = $this->getRegistedAuthCarrier('SOFTBANK')) {
- if ($sn == $registed_jp) {
+ if ($sn = P2Util::getSoftBankID() and HostCheck::isAddrSoftBank()) {
+ if ($registered_jp = $this->getRegisteredAuthCarrier('SOFTBANK')) {
+ if ($sn == $registered_jp) {
if (isset($_p2session)) {
// \x82\xB1\x82\xB1\x82\xC5 session_regenerate_id(true) \x82\xB7\x82\xE9\x82Ɛڑ\xB1\x82\xAA\x93r\x90ꂽ\x8E\x9E\x82Ƀ\x8D\x83O\x83C\x83\x93\x89\xE6\x96ʂɖ߂\xB3\x82\xEA\x82\xE9\x82炵\x82\xA2\x81B
// \x92[\x96\x96\x94F\x8F\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x82Ȃ\xE7\x81A\x83Z\x83b\x83V\x83\x87\x83\x93\x83`\x83F\x83b\x83N\x82܂ōs\x82\xA9\x82Ȃ\xA2\x82͂\xB8\x82Ȃ̂ɕs\x8Ev\x8Bc\x81B
@@ -336,7 +336,7 @@
}
return true;
}
- //$this->removeRegistedAuthCarrier('SOFTBANK');
+ //$this->removeRegisteredAuthCarrier('SOFTBANK');
}
}
@@ -345,8 +345,8 @@
if (empty($_POST['form_login_id'])) {
if ($sn = P2Util::getDocomoUtnId() and HostCheck::isAddrDocomo()) {
- if ($registed_docomo = $this->getRegistedAuthCarrier('DOCOMO')) {
- if ($sn == $registed_docomo) {
+ if ($registered_docomo = $this->getRegisteredAuthCarrier('DOCOMO')) {
+ if ($sn == $registered_docomo) {
if (isset($_p2session)) {
// docomo\x82ŏ\x91\x82\xAB\x8D\x9E\x82\xE3\x82ɖ߂\xC1\x82\xBD\x82肷\x82\xE9\x82ƍĔF\x8FɂȂ\xC1\x82ĕs\x95\xD6
//$_p2session->regenerateId();
@@ -492,50 +492,50 @@
*
* @access public
*/
- function registKtaiId()
+ function registerKtaiId()
{
global $_conf;
// {{{ \x94F\x8Fؓo\x98^\x8F\x88\x97\x9D EZweb
- if (!empty($_REQUEST['ctl_regist_ez'])) {
- if ($_REQUEST['regist_ez'] == '1') {
+ if (!empty($_REQUEST['ctl_register_ez'])) {
+ if ($_REQUEST['register_ez'] == '1') {
if (!empty($_SERVER['HTTP_X_UP_SUBNO'])) {
- $this->registAuthCarrier('EZWEB', $_SERVER['HTTP_X_UP_SUBNO']);
+ $this->registerAuthCarrier('EZWEB', $_SERVER['HTTP_X_UP_SUBNO']);
} else {
P2Util::pushInfoHtml('<p class="infomsg">\x81~EZweb\x97p\x83T\x83u\x83X\x83N\x83\x89\x83C\x83oID\x82ł̔F\x8Fؓo\x98^\x82͂ł\xAB\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD</p>');
}
} else {
- $this->removeRegistedAuthCarrier('EZWEB');
+ $this->removeRegisteredAuthCarrier('EZWEB');
}
// }}}
// {{{ \x94F\x8Fؓo\x98^\x8F\x88\x97\x9D SoftBank
- } elseif (!empty($_REQUEST['ctl_regist_jp'])) {
- if ($_REQUEST['regist_jp'] == '1') {
+ } elseif (!empty($_REQUEST['ctl_register_jp'])) {
+ if ($_REQUEST['register_jp'] == '1') {
if (HostCheck::isAddrSoftBank() && $sn = P2Util::getSoftBankID()) {
- $this->registAuthCarrier('SOFTBANK', $sn);
+ $this->registerAuthCarrier('SOFTBANK', $sn);
} else {
P2Util::pushInfoHtml('<p class="infomsg">\x81~SoftBank\x97p\x8CŗLID\x82ł̔F\x8Fؓo\x98^\x82͂ł\xAB\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD</p>');
}
} else {
- $this->removeRegistedAuthCarrier('SOFTBANK');
+ $this->removeRegisteredAuthCarrier('SOFTBANK');
}
// }}}
// {{{ \x94F\x8Fؓo\x98^\x8F\x88\x97\x9D docomo
- } elseif (!empty($_REQUEST['ctl_regist_docomo'])) {
- if ($_REQUEST['regist_docomo'] == '1') {
+ } elseif (!empty($_REQUEST['ctl_register_docomo'])) {
+ if ($_REQUEST['register_docomo'] == '1') {
// UA\x82Ɋ܂܂\xEA\x82\xE9\x83V\x83\x8A\x83A\x83\x8BID\x82\xF0\x8E擾(utn)
if ($sn = P2Util::getDocomoUtnId()) {
- $this->registAuthCarrier('DOCOMO', $sn);
+ $this->registerAuthCarrier('DOCOMO', $sn);
} else {
P2Util::pushInfoHtml('<p class="infomsg">\x81~docomo\x97p\x8CŗLID\x82ł̔F\x8Fؓo\x98^\x82͂ł\xAB\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD</p>');
}
} else {
- $this->removeRegistedAuthCarrier('DOCOMO');
+ $this->removeRegisteredAuthCarrier('DOCOMO');
}
}
@@ -547,39 +547,51 @@
*
* @return string|null|false \x8CŗLID|\x93o\x98^\x82Ȃ\xB5|\x83G\x83\x89\x81[
*/
- function getRegistedAuthCarrier($carrier)
+ function getRegisteredAuthCarrier($carrier)
{
if (!$auth_file = $this->getAuthCarrierFile($carrier)) {
return false;
}
- if (!$key = $this->getRegistedCarrierKey($carrier)) {
+ if (!$key = $this->getRegisteredCarrierKey($carrier)) {
return false;
}
if (!file_exists($auth_file)) {
return null;
}
- include $auth_file; // registAuthCarrier()
+ include $auth_file; // registerAuthCarrier()
+
+ // 2011/11/23 \x82Ƃ肠\x82\xA6\x82\xB8\x82̌\xE3\x95\xFB\x8C݊\xB7\x8F\x88\x92u
+ if (isset($registed_docomo)) {
+ $registered_docomo = $registed_docomo;
+ }
+ if (isset($registed_ez)) {
+ $registered_ez = $registed_ez;
+ }
+ if (isset($registered_jp)) {
+ $registered_jp = $registered_jp;
+ }
+
return $$key;
}
/**
* 2009/07/24 \x83L\x83\x83\x83\x8A\x83A\x96\x88\x82\xC9$key\x82\xF0\x95ς\xA6\x82\xE9\x95K\x97v\x82͂Ȃ\xA2\x82̂\xBE\x82\xAA\x81A\x8C\xE3\x95\xFB\x8C݊\xB7\x82̂\xBD\x82߁B
- * @see registAuthCarrier(), getRegistedAuthCarrier()
+ * @see registerAuthCarrier(), getRegisteredAuthCarrier()
* @access private
* @return string|false
*/
- function getRegistedCarrierKey($carrier)
+ function getRegisteredCarrierKey($carrier)
{
$carrier = strtoupper($carrier);
switch ($carrier) {
case 'DOCOMO':
- $key = 'registed_docomo';
+ $key = 'registered_docomo';
break;
case 'EZWEB':
- $key = 'registed_ez';
+ $key = 'registered_ez';
break;
case 'SOFTBANK':
- $key = 'registed_jp';
+ $key = 'registered_jp';
break;
default:
trigger_error('invalid $carrier', E_USER_WARNING);
@@ -594,11 +606,11 @@
* @access private
* @return boolean
*/
- function registAuthCarrier($carrier, $sub_id)
+ function registerAuthCarrier($carrier, $sub_id)
{
global $_conf;
- if (!$key = $this->getRegistedCarrierKey($carrier)) {
+ if (!$key = $this->getRegisteredCarrierKey($carrier)) {
return false;
}
@@ -651,7 +663,7 @@
* @access public
* @return boolean
*/
- function hasRegistedAuthCarrier($carrier)
+ function hasRegisteredAuthCarrier($carrier)
{
return file_exists($this->getAuthCarrierFile($carrier));
}
@@ -662,16 +674,16 @@
* @access private
* @return boolean
*/
- function removeRegistedAuthCarrier($carrier)
+ function removeRegisteredAuthCarrier($carrier)
{
- return $this->removeRegistedAuthCarrierFile($carrier);
+ return $this->removeRegisteredAuthCarrierFile($carrier);
}
/**
* @access private
* @return boolean
*/
- function removeRegistedAuthCarrierFile($carrier)
+ function removeRegisteredAuthCarrierFile($carrier)
{
if (!$auth_file = $this->getAuthCarrierFile($carrier)) {
return false;
@@ -688,7 +700,7 @@
* @access public
* @return boolean
*/
- function savaRegistUserPass($user_u, $pass)
+ function savaRegisterUserPass($user_u, $pass)
{
global $_conf;
@@ -733,7 +745,7 @@
{
global $_conf;
- if (!$this->savaRegistUserPass($user_u, $pass)) {
+ if (!$this->savaRegisterUserPass($user_u, $pass)) {
p2die('\x83\x86\x81[\x83U\x93o\x98^\x8F\x88\x97\x9D\x82\xF0\x8A\xAE\x97\xB9\x82ł\xAB\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD\x81B');
return false;
}
@@ -747,12 +759,12 @@
* @access public
* @return boolean
*/
- function registCookie()
+ function registerCookie()
{
$r = true;
- if (!empty($_REQUEST['ctl_regist_cookie'])) {
- if ($_REQUEST['regist_cookie'] == '1') {
+ if (!empty($_REQUEST['ctl_egister_cookie'])) {
+ if ($_REQUEST['register_cookie'] == '1') {
$check_cip = false;
if (!empty($_POST['check_cip'])) {
@@ -948,6 +960,7 @@
//!$_conf['cid_seed_ip'] or
UA::isK(geti($_SERVER['HTTP_USER_AGENT']))
|| HostCheck::isAddrDocomo() || HostCheck::isAddrAu() || HostCheck::isAddrSoftBank()
+ || HostCheck::isAddrSoftBankPcSiteBrowser()
|| HostCheck::isAddrWillcom()
|| HostCheck::isAddrJigWeb() || HostCheck::isAddrJig()
|| HostCheck::isAddrIbis()
Modified: p2/trunk/lib/P2Util.php
===================================================================
--- p2/trunk/lib/P2Util.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/P2Util.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -305,8 +305,8 @@
$time = time();
if (is_null($expires)) {
- $expires = $time + 60 * 60 * 24 * 365;
- } elseif ($expires < $time) {
+ $expires = $time + 60 * 60 * 24 * 365; // \x83f\x83t\x83H\x83\x8B\x83g\x90ݒ\xE8
+ } elseif ($expires and $expires < $time) {
trigger_error(sprintf('$expires is too early (%s)', $expires), E_USER_WARNING);
}
@@ -396,7 +396,7 @@
// \x83O\x83O\x82\xC1\x82Ă݂\xBD\x82\xAA\x93\xAF\x97l\x82̐\xBA\x82͂Ȃ\xA9\x82\xC1\x82\xBD\x81B\x82\xB1\x82̋@\x8E\xED(821SC)\x82\xBE\x82\xAF\x81H\x89\xBD\x82\xA9\x93\xC1\x8E\xEA\x82ȃP\x81[\x83X\x81H
if (UA::isSoftBank()) {
- $replace = $_COOKIE[$key];
+ $replace = array_key_exists($key, $_COOKIE) ? $_COOKIE[$key] : '';
$timelimit = time();
} else {
$replace = '';
@@ -1914,7 +1914,7 @@
include $_conf['idpw2ch_php'];
- // \x83p\x83X\x82\x87\x89\xBB
+ // \x83p\x83X\x82\x87
if (!is_null($rec_login2chPW)) {
$login2chPW = md5_decrypt($rec_login2chPW, P2Util::getMd5CryptPass());
}
Modified: p2/trunk/lib/P2View.php
===================================================================
--- p2/trunk/lib/P2View.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/P2View.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -5,6 +5,20 @@
class P2View
{
/**
+ * @return void HTML\x8Fo\x97\xCD
+ */
+ function printStyleTagImportIuiCss()
+ {
+?><style type="text/css" media="screen">
+<?php if (UA::isWindowsPhoneIEMobile()) { ?>
+ ＠ import "./iui/iui_wpie.css";
+<?php } ?>
+ ＠ import "./iui/iui.css";
+</style>
+<?php
+ }
+
+ /**
* \x90V\x92\x85\x82܂Ƃߓǂ݂̃L\x83\x83\x83b\x83V\x83\x85\x83\x8A\x83\x93\x83NHTML\x82\xF0\x95Ԃ\xB7
*
* @access public
Modified: p2/trunk/lib/ShowThread.php
===================================================================
--- p2/trunk/lib/ShowThread.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/ShowThread.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -697,6 +697,17 @@
return $level;
}
+
+ /**
+ * @access protected
+ * @param string $videoid
+ * @return string
+ */
+ function getYouTubeThumbnailUri($videoid)
+ {
+ // http://stackoverflow.com/questions/2068344/how-to-get-thumbnail-of-youtube-video-link-using-youtube-api
+ return sprintf('http://i.ytimg.com/vi/%s/default.jpg', $videoid);
+ }
}
/*
Modified: p2/trunk/lib/ShowThreadPc.php
===================================================================
--- p2/trunk/lib/ShowThreadPc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/ShowThreadPc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -1328,12 +1328,6 @@
/**
* YouTube\x83\x8A\x83\x93\x83N\x95ϊ\xB7\x83v\x83\x89\x83O\x83C\x83\x93
*
- * [wish] YouTube API\x82𗘗p\x82\xB5\x82āA\x89摜\x83T\x83\x80\x83l\x83C\x83\x8B\x82݂̂ɂ\xB5\x82\xBD\x82\xA2
- *
- * 2007/06/25 YouTube \x82\xCD API \x82\xF0\x8Co\x97R\x82\xB3\x82\xB9\x82ĂȂ\xAD\x82Ă\xE0\x81A\x90^\x82̃T\x83\x80\x83l\x83C\x83\x8B\x82\xCD
- * http://img.youtube.com/vi/VIDEO_ID/2.jpg \x82ŃA\x83N\x83Z\x83X\x82ł\xAB\x82\xE9\x81B
- * 1.jpg \x82\xC6 3.jpg \x82ƍ\x87\x82킹\x82\xC4 3 \x96\x87\x95\xC0\x82ׂĂ\xE0\x82\xA2\x82\xA2\x82\xA9\x82\xE0\x82\xB5\x82\xEA\x82Ȃ\xA2\x81B
- *
* @access private
* @return string|false HTML
*/
Modified: p2/trunk/lib/UA.php
===================================================================
--- p2/trunk/lib/UA.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/UA.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -1,5 +1,6 @@
<?php
// \x97Ⴆ\x82A\x83N\x83G\x83\x8A\x81[\x82\xAA b=k \x82Ȃ\xE7 isK() \x82\xAAtrue\x82ƂȂ\xE9\x82̂ŁA\x8Cg\x91ь\xFC\x82\xAF\x95\\x8E\xA6\x82ɂ\xB5\x82\xBD\x82肷\x82\xE9
+// conf_system.inc.php \x82\xC5cookie\x82\xC9b\x8Ew\x92\xE8\x82\xF0\x83Z\x83b\x83g\x82\xB5\x82Ă\xA2\x82\xE9\x81B
// {{{ \x82\xB1\x82̃N\x83\x89\x83X\x82ł̂ݗ\x98\x97p\x82\xB7\x82\xE9\x83O\x83\x8D\x81[\x83o\x83\x8B\x95ϐ\x94\x81i_UA_*\x81j
// over PHP5\x82Ɍ\xC0\x92\xE8\x82ł\xAB\x82\xE9\x82Ȃ\xE7\x83v\x83\x89\x83C\x83x\x81[\x83g\x82ȃN\x83\x89\x83X\x95ϐ\x94\x82ɂ\xB5\x82\xBD\x82\xA2\x82Ƃ\xB1\x82\xEB\x82̂\xE0\x82\xCC
@@ -108,12 +109,12 @@
if (!$isMobile) {
$isMobile = UA::isNetFront($ua);
}
+ */
// Nintendo DS\x82\xE0\x83\x82\x83o\x83C\x83\x8B\x82\xC9
if (!$isMobile) {
$isMobile = UA::isNintendoDS($ua);
}
- */
// \x88\xF8\x90\x94\x82\xCCUA\x82\xAA\x96\xB3\x8Ew\x92\xE8\x82Ȃ\xE7\x81A\x83L\x83\x83\x83b\x83V\x83\x85\x95ۑ\xB6
if (is_null($ua)) {
@@ -480,7 +481,7 @@
}
/**
- * UA\x82\xAANintendo DS\x82Ȃ\xE7true\x82\xF0\x95Ԃ\xB7\x81B
+ * UA\x82\xAANintendo DS\x8Cn\x82Ȃ\xE7true\x82\xF0\x95Ԃ\xB7\x81B
*
* @static
* @access public
@@ -493,14 +494,38 @@
$ua = $_SERVER['HTTP_USER_AGENT'];
}
- // Mozilla/4.0 (compatible; MSIE 6.0; Nitro) Opera 8.5 [ja]
- if (preg_match('/ Nitro/', $ua)) {
+ // (Wii) Opera/9.30 (Nintendo Wii; U; ; 3642; ja)
+ // (DS) Mozilla/4.0 (compatible; MSIE 6.0; Nitro) Opera 8.5 [ja]
+ // (DSi) Opera/9.50 (Nintendo DSi; Opera/507; U; ja)
+ // (3DS) Mozilla/5.0 (Nintendo 3DS; U; ; ja) Version/1.7455.JP
+ if (preg_match('/(?: Nitro|Nintendo DSi;)/', $ua) || UA::isNintendo3DS($ua)) {
return true;
}
return false;
}
/**
+ * UA\x82\xAANintendo 3DS\x82Ȃ\xE7true\x82\xF0\x95Ԃ\xB7\x81B
+ *
+ * @static
+ * @access public
+ * @param string $ua UA\x82\xF0\x8Ew\x92肷\x82\xE9\x82Ȃ\xE7
+ * @return boolean
+ */
+ function isNintendo3DS($ua = null)
+ {
+ if (is_null($ua) and isset($_SERVER['HTTP_USER_AGENT'])) {
+ $ua = $_SERVER['HTTP_USER_AGENT'];
+ }
+
+ // \x83j\x83\x93\x83e\x83\x93\x83h\x81[DSi\x83u\x83\x89\x83E\x83U\x81[\x82ł̓\x8D\x81[\x83J\x83\x8BIP\x82̃N\x83b\x83L\x81[\x82\xF0\x8BL\x89\xAF\x82\xB5\x82\xBD\x82\xAA\x81A3DS\x82ł͋L\x89\xAF\x82\xB9\x82\xB8\x81A\x83N\x83b\x83L\x81[\x83G\x83\x89\x81[\x82ɂȂ\xE9\x82炵\x82\xA2\x81B
+ if (preg_match('/Nintendo 3DS;/', $ua)) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
* UA\x82\xAAAndroid\x81i\x82\xC5Webkit\x81j\x82Ȃ\xE7true\x82\xF0\x95Ԃ\xB7\x81B
*
* @static
@@ -552,7 +577,7 @@
* @param string $ua UA\x82\xF0\x8Ew\x92肷\x82\xE9\x82Ȃ\xE7
* @return boolean
*/
- function isWindowsPhoneIEMobile($ua)
+ function isWindowsPhoneIEMobile($ua = null)
{
if (is_null($ua) and isset($_SERVER['HTTP_USER_AGENT'])) {
$ua = $_SERVER['HTTP_USER_AGENT'];
Modified: p2/trunk/lib/login_first.inc.php
===================================================================
--- p2/trunk/lib/login_first.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/login_first.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -173,8 +173,8 @@
}
// \x97v\x8B\x81\x82\xAA\x82\xA0\x82\xEA\x82A\x95⏕\x94F\x8F\xF0\x93o\x98^
- $_login->registCookie();
- $_login->registKtaiId();
+ $_login->registerCookie();
+ $_login->registerKtaiId();
}
// }}}
@@ -216,7 +216,7 @@
<title><?php eh($ptitle); ?></title>
<?php
if (UA::isIPhoneGroup()) {
- ?><style type="text/css" media="screen">@import "./iui/iui.css";</style><?php
+ P2View::printStyleTagImportIuiCss();
}
if (UA::isPC() && !UA::isIPhoneGroup()) {
// \x83\x86\x81[\x83U\x82͖\xA2\x8C\x88\x92\xE8
@@ -274,33 +274,33 @@
// EZ\x94F\x8F\xD8
if (!empty($_SERVER['HTTP_X_UP_SUBNO'])) {
- //if (!$_login->hasRegistedAuthCarrier('EZWEB')) {
- $auth_sub_input_ht = '<input type="hidden" name="ctl_regist_ez" value="1">' . "\n" .
- '<input type="checkbox" name="regist_ez" value="1" checked>EZ\x92[\x96\x96ID\x82ŔF\x8F\xF0\x93o\x98^<br>';
+ //if (!$_login->hasRegisteredAuthCarrier('EZWEB')) {
+ $auth_sub_input_ht = '<input type="hidden" name="ctl_register_ez" value="1">' . "\n" .
+ '<input type="checkbox" name="register_ez" value="1" checked>EZ\x92[\x96\x96ID\x82ŔF\x8F\xF0\x93o\x98^<br>';
//}
// SoftBank\x94F\x8F\xD8
// http://www.dp.j-phone.com/dp/tool_dl/web/useragent.php
} elseif (HostCheck::isAddrSoftBank() and P2Util::getSoftBankID()) {
- //if (!$_login->hasRegistedAuthCarrier('SOFTBANK')) {
- $auth_sub_input_ht = '<input type="hidden" name="ctl_regist_jp" value="1">' . "\n" .
- '<input type="checkbox" name="regist_jp" value="1" checked>SoftBank\x92[\x96\x96ID\x82ŔF\x8F\xF0\x93o\x98^<br>';
+ //if (!$_login->hasRegisteredAuthCarrier('SOFTBANK')) {
+ $auth_sub_input_ht = '<input type="hidden" name="ctl_register_jp" value="1">' . "\n" .
+ '<input type="checkbox" name="register_jp" value="1" checked>SoftBank\x92[\x96\x96ID\x82ŔF\x8F\xF0\x93o\x98^<br>';
//}
// docomo\x94F\x8F\xD8
} elseif ($mobile->isDoCoMo()) {
- //if (!$_login->hasRegistedAuthCarrier('DOCOMO')) {
- $auth_sub_input_ht = '<input type="hidden" name="ctl_regist_docomo" value="1">' . "\n" .
- '<input type="checkbox" name="regist_docomo" value="1" checked>docomo\x92[\x96\x96ID\x82ŔF\x8F\xF0\x93o\x98^<br>';
+ //if (!$_login->hasRegisteredAuthCarrier('DOCOMO')) {
+ $auth_sub_input_ht = '<input type="hidden" name="ctl_register_docomo" value="1">' . "\n" .
+ '<input type="checkbox" name="register_docomo" value="1" checked>docomo\x92[\x96\x96ID\x82ŔF\x8F\xF0\x93o\x98^<br>';
//}
// Cookie\x94F\x8F\xD8
} else {
- $regist_cookie_checked = ' checked';
+ $register_cookie_checked = ' checked';
if (isset($_POST['submit_newuser']) || isset($_POST['submit_userlogin'])) {
- if (empty($_POST['regist_cookie'])) {
- $regist_cookie_checked = '';
+ if (empty($_POST['register_cookie'])) {
+ $register_cookie_checked = '';
}
}
@@ -315,9 +315,9 @@
}
}
- $auth_sub_input_ht = '<input type="hidden" name="ctl_regist_cookie" value="1">'
- . sprintf('<input type="checkbox" id="regist_cookie" name="regist_cookie" value="1"%s><label for="regist_cookie">\x83\x8D\x83O\x83C\x83\x93\x8F\xEE\x95\xF1\x82\xF0Cookie\x82ɕۑ\xB6\x82\xB7\x82\xE9</label><br>', $regist_cookie_checked)
- . sprintf('<input type="checkbox" id="check_cip" name="check_cip" value="1"%s><label for="check_cip">Cookie\x83\x8D\x83O\x83C\x83\x93\x8E\x9E\x81AIP\x82̓\xAF\x88ꐫ\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81i\x82\xE6\x82\xE8\x88\xC0\x91S\x81j</label><br>', $check_cip_checked);
+ $auth_sub_input_ht = '<input type="hidden" name="ctl_register_cookie" value="1">'
+ . sprintf('<input type="checkbox" id="register_cookie" name="register_cookie" value="1"%s><label for="register_cookie">\x83\x8D\x83O\x83C\x83\x93\x8F\xEE\x95\xF1\x82\xF0Cookie\x82ɕۑ\xB6\x82\xB7\x82\xE9</label><br>', $register_cookie_checked)
+ . sprintf('<input type="checkbox" id="check_cip" name="check_cip" value="1"%s><label for="check_cip">Cookie\x83\x8D\x83O\x83C\x83\x93\x8E\x9E\x81AIP\x82̓\xAF\x88ꐫ\x82\xE0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9</label><br>', $check_cip_checked);
}
return $auth_sub_input_ht;
Modified: p2/trunk/lib/read_footer.inc.php
===================================================================
--- p2/trunk/lib/read_footer.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/read_footer.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -109,7 +109,7 @@
// \x83\x8C\x83X\x82̂\xB7\x82₳
$spd_ht = '';
if ($spd_st = $aThread->getTimePerRes() and $spd_st != '-') {
- $spd_ht = '<span class="spd" style="white-space: nowrap;" title="\x82\xB7\x82₳\x81\x81\x8E\x9E\x8A\xD4/\x83\x8C\x83X">' . $spd_st . '</span>';
+ $spd_ht = '<span class="spd" style="white-space: nowrap;" title="\x83\x8C\x83X\x8AԊu\x81\x81(\x8E\x9E\x8A\xD4/\x83\x8C\x83X)">' . $spd_st . '</span>';
}
// DAT\x97e\x97\xCA
Modified: p2/trunk/lib/sb_header_k.inc.php
===================================================================
--- p2/trunk/lib/sb_header_k.inc.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/lib/sb_header_k.inc.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -41,7 +41,7 @@
$ptitle_url = $ptitle_url . 'index2.html';
// PC
- } elseif (!$_conf['ktai']) {
+ } elseif (UA::isK()) {
$ptitle_url = "http://{$aThreadList->host}/{$aThreadList->bbs}/i/";
// \x8Cg\x91\xD1
} else {
Modified: p2/trunk/login.php
===================================================================
--- p2/trunk/login.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/login.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -67,11 +67,11 @@
// EZ\x94F\x8F\xD8
if (!empty($_SERVER['HTTP_X_UP_SUBNO'])) {
- if ($_login->hasRegistedAuthCarrier('EZWEB')) {
+ if ($_login->hasRegisteredAuthCarrier('EZWEB')) {
$atag = P2View::tagA(
UriUtil::buildQueryUri($_SERVER['SCRIPT_NAME'],
array(
- 'ctl_regist_ez' => '1',
+ 'ctl_register_ez' => '1',
UA::getQueryKey() => UA::getQueryValue()
)
),
@@ -84,8 +84,8 @@
$atag = P2View::tagA(
UriUtil::buildQueryUri($_SERVER['SCRIPT_NAME'],
array(
- 'ctl_regist_ez' => '1',
- 'regist_ez' => '1',
+ 'ctl_register_ez' => '1',
+ 'register_ez' => '1',
UA::getQueryKey() => UA::getQueryValue()
)
),
@@ -97,11 +97,11 @@
// SoftBank\x94F\x8F\xD8
} elseif (HostCheck::isAddrSoftBank() && P2Util::getSoftBankID()) {
- if ($_login->hasRegistedAuthCarrier('SOFTBANK')) {
+ if ($_login->hasRegisteredAuthCarrier('SOFTBANK')) {
$atag = P2View::tagA(
UriUtil::buildQueryUri($_SERVER['SCRIPT_NAME'],
array(
- 'ctl_regist_jp' => '1',
+ 'ctl_register_jp' => '1',
UA::getQueryKey() => UA::getQueryValue()
)
),
@@ -114,8 +114,8 @@
$atag = P2View::tagA(
UriUtil::buildQueryUri($_SERVER['SCRIPT_NAME'],
array(
- 'ctl_regist_jp' => '1',
- 'regist_jp' => '1',
+ 'ctl_register_jp' => '1',
+ 'register_jp' => '1',
UA::getQueryKey() => UA::getQueryValue()
)
),
@@ -127,11 +127,11 @@
// docomo\x94F\x8F\xD8
} elseif ($mobile->isDoCoMo()) {
- if ($_login->hasRegistedAuthCarrier('DOCOMO')) {
+ if ($_login->hasRegisteredAuthCarrier('DOCOMO')) {
$atag = P2View::tagA(
UriUtil::buildQueryUri($_SERVER['SCRIPT_NAME'],
array(
- 'ctl_regist_docomo' => '1',
+ 'ctl_register_docomo' => '1',
UA::getQueryKey() => UA::getQueryValue()
)
),
@@ -143,8 +143,8 @@
if ($_login->pass_x) {
$uri = UriUtil::buildQueryUri($_SERVER['SCRIPT_NAME'],
array(
- 'ctl_regist_docomo' => '1',
- 'regist_docomo' => '1',
+ 'ctl_register_docomo' => '1',
+ 'register_docomo' => '1',
'guid' => 'ON',
UA::getQueryKey() => UA::getQueryValue()
)
@@ -160,7 +160,7 @@
$atag = P2View::tagA(
UriUtil::buildQueryUri('cookie.php',
array(
- 'ctl_regist_cookie' => '1',
+ 'ctl_register_cookie' => '1',
UA::getQueryKey() => UA::getQueryValue()
)
),
@@ -173,8 +173,8 @@
$atag = P2View::tagA(
UriUtil::buildQueryUri('cookie.php',
array(
- 'ctl_regist_cookie' => '1',
- 'regist_cookie' => '1',
+ 'ctl_register_cookie' => '1',
+ 'register_cookie' => '1',
UA::getQueryKey() => UA::getQueryValue()
)
),
@@ -186,7 +186,7 @@
}
// Cookie\x94F\x8Fؓo\x98^\x89\xF0\x8F\x9C\x8F\x88\x97\x9D
-_preExecCheckRegistCookie();
+_preExecCheckRegisterCookie();
//=================================================================
// HTML\x83v\x83\x8A\x83\x93\x83g
@@ -290,7 +290,7 @@
// \x83p\x83X\x83\x8F\x81[\x83h\x95ύX\x93o\x98^\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4
} else {
- if (!$_login->savaRegistUserPass($_login->user_u, $_POST['form_login_pass'])) {
+ if (!$_login->savaRegisterUserPass($_login->user_u, $_POST['form_login_pass'])) {
p2die('\x83\x86\x81[\x83U\x93o\x98^\x8F\x88\x97\x9D\x82\xF0\x8A\xAE\x97\xB9\x82ł\xAB\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD\x81B');
}
@@ -304,21 +304,21 @@
*
* @return void, P2Util::pushInfoHtml()
*/
-function _preExecCheckRegistCookie()
+function _preExecCheckRegisterCookie()
{
global $_login;
- if (isset($_REQUEST['check_regist_cookie'])) {
+ if (isset($_REQUEST['check_register_cookie'])) {
if ($_login->checkUserPwWithCid($_COOKIE['cid'])) {
- if (geti($_REQUEST['regist_cookie']) == '1') {
+ if (geti($_REQUEST['register_cookie']) == '1') {
P2Util::pushInfoHtml('<p>\x81\x9Bcookie\x94F\x8Fؓo\x98^\x8A\xAE\x97\xB9</p>');
} else {
P2Util::pushInfoHtml('<p>\x81~cookie\x94F\x8F؉\xF0\x8F\x9C\x8E\xB8\x94s</p>');
}
} else {
- if (geti($_REQUEST['regist_cookie']) == '1') {
+ if (geti($_REQUEST['register_cookie']) == '1') {
P2Util::pushInfoHtml('<p>\x81~cookie\x94F\x8Fؓo\x98^\x8E\xB8\x94s</p>');
} else {
P2Util::pushInfoHtml('<p>\x81\x9Bcookie\x94F\x8F؉\xF0\x8F\x9C\x8A\xAE\x97\xB9</p>');
Modified: p2/trunk/menu_i.php
===================================================================
--- p2/trunk/menu_i.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/menu_i.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -45,7 +45,7 @@
?>
<html lang="ja">
<head>
-<style type="text/css" media="screen">@import "./iui/iui.css";</style>
+<?php P2View::printStyleTagImportIuiCss(); ?>
<script type="text/javascript">
<!--
window.onload = function() {
Modified: p2/trunk/post_form_i.php
===================================================================
--- p2/trunk/post_form_i.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/post_form_i.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -118,8 +118,8 @@
<head>
<?php
P2View::printExtraHeadersHtml();
+P2View::printStyleTagImportIuiCss();
echo <<<EOHEADER
-<style type="text/css" media="screen">@import "./iui/iui.css";</style>
<meta name="viewport" content="width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
<script type="text/javascript">
<!--
Modified: p2/trunk/read.php
===================================================================
--- p2/trunk/read.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/read.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -281,7 +281,7 @@
//===============================================================
$ptitle_ht = hs($aThread->itaj) . ' / ' . hs($aThread->ttitle_hc);
-if ($_conf['ktai']) {
+if (UA::isK()) {
$GLOBALS['_filter_hits'] = NULL;
if (isset($GLOBALS['word']) && strlen($GLOBALS['word'])) {
@@ -608,7 +608,7 @@
/**
* \x8DŋߓǂX\x83\x8C\x82ɋL\x98^\x82\xB7\x82\xE9
*
- * @param array $data_ar
+ * @param array $data_ar \x93o\x98^\x82\xB7\x82\xE9\x83X\x83\x8C\x83b\x83h\x83f\x81[\x83^
* @return boolean
*/
function _recRecent($data_ar)
@@ -618,7 +618,8 @@
$data_line = implode('<>', $data_ar);
$host = $data_ar[10];
$key = $data_ar[1];
-
+ $bbs = $data_ar[11];
+
// \x91\xAC\x95\xF1headline\x82͍ŋߓǂX\x83\x8C\x82ɋL\x98^\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82Ă݂\xE9
if ($host == 'headline.2ch.net') {
return true;
@@ -636,8 +637,12 @@
foreach ($lines as $line) {
$line = rtrim($line);
$lar = explode('<>', $line);
- if ($lar[1] == $key) { continue; } // key\x82ŏd\x95\xA1\x89\xF1\x94\xF0
- if (!$lar[1]) { continue; } // key\x82̂Ȃ\xA2\x82\xE0\x82͕̂s\x90\xB3\x83f\x81[\x83^
+ if (!$lar[1] || !strlen($lar[11])) { // \x95s\x90\xB3\x83f\x81[\x83^\x82\xF0\x8D폜
+ continue;
+ }
+ if ($lar[1] == $key && $lar[11] == $bbs) { // key, bbs\x82ŏd\x95\xA1\x89\xF1\x94\xF0
+ continue;
+ }
$newlines[] = $line;
}
}
Modified: p2/trunk/read_new.php
===================================================================
--- p2/trunk/read_new.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/read_new.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -516,7 +516,7 @@
// \x83\x8C\x83X\x82̂\xB7\x82₳
$spd_ht = "";
if ($spd_st = $aThread->getTimePerRes() and $spd_st != "-") {
- $spd_ht = '<span class="spd" style="white-space: nowrap;" title="\x82\xB7\x82₳\x81\x81\x8E\x9E\x8A\xD4/\x83\x8C\x83X">' . $spd_st . '</span>';
+ $spd_ht = '<span class="spd" style="white-space: nowrap;" title="\x83\x8C\x83X\x8AԊu\x81\x81(\x8E\x9E\x8A\xD4/\x83\x8C\x83X)">' . $spd_st . '</span>';
}
// \x83t\x83b\x83^\x95\x94\x95\xAAHTML
Modified: p2/trunk/read_new_i.php
===================================================================
--- p2/trunk/read_new_i.php 2011-10-23 13:04:01 UTC (rev 927)
+++ p2/trunk/read_new_i.php 2012-02-26 05:08:21 UTC (rev 928)
@@ -195,7 +195,7 @@
+ "rescount=" + document.frmresrange.rescount.value + "&"
+ "ttitle_en=" + document.frmresrange.ttitle_en.value + "&"
+ "ls=" + document.frmresrange.ls.value + "&";
- document.frmresrange.reset();
+ //document.frmresrange.reset();
window.location.assign(uriValue);
}
// -->
@@ -568,7 +568,7 @@
<div class="footbar">
<ul>
<li class="home"><a name="ntt_bt1" href="<?php eh($index_uri); ?>">TOP</a></li>
-<li class="other"><a onclick="all.item('footbar02').style.visibility='visible';">\x82\xBB\x82̑\xBC</a></li>
+<li class="other"><a onclick="document.getElementById('footbar02').style.visibility='visible';">\x82\xBB\x82̑\xBC</a></li>
<?php
if (!isset($GLOBALS['rnum_all_range']) or $GLOBALS['rnum_all_range'] > 0 or !empty($GLOBALS['limit_to_eq_to'])) {
if (!empty($GLOBALS['limit_to_eq_to'])) {
@@ -600,7 +600,7 @@
<filedset>
<ul>
<li class="whiteButton"><?php echo $ptitle_btm_atag; ?></li>
- <li class="grayButton" onclick="all.item('footbar02').style.visibility='hidden'">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li>
+ <li class="grayButton" onclick="document.getElementById('footbar02').style.visibility='hidden'">\x83L\x83\x83\x83\x93\x83Z\x83\x8B</li>
</ul>
</filedset>
</div>
