svnno****@sourc*****
svnno****@sourc*****
2012年 12月 22日 (土) 23:59:37 JST
Revision: 937
http://sourceforge.jp/projects/p2-php/scm/svn/commits/937
Author: akid
Date: 2012-12-22 23:59:37 +0900 (Sat, 22 Dec 2012)
Log Message:
-----------
p2/ for version 1.8.82
Modified Paths:
--------------
p2/trunk/conf/conf.inc.php
p2/trunk/conf/conf_hostcheck.php
p2/trunk/conf/conf_system.inc.php
p2/trunk/conf/conf_user_style.inc.php
p2/trunk/doc/ChangeLog.txt
p2/trunk/edit_aborn_word.php
p2/trunk/edit_conf_user.php
p2/trunk/edit_conf_user_i.php
p2/trunk/edit_indexmenui.php
p2/trunk/edit_indexmenuk.php
p2/trunk/editfavita.php
p2/trunk/editfavita_i.php
p2/trunk/editfile.php
p2/trunk/editpref.php
p2/trunk/editpref_i.php
p2/trunk/first_cont.php
p2/trunk/index.php
p2/trunk/info.php
p2/trunk/info_i.php
p2/trunk/iphone/ShowThreadK.php
p2/trunk/lib/NgAbornCtl.php
p2/trunk/lib/P2Util.php
p2/trunk/lib/ShowThread.php
p2/trunk/lib/ShowThreadK.php
p2/trunk/lib/ShowThreadPc.php
p2/trunk/lib/Thread.php
p2/trunk/lib/ThreadList.php
p2/trunk/lib/ThreadRead.php
p2/trunk/lib/UA.php
p2/trunk/lib/login_first.inc.php
p2/trunk/lib/menu.inc.php
p2/trunk/lib/mystyle_css.funcs.php
p2/trunk/lib/read_header.inc.php
p2/trunk/lib/read_new.funcs.php
p2/trunk/lib/read_res_hist.funcs.php
p2/trunk/lib/sb_header.inc.php
p2/trunk/login.php
p2/trunk/login2ch.php
p2/trunk/menu_i.php
p2/trunk/menu_k.php
p2/trunk/post.php
p2/trunk/post_form.php
p2/trunk/post_form_i.php
p2/trunk/read_copy_k.php
p2/trunk/read_filter_i.php
p2/trunk/read_filter_k.php
p2/trunk/read_new.php
p2/trunk/read_new_i.php
p2/trunk/read_new_k.php
p2/trunk/read_res_hist.php
p2/trunk/setting.php
p2/trunk/skin/blackboard.php
p2/trunk/skin/mes.php
p2/trunk/skin/metal.php
p2/trunk/skin/tangerine.php
p2/trunk/style/style_css.inc
p2/trunk/title.php
p2/trunk/viewtxt.php
-------------- next part --------------
Modified: p2/trunk/conf/conf.inc.php
===================================================================
--- p2/trunk/conf/conf.inc.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/conf/conf.inc.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -310,7 +310,7 @@
// gzip\x89”\\x82\xA9\x82ǂ\xA4\x82\xA9\x82\xCDPHP\x82Ŕ\xBB\x95ʂ\xB5\x82Ă\xAD\x82\xEA\x82\xE9\x82\xC1\x82ۂ\xA2\x82\xAF\x82\xC7
if ($_conf['enable_ob_gzhandler']
&& !ini_get('zlib.output_compression') // \x83T\x81[\x83o\x81[\x82̐ݒ\xE8\x82Ŏ\xA9\x93\xAEgzip\x88\xB3\x8Fk\x82\xAA\x97L\x8C\xF8\x82ɂȂ\xC1\x82Ă\xA2\x82Ȃ\xA2
- && strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') // \x83u\x83\x89\x83E\x83U\x82\xAAgzip\x82\xF0\x83f\x83R\x81[\x83h\x82ł\xAB\x82\xE9
+ && false !== strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') // \x83u\x83\x89\x83E\x83U\x82\xAAgzip\x82\xF0\x83f\x83R\x81[\x83h\x82ł\xAB\x82\xE9
) {
//if (!defined('SID') || !strlen(SID)) {
if ($_conf['enable_ob_gzhandler'] != 2 || UA::isK()) {
Modified: p2/trunk/conf/conf_hostcheck.php
===================================================================
--- p2/trunk/conf/conf_hostcheck.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/conf/conf_hostcheck.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -3,6 +3,7 @@
rep2 - \x83z\x83X\x83g\x92P\x88ʂł̃A\x83N\x83Z\x83X\x8B\x96\x89\xC2/\x8B\x91\x94ۂ̐ݒ\xE8\x83t\x83@\x83C\x83\x8B
\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82̐ݒ\xE8\x82́A\x95K\x97v\x82ɉ\x9E\x82\xB6\x82ĕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
+ \x81iIP\x83A\x83h\x83\x8C\x83X\x91ш\xE6\x82\xCD lib/HostCheck.php\x81j
*/
Modified: p2/trunk/conf/conf_system.inc.php
===================================================================
--- p2/trunk/conf/conf_system.inc.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/conf/conf_system.inc.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -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.81'; // rep2\x82̃o\x81[\x83W\x83\x87\x83\x93
+$_conf['p2version'] = '1.8.82'; // rep2\x82̃o\x81[\x83W\x83\x87\x83\x93
$_conf['p2name'] = 'rep2'; // rep2\x82̖\xBC\x91O\x81B
@@ -307,7 +307,7 @@
/**
* \x83X\x83N\x83\x8A\x83v\x83g\x82̎\xC0\x8Ds\x8E\x9E\x8AԐ\xA7\x8C\xC0\x82̉\xBA\x8C\xC0\x90ݒ\xE8(\x95b)
- * \x90ݒ\xE8\x92l\x82\xAA\x8Ew\x92\xE8\x95b\x96\xA2\x96\x9E\x82Ȃ\xE7\x8Ew\x92\xE8\x95b\x82Ɉ\xF8\x82\xAB\x8Fグ\x82Đݒ肷\x82\xE9
+ * PHP\x82̐ݒ\xE8\x92l\x82\xAA\x8Ew\x92\xE8\x95b\x96\xA2\x96\x9E\x82Ȃ\xE7\x8Ew\x92\xE8\x95b\x82Ɉ\xF8\x82\xAB\x8Fグ\x82Đݒ肷\x82\xE9
*
* @return void
*/
Modified: p2/trunk/conf/conf_user_style.inc.php
===================================================================
--- p2/trunk/conf/conf_user_style.inc.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/conf/conf_user_style.inc.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -19,10 +19,10 @@
// \x88ꕔ\x82̍\x80\x96ڂ́A\x81u\x83\x86\x81[\x83U\x90ݒ\xE8\x95ҏW\x81v\x82Őݒ肳\x82\xEA\x82Ă\xA2\x82\xEA\x82A\x82\xBB\x82\xBF\x82\xE7\x82̒l\x82\xAA\x97D\x90悳\x82\xEA\x82\xE9
-if (strstr(geti($_SERVER['HTTP_USER_AGENT']), 'Mac')) {
+if (false !== strpos(geti($_SERVER['HTTP_USER_AGENT']), 'Mac')) {
// Safari\x93\x99\x82\xCC WebKit\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ȃ\xE7
- if (strstr(geti($_SERVER['HTTP_USER_AGENT']), 'AppleWebKit')) {
+ if (false !== strpos(geti($_SERVER['HTTP_USER_AGENT']), 'AppleWebKit')) {
$STYLE['fontfamily'] = "Hiragino Kaku Gothic Pro"; // ("Hiragino Kaku Gothic Pro") \x8A\xEE\x96{\x82̃t\x83H\x83\x93\x83g
$STYLE['fontfamily_bold'] = ""; // ("") \x8A\xEE\x96{\x83{\x81[\x83\x8B\x83h\x97p\x83t\x83H\x83\x93\x83g
} else {
Modified: p2/trunk/doc/ChangeLog.txt
===================================================================
--- p2/trunk/doc/ChangeLog.txt 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/doc/ChangeLog.txt 2012-12-22 14:59:37 UTC (rev 937)
@@ -1,3 +1,10 @@
+2012/12/23
+ * rep2 version 1.8.82
+
+ [\x8DX\x90V] iPhone5\x82Ńt\x83H\x83\x93\x83g\x82\xAA\x96\xBE\x92\xA9\x91̂ɂȂ\xC1\x82Ă\xA2\x82\xBD\x89ӏ\x8A\x82\xF0\x81A\x83S\x83V\x83b\x83N\x91̂ɂ\xB5\x82\xBD\x81B
+ [\x8FC\x90\xB3] NG\x90ݒ\xE8\x82\xCCID\x82ŁA\x93\xFA\x95t\x82\xE0\x91ΏۂƂȂ\xC1\x82Ă\xA2\x82\xBD\x82̂\xF0ID\x82\xBE\x82\xAF\x82\xF0\x91ΏۂƂ\xB7\x82\xE9\x82悤\x82ɏC\x90\xB3\x82\xB5\x82\xBD\x81B
+ [\x8FC\x90\xB3] iPhone, Android\x82̐V\x92\x85\x82܂Ƃߓǂ݂ŁA\x83X\x83\x8C\x82\xF0\x83X\x83L\x83b\x83v\x82\xB7\x82\xE9\x81u\x81\xA5\x81v\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B
+
2012/10/23
* rep2 version 1.8.81
Modified: p2/trunk/edit_aborn_word.php
===================================================================
--- p2/trunk/edit_aborn_word.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/edit_aborn_word.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -138,7 +138,7 @@
$ar['word'] = $m[3];
$ar['re'] = ' checked';
// \x91啶\x8E\x9A\x8F\xAC\x95\xB6\x8E\x9A\x82\x8B
- if ($m[2] && strstr($m[2], 'i')) {
+ if ($m[2] && false !== strpos($m[2], 'i')) {
$ar['ic'] = ' checked';
}
// \x91啶\x8E\x9A\x8F\xAC\x95\xB6\x8E\x9A\x82\x8B
@@ -172,7 +172,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/edit_conf_user.php
===================================================================
--- p2/trunk/edit_conf_user.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/edit_conf_user.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -89,7 +89,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
@@ -437,7 +437,7 @@
// input \x93\xFC\x97͎\xAE\x82Ȃ\xE7
} else {
$type = 'text';
- if (strstr($name, 'password')) {
+ if (false !== strpos($name, 'password')) {
$type = 'password';
}
$form_ht = <<<EOP
Modified: p2/trunk/edit_conf_user_i.php
===================================================================
--- p2/trunk/edit_conf_user_i.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/edit_conf_user_i.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -95,7 +95,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php P2View::printExtraHeadersHtml(); ?>
<script type="text/javascript" src="./iui/smooth.pack.js"></script>
@@ -388,7 +388,7 @@
// input \x93\xFC\x97͎\xAE\x82Ȃ\xE7
} else {
$type = 'text';
- if (strstr($name, 'password')) {
+ if (false !== strpos($name, 'password')) {
$type = 'password';
}
$form_ht = <<<EOP
Modified: p2/trunk/edit_indexmenui.php
===================================================================
--- p2/trunk/edit_indexmenui.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/edit_indexmenui.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -40,7 +40,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/edit_indexmenuk.php
===================================================================
--- p2/trunk/edit_indexmenuk.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/edit_indexmenuk.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -38,7 +38,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/editfavita.php
===================================================================
--- p2/trunk/editfavita.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/editfavita.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -48,7 +48,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/editfavita_i.php
===================================================================
--- p2/trunk/editfavita_i.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/editfavita_i.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -48,7 +48,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/editfile.php
===================================================================
--- p2/trunk/editfile.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/editfile.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -126,7 +126,7 @@
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="ja">
+<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
Modified: p2/trunk/editpref.php
===================================================================
--- p2/trunk/editpref.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/editpref.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -108,7 +108,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
@@ -535,7 +535,7 @@
</form>\n
EOFORM;
// IE\x97p\x82\xC9form HTML\x93\xE0\x82̃^\x83O\x8AԂ̋\xF0\x8F\x9C\x8B\x8E\x90\xAE\x8C`\x82\xB7\x82\xE9
- if (strstr(geti($_SERVER['HTTP_USER_AGENT']), 'MSIE')) {
+ if (false !== strpos(geti($_SERVER['HTTP_USER_AGENT']), 'MSIE')) {
$html = ' ' . preg_replace('{>\s+<}', '><', $html);
}
}
@@ -610,7 +610,7 @@
EOFORM;
- if (strstr(geti($_SERVER['HTTP_USER_AGENT']), 'MSIE')) {
+ if (false !== strpos(geti($_SERVER['HTTP_USER_AGENT']), 'MSIE')) {
$ht = ' ' . preg_replace('/>\s+</', '><', $ht);
}
return $ht;
Modified: p2/trunk/editpref_i.php
===================================================================
--- p2/trunk/editpref_i.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/editpref_i.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -96,7 +96,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php P2View::printExtraHeadersHtml(); ?>
<?php P2View::printStyleTagImportIuiCss(); ?>
@@ -327,7 +327,7 @@
</form>\n
EOFORM;
// IE\x97p\x82\xC9form HTML\x93\xE0\x82̃^\x83O\x8AԂ̋\xF0\x8F\x9C\x8B\x8E\x90\xAE\x8C`\x82\xB7\x82\xE9
- if (strstr(geti($_SERVER['HTTP_USER_AGENT']), 'MSIE')) {
+ if (false !== strpos(geti($_SERVER['HTTP_USER_AGENT']), 'MSIE')) {
$html = ' ' . preg_replace('{>\s+<}', '><', $html);
}
}
@@ -353,7 +353,7 @@
EOFORM;
- if (strstr(geti($_SERVER['HTTP_USER_AGENT']), 'MSIE')) {
+ if (false !== strpos(geti($_SERVER['HTTP_USER_AGENT']), 'MSIE')) {
$ht = ' ' . preg_replace('/>\s+</', '><', $ht);
}
return $ht;
Modified: p2/trunk/first_cont.php
===================================================================
--- p2/trunk/first_cont.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/first_cont.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -39,7 +39,7 @@
//=============================================================
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/index.php
===================================================================
--- p2/trunk/index.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/index.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -52,7 +52,7 @@
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
"http://www.w3.org/TR/html4/frameset.dtd">
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml($frameset = true);
Modified: p2/trunk/info.php
===================================================================
--- p2/trunk/info.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/info.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -246,7 +246,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/info_i.php
===================================================================
--- p2/trunk/info_i.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/info_i.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -260,7 +260,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/iphone/ShowThreadK.php
===================================================================
--- p2/trunk/iphone/ShowThreadK.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/iphone/ShowThreadK.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -161,6 +161,8 @@
$date_id = $resar[2];
$msg = $resar[3];
+ $id = $this->parseDateId($date_id);
+
// \x83f\x83t\x83H\x83\x8B\x83g\x82̖\xBC\x91O\x82́ANG\x81E\x82\xA0\x82ځ[\x82\xF1\x82ƃ\x8C\x83X\x8C\x9F\x8D\xF5\x82̑ΏۊO\x82Ƃ\xB7\x82\xE9
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
@@ -211,7 +213,7 @@
*/
$aborned_res = "<span id=\"r{$i}\" name=\"r{$i}\"></span>\n";
- if (false !== $this->checkAborns($nameForAborn, $mail, $date_id, $msg)) {
+ if (false !== $this->checkAborns($nameForAborn, $mail, $id, $msg)) {
return $aborned_res;
}
@@ -230,7 +232,7 @@
if (false !== $this->ngAbornCheck('ng_mail', $mail)) {
$isNgMail = true;
}
- if (false !== $this->ngAbornCheck('ng_id', $date_id)) {
+ if (false !== $this->ngAbornCheck('ng_id', $id)) {
$isNgId = true;
}
if (false !== ($a_ng_msg = $this->ngAbornCheck('ng_msg', $msg))) {
@@ -304,7 +306,7 @@
// NGID\x95ϊ\xB7
} elseif ($isNgId) {
$date_id = preg_replace(
- '|ID: ?([0-9A-Za-z/.+]{8,11})|',
+ '|ID: ?([0-9A-Za-z/.+]{8,11}).*|',
"<s><font color=\"{$STYLE['read_ngword']}\">\\0</font></s>",
$date_id
);
@@ -320,15 +322,15 @@
}
*/
- $id = "qr{$i}of{$this->thread->key}";
+ $rid = "r{$i}of{$this->thread->key}";
// iphone\x97p
// \x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[\x81iread_new\x92\x86\x82͖\xA2\x91Ή\x9E\x82Ƃ\xB7\x82\xE9\x81j
if ($_conf['enable_spm'] and empty($GLOBALS['_read_new_html'])) {
- //$onPopUp_at = " onmouseup=\"showSPM({$this->thread->spmObjName},{$i},'{$id}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
+ //$onPopUp_at = " onmouseup=\"showSPM({$this->thread->spmObjName},{$i},'{$rid}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
// onmouseout="hideResPopUp()" \x82͊O\x82\xB7\x95K\x97v\x82\xAA\x82\xA0\x82\xE9
- $onPopUp_at = " onmouseup=\"showSPM({$this->thread->spmObjName},{$i},'{$id}',event,this)\"";
+ $onPopUp_at = " onmouseup=\"showSPM({$this->thread->spmObjName},{$i},'{$rid}',event,this)\"";
//$is = "<a href=\"javascript:void(0);\" class=\"resnum\"{$onPopUp_at}>{$i}</a>";
$is = "<span class=\"resnum\"{$onPopUp_at}>{$i}</span>";
} else {
@@ -370,7 +372,7 @@
}
}
- if (strlen($name) > 0 or strlen($mail) > 0 && !$is_sage) {
+ if (strlen($name) or strlen($mail) && !$is_sage) {
$tores .= ' ';
}
@@ -380,8 +382,8 @@
if ($_conf['flex_idpopup'] == 1) {
if (preg_match('|ID: ?([0-9a-zA-Z/.+]{8,11})|', $date_id, $matches)) {
- $id = $matches[1];
- if ($this->thread->idcount[$id] > 1) {
+ $idkey = $matches[1];
+ if ($this->thread->idcount[$idkey] > 1) {
$date_id = preg_replace_callback(
'|ID: ?([0-9A-Za-z/.+]{8,11})|',
array($this, 'idfilter_callback'), $date_id
@@ -484,6 +486,8 @@
$date_id = isset($resar[2]) ? $resar[2] : '';
$msg = isset($resar[3]) ? $resar[3] : '';
+ $id = $this->parseDateId($date_id);
+
// \x83f\x83t\x83H\x83\x8B\x83g\x82̖\xBC\x91O\x82́ANG\x81E\x82\xA0\x82ځ[\x82\xF1\x82ƃ\x8C\x83X\x8C\x9F\x8D\xF5\x82̑ΏۊO\x82Ƃ\xB7\x82\xE9
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
@@ -512,8 +516,8 @@
$no_trim_id_flag = false;
// \x82\xA0\x82ځ[\x82\xF1\x83`\x83F\x83b\x83N
- if (false !== $this->checkAborns($nameForAborn, $mail, $date_id, $msg)) {
- $name = $date_id = $msg = '\x82\xA0\x82ځ[\x82\xF1';
+ if (false !== $this->checkAborns($nameForAborn, $mail, $id, $msg)) {
+ $name = $msg = '\x82\xA0\x82ځ[\x82\xF1'; // $date_id
$mail = '';
} else {
@@ -529,7 +533,7 @@
if (false !== $this->ngAbornCheck('ng_mail', $mail)) {
$isNgMail = true;
}
- if (false !== $this->ngAbornCheck('ng_id', $date_id)) {
+ if (false !== $this->ngAbornCheck('ng_id', $id)) {
$isNgId = true;
}
if (false !== ($a_ng_msg = $this->ngAbornCheck('ng_msg', $msg))) {
@@ -578,7 +582,7 @@
// NGID\x95ϊ\xB7
} elseif ($isNgId) {
- $date_id = preg_replace('|ID: ?([0-9A-Za-z/.+]{8,11})|', "<s><font color=\"{$STYLE['read_ngword']}\">\\0</font></s>", $date_id);
+ $date_id = preg_replace('|ID: ?([0-9A-Za-z/.+]{8,11}).*|', "<s><font color=\"{$STYLE['read_ngword']}\">\\0</font></s>", $date_id);
// $date_id = sprintf('<s><font color="%s">%s</font></s>', $STYLE['read_ngword'], $date_id);
$msg = $kakunin_msg_ht;
}
@@ -588,8 +592,8 @@
// ID\x83t\x83B\x83\x8B\x83^
if ($_conf['flex_idpopup'] == 1) {
if (preg_match('|ID: ?([0-9a-zA-Z/.+]{8,11})|', $date_id, $matches)) {
- $id = $matches[1];
- if ($this->thread->idcount[$id] > 1) {
+ $idkey = $matches[1];
+ if ($this->thread->idcount[$idkey] > 1) {
$date_id = preg_replace_callback('|ID: ?([0-9A-Za-z/.+]{8,11})|', array($this, 'idfilter_callback'), $date_id);
} else {
if ($_conf['k_clip_unique_id']) {
@@ -638,7 +642,7 @@
}
*/
- $tores .="<br>\n"; // \x93\xFA\x95t\x82\xC6ID
+ $tores .= "<br>\n"; // \x93\xFA\x95t\x82\xC6ID
$tores .= "{$msg}\n"; // \x93\xE0\x97e iPhone\x97p\x82\xC9hr\x8D폜
// \x82܂Ƃ߂ăt\x83B\x83\x8B\x83^\x90F\x95\xAA\x82\xAF
@@ -878,7 +882,7 @@
// URL\x82\xF0\x83p\x81[\x83X
$purl = @parse_url($url);
- if (!$purl || !isset($purl['host']) || !strstr($purl['host'], '.') || $purl['host'] == '127.0.0.1') {
+ if (!$purl || !isset($purl['host']) || false === strpos($purl['host'], '.') || $purl['host'] == '127.0.0.1') {
return $html;
}
@@ -980,7 +984,7 @@
$attributes = array(
'onmouseup' => "showResPopUp('q{$qnum}of{$this->thread->key}',event)",
// d=1\x82̓_\x83~\x81[\x81B\x82Ȃ\xBA\x82\xA9return false\x82\xBE\x82\xAF\x82\xBE\x82ƌ\xF8\x89ʂ\xAA\x82Ȃ\xA2\x82悤\x82̂ŁB
- 'onclick' => 'var dummy=1; return false;'
+ 'onclick' => 'var d=1; return false;'
//'onmouseout' => "hideResPopUp('q{$qnum}of{$this->thread->key}')"
);
}
@@ -1044,20 +1048,20 @@
global $_conf;
$idstr = $s[0]; // ID:xxxxxxxxxx
- $id = $s[1]; // xxxxxxxxxx
+ $idkey = $s[1]; // xxxxxxxxxx
$idflag = ''; // \x8Cg\x91\xD1/PC\x8E\xAF\x95ʎq
// ID\x82\xCD8\x8C\x85\x82܂\xBD\x82\xCD10\x8C\x85(+\x8Cg\x91\xD1/PC\x8E\xAF\x95ʎq)\x82Ɖ\xBC\x92肵\x82\xC4
/*
- if (strlen($id) % 2 == 1) {
- $id = substr($id, 0, -1);
- $idflag = substr($id, -1);
+ if (strlen($idkey) % 2 == 1) {
+ $idkey = substr($idkey, 0, -1);
+ $idflag = substr($idkey, -1);
} elseif (isset($s[2])) {
$idflag = $s[2];
}
*/
- if (isset($this->thread->idcount[$id]) && $this->thread->idcount[$id] > 0) {
+ if (isset($this->thread->idcount[$idkey]) && $this->thread->idcount[$idkey] > 0) {
$filter_url = UriUtil::buildQueryUri($_conf['read_php'],
array(
'host' => $this->thread->host,
@@ -1069,12 +1073,12 @@
'field' => 'id',
'method' => 'just',
'match' => 'on',
- 'word' => $id,
+ 'word' => $idkey,
UA::getQueryKey() => UA::getQueryValue()
)
);
$num_ht = sprintf('(<a href="%s">%s</a>)',
- hs($filter_url), $this->thread->idcount[$id]
+ hs($filter_url), $this->thread->idcount[$idkey]
);
return "{$idstr}{$num_ht}";
}
@@ -1290,7 +1294,6 @@
return false;
}
-
/**
* YouTube\x83\x8A\x83\x93\x83N\x95ϊ\xB7\x83v\x83\x89\x83O\x83C\x83\x93
*
Modified: p2/trunk/lib/NgAbornCtl.php
===================================================================
--- p2/trunk/lib/NgAbornCtl.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/NgAbornCtl.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -114,7 +114,7 @@
$ar['word'] = $matches[3];
}
// \x91啶\x8E\x9A\x8F\xAC\x95\xB6\x8E\x9A\x82\x8B
- if ($matches[2] && strstr($matches[2], 'i')) {
+ if ($matches[2] && false !== strpos($matches[2], 'i')) {
if ($ar['regex'] == 'mb_ereg') {
$ar['regex'] = 'mb_eregi';
} else {
@@ -134,12 +134,12 @@
}
/**
- * \x83\x8C\x83X\x82̂\xA0\x82ځ[\x82\xF1\x82\xF0\x82܂Ƃ߂ă`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81i\x96\xBC\x91O\x81A\x83\x81\x81[\x83\x8B\x81A\x93\xFA\x95t\x81A\x83\x81\x83b\x83Z\x81[\x83W\x81j
+ * \x83\x8C\x83X\x82̂\xA0\x82ځ[\x82\xF1\x82\xF0\x82܂Ƃ߂ă`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81i\x96\xBC\x91O\x81A\x83\x81\x81[\x83\x8B\x81AID\x81A\x83\x81\x83b\x83Z\x81[\x83W\x81j
*
* @access public
* @return string|false \x83}\x83b\x83`\x82\xB5\x82\xBD\x82\xE7\x83}\x83b\x83`\x95\xB6\x8E\x9A\x97\xF1\x81B\x83}\x83b\x83`\x82\xB5\x82Ȃ\xAF\x82\xEA\x82\xCEfalse
*/
- function checkAborns($name, $mail, $date_id, $msg, $bbs, $ttitle_hc)
+ function checkAborns($name, $mail, $id, $msg, $bbs, $ttitle_hc)
{
if (false !== ($match_word = NgAbornCtl::ngAbornCheck('aborn_name', strip_tags($name), $bbs, $ttitle_hc))) {
return $match_word;
@@ -147,7 +147,7 @@
if (false !== ($match_word = NgAbornCtl::ngAbornCheck('aborn_mail', $mail, $bbs, $ttitle_hc))) {
return $match_word;
}
- if (false !== ($match_word = NgAbornCtl::ngAbornCheck('aborn_id', $date_id, $bbs, $ttitle_hc))) {
+ if (false !== ($match_word = NgAbornCtl::ngAbornCheck('aborn_id', $id, $bbs, $ttitle_hc))) {
return $match_word;
}
if (false !== ($match_word = NgAbornCtl::ngAbornCheck('aborn_msg', $msg, $bbs, $ttitle_hc))) {
@@ -210,7 +210,7 @@
}
// \x92P\x8F\x83\x82ɕ\xB6\x8E\x9A\x97܂܂\xEA\x82邩\x82ǂ\xA4\x82\xA9\x82\xF0\x83`\x83F\x83b\x83N
} else {
- if (strstr($subject, $v['word'])) {
+ if (false !== strpos($subject, $v['word'])) {
NgAbornCtl::ngAbornUpdate($code, $k);
$match_word = $v['word'];
break;
Modified: p2/trunk/lib/P2Util.php
===================================================================
--- p2/trunk/lib/P2Util.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/P2Util.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -1777,7 +1777,7 @@
// p2_res_hist.dat.php \x82𖼑O\x82\xF0\x95ς\xA6\x82ăo\x83b\x83N\x83A\x83b\x83v\x81B\x81i\x82\xE0\x82\xA4\x97v\x82\xE7\x82Ȃ\xA2\x81j
$bak_file = $_conf['p2_res_hist_dat_php'] . '.bak';
- if (strstr(PHP_OS, 'WIN') and file_exists($bak_file)) {
+ if (false !== strpos(PHP_OS, 'WIN') and file_exists($bak_file)) {
unlink($bak_file);
}
rename($_conf['p2_res_hist_dat_php'], $bak_file);
@@ -2066,7 +2066,7 @@
<?php
// IE\x83f\x83t\x83H\x83\x8B\x83g\x82\xCC403\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x95\\x8E\xA6\x82\xB3\x82\xB9\x82Ȃ\xA2\x82悤\x82ɗe\x97ʂ\xF0\x89҂\xAE\x82\xBD\x82߃_\x83~\x81[\x83X\x83y\x81[\x83X\x82\xF0\x8Fo\x97͂\xB7\x82\xE9
$ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT']: null;
- if (strstr($ua, 'MSIE')) {
+ if (false !== strpos($ua, 'MSIE')) {
for ($i = 0; $i < 512; $i++) {
echo ' ';
}
Modified: p2/trunk/lib/ShowThread.php
===================================================================
--- p2/trunk/lib/ShowThread.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/ShowThread.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -213,6 +213,22 @@
}
/**
+ * \x93\xFA\x95t\x93\xFA\x8E\x9EID\x83t\x83B\x81[\x83\x8B\x83h\x82\xA9\x82\xE7\x81A\x81uID: xxx\x81v\x88ȍ~\x82\xF0\x8E\xE6\x82\xE8\x8Fo\x82\xB7\x81B\x81i\x82܂\xBFBBS\x82ł̓\x8A\x83\x82\x83z\x82\xAA\x8A܂܂\xEA\x82邱\x82Ƃ\xE0\x81j
+ *
+ * @access protected
+ * @param string $date_id (beid\x82Ȃǂ\xE0\x8A܂܂\xEA\x82\xE9\x83P\x81[\x83X\x82\xAA\x82\xA0\x82\xE9)
+ * @return string
+ */
+ function parseDateId($date_id)
+ {
+ $id = null;
+ if (preg_match('| (ID: ?[0-9a-zA-Z/.+]{8,11}.*)|', $date_id, $m)) {
+ $id = $m[1];
+ }
+ return $id;
+ }
+
+ /**
* BE\x83v\x83\x8D\x83t\x83@\x83C\x83\x8B\x83\x8A\x83\x93\x83N\x95ϊ\xB7
*
* @access protected
@@ -489,11 +505,16 @@
}
*/
+ $quote_res_nums = array();
if (preg_match_all($this->getAnchorRegex('/(?:^|%prefix%|%delimiter%)(%a_num%)/'), $name, $matches)) {
foreach ($matches[1] as $a_quote_res_num) {
- $quote_res_nums[] = (int)mb_convert_kana($a_quote_res_num, 'n');
+ if ($num = (int)mb_convert_kana($a_quote_res_num, 'n')) {
+ $quote_res_nums[] = $num;
+ }
}
- return array_unique($quote_res_nums);
+ if ($quote_res_nums) {
+ return array_unique($quote_res_nums);
+ }
}
return false;
@@ -522,7 +543,9 @@
if (preg_match($this->getAnchorRegex('/%range_delimiter%/'), $a_quote_res_num)) {
continue;
}
- $quote_res_nums[] = (int)mb_convert_kana($a_quote_res_num, 'n');
+ if ($num = (int)mb_convert_kana($a_quote_res_num, 'n')) {
+ $quote_res_nums[] = $num;
+ }
}
}
}
Modified: p2/trunk/lib/ShowThreadK.php
===================================================================
--- p2/trunk/lib/ShowThreadK.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/ShowThreadK.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -151,7 +151,9 @@
$mail = $resar[1];
$date_id = $resar[2];
$msg = $resar[3];
-
+
+ $id = $this->parseDateId($date_id);
+
// \x83f\x83t\x83H\x83\x8B\x83g\x82̖\xBC\x91O\x82́ANG\x81E\x82\xA0\x82ځ[\x82\xF1\x82ƃ\x8C\x83X\x8C\x9F\x8D\xF5\x82̑ΏۊO\x82Ƃ\xB7\x82\xE9
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
@@ -202,7 +204,7 @@
*/
$aborned_res = "<span id=\"r{$i}\" name=\"r{$i}\"></span>\n";
- if (false !== $this->checkAborns($nameForAborn, $mail, $date_id, $msg)) {
+ if (false !== $this->checkAborns($nameForAborn, $mail, $id, $msg)) {
return $aborned_res;
}
@@ -221,7 +223,7 @@
if (false !== $this->ngAbornCheck('ng_mail', $mail)) {
$isNgMail = true;
}
- if (false !== $this->ngAbornCheck('ng_id', $date_id)) {
+ if (false !== $this->ngAbornCheck('ng_id', $id)) {
$isNgId = true;
}
if (false !== ($a_ng_msg = $this->ngAbornCheck('ng_msg', $msg))) {
@@ -278,7 +280,7 @@
// NGID\x95ϊ\xB7
} elseif ($isNgId) {
$date_id = preg_replace(
- '|ID: ?([0-9A-Za-z/.+]{8,11})|',
+ '|ID: ?([0-9A-Za-z/.+]{8,11}).*|',
"<s><font color=\"{$STYLE['read_ngword']}\">\\0</font></s>",
$date_id
);
@@ -335,8 +337,8 @@
if ($_conf['flex_idpopup'] == 1) {
if (preg_match('|ID: ?([0-9a-zA-Z/.+]{8,11})|', $date_id, $matches)) {
- $id = $matches[1];
- if ($this->thread->idcount[$id] > 1) {
+ $idkey = $matches[1];
+ if ($this->thread->idcount[$idkey] > 1) {
$date_id = preg_replace_callback(
'|ID: ?([0-9A-Za-z/.+]{8,11})|',
array($this, 'idfilter_callback'), $date_id
@@ -617,7 +619,7 @@
// URL\x82\xF0\x83p\x81[\x83X
$purl = @parse_url($url);
- if (!$purl || !isset($purl['host']) || !strstr($purl['host'], '.') || $purl['host'] == '127.0.0.1') {
+ if (!$purl || !isset($purl['host']) || false === strpos($purl['host'], '.') || $purl['host'] == '127.0.0.1') {
return $html;
}
Modified: p2/trunk/lib/ShowThreadPc.php
===================================================================
--- p2/trunk/lib/ShowThreadPc.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/ShowThreadPc.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -118,6 +118,8 @@
$date_id = $resar[2];
$msg = $resar[3];
+ $id = $this->parseDateId($date_id);
+
// \x83f\x83t\x83H\x83\x8B\x83g\x82̖\xBC\x91O\x82́ANG\x81E\x82\xA0\x82ځ[\x82\xF1\x82ƃ\x8C\x83X\x8C\x9F\x8D\xF5\x82̑ΏۊO\x82Ƃ\xB7\x82\xE9
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
@@ -145,7 +147,7 @@
// }}}
// {{{ \x82\xA0\x82ځ[\x82\xF1\x83`\x83F\x83b\x83N\x81i\x96\xBC\x91O\x81A\x83\x81\x81[\x83\x8B\x81AID\x81A\x83\x81\x83b\x83Z\x81[\x83W\x81j
- if (false !== $this->checkAborns($nameForAborn, $mail, $date_id, $msg)) {
+ if (false !== $this->checkAborns($nameForAborn, $mail, $id, $msg)) {
// \x96\xBC\x91O
$aborned_res_html = '<dt id="r' . $i . '" class="aborned"><span> </span></dt>' . "\n";
@@ -186,7 +188,7 @@
if (false !== $this->ngAbornCheck('ng_mail', $mail)) {
$isNgMail = true;
}
- if (false !== $this->ngAbornCheck('ng_id', $date_id)) {
+ if (false !== $this->ngAbornCheck('ng_id', $id)) {
$isNgId = true;
}
if (false !== ($a_ng_msg = $this->ngAbornCheck('ng_msg', $msg))) {
@@ -249,7 +251,7 @@
// NGID\x95ϊ\xB7
} elseif ($isNgId) {
$date_id = preg_replace(
- '|ID: ?([0-9A-Za-z/.+]{8,11})|',
+ '|ID: ?([0-9A-Za-z/.+]{8,11}).*|',
"<s class=\"ngword\" onClick=\"showHide('ngn{$_ngaborns_head_hits}', 'ngword_cont');\"{$atTitle}>NG\x81F\\0</s>",
$date_id
);
@@ -273,10 +275,12 @@
}
*/
+ $rid = "r{$i}of{$this->thread->key}";
+
// \x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[
$onPopUp_at = '';
if ($_conf['enable_spm']) {
- $onPopUp_at = " onmouseover=\"showSPM({$this->thread->spmObjName},{$i},'{$id}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
+ $onPopUp_at = " onmouseover=\"showSPM({$this->thread->spmObjName},{$i},'{}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
}
if ($this->thread->onthefly) {
@@ -309,7 +313,7 @@
// \x83\x81\x81[\x83\x8B
if ($mail) {
- if (strstr($mail, 'sage') && $STYLE['read_mail_sage_color']) {
+ if (false !== strpos($mail, 'sage') && $STYLE['read_mail_sage_color']) {
$tores .= "<span class=\"sage\">{$mail}</span> \x81F";
} elseif ($STYLE['read_mail_color']) {
$tores .= "<span class=\"mail\">{$mail}</span> \x81F";
@@ -321,8 +325,8 @@
// ID\x83t\x83B\x83\x8B\x83^
if ($_conf['flex_idpopup'] == 1) {
if (preg_match('|ID: ?([0-9A-Za-z/.+]{8,11})|', $date_id, $matches)) {
- $id = $matches[1];
- if ($this->thread->idcount[$id] > 1) {
+ $idkey = $matches[1];
+ if ($this->thread->idcount[$idkey] > 1) {
$date_id = preg_replace_callback(
'|ID: ?([0-9A-Za-z/.+]{8,11})|',
array($this, 'idfilter_callback'), $date_id
@@ -403,7 +407,9 @@
$mail = isset($resar[1]) ? $resar[1] : '';
$date_id = isset($resar[2]) ? $resar[2] : '';
$msg = isset($resar[3]) ? $resar[3] : '';
-
+
+ $id = $this->parseDateId($date_id);
+
// \x83f\x83t\x83H\x83\x8B\x83g\x82̖\xBC\x91O\x82́ANG\x81E\x82\xA0\x82ځ[\x82\xF1\x82ƃt\x83B\x83\x8B\x83^\x8C\x9F\x8D\xF5\x82̑ΏۊO\x82Ƃ\xB7\x82\xE9
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
@@ -411,8 +417,8 @@
}
// \x82\xA0\x82ځ[\x82\xF1\x83`\x83F\x83b\x83N
- if (false !== $this->checkAborns($nameForAborn, $mail, $date_id, $msg)) {
- $name = $date_id = $msg = '\x82\xA0\x82ځ[\x82\xF1';
+ if (false !== $this->checkAborns($nameForAborn, $mail, $id, $msg)) {
+ $name = $msg = '\x82\xA0\x82ځ[\x82\xF1'; // $date_id
$mail = '';
// "$i \x81F\x82\xA0\x82ځ[\x82\xF1 \x81F\x82\xA0\x82ځ[\x82\xF1<br>\x82\xA0\x82ځ[\x82\xF1<br>\n"
@@ -429,7 +435,7 @@
if (false !== $this->ngAbornCheck('ng_mail', $mail)) {
$isNgMail = true;
}
- if (false !== $this->ngAbornCheck('ng_id', $date_id)) {
+ if (false !== $this->ngAbornCheck('ng_id', $id)) {
$isNgId = true;
}
if (false !== ($a_ng_msg = $this->ngAbornCheck('ng_msg', $msg))) {
@@ -441,13 +447,13 @@
//$date_id = $this->transDateId($date_id);
// BE\x83v\x83\x8D\x83t\x83@\x83C\x83\x8B\x83\x8A\x83\x93\x83N\x95ϊ\xB7
- $date_id = $this->replaceBeId($date_id, $i);
+ $id = $this->replaceBeId($id, $i);
// HTML\x83|\x83b\x83v\x83A\x83b\x83v
if ($_conf['iframe_popup']) {
- $date_id = preg_replace_callback(
+ $id = preg_replace_callback(
"{<a href=\"(http://[-_.!~*()a-zA-Z0-9;/?:@&=+\$,%#]+)\"({$_conf['ext_win_target_at']})>((\?#*)|(Lv\.\d+))</a>}",
- array($this, 'iframePopupCallback'), $date_id
+ array($this, 'iframePopupCallback'), $id
);
}
@@ -483,7 +489,7 @@
// NGID\x95ϊ\xB7
} elseif ($isNgId) {
$date_id = preg_replace(
- '|ID: ?([0-9A-Za-z/.+]{8,11})|',
+ '|ID: ?([0-9A-Za-z/.+]{8,11}).*|',
"<s class=\"ngword\" onClick=\"showHide('ngn{$_ngaborns_head_hits}', 'ngword_cont');\"{$atTitle}>NG\x81F\\0</s>",
$date_id
);
@@ -499,9 +505,11 @@
EOMSG;
}
+ $rid = "qr{$i}of{$this->thread->key}";
+
// \x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[
if ($_conf['enable_spm']) {
- $onPopUp_at = " onmouseover=\"showSPM({$this->thread->spmObjName},{$i},'{$id}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
+ $onPopUp_at = " onmouseover=\"showSPM({$this->thread->spmObjName},{$i},'{}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
$i = "<a href=\"javascript:void(0);\" class=\"resnum\"{$onPopUp_at}>{$i}</a>";
}
@@ -708,7 +716,7 @@
// URL\x82\xF0\x83p\x81[\x83X
$purl = @parse_url($url);
- if (!$purl || !isset($purl['host']) || !strstr($purl['host'], '.') || $purl['host'] == '127.0.0.1') {
+ if (!$purl || !isset($purl['host']) || false === strpos($purl['host'], '.') || $purl['host'] == '127.0.0.1') {
return $html;
}
Modified: p2/trunk/lib/Thread.php
===================================================================
--- p2/trunk/lib/Thread.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/Thread.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -361,8 +361,8 @@
$l = fgets($fp, 32800);
fclose($fp);
$firstdatline = rtrim($l);
- if (strstr($firstdatline, "<>")) {
- $datline_sepa = "<>";
+ if (false !== strpos($firstdatline, '<>')) {
+ $datline_sepa = '<>';
} else {
$datline_sepa = ",";
$this->dat_type = "2ch_old";
Modified: p2/trunk/lib/ThreadList.php
===================================================================
--- p2/trunk/lib/ThreadList.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/ThreadList.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -182,7 +182,7 @@
if (!file_exists($theidx)) {
if ($datlines = file($dat_bbs_dir . DIRECTORY_SEPARATOR . $entry)) {
$firstdatline = rtrim($datlines[0]);
- if (strstr($firstdatline, '<>')) {
+ if (false !== strpos($firstdatline, '<>')) {
$datline_sepa = '<>';
} else {
$datline_sepa = ',';
Modified: p2/trunk/lib/ThreadRead.php
===================================================================
--- p2/trunk/lib/ThreadRead.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/ThreadRead.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -695,7 +695,7 @@
if ($marudatlines) {
$firstline = array_shift($marudatlines);
// \x83`\x83\x83\x83\x93\x83N\x82Ƃ\xA9
- if (!strstr($firstline, "+OK")) {
+ if (false !== strpos($firstline, '+OK')) {
$secondline = array_shift($marudatlines);
}
$cont = '';
@@ -1194,8 +1194,8 @@
}
$first_datline = rtrim($first_line);
- if (strstr($first_datline, "<>")) {
- $datline_sepa = "<>";
+ if (false !== strpos($first_datline, '<>')) {
+ $datline_sepa = '<>';
} else {
$datline_sepa = ",";
$this->dat_type = "2ch_old";
@@ -1305,7 +1305,7 @@
}
$first_datline = rtrim($first_line);
- if (strstr($first_datline, '<>')) {
+ if (false !== strpos($first_datline, '<>')) {
$datline_sepa = '<>';
} else {
$datline_sepa = ',';
@@ -1469,7 +1469,7 @@
$ls = $this->ls;
// n\x82\xF0\x8A܂\xF1\x82ł\xA2\x82\xE9\x8Fꍇ\x82́A>>1\x82\xF0\x95\\x8E\xA6\x82\xB5\x82Ȃ\xA2\x81i$nofirst\x81j
- if (strstr($ls, 'n')) {
+ if (false !== strpos($ls, 'n')) {
$nofirst = true;
$ls = preg_replace("/n/", "", $ls);
}
@@ -1624,7 +1624,7 @@
mb_convert_variables('SJIS-win', 'eucJP-win', $this->datlines);
}
- if (!strstr($this->datlines[0], '<>')) {
+ if (false === strpos($this->datlines[0], '<>')) {
$this->dat_type = '2ch_old';
}
}
Modified: p2/trunk/lib/UA.php
===================================================================
--- p2/trunk/lib/UA.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/UA.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -17,7 +17,7 @@
// @see setIPhoneGroupQuery() // b=i
$GLOBALS['_UA_iphonegroup_query'] = 'i';
-$GLOBALS['_UA_force_mode'] = null;
+$GLOBALS['_UA_force_mode'] = null; // 12/11/03\x8C\xBB\x8D݁A\x97\x98\x97p\x82\xB5\x82Ă\xA2\x82Ȃ\xA2
// }}}
@@ -29,7 +29,7 @@
class UA
{
/**
- * \x8B\xAD\x90\xA7\x93I\x82Ƀ\x82\x81[\x83h\x81ipc, k\x81j\x82\xF0\x8Ew\x92肷\x82\xE9
+ * \x8B\xAD\x90\xA7\x93I\x82Ƀ\x82\x81[\x83h\x81ipc, k\x81j\x82\xF0\x8Ew\x92肷\x82\xE9\x81BUA\x96\xB3\x8Ew\x92莞\x82ɗL\x8C\xF8\x81B
* \x81i\x83N\x83G\x83\x8A\x81[\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x82킯\x82ł͂Ȃ\xA2\x81j
*/
function setForceMode($v)
@@ -79,8 +79,8 @@
{
static $cache_ = null;
- // \x8B\xAD\x90\xA7\x8Ew\x92肪\x82\xA0\x82\xEA\x82\xCE
- if (isset($GLOBALS['_UA_force_mode'])) {
+ // UA\x96\xB3\x8Ew\x92\xE8\x82ŁA\x8B\xAD\x90\xA7\x8Ew\x92肪\x82\xA0\x82\xEA\x82\xCE
+ if (!$ua && isset($GLOBALS['_UA_force_mode'])) {
// \x82\xB1\x82\xB1\x82̓L\x83\x83\x83b\x83V\x83\x85\x82\xB5\x82Ȃ\xA2
return ($GLOBALS['_UA_force_mode'] == $GLOBALS['_UA_mobile_query']);
}
@@ -125,7 +125,7 @@
}
/**
- * UA\x82\xAAiPhone, iPod touch\x82Ȃ\xE7true\x82\xF0\x95Ԃ\xB7\x81B
+ * UA\x82\xAAiPhone, iPod touch\x82Ȃ\xE7true\x82\xF0\x95Ԃ\xB7\x81B\x81i\x81\xA6iPad\x82\xF0\x8A܂߂Ă\xA2\x82\xE9\x81j
*
* @static
* @access public
@@ -136,8 +136,10 @@
{
static $cache_ = null;
- // \x8B\xAD\x90\xA7\x8Ew\x92肪\x82\xA0\x82\xEA\x82`\x83F\x83b\x83N
- if (isset($GLOBALS['_UA_force_mode'])) {
+ $ua = $aua;
+
+ // UA\x96\xB3\x8Ew\x92\xE8\x82ŁA\x8B\xAD\x90\xA7\x8Ew\x92肪\x82\xA0\x82\xEA\x82`\x83F\x83b\x83N
+ if (!$ua && isset($GLOBALS['_UA_force_mode'])) {
// \x88ڍs\x82̕X\x8F\xE3\x81A\x8C\xF8\x97͂\xF0\x8E\xE3\x82߂Ă\xA2\x82\xE9
// return ($GLOBALS['_UA_force_mode'] == $GLOBALS['_UA_iphonegroup_query']);
if ($GLOBALS['_UA_force_mode'] == $GLOBALS['_UA_iphonegroup_query']) {
@@ -145,10 +147,8 @@
}
}
- $ua = $aua;
-
// UA\x82̈\x{4140AA}\x96\xB3\x8Ew\x92\xE8\x82Ȃ\xE7\x81A
- if (is_null($aua)) {
+ if (is_null($ua)) {
// \x83N\x83G\x83\x8A\x81[\x8Ew\x92\xE8\x82\xF0\x8EQ\x8F\xC6
if (UA::getQueryValue()) {
//// \x8C\xE3\x95\xFB\x8C݊\xB7\x8F\xE3\x81Ab=k\x82ł\xE0iPhone\x82Ƃ݂Ȃ\xB7\x82\xB1\x82Ƃ\xF0\x8B\x96\x82\xB7\x81B
@@ -176,15 +176,15 @@
// iPod touch
// Mozilla/5.0 (iPod; U; CPU like Mac OS X; ja-jp) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3A110a Safari/419.3
- if (preg_match('/(iPhone|iPod)/', $ua)) {// || UA::isAndroidWebKit($ua)) { // android\x82\xF0\x8A܂߂Ă\xA2\x82Ȃ\xA2\x82̂͂Ȃ\xF1\x82ł\xBE\x82\xC1\x82\xAF\x81H
+ if (preg_match('/(iPhone|iPod);/', $ua)) {// || UA::isAndroidWebKit($ua)) { // android\x82\xF0\x8A܂߂Ă\xA2\x82Ȃ\xA2\x82̂͂Ȃ\xF1\x82ł\xBE\x82\xC1\x82\xAF\x81H
$isiPhoneGroup = true;
-
+
// iPad 2010/5/29
// Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; ja-jp) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B367 Safari/531.21.10
- } elseif (preg_match('/(iPad)/', $ua)) {
+ } elseif (preg_match('/iPad;/', $ua)) {
$isiPhoneGroup = true;
}
-
+
// UA\x82̈\x{4140AA}\x96\xB3\x8Ew\x92\xE8\x82Ȃ\xE7\x81A\x83L\x83\x83\x83b\x83V\x83\x85\x95ۑ\xB6
if (is_null($aua)) {
$cache_ = $isiPhoneGroup;
@@ -525,6 +525,7 @@
return false;
}
+
/**
* UA\x82\xAAAndroid\x81i\x82\xC5Webkit\x81j\x82Ȃ\xE7true\x82\xF0\x95Ԃ\xB7\x81B
*
@@ -568,7 +569,7 @@
return (boolean)preg_match('/Safari|AppleWebKit|Konqueror/', $ua);
}
-
+
/**
* UA\x82\xAAWindows Phone\x82\xCCIE Mobile\x82Ȃ\xE7 true \x82\xF0\x95Ԃ\xB7
*
Modified: p2/trunk/lib/login_first.inc.php
===================================================================
--- p2/trunk/lib/login_first.inc.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/login_first.inc.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -208,7 +208,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/lib/menu.inc.php
===================================================================
--- p2/trunk/lib/menu.inc.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/menu.inc.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -44,7 +44,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/lib/mystyle_css.funcs.php
===================================================================
--- p2/trunk/lib/mystyle_css.funcs.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/mystyle_css.funcs.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -56,7 +56,7 @@
$unused = array();
foreach ($MYSTYLE as $key => $value) {
- if (is_string($value) && strstr($key, '<>')) {
+ if (is_string($value) && false !== strpos($key, '<>')) {
list($category, $selector, $property) = explode('<>', $key);
if ($category == '*') {
$category = 'all!';
Modified: p2/trunk/lib/read_header.inc.php
===================================================================
--- p2/trunk/lib/read_header.inc.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/read_header.inc.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -281,7 +281,7 @@
//=====================================
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/lib/read_new.funcs.php
===================================================================
--- p2/trunk/lib/read_new.funcs.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/read_new.funcs.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -29,7 +29,7 @@
if ($i == $max) {
unlink($tfile);
} else {
- if (strstr(PHP_OS, 'WIN') and file_exists($nfile)) {
+ if (false !== strpos(PHP_OS, 'WIN') and file_exists($nfile)) {
unlink($nfile);
}
rename($tfile, $nfile);
Modified: p2/trunk/lib/read_res_hist.funcs.php
===================================================================
--- p2/trunk/lib/read_res_hist.funcs.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/read_res_hist.funcs.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -17,7 +17,7 @@
/*
$bak_file = $_conf['p2_res_hist_dat'] . '.bak';
- if (strstr(PHP_OS, 'WIN') and file_exists($bak_file)) {
+ if (false !== strpos(PHP_OS, 'WIN') and file_exists($bak_file)) {
unlink($bak_file);
}
rename($_conf['p2_res_hist_dat'], $bak_file);
Modified: p2/trunk/lib/sb_header.inc.php
===================================================================
--- p2/trunk/lib/sb_header.inc.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/lib/sb_header.inc.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -143,7 +143,7 @@
//===================================================================
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/login.php
===================================================================
--- p2/trunk/login.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/login.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -202,7 +202,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/login2ch.php
===================================================================
--- p2/trunk/login2ch.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/login2ch.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -88,7 +88,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/menu_i.php
===================================================================
--- p2/trunk/menu_i.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/menu_i.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -43,7 +43,7 @@
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php P2View::printStyleTagImportIuiCss(); ?>
<script type="text/javascript">
Modified: p2/trunk/menu_k.php
===================================================================
--- p2/trunk/menu_k.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/menu_k.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -45,7 +45,7 @@
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/post.php
===================================================================
--- p2/trunk/post.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/post.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -1187,7 +1187,7 @@
$SubjectTxt = new SubjectTxt($host, $bbs);
foreach ($SubjectTxt->subject_lines as $l) {
- if (strstr($l, $ttitle)) {
+ if (false !== strpos($l, $ttitle)) {
if (preg_match("/^([0-9]+)\.(dat|cgi)(,|<>)(.+) ?(\(|\x81i)([0-9]+)(\)|\x81j)/", $l, $matches)) {
return $key = $matches[1];
}
Modified: p2/trunk/post_form.php
===================================================================
--- p2/trunk/post_form.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/post_form.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -128,7 +128,7 @@
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/post_form_i.php
===================================================================
--- p2/trunk/post_form_i.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/post_form_i.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -114,7 +114,7 @@
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/read_copy_k.php
===================================================================
--- p2/trunk/read_copy_k.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/read_copy_k.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -74,14 +74,14 @@
// $resar[2]: 2006/10/20(\x8B\xE0) 11:46:08 ID:YS696rnVP BE:32616498-DIA(30003)"
$name_txt = trim(strip_tags($resar[0]));
$mail_txt = trim(strip_tags($resar[1]));
- if (strstr($resar[2], 'ID:')) {
+ if (false !== strpos($resar[2], 'ID:')) {
//$id_preg = 'ID: ?([0-9A-Za-z\/.+?]+)([.,]|\x81\xF5)?';
$id_preg = 'ID: ?([0-9A-Za-z\/.+?]+)(,|\x81\xF5)?';
$date_txt = preg_replace('/ ?' . $id_preg . '.*$/', '', $resar[2]);
$id_txt = preg_replace('/^.*' . $id_preg . '.*$/', 'ID:$1', $resar[2]);
$id_ht = sprintf('<input type="text" name="dummy_id" value="%s"><br>', hs($id_txt));
- } elseif (strstr($resar[2], 'HOST:')) {
+ } elseif (false !== strpos($resar[2], 'HOST:')) {
$id_preg = 'HOST: ?([0-9A-Za-z.,_\-<>]+)';
$date_txt = preg_replace('/ ?' . $id_preg . '.*$/', '', $resar[2]);
$id_txt = preg_replace('/^.*' . $id_preg . '.*$/', 'HOST:$1', $resar[2]);
Modified: p2/trunk/read_filter_i.php
===================================================================
--- p2/trunk/read_filter_i.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/read_filter_i.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -74,7 +74,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/read_filter_k.php
===================================================================
--- p2/trunk/read_filter_k.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/read_filter_k.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -52,7 +52,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/read_new.php
===================================================================
--- p2/trunk/read_new.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/read_new.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -113,7 +113,7 @@
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/read_new_i.php
===================================================================
--- p2/trunk/read_new_i.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/read_new_i.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -403,8 +403,10 @@
if ($prev_thre_num != 0) {
$prev_thre_ht = "<a href=\"#ntt{$prev_thre_num}\">\x81\xA3</a>";
}
- //$next_thre_ht = "<a href=\"#ntt{$next_thre_num}\">\x81\xA5</a> ";
- $next_thre_ht = "<a class=\"button\" href=\"#ntt_bt{$_newthre_num}\">\x81\xA5</a> ";
+ $anchorId = "ntt_bt{$_newthre_num}"; // ntt{$next_thre_num}
+ //$next_thre_ht = "<a href=\"#{$anchorId}\" onclick=\"if (!document.getElementById('{$anchorId}')) { location.href='#footbar01'; return false;}\">\x81\xA5</a> ";
+ $next_thre_ht = "<a href=\"#{$anchorId}\">\x81\xA5</a> ";
+ //$next_thre_ht = "<a class=\"button\" href=\"#{$anchorId}\">\x81\xA5</a> ";
if ($spmode) {
$read_header_itaj_ht = sprintf(' (%s)', hs($aThread->itaj));
Modified: p2/trunk/read_new_k.php
===================================================================
--- p2/trunk/read_new_k.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/read_new_k.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -114,7 +114,7 @@
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/read_res_hist.php
===================================================================
--- p2/trunk/read_res_hist.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/read_res_hist.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -105,7 +105,7 @@
//P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/setting.php
===================================================================
--- p2/trunk/setting.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/setting.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -64,7 +64,7 @@
P2Util::headerNoCache();
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/skin/blackboard.php
===================================================================
--- p2/trunk/skin/blackboard.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/skin/blackboard.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -14,9 +14,9 @@
// {{{ \x83t\x83H\x83\x93\x83g
// Mac\x97p\x83t\x83H\x83\x93\x83g\x83t\x83@\x83~\x83\x8A\x81[
-if (strstr(geti($_SERVER['HTTP_USER_AGENT']), 'Mac')) {
+if (false !== strpos(geti($_SERVER['HTTP_USER_AGENT']), 'Mac')) {
// \x83u\x83\x89\x83E\x83U\x82\xAA Mac\x82\xC5 Safari\x93\x99\x82\xCC WebKit\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ȃ\xE7
- if (strstr(geti($_SERVER['HTTP_USER_AGENT']), "AppleWebKit")) {
+ if (false !== strpos(geti($_SERVER['HTTP_USER_AGENT']), "AppleWebKit")) {
// ("Hiragino Kaku Gothic Pro") \x8A\xEE\x96{\x82̃t\x83H\x83\x93\x83g for Safari
$STYLE['fontfamily'] = array("Comic Sans MS", "Hiragino Maru Gothic Pro");
// ("") \x8A\xEE\x96{\x83{\x81[\x83\x8B\x83h\x97p\x83t\x83H\x83\x93\x83g for Safari\x81i\x95\x81\x92ʂ̑\xBE\x8E\x9A\x82\xE6\x82葾\x82\xAD\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ\x82\xCD"Hiragino Kaku Gothic Std"\x81j
Modified: p2/trunk/skin/mes.php
===================================================================
--- p2/trunk/skin/mes.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/skin/mes.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -9,9 +9,9 @@
// {{{ \x83t\x83H\x83\x93\x83g
-if (strstr($_SERVER['HTTP_USER_AGENT'], "Mac")) {
+if (false !== strpos($_SERVER['HTTP_USER_AGENT'], "Mac")) {
/* Mac\x97p\x83t\x83H\x83\x93\x83g\x83t\x83@\x83~\x83\x8A\x81[*/
- if (strstr($_SERVER['HTTP_USER_AGENT'], "AppleWebKit")) { /* \x83u\x83\x89\x83E\x83U\x82\xAA Mac\x82\xC5 Safari\x93\x99\x82\xCC WebKit\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ȃ\xE7 */
+ if (false !== strpos($_SERVER['HTTP_USER_AGENT'], "AppleWebKit")) { /* \x83u\x83\x89\x83E\x83U\x82\xAA Mac\x82\xC5 Safari\x93\x99\x82\xCC WebKit\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ȃ\xE7 */
$STYLE['fontfamily'] = array("Lucida Grande", "Hiragino Kaku Gothic Pro"); // ("Hiragino Kaku Gothic Pro") \x8A\xEE\x96{\x82̃t\x83H\x83\x93\x83g for Safari
$STYLE['fontfamily_bold'] = ""; // ("") \x8A\xEE\x96{\x83{\x81[\x83\x8B\x83h\x97p\x83t\x83H\x83\x93\x83g for Safari\x81i\x95\x81\x92ʂ̑\xBE\x8E\x9A\x82\xE6\x82葾\x82\xAD\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ\x82\xCD"Hiragino Kaku Gothic Std"\x81j
} else {
Modified: p2/trunk/skin/metal.php
===================================================================
--- p2/trunk/skin/metal.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/skin/metal.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -12,9 +12,9 @@
// {{{ \x83t\x83H\x83\x93\x83g
-if (strstr($_SERVER['HTTP_USER_AGENT'], "Mac")) {
+if (false !== strpos($_SERVER['HTTP_USER_AGENT'], "Mac")) {
/* Mac\x97p\x83t\x83H\x83\x93\x83g\x83t\x83@\x83~\x83\x8A\x81[*/
- if (strstr($_SERVER['HTTP_USER_AGENT'], "AppleWebKit")) { /* \x83u\x83\x89\x83E\x83U\x82\xAA Mac\x82\xC5 Safari\x93\x99\x82\xCC WebKit\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ȃ\xE7 */
+ if (false !== strpos($_SERVER['HTTP_USER_AGENT'], "AppleWebKit")) { /* \x83u\x83\x89\x83E\x83U\x82\xAA Mac\x82\xC5 Safari\x93\x99\x82\xCC WebKit\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ȃ\xE7 */
$STYLE['fontfamily'] = array("Helvetica Neue", "Hiragino Kaku Gothic Pro"); // ("Hiragino Kaku Gothic Pro") \x8A\xEE\x96{\x82̃t\x83H\x83\x93\x83g for Safari
$STYLE['fontfamily_bold'] = array("Arial Black", "Hiragino Kaku Gothic Std"); // ("") \x8A\xEE\x96{\x83{\x81[\x83\x8B\x83h\x97p\x83t\x83H\x83\x93\x83g for Safari\x81i\x95\x81\x92ʂ̑\xBE\x8E\x9A\x82\xE6\x82葾\x82\xAD\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ\x82\xCD"Hiragino Kaku Gothic Std"\x81j
} else {
Modified: p2/trunk/skin/tangerine.php
===================================================================
--- p2/trunk/skin/tangerine.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/skin/tangerine.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -12,9 +12,9 @@
// {{{ \x83t\x83H\x83\x93\x83g
-if (strstr($_SERVER['HTTP_USER_AGENT'], "Mac")) {
+if (false !== strpos($_SERVER['HTTP_USER_AGENT'], "Mac")) {
/* Mac\x97p\x83t\x83H\x83\x93\x83g\x83t\x83@\x83~\x83\x8A\x81[*/
- if (strstr($_SERVER['HTTP_USER_AGENT'], "AppleWebKit")) { /* \x83u\x83\x89\x83E\x83U\x82\xAA Mac\x82\xC5 Safari\x93\x99\x82\xCC WebKit\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ȃ\xE7 */
+ if (false !== strpos($_SERVER['HTTP_USER_AGENT'], "AppleWebKit")) { /* \x83u\x83\x89\x83E\x83U\x82\xAA Mac\x82\xC5 Safari\x93\x99\x82\xCC WebKit\x82\xF0\x8Eg\x82\xC1\x82Ă\xA2\x82\xE9\x82\xE0\x82̂Ȃ\xE7 */
$STYLE['fontfamily'] = array("Lucida Grande", "Hiragino Kaku Gothic Pro"); // ("Hiragino Kaku Gothic Pro") \x8A\xEE\x96{\x82̃t\x83H\x83\x93\x83g for Safari
$STYLE['fontfamily_bold'] = ""; // ("") \x8A\xEE\x96{\x83{\x81[\x83\x8B\x83h\x97p\x83t\x83H\x83\x93\x83g for Safari\x81i\x95\x81\x92ʂ̑\xBE\x8E\x9A\x82\xE6\x82葾\x82\xAD\x82\xB5\x82\xBD\x82\xA2\x8Fꍇ\x82\xCD"Hiragino Kaku Gothic Std"\x81j
} else {
Modified: p2/trunk/style/style_css.inc
===================================================================
--- p2/trunk/style/style_css.inc 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/style/style_css.inc 2012-12-22 14:59:37 UTC (rev 937)
@@ -9,7 +9,7 @@
}
/* \x83u\x83\x89\x83E\x83U\x82\xAA Camino \x82Ȃ\xE7 */
-if (strstr($_SERVER['HTTP_USER_AGENT'], 'Camino') || strstr($_SERVER['HTTP_USER_AGENT'], 'Chimera')) {
+if (false !== strpos($_SERVER['HTTP_USER_AGENT'], 'Camino') || false !== strpos($_SERVER['HTTP_USER_AGENT'], 'Chimera')) {
echo <<<EOP
input,option,select{
font-size:10px;
Modified: p2/trunk/title.php
===================================================================
--- p2/trunk/title.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/title.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -95,7 +95,7 @@
P2View::printDoctypeTag();
?>
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();
Modified: p2/trunk/viewtxt.php
===================================================================
--- p2/trunk/viewtxt.php 2012-10-22 21:24:30 UTC (rev 936)
+++ p2/trunk/viewtxt.php 2012-12-22 14:59:37 UTC (rev 937)
@@ -83,7 +83,7 @@
// HTML\x83v\x83\x8A\x83\x93\x83g
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="ja">
+<html>
<head>
<?php
P2View::printExtraHeadersHtml();