svnno****@sourc*****
svnno****@sourc*****
2013年 6月 6日 (木) 03:17:24 JST
Revision: 950
http://sourceforge.jp/projects/p2-php/scm/svn/commits/950
Author: akid
Date: 2013-06-06 03:17:24 +0900 (Thu, 06 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
p2/trunk/conf/conf_user_def.inc.php
p2/trunk/edit_conf_user.php
p2/trunk/edit_conf_user_i.php
p2/trunk/iphone/ShowThreadK.php
p2/trunk/iphone/js/iphone.js
p2/trunk/iphone/post_form.inc.php
p2/trunk/iphone/post_form_popup.inc.php
p2/trunk/iphone/read_footer_k.inc.php
p2/trunk/iphone/read_header_k.inc.php
p2/trunk/lib/ThreadRead.php
p2/trunk/lib/post_form.inc.php
p2/trunk/lib/read_footer.inc.php
p2/trunk/lib/res_hist.class.php
p2/trunk/post_form.php
p2/trunk/post_form_i.php
p2/trunk/read_new_i.php
Added Paths:
-----------
p2/trunk/lib/getPostFormHtml.func.php
p2/trunk/lib/getPostFormIPhoneHtml.func.php
p2/trunk/lib/getPostFormPopupIPhoneHtml.func.php
-------------- next part --------------
Modified: p2/trunk/conf/conf_user_def.inc.php
===================================================================
--- p2/trunk/conf/conf_user_def.inc.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/conf/conf_user_def.inc.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -173,6 +173,10 @@
$conf_user_def['bottom_res_form'] = 1; // (1)
$conf_user_sel['bottom_res_form'] = array('1' => '\x83}\x83E\x83X\x83I\x81[\x83o\x81[\x82ł\xB7\x82\xE9', '2' => '\x8F\xED\x82ɂ\xB7\x82\xE9', '0' => '\x82\xB5\x82Ȃ\xA2');
+// PC \x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82\xC9DAT\x97e\x97ʂ\xF0\x95\\x8E\xA6
+$conf_user_def['show_datsize_in_footer'] = 0; // (0)
+$conf_user_sel['show_datsize_in_footer'] = array('1' => '\x82\xB7\x82\xE9', '0' => '\x82\xB5\x82Ȃ\xA2');
+
// \x88\xF8\x97p\x83\x8C\x83X\x82\xF0\x81i\x83|\x83b\x83v\x83A\x83b\x83v\x81j\x95\\x8E\xA6 (\x82\xB7\x82\xE9, \x82\xB5\x82Ȃ\xA2)
$conf_user_def['quote_res_view'] = 1; // (1)
$conf_user_sel['quote_res_view'] = array('1' => '\x82\xB7\x82\xE9', '0' => '\x82\xB5\x82Ȃ\xA2');
@@ -194,6 +198,10 @@
$conf_user_def['k_rnum_range'] = 20; // (20)
$conf_user_rules['k_rnum_range'] = array('emptyToDef', 'notIntExceptMinusToDef');
+// \x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94
+$conf_user_def['i_rnum_range'] = 25; // (25)
+$conf_user_rules['i_rnum_range'] = array('emptyToDef', 'notIntExceptMinusToDef');
+
// \x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x82‚̃\x8C\x83X\x82̍ő\xE5\x95\\x8E\xA6\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j
$conf_user_def['ktai_res_size'] = 600; // (600)
$conf_user_rules['ktai_res_size'] = array('notIntExceptMinusToDef');
Modified: p2/trunk/edit_conf_user.php
===================================================================
--- p2/trunk/edit_conf_user.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/edit_conf_user.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -222,6 +222,9 @@
echo getEditConfHtml('ext_win_target', '\x8AO\x95\x94\x83T\x83C\x83g\x93\x99\x82փW\x83\x83\x83\x93\x83v\x82\xB7\x82鎞\x82ɊJ\x82\xAD\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x81[\x83Q\x83b\x83g\x96\xBC');
echo getEditConfHtml('bbs_win_target', 'p2\x91Ή\x9EBBS\x83T\x83C\x83g\x93\xE0\x82ŃW\x83\x83\x83\x93\x83v\x82\xB7\x82鎞\x82ɊJ\x82\xAD\x83E\x83B\x83\x93\x83h\x83E\x82̃^\x81[\x83Q\x83b\x83g\x96\xBC');
echo getEditConfHtml('bottom_res_form', '\x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82ɏ\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82\xF0\x95\\x8E\xA6');
+if (UA::isPC()) {
+ echo getEditConfHtml('show_datsize_in_footer', 'PC \x83X\x83\x8C\x83b\x83h\x89\xBA\x95\x94\x82\xC9DAT\x97e\x97ʂ\xF0\x95\\x8E\xA6');
+}
echo getEditConfHtml('quote_res_view', '\x88\xF8\x97p\x83\x8C\x83X\x82\xF0\x81i\x83|\x83b\x83v\x83A\x83b\x83v\x81j\x95\\x8E\xA6');
echo getEditConfHtml('enable_headbar', 'PC \x83w\x83b\x83h\x83o\x81[\x82\xF0\x95\\x8E\xA6');
@@ -230,6 +233,9 @@
echo getEditConfHtml('k_rnum_range', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94');
+if (!UA::isK()) {
+ echo getEditConfHtml('i_rnum_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x83|\x83C\x83\x93\x83^\x82̉\xBD\x83R\x91O\x82̃\x8C\x83X\x82\xA9\x82\xE7\x95\\x8E\xA6\x82\xB7\x82邩');
+}
echo getEditConfHtml('ktai_res_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x82‚̃\x8C\x83X\x82̍ő\xE5\x95\\x8E\xA6\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j');
echo getEditConfHtml('ktai_ryaku_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83\x8C\x83X\x82\xF0\x8Fȗ\xAA\x82\xB5\x82\xBD\x82Ƃ\xAB\x82̕\\x8E\xA6\x83T\x83C\x83Y');
echo getEditConfHtml('k_aa_ryaku_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81AAA\x82炵\x82\xAB\x83\x8C\x83X\x82\xF0\x8Fȗ\xAA\x82\xB7\x82\xE9\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j');
Modified: p2/trunk/edit_conf_user_i.php
===================================================================
--- p2/trunk/edit_conf_user_i.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/edit_conf_user_i.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -201,7 +201,7 @@
//echo getEditConfHtml('spm_kokores', '\x83X\x83}\x81[\x83g\x83|\x83b\x83v\x83A\x83b\x83v\x83\x81\x83j\x83\x85\x81[\x82Łu\x82\xB1\x82\xEA\x82Ƀ\x8C\x83X\x81v\x82\xF0\x95\\x8E\xA6');
-echo getEditConfHtml('k_rnum_range', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94');
+echo getEditConfHtml('i_rnum_range', '\x83X\x83}\x83z\x89{\x97\x97\x8E\x9E\x81A\x88\xEA\x93x\x82ɕ\\x8E\xA6\x82\xB7\x82郌\x83X\x82̐\x94');
echo getEditConfHtml('ktai_res_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x88\xEA\x82‚̃\x8C\x83X\x82̍ő\xE5\x95\\x8E\xA6\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j');
echo getEditConfHtml('ktai_ryaku_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81A\x83\x8C\x83X\x82\xF0\x8Fȗ\xAA\x82\xB5\x82\xBD\x82Ƃ\xAB\x82̕\\x8E\xA6\x83T\x83C\x83Y');
echo getEditConfHtml('k_aa_ryaku_size', '\x8Cg\x91щ{\x97\x97\x8E\x9E\x81AAA\x82炵\x82\xAB\x83\x8C\x83X\x82\xF0\x8Fȗ\xAA\x82\xB7\x82\xE9\x83T\x83C\x83Y\x81i0\x82Ȃ\xE7\x8Fȗ\xAA\x82\xB5\x82Ȃ\xA2\x81j');
Modified: p2/trunk/iphone/ShowThreadK.php
===================================================================
--- p2/trunk/iphone/ShowThreadK.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/iphone/ShowThreadK.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -64,7 +64,7 @@
// for \x83}\x83\x8B\x83`\x83\x8C\x83X\x94͈͂̃y\x81[\x83W\x83X\x83L\x83b\x83v
if ($this->thread->resrange_multi and !isset($GLOBALS['_skip_resnum'])) {
$page = isset($_REQUEST['page']) ? max(1, intval($_REQUEST['page'])) : 1;
- $GLOBALS['_skip_resnum'] = ($page - 1) * $GLOBALS['_conf']['k_rnum_range'];
+ $GLOBALS['_skip_resnum'] = ($page - 1) * $GLOBALS['_conf']['i_rnum_range'];
$this->thread->resrange_readnum = 0;
}
@@ -88,7 +88,7 @@
if ($this->thread->resrange_multi) {
// \x95\\x8E\xA6\x90\x94\x92\xB4\x89߂Ȃ甲\x82\xAF\x82\xE9
- if ($GLOBALS['_shown_resnum'] >= $GLOBALS['_conf']['k_rnum_range']) {
+ if ($GLOBALS['_shown_resnum'] >= $GLOBALS['_conf']['i_rnum_range']) {
break;
}
@@ -1022,9 +1022,9 @@
}
// read.php\x82ŕ\\x8E\xA6\x94͈͂肷\x82\xE9\x82̂ŏ璷\x82ł͂\xA0\x82\xE9
if (!$to) {
- $to = min($from + $_conf['k_rnum_range'] - 1, $this->thread->rescount);
+ $to = min($from + $_conf['i_rnum_range'] - 1, $this->thread->rescount);
} else {
- $to = min($to, $from + $_conf['k_rnum_range'] - 1, $this->thread->rescount);
+ $to = min($to, $from + $_conf['i_rnum_range'] - 1, $this->thread->rescount);
}
$read_url = UriUtil::buildQueryUri($_conf['read_php'],
Modified: p2/trunk/iphone/js/iphone.js
===================================================================
--- p2/trunk/iphone/js/iphone.js 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/iphone/js/iphone.js 2013-06-05 18:17:24 UTC (rev 950)
@@ -1,3 +1,12 @@
+/* read \x8E\x9F\x83{\x83^\x83\x93\x82̉\xA1\x95\x9D\x82\xF0\x8Ag\x92\xA3\x82\xB7\x82\xE9\x81ibody oload\x8C\xE3\x82Ɏ\xC0\x8Ds\x81j */
+function expandLargeNextButton()
+{
+ var large_nextObj = document.getElementById('large_next');
+ if (large_nextObj) {
+ large_nextObj.style.width = document.body.clientWidth - 132 - 20 + 'px'; // window.innerWidth
+ }
+}
+
function anchorJump(ancId)
{
var gopos = document.getElementById(ancId);
Modified: p2/trunk/iphone/post_form.inc.php
===================================================================
--- p2/trunk/iphone/post_form.inc.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/iphone/post_form.inc.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -1,30 +1,44 @@
<?php
/**
- * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80
+ * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80 (iPhone)
+ * \x81i2013/06/06 lib/getPostFormIPhoneHtml.func.php \x82Ɉړ\xAE\x81j
*/
-$csrfid = P2Util::getCsrfId();
+/**
+ * @access public
+ * @return string HTML
+ */
+function getPostFormIPhoneHtml($host, $bbs, $key, $ttitle_en, $rescount)
+{
+ global $_conf, $STYLE; // readonly (without $htm['subject'])
+ global $htm, $hs; // readonly
+ // $htm['src_fix'], $htm['be2ch'], $htm['title_need_be'], $htm['maru_kakiko']
+ // $hs['mail'], $hs['FROM']
+ global $time_for_post, $res_disabled_at, $MESSAGE_hs, $wrap, $msg_cols_at, $sage_cb_ht, $on_check_sage, $mail_size_at, $name_size_at; // readonly
+ global $ptitle, $submit_value; // readonly
+ global $popup, $newthread_hidden_ht, $readnew_hidden_ht;
+
+ $csrfid = P2Util::getCsrfId();
-// \x8Cg\x91\xD1
-if (UA::isK()) {
- $htm['k_br'] = '<br>';
- $htm['kakiko_on_js'] = '';
-// PC
-} else {
- $htm['k_br'] = '';
- $htm['kakiko_on_js'] = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
- . " autoSavePostForm('$host', '$bbs', '$key');\"";
-}
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $k_br_ht = '';
+ $kakiko_on_js_ht = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
+ . " autoSavePostForm('$host', '$bbs', '$key');\"";
+ // \x8Cg\x91\xD1
+ } else {
+ $k_br_ht = '<br>';
+ $kakiko_on_js_ht = '';
+ }
-$htm['subject'] = isset($htm['subject']) ? $htm['subject'] : '';
-$popup_hs = isset($popup) ? hs($popup) : '';
-$newthread_hidden_ht = isset($newthread_hidden_ht) ? $newthread_hidden_ht : '';
-$readnew_hidden_ht = isset($readnew_hidden_ht) ? $readnew_hidden_ht : '';
+ $htm['subject'] = isset($htm['subject']) ? $htm['subject'] : '';
+ $popup_hs = isset($popup) ? hs($popup) : '';
+ $newthread_hidden_ht = isset($newthread_hidden_ht) ? $newthread_hidden_ht : '';
+ $readnew_hidden_ht = isset($readnew_hidden_ht) ? $readnew_hidden_ht : '';
-$ttitle_en_hs = hs($ttitle_en);
+ $ttitle_en_hs = hs($ttitle_en);
-// \x95\xB6\x8E\x9A\x83R\x81[\x83h\x94\xBB\x92\xE8\x97p\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x90擪\x82Ɏd\x8D\x9E\x82ނ\xB1\x82Ƃ\xC5mb_convert_variables()\x82̎\xA9\x93\xAE\x94\xBB\x92\xE8\x82\xF0\x8F\x95\x82\xAF\x82\xE9
-$htm['post_form'] = <<<EOP
+ // \x95\xB6\x8E\x9A\x83R\x81[\x83h\x94\xBB\x92\xE8\x97p\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x90擪\x82Ɏd\x8D\x9E\x82ނ\xB1\x82Ƃ\xC5mb_convert_variables()\x82̎\xA9\x93\xAE\x94\xBB\x92\xE8\x82\xF0\x8F\x95\x82\xAF\x82\xE9
+ $post_form_htm = <<<EOP
{$htm['resform_ttitle']}
{$htm['back']}
<form id="settings" class="panel" method="POST" action="{$_conf['post_php']}" accept-charset="{$_conf['accept_charset']}" onsubmit="disableSubmit(this)">
@@ -35,19 +49,20 @@
{$htm['subject']}
<div class="row">
<label>{$htm['maru_kakiko']} \x96\xBC\x91O</label>
- <input id="FROM" name="FROM" type="text" value="{$hs['FROM']}"{$name_size_at}>{$htm['k_br']}
+ <input id="FROM" name="FROM" type="text" value="{$hs['FROM']}"{$name_size_at}>{$k_br_ht}
</div>
<div class="row">
<label>E-mail</label> <input id="mail" name="mail" type="text" value="{$hs['mail']}"{$mail_size_at}{$on_check_sage}>
</div>
{$sage_cb_ht}
<div class="row"><label>\x93\xE0\x97e</label>
- <textarea id="MESSAGE" name="MESSAGE" rows="{$STYLE['post_msg_rows']}"{$msg_cols_at} wrap="{$wrap}"{$htm['kakiko_on_js']}>{$MESSAGE_hs}</textarea>{$htm['k_br']}
+ <textarea id="MESSAGE" name="MESSAGE" rows="{$STYLE['post_msg_rows']}"{$msg_cols_at} wrap="{$wrap}"{$kakiko_on_js_ht}>{$MESSAGE_hs}</textarea>{$k_br_ht}
</div>
</fieldset>
<input class="whitebutton" id="submit" type="submit" name="submit" value="{$submit_value}"{$res_disabled_at}{$htm['title_need_be']} onClick="setHiddenValue(this);">
{$htm['be2ch']}
{$htm['src_fix']}
+
<input type="hidden" name="bbs" value="{$bbs}">
<input type="hidden" name="key" value="{$key}">
<input type="hidden" name="time" value="{$time_for_post}">
@@ -60,22 +75,25 @@
{$newthread_hidden_ht}{$readnew_hidden_ht}
{$_conf['k_input_ht']}
- <!-- <input type="submit" value="\x95\x9C\x8A\x88\x82̎\xF4\x95\xB6" onclick="hukkatuPostForm('{$host}', '{$bbs}', '{$key}'); return false;"> -->
- <span id="status_post_form" style="font-size:10pt;"></span>
-</form>\n
+ <span id="status_post_form" style="font-size:10pt;"></span>\n
EOP;
-if (!UA::isK()) {
- $htm['post_form'] .= <<<EOP
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $post_form_htm .= <<<EOP
<script type="text/javascript">
<!--
var messageObj = document.getElementById('MESSAGE');
if (!messageObj.value) {
- hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
+ hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
}
-->
</script>\n
EOP;
+ }
+
+ $post_form_htm .= "</form>\n";
+
+ return $post_form_htm;
}
/*
Modified: p2/trunk/iphone/post_form_popup.inc.php
===================================================================
--- p2/trunk/iphone/post_form_popup.inc.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/iphone/post_form_popup.inc.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -1,72 +1,66 @@
<?php
/**
- * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80 \x83|\x83b\x83v\x83A\x83b\x83v
+ * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80 \x83|\x83b\x83v\x83A\x83b\x83v (iPhone)
+ * \x81i2013/06/06 lib/getPostFormPopupIPhoneHtml.func.php \x82Ɉړ\xAE\x81j
*/
/**
* @access public
* @return string HTML
*/
-function getPostFormPopupIPhone($host, $bbs, $key, $ttitle_en, $rescount)
+function getPostFormPopupIPhoneHtml($host, $bbs, $key, $ttitle_en, $rescount)
{
- global $_conf, $STYLE; // readonly
+ global $_conf, $STYLE; // readonly (without $htm['subject'])
global $htm, $hs; // readonly
// $htm['src_fix'], $htm['be2ch'], $htm['title_need_be'], $htm['maru_kakiko']
// $hs['mail'], $hs['FROM']
global $time_for_post, $res_disabled_at, $MESSAGE_hs, $wrap, $msg_cols_at, $sage_cb_ht, $on_check_sage, $mail_size_at, $name_size_at; // readonly
+ global $popup, $newthread_hidden_ht, $readnew_hidden_ht; // readwrite
- // $sid_q = (defined('SID') && strlen(SID)) ? '&' . hs(SID) : '';
-
$csrfid = P2Util::getCsrfId();
$submit_value = '\x8F\x91\x82\xAB\x8D\x9E\x82\xDE';
-
- // \x83X\x83\x8C\x83b\x83h\x83^\x83C\x83g\x83\x8B\x82̍쐬
- $resform_ttitle_ht = sprintf('<p><b class="thre_title">%s</b></p>', $aThread->ttitle_hs);
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $k_br_ht = '';
+ $kakiko_on_js_ht = ' onChange="' . "autoSavePostForm('$host', '$bbs', '$key');\""; // onFocus="adjustTextareaRows(this, 2);"
// \x8Cg\x91\xD1
- /*
- if (UA::isK()) {
+ } else {
$k_br_ht = '<br>';
$kakiko_on_js_ht = '';
- // PC
- } else {
- */
- $k_br_ht = '';
- $kakiko_on_js_ht = ' onChange="' . "autoSavePostForm('$host', '$bbs', '$key');\""; // onFocus="adjustTextareaRows(this, 2);"
- //}
+ }
$htm['subject'] = isset($htm['subject']) ? $htm['subject'] : '';
$popup_hs = isset($popup) ? hs($popup) : '';
$newthread_hidden_ht = isset($newthread_hidden_ht) ? $newthread_hidden_ht : '';
$readnew_hidden_ht = isset($readnew_hidden_ht) ? $readnew_hidden_ht : '';
+ $ttitle_en_hs = hs($ttitle_en);
+
// \x95\xB6\x8E\x9A\x83R\x81[\x83h\x94\xBB\x92\xE8\x97p\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x90擪\x82Ɏd\x8D\x9E\x82ނ\xB1\x82Ƃ\xC5mb_convert_variables()\x82̎\xA9\x93\xAE\x94\xBB\x92\xE8\x82\xF0\x8F\x95\x82\xAF\x82\xE9
// <fieldset>\x82\xCDorder-top\x82\xAA\x92\xB4\x8Fc\x92\xB7
- $post_form_html = <<<EOP
+ $post_form_htm = <<<EOP
<form class="dialog_write" id="writeForm" method="POST" action="{$_conf['post_php']}" accept-charset="{$_conf['accept_charset']}">
<input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
<fieldset>
-<!-- <h5>{$resform_ttitle_ht}</h5>
- {$htm['subject']}
--->
-<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']}
- <br>
- <label>E-Mail:</label>
- <input id="mail" name="mail" type="text" value="{$hs['mail']}"{$mail_size_at}{$on_check_sage}>
- <span>{$sage_cb_ht}</span>
- <br>
- <!--<label>Message:</label>-->
- <textarea id="MESSAGE" name="MESSAGE" rows="{$STYLE['post_msg_rows']}"{$msg_cols_at} wrap="{$wrap}"{$kakiko_on_js_ht}>{$MESSAGE_hs}</textarea>
- <br>
+ <!-- {$htm['subject']} -->
+ <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']}
+ <br>
+ <label>E-Mail:</label>
+ <input id="mail" name="mail" type="text" value="{$hs['mail']}"{$mail_size_at}{$on_check_sage}>
+ <span>{$sage_cb_ht}</span>
+ <br>
+ <!--<label>Message:</label>-->
+ <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);">
- {$htm['be2ch']}
- {$htm['src_fix']}
+ <input id="submit" type="submit" name="submit" value="{$submit_value}"{$res_disabled_at}{$htm['title_need_be']} onClick="setHiddenValue(this); popUpFootbarFormIPhone(1, 1);">
+ {$htm['be2ch']}
+ {$htm['src_fix']}
</fieldset>
@@ -79,18 +73,16 @@
<input type="hidden" name="host" value="{$host}">
<input type="hidden" name="popup" value="{$popup_hs}">
<input type="hidden" name="rescount" value="{$rescount}">
- <input type="hidden" name="ttitle_en" value="{$ttitle_en}">
+ <input type="hidden" name="ttitle_en" value="{$ttitle_en_hs}">
<input type="hidden" name="csrfid" value="{$csrfid}">
{$newthread_hidden_ht}{$readnew_hidden_ht}
{$_conf['k_input_ht']}
- <span id="status_post_form" style="font-size:10pt;"></span>
-</form>\n
+ <span id="status_post_form" style="font-size:10pt;"></span>\n
EOP;
-
if (!UA::isK() || UA::isIPhoneGroup()) {
- $post_form_html .= <<<EOP
+ $post_form_htm .= <<<EOP
<script type="text/javascript">
<!--
var messageObj = document.getElementById('MESSAGE');
@@ -101,8 +93,10 @@
</script>\n
EOP;
}
-
- return $post_form_html;
+
+ $post_form_htm .= "</form>\n";
+
+ return $post_form_htm;
}
/*
Modified: p2/trunk/iphone/read_footer_k.inc.php
===================================================================
--- p2/trunk/iphone/read_footer_k.inc.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/iphone/read_footer_k.inc.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -110,11 +110,11 @@
<?php
// \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̃I\x83v\x83V\x83\x87\x83\x93\x93ǂݍ\x9E\x82\xDD
require_once P2_LIB_DIR . '/loadPostOptions.func.php';
- loadPostOptions($host, $bbs, $key);
+ loadPostOptions($aThread->host, $aThread->bbs, $aThread->key);
// \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80HTML\x82\xF0\x8Fo\x97\xCD
- require_once P2_IPHONE_LIB_DIR . '/post_form_popup.inc.php'; // getPostFormPopupIPhone()
- echo getPostFormPopupIPhone($aThread->host, $aThread->bbs, $aThread->key, $ttitle_en = base64_encode($aThread->ttitle), $aThread->rescount);
+ require_once P2_LIB_DIR . '/getPostFormPopupIPhoneHtml.func.php';
+ echo getPostFormPopupIPhoneHtml($aThread->host, $aThread->bbs, $aThread->key, $ttitle_en = base64_encode($aThread->ttitle), $aThread->rescount);
if ($diedat_msg_ht) {
Modified: p2/trunk/iphone/read_header_k.inc.php
===================================================================
--- p2/trunk/iphone/read_header_k.inc.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/iphone/read_header_k.inc.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -48,8 +48,8 @@
// \x83\x8C\x83X\x83i\x83r\x90ݒ\xE8 =====================================================
-$rnum_range = $_conf['k_rnum_range'];
-$latest_show_res_num = $_conf['k_rnum_range']; // \x8DŐVXX
+$rnum_range = $_conf['i_rnum_range'];
+$latest_show_res_num = $_conf['i_rnum_range']; // \x8DŐVXX
$read_navi_previous_ht = '';
$read_navi_previous_btm_ht = '';
@@ -266,11 +266,8 @@
initIPhoneGestures();
- /* \x8E\x9F\x83{\x83^\x83\x93\x82̉\xA1\x95\x9D\x89\x84\x92\xB7 */
- var large_nextObj = document.getElementById('large_next');
- if (large_nextObj) {
- large_nextObj.style.width = document.body.clientWidth - 132 - 20 + 'px'; // window.innerWidth
- }
+ /* \x8E\x9F\x83{\x83^\x83\x93\x82̉\xA1\x95\x9D\x8Ag\x92\xA3 */
+ expandLargeNextButton();
}
// \x83\x8C\x83X\x94͈͂̃t\x83H\x81[\x83\x80\x82̓\xE0\x97e\x82\xF0\x83\x8A\x83Z\x83b\x83g\x82\xB5\x82Ă\xA9\x82\xE7\x83y\x81[\x83W\x88ڍs\x82\xB7\x82郁\x83\\x83b\x83h
@@ -434,7 +431,7 @@
// $read_navi_next_anchor \x82͎g\x97p\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82̂ŁA\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x82܂ŏȗ\xAA
$filter_page = isset($_REQUEST['filter_page']) ? max(1, intval($_REQUEST['filter_page'])) : 1;
- $rnum_range = $_conf['k_rnum_range'];
+ $rnum_range = $_conf['i_rnum_range'];
$newtime = date('gis');
$goto_next_ht = ''; // \x91傫\x82Ȏ\x9FN\x83{\x83^\x83\x93
@@ -514,7 +511,7 @@
{
global $_conf;
- $rnum_range = $_conf['k_rnum_range'];
+ $rnum_range = $_conf['i_rnum_range'];
$url = UriUtil::buildQueryUri($_conf['read_php'],
array(
@@ -580,13 +577,13 @@
$read_range_hs = "\x83X\x83\x8C\x93\xE0\x88ړ\xAE($aThread->rescount)";
}
$form .= sprintf('<option disabled="disabled" selected="selected">%s</option>', $read_range_hs);
- for ($i = 1; $i <= $aThread->rescount; $i = $i + $_conf['k_rnum_range']) {
+ for ($i = 1; $i <= $aThread->rescount; $i = $i + $_conf['i_rnum_range']) {
$offline_range_q = '';
$accesskey_at = '';
if ($i == 1) {
$accesskey_at = " {$_conf['accesskey_for_k']}=\"1\"";
}
- $ito = $i + $_conf['k_rnum_range'] -1;
+ $ito = $i + $_conf['i_rnum_range'] -1;
if ($ito <= $aThread->gotnum) {
$offline_range_q = '&offline=1';
}
Modified: p2/trunk/lib/ThreadRead.php
===================================================================
--- p2/trunk/lib/ThreadRead.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/lib/ThreadRead.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -1491,12 +1491,14 @@
$ls = preg_replace("/n/", "", $ls);
}
+ $rnum_range = UA::isIPhoneGroup() ? $_conf['i_rnum_range'] : $_conf['k_rnum_range'];
+
// l\x8Ew\x92肪\x82\xA0\x82\xEA\x82i\x8Dŋ\xDFN\x8C\x8F\x82̎w\x92\xE8\x81j
if (substr($ls, 0, 1) == "l") {
$ln = intval(substr($ls, 1));
- if ($_conf['ktai']) {
- if ($ln > $_conf['k_rnum_range']) {
- $ln = $_conf['k_rnum_range'];
+ if (UA::isK() || UA::isIPhoneGroup()) {
+ if ($ln > $rnum_range) {
+ $ln = $rnum_range;
}
}
$start = $this->rescount - $ln + 1;
@@ -1579,18 +1581,18 @@
} else {
// \x8Cg\x91їp\x82̕\\x8E\xA6\x90\x94\x90\xA7\x8C\xC0
- if ($_conf['ktai']) {
+ if (UA::isK() || UA::isIPhoneGroup()) {
/*
- if ($start + $_conf['k_rnum_range'] -1 <= $to) {
- $to = $start + $_conf['k_rnum_range'] -1;
+ if ($start + $rnum_range -1 <= $to) {
+ $to = $start + $rnum_range -1;
}
*/
// \x83}\x83\x8B\x83`\x8E\x9E\x82̌g\x91ѕ\\x8E\xA6\x90\x94\x90\xA7\x8C\xC0\x82͕ʏ\x88\x97\x9D
if (!$this->resrange_multi) {
// \x8E\x9FX\x8C\x8F\x82ł́A\x91O\x88\xEA\x82‚\xF0\x8A܂݁A\x8E\xC0\x8E\xBF+1\x82ƂȂ\xE9\x82̂ŁA1\x82‚\xA8\x82܂\xAF\x82\xB7\x82\xE9
- if ($start + $_conf['k_rnum_range'] <= $to) {
- $to = $start + $_conf['k_rnum_range'];
+ if ($start + $rnum_range <= $to) {
+ $to = $start + $rnum_range;
}
}
@@ -1605,7 +1607,7 @@
if ($this->resrange_multi) {
$page = isset($_REQUEST['page']) ? max(1, intval($_REQUEST['page'])) : 1;
- $reach = $page * $GLOBALS['_conf']['k_rnum_range'];
+ $reach = $page * $rnum_range;
if ($reach < $this->countResrangeMulti()) {
$this->resrange_multi_exists_next = true;
}
Added: p2/trunk/lib/getPostFormHtml.func.php
===================================================================
--- p2/trunk/lib/getPostFormHtml.func.php (rev 0)
+++ p2/trunk/lib/getPostFormHtml.func.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -0,0 +1,103 @@
+<?php
+/**
+ * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80 (PC, \x8Cg\x91\xD1)
+ * \x81i2013/06/06 lib/post_form.inc.php \x82\xA9\x82\xE7\x88ړ\xAE\x81j
+ */
+
+/**
+ * @access public
+ * @return string HTML
+ */
+function getPostFormHtml($host, $bbs, $key, $ttitle_en, $rescount)
+{
+ global $_conf, $STYLE; // readonly
+ global $htm, $hs; // readonly
+ // $htm['src_fix'], $htm['be2ch'], $htm['title_need_be'], $htm['maru_kakiko']
+ // $hs['mail'], $hs['FROM']
+ global $time_for_post, $res_disabled_at, $MESSAGE_hs, $wrap, $msg_cols_at, $sage_cb_ht, $on_check_sage, $mail_size_at, $name_size_at; // readonly
+ global $ptitle, $submit_value; // readonly
+ global $popup, $newthread_hidden_ht, $readnew_hidden_ht, $resable_msg_ht; // for read
+
+ $csrfid = P2Util::getCsrfId();
+
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $k_br_ht = '';
+ $kakiko_on_js_ht = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
+ . " autoSavePostForm('$host', '$bbs', '$key');\"";
+ // \x8Cg\x91\xD1
+ } else {
+ $k_br_ht = '<br>';
+ $kakiko_on_js_ht = '';
+ }
+
+ $subject_ht = isset($htm['subject']) ? $htm['subject'] : '';
+ $popup_hs = isset($popup) ? hs($popup) : '';
+ $newthread_hidden_ht = isset($newthread_hidden_ht) ? $newthread_hidden_ht : '';
+ $readnew_hidden_ht = isset($readnew_hidden_ht) ? $readnew_hidden_ht : '';
+
+ $ttitle_en_hs = hs($ttitle_en);
+
+ // \x95\xB6\x8E\x9A\x83R\x81[\x83h\x94\xBB\x92\xE8\x97p\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x90擪\x82Ɏd\x8D\x9E\x82ނ\xB1\x82Ƃ\xC5mb_convert_variables()\x82̎\xA9\x93\xAE\x94\xBB\x92\xE8\x82\xF0\x8F\x95\x82\xAF\x82\xE9
+ $post_form_htm = <<<EOP
+<form id="resform" method="POST" action="{$_conf['post_php']}?guid=ON" accept-charset="{$_conf['accept_charset']}" onsubmit="disableSubmit(this)">
+ {$htm['resform_ttitle']}
+ {$htm['orig_msg']}
+
+ <input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
+ {$subject_ht}
+ {$htm['maru_kakiko']} \x96\xBC\x91O\x81F <input id="FROM" name="FROM" type="text" value="{$hs['FROM']}"{$name_size_at}>{$k_br_ht}
+ E-mail : <input id="mail" name="mail" type="text" value="{$hs['mail']}"{$mail_size_at}{$on_check_sage}>
+ {$sage_cb_ht}{$k_br_ht}
+ <textarea id="MESSAGE" name="MESSAGE" rows="{$STYLE['post_msg_rows']}"{$msg_cols_at} wrap="{$wrap}"{$res_disabled_at}{$kakiko_on_js_ht}>{$MESSAGE_hs}</textarea>{$k_br_ht}
+ <input id="submit" type="submit" name="submit" value="{$submit_value}"{$res_disabled_at}{$htm['title_need_be']} onClick="setHiddenValue(this);">
+ {$htm['be2ch']}
+ <br>
+ {$htm['src_fix']}
+
+ <input type="hidden" name="bbs" value="{$bbs}">
+ <input type="hidden" name="key" value="{$key}">
+ <input type="hidden" name="time" value="{$time_for_post}">
+
+ <input type="hidden" name="host" value="{$host}">
+ <input type="hidden" name="popup" value="{$popup_hs}">
+ <input type="hidden" name="rescount" value="{$rescount}">
+ <input type="hidden" name="ttitle_en" value="{$ttitle_en_hs}">
+ <input type="hidden" name="csrfid" value="{$csrfid}">
+ {$newthread_hidden_ht}{$readnew_hidden_ht}
+ {$_conf['k_input_ht']}
+
+ <span id="status_post_form" style="font-size:10pt;"></span>\n
+EOP;
+
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $post_form_htm .= <<<EOP
+<script type="text/javascript">
+<!--
+var messageObj = document.getElementById('MESSAGE');
+if (!messageObj.value) {
+ hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
+}
+-->
+</script>\n
+EOP;
+ }
+
+ if (!empty($GLOBALS['brazil'])) {
+ $post_form_htm .= $resable_msg_ht . "\n";
+ }
+
+ $post_form_htm .= "</form>\n";
+
+ return $post_form_htm;
+}
+
+/*
+ * 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:
Added: p2/trunk/lib/getPostFormIPhoneHtml.func.php
===================================================================
--- p2/trunk/lib/getPostFormIPhoneHtml.func.php (rev 0)
+++ p2/trunk/lib/getPostFormIPhoneHtml.func.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -0,0 +1,108 @@
+<?php
+/**
+ * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80 (iPhone)
+ * \x81i2013/06/06 iphone/post_form.inc.php \x82\xA9\x82\xE7\x88ړ\xAE\x81j
+ */
+
+/**
+ * @access public
+ * @return string HTML
+ */
+function getPostFormIPhoneHtml($host, $bbs, $key, $ttitle_en, $rescount)
+{
+ global $_conf, $STYLE; // readonly
+ global $htm, $hs; // readonly
+ // $htm['src_fix'], $htm['be2ch'], $htm['title_need_be'], $htm['maru_kakiko']
+ // $hs['mail'], $hs['FROM']
+ global $time_for_post, $res_disabled_at, $MESSAGE_hs, $wrap, $msg_cols_at, $sage_cb_ht, $on_check_sage, $mail_size_at, $name_size_at; // readonly
+ global $ptitle, $submit_value; // readonly
+ global $popup, $newthread_hidden_ht, $readnew_hidden_ht; // for read
+
+ $csrfid = P2Util::getCsrfId();
+
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $k_br_ht = '';
+ $kakiko_on_js_ht = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
+ . " autoSavePostForm('$host', '$bbs', '$key');\"";
+ // \x8Cg\x91\xD1
+ } else {
+ $k_br_ht = '<br>';
+ $kakiko_on_js_ht = '';
+ }
+
+ $subject_ht = isset($htm['subject']) ? $htm['subject'] : '';
+ $popup_hs = isset($popup) ? hs($popup) : '';
+ $newthread_hidden_ht = isset($newthread_hidden_ht) ? $newthread_hidden_ht : '';
+ $readnew_hidden_ht = isset($readnew_hidden_ht) ? $readnew_hidden_ht : '';
+
+ $ttitle_en_hs = hs($ttitle_en);
+
+ // \x95\xB6\x8E\x9A\x83R\x81[\x83h\x94\xBB\x92\xE8\x97p\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x90擪\x82Ɏd\x8D\x9E\x82ނ\xB1\x82Ƃ\xC5mb_convert_variables()\x82̎\xA9\x93\xAE\x94\xBB\x92\xE8\x82\xF0\x8F\x95\x82\xAF\x82\xE9
+ $post_form_htm = <<<EOP
+{$htm['resform_ttitle']}
+{$htm['back']}
+<form id="settings" class="panel" method="POST" action="{$_conf['post_php']}" accept-charset="{$_conf['accept_charset']}" onsubmit="disableSubmit(this)">
+ {$htm['orig_msg']}
+ <h2>{$ptitle}</h2>
+ <input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
+ <fieldset>
+ {$subject_ht}
+ <div class="row">
+ <label>{$htm['maru_kakiko']} \x96\xBC\x91O</label>
+ <input id="FROM" name="FROM" type="text" value="{$hs['FROM']}"{$name_size_at}>{$k_br_ht}
+ </div>
+ <div class="row">
+ <label>E-mail</label> <input id="mail" name="mail" type="text" value="{$hs['mail']}"{$mail_size_at}{$on_check_sage}>
+ </div>
+ {$sage_cb_ht}
+ <div class="row"><label>\x93\xE0\x97e</label>
+ <textarea id="MESSAGE" name="MESSAGE" rows="{$STYLE['post_msg_rows']}"{$msg_cols_at} wrap="{$wrap}"{$kakiko_on_js_ht}>{$MESSAGE_hs}</textarea>{$k_br_ht}
+</div>
+ </fieldset>
+ <input class="whitebutton" id="submit" type="submit" name="submit" value="{$submit_value}"{$res_disabled_at}{$htm['title_need_be']} onClick="setHiddenValue(this);">
+ {$htm['be2ch']}
+ {$htm['src_fix']}
+
+ <input type="hidden" name="bbs" value="{$bbs}">
+ <input type="hidden" name="key" value="{$key}">
+ <input type="hidden" name="time" value="{$time_for_post}">
+
+ <input type="hidden" name="host" value="{$host}">
+ <input type="hidden" name="popup" value="{$popup_hs}">
+ <input type="hidden" name="rescount" value="{$rescount}">
+ <input type="hidden" name="ttitle_en" value="{$ttitle_en_hs}">
+ <input type="hidden" name="csrfid" value="{$csrfid}">
+ {$newthread_hidden_ht}{$readnew_hidden_ht}
+ {$_conf['k_input_ht']}
+
+ <span id="status_post_form" style="font-size:10pt;"></span>\n
+EOP;
+
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $post_form_htm .= <<<EOP
+<script type="text/javascript">
+<!--
+var messageObj = document.getElementById('MESSAGE');
+if (!messageObj.value) {
+ hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
+}
+-->
+</script>\n
+EOP;
+ }
+
+ $post_form_htm .= "</form>\n";
+
+ return $post_form_htm;
+}
+
+/*
+ * 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:
Added: p2/trunk/lib/getPostFormPopupIPhoneHtml.func.php
===================================================================
--- p2/trunk/lib/getPostFormPopupIPhoneHtml.func.php (rev 0)
+++ p2/trunk/lib/getPostFormPopupIPhoneHtml.func.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -0,0 +1,112 @@
+<?php
+/**
+ * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80 \x83|\x83b\x83v\x83A\x83b\x83v (iPhone)
+ * \x81i2013/06/06 iphone/post_form_popup.inc.php \x82\xA9\x82\xE7\x88ړ\xAE\x81j
+ */
+
+/**
+ * @access public
+ * @return string HTML
+ */
+function getPostFormPopupIPhoneHtml($host, $bbs, $key, $ttitle_en, $rescount)
+{
+ global $_conf, $STYLE; // readonly
+ global $htm, $hs; // readonly
+ // $htm['src_fix'], $htm['be2ch'], $htm['title_need_be'], $htm['maru_kakiko']
+ // $hs['mail'], $hs['FROM']
+ global $time_for_post, $res_disabled_at, $MESSAGE_hs, $wrap, $msg_cols_at, $sage_cb_ht, $on_check_sage, $mail_size_at, $name_size_at; // readonly
+ // global $ptitle, $submit_value; // readonly
+ global $popup, $newthread_hidden_ht, $readnew_hidden_ht; // for read
+
+ $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);"
+ // \x8Cg\x91\xD1
+ } else {
+ $k_br_ht = '<br>';
+ $kakiko_on_js_ht = '';
+ }
+
+ $subject_ht = isset($htm['subject']) ? $htm['subject'] : '';
+ $popup_hs = isset($popup) ? hs($popup) : '';
+ $newthread_hidden_ht = isset($newthread_hidden_ht) ? $newthread_hidden_ht : '';
+ $readnew_hidden_ht = isset($readnew_hidden_ht) ? $readnew_hidden_ht : '';
+
+ $ttitle_en_hs = hs($ttitle_en);
+
+ // \x95\xB6\x8E\x9A\x83R\x81[\x83h\x94\xBB\x92\xE8\x97p\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x90擪\x82Ɏd\x8D\x9E\x82ނ\xB1\x82Ƃ\xC5mb_convert_variables()\x82̎\xA9\x93\xAE\x94\xBB\x92\xE8\x82\xF0\x8F\x95\x82\xAF\x82\xE9
+
+ // <fieldset>\x82\xCDorder-top\x82\xAA\x92\xB4\x8Fc\x92\xB7
+ $post_form_htm = <<<EOP
+<form class="dialog_write" id="writeForm" method="POST" action="{$_conf['post_php']}" accept-charset="{$_conf['accept_charset']}">
+ <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>
+ <label>Name:</label>
+ <input id="FROM" name="FROM" type="text" value="{$hs['FROM']}"{$name_size_at}>
+ {$htm['maru_kakiko']}
+ <br>
+ <label>E-Mail:</label>
+ <input id="mail" name="mail" type="text" value="{$hs['mail']}"{$mail_size_at}{$on_check_sage}>
+ <span>{$sage_cb_ht}</span>
+ <br>
+ <!--<label>Message:</label>-->
+ <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);">
+ {$htm['be2ch']}
+ {$htm['src_fix']}
+ </fieldset>
+
+
+
+
+ <input type="hidden" name="bbs" value="{$bbs}">
+ <input type="hidden" name="key" value="{$key}">
+ <input type="hidden" name="time" value="{$time_for_post}">
+
+ <input type="hidden" name="host" value="{$host}">
+ <input type="hidden" name="popup" value="{$popup_hs}">
+ <input type="hidden" name="rescount" value="{$rescount}">
+ <input type="hidden" name="ttitle_en" value="{$ttitle_en_hs}">
+ <input type="hidden" name="csrfid" value="{$csrfid}">
+ {$newthread_hidden_ht}{$readnew_hidden_ht}
+ {$_conf['k_input_ht']}
+
+ <span id="status_post_form" style="font-size:10pt;"></span>\n
+EOP;
+
+ if (!UA::isK() || UA::isIPhoneGroup()) {
+ $post_form_htm .= <<<EOP
+<script type="text/javascript">
+<!--
+var messageObj = document.getElementById('MESSAGE');
+if (!messageObj.value) {
+ hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
+}
+-->
+</script>\n
+EOP;
+ }
+
+ $post_form_htm .= "</form>\n";
+
+ return $post_form_htm;
+}
+
+/*
+ * 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/lib/post_form.inc.php
===================================================================
--- p2/trunk/lib/post_form.inc.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/lib/post_form.inc.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -1,40 +1,54 @@
<?php
/**
- * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80
+ * p2 \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80 (PC, \x8Cg\x91\xD1)
+ * \x81i2013/06/06 lib/getPostFormHtml.func.php \x82Ɉړ\xAE\x81j
*/
-$csrfid = P2Util::getCsrfId();
+/**
+ * @access public
+ * @return string HTML
+ */
+function getPostFormHtml($host, $bbs, $key, $ttitle_en, $rescount)
+{
+ global $_conf, $STYLE; // readonly (without $htm['subject'])
+ global $htm, $hs; // readonly
+ // $htm['src_fix'], $htm['be2ch'], $htm['title_need_be'], $htm['maru_kakiko']
+ // $hs['mail'], $hs['FROM']
+ global $time_for_post, $res_disabled_at, $MESSAGE_hs, $wrap, $msg_cols_at, $sage_cb_ht, $on_check_sage, $mail_size_at, $name_size_at; // readonly
+ global $ptitle, $submit_value; // readonly
+ global $popup, $newthread_hidden_ht, $readnew_hidden_ht, $resable_msg_ht;
+
+ $csrfid = P2Util::getCsrfId();
-// \x8Cg\x91\xD1
-if (UA::isK()) {
- $htm['k_br'] = '<br>';
- $htm['kakiko_on_js'] = '';
-// PC
-} else {
- $htm['k_br'] = '';
- $htm['kakiko_on_js'] = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
- . " autoSavePostForm('$host', '$bbs', '$key');\"";
-}
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $k_br_ht = '';
+ $kakiko_on_js_ht = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
+ . " autoSavePostForm('$host', '$bbs', '$key');\"";
+ // \x8Cg\x91\xD1
+ } else {
+ $k_br_ht = '<br>';
+ $kakiko_on_js_ht = '';
+ }
-$htm['subject'] = isset($htm['subject']) ? $htm['subject'] : '';
-$popup_hs = isset($popup) ? hs($popup) : '';
-$newthread_hidden_ht = isset($newthread_hidden_ht) ? $newthread_hidden_ht : '';
-$readnew_hidden_ht = isset($readnew_hidden_ht) ? $readnew_hidden_ht : '';
+ $htm['subject'] = isset($htm['subject']) ? $htm['subject'] : '';
+ $popup_hs = isset($popup) ? hs($popup) : '';
+ $newthread_hidden_ht = isset($newthread_hidden_ht) ? $newthread_hidden_ht : '';
+ $readnew_hidden_ht = isset($readnew_hidden_ht) ? $readnew_hidden_ht : '';
-$ttitle_en_hs = hs($ttitle_en);
+ $ttitle_en_hs = hs($ttitle_en);
-// \x95\xB6\x8E\x9A\x83R\x81[\x83h\x94\xBB\x92\xE8\x97p\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x90擪\x82Ɏd\x8D\x9E\x82ނ\xB1\x82Ƃ\xC5mb_convert_variables()\x82̎\xA9\x93\xAE\x94\xBB\x92\xE8\x82\xF0\x8F\x95\x82\xAF\x82\xE9
-$htm['post_form'] = <<<EOP
+ // \x95\xB6\x8E\x9A\x83R\x81[\x83h\x94\xBB\x92\xE8\x97p\x95\xB6\x8E\x9A\x97\xF1\x82\xF0\x90擪\x82Ɏd\x8D\x9E\x82ނ\xB1\x82Ƃ\xC5mb_convert_variables()\x82̎\xA9\x93\xAE\x94\xBB\x92\xE8\x82\xF0\x8F\x95\x82\xAF\x82\xE9
+ $post_form_htm = <<<EOP
<form id="resform" method="POST" action="{$_conf['post_php']}?guid=ON" accept-charset="{$_conf['accept_charset']}" onsubmit="disableSubmit(this)">
{$htm['resform_ttitle']}
{$htm['orig_msg']}
<input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
{$htm['subject']}
- {$htm['maru_kakiko']} \x96\xBC\x91O\x81F <input id="FROM" name="FROM" type="text" value="{$hs['FROM']}"{$name_size_at}>{$htm['k_br']}
+ {$htm['maru_kakiko']} \x96\xBC\x91O\x81F <input id="FROM" name="FROM" type="text" value="{$hs['FROM']}"{$name_size_at}>{$k_br_ht}
E-mail : <input id="mail" name="mail" type="text" value="{$hs['mail']}"{$mail_size_at}{$on_check_sage}>
- {$sage_cb_ht}{$htm['k_br']}
- <textarea id="MESSAGE" name="MESSAGE" rows="{$STYLE['post_msg_rows']}"{$msg_cols_at} wrap="{$wrap}"{$res_disabled_at}{$htm['kakiko_on_js']}>{$MESSAGE_hs}</textarea>{$htm['k_br']}
+ {$sage_cb_ht}{$k_br_ht}
+ <textarea id="MESSAGE" name="MESSAGE" rows="{$STYLE['post_msg_rows']}"{$msg_cols_at} wrap="{$wrap}"{$res_disabled_at}{$kakiko_on_js_ht}>{$MESSAGE_hs}</textarea>{$k_br_ht}
<input id="submit" type="submit" name="submit" value="{$submit_value}"{$res_disabled_at}{$htm['title_need_be']} onClick="setHiddenValue(this);">
{$htm['be2ch']}
<br>
@@ -52,13 +66,11 @@
{$newthread_hidden_ht}{$readnew_hidden_ht}
{$_conf['k_input_ht']}
- <!-- <input type="submit" value="\x95\x9C\x8A\x88\x82̎\xF4\x95\xB6" onclick="hukkatuPostForm('{$host}', '{$bbs}', '{$key}'); return false;"> -->
<span id="status_post_form" style="font-size:10pt;"></span>\n
EOP;
-
-if (!$_conf['ktai']) {
- $htm['post_form'] .= <<<EOP
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $post_form_htm .= <<<EOP
<script type="text/javascript">
<!--
var messageObj = document.getElementById('MESSAGE');
@@ -68,8 +80,16 @@
-->
</script>\n
EOP;
+ }
+
+ if (!empty($GLOBALS['brazil'])) {
+ $post_form_htm .= $resable_msg_ht . "\n";
+ }
+
+ $post_form_htm .= "</form>\n";
+
+ return $post_form_htm;
}
-$htm['post_form'] .= "</form>\n";
/*
* Local Variables:
Modified: p2/trunk/lib/read_footer.inc.php
===================================================================
--- p2/trunk/lib/read_footer.inc.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/lib/read_footer.inc.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -31,14 +31,10 @@
hs($aThread->ttitle_hc)
);
- require_once P2_LIB_DIR . '/post_form.inc.php';
+ require_once P2_LIB_DIR . '/getPostFormHtml.func.php';
- // \x83t\x83H\x81[\x83\x80
- $res_form_html = <<<EOP
-<div id="kakiko">
-{$htm['post_form']}
-</div>\n
-EOP;
+ // \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80
+ $res_form_html = sprintf('<div id="kakiko">%s</div>', getPostFormHtml($host, $bbs, $key, $ttitle_en, $rescount));
// onMouseover="showResbar(event, true);"
$onmouse_showform_attrs = array('onMouseover' => "document.getElementById('kakiko').style.display = 'block';");
@@ -115,13 +111,14 @@
// DAT\x97e\x97\xCA
$datsize_ht = '';
- /*
- $datsize_ht = sprintf('<span class="datsize" style="white-space: nowrap;" title="DAT\x97e\x97\xCA">%s</span>', P2Util::getTranslatedUnitFileSize($aThread->getDatBytesFromLocalDat(false), 'KB'));
- // 500KB\x88ȏ\xE3\x82ŋ\xAD\x92\xB2\x95\\x8E\xA6
- if ($datsize / 1024 >= 500) {
- $datsize_ht = '<b>' . $datsize_ht . '</b>';
+
+ 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'));
+ // 500KB\x88ȏ\xE3\x82ŋ\xAD\x92\xB2\x95\\x8E\xA6
+ if ($datsize / 1024 >= 500) {
+ $datsize_ht = '<b>' . $datsize_ht . '</b>';
+ }
}
- */
// {{{ \x83t\x83B\x83\x8B\x83^\x83q\x83b\x83g\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x8Fꍇ\x81A\x8E\x9FX\x82Ƒ\xB1\x82\xAB\x82\xF0\x93ǂނ\xF0\x8DX\x90V\x82\xB7\x82\xE9
Modified: p2/trunk/lib/res_hist.class.php
===================================================================
--- p2/trunk/lib/res_hist.class.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/lib/res_hist.class.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -271,7 +271,7 @@
// \x95\\x8E\xA6\x90\x94\x90\xA7\x8C\xC0
$list_disp_all_num = $totalNum;
- $list_disp_range = $_conf['k_rnum_range'];
+ $list_disp_range = UA::isIPhoneGroup() ? $_conf['i_rnum_range'] : $_conf['k_rnum_range'];
$from = isset($_GET['from']) ? intval($_GET['from']) : null;
$end = isset($_GET['end']) ? intval($_GET['end']) : null;
Modified: p2/trunk/post_form.php
===================================================================
--- p2/trunk/post_form.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/post_form.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -153,11 +153,9 @@
P2Util::printInfoHtml();
-// $htm['post_form'] \x82\xF0\x8E擾
-require_once P2_LIB_DIR . '/post_form.inc.php';
+require_once P2_LIB_DIR . '/getPostFormHtml.func.php';
+echo getPostFormHtml($host, $bbs, $key, $ttitle_en, $rescount);
-echo $htm['post_form'];
-
?>
</body></html>
<?php
Modified: p2/trunk/post_form_i.php
===================================================================
--- p2/trunk/post_form_i.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/post_form_i.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -119,6 +119,7 @@
<?php
P2View::printExtraHeadersHtml();
P2View::printStyleTagImportIuiCss();
+
echo <<<EOHEADER
<meta name="viewport" content="width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;">
<script type="text/javascript">
@@ -130,6 +131,7 @@
</script>
<title>{$ptitle}</title>\n
EOHEADER;
+
if (!UA::isK()) {
P2View::printIncludeCssHtml('style');
P2View::printIncludeCssHtml('post');
@@ -149,11 +151,10 @@
P2Util::printInfoHtml();
-// $htm['post_form'] \x82\xF0\x8E擾
-require_once P2_IPHONE_LIB_DIR . '/post_form.inc.php';
+// \x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82\xF0\x95\\x8E\xA6
+require_once P2_LIB_DIR . '/getPostFormIPhoneHtml.func.php';
+echo getPostFormIPhoneHtml($host, $bbs, $key, $ttitle_en, $rescount);
-echo $htm['post_form'];
-
?></body></html><?php
Modified: p2/trunk/read_new_i.php
===================================================================
--- p2/trunk/read_new_i.php 2013-06-05 10:32:49 UTC (rev 949)
+++ p2/trunk/read_new_i.php 2013-06-05 18:17:24 UTC (rev 950)
@@ -32,7 +32,7 @@
//==================================================================
// \x95ϐ\x94
//==================================================================
-$GLOBALS['rnum_all_range'] = $_conf['k_rnum_range'];
+$GLOBALS['rnum_all_range'] = $_conf['i_rnum_range'];
$GLOBALS['word'] = null;