• R/O
  • SSH
  • HTTPS

p2-php: Commit


Commit MetaInfo

Revision973 (tree)
Time2014-01-23 23:10:03
Authorakid

Log Message

p2/ for version 1.8.97

Change Summary

Incremental Difference

--- p2/trunk/read_new_i.php (revision 972)
+++ p2/trunk/read_new_i.php (revision 973)
@@ -201,8 +201,8 @@
201201 // -->
202202 </script>
203203 <?php // ここでは iui.css は読んでいないことに注意 ?>
204-<link rel="stylesheet" type="text/css" href="./iui/smartphone.css?20130612">
205-<link rel="stylesheet" type="text/css" href="./iui/read.css?20130612">
204+<link rel="stylesheet" type="text/css" href="./iui/smartphone.css?20140114">
205+<link rel="stylesheet" type="text/css" href="./iui/read.css?20140114">
206206 <?php
207207
208208 echo "<title>{$ptitle_ht}</title>";
@@ -573,9 +573,8 @@
573573
574574 ?>
575575 <div id="footToolbar" class="footbar">
576-<ul>
577-<li class="home"><a name="ntt_bt1" href="<?php eh($index_uri); ?>">TOP</a></li>
578-<li class="other" id="etcButoon" title="off"><a onclick="popUpFootbarFormIPhone(2);">その他</a></li>
576+<span class="home"><a name="ntt_bt1" href="<?php eh($index_uri); ?>">TOP</a></span>
577+<span class="other" id="etcButoon" title="off"><a onclick="popUpFootbarFormIPhone(2);">その他</a></span>
579578 <?php
580579 if (!isset($GLOBALS['rnum_all_range']) or $GLOBALS['rnum_all_range'] > 0 or !empty($GLOBALS['_is_eq_limit_to_and_to'])) {
581580 if (!empty($GLOBALS['_is_eq_limit_to_and_to'])) {
@@ -583,21 +582,21 @@
583582 } else {
584583 $str = '新まとめを更新';
585584 }
585+ ?><span class="next_disabled"></span><?php
586586 echo <<<EOP
587- <li class="next_disabled"></li>
588- <li class="new"><a href="{$_conf['read_new_k_php']}?host={$aThreadList->host}&bbs={$aThreadList->bbs}&spmode={$aThreadList->spmode}&nt={$newtime}{$_conf['k_at_a']}">{$str}</a></li>
587+ <span class="new"><a href="{$_conf['read_new_k_php']}?host={$aThreadList->host}&bbs={$aThreadList->bbs}&spmode={$aThreadList->spmode}&nt={$newtime}{$_conf['k_at_a']}">{$str}</a></span>
589588 EOP;
590589 } else {
591590 echo <<<EOP
592- <li class="next"><a href="{$_conf['read_new_k_php']}?host={$aThreadList->host}&bbs={$aThreadList->bbs}&spmode={$aThreadList->spmode}&nt={$newtime}&amp;norefresh=1{$_conf['k_at_a']}">新まとめの続き</a></li>
593- <li class="new_disabled"></li>
591+ <span class="next"><a href="{$_conf['read_new_k_php']}?host={$aThreadList->host}&bbs={$aThreadList->bbs}&spmode={$aThreadList->spmode}&nt={$newtime}&amp;norefresh=1{$_conf['k_at_a']}">新まとめの続き</a></span>
594592 EOP;
593+ ?><span class="new_disabled"></span><?php
594+
595595 }
596596 //{$sb_ht_btm}の
597597 //echo '<hr>' . P2View::getBackToIndexKATag() . "\n";
598598 //iphone 080801
599599 ?>
600- </ul>
601600 </div>
602601
603602 <?php // 「その他」のポップアップメニュー ?>
--- p2/trunk/conf/conf_user_def.inc.php (revision 972)
+++ p2/trunk/conf/conf_user_def.inc.php (revision 973)
@@ -236,11 +236,11 @@
236236 $conf_user_def['before_respointer_i'] = 5; // (5) k_rnum_range よりも小さく
237237 $conf_user_rules['before_respointer_i'] = array('notIntExceptMinusToDef');
238238
239-// 携帯閲覧時、外部URLクッションを利用 (する, しない)
239+// 携帯閲覧時、外部URLクッションページを利用 (する, しない)
240240 $conf_user_def['through_ime_k'] = 'p2'; // ('p2')
241241 $conf_user_sel['through_ime_k'] = array('p2' => 'する', '0' => 'しない');
242242
243-// 携帯閲覧時、外部URLクッションでjigブラウザWEBを利用する (ホスト名。「http://XXXXXX.jig.jp/fweb/?_jig_=」の XXXXXX 部分)
243+// 携帯閲覧時、外部URLクッションページでjigブラウザWEBを利用する (ホスト名。「http://XXXXXX.jig.jp/fweb/?_jig_=」の XXXXXX 部分)
244244 $conf_user_def['k_jig_host'] = ''; // ('')
245245
246246 // 携帯閲覧時、外部リンクに通勤ブラウザ(通)を利用(する, しない)
--- p2/trunk/conf/conf_system.inc.php (revision 972)
+++ p2/trunk/conf/conf_system.inc.php (revision 973)
@@ -3,7 +3,7 @@
33 // このファイルは、特に理由の無い限り変更しないで下さい。
44 // include from conf.inc.php
55
6-$_conf['p2version'] = '1.8.96'; // rep2のバージョン
6+$_conf['p2version'] = '1.8.97'; // rep2のバージョン
77
88 $_conf['p2name'] = 'rep2'; // rep2の名前。
99
--- p2/trunk/conf/conf_admin.inc.php (revision 972)
+++ p2/trunk/conf/conf_admin.inc.php (revision 973)
@@ -95,6 +95,8 @@
9595
9696 $_conf['ngaborn_data_limit'] = 0; // (0) NGあぼーんに登録できる数(0なら制限なし)
9797
98+$_conf['force_through_ime_if_urlsid'] = 1; // (1) セッションIDのリファラ漏れを防ぐため、URLにセッションIDが含まれる場合は、強制的にimeを通す。(Yes:1, No:0)
99+
98100 $_conf['enable_skin'] = 1;
99101
100102 $_conf['bbsmenu_url_for_mapping'] = 'http://kita.jikkyo.org/cbm/cbm.cgi/20.p0.m0/-all/bbsmenu.html'; // 板-ホストの対応表を作成するために使用するbbsmenuのURL
--- p2/trunk/editpref_i.php (revision 972)
+++ p2/trunk/editpref_i.php (revision 973)
@@ -211,7 +211,8 @@
211211
212212 ?>[<?php echo $clear_res_hist_log_atag; ?>]<?php
213213
214-?></filedset><div><?php
214+?></filedset></div><?php
215+
215216 ?></body></html><?php
216217
217218
--- p2/trunk/doc/ChangeLog.txt (revision 972)
+++ p2/trunk/doc/ChangeLog.txt (revision 973)
@@ -1,3 +1,13 @@
1+2014/01/23
2+ * rep2 version 1.8.97
3+
4+ [更新] スマホ向け表示をフラットデザイン化した。
5+ [更新] ユーザ設定編集のフォームに autocomplete="off" の属性を追加した。
6+ [更新] サムネイル画像表示のコードを更新した。
7+ [更新] クッキー無効時は外部URLクッションページを強制的に通すようにした。
8+ (conf_admin.inc.phpの$_conf['force_through_ime_if_urlsid']で設定変更可能)
9+ [更新] IDを省略して末尾のみ表示する時に「*」表示を追加した。
10+
111 2013/12/15
212 * rep2 version 1.8.96
313
--- p2/trunk/post_form_i.php (revision 972)
+++ p2/trunk/post_form_i.php (revision 973)
@@ -53,6 +53,8 @@
5353 $sub_size_at = ' size="40"';
5454 }
5555
56+$htm['resform_ttitle'] = '';
57+
5658 // {{{ スレ立てなら
5759
5860 if (!empty($_GET['newthread'])) {
--- p2/trunk/lib/ShowThreadPc.php (revision 972)
+++ p2/trunk/lib/ShowThreadPc.php (revision 973)
@@ -1108,7 +1108,7 @@
11081108
11091109 if (isset($purl['scheme'])) {
11101110 // ime
1111- $link_url = $_conf['through_ime'] ? P2Util::throughIme($url) : $url;
1111+ $link_url = P2Util::throughIme($url);
11121112
11131113 // HTMLポップアップ (p)など
11141114 if ($_conf['iframe_popup'] && preg_match('/https?/', $purl['scheme']) && !$this->isNoIframeUri($url)) {
@@ -1419,7 +1419,7 @@
14191419
14201420 // http://www.yourfilehost.com/media.php?cat=video&file=hogehoge.wmv
14211421 if (preg_match('{^http://www\\.yourfilehost\\.com/media\\.php\\?cat=video&file=([0-9A-Za-z_\\-\\.]+)}', $url, $m)) {
1422- $link_url = $_conf['through_ime'] ? P2Util::throughIme($url) : $url;
1422+ $link_url = P2Util::throughIme($url);
14231423
14241424 if ($_conf['iframe_popup']) {
14251425 $linkHtml = $this->iframePopup($link_url, $html, array('target' => $_conf['bbs_win_target']));
@@ -1430,7 +1430,7 @@
14301430
14311431 $dl_url1 = "http://getyourfile.dyndns.tv/video?url=" . rawurlencode($url);
14321432 $dl_url2 = "http://yourfilehostwmv.com/video?url=" . rawurlencode($url);
1433- if ($_conf['through_ime']) {
1433+ if (P2Util::getThroughImeSetting()) {
14341434 $dl_url1 = P2Util::throughIme($dl_url1);
14351435 $dl_url2 = P2Util::throughIme($dl_url2);
14361436 }
@@ -1472,10 +1472,10 @@
14721472 $GLOBALS['pre_thumb_limit']--;
14731473
14741474 $img_tag = sprintf(
1475- '<img class="thumbnail" src="%s" height="%s" width="%s" hspace="4" vspace="4" align="middle">',
1475+ '<img class="thumbnail" src="%s" %s %s hspace="4" vspace="4" align="middle">',
14761476 hs($url),
1477- hs($_conf['pre_thumb_height']),
1478- hs($_conf['pre_thumb_width'])
1477+ $_conf['pre_thumb_height'] ? 'height="' . hs($_conf['pre_thumb_height']) . '"' : '',
1478+ $_conf['pre_thumb_width'] ? 'width="' . hs($_conf['pre_thumb_width']) . '"' : ''
14791479 );
14801480
14811481 switch ($_conf['iframe_popup']) {
--- p2/trunk/lib/ShowThread.php (revision 972)
+++ p2/trunk/lib/ShowThread.php (revision 973)
@@ -229,6 +229,20 @@
229229 }
230230
231231 /**
232+ * IDを省略して末尾のみ表示に変換する
233+ *
234+ * @access protected
235+ * @param string $date_id 日付日時ID
236+ * @param string $id_field IDフィールド
237+ * @return string
238+ */
239+ function clipId($date_id, $id_field)
240+ {
241+ $ryaku_mark = (substr($id_field, -2, 1) == ' ') ? '' : '*';
242+ return str_replace($id_field, 'ID:' . $ryaku_mark . substr($id_field, -1, 1), $date_id);
243+ }
244+
245+ /**
232246 * BEプロファイルリンク変換
233247 *
234248 * @access protected
--- p2/trunk/lib/P2Util.php (revision 972)
+++ p2/trunk/lib/P2Util.php (revision 973)
@@ -1482,28 +1482,60 @@
14821482 {
14831483 global $_conf;
14841484
1485+ $through_ime = P2Util::getThroughImeSetting();
1486+
1487+ $url_r = $url;
1488+
14851489 // p2imeは、enc, m, url の引数順序が固定されているので注意
14861490
14871491 // [wish] 2chに限らず、
14881492 // http://machi.to/bbs/link.cgi?URL=http://hokkaido.machibbs.com/bbs/read.cgi/hokkaidou/1244990327/
14891493 // のようなそれぞれのBBSでのimeに対応したいところ。あらかじめ引数でbbs種別を受け取る必要がある。
1490- if ($_conf['through_ime'] == '2ch') {
1494+ if ($through_ime == '2ch') {
14911495 $purl = parse_url($url);
14921496 $url_r = $purl['scheme'] . '://ime.nu/' . $purl['host'] . $purl['path'];
14931497
1494- } elseif ($_conf['through_ime'] == 'p2' || $_conf['through_ime'] == 'p2pm') {
1498+ } elseif ($through_ime == 'p2' || $through_ime == 'p2pm') {
14951499 $url_r = $_conf['p2ime_url'] . '?enc=1&url=' . rawurlencode($url);
14961500
1497- } elseif ($_conf['through_ime'] == 'p2m') {
1501+ } elseif ($through_ime == 'p2m') {
14981502 $url_r = $_conf['p2ime_url'] . '?enc=1&m=1&url=' . rawurlencode($url);
1499-
1500- } else {
1501- $url_r = $url;
15021503 }
15031504
15041505 return $url_r;
15051506 }
15061507
1508+ /**
1509+ * 適用されるime設定を返す
1510+ *
1511+ * @access public
1512+ * @return string
1513+ */
1514+ function getThroughImeSetting()
1515+ {
1516+ global $_conf;
1517+
1518+ if (UA::isK() && !UA::isIPhoneGroup()) {
1519+ if (!empty($_conf['through_ime_k'])) {
1520+ return $_conf['through_ime_k'];
1521+ }
1522+ } else {
1523+ if (!empty($_conf['through_ime'])) {
1524+ return $_conf['through_ime'];
1525+ }
1526+ }
1527+
1528+ // URLにセッションIDが含まれる場合は、強制的にimeを通す
1529+ // (cookieがあっても初回ページにはSIDが付く)
1530+ if ($_conf['force_through_ime_if_urlsid']) {
1531+ if (defined('SID') && strlen(SID)) {
1532+ return 'p2'; // デフォルト値
1533+ }
1534+ }
1535+
1536+ return '';
1537+ }
1538+
15071539 // {{{ normalizeHostName()
15081540
15091541 /**
--- p2/trunk/lib/setFav.func.php (revision 972)
+++ p2/trunk/lib/setFav.func.php (revision 973)
@@ -65,9 +65,9 @@
6565 }
6666 }
6767
68- if (!empty($GLOBALS['brazil'])) {
68+ //if (!empty($GLOBALS['brazil'])) {
6969 //$newlines = _removeLargeFavlistData($newlines);
70- }
70+ //}
7171
7272 // 記録データ設定
7373 if ($setfav) {
@@ -103,8 +103,11 @@
103103 * @access private
104104 * @return void
105105 */
106-function _removeLargeFavlistData($newlines, $max = 500)
106+function _removeLargeFavlistData($newlines, $max = null)
107107 {
108+ if (!$max) {
109+ $max = 500;
110+ }
108111 if ($removelines = array_slice($newlines, $max)) {
109112 for ($i = 0; $i < count($removelines); $i++) {
110113 $d = explode('<>', $removelines[$i]);
--- p2/trunk/lib/P2View.php (revision 972)
+++ p2/trunk/lib/P2View.php (revision 973)
@@ -13,8 +13,8 @@
1313 <?php if (UA::isWindowsPhoneIEMobile()) { ?>
1414 @import "./iui/iui_wpie.css";
1515 <?php } ?>
16-@import "./iui/smartphone.css?20130613";
17-@import "./iui/iui.css?2013061320";
16+@import "./iui/smartphone.css?20140114";
17+@import "./iui/iui.css?20140114";
1818 </style>
1919 <?php
2020 }
--- p2/trunk/lib/ShowThreadK.php (revision 972)
+++ p2/trunk/lib/ShowThreadK.php (revision 973)
@@ -351,7 +351,7 @@
351351 );
352352 } else {
353353 if ($_conf['k_clip_unique_id']) {
354- $date_id = str_replace($matches[0], 'ID:' . substr($matches[0], -1, 1), $date_id);
354+ $date_id = $this->clipId($date_id, $matches[0]);
355355 $no_trim_id_flag = true;
356356 }
357357 }
@@ -659,7 +659,8 @@
659659 {
660660 global $_conf;
661661
662- $url = $s[1];
662+ $url = $s[1];
663+ $html = $s[2];
663664
664665 $ext_pre_hts = array();
665666
@@ -666,9 +667,8 @@
666667 // 通勤ブラウザ
667668 if ($_conf['k_use_tsukin']) {
668669 $tsukin_url = 'http://www.sjk.co.jp/c/w.exe?y=' . urlencode($url);
669- if ($_conf['through_ime_k']) {
670- $tsukin_url = P2Util::throughIme($tsukin_url);
671- }
670+ $tsukin_url = P2Util::throughIme($tsukin_url);
671+
672672 $ext_pre_hts[] = '<a href="' . hs($tsukin_url) . '">通</a>';
673673 }
674674
@@ -675,9 +675,8 @@
675675 // jigブラウザWEB http://bwXXXX.jig.jp/fweb/?_jig_=
676676 if ($_conf['k_jig_host']) {
677677 $jig_url = 'http://'. $_conf['k_jig_host'] . '.jig.jp/fweb/?_jig_=' . urlencode($url);
678- if ($_conf['through_ime_k']) {
679- $jig_url = P2Util::throughIme($jig_url);
680- }
678+ $jig_url = P2Util::throughIme($jig_url);
679+
681680 $ext_pre_hts[] = '<a href="' . hs($jig_url) . '">j</a>';
682681 }
683682
@@ -685,12 +684,9 @@
685684 if ($ext_pre_hts) {
686685 $ext_pre_ht = '(' . implode('|', $ext_pre_hts) . ')';
687686 }
688-
689- if ($_conf['through_ime_k']) {
690- $url = P2Util::throughIme($url);
691- }
687+
692688 return $ext_pre_ht . sprintf('<a href="%s">%s</a>',
693- hs($url), $s[2]
689+ hs(P2Util::throughIme($url)), $html
694690 );
695691 }
696692
@@ -851,19 +847,7 @@
851847
852848 if (isset($purl['scheme'])) {
853849 // 携帯用外部URL変換
854- if ($_conf['k_use_tsukin'] || $_conf['k_jig_host']) {
855- return $this->ktai_exturl_callback(array('', $url, $html));
856- }
857- // ime
858- if ($_conf['through_ime_k']) {
859- $link_url = P2Util::throughIme($url);
860- } else {
861- $link_url = $url;
862- }
863- return sprintf(
864- '<a href="%s">%s</a>',
865- hs($link_url), $html
866- );
850+ return $this->ktai_exturl_callback(array('', $url, $html));
867851 }
868852 return false;
869853 }
@@ -995,7 +979,7 @@
995979 }
996980
997981 /**
998- * 画像ポップアップ変換(ピクトを利用。ピクト終了につき不使用)
982+ * 画像URL変換(ピクトを利用。ピクト終了につき不使用)
999983 *
1000984 * @access private
1001985 * @return string|false HTML
@@ -1005,13 +989,12 @@
1005989 global $_conf;
1006990
1007991 if (preg_match('{^https?://.+?\\.(jpe?g|gif|png)$}i', $url) && empty($purl['query'])) {
992+ $link_url = $url;
1008993 $picto_url = 'http://pic.to/' . $purl['host'] . $purl['path'];
1009- if ($_conf['through_ime_k']) {
1010- $link_url = P2Util::throughIme($url);
1011- $picto_url = P2Util::throughIme($picto_url);
1012- } else {
1013- $link_url = $url;
1014- }
994+
995+ $link_url = P2Util::throughIme($link_url);
996+ $picto_url = P2Util::throughIme($picto_url);
997+
1015998 $picto_tag = sprintf('<a href="%s">(ピ)</a> ', hs($picto_url));
1016999 return $picto_tag . sprintf('<a href="%s">%s</a>',
10171000 hs($link_url), $html
--- p2/trunk/read_filter_i.php (revision 972)
+++ p2/trunk/read_filter_i.php (revision 973)
@@ -79,8 +79,8 @@
7979 <?php
8080 P2View::printExtraHeadersHtml();
8181 ?>
82- <link rel="stylesheet" type="text/css" href="./iui/smartphone.css">
83- <link rel="stylesheet" type="text/css" href="./iui/read.css?20130606">
82+ <link rel="stylesheet" type="text/css" href="./iui/smartphone.css?20140114">
83+ <link rel="stylesheet" type="text/css" href="./iui/read.css?20140114">
8484 <title>スレ内検索</title>
8585 </head>
8686 <body<?php echo $body_at; ?>>
--- p2/trunk/iphone/ShowThreadK.php (revision 972)
+++ p2/trunk/iphone/ShowThreadK.php (revision 973)
@@ -395,7 +395,7 @@
395395 );
396396 } else {
397397 if ($_conf['k_clip_unique_id']) {
398- $date_id = str_replace($matches[0], 'ID:' . substr($matches[0], -1, 1), $date_id);
398+ $date_id = $this->clipId($date_id, $matches[0]);
399399 $no_trim_id_flag = true;
400400 }
401401 }
@@ -608,7 +608,7 @@
608608 $date_id = preg_replace_callback('|ID: ?([0-9A-Za-z/.+]{8,11})|', array($this, 'idfilter_callback'), $date_id);
609609 } else {
610610 if ($_conf['k_clip_unique_id']) {
611- $date_id = str_replace($matches[0], 'ID:' . substr($matches[0], -1, 1), $date_id);
611+ $date_id = $this->clipId($date_id, $matches[0]);
612612 $no_trim_id_flag = true;
613613 }
614614 }
@@ -1092,7 +1092,7 @@
10921092
10931093 if (isset($purl['scheme'])) {
10941094
1095- $link_url = $_conf['through_ime'] ? P2Util::throughIme($url) : $url;
1095+ $link_url = P2Util::throughIme($url);
10961096
10971097 /*
10981098 // iPhone用 別窓リンク
@@ -1105,7 +1105,7 @@
11051105 );
11061106 }
11071107 */
1108- return $ext_pre_ht . P2View::tagA($link_url, $html, array('target' => $_conf['ext_win_target']));
1108+ return P2View::tagA($link_url, $html, array('target' => $_conf['ext_win_target']));
11091109
11101110 }
11111111 return false;
@@ -1268,10 +1268,10 @@
12681268 if (preg_match('{^https?://.+?\\.(jpe?g|gif|png)$}i', $url) && empty($purl['query'])) {
12691269
12701270 $img_tag = sprintf(
1271- '<img class="thumbnail" src="%s" height="%s" width="%s" hspace="4" vspace="4" align="middle">',
1271+ '<img class="thumbnail" src="%s" %s %s hspace="4" vspace="4" align="middle">',
12721272 hs($url),
1273- hs($_conf['pre_thumb_height']),
1274- hs($_conf['pre_thumb_width'])
1273+ $_conf['pre_thumb_height'] ? 'height="' . hs($_conf['pre_thumb_height']) . '"' : '',
1274+ $_conf['pre_thumb_width'] ? 'width="' . hs($_conf['pre_thumb_width']) . '"' : ''
12751275 );
12761276
12771277 // $html は URLを表現しているが、hが欠けていたりする
--- p2/trunk/iphone/index_print_k.inc.php (revision 972)
+++ p2/trunk/iphone/index_print_k.inc.php (revision 973)
@@ -15,7 +15,7 @@
1515
1616 $ptitle = $_conf['p2name'] . 'iPhone';
1717 if (UA::isAndroidWebKit()) {
18- $ptitle = $_conf['p2name'] . 'Android(仮)';
18+ $ptitle = $_conf['p2name'] . 'Android';
1919 }
2020
2121 // ログインユーザ情報
--- p2/trunk/iphone/read_header_k.inc.php (revision 972)
+++ p2/trunk/iphone/read_header_k.inc.php (revision 973)
@@ -284,8 +284,8 @@
284284 // -->
285285 </script>
286286
287- <link rel="stylesheet" type="text/css" href="./iui/smartphone.css?2013060910">
288- <link rel="stylesheet" type="text/css" href="./iui/read.css?20130611">
287+ <link rel="stylesheet" type="text/css" href="./iui/smartphone.css?20140114">
288+ <link rel="stylesheet" type="text/css" href="./iui/read.css?20140114">
289289 <title><?php echo $ptitle_ht; ?></title>
290290 <?php
291291
--- p2/trunk/iui/read.css (revision 972)
+++ p2/trunk/iui/read.css (revision 973)
@@ -61,12 +61,6 @@
6161 padding: 0px 4px 0px 6px;
6262 }
6363
64-/* URL 対策したからもういらないかも */
65-div.footbar a {
66- max-width: 300px;
67- display: inline-block;
68-}
69-
7064 /* read_new_i でのスレッドフッタ表示 */
7165 div.read_new_thre_footer {
7266 padding-top: 0px; padding-bottom: 4px;
@@ -84,7 +78,7 @@
8478 padding: 6px;
8579 height:45px;
8680 margin: 0;
87- background:url(toolbar.png) #6d84a2 repeat-x;
81+ background: #222; /* url(toolbar.png) #6d84a2 repeat-x; */
8882 }
8983
9084 /* ツールバーの真ん中の文字 read_new_i */
@@ -155,12 +149,13 @@
155149 width: 165px;
156150 height: 26px;
157151 color: white;
158- -webkit-border-image: url(toolButton.png) 0 5 0 5;
152+ background: #333; border-radius: 5px;
153+ /* -webkit-border-image: url(toolButton.png) 0 5 0 5; */
159154 border-width: 0 5px;
160155 }
161156 /* 次N disabled */
162157 span#large_next{
163- opacity: 0.5;
158+ opacity: 0.3;
164159 }
165160
166161 #footform form {
@@ -201,7 +196,7 @@
201196 }
202197
203198 /* レス番号 */
204-span.trnum {margin-right:2px; margin-left:1px;
199+span.trnum {margin-right:2px; /* margin-left:1px; */
205200 color: #333;
206201 font-size:16px;
207202 }
@@ -220,7 +215,7 @@
220215 }
221216 span.tdate {
222217 color: #555;
223- font-size:12px;
218+ font-size:12px; /* position: absolute; right:4px; */
224219 }
225220 font.sage {
226221 color: #555;
@@ -319,7 +314,7 @@
319314
320315 /* border-top: 480px rgba(0, 0, 0, 0.2) solid; */
321316 padding: 5px 6px 6px 0;
322- background: rgba(0, 0, 0, 0.5) url(footformbg.png?130609) repeat-x;
317+ background: rgba(0, 0, 0, 0.5) url(footformbg.png?130613) repeat-x;
323318 /*
324319 border-top: 1px solid
325320 padding: 0px 6px;
@@ -328,8 +323,9 @@
328323 overflow: visible;
329324 }
330325 .dialog_write > fieldset {
331- position: relative; background-color:#aaa;
332- border:none;
326+ position: relative;
327+ background-color:#aaa;
328+ border:none;
333329 }
334330
335331 .dialog_filter fieldset > h1, .dialog_write > fieldset > h5 {
--- p2/trunk/iui/smartphone.css (revision 972)
+++ p2/trunk/iui/smartphone.css (revision 973)
@@ -6,7 +6,7 @@
66 right: 6px;
77 margin: 0;
88 border-width: 0 5px;
9- padding: 1px 3px 0 3px;
9+ padding: 1px 4px 0 4px;
1010 width: auto;
1111 height: 30px;
1212
@@ -19,8 +19,9 @@
1919 text-overflow: ellipsis;
2020 text-decoration: none;
2121 white-space: nowrap;
22- background: none;
23- -webkit-border-image: url(toolButton.png) 0 5 0 5;
22+ background: #333; border-radius: 5px;
23+ /* background: none;
24+ -webkit-border-image: url(toolButton.png) 0 5 0 5; */
2425 display:block;
2526 }
2627
@@ -31,7 +32,9 @@
3132 width: auto; max-width: 55px;
3233 font-family: Helvetica;
3334 border-width: 0 8px 0 14px;
34- -webkit-border-image: url(backButton.png) 0 8 0 14;
35+ /* background: #333; border-radius: 5px; min-width:46px; text-align:center */
36+ background: none;
37+ -webkit-border-image: url(backButton.png?14011419) 0 8 0 14;
3538 }
3639
3740 /* ツールバーの真ん中の文字 */
@@ -59,7 +62,8 @@
5962 width: auto; max-width: 88px;
6063 /* font-family: Helvetica; */
6164 border-width:0 8px 0 14px;
62- -webkit-border-image:url(backButton.png) 0 8 0 14;
65+ background: #333; border-radius: 5px; min-width:46px; text-align:center; left: 59px; padding-right: 4px; padding-left: 4px;
66+ /* -webkit-border-image:url(backButton.png) 0 8 0 14; */
6367 }
6468
6569
@@ -80,15 +84,18 @@
8084 }
8185
8286 .whiteButton {
83- -webkit-border-image: url(whiteButton.png) 0 12 0 12;
87+ /* -webkit-border-image: url(whiteButton.png) 0 12 0 12; */ background:#eee; border-radius: 10px;
8488 text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0;
8589 /* -webkit-appearance: none; */
8690 }
91+input.whiteButton { /* 新規スレッド作成ボタン */
92+ border-width:1px; border-color:#aaa;
93+}
8794 .whiteButton a {
8895 display:block;
8996 }
9097 li.grayButton {
91- -webkit-border-image: url(grayButton.png) 0 12 0 12;
98+ /* -webkit-border-image: url(grayButton.png) 0 12 0 12; */ background:#444; border-radius: 10px;
9299 color: #FFFFFF;
93100 }
94101
@@ -122,7 +129,7 @@
122129 border-top: 1px solid #7d7d7d;
123130 border-bottom: 1px solid #999999;
124131 padding: 2px 10px 0px 10px;
125- background: url(listGroup.png) repeat-x;
132+ /* background: url(listGroup.png) repeat-x; */ background:#aaa;
126133 font-size: 16px;
127134 font-weight: bold;
128135 text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0;
@@ -157,7 +164,8 @@
157164 /* フッタ ツール */
158165
159166 #footToolbar {
160- background-image: url(footback.png); background-color:#333;
167+ /* background-image: url(footback.png); */
168+ background-color:#111;
161169 opacity:0.8;
162170 width:100%;
163171 padding: 0;
@@ -172,13 +180,10 @@
172180 margin: 0;
173181 -webkit-tap-highlight-color:rgba(0,0,0,0);
174182 }
175-.footbar>ul {
183+.footbar > span {
176184 display: inline;
177- list-style:none
178- padding: 0;
179185 margin: 0;
180-}
181-.footbar > ul > li {
186+
182187 width: 52px;
183188 height: 50px;
184189 overflow: hidden;
@@ -188,7 +193,7 @@
188193 background-image: url(footer_tool.png?31);
189194 }
190195 @media only screen and (-webkit-min-device-pixel-ratio: 2),(-webkit-min-device-pixel-ratio: 1.5) {
191- .footbar > ul > li {
196+ .footbar > span {
192197 -webkit-background-size: 532px 100px;
193198 background-image:url('footer_tool_retina.png?37');
194199 }
@@ -200,32 +205,32 @@
200205 text-indent: -5000px;
201206 }
202207
203-.footbar>ul>li.home {background-position: 0 0;}
204-.footbar>ul>li.home:hover {background-position: 0 -50px;}
205-.footbar>ul>li.prev {background-position: -54px 0;}
206-.footbar>ul>li.prev:hover {background-position: -54px -50px;}
207-.footbar > ul > li.prev_disabled {
208+.footbar > span.home {background-position: 0 0;}
209+.footbar > span.home:hover {background-position: 0 -50px;}
210+.footbar > span.prev {background-position: -54px 0;}
211+.footbar > span.prev:hover {background-position: -54px -50px;}
212+.footbar > span.prev_disabled {
208213 background-position: -54px 0;
209214 opacity:0.2;
210215 }
211-.footbar>ul>li.new {background-position: -107px 0;}
212-.footbar>ul>li.new:hover {background-position: -107px -50px;}
213-.footbar > ul > li.new_disabled {
216+.footbar > span.new {background-position: -107px 0;}
217+.footbar > span.new:hover {background-position: -107px -50px;}
218+.footbar > span.new_disabled {
214219 background-position: -107px 0;
215220 opacity:0.2;
216221 }
217-.footbar>ul>li.res {background-position: -160px 0;}
218-.footbar>ul>li.res:hover {background-position: -160px -50px;}
219-.footbar>ul>li.other {background-position: -212px 0;}
220-.footbar>ul>li.other:hover {background-position: -212px -50px;}
221-.footbar>ul>li.next {background-position: -264px 0;}
222-.footbar>ul>li.next:hover {background-position: -264px -50px;}
223-.footbar > ul > li.next_disabled {
222+.footbar > span.res {background-position: -160px 0;}
223+.footbar > span.res:hover {background-position: -160px -50px;}
224+.footbar > span.other {background-position: -212px 0;}
225+.footbar > span.other:hover {background-position: -212px -50px;}
226+.footbar > span.next {background-position: -264px 0;}
227+.footbar > span.next:hover {background-position: -264px -50px;}
228+.footbar > span.next_disabled {
224229 background-position: -264px 0;
225230 opacity:0.2;
226231 }
227-.footbar > ul > li.delelog {background-position: -318px 0;}
228-.footbar > ul > li.delelog_disabled {
232+.footbar > span.delelog {background-position: -318px 0;}
233+.footbar > span.delelog_disabled {
229234 background-position: -318px 0;
230235 opacity:0.2;
231236 }
@@ -232,12 +237,12 @@
232237
233238
234239 /* スレ一覧のフットメニュー スレ立て */
235-.footbar > ul > li.build {background-position: -422px 0;}
236-.footbar > ul > li.build:hover {background-position: -422px -50px;}
240+.footbar > span.build {background-position: -422px 0;}
241+.footbar > span.build:hover {background-position: -422px -50px;}
237242
238243 /* 新着まとめ読み */
239-.footbar > ul > li.matome {background-position: -475px 0;}
240-.footbar > ul > li.matome:hover {background-position: -475px -50px;}
244+.footbar > span.matome {background-position: -475px 0;}
245+.footbar > span.matome:hover {background-position: -475px -50px;}
241246
242247 /* フッタツール その他のメニューポップアップ */
243248 #footbarEtc {
@@ -283,7 +288,7 @@
283288
284289 /* ユーザ設定編集 */
285290 body#edit_conf_user {
286- background: url(pinstripes.png);
291+ background: #ddd; /* url(pinstripes.png); */
287292 }
288293
289294 body#edit_conf_user div.edit_conf_user {
--- p2/trunk/iui/iui.css (revision 972)
+++ p2/trunk/iui/iui.css (revision 973)
@@ -63,10 +63,10 @@
6363 -moz-box-sizing: border-box;
6464 -webkit-box-sizing: border-box;
6565 border-bottom: 1px solid #2d3642;
66- border-top: 1px solid #000000;/*初期値 #6d84a2*/
66+ border-top: 1px solid #000000; /* 初期値 #6d84a2 */
6767 padding: 6px;
6868 height: 45px;
69- background: url(toolbar.png) #6d84a2 repeat-x;
69+ background: #222; /* url(toolbar.png) #6d84a2 repeat-x; */
7070 }
7171
7272
@@ -198,44 +198,6 @@
198198
199199 /************************************************************************************************/
200200
201-body > .dialog {
202- top: 0;
203- width: 100%;
204- min-height: 417px;
205- z-index: 2;
206- background: rgba(0, 0, 0, 0.8);
207- padding: 0;
208- text-align: right;
209-}
210-
211-.dialog > fieldset {
212- box-sizing: border-box;
213- -webkit-box-sizing: border-box;
214- width: 100%;
215- margin: 0;
216- border: none;
217- border-top: 1px solid #6d84a2;
218- padding: 10px 6px;
219- background: url(toolbar.png) #7388a5 repeat-x;
220-}
221-
222-.dialog > fieldset > h1 {
223- margin: 0 10px 0 10px;
224- padding: 0;
225- font-size: 20px;
226- font-weight: bold;
227- color: #FFFFFF;
228- text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
229- text-align: center;
230-}
231-
232-.dialog > fieldset > label {
233- position: absolute;
234- margin: 16px 0 0 6px;
235- font-size: 14px;
236- color: #999999;
237-}
238-
239201 input {
240202 box-sizing: border-box;
241203 -webkit-box-sizing: border-box;
@@ -253,7 +215,7 @@
253215 box-sizing: border-box;
254216 -webkit-box-sizing: border-box;
255217 padding: 10px;
256- background: #c8c8c8 url(pinstripes.png);
218+ background: #ddd; /* #c8c8c8 url(pinstripes.png); */
257219 }
258220
259221
--- p2/trunk/menu_i.php (revision 972)
+++ p2/trunk/menu_i.php (revision 973)
@@ -183,7 +183,7 @@
183183 } else {
184184 $ptitle = 'rep2iPhone'; // 'ユビキタスp2';
185185 if (UA::isAndroidWebKit()) {
186- $ptitle = 'rep2Android(仮)';
186+ $ptitle = 'rep2Android';
187187 }
188188 }
189189 return $ptitle;
--- p2/trunk/title.php (revision 972)
+++ p2/trunk/title.php (revision 973)
@@ -117,7 +117,7 @@
117117 <?php echo $newversion_found_html; ?>
118118
119119 <table border="0" cellspacing="0" cellpadding="0"><tr><td>
120- <img src="img/rep2.gif" alt="rep2" width="119" height="63">
120+ <img src="img/rep2.gif?140123" alt="rep2" width="120" height="63">
121121 </td><td style="padding-left:30px;">
122122
123123 <p>rep2 version <?php eh($_conf['p2version']); ?>  <a href="<?php eh($p2web_url_r); ?>" target="_blank"><?php eh($_conf['p2web_url']); ?></a></p>
--- p2/trunk/edit_conf_user.php (revision 972)
+++ p2/trunk/edit_conf_user.php (revision 973)
@@ -157,7 +157,7 @@
157157 P2Util::printInfoHtml();
158158
159159 ?>
160-<form method="POST" action="<?php eh($_SERVER['SCRIPT_NAME']); ?>" target="_self">
160+<form method="POST" action="<?php eh($_SERVER['SCRIPT_NAME']); ?>" target="_self" autocomplete="off">
161161 <input type="hidden" name="csrfid" value="<?php eh($csrfid); ?>">
162162 <?php echo P2View::getInputHiddenKTag(); ?>
163163 <?php
@@ -318,9 +318,10 @@
318318 echo getEditConfHtml('rct_rec_num', '最近読んだスレの記録数');
319319 echo getEditConfHtml('res_hist_rec_num', '書き込み履歴の記録数');
320320 echo getEditConfHtml('res_write_rec', '書き込み内容ログを記録');
321-echo getEditConfHtml('through_ime', '外部URLジャンプする際に通すクッションページ');
322-echo getEditConfHtml('through_ime_k', '携帯閲覧時、外部URLクッションを利用(※利用を推奨)');//.(※Cookie無効時は、セキュリティ上の理由からこの設定値に関わらずクッションが利用されます)');
323-echo getEditConfHtml('k_jig_host', '携帯閲覧時、外部URLクッションでjigブラウザWEBを利用する<br>
321+$add_force_through_ime_ht = $_conf['force_through_ime_if_urlsid'] ? '(※クッキー無効時は強制適用)' : '';
322+echo getEditConfHtml('through_ime', '外部URLジャンプする際に通すクッションページ' . $add_force_through_ime_ht);
323+echo getEditConfHtml('through_ime_k', '携帯閲覧時、外部URLクッションページを利用' . $add_force_through_ime_ht);
324+echo getEditConfHtml('k_jig_host', '携帯閲覧時、外部URLクッションページでjigブラウザWEBを利用する<br>
324325 (ホスト名。「http://<font color="red">XXXXXX</font>.jig.jp/fweb/?_jig_=」の <font color="red">XXXXXX</font> 部分)');
325326 echo getEditConfHtml('enable_menu_new', '板メニューに新着数を表示');
326327 echo getEditConfHtml('menu_refresh_time', '板メニュー部分の自動更新間隔 (分指定。0なら自動更新しない。)');
Show on old repository browser