svnno****@sourc*****
svnno****@sourc*****
2013年 6月 5日 (水) 19:32:49 JST
Revision: 949
http://sourceforge.jp/projects/p2-php/scm/svn/commits/949
Author: akid
Date: 2013-06-05 19:32:49 +0900 (Wed, 05 Jun 2013)
Log Message:
-----------
Modified Paths:
--------------
p2/trunk/iphone/post_form.inc.php
p2/trunk/iphone/post_form_popup.inc.php
p2/trunk/iphone/read_header_k.inc.php
p2/trunk/iui/iui.css
p2/trunk/iui/read.css
p2/trunk/lib/loadPostOptions.func.php
p2/trunk/lib/post_form.inc.php
Removed Paths:
-------------
p2/trunk/iphone/post_options_loader_popup.inc.php
p2/trunk/lib/post_options_loader.inc.php
-------------- next part --------------
Modified: p2/trunk/iphone/post_form.inc.php
===================================================================
--- p2/trunk/iphone/post_form.inc.php 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/iphone/post_form.inc.php 2013-06-05 10:32:49 UTC (rev 949)
@@ -26,45 +26,42 @@
// \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
{$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>
- {$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']}
- </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']}
- </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']}
-
- <!-- <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>
+ {$htm['orig_msg']}
+ <h2>{$ptitle}</h2>
+ <input type="hidden" name="detect_hint" value="\x81\x9D\x81\x9E">
+ <fieldset>
+ {$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']}
+ </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']}
+</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']}
+
+ <!-- <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
EOP;
Modified: p2/trunk/iphone/post_form_popup.inc.php
===================================================================
--- p2/trunk/iphone/post_form_popup.inc.php 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/iphone/post_form_popup.inc.php 2013-06-05 10:32:49 UTC (rev 949)
@@ -10,7 +10,7 @@
function getPostFormPopupIPhone($host, $bbs, $key, $ttitle_en, $rescount)
{
global $_conf, $STYLE; // readonly
- global $html, $hs; // 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
@@ -33,8 +33,7 @@
} else {
*/
$k_br_ht = '';
- $kakiko_on_js_ht = ' onFocus="adjustTextareaRows(this, 2);" onKeyup="adjustTextareaRows(this, 2);'
- . " autoSavePostForm('$host', '$bbs', '$key');\"";
+ $kakiko_on_js_ht = ' onChange="' . "autoSavePostForm('$host', '$bbs', '$key');\""; // onFocus="adjustTextareaRows(this, 2);"
//}
$htm['subject'] = isset($htm['subject']) ? $htm['subject'] : '';
@@ -47,57 +46,56 @@
// <fieldset>\x82\xCDorder-top\x82\xAA\x92\xB4\x8Fc\x92\xB7
$post_form_html = <<<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']}
+ <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: {$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>
+ <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 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="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}">
- <input type="hidden" name="csrfid" value="{$csrfid}">
- {$newthread_hidden_ht}{$readnew_hidden_ht}
- {$_conf['k_input_ht']}
+ <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="csrfid" value="{$csrfid}">
+ {$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>
+ <span id="status_post_form" style="font-size:10pt;"></span>
</form>\n
EOP;
- if (!UA::isK()) {
- $htm['post_form'] .= <<<EOP
+ if (!UA::isK() || UA::isIPhoneGroup()) {
+ $post_form_html .= <<<EOP
<script type="text/javascript">
<!--
var messageObj = document.getElementById('MESSAGE');
if (!messageObj.value) {
- hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
+ hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
}
-->
</script>\n
Deleted: p2/trunk/iphone/post_options_loader_popup.inc.php
===================================================================
--- p2/trunk/iphone/post_options_loader_popup.inc.php 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/iphone/post_options_loader_popup.inc.php 2013-06-05 10:32:49 UTC (rev 949)
@@ -1,283 +0,0 @@
-<?php
-// 2013/06/05 loadPostOptions.php \x82Ɉڍs\x93\x9D\x8D\x87\x82\xB5\x82Ĕp\x8E~
-
-// p2 - \x83\x8C\x83X\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̋@\x94\\x93ǂݍ\x9E\x82\xDD
-// post_options_loader_popup()
-
-// \x8E\x96\x91O\x95ϐ\x94
-// $host, $bbs, $key ($rescount, $popup, $ttitle_en)
-
-// post_options_loader_popup($host, $bbs, $key);
-
-
-/**
- * @access public
- * @return void
- */
-function post_options_loader_popup($host, $bbs, $key)
-{
- global $_conf, $STYLE;
- global $hs, $htm;
- global $time_for_post, $res_disabled_at, $MESSAGE_hs, $name_size_at, $mail_size_at, $msg_cols_at, $wrap, $on_check_sage, $sage_cb_ht;
-
- $fake_time = -10; // time \x82\xF010\x95\xAA\x91O\x82ɋU\x91\x95
- $time_for_post = time() - 9*60*60;
- $time_for_post = $time_for_post + $fake_time * 60;
-
- $res_disabled_at = '';
-
- // $resv 'FROM', 'mail', 'MESSAGE, 'subject'
- $resv = P2Util::getDefaultResValues($host, $bbs, $key);
-
- //$hs = array_map(create_function('$n', 'return hs($n);'), $resv);
- $hs = array(
- 'FROM' => hs($resv['FROM']),
- 'mail' => hs($resv['mail']),
- 'subject' => hs($resv['subject'])
- );
- $MESSAGE_hs = hs($resv['MESSAGE']);
-
- // \x82\xB1\x82\xEA\x82Ƀ\x8C\x83X
- $htm['orig_msg'] = _getOrigMsgHtmlAndSetMessageHs(
- $host, $bbs, $key, geti($_GET['resnum']), geti($_GET['inyou']), $MESSAGE_hs
- );
-
-
- // \x95\\x8E\xA6\x8Ew\x92\xE8
- // \x8EQ\x8Dl \x83N\x83\x89\x83V\x83b\x83N COLS='60' ROWS='8'
- $mobile = &Net_UserAgent_Mobile::singleton();
-
- $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';
-
- // 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
- } elseif($mobile && $mobile->isWillcom()) {
- if ($_conf['k_post_msg_cols']) {
- $msg_cols_at = sprintf(' cols="%d"', $_conf['k_post_msg_cols']);
- } else {
- $msg_cols_at = sprintf(' cols="%d"', $STYLE['post_msg_cols']);
- }
- // $STYLE['post_msg_rows'] => 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 {
- $msg_cols_at = '';
- if ($_conf['k_post_msg_cols']) {
- $msg_cols_at = sprintf(' cols="%d"', $_conf['k_post_msg_cols']);
- }
- 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
- }
-
- $wrap = 'soft';
- }
-
- // 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" type="submit" name="submit_beres" value="BE\x82ŏ\x91\x82\xAB\x8D\x9E\x82\xDE" onClick="setHiddenValue(this); popUpFootbarFormIPhone(1, 1);"><br>';
- } else {
- $htm['be2ch'] = '\x81@<input id="submit_beres" type="submit" name="submit_beres" value="BE\x82ŏ\x91\x82\xAB\x8D\x9E\x82\xDE"' . $res_disabled_at . ' onClick="setHiddenValue(this);">';
- }
- }
-
- // be\x94‚ł͏\x91\x82\xAB\x8D\x9E\x82݂\xF8\x82ɂ\xB7\x82\xE9
- $htm['title_need_be'] = '';
- if (P2Util::isBbsBe2chNet($host, $bbs)) {
- // \x82\xE2\x82\xC1\x82ς薳\x8C\xF8\x82ɂ\xB5\x82Ȃ\xA2\x81B\x8F\x91\x82\xAB\x8D\x9E\x82ݎ\xB8\x94s\x8E\x9E\x82ɁA2ch\x91\xA4\x82\xC5Be\x83\x8D\x83O\x83C\x83\x93\x82ւ̗U\x93\xB1\x82\xAA\x82\xA0\x82\xE9\x82̂ŁB
- //$res_disabled_at = ' disabled';
- if (P2Util::enableBe2ch()) {
- $htm['title_need_be'] = ' title="Be\x94‚ɂ‚\xAB\x81A\x8E\xA9\x93\xAEBe\x8F\x91\x82\xAB\x8D\x9E\x82݂\xB5\x82܂\xB7"';
- } else {
- $htm['title_need_be'] = ' title="\x8F\x91\x82\xAB\x8D\x9E\x82ނɂ\xCDBe\x83\x8D\x83O\x83C\x83\x93\x82\xAA\x95K\x97v\x82ł\xB7"';
- }
- }
-
-
- // sage checkbox
- $on_check_sage = '';
- $sage_cb_ht = '';
- if (UA::isPC() || UA::isIPhoneGroup()) {
- $on_check_sage = ' onChange="checkSage();"';
- $sage_cb_ht = '<input id="sage" type="checkbox" onClick="mailSage();">';
- if (UA::isPC()) {
- $sage_cb_ht .= '<label for="sage">sage</label><br>';
- }
- }
-
- // 2ch\x81\x9C\x8F\x91\x82\xAB\x8D\x9E\x82\xDD
- $htm['maru_kakiko'] = _getMaruKakikoHtml($host);
-
- // \x83\\x81[\x83X\x83R\x81[\x83h\x95\x97p\x83`\x83F\x83b\x83N\x83{\x83b\x83N\x83X
- $htm['src_fix'] = _getSrcFixHtml($host);
-
- /*
- // {{{ \x96{\x95\xB6\x82\xAA\x8B\xF3\x82̂Ƃ\xAB\x82\xE2sage\x82ĂȂ\xA2\x82Ƃ\xAB\x82ɑ\x97\x90M\x82\xB5\x82悤\x82Ƃ\xB7\x82\xE9\x82ƒ\x8D\x88ӂ\xB7\x82\xE9
-
- $onsubmit_ht = '';
-
- if (UA::isPC() || UA::isIPhoneGroup()) {
- if ($_exconf['editor']['check_message'] || $_exconf['editor']['check_sage']) {
- $check_message = (int)$_exconf['editor']['check_message'];
- $check_sage = (int)$_exconf['editor']['check_sage'];
- $onsubmit_ht = " onsubmit=\"return validateAll({$check_message},{$check_sage})\"";
- }
- }
-
- // }}}
- */
-}
-
-//==================================================================================
-// \x8A\x94\x81i\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x93\xE0\x82݂̂ŗ\x98\x97p\x81j
-//==================================================================================
-/**
- * \x82\xB1\x82\xEA\x82Ƀ\x8C\x83X
- *
- * @return string HTML
- */
-function _getOrigMsgHtmlAndSetMessageHs($host, $bbs, $key, $resnum, $inyou, &$MESSAGE_hs)
-{
- global $_conf;
-
- $orig_msg_ht = '';
-
- // inyou:1 \x88\xF8\x97p
- // inyou:2 \x83v\x83\x8C\x83r\x83\x85\x81[
- // inyou:3 \x88\xF8\x97p\x81{\x83v\x83\x8C\x83r\x83\x85\x81[
- if ((in_array(basename($_SERVER['SCRIPT_NAME']), array('post_form.php', 'post_form_i.php')) || $inyou) && $resnum) {
- if (!($inyou == 2 && strlen($MESSAGE_hs))) {
- $MESSAGE_hs = '>>' . $resnum . "\r\n";
- }
- if (!empty($inyou)) {
- $q_resar = _getExplodedDatLine($host, $bbs, $key, $resnum);
- $prvwMsgHtml = _getPrvwMsgHtml($q_resar[3]);
- if ($inyou == 1 || $inyou == 3) {
- // \x88\xF8\x97p\x83\x8C\x83X\x94ԍ\x86\x82\xAA\x82ł\xAB\x82Ă\xB5\x82܂\xED\x82Ȃ\xA2\x82悤\x82ɁA\x93\xF1\x82‚̔\xBC\x8Ap\x83X\x83y\x81[\x83X\x82\xF0\x93\xFC\x82\xEA\x82Ă\xA2\x82\xE9
- $MESSAGE_hs .= '> ';
- $MESSAGE_hs .= preg_replace('/ *<br> ?/', "\r\n> ", $prvwMsgHtml);
- $MESSAGE_hs .= "\r\n";
- }
- if ($inyou == 2 || $inyou == 3) {
- // <table border="0" cellpadding="0" cellspacing="0"><tr><td>
- $orig_msg_ht = <<<EOM
-<blockquote id="original_msg">
- <div>
- <span class="prvw_resnum">{$resnum}</span>
- \x81F<b class="prvw_name">{$q_resar[0]}</b>
- \x81F<span class="prvw_mail">{$q_resar[1]}</span>
- \x81F<span class="prvw_dateid">{$q_resar[2]}</span>
- <br>
- <div class="prvw_msg">{$prvwMsgHtml}</div>
-</blockquote>
-EOM;
- // </td></tr></table>
- }
- }
- }
- return $orig_msg_ht;
-}
-
-/**
- * @return array
- */
-function _getExplodedDatLine($host, $bbs, $key, $resnum)
-{
- require_once P2_LIB_DIR . '/Thread.php';
- require_once P2_LIB_DIR . '/ThreadRead.php';
- $ThreadRead = new ThreadRead;
- $ThreadRead->setThreadPathInfo($host, $bbs, $key);
- $ThreadRead->readDat($ThreadRead->keydat);
- $explodedDatLine = $ThreadRead->explodeDatLine($ThreadRead->datlines[$resnum - 1]);
- return array_map('trim', $explodedDatLine);
-}
-
-/**
- * \x88\xF8\x97p\x83\x81\x83b\x83Z\x81[\x83W\x82̂\xBD\x82߂\xCCHTML
- *
- * @return string HTML
- */
-function _getPrvwMsgHtml($datMsg)
-{
- // transMsg(), removeResAnchorTagInDat()
- $datMsg = str_replace('<br>', "\n", $datMsg);
- $datMsg = strip_tags($datMsg);
- $datMsg = str_replace("\n", '<br>', $datMsg);
- return $datMsg;
-}
-
-/**
- * 2ch\x81\x9C\x8F\x91\x82\xAB\x8D\x9E\x82\xDD
- *
- * @return string HTML
- */
-function _getMaruKakikoHtml($host)
-{
- global $_conf;
-
- $maru_kakiko_ht = '';
-
- if (P2Util::isHost2chs($host) and file_exists($_conf['sid2ch_php'])) {
- $maru_kakiko_ht = sprintf(
- UA::isIPhoneGroup()
- ? '<span title="2ch\x81\x9CID\x82̎g\x97p">2ch\x81\x9CID: <input id="maru_kakiko" name="maru_kakiko" type="checkbox" value="1"%s></span>'
- :'<span title="2ch\x81\x9CID\x82̎g\x97p"><input id="maru_kakiko" name="maru_kakiko" type="checkbox" value="1"%s><label for="maru_kakiko">\x81\x9C</label></span>',
- $_conf['maru_kakiko'] ? ' checked' : ''
- );
- }
- return $maru_kakiko_ht;
-}
-
-/**
- * \x83\\x81[\x83X\x83R\x81[\x83h\x95\x97p\x83`\x83F\x83b\x83N\x83{\x83b\x83N\x83X
- *
- * @return string HTML
- */
-function _getSrcFixHtml($host)
-{
- global $_conf;
-
- $src_fix_ht = '';
-
- if (UA::isPC() || UA::isIPhoneGroup()) {
- if (
- $_conf['editor_srcfix'] == 1
- or $_conf['editor_srcfix'] == 2 && preg_match('/pc\d+\.2ch\.net/', $host)
- ) {
- $src_fix_ht = '<input type="checkbox" id="fix_source" name="fix_source" value="1"><label for="fix_source">\x83\\x81[\x83X\x83R\x81[\x83h\x95</label>';
- }
- }
- return $src_fix_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/iphone/read_header_k.inc.php
===================================================================
--- p2/trunk/iphone/read_header_k.inc.php 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/iphone/read_header_k.inc.php 2013-06-05 10:32:49 UTC (rev 949)
@@ -265,6 +265,12 @@
}
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
+ }
}
// \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
Modified: p2/trunk/iui/iui.css
===================================================================
--- p2/trunk/iui/iui.css 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/iui/iui.css 2013-06-05 10:32:49 UTC (rev 949)
@@ -633,6 +633,7 @@
/* \x83X\x83\x8C\x83^\x83C\x83\x8A\x83\x93\x83N */
.ttitle {
font-size: 15px;
+ line-height:127%;
}
/* \x81i\x94–\xBC\x81j */
Modified: p2/trunk/iui/read.css
===================================================================
--- p2/trunk/iui/read.css 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/iui/read.css 2013-06-05 10:32:49 UTC (rev 949)
@@ -167,13 +167,13 @@
}
#frmresrange select{
margin: 0px;
- width: 150px;
+ width: 132px;
}
#large_next{
font-size:14px;
font-weight: bold;
text-align: center;
- width: 150px;
+ width: 168px;
height: 26px;
color:white;
-webkit-border-image: url(toolButton.png) 0 5 0 5;
@@ -500,7 +500,9 @@
padding: 6px 6px 6px 54px;
font-size:16px;
}
-
+textarea#MESSAGE {
+ padding: 6px 6px 6px 6px;
+}
.dialog_write > fieldset > input[type="text"] {
width: 60%;
}
Modified: p2/trunk/lib/loadPostOptions.func.php
===================================================================
--- p2/trunk/lib/loadPostOptions.func.php 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/lib/loadPostOptions.func.php 2013-06-05 10:32:49 UTC (rev 949)
@@ -1,11 +1,8 @@
<?php
// p2 - \x83\x8C\x83X\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̋@\x94\\x93ǂݍ\x9E\x82\xDD
// read_footer.inc.php, iphone/read_footer_k.inc.php \x82\xC6 post_form.php, post_form_i.php \x82\xA9\x82\xE7\x8CĂ\xEA\x82Ă\xA2\x82\xE9
-// \x81i\x8B\x8C post_options_loader.php, iphone/post_options_loader_popup.php \x82\xA9\x82\xE7\x88ڍs\x93\x9D\x8D\x87\x82\xB5\x82\xBD\x81j
+// \x81i2013/06/05 \x8B\x8C post_options_loader.php, iphone/post_options_loader_popup.php \x82\xA9\x82\xE7\x88ڍs\x93\x9D\x8D\x87\x82\xB5\x82\xBD\x81j
-// \x8E\x96\x91O\x95ϐ\x94
-// $host, $bbs, $key
-
/**
* @access public
* @return void
@@ -69,15 +66,15 @@
}
$wrap = 'soft';
-
- } elseif (UA::isIPhoneGroup()) {
+
+ } elseif (UA::isIPhoneGroup()) {
$msg_cols_at = '';
$STYLE['post_msg_rows'] = 5;
- $wrap = 'soft';
+ $wrap = 'soft';
// \x8Cg\x91\xD1
} else {
- $msg_cols_at = '';
+ $msg_cols_at = '';
if ($_conf['k_post_msg_cols']) {
$msg_cols_at = sprintf(' cols="%d"', $_conf['k_post_msg_cols']);
}
@@ -93,11 +90,11 @@
// 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>';
- } 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);">';
- }
+ 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>';
+ } 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);">';
+ }
}
// be\x94‚ł͏\x91\x82\xAB\x8D\x9E\x82݂\xF8\x82ɂ\xB7\x82\xE9
@@ -119,9 +116,12 @@
if (UA::isPC() || UA::isIPhoneGroup()) {
$on_check_sage = ' onChange="checkSage();"';
$sage_cb_ht = '<input id="sage" type="checkbox" onClick="mailSage();">';
- if (UA::isPC()) {
- $sage_cb_ht .= '<label for="sage">sage</label><br>';
- }
+ if (UA::isPC() || UA::isIPhoneGroup()) {
+ $sage_cb_ht .= '<label for="sage">sage</label>';
+ }
+ if (UA::isPC()) {
+ $sage_cb_ht .= '<br>';
+ }
}
// 2ch\x81\x9C\x8F\x91\x82\xAB\x8D\x9E\x82\xDD
@@ -238,9 +238,9 @@
if (P2Util::isHost2chs($host) and file_exists($_conf['sid2ch_php'])) {
$maru_kakiko_ht = sprintf(
- UA::isIPhoneGroup()
- ? '<span title="2ch\x81\x9CID\x82̎g\x97p">2ch\x81\x9CID: <input id="maru_kakiko" name="maru_kakiko" type="checkbox" value="1"%s></span>'
- :'<span title="2ch\x81\x9CID\x82̎g\x97p"><input id="maru_kakiko" name="maru_kakiko" type="checkbox" value="1"%s><label for="maru_kakiko">\x81\x9C</label></span>',
+ UA::isIPhoneGroup()
+ ? '<span title="2ch\x81\x9CID\x82̎g\x97p"><input id="maru_kakiko" name="maru_kakiko" type="checkbox" value="1"%s><label for="maru_kakiko">\x81\x9C</label></span>'
+ : '<span title="2ch\x81\x9CID\x82̎g\x97p"><input id="maru_kakiko" name="maru_kakiko" type="checkbox" value="1"%s><label for="maru_kakiko">\x81\x9C</label></span>',
$_conf['maru_kakiko'] ? ' checked' : ''
);
}
Modified: p2/trunk/lib/post_form.inc.php
===================================================================
--- p2/trunk/lib/post_form.inc.php 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/lib/post_form.inc.php 2013-06-05 10:32:49 UTC (rev 949)
@@ -25,50 +25,51 @@
// \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
-<form id="resform" method="POST" action="{$_conf['post_php']}" accept-charset="{$_conf['accept_charset']}" onsubmit="disableSubmit(this)">
-{$htm['resform_ttitle']}
-{$htm['orig_msg']}
+<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']}
- 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}"{$htm['kakiko_on_js']}>{$MESSAGE_hs}</textarea>{$htm['k_br']}
- <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']}
-
- <!-- <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
+ <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']}
+ 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']}
+ <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']}
+
+ <!-- <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
<script type="text/javascript">
<!--
var messageObj = document.getElementById('MESSAGE');
if (!messageObj.value) {
- hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
+ hukkatuPostForm('{$host}', '{$bbs}', '{$key}');
}
-->
</script>\n
EOP;
}
+$htm['post_form'] .= "</form>\n";
/*
* Local Variables:
Deleted: p2/trunk/lib/post_options_loader.inc.php
===================================================================
--- p2/trunk/lib/post_options_loader.inc.php 2013-06-05 06:28:30 UTC (rev 948)
+++ p2/trunk/lib/post_options_loader.inc.php 2013-06-05 10:32:49 UTC (rev 949)
@@ -1,283 +0,0 @@
-<?php
-// 2013/06/05 loadPostOptions.php \x82Ɉڍs\x93\x9D\x8D\x87\x82\xB5\x82Ĕp\x8E~
-
-// p2 - \x83\x8C\x83X\x8F\x91\x82\xAB\x8D\x9E\x82݃t\x83H\x81[\x83\x80\x82̋@\x94\\x93ǂݍ\x9E\x82\xDD
-// read_footer.inc.php \x82\xC6 post_form.php, post_form_i.php \x82\xA9\x82\xE7\x8CĂ\xEA\x82Ă\xA2\x82\xE9
-
-// \x8E\x96\x91O\x95ϐ\x94
-// $host, $bbs, $key ($rescount, $popup, $ttitle_en)
-
-// post_options_loader($host, $bbs, $key);
-
-/**
- * @access public
- * @return void
- */
-function post_options_loader($host, $bbs, $key)
-{
- global $_conf, $STYLE;
- global $hs, $htm;
- global $time_for_post, $res_disabled_at, $MESSAGE_hs, $name_size_at, $mail_size_at, $msg_cols_at, $wrap, $on_check_sage, $sage_cb_ht;
-
-
- $fake_time = -10; // time \x82\xF010\x95\xAA\x91O\x82ɋU\x91\x95
- $time_for_post = time() - 9*60*60;
- $time_for_post = $time_for_post + $fake_time * 60;
-
- $res_disabled_at = '';
-
- // $resv 'FROM', 'mail', 'MESSAGE, 'subject'
- $resv = P2Util::getDefaultResValues($host, $bbs, $key);
-
- //$hs = array_map(create_function('$n', 'return hs($n);'), $resv);
- $hs = array(
- 'FROM' => hs($resv['FROM']),
- 'mail' => hs($resv['mail']),
- 'subject' => hs($resv['subject'])
- );
- $MESSAGE_hs = hs($resv['MESSAGE']);
-
- // \x82\xB1\x82\xEA\x82Ƀ\x8C\x83X
- $htm['orig_msg'] = _getOrigMsgHtmlAndSetMessageHs(
- $host, $bbs, $key, geti($_GET['resnum']), geti($_GET['inyou']), $MESSAGE_hs
- );
-
-
- // \x95\\x8E\xA6\x8Ew\x92\xE8
- // \x8EQ\x8Dl \x83N\x83\x89\x83V\x83b\x83N COLS='60' ROWS='8'
- $mobile = &Net_UserAgent_Mobile::singleton();
-
- $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';
-
- // 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
- } elseif($mobile && $mobile->isWillcom()) {
- if ($_conf['k_post_msg_cols']) {
- $msg_cols_at = sprintf(' cols="%d"', $_conf['k_post_msg_cols']);
- } else {
- $msg_cols_at = sprintf(' cols="%d"', $STYLE['post_msg_cols']);
- }
- // $STYLE['post_msg_rows'] => 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 {
- $msg_cols_at = '';
- if ($_conf['k_post_msg_cols']) {
- $msg_cols_at = sprintf(' cols="%d"', $_conf['k_post_msg_cols']);
- }
- 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
- }
-
- $wrap = 'soft';
- }
-
- // 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" type="submit" name="submit_beres" value="BE\x82ŏ\x91\x82\xAB\x8D\x9E\x82\xDE" onClick="setHiddenValue(this); popUpFootbarFormIPhone(1, 1);"><br>';
- } else {
- $htm['be2ch'] = '\x81@<input id="submit_beres" type="submit" name="submit_beres" value="BE\x82ŏ\x91\x82\xAB\x8D\x9E\x82\xDE"' . $res_disabled_at . ' onClick="setHiddenValue(this);">';
- }
- }
-
- // be\x94‚ł͏\x91\x82\xAB\x8D\x9E\x82݂\xF8\x82ɂ\xB7\x82\xE9
- $htm['title_need_be'] = '';
- if (P2Util::isBbsBe2chNet($host, $bbs)) {
- // \x82\xE2\x82\xC1\x82ς薳\x8C\xF8\x82ɂ\xB5\x82Ȃ\xA2\x81B\x8F\x91\x82\xAB\x8D\x9E\x82ݎ\xB8\x94s\x8E\x9E\x82ɁA2ch\x91\xA4\x82\xC5Be\x83\x8D\x83O\x83C\x83\x93\x82ւ̗U\x93\xB1\x82\xAA\x82\xA0\x82\xE9\x82̂ŁB
- //$res_disabled_at = ' disabled';
- if (P2Util::enableBe2ch()) {
- $htm['title_need_be'] = ' title="Be\x94‚ɂ‚\xAB\x81A\x8E\xA9\x93\xAEBe\x8F\x91\x82\xAB\x8D\x9E\x82݂\xB5\x82܂\xB7"';
- } else {
- $htm['title_need_be'] = ' title="\x8F\x91\x82\xAB\x8D\x9E\x82ނɂ\xCDBe\x83\x8D\x83O\x83C\x83\x93\x82\xAA\x95K\x97v\x82ł\xB7"';
- }
- }
-
-
- // sage checkbox
- $on_check_sage = '';
- $sage_cb_ht = '';
- if (UA::isPC() || UA::isIPhoneGroup()) {
- $on_check_sage = ' onChange="checkSage();"';
- $sage_cb_ht = '<input id="sage" type="checkbox" onClick="mailSage();">';
- if (UA::isPC()) {
- $sage_cb_ht .= '<label for="sage">sage</label><br>';
- }
- }
-
- // 2ch\x81\x9C\x8F\x91\x82\xAB\x8D\x9E\x82\xDD
- $htm['maru_kakiko'] = _getMaruKakikoHtml($host);
-
- // \x83\\x81[\x83X\x83R\x81[\x83h\x95\x97p\x83`\x83F\x83b\x83N\x83{\x83b\x83N\x83X
- $htm['src_fix'] = _getSrcFixHtml($host);
-
- /*
- // {{{ \x96{\x95\xB6\x82\xAA\x8B\xF3\x82̂Ƃ\xAB\x82\xE2sage\x82ĂȂ\xA2\x82Ƃ\xAB\x82ɑ\x97\x90M\x82\xB5\x82悤\x82Ƃ\xB7\x82\xE9\x82ƒ\x8D\x88ӂ\xB7\x82\xE9
-
- $onsubmit_ht = '';
-
- if (UA::isPC() || UA::isIPhoneGroup()) {
- if ($_exconf['editor']['check_message'] || $_exconf['editor']['check_sage']) {
- $check_message = (int)$_exconf['editor']['check_message'];
- $check_sage = (int)$_exconf['editor']['check_sage'];
- $onsubmit_ht = " onsubmit=\"return validateAll({$check_message},{$check_sage})\"";
- }
- }
-
- // }}}
- */
-}
-
-//==================================================================================
-// \x8A\x94\x81i\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x93\xE0\x82݂̂ŗ\x98\x97p\x81j
-//==================================================================================
-/**
- * \x82\xB1\x82\xEA\x82Ƀ\x8C\x83X
- *
- * @return string HTML
- */
-function _getOrigMsgHtmlAndSetMessageHs($host, $bbs, $key, $resnum, $inyou, &$MESSAGE_hs)
-{
- global $_conf;
-
- $orig_msg_ht = '';
-
- // inyou:1 \x88\xF8\x97p
- // inyou:2 \x83v\x83\x8C\x83r\x83\x85\x81[
- // inyou:3 \x88\xF8\x97p\x81{\x83v\x83\x8C\x83r\x83\x85\x81[
- if ((in_array(basename($_SERVER['SCRIPT_NAME']), array('post_form.php', 'post_form_i.php')) || $inyou) && $resnum) {
- if (!($inyou == 2 && strlen($MESSAGE_hs))) {
- $MESSAGE_hs = '>>' . $resnum . "\r\n";
- }
- if (!empty($inyou)) {
- $q_resar = _getExplodedDatLine($host, $bbs, $key, $resnum);
- $prvwMsgHtml = _getPrvwMsgHtml($q_resar[3]);
- if ($inyou == 1 || $inyou == 3) {
- // \x88\xF8\x97p\x83\x8C\x83X\x94ԍ\x86\x82\xAA\x82ł\xAB\x82Ă\xB5\x82܂\xED\x82Ȃ\xA2\x82悤\x82ɁA\x93\xF1\x82‚̔\xBC\x8Ap\x83X\x83y\x81[\x83X\x82\xF0\x93\xFC\x82\xEA\x82Ă\xA2\x82\xE9
- $MESSAGE_hs .= '> ';
- $MESSAGE_hs .= preg_replace('/ *<br> ?/', "\r\n> ", $prvwMsgHtml);
- $MESSAGE_hs .= "\r\n";
- }
- if ($inyou == 2 || $inyou == 3) {
- // <table border="0" cellpadding="0" cellspacing="0"><tr><td>
- $orig_msg_ht = <<<EOM
-<blockquote id="original_msg">
- <div>
- <span class="prvw_resnum">{$resnum}</span>
- \x81F<b class="prvw_name">{$q_resar[0]}</b>
- \x81F<span class="prvw_mail">{$q_resar[1]}</span>
- \x81F<span class="prvw_dateid">{$q_resar[2]}</span>
- <br>
- <div class="prvw_msg">{$prvwMsgHtml}</div>
-</blockquote>
-EOM;
- // </td></tr></table>
- }
- }
- }
- return $orig_msg_ht;
-}
-
-/**
- * @return array
- */
-function _getExplodedDatLine($host, $bbs, $key, $resnum)
-{
- require_once P2_LIB_DIR . '/Thread.php';
- require_once P2_LIB_DIR . '/ThreadRead.php';
- $ThreadRead = new ThreadRead;
- $ThreadRead->setThreadPathInfo($host, $bbs, $key);
- $ThreadRead->readDat($ThreadRead->keydat);
- $explodedDatLine = $ThreadRead->explodeDatLine($ThreadRead->datlines[$resnum - 1]);
- return array_map('trim', $explodedDatLine);
-}
-
-/**
- * \x88\xF8\x97p\x83\x81\x83b\x83Z\x81[\x83W\x82̂\xBD\x82߂\xCCHTML
- *
- * @return string HTML
- */
-function _getPrvwMsgHtml($datMsg)
-{
- // transMsg(), removeResAnchorTagInDat()
- $datMsg = str_replace('<br>', "\n", $datMsg);
- $datMsg = strip_tags($datMsg);
- $datMsg = str_replace("\n", '<br>', $datMsg);
- return $datMsg;
-}
-
-/**
- * 2ch\x81\x9C\x8F\x91\x82\xAB\x8D\x9E\x82\xDD
- *
- * @return string HTML
- */
-function _getMaruKakikoHtml($host)
-{
- global $_conf;
-
- $maru_kakiko_ht = '';
-
- if (P2Util::isHost2chs($host) and file_exists($_conf['sid2ch_php'])) {
- $maru_kakiko_ht = sprintf(
- UA::isIPhoneGroup()
- ? '<span title="2ch\x81\x9CID\x82̎g\x97p">2ch\x81\x9CID: <input id="maru_kakiko" name="maru_kakiko" type="checkbox" value="1"%s></span>'
- :'<span title="2ch\x81\x9CID\x82̎g\x97p"><input id="maru_kakiko" name="maru_kakiko" type="checkbox" value="1"%s><label for="maru_kakiko">\x81\x9C</label></span>',
- $_conf['maru_kakiko'] ? ' checked' : ''
- );
- }
- return $maru_kakiko_ht;
-}
-
-/**
- * \x83\\x81[\x83X\x83R\x81[\x83h\x95\x97p\x83`\x83F\x83b\x83N\x83{\x83b\x83N\x83X
- *
- * @return string HTML
- */
-function _getSrcFixHtml($host)
-{
- global $_conf;
-
- $src_fix_ht = '';
-
- if (UA::isPC() || UA::isIPhoneGroup()) {
- if (
- $_conf['editor_srcfix'] == 1
- or $_conf['editor_srcfix'] == 2 && preg_match('/pc\d+\.2ch\.net/', $host)
- ) {
- $src_fix_ht = '<input type="checkbox" id="fix_source" name="fix_source" value="1"><label for="fix_source">\x83\\x81[\x83X\x83R\x81[\x83h\x95</label>';
- }
- }
- return $src_fix_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: