svnno****@sourc*****
svnno****@sourc*****
2013年 6月 14日 (金) 01:29:05 JST
Revision: 956
http://sourceforge.jp/projects/p2-php/scm/svn/commits/956
Author: akid
Date: 2013-06-14 01:29:04 +0900 (Fri, 14 Jun 2013)
Log Message:
-----------
p2/ for version 1.8.88
Modified Paths:
--------------
p2/trunk/conf/conf_system.inc.php
p2/trunk/conf/conf_user_def.inc.php
p2/trunk/doc/ChangeLog.txt
p2/trunk/edit_aborn_word.php
p2/trunk/edit_conf_user_i.php
p2/trunk/edit_indexmenuk.php
p2/trunk/editfavita.php
p2/trunk/first_cont.php
p2/trunk/index.php
p2/trunk/info.php
p2/trunk/iphone/ShowThreadK.php
p2/trunk/iphone/js/iphone.js
p2/trunk/iphone/js/respopup.iPhone.js
p2/trunk/iphone/read_header_k.inc.php
p2/trunk/js/smartpopup.js
p2/trunk/lib/BrdCtl.php
p2/trunk/lib/BrdMenu.php
p2/trunk/lib/FileCtl.php
p2/trunk/lib/HostCheck.php
p2/trunk/lib/Login.php
p2/trunk/lib/P2Util.php
p2/trunk/lib/P2View.php
p2/trunk/lib/SettingTxt.php
p2/trunk/lib/ShowBrdMenuK.php
p2/trunk/lib/ShowBrdMenuPc.php
p2/trunk/lib/ShowThread.php
p2/trunk/lib/ShowThreadK.php
p2/trunk/lib/ShowThreadPc.php
p2/trunk/lib/SubjectTxt.php
p2/trunk/lib/Thread.php
p2/trunk/lib/ThreadList.php
p2/trunk/lib/ThreadRead.php
p2/trunk/lib/UriUtil.php
p2/trunk/lib/edit_conf_user.funcs.php
p2/trunk/lib/getPostFormHtml.func.php
p2/trunk/lib/getPostFormIPhoneHtml.func.php
p2/trunk/lib/getPostFormPopupIPhoneHtml.func.php
p2/trunk/lib/index_print_k.inc.php
p2/trunk/lib/loadPostOptions.func.php
p2/trunk/lib/login_first.inc.php
p2/trunk/lib/read_footer.inc.php
p2/trunk/lib/read_footer_k.inc.php
p2/trunk/lib/read_header.inc.php
p2/trunk/lib/read_header_k.inc.php
p2/trunk/lib/read_new.funcs.php
p2/trunk/lib/res_hist.class.php
p2/trunk/lib/sb_header.inc.php
p2/trunk/lib/sb_header_k.inc.php
p2/trunk/lib/sb_print_k.func.php
p2/trunk/lib/sb_toolbar_k.funcs.php
p2/trunk/lib/setFav.func.php
p2/trunk/lib/setFavIta.func.php
p2/trunk/lib/settaborn.func.php
p2/trunk/lib/subject.funcs.php
p2/trunk/login.php
p2/trunk/menu_i.php
p2/trunk/menu_k.php
p2/trunk/post.php
p2/trunk/post_form.php
p2/trunk/read.php
p2/trunk/read_copy_k.php
p2/trunk/read_filter.php
p2/trunk/read_filter_i.php
p2/trunk/read_filter_k.php
p2/trunk/read_new.php
p2/trunk/read_new_k.php
p2/trunk/setting.php
p2/trunk/subject.php
p2/trunk/subject_new.php
p2/trunk/title.php
-------------- next part --------------
Modified: p2/trunk/conf/conf_system.inc.php
===================================================================
--- p2/trunk/conf/conf_system.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/conf/conf_system.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -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.87'; // rep2\x82̃o\x81[\x83W\x83\x87\x83\x93
+$_conf['p2version'] = '1.8.88'; // rep2\x82̃o\x81[\x83W\x83\x87\x83\x93
$_conf['p2name'] = 'rep2'; // rep2\x82̖\xBC\x91O\x81B
Modified: p2/trunk/conf/conf_user_def.inc.php
===================================================================
--- p2/trunk/conf/conf_user_def.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/conf/conf_user_def.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -95,7 +95,7 @@
$conf_user_def['cmp_dayres_midoku'] = 1; // (1)
$conf_user_sel['cmp_dayres_midoku'] = array('1' => '\x82\xB7\x82\xE9', '0' => '\x82\xB5\x82Ȃ\xA2');
-// \x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x83X\x83\x8C\x82̐\x94
+// \x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9\x83X\x83\x8C\x83\x8A\x83X\x83g\x82̐\x94
$conf_user_def['k_sb_disp_range'] = 30; // (30)
$conf_user_rules['k_sb_disp_range'] = array('emptyToDef', 'notIntExceptMinusToDef');
@@ -411,6 +411,7 @@
// }}}
// \x93\xE0\x95\x94\x97p\x90ݒ\xE8
+
// \x81\x9C\x8F\x91\x82\xAB\x8D\x9E\x82݂̋L\x89\xAF\x8F\xF3\x91\xD4
$conf_user_def['maru_kakiko'] = 1; // (1)
Modified: p2/trunk/doc/ChangeLog.txt
===================================================================
--- p2/trunk/doc/ChangeLog.txt 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/doc/ChangeLog.txt 2013-06-13 16:29:04 UTC (rev 956)
@@ -1,5 +1,11 @@
+2013/06/14
+ * rep2 version 1.8.88
+
+ [\x8FC\x90\xB3] version 1.8.87\x82Ő\xB3\x8F\xED\x82ɓ\xAE\x8D삵\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x82̂\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+
2013/06/13
* rep2 version 1.8.87
+
[\x89\xFC\x97\xC7] \x83X\x83}\x83z\x8C\xFC\x82\xAF\x82\xCCUI\x82\xF0\x89\xFC\x97ǂ\xB5\x82\xBD\x81B
[\x89\xFC\x97\xC7] \x83X\x83}\x83z\x82̐V\x92\x85\x82܂Ƃߓǂ݂Ɂu\x8D폜\x81v\x83\x8A\x83\x93\x83N\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B
[\x89\xFC\x97\xC7] \x90ݒ\xE8\x89”\\x82ȍ\x80\x96ڒlj\xC1\x82\xB5\x82\xBD\x81B
Modified: p2/trunk/edit_aborn_word.php
===================================================================
--- p2/trunk/edit_aborn_word.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/edit_aborn_word.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -177,7 +177,7 @@
<?php
P2View::printExtraHeadersHtml();
?>
- <title><?php echo ptitle_hs; ?></title>
+ <title><?php echo $ptitle_hs; ?></title>
<?php
if (UA::isPC()) {
Modified: p2/trunk/edit_conf_user_i.php
===================================================================
--- p2/trunk/edit_conf_user_i.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/edit_conf_user_i.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -1,11 +1,10 @@
<?php
/*
p2 - \x83\x86\x81[\x83U\x90ݒ\xE8\x95ҏWUI
-
+
\x81\xA6\x82\xB1\x82̃X\x83N\x83\x8A\x83v\x83g\x88ȊO\x82ł\xE0\x90ݒ肳\x82\xEA\x82郆\x81[\x83U\x90ݒ\xE8\x92l\x82\xAA\x82\xA0\x82\xEA\x82A
\x82\xBB\x82\xCCkey\x82\xF0_getConfSave()\x93\xE0\x82\xCC$remain_keys\x82ɓo\x98^\x82\xB5\x82Ă\xA8\x82\xAD\x81B
*/
-/* 2008/7/25 iPhone\x97p\x82ɃJ\x83X\x83^\x83}\x83C\x83Y*/
require_once './conf/conf.inc.php';
@@ -40,10 +39,8 @@
// \x83\x8B\x81[\x83\x8B\x82\xF0\x93K\x97p\x82\xB7\x82\xE9
_applyRules();
- /**
- * \x83f\x83t\x83H\x83\x8B\x83g\x92l $conf_user_def \x82ƕύX\x92l $_POST['conf_edit'] \x82̗\xBC\x95\x{30AA476}\x8D݂\xB5\x82Ă\xA2\x82āA
- * \x83f\x83t\x83H\x83\x8B\x83g\x92l\x82ƕύX\x92l\x82\xAA\x88قȂ\xE9\x8Fꍇ\x82̂ݐݒ\xE8\x95ۑ\xB6\x82\xB7\x82\xE9\x81i\x82\xBB\x82̑\xBC\x82̃f\x81[\x83^\x82͕ۑ\xB6\x82\xB3\x82ꂸ\x81A\x94j\x8A\xFC\x82\xB3\x82\xEA\x82\xE9\x81j
- */
+ // \x83f\x83t\x83H\x83\x8B\x83g\x92l $conf_user_def \x82ƕύX\x92l $_POST['conf_edit'] \x82̗\xBC\x95\x{30AA476}\x8D݂\xB5\x82Ă\xA2\x82āA
+ // \x83f\x83t\x83H\x83\x8B\x83g\x92l\x82ƕύX\x92l\x82\xAA\x88قȂ\xE9\x8Fꍇ\x82̂ݐݒ\xE8\x95ۑ\xB6\x82\xB7\x82\xE9\x81i\x82\xBB\x82̑\xBC\x82̃f\x81[\x83^\x82͕ۑ\xB6\x82\xB3\x82ꂸ\x81A\x94j\x8A\xFC\x82\xB3\x82\xEA\x82\xE9\x81j
$conf_save = _getConfSave();
// \x83V\x83\x8A\x83A\x83\x89\x83C\x83Y\x82\xB5\x82ĕۑ\xB6
@@ -96,29 +93,73 @@
?>
<html>
<head>
-<?php P2View::printExtraHeadersHtml(); ?>
-<script type="text/javascript" src="./iui/smooth.pack.js"></script>
-<?php P2View::printStyleTagImportIuiCss(); ?>
-<style type="text/css" media="screen">
+<?php
+P2View::printExtraHeadersHtml();
+
+if (UA::isIPhoneGroup()) {
+// <script type="text/javascript" src="./iui/smooth.pack.js"></script>
+ P2View::printStyleTagImportIuiCss();
+ ?><style type="text/css" media="screen">
body{ background:url(iui/pinstripes.png); }
input,select{ float: right; }
-</style>
+</style><?php
+}
+?>
<title><?php eh($ptitle); ?></title>
+<?php
+if (UA::isPC()) {
+ ?>
+ <script type="text/javascript" src="js/basic.js"></script>
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
+<?php
+ P2View::printIncludeCssHtml('style');
+ P2View::printIncludeCssHtml('edit_conf_user');
+}
+?>
</head>
-<body onLoad="top.document.title=self.document.title;">
-<div class="toolbar">
+<body onLoad="top.document.title=self.document.title;"<?php echo P2View::getBodyAttrK(); ?>>
+<?php
+
+// \x83X\x83}\x83z
+if (UA::isIPhoneGroup()) {
+?><div class="toolbar">
<h1 class="pageTitle"><?php eh($ptitle); ?></h1>
<a name="top" id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a>
</div>
<?php
-$htm['form_submit'] = <<<EOP
+// PC\x97p\x95\\x8E\xA6
+} elseif (UA::isPC()) {
+ ?><p id="pan_menu"><a href="<?php eh($_conf['editpref_php']) ?>">\x90ݒ\xE8\x8AǗ\x9D</a> > <?php eh($ptitle); ?> \x81i<a href="<?php eh(UriUtil::getMyUri(false, null, $add_sid = true)); ?>">\x83\x8A\x83\x8D\x81[\x83h</a>\x81j</p><?php
+}
+
+// \x83X\x83}\x83z
+if (UA::isIPhoneGroup()) {
+ $htm['form_submit'] = <<<EOP
<input type="submit" name="submit_save" value="\x95ύX\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9">
<input type="submit" name="submit_default" value="\x83f\x83t\x83H\x83\x8B\x83g\x82ɖ߂\xB7" onClick="if (!window.confirm('\x83\x86\x81[\x83U\x90ݒ\xE8\x82\xF0\x83f\x83t\x83H\x83\x8B\x83g\x82ɖ߂\xB5\x82Ă\xE0\x82\xE6\x82낵\x82\xA2\x82ł\xB7\x82\xA9\x81H\x81i\x82\xE2\x82蒼\x82\xB5\x82͂ł\xAB\x82܂\xB9\x82\xF1\x81j')) {return false;}">
EOP;
+// PC\x97p\x95\\x8E\xA6
+} elseif (UA::isPC()) {
+ $htm['form_submit'] = <<<EOP
+ <tr class="group">
+ <td colspan="3" align="center">
+ <input type="submit" name="submit_save" value="\x95ύX\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9">
+ <input type="submit" name="submit_default" value="\x83f\x83t\x83H\x83\x8B\x83g\x82ɖ߂\xB7" onClick="if (!window.confirm('\x83\x86\x81[\x83U\x90ݒ\xE8\x82\xF0\x83f\x83t\x83H\x83\x8B\x83g\x82ɖ߂\xB5\x82Ă\xE0\x82\xE6\x82낵\x82\xA2\x82ł\xB7\x82\xA9\x81H\x81i\x82\xE2\x82蒼\x82\xB5\x82͂ł\xAB\x82܂\xB9\x82\xF1\x81j')) {return false;}"><br>
+ </td>
+ </tr>\n
+EOP;
+// \x8Cg\x91їp\x95\\x8E\xA6
+} else {
+ $htm['form_submit'] = <<<EOP
+ <input type="submit" name="submit_save" value="\x95ύX\x82\xF0\x95ۑ\xB6\x82\xB7\x82\xE9">\n
+EOP;
+}
+
+
P2Util::printInfoHtml();
?>
@@ -127,12 +168,32 @@
<?php echo P2View::getInputHiddenKTag(); ?>
<?php
-?><div><?php
+// \x83X\x83}\x83z
+if (UA::isIPhoneGroup()) {
+ ?><div><?php
+
+// PC\x97p\x95\\x8E\xA6\x81itable\x81j
+} elseif (UA::isPC()) {
+ ?><table id="edit_conf_user" cellspacing="0"><?php
+}
+
echo $htm['form_submit'];
-?><br clear="both"></div><?php
+// \x83X\x83}\x83z
+if (UA::isIPhoneGroup()) {
+ ?><br clear="both"></div><?php
+// PC\x97p\x95\\x8E\xA6\x81itable\x81j
+} elseif (UA::isPC()) {
+ ?>
+ <tr>
+ <td>\x95ϐ\x94\x96\xBC</td>
+ <td>\x92l</td>
+ <td>\x90\xE0\x96\xBE</td>
+ </tr><?php
+}
+
echo getGroupSepaHtml('be.2ch.net \x83A\x83J\x83E\x83\x93\x83g');
//echo getEditConfHtml('be_2ch_code', '<a href="http://be.2ch.net/" target="_blank">be.2ch.net</a>\x82̔F\x8FR\x81[\x83h(\x83p\x83X\x83\x8F\x81[\x83h\x82ł͂\xA0\x82\xE8\x82܂\xB9\x82\xF1)');
@@ -156,7 +217,6 @@
');
-/*080725 \x88ꕔiPhone\x97p\x82ɍ폜 */
echo getGroupSepaHtml('subject');
echo getEditConfHtml('refresh_time', '\x83X\x83\x8C\x83b\x83h\x88ꗗ\x82̎\xA9\x93\xAE\x8DX\x90V\x8AԊu (\x95\xAA\x8Ew\x92\xE8\x81B0\x82Ȃ玩\x93\xAE\x8DX\x90V\x82\xB5\x82Ȃ\xA2)');
@@ -272,13 +332,26 @@
echo getEditConfHtml('proxy_host', '\x83v\x83\x8D\x83L\x83V\x83z\x83X\x83g ex)"127.0.0.1", "www.p2proxy.com"');
echo getEditConfHtml('proxy_port', '\x83v\x83\x8D\x83L\x83V\x83|\x81[\x83g ex)"8080"');
-?><div><?php
+if (UA::isIPhoneGroup()) {
+ ?><div><?php
+}
echo $htm['form_submit'];
-?></div>
-</form>
-</body>
-</html>
+if (UA::isIPhoneGroup()) {
+ ?></div><?php
+}
+if (UA::isPC()) {
+ ?></table><?php
+}
+
+?></form><?php
+
+if (UA::isK()) {
+ echo P2View::getHrHtmlK() . P2View::getBackToIndexKATag();
+}
+
+?>
+</body></html>
<?php
exit;
@@ -357,8 +430,21 @@
{
global $_conf;
- $ht = "<ul><li class=\"group\">{$title}<a name=\"{$title}\"></a></li></ul>"."\n";
-
+ if (UA::isIPhoneGroup()) {
+ $ht = "<ul><li class=\"group\">{$title}<a name=\"{$title}\"></a></li></ul>"."\n";
+
+ // PC\x97p
+ } elseif (UA::isPC()) {
+ $ht = <<<EOP
+ <tr class="group">
+ <td colspan="4"><h4 style="display:inline;">{$title}</h4></td>
+ </tr>\n
+EOP;
+ // \x8Cg\x91їp
+ } else {
+ $hr = P2View::getHrHtmlK();
+ $ht = "$hr<font color=\"gray\">{$title}</font><br><br>" . "\n";
+ }
return $ht;
}
@@ -416,10 +502,9 @@
$name_value_hs = hs($_conf[$name]);
+ $input_size_at = '';
if (UA::isPC()) {
$input_size_at = ' size="38"';
- } else {
- $input_size_at = '';
}
// select \x91I\x91\xF0\x8C`\x8E\xAE\x82Ȃ\xE7
@@ -440,13 +525,37 @@
$def_views[$name] = hs($conf_user_def[$name]);
}
-
-$r = <<<EOP
+ if (UA::isIPhoneGroup()) {
+ $r = <<<EOP
{$description_ht}<br>
{$form_ht}<br clear="both">
<hr>\n
EOP;
+ // PC\x97p
+ } elseif (UA::isPC()) {
+ $r = <<<EOP
+<tr title="\x83f\x83t\x83H\x83\x8B\x83g\x92l: {$def_views[$name]}">
+ <td>{$name}</td>
+ <td>{$form_ht}</td>
+ <td>{$description_ht}</td>
+</tr>\n
+EOP;
+ // \x8Cg\x91їp
+ } else {
+ // [{$name}]<br>
+
+ // \x8Cg\x91їp\x95\\x8E\xA6\x95\xB6\x8E\x9A\x97\xF1\x91S\x8Ap\x81\xA8\x94\xBC\x8Ap\x95ϊ\xB7
+ if ($_conf['k_save_packet']) {
+ $description_ht = mb_convert_kana($description_ht, 'rnsk');
+ }
+
+ $r = <<<EOP
+{$description_ht}<br>
+{$form_ht}<br>
+<br>\n
+EOP;
+ }
return $r;
}
@@ -462,11 +571,35 @@
$options_ht = '';
foreach ($conf_user_sel[$name] as $key => $value) {
- /*
- if ($value == "") {
- continue;
+ //if ($value == '') {
+ // continue;
+ //}
+ $selected = '';
+ if ($_conf[$name] == (string)$key) {
+ $selected = ' checked';
}
- */
+ $key_ht = hs($key);
+ $value_ht = hs($value);
+ $options_ht .= "\t<nobr><input type=\"radio\" name=\"conf_edit[{$name}]\" value=\"{$key_ht}\"{$selected}>{$value_ht}</nobr>\n";
+ }
+
+ $form_ht = $options_ht;
+
+ return $form_ht;
+}
+
+/*
+function getEditConfSelHtml($name)
+{
+ global $_conf, $conf_user_def, $conf_user_sel;
+
+ $options_ht = '';
+ foreach ($conf_user_sel[$name] as $key => $value) {
+
+ //if ($value == "") {
+ // continue;
+ //}
+
$selected = "";
if ($_conf[$name] == $key) {
$selected = " selected";
@@ -476,10 +609,19 @@
$options_ht .= "\t<option value=\"{$key_ht}\"{$selected}>{$value_ht}</option>\n";
}
- $form_ht = <<<EOP
- <select name="conf_edit[{$name}]">
- {$options_ht}
- </select>\n
-EOP;
+ $form_ht = sprintf('<select name="conf_edit[%s]">%s</select>', $name, $options_ht);
+
return $form_ht;
}
+*/
+
+/*
+ * Local Variables:
+ * mode: php
+ * coding: cp932
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
+// vim: set syn=php fenc=cp932 ai et ts=4 sw=4 sts=4 fdm=marker:
Modified: p2/trunk/edit_indexmenuk.php
===================================================================
--- p2/trunk/edit_indexmenuk.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/edit_indexmenuk.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -24,6 +24,7 @@
require_once P2_LIB_DIR . '/index_print_k.inc.php';
+
$setfrom1 = (int) !$_conf['index_menu_k_from1'];
require_once P2_LIB_DIR . '/index.funcs.php';
@@ -110,7 +111,7 @@
function _setOrderIndexMenuK($code, $set)
{
global $_conf;
-
+
if (!preg_match('/^[\\w]+$/', $code) || !preg_match('/^[\\w]+$/', $set)) {
P2Util::pushInfoHtml('<p>p2 error: \x88\x{4140AA}\x95ςł\xB7</p>');
return false;
Modified: p2/trunk/editfavita.php
===================================================================
--- p2/trunk/editfavita.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/editfavita.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -177,17 +177,17 @@
?>
<div><b>\x82\xA8\x8BC\x82ɔ‚̐V\x8BK\x92lj\xC1</b></div>
<form method="POST" action="<?php eh($_SERVER['SCRIPT_NAME']); ?>" accept-charset="<?php eh($_conf['accept_charset']); ?>" target="_self">
- <input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
- <input type="hidden" name="csrfid" value="<?php eh($csrfid); ?>">
- <?php echo P2View::getInputHiddenKTag(); ?>
- \x94\xC2URL: <input type="text" id="url" name="url" value="http://" size="48">
- \x94–\xBC: <input type="text" id="itaj" name="itaj" value="" size="16">
- <input type="hidden" id="setfavita" name="setfavita" value="1">
- <?php if ($sortNoJs) { ?>
- <input type="hidden" id="sortNoJs" name="sortNoJs" value="1">
- <?php } ?>
- <input type="submit" name="submit" value="\x90V\x8BK\x92lj\xC1">
- <div>\x81i\x93\xFC\x97͗\xE1 \x81\xA8 \x94\xC2URL: http://news19.2ch.net/newsplus/ \x94–\xBC: \x83j\x83\x85\x81[\x83X\x91\xAC\x95\xF1+\x81j</div>
+ <input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
+ <input type="hidden" name="csrfid" value="<?php eh(P2Util::getCsrfId()); ?>">
+ <?php echo P2View::getInputHiddenKTag(); ?>
+ \x94\xC2URL: <input type="text" id="url" name="url" value="http://" size="48">
+ \x94–\xBC: <input type="text" id="itaj" name="itaj" value="" size="16">
+ <input type="hidden" id="setfavita" name="setfavita" value="1">
+ <?php if ($sortNoJs) { ?>
+ <input type="hidden" id="sortNoJs" name="sortNoJs" value="1">
+ <?php } ?>
+ <input type="submit" name="submit" value="\x90V\x8BK\x92lj\xC1">
+ <div>\x81i\x93\xFC\x97͗\xE1 \x81\xA8 \x94\xC2URL: http://news19.2ch.net/newsplus/ \x94–\xBC: \x83j\x83\x85\x81[\x83X\x91\xAC\x95\xF1+\x81j</div>
</form>
<?php
// }}}
Modified: p2/trunk/first_cont.php
===================================================================
--- p2/trunk/first_cont.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/first_cont.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -8,11 +8,9 @@
$explanation = '\x8C\xA9\x82\xBD\x82\xA2\x83X\x83\x8C\x83b\x83h\x82\xCCURL\x82\xF0\x93\xFC\x97͂\xB5\x82ĉ\xBA\x82\xB3\x82\xA2\x81B\x97\xE1\x81Fhttp://pc.2ch.net/test/read.cgi/mac/1034199997/';
-
-
$ini_url_text = '';
$defurl = '';
-// $defurl = getLastReadTreadUrl();
+// $defurl = _getLastReadTreadUrl();
$onClick_ht = <<<EOP
var url_v = document.forms["urlform"].elements["url_text"].value;
@@ -35,7 +33,7 @@
$bookmarkletUrl = "javascript:location='" . dirname(UriUtil::getMyUri()) . "/" . $_conf['read_php'] . "?url='+escape(location);";
//=============================================================
-// HTML\x83v\x83\x8A\x83\x93\x83g
+// HTML\x95\\x8E\xA6\x8Fo\x97\xCD
//=============================================================
P2View::printDoctypeTag();
?>
@@ -52,6 +50,7 @@
</head>
<body id="first_cont">
<br>
+
<div class="container">
<?php echo $htm['urlform']; ?>
<hr>
@@ -63,6 +62,7 @@
</html>
<?php
+
/*
* Local Variables:
* mode: php
Modified: p2/trunk/index.php
===================================================================
--- p2/trunk/index.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/index.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -37,7 +37,7 @@
// }}}
// {{{ PC\x97p HTML\x83v\x83\x8A\x83\x93\x83g
-
+
$menu_uri = UriUtil::buildQueryUri($_conf['menu_php'],
array(UA::getQueryKey() => UA::getQueryValue())
);
Modified: p2/trunk/info.php
===================================================================
--- p2/trunk/info.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/info.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -35,7 +35,7 @@
$offrecent_accesskey = '#'; // \x97\x9A\x97\xF0\x89\xF0\x8F\x9C
$title_msg = '';
-$info_msg = '';
+$info_msg = '';
//================================================================
// \x93\xC1\x95ʂȑO\x8F\x88\x97\x9D
@@ -90,7 +90,7 @@
} elseif (isset($_GET['taborn']) && strlen($_GET['taborn'])) {
require_once P2_LIB_DIR . '/settaborn.func.php';
settaborn($host, $bbs, $key, $_GET['taborn']);
-
+
// \x83N\x83b\x83L\x81[\x8D폜
} elseif (!empty($_GET['clearbbscookie'])) {
P2Util::deleteBbsCookieFilePathByHost($host);
@@ -190,7 +190,6 @@
$ta_keys = P2Util::getThreadAbornKeys($aThread->host, $aThread->bbs);
$isTaborn = empty($ta_keys[$aThread->key]) ? false : true;
-
$taborndo_title_attrs = array();
if (UA::isPC() || UA::isIPhoneGroup() and !$isTaborn) {
$taborndo_title_attrs = array('title' => '\x83X\x83\x8C\x83b\x83h\x88ꗗ\x82Ŕ\xF1\x95\\x8E\xA6\x82ɂ\xB5\x82܂\xB7');
@@ -254,6 +253,7 @@
<title><?php echo $hs['title']; ?> </title>
<?php
+
if (UA::isPC()) {
// echo "<!-- ".$key_line." -->\n";
P2View::printIncludeCssHtml('style');
@@ -287,8 +287,8 @@
}
}
-$dele_pre_ht = '';
-$up_pre_ht = '';
+$dele_pre_ht = '';
+$up_pre_ht = '';
if (UA::isK()) {
$dele_pre_ht = $_conf['k_accesskey']['dele'] . '.';
$up_pre_ht = $_conf['k_accesskey']['up'] . '.';
@@ -338,6 +338,7 @@
_printInfoTrHtml('\x83z\x83X\x83g', $host_ht);
+
// \x94\xC2
$ita_uri = UriUtil::buildQueryUri(
$_conf['subject_php'],
Modified: p2/trunk/iphone/ShowThreadK.php
===================================================================
--- p2/trunk/iphone/ShowThreadK.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/iphone/ShowThreadK.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -454,7 +454,7 @@
// \x83\x8C\x83X\x96{\x95\xB6\x82ƈ\xF8\x97p\x83\x8C\x83X\x97p\x82̃\x81\x83b\x83Z\x81[\x83W\x82\xAA\x91S\x82\xC42\x8Fd\x82ɖ\x84\x82ߍ\x9E\x82܂\xEA\x82Ă\xA2\x82\xE9\x81B
// @see resQuoteMessage()
- // [todo]\x96\x84\x82ߍ\x9E\x82݂\xB5\x82Ȃ\xA2\x82ŃA\x83N\x83V\x83\x87\x83\x93\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82Ƃ\xAB\x82ɌĂяo\x82\xB7\x82悤\x82ɂ\xB5\x82\xBD\x82\xA2\x82\xAF\x82ǁB
+ // [todo]\x96\x84\x82ߍ\x9E\x82݂\xB5\x82Ȃ\xA2\x82ŃA\x83N\x83V\x83\x87\x83\x93\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82Ƃ\xAB\x82ɌĂяo\x82\xB7\x82悤\x82ɂ\xB5\x82\xBD\x82\xA2\x82\xAF\x82ǁB\x83\x8A\x83\x93\x83N\x82\xCC(\x91\x8B)\x82̕\\x8E\xA6\x82\xAA\x8Ec\x82\xC1\x82Ă\xB5\x82܂\xA4\x95s\x8B\x82\xE0\x82\xA0\x82\xE9\x81B
$quoteMsg = $msg;
@@ -474,7 +474,7 @@
$tores = "\n" . $quoteMsg . "\n" . $tores;
// }}}
-
+
return $tores;
}
Modified: p2/trunk/iphone/js/iphone.js
===================================================================
--- p2/trunk/iphone/js/iphone.js 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/iphone/js/iphone.js 2013-06-13 16:29:04 UTC (rev 956)
@@ -59,7 +59,7 @@
}
var distance = dist - document.body.scrollTop;
- var speed = 9;
+ var speed = 12;
if (Math.abs(distance) < 2) {
speed = 1;
} else if (Math.abs(distance) < 30) {
@@ -68,7 +68,7 @@
speed = 3;
} else if (Math.abs(distance) < 180) {
speed = 6;
- } else if (Math.abs(distance) < 3000) {
+ } else if (Math.abs(distance) < 300) {
speed = 9;
}
if (distance < 0) {
Modified: p2/trunk/iphone/js/respopup.iPhone.js
===================================================================
--- p2/trunk/iphone/js/respopup.iPhone.js 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/iphone/js/respopup.iPhone.js 2013-06-13 16:29:04 UTC (rev 956)
@@ -301,7 +301,7 @@
}
if (!onPopSpace) {
- // Safari\x82ł͍\x82\x91\xAC\x82Ń}\x83E\x83X\x83I\x81[\x83o\x81[\x81A\x83}\x83E\x83X\x83A\x83E\x83g\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82ă}\x83E\x83X\x82ɂ‚\xA2\x82Ă\xAB\x82Ă\xB5\x82܂\xA4\x81i\x8C\x99\x82Ȏd\x97l\x82\xBE\x81j
+ // Safari\x82ł͍\x82\x91\xAC\x82Ń}\x83E\x83X\x83I\x81[\x83o\x81[\x81A\x83}\x83E\x83X\x83A\x83E\x83g\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82ă}\x83E\x83X\x82ɂ‚\xA2\x82Ă\xAB\x82Ă\xB5\x82܂\xA4\x96\xE2\x91肪\x82\xA0\x82\xE9
if (!isSafari() || isIPhoneGroup()) {
aResPopUp.setPosResPopUp(x,y);
}
Modified: p2/trunk/iphone/read_header_k.inc.php
===================================================================
--- p2/trunk/iphone/read_header_k.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/iphone/read_header_k.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -747,7 +747,7 @@
$read_footer_navi_new_ht = '';
$read_footer_navi_new_btm_ht = '';
-
+
if ($aThread->resrange['to'] == $aThread->rescount) {
// \x90V\x92\x85\x83\x8C\x83X\x82̕\\x8E\xA6 <a>
Modified: p2/trunk/js/smartpopup.js
===================================================================
--- p2/trunk/js/smartpopup.js 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/js/smartpopup.js 2013-06-13 16:29:04 UTC (rev 956)
@@ -138,7 +138,7 @@
if (kore_res3) {
kore_res3.href = getSpmOpenSubUrl(aThread, 'post_form.php', 'inyou=3');
}
-
+
showResPopUp(aThread.objName + "_spm", event);
}
Modified: p2/trunk/lib/BrdCtl.php
===================================================================
--- p2/trunk/lib/BrdCtl.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/BrdCtl.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -230,7 +230,7 @@
$word_hs = isset($GLOBALS['word']) ? hs($GLOBALS['word']) : null;
return <<<EOFORM
-<form method="GET" action="{$action}" accept-charset="{$_conf['accept_charset']}">
+<form class="itaKensaku" method="GET" action="{$action}" accept-charset="{$_conf['accept_charset']}">
<input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
{$_conf['k_input_ht']}
<input type="hidden" name="nr" value="1">
Modified: p2/trunk/lib/BrdMenu.php
===================================================================
--- p2/trunk/lib/BrdMenu.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/BrdMenu.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -119,11 +119,13 @@
if (!$no_match) {
$this->categories[$this->num-1]->ita_match_num++;
+
if (isset($GLOBALS['ita_mikke']['num'])) {
$GLOBALS['ita_mikke']['num']++;
} else {
$GLOBALS['ita_mikke']['num'] = 1;
}
+
$GLOBALS['ita_mikke']['host'] = $aBrdMenuIta->host;
$GLOBALS['ita_mikke']['bbs'] = $aBrdMenuIta->bbs;
$GLOBALS['ita_mikke']['itaj_en'] = $aBrdMenuIta->itaj_en;
Modified: p2/trunk/lib/FileCtl.php
===================================================================
--- p2/trunk/lib/FileCtl.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/FileCtl.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -251,9 +251,9 @@
}
return rename($src_file, $dest_file);
}
-
+
/**
- * \x8F\x91\x82\xAB\x8D\x9E\x82ݒ\x86\x82̕s\x8A\xAE\x91S\x82ȃt\x83@\x83C\x83\x8B\x93\xE0\x97e\x82\xAA\x93ǂݎ\xE6\x82\xE7\x82\xEA\x82邱\x82Ƃ̂Ȃ\xA2\x82悤\x82ɁA\x88ꎞ\x83t\x83@\x83C\x83\x8B\x82ɏ\x91\x82\xAB\x8D\x9E\x82\xF1\x82ł\xA9\x82烊\x83l\x81[\x83\x80\x82\xB7\x82\xE9\x81B
+ * \x8F\x91\x82\xAB\x8D\x9E\x82ݒ\x86\x82̕s\x8A\xAE\x91S\x82ȃt\x83@\x83C\x83\x8B\x93\xE0\x97e\x82\xAA\x93ǂݍ\x9E\x82܂\xEA\x82邱\x82Ƃ̂Ȃ\xA2\x82悤\x82ɁA\x88ꎞ\x83t\x83@\x83C\x83\x8B\x82ɏ\x91\x82\xAB\x8D\x9E\x82\xF1\x82ł\xA9\x82烊\x83l\x81[\x83\x80\x82\xB7\x82\xE9\x81B
* \x81\xA6\x82\xBD\x82\xBE\x82\xB5\x81AWindows\x82̏ꍇ\x82́A\x8F㏑\x82\xABrename\x82\xAA\x95s\x8A\xAE\x91S\x82ƂȂ\xE9\x82̂Œ\xBC\x90ڏ\x91\x82\xAB\x8D\x9E\x82ނ\xB1\x82ƂƂ\xB7\x82\xE9\x81B
* $tmp_path\x82ňꎞ\x83t\x83@\x83C\x83\x8B\x83p\x83X\x82\xF0\x8Ew\x92肵\x82Ȃ\xA2\x8Fꍇ\x81A\x93\xAF\x8E\x9E\x82ɏ\x91\x82\xAB\x8D\x9E\x82݂\xAA\x82\xA0\x82\xE9\x82ƋL\x98^\x82̏\x87\x8F\x98\x82͕ۏ\xB3\x82\xEA\x82Ȃ\xA2\x81B
*
Modified: p2/trunk/lib/HostCheck.php
===================================================================
--- p2/trunk/lib/HostCheck.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/HostCheck.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -436,7 +436,7 @@
/**
* IP\x82\xCD docomo?
*
- * @link http://www.nttdocomo.co.jp/service/imode/make/content/ip/
+ * @link http://www.nttdocomo.co.jp/service/developer/make/content/ip/#ip
* @return boolean
* @access public
* @static
@@ -528,7 +528,7 @@
'111.86.147.160/27',
'111.86.147.192/27',
'111.86.147.224/27',
-
+
/* PCSV
'222.15.68.192/26',
'59.135.39.128/27',
@@ -575,7 +575,7 @@
'202.253.96.144/28',
'202.253.99.144/28',
'210.228.189.188/30'
-
+
// pcsitebrowser\x82͊܂܂Ȃ\xA2
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
@@ -676,148 +676,153 @@
$regHost = '/^[Pp]\d{12}\.ppp\.prin\.ne\.jp$/';
- // @updated 2012/10/21
+ // @updated 2012/11/02
$bands = array(
- '61.198.129.0/24',
- '61.198.130.0/24',
- '61.198.132.0/24',
- '61.198.133.0/24',
- '61.198.134.0/24',
- '61.198.135.0/24',
- '61.198.136.0/24',
- '61.198.137.0/24',
- '61.198.139.0/29',
- '61.198.139.128/27',
- '61.198.139.160/28',
- '61.198.142.0/24',
- '61.198.160.0/24',
- '61.198.161.0/24',
- '61.198.162.0/24',
- '61.198.163.0/24',
- '61.198.164.0/24',
- '61.198.168.0/24',
- '61.198.169.0/24',
- '61.198.170.0/24',
- '61.198.171.0/24',
- '61.198.172.0/24',
- '61.198.173.0/24',
- '61.198.174.0/24',
- '61.198.175.0/24',
- '61.198.248.0/24',
- '61.198.249.0/24',
- '61.198.250.0/24',
- '61.198.251.0/24',
- '61.198.252.0/24',
- '61.198.253.0/24',
- '61.198.255.0/24',
- '61.204.0.0/24',
- '61.204.2.0/24',
- '61.204.3.128/25',
- '61.204.4.0/24',
- '61.204.5.0/24',
- '61.204.6.128/25',
- '61.204.7.0/25',
- '61.204.92.0/24',
- '61.204.93.0/24',
- '61.204.94.0/24',
- '61.204.95.0/24',
- '114.20.49.0/24',
- '114.20.50.0/24',
- '114.20.51.0/24',
- '114.20.52.0/24',
- '114.20.53.0/24',
- '114.20.54.0/24',
- '114.20.55.0/24',
- '114.20.56.0/24',
- '114.20.57.0/24',
- '114.20.58.0/24',
- '114.20.59.0/24',
- '114.20.60.0/24',
- '114.20.61.0/24',
- '114.20.62.0/24',
- '114.20.63.0/24',
- '114.20.64.0/24',
- '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.2.0/24',
- '125.28.3.0/24',
- '125.28.6.0/24',
- '125.28.7.0/24',
- '125.28.8.0/24',
- '125.28.11.0/24',
- '125.28.12.0/24',
- '125.28.13.0/24',
- '125.28.14.0/24',
- '125.28.15.0/24',
- '125.28.16.0/24',
- '125.28.17.0/24',
- '210.168.246.0/24',
- '210.168.247.0/24',
- '210.169.92.0/24',
- '210.169.93.0/24',
- '210.169.95.0/24',
- '210.169.96.0/24',
- '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',
- '211.18.234.0/24',
- '211.18.235.0/24',
- '211.18.236.0/24',
- '211.18.237.0/24',
- '211.18.238.0/24',
- '211.18.239.0/24',
- '219.108.2.0/24',
- '219.108.3.0/24',
- '219.108.4.0/24',
- '219.108.5.0/24',
- '219.108.6.0/24',
- '219.108.7.0/24',
- '219.108.10.0/24',
- '219.108.11.0/24',
- '219.108.12.0/24',
- '219.108.13.0/24',
- '219.108.14.0/24',
- '219.108.15.0/24',
- '221.119.0.0/24',
- '221.119.1.0/24',
- '221.119.2.0/24',
- '221.119.3.0/24',
- '221.119.4.0/24',
- '221.119.5.0/24',
- '221.119.6.0/24',
- '221.119.7.0/24',
- '221.119.8.0/24',
- '221.119.9.0/24',
- '118.103.89.0/26'
+ '61.198.131.0/24',
+ '61.198.140.0/24',
+ '61.198.141.0/24',
+ '61.198.143.0/24',
+ '61.198.165.0/24',
+ '61.198.166.0/24',
+ '61.198.129.0/24',
+ '61.198.130.0/24',
+ '61.198.132.0/24',
+ '61.198.133.0/24',
+ '61.198.134.0/24',
+ '61.198.135.0/24',
+ '61.198.136.0/24',
+ '61.198.137.0/24',
+ '61.198.139.0/29',
+ '61.198.139.128/27',
+ '61.198.139.160/28',
+ '61.198.142.0/24',
+ '61.198.160.0/24',
+ '61.198.161.0/24',
+ '61.198.162.0/24',
+ '61.198.163.0/24',
+ '61.198.164.0/24',
+ '61.198.168.0/24',
+ '61.198.169.0/24',
+ '61.198.170.0/24',
+ '61.198.171.0/24',
+ '61.198.172.0/24',
+ '61.198.173.0/24',
+ '61.198.174.0/24',
+ '61.198.175.0/24',
+ '61.198.248.0/24',
+ '61.198.249.0/24',
+ '61.198.250.0/24',
+ '61.198.251.0/24',
+ '61.198.252.0/24',
+ '61.198.253.0/24',
+ '61.198.255.0/24',
+ '61.204.0.0/24',
+ '61.204.2.0/24',
+ '61.204.3.128/25',
+ '61.204.4.0/24',
+ '61.204.5.0/24',
+ '61.204.6.128/25',
+ '61.204.7.0/25',
+ '61.204.92.0/24',
+ '61.204.93.0/24',
+ '61.204.94.0/24',
+ '61.204.95.0/24',
+ '114.20.49.0/24',
+ '114.20.50.0/24',
+ '114.20.51.0/24',
+ '114.20.52.0/24',
+ '114.20.53.0/24',
+ '114.20.54.0/24',
+ '114.20.55.0/24',
+ '114.20.56.0/24',
+ '114.20.57.0/24',
+ '114.20.58.0/24',
+ '114.20.59.0/24',
+ '114.20.60.0/24',
+ '114.20.61.0/24',
+ '114.20.62.0/24',
+ '114.20.63.0/24',
+ '114.20.64.0/24',
+ '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.2.0/24',
+ '125.28.3.0/24',
+ '125.28.6.0/24',
+ '125.28.7.0/24',
+ '125.28.8.0/24',
+ '125.28.11.0/24',
+ '125.28.12.0/24',
+ '125.28.13.0/24',
+ '125.28.14.0/24',
+ '125.28.15.0/24',
+ '125.28.16.0/24',
+ '125.28.17.0/24',
+ '210.168.246.0/24',
+ '210.168.247.0/24',
+ '210.169.92.0/24',
+ '210.169.93.0/24',
+ '210.169.95.0/24',
+ '210.169.96.0/24',
+ '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',
+ '211.18.234.0/24',
+ '211.18.235.0/24',
+ '211.18.236.0/24',
+ '211.18.237.0/24',
+ '211.18.238.0/24',
+ '211.18.239.0/24',
+ '219.108.2.0/24',
+ '219.108.3.0/24',
+ '219.108.4.0/24',
+ '219.108.5.0/24',
+ '219.108.6.0/24',
+ '219.108.7.0/24',
+ '219.108.10.0/24',
+ '219.108.11.0/24',
+ '219.108.12.0/24',
+ '219.108.13.0/24',
+ '219.108.14.0/24',
+ '219.108.15.0/24',
+ '221.119.0.0/24',
+ '221.119.1.0/24',
+ '221.119.2.0/24',
+ '221.119.3.0/24',
+ '221.119.4.0/24',
+ '221.119.5.0/24',
+ '221.119.6.0/24',
+ '221.119.7.0/24',
+ '221.119.8.0/24',
+ '221.119.9.0/24'
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
}
Modified: p2/trunk/lib/Login.php
===================================================================
--- p2/trunk/lib/Login.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/Login.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -18,7 +18,7 @@
function Login()
{
$login_user = $this->setdownLoginUser();
-
+
// \x83\x86\x81[\x83U\x96\xBC\x82\xAA\x8Ew\x92肳\x82\xEA\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82\xCE
if (!strlen($login_user)) {
@@ -111,7 +111,7 @@
// Session\x82Ŏw\x92\xE8
} elseif (isset($_SESSION['login_user']) and $this->validLoginId($_SESSION['login_user'])) {
$login_user = $_SESSION['login_user'];
-
+
// Cookie\x82Ŏw\x92\xE8
} elseif (isset($_COOKIE['cid'])) {
if (false !== $user = Login::getUserFromCid($_COOKIE['cid'])) {
@@ -122,7 +122,6 @@
if (is_null($login_user)) {
$this->clearCookieAuth(); // cid
}
-
/*
// Basic\x94F\x8FŎw\x92\xE8
} elseif (isset($_REQUEST['basic']) and !empty($_REQUEST['basic'])) {
@@ -154,7 +153,7 @@
{
return isset($_REQUEST['form_login_id']) ? $_REQUEST['form_login_id'] : null;
}
-
+
/**
* \x94F\x8F\xF0\x8Ds\x82\xA4
*
@@ -578,7 +577,7 @@
return null;
}
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;
@@ -792,7 +791,7 @@
}
// ---- \x88ȉ\xBA\x81Acookie\x8A֘A\x82̃\x81\x83\\x83b\x83h
-
+
/**
* cookie\x94F\x8F\xF0\x93o\x98^/\x89\xF0\x8F\x9C\x82\xB7\x82\xE9
*
@@ -999,7 +998,7 @@
!$notK and
//!$_conf['cid_seed_ip'] or
UA::isK(geti($_SERVER['HTTP_USER_AGENT']))
- || HostCheck::isAddrDocomo() || HostCheck::isAddrAu() || HostCheck::isAddrSoftBank()
+ || HostCheck::isAddrDocomo() || HostCheck::isAddrAu() || HostCheck::isAddrSoftBank()
|| HostCheck::isAddrSoftBankPcSiteBrowser()
|| HostCheck::isAddrWillcom()
|| HostCheck::isAddrJigWeb() || HostCheck::isAddrJig()
Modified: p2/trunk/lib/P2Util.php
===================================================================
--- p2/trunk/lib/P2Util.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/P2Util.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -91,7 +91,7 @@
$params['proxy_port'] = $GLOBALS['_conf']['proxy_port'];
}
- $req = new HTTP_Request('http://be.2ch.net/test/login.php', $params);
+ $req = new HTTP_Request('http://be.2ch.net/test/login.php?guid=ON', $params);
$req->setMethod(HTTP_REQUEST_METHOD_POST);
$req->addPostData('m', $mail);
@@ -213,7 +213,7 @@
{
return UriUtil::getMyHost();
}
- function getMyUrl($with_get = false, $add_get = null, $add_sid = false, $sepa = '&')
+ function getMyUri($with_get = false, $add_get = null, $add_sid = false, $sepa = '&')
{
return UriUtil::getMyUri($with_get, $add_get, $add_sid, $sepa);
}
@@ -235,7 +235,7 @@
}
// }}}
-
+
/**
* @return boolean
*/
@@ -284,7 +284,7 @@
return $r;
*/
}
-
+
/**
* @access public
* @return string
@@ -332,7 +332,7 @@
} elseif ($expires and $expires < $time) {
trigger_error(sprintf('$expires is too early (%s)', $expires), E_USER_WARNING);
}
-
+
// Mac IE\x82́A\x93\xAE\x8D\xEC\x95s\x97ǂ\xF0\x8BN\x82\xB1\x82\xB7\x82炵\x82\xA2\x82\xC1\x82ۂ\xA2\x82̂ŁAhttponly\x82̑Ώۂ\xA9\x82\xE7\x8AO\x82\xB7\x81B\x81i\x82\xBB\x82\xE0\x82\xBB\x82\xE0\x91Ή\x9E\x82\xE0\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x81j
// MAC IE5.1 Mozilla/4.0 (compatible; MSIE 5.16; Mac_PowerPC)
if (preg_match('/MSIE \d\\.\d+; Mac/', geti($_SERVER['HTTP_USER_AGENT']))) {
@@ -346,6 +346,7 @@
$keys["$key[$k]"] = $v;
}
*/
+
$maxage = null;
if ($expires > $time) {
$maxage = $expires - $time;
@@ -459,7 +460,7 @@
}
return ceil($size) . '' . $reUnit;
}
-
+
/**
* @access public
* @return string
@@ -499,7 +500,6 @@
return P2_SKIN_DIR . '/' . rawurlencode($skinname) . '.php';
}
-
// {{{ mkTrip()
/**
@@ -564,7 +564,6 @@
// }}}
-
/**
* @access public
* @return string|null
@@ -1145,7 +1144,7 @@
if (P2Util::isHost2chs($host)) {
$host_dir = $base_dir . DIRECTORY_SEPARATOR . '2channel';
- // machibbs.com
+ // machibbs.com or machi.to
} elseif (P2Util::isHostMachiBbs($host)) {
$host_dir = $base_dir . DIRECTORY_SEPARATOR . 'machibbs.com';
@@ -1353,7 +1352,7 @@
return $p2cookies;
}
-
+
/**
* \x83N\x83b\x83L\x81[\x82\xF0\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82ɕۑ\xB6\x82\xB7\x82\xE9 [todo]\x83h\x83\x81\x83C\x83\x93\x82\xF0\x82\xBF\x82\xE1\x82\xF1\x82Ɠǂނׂ\xAB
*
@@ -1381,7 +1380,7 @@
return true;
}
-
+
/**
* \x83\x8A\x83X\x83g\x82̃i\x83r\x94͈͂\xF0\x8E擾\x82\xB7\x82\xE9
*
@@ -1763,7 +1762,7 @@
// p2_res_hist.dat \x82\xAA\x82\xA0\x82\xEA\x82A\x96\xBC\x91O\x82\xF0\x95ς\xA6\x82ăo\x83b\x83N\x83A\x83b\x83v\x81B\x81i\x82\xE0\x82\xA4\x97v\x82\xE7\x82Ȃ\xA2\x81j
if (file_exists($_conf['p2_res_hist_dat'])) {
$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);
@@ -2025,7 +2024,7 @@
// return md5($_login->user . $_login->pass_x . geti($_SERVER['HTTP_USER_AGENT']));
return md5($_login->user . $_login->pass_x);
}
-
+
/**
* @static
* @access public
Modified: p2/trunk/lib/P2View.php
===================================================================
--- p2/trunk/lib/P2View.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/P2View.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -13,7 +13,8 @@
<?php if (UA::isWindowsPhoneIEMobile()) { ?>
@import "./iui/iui_wpie.css";
<?php } ?>
- ＠ import "./iui/iui.css";
+ ＠ import "./iui/smartphone.css?20130613";
+ ＠ import "./iui/iui.css?2013061320";
</style>
<?php
}
@@ -67,7 +68,10 @@
*/
function getInputHiddenKTag()
{
- return sprintf('<input type="hidden" name="%s" value="%s">', hs(UA::getQueryKey()), hs(UA::getQueryValue()));
+ if (null === $v = UA::getQueryValue()) {
+ return '';
+ }
+ return sprintf('<input type="hidden" name="%s" value="%s">', hs(UA::getQueryKey()), hs($v));
}
/**
@@ -184,8 +188,9 @@
$href = UriUtil::buildQueryUri('css.php',
array(
'css' => $css,
- 'user' => $_login->user_u,
- 'skin' => $_conf['skin']
+ 'user' => $user,
+ 'skin' => $_conf['skin'],
+ 'd' => '130612' // \x83L\x83\x83\x83b\x83V\x83\x85\x89\xF1\x94\xF0\x8DX\x90V\x97p
)
);
?><link rel="stylesheet" type="text/css" href="<?php eh($href); ?>"><?php
@@ -248,6 +253,12 @@
'name' => 'format-detection',
'content' => 'telephone=no'
);
+ /*
+ $metas[] = array(
+ 'name' => 'apple-mobile-web-app-capable',
+ 'content' => 'yes'
+ );
+ */
}
}
Modified: p2/trunk/lib/SettingTxt.php
===================================================================
--- p2/trunk/lib/SettingTxt.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/SettingTxt.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -315,6 +315,7 @@
$hr->sendRequest();
return $hr->getResponseCode();
}
+
}
// }}}
Modified: p2/trunk/lib/ShowBrdMenuK.php
===================================================================
--- p2/trunk/lib/ShowBrdMenuK.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/ShowBrdMenuK.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -301,7 +301,7 @@
$attr[$_conf['accesskey_for_k']] = $i;
$key_num_st = "$i.";
}
-
+
$atag = P2View::tagA(
UriUtil::buildQueryUri($_conf['subject_php'],
array(
Modified: p2/trunk/lib/ShowBrdMenuPc.php
===================================================================
--- p2/trunk/lib/ShowBrdMenuPc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/ShowBrdMenuPc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -32,6 +32,7 @@
foreach ($categories as $cate) {
if ($cate->num > 0) {
+
echo "<div class=\"menu_cate\">\n";
echo " <b><a class=\"menu_cate\" href=\"javascript:void(0);\" onClick=\"showHide('c{$this->cate_id}', 'itas_hide');\" target=\"_self\">{$cate->name}</a></b>\n";
Modified: p2/trunk/lib/ShowThread.php
===================================================================
--- p2/trunk/lib/ShowThread.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/ShowThread.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -12,7 +12,7 @@
var $str_to_link_regex;
// \x88\xEA\x82‚̃\x8C\x83X\x93\xE0\x82ɂ\xA8\x82\xAF\x82郊\x83\x93\x83N\x95ϊ\xB7\x82̐\xA7\x8C\xC0\x89i\x8Dr\x82炵\x91\xF4\x81j
- var $str_to_link_limit = 33;
+ var $str_to_link_limit = 35;
// \x8F\xE3\x8BL\x82̎c\x82萔\x83J\x83E\x83\x93\x83^\x81[\x81B\x8C\xB5\x96\xA7\x82ȓK\x97p\x82͂\xB5\x82Ă\xA2\x82Ȃ\xA2\x81B\x82Ƃ肠\x82\xA6\x82\xB8>>1,2,3,..\x91\xF4\x82̂\xBD\x82߂ɁB
var $str_to_link_rest;
@@ -22,7 +22,7 @@
// URL\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x8A\x94\x81E\x83\x81\x83\\x83b\x83h\x96\xBC\x82Ȃǂ\xF0\x8Ai\x94[\x82\xB7\x82\xE9\x94z\x97\xF1\x81i\x83\x86\x81[\x83U\x92\xE8\x8B`\x81A\x83f\x83t\x83H\x83\x8B\x83g\x82̂\xE0\x82̂\xE6\x82\xE8\x97D\x90\xE6\x81j
var $user_url_handlers = array();
-
+
var $BBS_NONAME_NAME = '';
/**
@@ -211,7 +211,7 @@
return $html;
}
-
+
/**
* \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
*
Modified: p2/trunk/lib/ShowThreadK.php
===================================================================
--- p2/trunk/lib/ShowThreadK.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/ShowThreadK.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -63,7 +63,7 @@
}
// 1\x82\xF0\x95\\x8E\xA6\x81i\x94͈͊O\x82̃P\x81[\x83X\x82\xE0\x82\xA0\x82\xE9\x82̂ł\xB1\x82\xB1\x82Łj
- if (!$nofirst) {
+ if ($start == 1 || !$nofirst) {
if ($this->thread->resrange_multi and $GLOBALS['_skip_resnum']) {
$GLOBALS['_skip_resnum']--;
} else {
@@ -90,8 +90,8 @@
}
}
- // 1\x82\xAA\x91O\x92i\x8F\x88\x97\x9D\x82Ŋ\xF9\x95\\x8E\xA6\x82Ȃ\xE7\x83X\x83L\x83b\x83v
- if (!$nofirst and $i == 1) {
+ // 1\x82͏\x88\x97\x9D\x8Dς݂̂\xBD\x82߃X\x83L\x83b\x83v
+ if ($i == 1) {
continue;
}
if (!$this->thread->datlines[$i - 1]) {
@@ -151,7 +151,7 @@
$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
@@ -163,7 +163,7 @@
$nameForAborn = '';
}
}
-
+
// \x8C\xBB\x8D݂̔N\x8D\x86\x82͏ȗ\xAA\x83J\x83b\x83g\x82\xB7\x82\xE9\x81B\x81i\x90ݒ\xE8\x82Łj\x8C\x8E\x93\xFA\x82̐擪0\x82\xE0\x83J\x83b\x83g\x81B
if ($_conf['k_date_zerosuppress']) {
$date_id = preg_replace('~^(?:' . date('Y') . '|' . date('y') . ')/(?:0(\d)|(\d\d))?(?:(/)0)?~', '$1$2$3', $date_id);
@@ -219,7 +219,7 @@
$isNgMsg = false;
if (empty($_GET['nong'])) {
- if ($nameForAborn and false !== $this->ngAbornCheck('ng_name', strip_tags($nameForAborn))) {
+ if (strlen($nameForAborn) and false !== $this->ngAbornCheck('ng_name', strip_tags($nameForAborn))) {
$isNgName = true;
}
if (false !== $this->ngAbornCheck('ng_mail', $mail)) {
@@ -444,7 +444,7 @@
return $name;
}
-
+
/**
* @access private
* @return string HTML
Modified: p2/trunk/lib/ShowThreadPc.php
===================================================================
--- p2/trunk/lib/ShowThreadPc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/ShowThreadPc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -61,7 +61,7 @@
echo "<dl onMouseover=\"window.top.status='{$status_title_hs} ';\">";
// 1\x82\xF0\x95\\x8E\xA6\x81i\x94͈͊O\x82̃P\x81[\x83X\x82\xE0\x82\xA0\x82\xE9\x82̂ł\xB1\x82\xB1\x82Łj
- if (!$nofirst) {
+ if ($start == 1 || !$nofirst) {
echo $this->transRes($this->thread->datlines[0], 1);
}
@@ -72,8 +72,8 @@
continue;
}
- // 1\x82\xAA\x91O\x92i\x8F\x88\x97\x9D\x82Ŋ\xF9\x95\\x8E\xA6\x82Ȃ\xE7\x83X\x83L\x83b\x83v
- if (!$nofirst and $i == 1) {
+ // 1\x82͏\x88\x97\x9D\x8Dς݂̂\xBD\x82߃X\x83L\x83b\x83v
+ if ($i == 1) {
continue;
}
if (!$this->thread->datlines[$i - 1]) {
@@ -94,7 +94,7 @@
//return $s2e;
return true;
}
-
+
/**
* Dat\x83\x8C\x83X\x82\xF0HTML\x83\x8C\x83X\x82ɕϊ\xB7\x82\xB7\x82\xE9
*
@@ -263,7 +263,6 @@
<s class="ngword" onClick="showHide('ngn{$_ngaborns_head_hits}', 'ngword_cont');">$date_id</s>
EOID;
*/
-
$msg_ht = sprintf(
'<div id="ngn%s" class="ngword_cont">%s</div>',
$_ngaborns_head_hits, $msg_ht
@@ -282,7 +281,7 @@
// \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},'{}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
+ $onPopUp_at = " onmouseover=\"showSPM({$this->thread->spmObjName},{$i},'{$rid}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
}
if ($this->thread->onthefly) {
@@ -451,13 +450,13 @@
//$date_id = $this->transDateId($date_id);
// BE\x83v\x83\x8D\x83t\x83@\x83C\x83\x8B\x83\x8A\x83\x93\x83N\x95ϊ\xB7
- $id = $this->replaceBeId($id, $i);
+ $date_id = $this->replaceBeId($date_id, $i);
// HTML\x83|\x83b\x83v\x83A\x83b\x83v
if ($_conf['iframe_popup']) {
- $id = preg_replace_callback(
+ $date_id = preg_replace_callback(
"{<a href=\"(http://[-_.!~*()a-zA-Z0-9;/?:@&=+\$,%#]+)\"({$_conf['ext_win_target_at']})>((\?#*)|(Lv\.\d+))</a>}",
- array($this, 'iframePopupCallback'), $id
+ array($this, 'iframePopupCallback'), $date_id
);
}
@@ -508,20 +507,20 @@
<div id="ngn{$_ngaborns_head_hits}" class="ngword_cont">$msg</div>
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},'{}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
+ $onPopUp_at = " onmouseover=\"showSPM({$this->thread->spmObjName},{$i},'{$rid}',event,this)\" onmouseout=\"hideResPopUp('{$this->thread->spmObjName}_spm')\"";
$i = "<a href=\"javascript:void(0);\" class=\"resnum\"{$onPopUp_at}>{$i}</a>";
}
// 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
@@ -1095,7 +1094,7 @@
}
return false;
}
-
+
/**
* \x92ʏ\xEDURL\x83\x8A\x83\x93\x83N
*
@@ -1421,7 +1420,7 @@
// http://www.yourfilehost.com/media.php?cat=video&file=hogehoge.wmv
if (preg_match('{^http://www\\.yourfilehost\\.com/media\\.php\\?cat=video&file=([0-9A-Za-z_\\-\\.]+)}', $url, $m)) {
$link_url = $_conf['through_ime'] ? P2Util::throughIme($url) : $url;
-
+
if ($_conf['iframe_popup']) {
$linkHtml = $this->iframePopup($link_url, $html, array('target' => $_conf['bbs_win_target']));
@@ -1446,7 +1445,7 @@
return "{$linkHtml} [$dl_url1_atag][$dl_url2_atag]";
}
- return FALSE;
+ return false;
}
// }}}
Modified: p2/trunk/lib/SubjectTxt.php
===================================================================
--- p2/trunk/lib/SubjectTxt.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/SubjectTxt.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -178,6 +178,7 @@
if (
$new_host != $this->host
// SETTING.TXT\x82̗L\x96\xB3\x82Ŕˆړ]\x82\xF0\x8Am\x94F
+ // 2010/08/05 \x81u\x82\xE0\x82\xA4\x82\xB8\x82\xC1\x82Ɛl\x91吙 \x81v\x82ł\xE0302\x82\xF0\x95Ԃ\xB7
and !in_array(
SettingTxt::get2chSettingTxtResponseCode($this->host, $this->bbs),
array(200, null), true
Modified: p2/trunk/lib/Thread.php
===================================================================
--- p2/trunk/lib/Thread.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/Thread.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -203,7 +203,7 @@
$this->host = $host;
$this->bbs = $bbs;
$this->key = $key;
-
+
$this->keydat = P2Util::datDirOfHostBbs($this->host, $this->bbs) . $this->key . '.dat';
$this->keyidx = P2Util::getKeyIdxFilePath($this->host, $this->bbs, $this->key);
@@ -219,7 +219,7 @@
function isKitoku()
{
// if (file_exists($this->keyidx)) {
- if ($this->gotnum || $this->readnum || $this->newline > 1) {
+ if ($this->gotnum || $this->readnum || isset($this->newline) && $this->newline > 1) {
return true;
}
return false;
Modified: p2/trunk/lib/ThreadList.php
===================================================================
--- p2/trunk/lib/ThreadList.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/ThreadList.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -232,9 +232,9 @@
}
$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('idx');
-
+
// }}}
-
+
// }}}
// \x83X\x83\x8C\x82̓a\x93\xB0\x82̏ꍇ // p2_palace.idx \x93ǂݍ\x9E\x82\xDD
Modified: p2/trunk/lib/ThreadRead.php
===================================================================
--- p2/trunk/lib/ThreadRead.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/ThreadRead.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -1080,7 +1080,7 @@
$soko_atag,
hs($read_kako_url)
);
-
+
} elseif (preg_match($waithtml_match, $read_response_html, $matches)) {
$dat_response_status = "\x91\xE0\x92\xB7! \x83X\x83\x8C\x83b\x83h\x82\xCDhtml\x89\xBB\x82\xB3\x82\xEA\x82\xE9\x82̂\xF0\x91҂\xC1\x82Ă\xA2\x82\xE9\x82悤\x82ł\xB7\x81B";
$marutori_ht = ' ' . $this->getMarutoriHtml();
@@ -1331,7 +1331,7 @@
}
// \x8C\xB5\x96\xA7\x82ɂ̓I\x83\x93\x83U\x83t\x83\x89\x83C\x82ł͂Ȃ\xA2\x82\xAA\x81A\x8Cl\x82ɂƂ\xC1\x82Ắi\x8A\xF9\x93NjL\x98^\x82\xAA\x82\xB3\x82\xEA\x82Ȃ\xA2\x82Ƃ\xA2\x82\xA4\x88Ӗ\xA1\x82Łj\x83I\x83\x93\x83U\x83t\x83\x89\x83C
- if (!$this->isKitoku()) {
+ if (!$this->gotnum) {
$this->onthefly = true;
}
@@ -1407,8 +1407,8 @@
// \x94͈͎w\x92肪\x82Ȃ\xAF\x82\xEA\x82\xCE
} else {
- // \x83\x8C\x83X\x94Ԏw\x92\xE8
- if (intval($ls) > 0) {
+ // \x83\x8C\x83X\x94ԒP\x93Ǝw\x92\xE8
+ if (intval($ls)) {
$start = intval($ls);
$to = intval($ls);
$nofirst = true;
Modified: p2/trunk/lib/UriUtil.php
===================================================================
--- p2/trunk/lib/UriUtil.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/UriUtil.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -105,7 +105,7 @@
}
return $uri;
}
-
+
/**
* URI\x82\xC9GET\x83N\x83G\x83\x8A\x81[\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9\x81i\x90^\x96ʖڂ\xC9URL\x82\xF0\x83p\x81[\x83X\x82\xB5\x82Ă\xA9\x82\xE7\x92lj\xC1\x82\xB5\x82Ă\xA2\x82\xE9\x81j
*
Modified: p2/trunk/lib/edit_conf_user.funcs.php
===================================================================
--- p2/trunk/lib/edit_conf_user.funcs.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/edit_conf_user.funcs.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -71,4 +71,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: p2/trunk/lib/getPostFormHtml.func.php
===================================================================
--- p2/trunk/lib/getPostFormHtml.func.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/getPostFormHtml.func.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -20,14 +20,15 @@
$csrfid = P2Util::getCsrfId();
- if (UA::isPC() || UA::isIPhoneGroup()) {
- $k_br_ht = '';
+ $k_br_ht = '';
+ $kakiko_on_js_ht = '';
+ if (UA::isIPhoneGroup() || UA::isPC()) {
+ // 2013/06/13 iPhone Safari, Android\x82\xCCChrome\x82\xC5 onKeyup \x82\xF0\x8FE\x82\xA4\x82̂\xF0\x8Am\x94F\x82\xB5\x82\xBD\x81B
$kakiko_on_js_ht = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
- . " autoSavePostForm('$host', '$bbs', '$key');\"";
+ . sprintf(" autoSavePostForm('%s', '%s', '%s');", $host, $bbs, $key) . '"';
// \x8Cg\x91\xD1
} else {
$k_br_ht = '<br>';
- $kakiko_on_js_ht = '';
}
$subject_ht = isset($htm['subject']) ? $htm['subject'] : '';
Modified: p2/trunk/lib/getPostFormIPhoneHtml.func.php
===================================================================
--- p2/trunk/lib/getPostFormIPhoneHtml.func.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/getPostFormIPhoneHtml.func.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -20,14 +20,15 @@
$csrfid = P2Util::getCsrfId();
- if (UA::isPC() || UA::isIPhoneGroup()) {
- $k_br_ht = '';
+ $k_br_ht = '';
+ $kakiko_on_js_ht = '';
+ if (UA::isIPhoneGroup() || UA::isPC()) {
+ // 2013/06/13 iPhone Safari, Android\x82\xCCChrome\x82\xC5 onKeyup \x82\xF0\x8FE\x82\xA4\x82̂\xF0\x8Am\x94F\x82\xB5\x82\xBD\x81B
$kakiko_on_js_ht = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
- . " autoSavePostForm('$host', '$bbs', '$key');\"";
+ . sprintf(" autoSavePostForm('%s', '%s', '%s');", $host, $bbs, $key) . '"';
// \x8Cg\x91\xD1
} else {
$k_br_ht = '<br>';
- $kakiko_on_js_ht = '';
}
$subject_ht = isset($htm['subject']) ? $htm['subject'] : '';
Modified: p2/trunk/lib/getPostFormPopupIPhoneHtml.func.php
===================================================================
--- p2/trunk/lib/getPostFormPopupIPhoneHtml.func.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/getPostFormPopupIPhoneHtml.func.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -21,14 +21,16 @@
$csrfid = P2Util::getCsrfId();
$submit_value = '\x8F\x91\x82\xAB\x8D\x9E\x82\xDE';
-
- if (UA::isPC() || UA::isIPhoneGroup()) {
- $k_br_ht = '';
- $kakiko_on_js_ht = ' onChange="' . "autoSavePostForm('$host', '$bbs', '$key');\""; // onFocus="adjustTextareaRows(this, 2);"
+
+ $k_br_ht = '';
+ $kakiko_on_js_ht = '';
+ if (UA::isIPhoneGroup() || UA::isPC()) {
+ // 2013/06/13 iPhone Safari, Android\x82\xCCChrome\x82\xC5 onKeyup \x82\xF0\x8FE\x82\xA4\x82̂\xF0\x8Am\x94F\x82\xB5\x82\xBD\x81B
+ $kakiko_on_js_ht = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
+ . sprintf(" autoSavePostForm('%s', '%s', '%s');", $host, $bbs, $key) . '"';
// \x8Cg\x91\xD1
} else {
$k_br_ht = '<br>';
- $kakiko_on_js_ht = '';
}
$subject_ht = isset($htm['subject']) ? $htm['subject'] : '';
@@ -46,7 +48,7 @@
<input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
<fieldset>
<!-- {$subject_ht} -->
- <div id="writeFormCloseBtn" style="display:none;margin:0;"><img src="iui/icon_close.png" onClick="popUpFootbarFormIPhone(0, 1)"></div>
+ <!-- <div id="writeFormCloseBtn" style="display:none;margin:0;"><img src="iui/icon_close.png" onClick="popUpFootbarFormIPhone(0, 1)"></div> -->
<label>Name:</label>
<input id="FROM" name="FROM" type="text" value="{$hs['FROM']}"{$name_size_at}>
{$htm['maru_kakiko']}
@@ -59,7 +61,7 @@
<textarea id="MESSAGE" name="MESSAGE" rows="{$STYLE['post_msg_rows']}"{$msg_cols_at} wrap="{$wrap}"{$kakiko_on_js_ht}>{$MESSAGE_hs}</textarea>
<br>
- <input id="submit" type="submit" name="submit" value="{$submit_value}"{$res_disabled_at}{$htm['title_need_be']} onClick="setHiddenValue(this); popUpFootbarFormIPhone(1, 1);">
+ <input id="submit" type="submit" name="submit" value="{$submit_value}"{$res_disabled_at}{$htm['title_need_be']} onClick="setHiddenValue(this);">
{$htm['be2ch']}
{$htm['src_fix']}
</fieldset>
Modified: p2/trunk/lib/index_print_k.inc.php
===================================================================
--- p2/trunk/lib/index_print_k.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/index_print_k.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -88,7 +88,7 @@
$body_at = P2View::getBodyAttrK();
$hr = P2View::getHrHtmlK();
-
+
//=========================================================
// \x8Cg\x91їp HTML\x8Fo\x97\xCD
//=========================================================
@@ -124,6 +124,7 @@
<input type="submit" name="btnG" value="\x95\\x8E\xA6">
</form>
+
<?php echo $hr; ?>
<?php echo $htm['auth_user']; ?>
<br>
Modified: p2/trunk/lib/loadPostOptions.func.php
===================================================================
--- p2/trunk/lib/loadPostOptions.func.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/loadPostOptions.func.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -45,12 +45,13 @@
$name_size_at = '';
$mail_size_at = '';
- // PC
- if (UA::isPC()) {
- $name_size_at = ' size="19"';
- $mail_size_at = ' size="19"';
- $msg_cols_at = sprintf(' cols="%d"', $STYLE['post_msg_cols']);
- $wrap = 'off';
+ // $STYLE['post_msg_rows'] \x82ɂ\xCDPC\x97p\x90ݒ\xE8\x92l\x82\xAA\x93\xFC\x82\xC1\x82Ă\xA2\x82\xE9\x82̂\xF0\x8F㏑\x82\xAB\x82\xB5\x82Ă\xA2\x82\xE9
+
+ // \x83X\x83}\x83z
+ if (UA::isIPhoneGroup()) {
+ $msg_cols_at = '';
+ $STYLE['post_msg_rows'] = $_conf['i_post_msg_rows'] ? $_conf['i_post_msg_rows'] : 7;
+ $wrap = 'soft';
// willcom
// \x92ʏ\xED\x82\xCDPC\x97p\x90ݒ\xE8\x82ɏ\x80\x82\xB6\x82邪\x81A\x8Cg\x91їp\x90ݒ肪\x83Z\x83b\x83g\x82\xB3\x82\xEA\x82Ă\xA2\x82\xEA\x82A\x82\xBB\x82\xBF\x82\xE7\x82ɏ\x80\x82\xB6\x82\xE9\x81B
@@ -64,16 +65,10 @@
if ($_conf['k_post_msg_rows']) {
$STYLE['post_msg_rows'] = (int)$_conf['k_post_msg_rows'];
}
-
$wrap = 'soft';
-
- } elseif (UA::isIPhoneGroup()) {
- $msg_cols_at = '';
- $STYLE['post_msg_rows'] = 5;
- $wrap = 'soft';
// \x8Cg\x91\xD1
- } else {
+ } elseif (UA::isK()) {
$msg_cols_at = '';
if ($_conf['k_post_msg_cols']) {
$msg_cols_at = sprintf(' cols="%d"', $_conf['k_post_msg_cols']);
@@ -81,17 +76,23 @@
if ($_conf['k_post_msg_rows']) {
$STYLE['post_msg_rows'] = (int)$_conf['k_post_msg_rows'];
} else {
- $STYLE['post_msg_rows'] = 5; // \x8Cg\x91їp\x83f\x83t\x83H\x83\x8B\x83g\x92l
+ $STYLE['post_msg_rows'] = 5; // \x8Cg\x91їp\x83f\x83t\x83H\x83\x8B\x83g\x92l\x81iwillcom\x82Ŗ\xA2\x90ݒ莞\x82̋\x93\x93\xAE\x82\xAA\x82\xA0\x82邽\x82߁Aconf_user_def\x82ŃZ\x83b\x83g\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82Ǝv\x82\xA4\x81j
}
-
$wrap = 'soft';
+
+ // PC
+ } elseif (UA::isPC()) {
+ $name_size_at = ' size="19"';
+ $mail_size_at = ' size="19"';
+ $msg_cols_at = sprintf(' cols="%d"', $STYLE['post_msg_cols']);
+ $wrap = 'off';
}
// Be\x8F\x91\x82\xAB\x8D\x9E\x82\xDD
$htm['be2ch'] = '';
if (P2Util::isHost2chs($host) and P2Util::enableBe2ch()) {
if (UA::isIPhoneGroup()) {
- $htm['be2ch'] = '<input style="margin-right:16px;" id="submit_beres" name="submit_beres" type="submit" value="BE\x82ŏ\x91\x82\xAB\x8D\x9E\x82\xDE"' . $res_disabled_at . ' onClick="setHiddenValue(this); popUpFootbarFormIPhone(1, 1);"><br>';
+ $htm['be2ch'] = '<input style="margin-right:16px;" id="submit_beres" name="submit_beres" type="submit" value="BE\x82ŏ\x91\x82\xAB\x8D\x9E\x82\xDE"' . $res_disabled_at . ' onClick="setHiddenValue(this);"><br>';
} else {
$htm['be2ch'] = '\x81@<input id="submit_beres" name="submit_beres" type="submit" value="BE\x82ŏ\x91\x82\xAB\x8D\x9E\x82\xDE"' . $res_disabled_at . ' onClick="setHiddenValue(this);">';
}
Modified: p2/trunk/lib/login_first.inc.php
===================================================================
--- p2/trunk/lib/login_first.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/login_first.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -136,6 +136,7 @@
and !P2Util::existsAuthUserData() && !$_login_failed_flag
and !empty($_POST['submit_newuser']) && $post['form_login_id'] && $post['form_login_pass']
) {
+
// {{{ \x93\xFC\x97̓G\x83\x89\x81[\x82\xF0\x83`\x83F\x83b\x83N\x81A\x94\xBB\x92\xE8
if (
@@ -231,7 +232,7 @@
</head><body><?php
if (UA::isIPhoneGroup()) {
- ?><div class="toolbar"><h1 id="pageTitle"><?php echo $ptitle_ht; ?></h1></div><?php
+ ?><div class="toolbar"><h1 class="pageTitle"><?php echo $ptitle_ht; ?></h1></div><?php
?><div class="panel"><filedset><?php
} else {
?><h3><?php echo $ptitle_ht; ?></h3><?php
@@ -265,6 +266,7 @@
?></body></html><?php
}
+
/**
* @return string HTML
*/
Modified: p2/trunk/lib/read_footer.inc.php
===================================================================
--- p2/trunk/lib/read_footer.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/read_footer.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -40,7 +40,6 @@
$onmouse_showform_attrs = array('onMouseover' => "document.getElementById('kakiko').style.display = 'block';");
}
-
// ============================================================
$dores_html = '';
$res_form_html_pb = '';
@@ -58,7 +57,7 @@
'target' => '_blank'
)
);
-
+
} else {
$dores_qs = array(
'host' => $aThread->host,
@@ -108,12 +107,12 @@
if ($spd_st = $aThread->getTimePerRes() and $spd_st != '-') {
$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
$datsize_ht = '';
if ($_conf['show_datsize_in_footer']) {
- $datsize_ht = sprintf('<span class="datsize" style="white-space: nowrap;" title="DAT\x97e\x97\xCA">%s</span>', P2Util::getTranslatedUnitFileSize($aThread->getDatBytesFromLocalDat(false), 'KB'));
+ $datsize_ht = sprintf('<span class="datsize" style="white-space: nowrap;" title="DAT\x97e\x97\xCA">%s</span>', P2Util::getTranslatedUnitFileSize($datsize = $aThread->getDatBytesFromLocalDat(false), 'KB'));
// 500KB\x88ȏ\xE3\x82ŋ\xAD\x92\xB2\x95\\x8E\xA6
if ($datsize / 1024 >= 500) {
$datsize_ht = '<b>' . $datsize_ht . '</b>';
@@ -156,11 +155,11 @@
<table id="footer" class="toolbar" width="100%" style="padding:0px 10px 0px 0px;">
<tr>
<td align="left">
- {$q_ichi_ht}
+ {$q_ichi_ht}
$all_atag
{$read_navi_previous_ht}
{$read_navi_next_ht}
- $latest_atag
+ $latest_atag
{$goto_ht}
| {$read_footer_navi_new_ht}
| {$dores_html}
Modified: p2/trunk/lib/read_footer_k.inc.php
===================================================================
--- p2/trunk/lib/read_footer_k.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/read_footer_k.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -143,7 +143,7 @@
$form .= '<input type="submit" value="OK" title="OK">';
$form .= '</form>';
-
+
return $form;
}
Modified: p2/trunk/lib/read_header.inc.php
===================================================================
--- p2/trunk/lib/read_header.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/read_header.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -41,7 +41,8 @@
$latest_show_res_num = 50; // \x8DŐVXX
//----------------------------------------------
-// $read_navi_previous_ht -- \x91O100
+// {{{ $read_navi_previous_ht -- \x91O100
+
$before_rnum = max($aThread->resrange['start'] - $rnum_range, 1);
if ($aThread->resrange['start'] == 1 or !empty($_GET['onlyone'])) {
@@ -56,7 +57,7 @@
// $read_navi_prev_anchor = "#r{$before_rnum}";
//}
-$read_navi_prev_header = '';
+$read_navi_prev_header_ht = '';
if (!$read_navi_prev_isInvisible) {
$url = UriUtil::buildQueryUri($_conf['read_php'],
array(
@@ -71,10 +72,12 @@
$read_navi_previous_url = $url . $read_navi_prev_anchor;
$read_navi_prev_header_url = $url . "#r{$aThread->resrange['start']}";
$html = "{$prev_st}{$rnum_range}";
- $read_navi_previous = P2View::tagA($read_navi_previous_url, $html);
- $read_navi_prev_header = P2View::tagA($read_navi_prev_header_url, $html);
+ $read_navi_previous_ht = P2View::tagA($read_navi_previous_url, $html);
+ $read_navi_prev_header_ht = P2View::tagA($read_navi_prev_header_url, $html);
}
+// }}}
+
//----------------------------------------------
//$read_navi_next_ht -- \x8E\x9F100
$read_navi_next_anchor = '';
@@ -209,25 +212,8 @@
)
);
-$dele_url = UriUtil::buildQueryUri($info_php, array_merge($info_qs, array('dele' => 'true')));
+$deleLogATag = _getDeleLogATag($aThread, $info_php, $info_qs, $sid_qs, $dele_st);
-$deleLogJs_query = UriUtil::buildQuery(array_merge($info_qs, $sid_qs));
-$deleLogJs_query_es = str_replace("'", "\\'", $deleLogJs_query);
-
-$deleLogATag = P2View::tagA(
- $dele_url,
- hs($dele_st),
- array(
- 'accesskey' => $_conf['pc_accesskey']['dele'],
- 'title' => sprintf(
- "\x83\x8D\x83O\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B\x8E\xA9\x93\xAE\x82Łu\x82\xA8\x8BC\x82ɃX\x83\x8C\x81v\x81u\x93a\x93\xB0\x81v\x82\xA9\x82\xE7\x82\xE0\x8AO\x82\xEA\x82܂\xB7\x81B\x81i\x83A\x83N\x83Z\x83X\x83L\x81[[%s]\x81j",
- $_conf['pc_accesskey']['dele']
- ),
- 'target' => 'info',
- 'onclick' => "return !deleLog('{$deleLogJs_query_es}', {$STYLE['info_pop_size']}, 'read', this);"
- )
-);
-
$tabornATag = '';
/*
$taborn_url = UriUtil::buildQueryUri($info_php, array_merge($info_qs, array('taborn' => '2')));
@@ -262,7 +248,6 @@
)
);
-
$toolbar_right_ht = <<<EOTOOLBAR
<a style="white-space: nowrap;" href="{$ita_url_hs}" target="subject" title="\x94‚\xF0\x8AJ\x82\xAD">{$itaj_hs}</a>
@@ -441,7 +426,7 @@
'toolbar_right_ht' => $toolbar_right_ht,
'goto_ht' => $goto_ht,
'motothre_url' => $motothre_url,
- 'read_navi_prev_header' => $read_navi_prev_header,
+ 'read_navi_prev_header' => $read_navi_prev_header_ht,
'latest_show_res_num' => $latest_show_res_num // conf\x82ɂ\xB5\x82\xBD\x95\xFB\x82\xAA\x82悳\x82\xBB\x82\xA4
);
@@ -464,6 +449,38 @@
//=======================================================================================
/**
+ * @return string HTML <a>
+ */
+function _getDeleLogATag($aThread, $info_php, $info_qs, $sid_qs, $dele_st)
+{
+ global $_conf, $STYLE;
+
+ // \x81i\x83v\x83\x8C\x83r\x83\x85\x81[>>1\x81j\x83\x8D\x83O\x82\xAA\x96\xB3\x82\xA2\x8E\x9E
+ if (!empty($_GET['onlyone']) && !file_exists($aThread->keyidx)) {
+ return '<span class="disabled">' . $dele_st . '</span>';
+ }
+
+ $dele_url = UriUtil::buildQueryUri($info_php, array_merge($info_qs, array('dele' => 'true')));
+
+ $deleLogJs_query = UriUtil::buildQuery(array_merge($info_qs, $sid_qs));
+ $deleLogJs_query_es = str_replace("'", "\\'", $deleLogJs_query);
+
+ return $deleLogATag = P2View::tagA(
+ $dele_url,
+ hs($dele_st),
+ array(
+ 'accesskey' => $_conf['pc_accesskey']['dele'],
+ 'title' => sprintf(
+ "\x83\x8D\x83O\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B\x8E\xA9\x93\xAE\x82Łu\x82\xA8\x8BC\x82ɃX\x83\x8C\x81v\x81u\x93a\x93\xB0\x81v\x82\xA9\x82\xE7\x82\xE0\x8AO\x82\xEA\x82܂\xB7\x81B\x81i\x83A\x83N\x83Z\x83X\x83L\x81[[%s]\x81j",
+ $_conf['pc_accesskey']['dele']
+ ),
+ 'target' => 'info',
+ 'onclick' => "return !deleLog('{$deleLogJs_query_es}', {$STYLE['info_pop_size']}, 'read', this);"
+ )
+ );
+}
+
+/**
* \x91\xB1\x82\xAB\x82\xF0\x93ǂ\xDE \x90V\x92\x85\x83\x8C\x83X\x82̕\\x8E\xA6
*
* @return string HTML
@@ -630,7 +647,7 @@
<td align="left">
{$all_atag}
{$read_navi_range_ht}
- {$read_navi_prev_header}
+ {$read_navi_prev_header_ht}
{$latest_atag}
{$goto_ht}
</td>
@@ -662,6 +679,7 @@
hs('3\x83y\x83C\x83\x93\x82ŊJ\x82\xAD'),
array('title' => 'p2\x83t\x83\x8C\x81[\x83\x80 3\x83y\x83C\x83\x93\x82ŊJ\x82\xAD')
);
+
// Chrome, Safari\x82œ\xAE\x8D삪\x95ρH\x82Ȃ̂ŁA\x82Ƃ肠\x82\xA6\x82\xB8\x8F\xF0\x8C\x8F\x82\xA9\x82\xE7\x8AO\x82\xB5\x82Ă\xA8\x82\xAD\x81B
// \x82\xE0\x82\xA4\x82\xBF\x82\xE5\x82\xC1\x82Ƃ܂\xC1\x82Ƃ\xA4\x82\xC8JavaScript\x8F\x88\x97\x9D\x82ɕς\xA6\x82\xBD\x82\xA2\x82Ƃ\xB1\x82\xEB\x81B
return $p2frame_ht = <<<EOP
@@ -678,6 +696,7 @@
\n
EOP;
}
+
/**
* 1- 101- 201- \x82̃\x8A\x83\x93\x83NHTML\x82\xF0\x8E擾\x82\xB7\x82\xE9
* _getHeadBarHtml() \x82\xA9\x82\xE7\x8CĂ\xEA\x82\xE9
Modified: p2/trunk/lib/read_header_k.inc.php
===================================================================
--- p2/trunk/lib/read_header_k.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/read_header_k.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -54,7 +54,7 @@
$read_navi_previous_ht = '';
$read_navi_previous_btm_ht = '';
$read_navi_next_ht = '';
-$read_navi_next_btm_ht = '';
+$read_navi_next_btm_ht = '';
$read_footer_navi_new_ht = '';
$read_footer_navi_new_btm_ht = '';
$read_navi_latest_ht = '';
@@ -84,7 +84,8 @@
//----------------------------------------------
-// $read_navi_previous_ht -- \x91O
+// {{{ $read_navi_previous_ht -- \x91O
+
$before_rnum = max($aThread->resrange['start'] - $rnum_range, 1);
$read_navi_prev_isInvisible = false;
@@ -130,6 +131,8 @@
$read_navi_previous_btm_ht = P2View::tagA($url, $html, array($_conf['accesskey_for_k'] => $_conf['k_accesskey']['prev']));
}
+// }}}
+
//----------------------------------------------
// $read_navi_next_ht -- \x8E\x9F
$read_navi_next_isInvisible = false;
@@ -190,11 +193,11 @@
// \x8DŐVN\x8C\x8F
$read_navi_latest_ht = <<<EOP
-<a href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&ls=l{$latest_show_res_num}{$_conf['k_at_a']}">{$_conf['k_accesskey']['latest']}.{$latest_st}{$latest_show_res_num}</a>
+<a href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&ls=l{$latest_show_res_num}n{$_conf['k_at_a']}">{$_conf['k_accesskey']['latest']}.{$latest_st}{$latest_show_res_num}</a>
EOP;
$time = time();
$read_navi_latest_btm_ht = <<<EOP
-<a {$_conf['accesskey_for_k']}="{$_conf['k_accesskey']['latest']}" href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&ls=l{$latest_show_res_num}&dummy={$time}{$_conf['k_at_a']}">{$_conf['k_accesskey']['latest']}.{$latest_st}{$latest_show_res_num}</a>
+<a {$_conf['accesskey_for_k']}="{$_conf['k_accesskey']['latest']}" href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&ls=l{$latest_show_res_num}n&dummy={$time}{$_conf['k_at_a']}">{$_conf['k_accesskey']['latest']}.{$latest_st}{$latest_show_res_num}</a>
EOP;
}
@@ -209,6 +212,7 @@
// }}}
+
if (P2Util::ifFiltering()) {
require_once P2_LIB_DIR . '/read_filter_k.funcs.php';
rewriteReadNaviHeaderK();
@@ -267,7 +271,9 @@
}
echo $hr;
-?><h3><font color="<?php eh($STYLE['read_k_thread_title_color']); ?>"><?php eh($aThread->ttitle_hc); ?> </font></h3><?php
+?>
+<h3><font color="<?php eh($STYLE['read_k_thread_title_color']); ?>"><?php eh($aThread->ttitle_hc); ?> </font></h3>
+<?php
$filter_fields = array(
'whole' => '',
@@ -361,7 +367,7 @@
"{$_conf['k_accesskey']['up']}." . hs($aThread->itaj),
array($_conf['accesskey_for_k'] => $_conf['k_accesskey']['up'])
);
-
+
$similar_qs = array(
'detect_hint' => '\x81\x9D\x81\x9E',
'itaj_en' => base64_encode($aThread->itaj),
@@ -386,19 +392,24 @@
array($_conf['accesskey_for_k'] => $_conf['k_accesskey']['info'])
);
- $dele_atag = P2View::tagA(
- UriUtil::buildQueryUri($info_php,
- array_merge($thread_qs, $b_qs,
- array(
- 'ttitle_en' => $ttitle_en,
- 'dele' => 1
+ // \x81i\x83v\x83\x8C\x83r\x83\x85\x81[>>1\x81j\x83\x8D\x83O\x82\xAA\x96\xB3\x82\xA2\x8E\x9E
+ if (!empty($_GET['onlyone']) && !file_exists($aThread->keyidx)) {
+ $dele_atag = "{$_conf['k_accesskey']['dele']}." . hs($dele_st);
+ } else {
+ $dele_atag = P2View::tagA(
+ UriUtil::buildQueryUri($info_php,
+ array_merge($thread_qs, $b_qs,
+ array(
+ 'ttitle_en' => $ttitle_en,
+ 'dele' => 1
+ )
)
- )
- ),
- "{$_conf['k_accesskey']['dele']}." . hs($dele_st),
- array($_conf['accesskey_for_k'] => $_conf['k_accesskey']['dele'])
- );
-
+ ),
+ "{$_conf['k_accesskey']['dele']}." . hs($dele_st),
+ array($_conf['accesskey_for_k'] => $_conf['k_accesskey']['dele'])
+ );
+ }
+
$motothre_atag = P2View::tagA($motothre_url, hs($moto_thre_st));
return $toolbar_right_ht = "$ita_atag $similar_atag $info_atag $dele_atag $motothre_atag";
Modified: p2/trunk/lib/read_new.funcs.php
===================================================================
--- p2/trunk/lib/read_new.funcs.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/read_new.funcs.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -12,7 +12,7 @@
function saveMatomeCache()
{
global $_conf;
-
+
if (!empty($GLOBALS['_is_matome_shinchaku_naipo'])) {
return true;
}
Modified: p2/trunk/lib/res_hist.class.php
===================================================================
--- p2/trunk/lib/res_hist.class.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/res_hist.class.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -180,7 +180,7 @@
$res_ht .= "{$ResArticle->order} \x81F";
// \x96\xBC\x91O
- $array = preg_split('/[#\x81\x94]/', $ResArticle->name, 2);
+ $array = preg_split('/(?:#|\x81\x94)/', $ResArticle->name, 2);
if (count($array) == 2) {
$name_ht = sprintf('%s \x81\x9F</b>%s<b>', $array[0], P2Util::mkTrip($array[1]));
$title_at = ' title="' . hs($ResArticle->name) . '"';
Modified: p2/trunk/lib/sb_header.inc.php
===================================================================
--- p2/trunk/lib/sb_header.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/sb_header.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -180,12 +180,13 @@
<script type="text/javascript" src="js/delelog.js?v=20100127"></script>
<script language="JavaScript">
<!--
- function setWinTitle(){
+ function setWinTitle()
+ {
var shinchaku_ari = <?php echo !$shinchaku_num ? 'false' : 'true'; ?>;
if (shinchaku_ari) {
- window.top.document.title="\x81\x9A<?php echo _addslashesJS($aThreadList->ptitle); ?>";
+ window.top.document.title = "\x81\x9A<?php echo _addslashesJS($aThreadList->ptitle); ?>";
} else {
- if (top != self) { top.document.title=self.document.title; }
+ if (top != self) { top.document.title = self.document.title; }
}
}
@@ -206,6 +207,7 @@
}
}
}
+
function chUnColor(id){
var unid_obj = document.getElementById('un'+id);
if (unid_obj) {
@@ -213,16 +215,21 @@
}
}
function chTtColor(idnum){
- var ttid = "tt"+idnum;
- var toid = "to"+idnum;
- var ttid_obj = document.getElementById(ttid);
+ var ttid = "tt" + idnum;
+ var ttid_obj = document.getElementById(ttid); // \x83^\x83C\x83g\x83\x8B
if (ttid_obj) {
ttid_obj.style.color="<?php echo _addslashesJS($STYLE['thre_title_color_v']); ?>";
}
- var toid_obj = document.getElementById(toid);
+ var toid = "to" + idnum;
+ var toid_obj = document.getElementById(toid); // No.
if (toid_obj) {
toid_obj.style.color="<?php echo _addslashesJS($STYLE['thre_title_color_v']); ?>";
}
+ var tnid = "tn" + idnum;
+ var tnid_obj = document.getElementById(tnid); // \x90V
+ if (tnid_obj) {
+ tnid_obj.style.color="<?php echo _addslashesJS($STYLE['thre_title_color_v']); ?>";
+ }
}
// -->
</script>
@@ -241,7 +248,7 @@
}
*/
-if ($aThreadList->spmode == "taborn" or $aThreadList->spmode == "soko") {
+if ($aThreadList->spmode=="taborn" or $aThreadList->spmode=="soko") {
?>
<script language="javascript">
<!--
@@ -308,7 +315,6 @@
return $taborn_check_msg_html;
}
-
/**
* \x83`\x83F\x83b\x83N\x82\xB5\x82\xBD\x8D\x80\x96ڂ\xCC \x83\x8D\x83O\x82\xF0\x8D폜, \x82\xA0\x82ځ[\x82\xF1\x82\xF0\x89\xF0\x8F\x9C \x83t\x83H\x81[\x83\x80HTML\x82̃w\x83b\x83_\x95\x94\x95\xAA\x82\xF0\x8E擾\x82\xB7\x82\xE9
*
@@ -350,7 +356,7 @@
UA::getQueryKey() => UA::getQueryValue()
));
- } elseif ($aThreadList->spmode == "res_hist") {
+ } elseif ($aThreadList->spmode == 'res_hist') {
$ptitle_url = "read_res_hist.php#footer";
} elseif (!$aThreadList->spmode) {
Modified: p2/trunk/lib/sb_header_k.inc.php
===================================================================
--- p2/trunk/lib/sb_header_k.inc.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/sb_header_k.inc.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -30,7 +30,7 @@
UA::getQueryKey() => UA::getQueryValue()
)
);
-
+
// \x92ʏ\xED \x94\xC2
} elseif (!$aThreadList->spmode) {
// \x93\xC1\x95ʂȃp\x83^\x81[\x83\x93 index2.html
@@ -41,7 +41,7 @@
$ptitle_url = $ptitle_url . 'index2.html';
// PC
- } elseif (UA::isK()) {
+ } elseif (UA::isPC()) {
$ptitle_url = "http://{$aThreadList->host}/{$aThreadList->bbs}/i/";
// \x8Cg\x91\xD1
} else {
@@ -59,7 +59,6 @@
}
}
-
// }}}
// {{{ \x83y\x81[\x83W\x83^\x83C\x83g\x83\x8B\x95\x94\x95\xAAHTML\x90ݒ\xE8
Modified: p2/trunk/lib/sb_print_k.func.php
===================================================================
--- p2/trunk/lib/sb_print_k.func.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/sb_print_k.func.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -109,8 +109,9 @@
// \x8A\xF9\x93\xBE\x8Dς\xDD
if ($aThread->isKitoku()) {
$unum_ht = "{$aThread->unum}";
-
- $anum = $aThread->rescount - $aThread->unum + 1 - $_conf['respointer'];
+
+ $respointer = UA::isIPhoneGroup() ? $_conf['respointer_i'] : $_conf['respointer'];
+ $anum = $aThread->rescount - $aThread->unum + 1 - $respointer;
if ($anum > $aThread->rescount) {
$anum = $aThread->rescount;
}
@@ -187,6 +188,21 @@
// }}}
+ // \x90\xA8\x82\xA2
+ $ikioi_ht = '';
+ if (UA::isIPhoneGroup()) {
+ if ($_conf['sb_show_ikioi']) {
+ if ($aThread->dayres > 0) {
+ // 0.0 \x82ƂȂ\xE7\x82Ȃ\xA2\x82悤\x82ɏ\xAC\x90\x94\x93_\x91\xE62\x88ʂŐ\xE8\x8Fグ
+ $dayres = ceil($aThread->dayres * 10) / 10;
+ $dayres_st = sprintf("%01.1f", $dayres);
+ } else {
+ $dayres_st = '-';
+ }
+ $ikioi_ht = sprintf(' <span class="ikioi">%s<span class="ikioistr">\x82̐\xA8\x82\xA2</span></span>', hs($dayres_st));
+ }
+ }
+
// torder(info) =================================================
/*
// \x82\xA8\x8BC\x82ɃX\x83\x8C
@@ -227,7 +243,7 @@
// \x91\x8D\x83\x8C\x83X\x90\x94
if (UA::isIPhoneGroup()) {
- $rescount_ht = '<font class="sbnum"> ' . $aThread->rescount . '</font>';
+ $rescount_ht = '<font class="sbnum"> ' . $aThread->rescount . '<span class="sbnumstr">res</span></font>';
} else {
$rescount_ht = ' (' . $aThread->rescount . ')';
}
@@ -274,6 +290,7 @@
$one_ht = "<a href=\"{$onlyone_url}\">>>1</a>";
}
+ // 2ch\x8Cn\x88ȊO\x82̓I\x83\x93\x83U\x83t\x83\x89\x83C\x8E擾\x82ɑΉ\x9E\x82\xB5\x82Ă\xA2\x82Ȃ\xA2
if (P2Util::isHost2chs($aThreadList->host) and !$aThread->isKitoku()) {
if ($GLOBALS['_conf']['k_sb_show_first'] == 1) {
$thre_url = $onlyone_url;
@@ -298,7 +315,7 @@
$favmark = !empty($aThread->fav) ? '\x81\x9A' : '+';
if ($favmark == '\x81\x9A') {
- $favmark = '<img src="iui/icon_del.png">';
+ $favmark = '<img src="iui/icon_del.png">'; // 29x29
} else {
$favmark = '<img src="iui/icon_add.png">';
}
@@ -332,12 +349,16 @@
if (UA::isIPhoneGroup()) {
?><li><?php
+ // \x82\xA8\x8BC\x82ɓ\xFC\x82\xE8\x83}\x81[\x83N
echo "<span class=\"plus\" id=\"{$aThread->torder}\" ><a href=\"{$setFavUri_hs}\" target=\"info\" onClick=\"return setFavJsNoStr('host={$aThread->host}{$bbs_q}{$key_q}{$ttitle_en_q}{$sid_q}', '{$favvalue}', {$STYLE['info_pop_size']}, 'read', 'this',{$aThread->torder});\" title=\"{$favtitle}\">{$favmark}</a></span>";
// \x83{\x83f\x83B
echo <<<EOP
- <a href="{$thre_url}" class="ttitle">{$unum_new_ht}{$aThread->ttitle_ht}{$ita_name_ht}{$rescount_ht}{$similarity_ht}</a>{$unum_ht}</li>
+ <a href="{$thre_url}" class="ttitle">{$unum_new_ht}{$aThread->ttitle_ht}{$ita_name_ht}{$rescount_ht}{$ikioi_ht}{$similarity_ht}</a>{$unum_ht}
EOP;
+ ?></li><?php
+
+ // \x8Cg\x91\xD1
} else {
echo <<<EOP
<div>
Modified: p2/trunk/lib/sb_toolbar_k.funcs.php
===================================================================
--- p2/trunk/lib/sb_toolbar_k.funcs.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/sb_toolbar_k.funcs.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -11,7 +11,7 @@
* @access public
* @return string HTML
*/
-function getShinchakuMatomeATag($aThreadList, $shinchaku_num)
+function getShinchakuMatomeATag($aThreadList, $shinchaku_num, $noclass = false)
{
global $_conf;
static $upper_toolbar_done_ = false;
@@ -25,8 +25,8 @@
$attrs = array();
- if (UA::isIPhoneGroup()) {
- $attrs['class'] = 'button';
+ if (!$noclass && UA::isIPhoneGroup()) {
+ $attrs['class'] = 'tbutton';
}
// \x8F㉺\x82\xA0\x82\xE9\x83c\x81[\x83\x8B\x83o\x81[\x82̉\xBA\x82\xBE\x82\xAF\x82ɃA\x83N\x83Z\x83X\x83L\x81[\x82\xF0\x82‚\xAF\x82\xE9
@@ -34,7 +34,7 @@
$attrs[$_conf['accesskey_for_k']] = $_conf['k_accesskey']['matome'];
}
$upper_toolbar_done_ = true;
-
+
$qs = array(
'host' => $aThreadList->host,
'bbs' => $aThreadList->bbs,
@@ -42,8 +42,13 @@
'nt' => date('gis'),
UA::getQueryKey() => UA::getQueryValue()
);
- $label = "{$_conf['k_accesskey']['matome']}.\x90V\x82܂Ƃ\xDF";
+ if (UA::isIPhoneGroup()) {
+ $label = '\x90V\x82܂Ƃ\xDF';
+ } else {
+ $label = "{$_conf['k_accesskey']['matome']}.\x90V\x82܂Ƃ\xDF";
+ }
+
if ($shinchaku_num) {
$shinchaku_matome_atag = P2View::tagA(
UriUtil::buildQueryUri(
Modified: p2/trunk/lib/setFav.func.php
===================================================================
--- p2/trunk/lib/setFav.func.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/setFav.func.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -172,6 +172,8 @@
{
global $_conf;
+ return null; // 2013/06/13 \x82\xA8\x8BC\x82ɃX\x83\x8C\x8B\xA4\x97L\x82͔p\x8E~\x82\xB7\x82\xE9
+
if (!$_conf['join_favrank']) {
return null;
}
Modified: p2/trunk/lib/setFavIta.func.php
===================================================================
--- p2/trunk/lib/setFavIta.func.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/setFavIta.func.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -20,10 +20,10 @@
} elseif (isset($_POST['setfavita'])) {
$setfavita = $_POST['setfavita'];
}
-
+
$host = isset($_GET['host']) ? $_GET['host'] : NULL;
$bbs = isset($_GET['bbs']) ? $_GET['bbs'] : NULL;
-
+
if (isset($setfavita) && !preg_match('/^[a-zA-Z0-9]+$/', $setfavita)) {
P2Util::pushInfoHtml('<p>p2 info: \x95s\x90\xB3\x82Ȉ\xF8\x90\x94\x82ł\xB7\x81isetfavita\x81j');
return false;
Modified: p2/trunk/lib/settaborn.func.php
===================================================================
--- p2/trunk/lib/settaborn.func.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/settaborn.func.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -25,7 +25,7 @@
}
// }}}
-
+
// p2_threads_aborn.idx \x82̃p\x83X\x8E擾
$taborn_idx = P2Util::getThreadAbornFile($host, $bbs);
Modified: p2/trunk/lib/subject.funcs.php
===================================================================
--- p2/trunk/lib/subject.funcs.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/lib/subject.funcs.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -1,5 +1,100 @@
<?php
+
/**
+ * \x83N\x83G\x83\x8A\x81[\x82\xA9\x82\xE7\x83t\x83B\x83\x8B\x83^\x83\x8F\x81[\x83h\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9
+ *
+ * @access public
+ * @return void
+ */
+function sbSetFilterWord()
+{
+ global $_conf;
+
+ $GLOBALS['sb_filter'] = array();
+ $GLOBALS['sb_filter']['method'] = null;
+
+ $GLOBALS['word'] = null;
+ $GLOBALS['word_fm'] = null;
+ $GLOBALS['wakati_word'] = null;
+
+ // \x81u\x8DX\x90V\x81v\x82ł͂Ȃ\xAD\x82āA\x8C\x9F\x8D\xF5\x8Ew\x92肪\x82\xA0\x82\xEA\x82A\x8C\x9F\x8D\x{1433C1}[\x83h\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9
+ if (empty($_REQUEST['submit_refresh']) or !empty($_REQUEST['submit_kensaku'])) {
+
+ if (isset($_GET['word'])) {
+ $GLOBALS['word'] = $_GET['word'];
+ } elseif (isset($_POST['word'])) {
+ $GLOBALS['word'] = $_POST['word'];
+ }
+
+ if (isset($_GET['method'])) {
+ $GLOBALS['sb_filter']['method'] = $_GET['method'];
+ } elseif (isset($_POST['method'])) {
+ $GLOBALS['sb_filter']['method'] = $_POST['method'];
+ }
+
+ if (isset($GLOBALS['sb_filter']['method']) and $GLOBALS['sb_filter']['method'] == 'similar') {
+ $GLOBALS['wakati_word'] = $GLOBALS['word'];
+ $GLOBALS['wakati_words'] = _wakati($GLOBALS['word']);
+
+ if (!$GLOBALS['wakati_words']) {
+ unset($GLOBALS['wakati_word'], $GLOBALS['wakati_words']);
+ } else {
+ require_once P2_LIB_DIR . '/StrCtl.php';
+ $wakati_words2 = array_filter($GLOBALS['wakati_words'], '_wakatiFilter');
+
+ if (!$wakati_words2) {
+ $GLOBALS['wakati_hl_regex'] = $GLOBALS['wakati_word'];
+ } else {
+ rsort($wakati_words2, SORT_STRING);
+ $GLOBALS['wakati_hl_regex'] = implode(' ', $wakati_words2);
+ $GLOBALS['wakati_hl_regex'] = mb_convert_encoding($GLOBALS['wakati_hl_regex'], 'SJIS-win', 'UTF-8');
+ }
+
+ $GLOBALS['wakati_hl_regex'] = StrCtl::wordForMatch($GLOBALS['wakati_hl_regex'], 'or');
+ $GLOBALS['wakati_hl_regex'] = str_replace(' ', '|', $GLOBALS['wakati_hl_regex']);
+ $GLOBALS['wakati_length'] = mb_strlen($GLOBALS['wakati_word'], 'SJIS-win');
+ $GLOBALS['wakati_score'] = _getSbScore($GLOBALS['wakati_words'], $GLOBALS['wakati_length']);
+
+ if (!isset($_conf['expack.min_similarity'])) {
+ $_conf['expack.min_similarity'] = 0.05;
+ } elseif ($_conf['expack.min_similarity'] > 1) {
+ $_conf['expack.min_similarity'] /= 100;
+ }
+ if (count($GLOBALS['wakati_words']) == 1) {
+ $_conf['expack.min_similarity'] /= 100;
+ }
+ $_conf['expack.min_similarity'] = (float) $_conf['expack.min_similarity'];
+ }
+ $GLOBALS['word'] = '';
+
+ } elseif (preg_match('/^\.+$/', $GLOBALS['word'])) {
+ $GLOBALS['word'] = '';
+ }
+
+ if (strlen($GLOBALS['word'])) {
+
+ // \x83f\x83t\x83H\x83\x8B\x83g\x83I\x83v\x83V\x83\x87\x83\x93
+ // $GLOBALS['sb_filter'] \x82\xCD global @see sb_print.inc.php
+ if (!$GLOBALS['sb_filter']['method']) {
+ $GLOBALS['sb_filter']['method'] = 'or';
+ }
+
+ require_once P2_LIB_DIR . '/StrCtl.php';
+ $GLOBALS['word_fm'] = StrCtl::wordForMatch($GLOBALS['word'], $GLOBALS['sb_filter']['method']);
+ if ($GLOBALS['sb_filter']['method'] != 'just') {
+ if (P2_MBREGEX_AVAILABLE == 1) {
+ $GLOBALS['words_fm'] = mb_split('\s+', $GLOBALS['word_fm']);
+ $GLOBALS['word_fm'] = mb_ereg_replace('\s+', '|', $GLOBALS['word_fm']);
+ } else {
+ $GLOBALS['words_fm'] = preg_split('/\s+/', $GLOBALS['word_fm']);
+ $GLOBALS['word_fm'] = preg_replace('/\s+/', '|', $GLOBALS['word_fm']);
+ }
+ }
+ }
+ }
+}
+
+/**
* @return array
*/
function sbLoadP2SettingTxt($p2_setting_txt)
Modified: p2/trunk/login.php
===================================================================
--- p2/trunk/login.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/login.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -311,14 +311,14 @@
if (isset($_REQUEST['check_register_cookie'])) {
if ($_login->checkUserPwWithCid($_COOKIE['cid'])) {
- if (geti($_REQUEST['register_cookie']) == '1') {
+ if ($_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['register_cookie']) == '1') {
+ if ($_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 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/menu_i.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -64,6 +64,7 @@
<body class="menu_i">
<?php $index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue())); ?>
<p><a id="backButton" class="tbutton" href="<?php eh($index_uri); ?>">TOP</a></p>
+
<div class="toolbar"><h1 class="pageTitle"><?php eh($ptitle); ?></h1></div>
<?php
P2Util::printInfoHtml();
@@ -157,6 +158,7 @@
// \x83t\x83b\x83^\x82\xF0HTML\x95\\x8E\xA6
echo geti($GLOBALS['list_navi_ht']);
?>
+
</body></html>
<?php
Modified: p2/trunk/menu_k.php
===================================================================
--- p2/trunk/menu_k.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/menu_k.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -177,4 +177,4 @@
$ptitle = '\xD5\xCB\xC0\xBDp2';
}
return $ptitle;
-}
+}
\ No newline at end of file
Modified: p2/trunk/post.php
===================================================================
--- p2/trunk/post.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/post.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -93,7 +93,7 @@
$mail_k = 'MAIL';
$MESSAGE_k = 'MESSAGE';
$subject_k = 'SUBJECT';
-
+
// cha2\x82Ȃ\xE7
} elseif (P2Util::isHostCha2($host)) {
$bbs_cgi = '/cgi-bin/test/bbs.cgi';
@@ -106,7 +106,7 @@
$mail_k = 'mail';
$MESSAGE_k = 'MESSAGE';
$subject_k = 'SUBJECT';
-
+
// 2ch\x8Cn\x82Ȃ\xE7
} else {
if ($sub) {
@@ -398,7 +398,9 @@
// \x83f\x81[\x83^PHP\x8C`\x8E\xAE\x81ip2_res_hist.dat.php, \x83^\x83u\x8B\xE6\x90\xE8\x81j\x82̏\x91\x82\xAB\x8D\x9E\x82ݗ\x9A\x97\xF0\x82\xF0\x81Adat\x8C`\x8E\xAE\x81ip2_res_hist.dat, <>\x8B\xE6\x90\xE8\x81j\x82ɕϊ\xB7\x82\xB7\x82\xE9
P2Util::transResHistLogPhpToDat();
- FileCtl::make_datafile($_conf['p2_res_hist_dat'], $_conf['res_write_perm']);
+ if (false === FileCtl::make_datafile($_conf['p2_res_hist_dat'], $_conf['res_write_perm'])) {
+ return false;
+ }
$resnum = '';
if (!empty($_POST['newthread'])) {
@@ -558,32 +560,6 @@
}
/**
- * \x83N\x83b\x83L\x81[\x82\xF0\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82ɕۑ\xB6\x82\xB7\x82\xE9
- *
- * @param array $p2cookies
- * @param string $cookie_file
- * @return boolean
- */
-function _saveCookieFile($p2cookies, $cookie_file)
-{
- global $_conf;
-
- // \x8BL\x98^\x82\xB7\x82\xE9\x83f\x81[\x83^\x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82́A\x90\xAC\x8C\x{1C8D42}\xA2\x82ʼn\xBD\x82\xE0\x82\xB5\x82Ȃ\xA2
- if (!$p2cookies) {
- return true;
- }
-
- $cookie_cont = serialize($p2cookies);
-
- FileCtl::make_datafile($cookie_file, $_conf['p2_perm']);
- if (false === file_put_contents($cookie_file, $cookie_cont, LOCK_EX)) {
- return false;
- }
-
- return true;
-}
-
-/**
* @return array array($request, $send_host, $send_port)
*/
function _buildRequestForPost($host, $bbs, $key, $post, $bbs_cgi)
@@ -609,7 +585,7 @@
!$send_port and $send_port = 80;
- $request = $method . ' ' . $send_path . " HTTP/1.0" . "\r\n";
+ $request = $method . ' ' . $send_path . ' HTTP/1.0' . "\r\n";
$request .= 'Host: ' . $purl['host'] . "\r\n";
$remote_host = P2Util::getRemoteHost($_SERVER['REMOTE_ADDR']);
@@ -641,7 +617,7 @@
// \x83N\x83b\x83L\x81[
$cookies_to_send = array();
$p2cookies = P2Util::readBbsCookieFileByHost($host);
-
+
if ($p2cookies) {
foreach ($p2cookies as $cname => $cvalue) {
if (!in_array($cname, array('expires', 'domain'))) {
@@ -671,7 +647,7 @@
}
}
}
-
+
if ($cookies_to_send) {
$cstrs = array();
foreach ($cookies_to_send as $k => $v) {
@@ -777,7 +753,7 @@
// \x93]\x91\x97\x82͏\x91\x82\xAB\x8D\x9E\x82ݐ\xAC\x8C\xF7\x82Ɣ\xBB\x92f
} elseif (
- preg_match("/^Location: /", $l, $matches)
+ preg_match('/^Location: /', $l, $matches)
// \x94ˆړ]\x8Cゾ\x82Ƃ\xB1\x82\xA4\x82Ȃ\xE9\x82݂\xBD\x82\xA2 \x81\xA8 http://www2.2ch.net/live.html\x81i\x82\xE0\x82\xA4\x82\xB8\x82\xC1\x82Ɛl\x91吙\x81j
// \x81i\x82\xB1\x82̃G\x83\x89\x81[\x8Fڍׂ\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x95\xFB\x82\xAA\x90e\x90\xBE\x82\xAA\x81j
and !preg_match('{\\.2ch\\.net/live\\.html}', $l, $matches)
@@ -1008,7 +984,7 @@
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<?php
echo $popup_ht;
-
+
// \x8Cg\x91ь\xFC\x82\xAF
} else {
$kakunin_ht = '<p><a href="' . hs($location_url) . '">\x8Am\x94F</a></p>';
@@ -1027,7 +1003,6 @@
EOP;
}
-
/**
* @return boolean \x8BK\x90\xA7\x92\x86\x82Ȃ\xE7 true \x82\xF0\x95Ԃ\xB7
*/
@@ -1036,15 +1011,15 @@
if (!$times = _getLastPostTime()) {
return false;
}
- $last_try_time = $times[0];
- if (time() - $lasttrytime < $sambatime) {
+ $last_post_time = $times[1];
+ if ($sambatime > time() - $last_post_time) {
return true;
}
return false;
}
/**
- * \x8DŏI\x93\x8A\x8De\x8E\x9E\x8AԋK\x90\xA7\x82\xF0\x83`\x83F\x83b\x83N\x82\xB5\x82čX\x90V\x82\xB7\x82\xE9
+ * \x8DŏI\x93\x8A\x8De\x8E\x8E\x8Ds\x8E\x9E\x8AԂ̋K\x90\xA7\x82\xF0\x83`\x83F\x83b\x83N\x82\xB5\x82čX\x90V\x82\xB7\x82\xE9
*
* @return boolean \x92e\x82\xAD\x82Ȃ\xE7true
*/
@@ -1068,7 +1043,7 @@
}
}
- // \x91O\x89\xAB\x8D\x9E\x82ݎ\x9E\x8AԂ\xF0\x93ǂݍ\x9E\x82\xF1\x82Ń`\x83F\x83b\x83N
+ // \x91O\x89\xAB\x8D\x9E\x82ݎ\x8E\x8Ds\x8E\x9E\x8AԂ\xF0\x93ǂݍ\x9E\x82\xF1\x82Ń`\x83F\x83b\x83N
$last_post_times = $lines;
if ($last_try_time = $last_post_times[0]) {
if ($last_try_time > time() - $kisei_second) {
Modified: p2/trunk/post_form.php
===================================================================
--- p2/trunk/post_form.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/post_form.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -5,6 +5,8 @@
require_once './conf/conf.inc.php';
require_once P2_LIB_DIR . '/DataPhp.php';
+//require_once P2_LIB_DIR . '/Thread.php';
+//require_once P2_LIB_DIR . '/ThreadRead.php';
require_once P2_LIB_DIR . '/P2Validate.php';
$_login->authorize(); // \x83\x86\x81[\x83U\x94F\x8F\xD8
@@ -122,7 +124,7 @@
$body_on_load = '';
if (!$_conf['ktai']) {
$body_on_load = <<<EOP
- onLoad="setFocus('MESSAGE'); checkSage();"
+ onLoad="setFocus('MESSAGE'); checkSage(); bodyFit();"
EOP;
}
@@ -142,6 +144,7 @@
?>
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<script type="text/javascript" src="js/basic.js?2012"></script>
+ <!-- <script type="text/javascript" src="js/yui-ext/yui.js"></script> -->
<script type="text/javascript" src="js/post_form.js?v=20090724"></script>
<?php
}
Modified: p2/trunk/read.php
===================================================================
--- p2/trunk/read.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/read.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -291,7 +291,7 @@
}
if (UA::isK()) {
-
+
// \x83w\x83b\x83_\x83v\x83\x8A\x83\x93\x83g
if (UA::isIPhoneGroup()) {
require_once P2_IPHONE_LIB_DIR . '/read_header_k.inc.php';
@@ -322,6 +322,7 @@
$read_navi_previous_btm_ht, $read_navi_next_btm_ht, $read_footer_navi_new_btm_ht, $goto_next_ht
) = getRewriteReadNaviFooterK($aThread, $params);
}
+
if (UA::isIPhoneGroup()) {
require_once P2_IPHONE_LIB_DIR . '/read_footer_k.inc.php';
} else {
@@ -515,14 +516,14 @@
$bbs = $matches[3];
$key = $matches[4];
$ls = geti($matches[5]);
-
+
// \x83`\x83\x83\x83b\x83g\x82\xBF\x82\xE1\x82\xF1\x82˂\xE9 http://cha2.net/cgi-bin/test/read.cgi/anitoku/1241688251/l50
} elseif (preg_match('{http://(cha2\\.net)/cgi-bin/test/read\\.cgi/(\\w+)/(\\d+)/?([^/]+)?}', $url, $matches)) {
$host = $matches[1];
$bbs = $matches[2];
$key = $matches[3];
$ls = geti($matches[4]);
-
+
// \x8AO\x95\x94\x94\xC2 read.cgi \x8C`\x8E\xAE http://ex14.vip2ch.com/test/read.cgi/operate/1161701941/
} elseif (preg_match('{http://([^/]+)/test/read\\.cgi/(\\w+)/(\\d+)/?([^/]+)?}', $url, $matches)) {
$host = $matches[1];
@@ -619,10 +620,10 @@
global $_conf;
$data_line = implode('<>', $data_ar);
+ $key = $data_ar[1];
$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;
@@ -709,7 +710,7 @@
$read_footer_inc_php = P2_LIB_DIR . '/read_footer.inc.php';
}
require_once $read_header_inc_php;
-
+
echo $bodyHtml;
require_once $read_footer_inc_php;
Modified: p2/trunk/read_copy_k.php
===================================================================
--- p2/trunk/read_copy_k.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/read_copy_k.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -60,7 +60,6 @@
// \x93\x8A\x8De\x83t\x83H\x81[\x83\x80 <a>
$post_link_atag = _getPostLinkATag($aThread, $ttitle_en);
-
// \x8C\xB3\x83X\x83\x8C\x82\xD6 <a>
$moto_link_atag = P2View::tagA(
P2Util::throughIme($moto_url_k),
@@ -103,6 +102,7 @@
$be_txt = "?{$m[2]}";
}
$msg_txt = trim(strip_tags($resar[3], '<br>'));
+
if ($quote) {
$msg_txt = ">>{$resid}\r\n> " . preg_replace('/ *<br[^>]*> */i', "\n> ", $msg_txt);
} else {
Modified: p2/trunk/read_filter.php
===================================================================
--- p2/trunk/read_filter.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/read_filter.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -106,7 +106,7 @@
// mb_eregi()\x82\xCD\d\x82őS\x8Ap\x90\x94\x8E\x9A\x82ɂ\xE0\x94\xBD\x89\x9E\x82\xB7\x82\xE9\x81iStrCtl\x81j
$word = ShowThread::getAnchorRegex(
'%prefix%(.+%delimiter%)?' . $resnum . '(?!\\d|%range_delimiter%)'
- );
+ );
}
return $word;
}
Modified: p2/trunk/read_filter_i.php
===================================================================
--- p2/trunk/read_filter_i.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/read_filter_i.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -1,6 +1,6 @@
<?php
// 2010/08/05 \x94p\x8E~\x81B
-// \x82\xB1\x82̃X\x83N\x83\x8A\x83v\x83g\x82͎g\x82킸\x82ɁAread.php\x82ł\xBB\x82̂܂\x88\x97\x9D\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B\x88\xF8\x90\x94popup_filter\x82Ŕ\xBB\x95ʁB
+// \x82\xB1\x82̃X\x83N\x83\x8A\x83v\x83g\x82͎g\x82킸\x82ɁAread.php\x82ł\xBB\x82̂܂\x88\x97\x9D\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B\x88\xF8\x90\x94popup_filter\x82Ŕ\xBB\x95ʂ\xB7\x82\xE9\x81B
// \x93\xFC\x97̓t\x83H\x81[\x83\x80\x89\xE6\x96ʂ́A\x83I\x81[\x83o\x81[\x83\x8C\x83C\x83|\x83b\x83v\x83A\x83b\x83v\x82̕\xFB\x82𗘗p\x82\xB5\x82Ă\xA2\x82\xE9\x81B
Modified: p2/trunk/read_filter_k.php
===================================================================
--- p2/trunk/read_filter_k.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/read_filter_k.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -104,9 +104,11 @@
$hr
EOF;
+
echo P2View::getBackToIndexKATag();
?>
-</body></html>
+</body>
+</html>
<?php
/*
Modified: p2/trunk/read_new.php
===================================================================
--- p2/trunk/read_new.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/read_new.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -533,9 +533,9 @@
$aThread->readnum, $data[6], $data[7], $data[8], $newline,
$data[10], $data[11], $aThread->datochiok
);
- P2Util::recKeyIdx($aTread->keyidx, $sar); // key.idx \x82ɋL\x98^
+ P2Util::recKeyIdx($aThread->keyidx, $sar); // key.idx \x82ɋL\x98^
}
-
+
// \x83t\x83b\x83^\x95\x94\x95\xAAHTML
$read_atag = _getReadATag($aThread);
@@ -644,7 +644,7 @@
{
global $_conf;
- $read_atag = P2View::tagA(
+ return $read_atag = P2View::tagA(
UriUtil::buildQueryUri($_conf['read_php'],
array(
'host' => $aThread->host,
@@ -659,6 +659,8 @@
);
}
+
+
/*
* Local Variables:
* mode: php
Modified: p2/trunk/read_new_k.php
===================================================================
--- p2/trunk/read_new_k.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/read_new_k.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -14,17 +14,20 @@
$_login->authorize(); // \x83\x86\x81[\x83U\x94F\x8F\xD8
-// \x82܂Ƃ߂\xE6\x82݂̃L\x83\x83\x83b\x83V\x83\x85\x93ǂ\xDD
+// {{{ \x90V\x92\x85\x82܂Ƃ߂\xE6\x82݂̃L\x83\x83\x83b\x83V\x83\x85\x93ǂ\xDD
+
if (!empty($_GET['cview'])) {
$cnum = isset($_GET['cnum']) ? intval($_GET['cnum']) : NULL;
if ($cont = getMatomeCache($cnum)) {
echo $cont;
- exit;
} else {
- p2die('\x90V\x92\x85\x82܂Ƃߓǂ݂̃L\x83\x83\x83b\x83V\x83\x85\x82\xAA\x82Ȃ\xA2\x82\xE6');
+ echo 'p2 error: \x90V\x92\x85\x82܂Ƃߓǂ݂̃L\x83\x83\x83b\x83V\x83\x85\x82\xAA\x82Ȃ\xA2\x82\xE6';
}
+ exit;
}
+// }}}
+
//==================================================================
// \x95ϐ\x94
//==================================================================
Modified: p2/trunk/setting.php
===================================================================
--- p2/trunk/setting.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/setting.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -75,7 +75,7 @@
P2View::printIncludeCssHtml('style');
P2View::printIncludeCssHtml('setting');
?>
- <link rel="shortc<ut icon" href="favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
<script type="text/javascript" src="js/basic.js?2012"></script>
<?php
}
@@ -125,7 +125,7 @@
// \x83t\x83b\x83^HTML\x95\\x8E\xA6
if (UA::isK()) {
- echo $hr . P2View::getBackToIndexKATag() . "\n";
+ echo $hr . P2View::getBackToIndexKATag() . "\n";
}
?>
Modified: p2/trunk/subject.php
===================================================================
--- p2/trunk/subject.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/subject.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -7,6 +7,7 @@
*/
require_once './conf/conf.inc.php';
+
require_once P2_LIB_DIR . '/ThreadList.php';
require_once P2_LIB_DIR . '/Thread.php';
require_once P2_LIB_DIR . '/P2Validate.php';
@@ -251,7 +252,7 @@
unset($aThread);
$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('word_filter_for_sb');
continue;
-
+
// \x83}\x83b\x83`\x82\xB5\x82\xBD\x8E\x9E
} else {
$GLOBALS['sb_mikke_num'] = isset($GLOBALS['sb_mikke_num']) ? $GLOBALS['sb_mikke_num'] + 1 : 1;
@@ -437,7 +438,7 @@
}
$GLOBALS['debug'] && $GLOBALS['profiler']->enterSection('FORLOOP_HIP');
-
+
// subjexct\x82\xA9\x82\xE7rescount\x82\xAA\x8E\xE6\x82\xEA\x82Ȃ\xA9\x82\xC1\x82\xBD\x8Fꍇ\x82́Agotnum\x82𗘗p\x82\xB7\x82\xE9\x81B
if ((!$aThread->rescount) and $aThread->gotnum) {
$aThread->rescount = $aThread->gotnum;
@@ -447,9 +448,11 @@
// \x90V\x92\x85\x82\xA0\x82\xE8
if ($aThread->unum > 0) {
$shinchaku_num += $aThread->unum; // \x90V\x92\x85\x90\x94set
- } elseif ($aThread->fav) { // \x82\xA8\x8BC\x82ɃX\x83\x8C
+ // \x82\xA8\x8BC\x82ɃX\x83\x8C
+ } elseif ($aThread->fav) {
;
- } elseif ($aThread->new) { // \x90V\x8BK\x83X\x83\x8C
+ // \x90V\x8BK\x83X\x83\x8C
+ } elseif ($aThread->new) {
;
// \x8A\xF9\x93\xBE\x83X\x83\x8C
} elseif ($_conf['viewall_kitoku'] && $aThread->isKitoku()) {
@@ -489,14 +492,13 @@
// \x83\x8A\x83X\x83g\x82ɒlj\xC1
$aThreadList->addThread($aThread);
-
+
unset($aThread);
$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('FORLOOP_HIP');
}
$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('FORLOOP');
-
$GLOBALS['debug'] && $GLOBALS['profiler']->enterSection('FOOT');
// \x8A\xF9\x82\xC9dat\x97\x8E\x82\xBF\x82\xB5\x82Ă\xA2\x82\xE9\x83X\x83\x8C\x82͎\xA9\x93\xAE\x93I\x82ɂ\xA0\x82ځ[\x82\xF1\x82\xF0\x89\xF0\x8F\x9C\x82\xB7\x82\xE9
@@ -569,7 +571,7 @@
// \x83w\x83b\x83_HTML\x82\xF0\x95\\x8E\xA6
$GLOBALS['debug'] && $GLOBALS['profiler']->enterSection('sb_header');
require_once P2_LIB_DIR . '/sb_header.inc.php';
- flush();
+ ob_flush(); flush();
$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('sb_header');
// \x83X\x83\x8C\x83b\x83h\x83T\x83u\x83W\x83F\x83N\x83g\x83\x81\x83C\x83\x93\x95\x94\x95\xAAHTML\x95\\x8E\xA6
@@ -592,7 +594,7 @@
// $subject_keys \x82\xF0\x83V\x83\x8A\x83A\x83\x89\x83C\x83Y\x82\xB5\x82ĕۑ\xB6\x82\xB7\x82\xE9
_saveSubjectKeys($subject_keys, $sb_keys_txt, $sb_keys_b_txt);
-$debug && $profiler->leaveSection('FOOT');
+$GLOBALS['debug'] && $GLOBALS['profiler']->leaveSection('FOOT');
exit;
@@ -609,7 +611,7 @@
*/
function _autoTAbornOff(&$aThreadList, $ta_keys)
{
- global $ta_num;
+ global $ta_num; // \x82\xA0\x82ځ[\x82X\x83g\x82̐\x94
$result = '';
@@ -624,6 +626,7 @@
require_once P2_LIB_DIR . '/settaborn_off.inc.php';
$ta_vkeys = array_keys($ta_keys);
settaborn_off($aThreadList->host, $aThreadList->bbs, $ta_vkeys);
+
foreach ($ta_vkeys as $k) {
$ta_num--;
if ($k) {
@@ -748,7 +751,7 @@
function _saveSubjectKeys($subject_keys, $sb_keys_txt, $sb_keys_b_txt)
{
global $_conf;
-
+
//if (file_exists($sb_keys_b_txt)) { unlink($sb_keys_b_txt); }
if ($subject_keys) {
if (file_exists($sb_keys_txt)) {
@@ -954,7 +957,6 @@
/**
* \x82\xB7\x82\xB2\x82\xAD\x93K\x93\x96\x82ȕ\xAA\x82\xA9\x82\xBF\x8F\x91\x82\xAB\x97p\x90\xB3\x8BK\x95\\x8C\xBB\x83p\x83^\x81[\x83\x93\x82\xF0\x8E擾\x82\xB7\x82\xE9
- * \x81i\x8A\x94\x82Ŏ擾\x82\xB7\x82\xE9\x82͔̂\xF1\x8C\xF8\x97\xA6\x93I\x82\xBE\x82\xAA\x81j
*
* @return string
*/
Modified: p2/trunk/subject_new.php
===================================================================
--- p2/trunk/subject_new.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/subject_new.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -5,7 +5,7 @@
\x96\xB3\x97\x9D\x96\x82\xBE\x82\xAA\x81A\x94ƒ\x81\x83j\x83\x85\x81[\x82ŐV\x92\x85\x90\x94\x82\xF0\x92m\x82邽\x82߂Ɏg\x97p\x82\xB5\x82Ă\xA2\x82\xE9 // $shinchaku_num, $_newthre_num \x82\xF0\x83Z\x83b\x83g
\x81i\x95ϐ\x94\x82̃X\x83R\x81[\x83v\x82͕‚\xB6\x82\xBD\x82\xA2\x82Ƃ\xB1\x82\xEB\x81j
-
+
subject.php \x82ƌZ\x92\xED\x82Ȃ̂ňꏏ\x82ɖʓ|\x82\xF0\x82݂\xE9
$host, $bbs, $spmode \x82\xF0\x82\xA0\x82炩\x82\xB6\x82ߏ\x80\x94\x{142D42}Ă\xA8\x82\xAD
@@ -99,7 +99,7 @@
$aThreadList->setSpMode($spmode);
} else {
// if (!$p2_setting['itaj']) { $p2_setting['itaj'] = P2Util::getItaName($host, $bbs); }
- $aThreadList->setIta($host, $bbs, $itaj = isset($p2_setting['itaj']) ? $p2_setting['itaj'] : null);
+ $aThreadList->setIta($host, $bbs, isset($p2_setting['itaj']) ? $p2_setting['itaj'] : null);
// \x83X\x83\x8C\x83b\x83h\x82\xA0\x82ځ[\x82X\x83g\x93Ǎ\x9E
$ta_keys = P2Util::getThreadAbornKeys($aThreadList->host, $aThreadList->bbs);
@@ -139,7 +139,7 @@
// \x83\x89\x83C\x83\x93\x82\xA9\x82\xE7\x83X\x83\x8C\x83b\x83h\x83f\x81[\x83^\x82\xF0\x93ǂݍ\x9E\x82\xF1\x82ŃZ\x83b\x83g
$aThread->setThreadInfoFromLineWithThreadList($l, $aThreadList);
-
+
// host\x82\xA9bbs\x82\xA9key\x82\xAA\x95s\x96\xBE\x82Ȃ\xE7\x83X\x83L\x83b\x83v
if (!($aThread->host && $aThread->bbs && $aThread->key)) {
unset($aThread);
@@ -166,7 +166,7 @@
if ($aThreadList->spmode != 'taborn' and !empty($ta_keys[$aThread->key])) {
unset($ta_keys[$aThread->key]);
- continue; //\x82\xA0\x82ځ[\x82\xF1\x83X\x83\x8C\x82̓X\x83L\x83b\x83v
+ continue; // \x82\xA0\x82ځ[\x82\xF1\x83X\x83\x8C\x82̓X\x83L\x83b\x83v
}
$aThread->setThreadPathInfo($aThread->host, $aThread->bbs, $aThread->key);
@@ -174,7 +174,7 @@
// }}}
// {{{ favlist\x83`\x83F\x83b\x83N
-
+
!empty($debug) && $profiler->enterSection('favlist_check');
// if ($x <= $threads_num) {
if ($aThreadList->spmode != 'taborn' and !empty($fav_keys[$aThread->key])) {
@@ -189,7 +189,7 @@
// \x81\xA1 spmode(\x93a\x93\xB0\x93\xFC\x82\xE8\x81Anews\x82\xF0\x8F\x9C\x82\xAD)\x82Ȃ\xE7 ====================================
if ($aThreadList->spmode && $aThreadList->spmode!="news" && $sb_view!="edit") {
- // {{{ subject.txt\x82\xAA\x96\xA2DL\x82Ȃ痎\x82Ƃ\xB5\x82ăf\x81[\x83^\x82\xF0\x94z\x97\xF1\x82Ɋi\x94[\x82\xB7\x82\xE9
+ // {{{ subject.txt \x82\xAA\x96\xA2DL\x82Ȃ痎\x82Ƃ\xB5\x82ăf\x81[\x83^\x82\xF0\x94z\x97\xF1\x82Ɋi\x94[\x82\xB7\x82\xE9
if (empty($subject_txts["$aThread->host/$aThread->bbs"])) {
@@ -284,6 +284,7 @@
if ((!$aThread->rescount) and $aThread->gotnum) {
$aThread->rescount = $aThread->gotnum;
}
+
if (!$aThread->ttitle_ht) {
$aThread->ttitle_ht = $aThread->ttitle;
}
@@ -328,6 +329,7 @@
*/
unset($aThread);
+
}
// $shinchaku_num
Modified: p2/trunk/title.php
===================================================================
--- p2/trunk/title.php 2013-06-13 14:03:18 UTC (rev 955)
+++ p2/trunk/title.php 2013-06-13 16:29:04 UTC (rev 956)
@@ -2,7 +2,6 @@
// p2 - \x83^\x83C\x83g\x83\x8B\x83y\x81[\x83W(PC\x97p)
require_once './conf/conf.inc.php';
-require_once P2_LIB_DIR . '/FileCtl.php';
$_login->authorize(); // \x83\x86\x81[\x83U\x94F\x8F\xD8
@@ -36,6 +35,7 @@
$newversion_found_html = _checkUpdatan();
}
+
// \x83\x8D\x83O\x83C\x83\x93\x83\x86\x81[\x83U\x8F\xEE\x95\xF1
$htm['auth_user'] = "<p>\x83\x8D\x83O\x83C\x83\x93\x83\x86\x81[\x83U: {$_login->user_u} - " . date('Y/m/d (D) G:i') . '</p>' . "\n";
@@ -85,7 +85,7 @@
HOST: {$htm['log']['host']}<br>
UA: {$htm['log']['ua']}<br>
REFERER: {$htm['log']['referer']}
-<div>
+</div>
EOP;
}
}
@@ -180,7 +180,7 @@
$update_ver = $ver_txt[0];
$kita = '\xB7\xC0\x84\xAA\x84\xAA\x84\xAA\x84\xAA\x81i߁\xCD߁j\x84\xAA\x84\xAA\x84\xAA\x84\xAA!!!!!!';
//$kita = '\xB7\xC0*\xA5\xDFߥ*:.\xA1..\xA1.:*\xA5\xDF(߁\xCD\xDF)ߥ*:.\xA1. .\xA1.:*\xA5\xDFߥ*!!!!!';
-
+
$newversion_found_html = '';
if ($update_ver && version_compare($update_ver, $_conf['p2version'], '>')) {
$update_ver_hs = hs($update_ver);