svnno****@sourc*****
svnno****@sourc*****
2011年 6月 27日 (月) 18:39:25 JST
Revision: 917
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=917
Author: akid
Date: 2011-06-27 18:39:25 +0900 (Mon, 27 Jun 2011)
Log Message:
-----------
p2/ for version 1.8.69
Modified Paths:
--------------
p2/trunk/conf/conf_admin.inc.php
p2/trunk/conf/conf_system.inc.php
p2/trunk/conf/conf_user_style.inc.php
p2/trunk/doc/ChangeLog.txt
p2/trunk/iphone/ShowThreadK.php
p2/trunk/iphone/index_print_k.inc.php
p2/trunk/iphone/js/smartpopup.iPhone.js
p2/trunk/iphone/read_footer_k.inc.php
p2/trunk/iphone/read_header_k.inc.php
p2/trunk/iphone/sb_header_k.inc.php
p2/trunk/iui/read.css
p2/trunk/js/smartpopup.js
p2/trunk/lib/HostCheck.php
p2/trunk/lib/Login.php
p2/trunk/lib/P2Util.php
p2/trunk/lib/ShowThreadK.php
p2/trunk/lib/ShowThreadPc.php
p2/trunk/lib/index_print_k.inc.php
p2/trunk/lib/read_header.inc.php
p2/trunk/lib/sb_footer.inc.php
p2/trunk/lib/sb_header.inc.php
p2/trunk/lib/sb_header_k.inc.php
p2/trunk/lib/sb_print.inc.php
p2/trunk/lib/sb_print_k.func.php
p2/trunk/read.php
p2/trunk/read_filter.php
p2/trunk/read_filter_i.php
p2/trunk/read_filter_k.php
p2/trunk/setting.php
p2/trunk/title.php
Removed Paths:
-------------
p2/trunk/iphone/conf_user_style.inc.php
-------------- next part --------------
Modified: p2/trunk/conf/conf_admin.inc.php
===================================================================
--- p2/trunk/conf/conf_admin.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/conf/conf_admin.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -89,7 +89,7 @@
$_conf['login_log_rec_num'] = 200; // (200) ƒƒOƒCƒ“ƒƒO‚Ì‹L˜^”
$_conf['last_login_log_show'] = 1; // (1) ‘O‰ñƒƒOƒCƒ“î•ñ‚ð•\Ž¦i‚·‚é:1, ‚µ‚È‚¢:0j
-$_conf['cid_expire_day'] = 30; // (30) Cookie ID‚Ì—LŒøŠúŒÀ“ú”
+$_conf['cid_expire_day'] = 60; // (60) Cookie ID‚Ì—LŒøŠúŒÀ“ú”
$_conf['ngaborn_data_limit'] = 0; // (0) NG‚ ‚Ú[‚ñ‚É“o˜^‚Å‚«‚é”i0‚Ȃ秌À‚È‚µj
Modified: p2/trunk/conf/conf_system.inc.php
===================================================================
--- p2/trunk/conf/conf_system.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/conf/conf_system.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -3,7 +3,7 @@
// ‚±‚̃tƒ@ƒCƒ‹‚ÍA“Á‚É——R‚Ì–³‚¢ŒÀ‚è•ÏX‚µ‚È‚¢‚ʼnº‚³‚¢B
// include from conf.inc.php
-$_conf['p2version'] = '1.8.68'; // rep2‚̃o[ƒWƒ‡ƒ“
+$_conf['p2version'] = '1.8.69'; // rep2‚̃o[ƒWƒ‡ƒ“
$_conf['p2name'] = 'rep2'; // rep2‚Ì–¼‘OB
@@ -99,7 +99,7 @@
// 2010/06/09 cookie‚ÉbŽw’è‚ðƒZƒbƒg‚µ‚Ä‚Ý‚é
if ($v = UA::getQueryValue()) {
- P2Util::setCookie(UA::getQueryKey(), $v, 0);
+ P2Util::setCookie(UA::getQueryKey(), $v);
}
// output_add_rewrite_var() ‚Í•Ö—˜‚¾‚ªAo—Í‚ªƒoƒbƒtƒ@‚³‚ê‚Ä‘ÌŠ´‘¬“x‚ª—Ž‚¿‚é‚Ì‚ª“ï“_BB
Modified: p2/trunk/conf/conf_user_style.inc.php
===================================================================
--- p2/trunk/conf/conf_user_style.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/conf/conf_user_style.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -6,7 +6,7 @@
Ý’è‚Í style/*_css.inc ‚ƘA“®
‚±‚̃tƒ@ƒCƒ‹“à‚Å‚ÌÝ’è‚ÍA‚¨D‚݂ɉž‚¶‚Ä•ÏX‚µ‚Ä‚‚¾‚³‚¢
- iPhone‚̃XƒŒ•\Ž¦‚ÌÝ’è‚ÍAiui/read.css‚ð’¼Ú•ÒW
+ iPhone‚ÌCSSÝ’è‚ÍAiui/iui.cssAiui/read.css‚ð’¼Ú•ÒW
*/
// _setStyle()
@@ -179,6 +179,12 @@
$STYLE['respop_b_color'] = "black"; // ("black") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃{[ƒ_[F
$STYLE['respop_b_style'] = "solid"; // ("solid") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃{[ƒ_[Œ`Ž®
+if (UA::isIPhoneGroup()) {
+ $STYLE['respop_color'] = "#FFFFFF"; // ("#000") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃eƒLƒXƒgF
+ $STYLE['respop_bgcolor'] = ""; // ("#ffffcc") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì”wŒiF
+ $STYLE['respop_fontsize'] = '13px';
+}
+
$STYLE['info_pop_size'] = "600,430"; // ("600,400") î•ñƒ|ƒbƒvƒAƒbƒvƒEƒBƒ“ƒhƒE‚Ì‘å‚«‚³i‰¡,cj
Modified: p2/trunk/doc/ChangeLog.txt
===================================================================
--- p2/trunk/doc/ChangeLog.txt 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/doc/ChangeLog.txt 2011-06-27 09:39:25 UTC (rev 917)
@@ -1,3 +1,13 @@
+2011/06/27
+ * rep2 version 1.8.69
+
+ [C³] iPhone—p•\Ž¦‚ðAndroid‚ÅŒ©‚½‚Æ‚«AuŽŸXXvƒ{ƒ^ƒ“‚Ìdisabledó‘Ô‚ª”¼“§–¾•\Ž¦‚É‚È‚Á‚Ä‚¢‚È‚©‚Á‚½‚Ì‚ðC³‚µ‚½B
+ [XV] spmodeƒXƒŒˆê——‚ÅŠù“¾ó‘Ô‚Å‚È‚¢ê‡‚ÌV’…”•\Ž¦‚Íu*vƒ}[ƒN‚Æ‚µAƒNƒŠƒbƒN‚·‚邱‚Æ‚Å‹L˜^‚ð휂ł«‚é‚悤‚É‚µ‚½B
+ [XV] iPhone—p•\Ž¦‚̃gƒbƒvƒy[ƒW‰º•”‚Éu2ch‚̃XƒŒURL‚ð’¼ÚŽw’èv‚·‚邽‚߂̃tƒH[ƒ€‚ð’ljÁ‚µ‚½B
+ [XV] ŠeŽíƒfƒoƒCƒX‚̃ƒOƒCƒ“—pURL‚Ì•\Ž¦‚ð’ljÁ‚µ‚½B
+ [XV] Œg‘Ñ‚Ì‚¨‹C‚ɔ•ÒW‚Ì•\Ž¦Œ”‚ð—}§‚µ‚½B
+ [XV] Œg‘Ñ‚ÌIPƒAƒhƒŒƒX‘шæ‚ðXV‚µ‚½B
+
2011/3/29
* rep2 version 1.8.68
Modified: p2/trunk/iphone/ShowThreadK.php
===================================================================
--- p2/trunk/iphone/ShowThreadK.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/iphone/ShowThreadK.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -161,7 +161,7 @@
$date_id = $resar[2];
$msg = $resar[3];
- // ƒfƒtƒHƒ‹ƒg‚Ì–¼‘O‚ÍANGE‚ ‚Ú[‚ñ‚ƃtƒBƒ‹ƒ^ŒŸõ‚Ì‘ÎÛŠO‚Æ‚·‚é
+ // ƒfƒtƒHƒ‹ƒg‚Ì–¼‘O‚ÍANGE‚ ‚Ú[‚ñ‚ƃŒƒXŒŸõ‚Ì‘ÎÛŠO‚Æ‚·‚é
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
if (!$_conf['k_bbs_noname_name']) {
@@ -482,7 +482,7 @@
$date_id = isset($resar[2]) ? $resar[2] : '';
$msg = isset($resar[3]) ? $resar[3] : '';
- // ƒfƒtƒHƒ‹ƒg‚Ì–¼‘O‚ÍANGE‚ ‚Ú[‚ñ‚ƃtƒBƒ‹ƒ^ŒŸõ‚Ì‘ÎÛŠO‚Æ‚·‚é
+ // ƒfƒtƒHƒ‹ƒg‚Ì–¼‘O‚ÍANGE‚ ‚Ú[‚ñ‚ƃŒƒXŒŸõ‚Ì‘ÎÛŠO‚Æ‚·‚é
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
if (!$_conf['k_bbs_noname_name']) {
@@ -507,6 +507,7 @@
$date_id = preg_replace('/(\d\d:\d\d):\d\d(\.\d\d)?/', '$1', $date_id);
}
+ $no_trim_id_flag = false;
// ‚ ‚Ú[‚ñƒ`ƒFƒbƒN
if (false !== $this->checkAborns($nameForAborn, $mail, $date_id, $msg)) {
Deleted: p2/trunk/iphone/conf_user_style.inc.php
===================================================================
--- p2/trunk/iphone/conf_user_style.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/iphone/conf_user_style.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -1,164 +0,0 @@
-<?php
-/*
- rep2 - ƒfƒUƒCƒ“—p Ý’èƒtƒ@ƒCƒ‹
-
- ƒRƒƒ“ƒg–`“ª‚Ì() “à‚̓fƒtƒHƒ‹ƒg’l
- Ý’è‚Í style/*_css.inc ‚ƘA“®
-
- ‚±‚̃tƒ@ƒCƒ‹‚ÌÝ’è‚ÍA‚¨D‚݂ɉž‚¶‚Ä•ÏX‚µ‚Ä‚‚¾‚³‚¢
-*/
-
-//======================================================================
-// ƒfƒUƒCƒ“ƒJƒXƒ^ƒ}ƒCƒY
-//======================================================================
-
-$STYLE['a_underline_none'] = "2"; // ("2") ƒŠƒ“ƒN‚ɉºü‚ði‚‚¯‚é:0, ‚‚¯‚È‚¢:1, ƒXƒŒƒ^ƒCƒgƒ‹ˆê——‚¾‚¯‚‚¯‚È‚¢:2j
-
-// ƒtƒHƒ“ƒg ======================================================
-
-if (strstr($_SERVER['HTTP_USER_AGENT'], "Mac")) {
-
- // Safari“™‚Ì WebKit‚ðŽg‚Á‚Ä‚¢‚é‚à‚Ì‚È‚ç
- if (strstr($_SERVER['HTTP_USER_AGENT'], "AppleWebKit")) {
- $STYLE['fontfamily'] = "Hiragino Kaku Gothic Pro"; // ("Hiragino Kaku Gothic Pro") Šî–{‚̃tƒHƒ“ƒg
- $STYLE['fontfamily_bold'] = ""; // ("") Šî–{ƒ{[ƒ‹ƒh—pƒtƒHƒ“ƒg
- } else {
- $STYLE['fontfamily'] = "ƒqƒ‰ƒMƒmŠpƒS Pro W3"; // ("ƒqƒ‰ƒMƒmŠpƒS Pro W3") Šî–{‚̃tƒHƒ“ƒg
- $STYLE['fontfamily_bold'] = "ƒqƒ‰ƒMƒmŠpƒS Pro W6"; // ("ƒqƒ‰ƒMƒmŠpƒS Pro W6") Šî–{ƒ{[ƒ‹ƒh—pƒtƒHƒ“ƒgi•’Ê‚É‘¾Žš‚É‚µ‚½‚¢ê‡‚ÍŽw’肵‚È‚¢("")j
- }
-
- // Mac—pƒtƒHƒ“ƒgƒTƒCƒY
- $STYLE['fontsize'] = "12px"; // ("") Šî–{ƒtƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['menu_fontsize'] = "11px"; // ("10pt") ”ƒƒjƒ…[‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['sb_fontsize'] = "11px"; // ("10pt") ƒXƒŒˆê——‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['read_fontsize'] = "12px"; // ("") ƒXƒŒƒbƒh“à—e•\Ž¦‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['respop_fontsize'] = "11px"; // ("10pt") ˆø—pƒŒƒXƒ|ƒbƒvƒAƒbƒv•\Ž¦‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['infowin_fontsize'] = "11px"; // ("10pt") î•ñƒEƒBƒ“ƒhƒE‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['form_fontsize'] = "11px"; // ("10pt") input, option, select ‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³iCamino‚ðœ‚j
-
-} else {
-
- // MacˆÈŠO‚̃tƒHƒ“ƒgƒTƒCƒY
- $STYLE['fontsize'] = "12px"; // ("") Šî–{ƒtƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['menu_fontsize'] = "12px"; // ("10pt") ”ƒƒjƒ…[‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['sb_fontsize'] = "12px"; // ("10pt") ƒXƒŒˆê——‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['read_fontsize'] = "13px"; // ("") ƒXƒŒƒbƒh“à—e•\Ž¦‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['respop_fontsize'] = "12px"; // ("10pt") ˆø—pƒŒƒXƒ|ƒbƒvƒAƒbƒv•\Ž¦‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['infowin_fontsize'] = "12px"; // ("10pt") î•ñƒEƒBƒ“ƒhƒE‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
- $STYLE['form_fontsize'] = "12px"; // ("10pt") input, option, select ‚̃tƒHƒ“ƒg‚Ì‘å‚«‚³
-}
-
-//======================================================================
-// FÊ‚ÌÝ’è
-//======================================================================
-// –³Žw’è("")‚̓uƒ‰ƒEƒU‚̃fƒtƒHƒ‹ƒgFA‚Ü‚½‚ÍŠî–{Žw’è‚Æ‚È‚è‚Ü‚·B
-// —Dæ“x‚ÍAŒÂ•Êƒy[ƒWŽw’è ¨ Šî–{Žw’è ¨ Žg—pƒuƒ‰ƒEƒU‚̃fƒtƒHƒ‹ƒgŽw’è ‚Å‚·B
-
-// Šî–{(style)=======================
-$STYLE['bgcolor'] = "#ffffff"; // ("#ffffff") Šî–{ ”wŒiF
-$STYLE['textcolor'] = "#000"; // ("#000") Šî–{ ƒeƒLƒXƒgF
-$STYLE['acolor'] = ""; // ("") Šî–{ ƒŠƒ“ƒNF
-$STYLE['acolor_v'] = ""; // ("") Šî–{ –K–âς݃Šƒ“ƒNFB
-$STYLE['acolor_h'] = "#09c"; // ("#09c") Šî–{ ƒ}ƒEƒXƒI[ƒo[Žž‚̃Šƒ“ƒNF
-
-$STYLE['fav_color'] = "#999"; // ("#999") ‚¨‹C‚Ƀ}[ƒN‚ÌF
-
-// ƒƒjƒ…[(menu)====================
-$STYLE['menu_bgcolor'] = "#fff"; //("#fff") menu ”wŒiF
-$STYLE['menu_background'] = ''; // ('') menu ”wŒi‰æ‘œ
-$STYLE['menu_color'] = "#000"; //("#000") menu ƒeƒLƒXƒgF
-$STYLE['menu_cate_color'] = "#333"; // ("#333") menu ƒJƒeƒSƒŠ[‚ÌF
-
-$STYLE['menu_acolor_h'] = "#09c"; // ("#09c") menu ƒ}ƒEƒXƒI[ƒo[Žž‚̃Šƒ“ƒNF
-
-$STYLE['menu_ita_color'] = ""; // ("") menu ” ƒŠƒ“ƒNF
-$STYLE['menu_ita_color_v'] = ""; // ("") menu ” –K–âς݃Šƒ“ƒNF
-$STYLE['menu_ita_color_h'] = "#09c"; // ("#09c") menu ” ƒ}ƒEƒXƒI[ƒo[Žž‚̃Šƒ“ƒNF
-
-$STYLE['menu_newthre_color'] = "hotpink"; // ("hotpink") menu V‹KƒXƒŒƒbƒh”‚ÌF
-$STYLE['menu_newres_color'] = "#ff3300"; // ("#ff3300") menu V’…ƒŒƒX”‚ÌF
-
-// ƒXƒŒˆê——(subject)====================
-$STYLE['sb_bgcolor'] = "#fff"; // ("#fff") subject ”wŒiF
-$STYLE['sb_color'] = "#000"; // ("#000") subject ƒeƒLƒXƒgF
-
-$STYLE['sb_acolor'] = "#000"; // ("#000") subject ƒŠƒ“ƒNF
-$STYLE['sb_acolor_v'] = "#000"; // ("#000") subject –K–âς݃Šƒ“ƒNF
-$STYLE['sb_acolor_h'] = "#09c"; // ("#09c") subject ƒ}ƒEƒXƒI[ƒo[Žž‚̃Šƒ“ƒNF
-
-$STYLE['sb_th_bgcolor'] = "#d6e7ff"; // ("#d6e7ff") subject ƒe[ƒuƒ‹ƒwƒbƒ_”wŒiF
-$STYLE['sb_tbgcolor'] = "#fff"; // ("#fff") subject ƒe[ƒuƒ‹“à”wŒiF0
-$STYLE['sb_tbgcolor1'] = "#eef"; // ("#eef") subject ƒe[ƒuƒ‹“à”wŒiF1
-
-$STYLE['sb_ttcolor'] = "#333"; // ("#333") subject ƒe[ƒuƒ‹“à ƒeƒLƒXƒgF
-$STYLE['sb_tacolor'] = "#000"; // ("#000") subject ƒe[ƒuƒ‹“à ƒŠƒ“ƒNF
-$STYLE['sb_tacolor_h'] = "#09c"; // ("#09c")subject ƒe[ƒuƒ‹“à ƒ}ƒEƒXƒI[ƒo[Žž‚̃Šƒ“ƒNF
-
-$STYLE['sb_order_color'] = "#111"; // ("#111") ƒXƒŒˆê——‚̔Ԇ ƒŠƒ“ƒNF
-
-$STYLE['thre_title_color'] = "#000"; // ("#000") subject ƒXƒŒƒ^ƒCƒgƒ‹ ƒŠƒ“ƒNF
-$STYLE['thre_title_color_v'] = "#999"; // ("#999") subject ƒXƒŒƒ^ƒCƒgƒ‹ –K–âς݃Šƒ“ƒNF
-$STYLE['thre_title_color_h'] = "#09c"; // ("#09c") subject ƒXƒŒƒ^ƒCƒgƒ‹ ƒ}ƒEƒXƒI[ƒo[Žž‚̃Šƒ“ƒNF
-
-$STYLE['sb_tool_bgcolor'] = "#8cb5ff"; // ("#8cb5ff") subject ƒc[ƒ‹ƒo[‚Ì”wŒiF
-$STYLE['sb_tool_border_color'] = "#6393ef"; // ("#6393ef") subject ƒc[ƒ‹ƒo[‚̃{[ƒ_[F
-$STYLE['sb_tool_color'] = "#d6e7ff"; // ("#d6e7ff") subject ƒc[ƒ‹ƒo[“à •¶ŽšF
-$STYLE['sb_tool_acolor'] = "#d6e7ff"; // ("#d6e7ff") subject ƒc[ƒ‹ƒo[“à ƒŠƒ“ƒNF
-$STYLE['sb_tool_acolor_v'] = "#d6e7ff"; // ("#d6e7ff") subject ƒc[ƒ‹ƒo[“à –K–âς݃Šƒ“ƒNF
-$STYLE['sb_tool_acolor_h'] = "#fff"; // ("#fff") subject ƒc[ƒ‹ƒo[“à ƒ}ƒEƒXƒI[ƒo[Žž‚̃Šƒ“ƒNF
-$STYLE['sb_tool_sepa_color'] = "#000"; // ("#000") subject ƒc[ƒ‹ƒo[“à ƒZƒpƒŒ[ƒ^•¶ŽšF
-
-$STYLE['sb_now_sort_color'] = "#1144aa"; // ("#1144aa") subject Œ»Ý‚̃\[ƒgF
-
-$STYLE['sb_thre_title_new_color'] = "red"; // ("red") subject V‹KƒXƒŒƒ^ƒCƒgƒ‹‚ÌF
-
-$STYLE['sb_tool_newres_color'] = "#ff3300"; // ("#ff3300") subject ƒc[ƒ‹ƒo[“à V‹KƒŒƒX”‚ÌF
-$STYLE['sb_newres_color'] = "#ff3300"; // ("#ff3300") subject V’…ƒŒƒX”‚ÌF
-
-// ƒXƒŒ“à—e(read)====================
-$STYLE['read_bgcolor'] = "#efefef"; // ("#efefef") ƒXƒŒƒbƒh•\Ž¦‚Ì”wŒiF
-$STYLE['read_color'] = "#000"; // ("#000") ƒXƒŒƒbƒh•\Ž¦‚̃eƒLƒXƒgF
-
-$STYLE['read_acolor'] = ""; // ("") ƒXƒŒƒbƒh•\Ž¦ ƒŠƒ“ƒNF
-$STYLE['read_acolor_v'] = ""; // ("") ƒXƒŒƒbƒh•\Ž¦ –K–âς݃Šƒ“ƒNF
-$STYLE['read_acolor_h'] = "#09c"; // ("#09c") ƒXƒŒƒbƒh•\Ž¦ ƒ}ƒEƒXƒI[ƒo[Žž‚̃Šƒ“ƒNF
-
-$STYLE['read_newres_color'] = "#ff3300"; // ("#ff3300") V’…ƒŒƒX”Ô‚ÌF
-
-$STYLE['read_thread_title_color'] = "#f40"; // ("#f40") ƒXƒŒƒbƒhƒ^ƒCƒgƒ‹F
-$STYLE['read_name_color'] = "#1144aa"; // ("#1144aa") “ŠeŽÒ‚Ì–¼‘O‚ÌF
-$STYLE['read_mail_color'] = ""; // ("") “ŠeŽÒ‚Ìmail‚ÌF ex)"#a00000"
-$STYLE['read_mail_sage_color'] = ""; // ("") sage‚ÌŽž‚Ì“ŠeŽÒ‚Ìmail‚ÌF ex)"#00b000"
-$STYLE['read_ngword'] = "#bbbbbb"; // ("#bbbbbb") NGƒ[ƒh‚ÌF
-
-// Œg‘Ñ—p
-$STYLE['read_k_thread_title_color'] = "#3366CC"; // ("#1144aa") ƒXƒŒƒbƒhƒ^ƒCƒgƒ‹F
-$STYLE['read_k_bgcolor'] = "#efefef"; // ("#efefef") ƒXƒŒƒbƒh•\Ž¦‚Ì”wŒiF
-$STYLE['read_k_color'] = "#000000"; // ("#222222") ƒXƒŒƒbƒh•\Ž¦‚̃eƒLƒXƒgF
-
-// ƒŒƒX‘‚«ž‚݃tƒH[ƒ€
-$STYLE['post_pop_size'] = "620,360"; // ("620,360") ƒŒƒX‘‚«ž‚݃|ƒbƒvƒAƒbƒvƒEƒBƒ“ƒhƒE‚Ì‘å‚«‚³i‰¡,cj
-$STYLE['post_msg_rows'] = 10; // (10) ƒŒƒX‘‚«ž‚݃tƒH[ƒ€AƒƒbƒZ[ƒWƒtƒB[ƒ‹ƒh‚Ìs”
-$STYLE['post_msg_cols'] = 70; // (70) ƒŒƒX‘‚«ž‚݃tƒH[ƒ€AƒƒbƒZ[ƒWƒtƒB[ƒ‹ƒh‚ÌŒ…”
-
-// ƒŒƒXƒ|ƒbƒvƒAƒbƒv
-$STYLE['respop_color'] = "#000"; // ("#000") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃eƒLƒXƒgF
-$STYLE['respop_bgcolor'] = "#ffffcc"; // ("#ffffcc") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì”wŒiF
-$STYLE['respop_background'] = ""; // ("") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì”wŒi‰æ‘œ
-$STYLE['respop_b_width'] = "1px"; // ("1px") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃{[ƒ_[•
-$STYLE['respop_b_color'] = "black"; // ("black") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃{[ƒ_[F
-$STYLE['respop_b_style'] = "solid"; // ("solid") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃{[ƒ_[Œ`Ž®
-
-$STYLE['info_pop_size'] = "600,430"; // ("600,400") î•ñƒ|ƒbƒvƒAƒbƒvƒEƒBƒ“ƒhƒE‚Ì‘å‚«‚³i‰¡,cj
-
-
-/*
- * 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/index_print_k.inc.php
===================================================================
--- p2/trunk/iphone/index_print_k.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/iphone/index_print_k.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -67,6 +67,14 @@
$body_at = P2View::getBodyAttrK();
$hr = P2View::getHrHtmlK();
+ $urlform_onClick_ht = <<<EOP
+var url_v = document.forms['urlform'].elements['url_text'].value;
+if (url_v == '') {
+ alert('Œ©‚½‚¢ƒXƒŒƒbƒh‚ÌURL‚ð“ü—Í‚µ‚ĉº‚³‚¢B —áFhttp://hibari.2ch.net/test/read.cgi/software/1306160232/');
+ return false;
+}
+EOP;
+
//=========================================================
// Œg‘Ñ—p HTMLo—Í
//=========================================================
@@ -104,8 +112,16 @@
}
?>
-<li class="group">ŒŸõ</li>
+<li class="group">ƒXƒŒƒ^ƒC/”ÂŒŸõ</li>
<?php echo $search_form_htm; ?>
+
+<li class="group">2ch‚̃XƒŒURL‚ð’¼ÚŽw’è</li>
+<form id="urlform" method="GET" action="<?php eh($_conf['read_php']); ?>">
+ <input id="url_text" type="text" value="" name="url" placeholder="http://hibari.2ch.net/test/read.cgi/software/1306160232/">
+ <?php echo P2View::getInputHiddenKTag(); ?>
+ <input type="submit" name="btnG" value="•\Ž¦" onClick="<?php echo $urlform_onClick_ht; ?>">
+</form>
+
</ul>
<br>
</body>
Modified: p2/trunk/iphone/js/smartpopup.iPhone.js
===================================================================
--- p2/trunk/iphone/js/smartpopup.iPhone.js 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/iphone/js/smartpopup.iPhone.js 2011-06-27 09:39:25 UTC (rev 917)
@@ -67,7 +67,7 @@
/*
//ƒtƒBƒ‹ƒ^ƒŠƒ“ƒO
if (aThread.spmOption['enable_fl_on_spm']) {
- document.writeln("<a href=\"javascript:void(0);\"" + makeOnPopUp(thread_id+"_fl", true) + ">ƒtƒBƒ‹ƒ^•\Ž¦</a>");
+ document.writeln("<a href=\"javascript:void(0);\"" + makeOnPopUp(thread_id+"_fl", true) + ">ƒŒƒXŒŸõ</a>");
}
*/
@@ -75,7 +75,7 @@
document.writeln('<span id="' + thread_id + '_iphone_res"></span>');
document.writeln('<span id="' + thread_id + '_iphone_quoteres"></span>');
- // “¯‚¶–¼‘O‚ðƒtƒBƒ‹ƒ^•\Ž¦
+ // “¯‚¶–¼‘O‚ðƒŒƒXŒŸõ
document.writeln('<a id="' + thread_id + '_same_name" href="#" target="' + spmTarget + '">“¯‚¶–¼‘O</a>');
// ‹tŽQÆ
Modified: p2/trunk/iphone/read_footer_k.inc.php
===================================================================
--- p2/trunk/iphone/read_footer_k.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/iphone/read_footer_k.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -67,13 +67,12 @@
$index_uri = UriUtil::buildQueryUri('index.php', array(UA::getQueryKey() => UA::getQueryValue()));
- $goto_select_ht = _csrangeform(isset($GLOBALS['word']) ? $last_hit_resnum : $aThread->resrange['to'], $aThread)
- . $goto_select_ht . '</form>';
+ $goto_select_ht = _csrangeform(isset($GLOBALS['word']) ? $last_hit_resnum : $aThread->resrange['to'], $aThread);
?>
<?php echo $toolbar_back_board_ht; ?>
<div class="footform">
<a id="footer" name="footer"></a>
-<?php echo $goto_select_ht; ?>
+<?php echo $goto_select_ht, $goto_next_ht; ?>
</div>
<div id="footbar01">
<div class="footbar">
@@ -91,7 +90,7 @@
<div id="footbar02" class="dialog_other">
<filedset>
<ul>
- <li class="whiteButton" id="serchId" title="off" onclick="popUpFootbarFormIPhone(0); all.item('footbar02').style.visibility='hidden'">ƒtƒBƒ‹ƒ^ŒŸõ</li>
+ <li class="whiteButton" id="serchId" title="off" onclick="popUpFootbarFormIPhone(0); all.item('footbar02').style.visibility='hidden'">ƒŒƒXŒŸõ</li>
<?php echo $toolbar_right_ht; ?>
<li class="grayButton" onclick="all.item('footbar02').style.visibility='hidden'">ƒLƒƒƒ“ƒZƒ‹</li>
</ul>
@@ -339,7 +338,7 @@
<label>Word:</label>
<input id="word" name="word" type="text" value="">
<br>
- <input type="submit" id="s2" name="s2" value="ƒtƒBƒ‹ƒ^•\Ž¦" onclick="popUpFootbarFormIPhone(0, 1)"><br><br>
+ <input type="submit" id="s2" name="s2" value="ƒŒƒXŒŸõ" onclick="popUpFootbarFormIPhone(0, 1)"><br><br>
<input type="hidden" name="detect_hint" value="ž">
<input type="hidden" name="bbs" value="{$aThread->bbs}">
Modified: p2/trunk/iphone/read_header_k.inc.php
===================================================================
--- p2/trunk/iphone/read_header_k.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/iphone/read_header_k.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -152,6 +152,7 @@
$after_rnum = $aThread->resrange['to'] + $rnum_range;
+$goto_next_ht = '';
if (!$read_navi_next_isInvisible) {
$url = UriUtil::buildQueryUri($_conf['read_php'],
array_merge(
@@ -166,15 +167,14 @@
);
// ‘å‚«‚ÈŽŸ>ƒ{ƒ^ƒ“
- // disabled‚Ìê‡A‚È‚º‚©ŠÔ‚ðŠJ‚¯‚ç‚ê‚È‚¢
- $goto_select_ht .= sprintf('<form style="margin-left: 1px; display:inline;" action="%s">', hs($_conf['read_php']));
+ $goto_next_ht = sprintf('<form style="margin-left: 1px; display:inline;" action="%s">', hs($_conf['read_php']));
if (!$read_navi_next_isInvisible) {
- $goto_select_ht .= sprintf('<input type="hidden" name="host" value="%s">', hs($aThread->host));
- $goto_select_ht .= sprintf('<input type="hidden" name="bbs" value="%s">', hs($aThread->bbs));
- $goto_select_ht .= sprintf('<input type="hidden" name="key" value="%s">', hs($aThread->key));
- $goto_select_ht .= sprintf('<input type="hidden" name="offline" value="%s">', 1);
- $goto_select_ht .= sprintf('<input type="hidden" name="nt" value="%s">', $newtime);
- $goto_select_ht .= P2View::getInputHiddenKTag();
+ $goto_next_ht .= sprintf('<input type="hidden" name="host" value="%s">', hs($aThread->host));
+ $goto_next_ht .= sprintf('<input type="hidden" name="bbs" value="%s">', hs($aThread->bbs));
+ $goto_next_ht .= sprintf('<input type="hidden" name="key" value="%s">', hs($aThread->key));
+ $goto_next_ht .= sprintf('<input type="hidden" name="offline" value="%s">', 1);
+ $goto_next_ht .= sprintf('<input type="hidden" name="nt" value="%s">', $newtime);
+ $goto_next_ht .= P2View::getInputHiddenKTag();
}
$st = "{$next_st}";
@@ -189,28 +189,31 @@
$next_page = $page + 1;
$url .= '&page=' . $next_page;
- $goto_select_ht .= sprintf('<input type="hidden" name="ls" value="%s">', hs($aThread->ls));
- $goto_select_ht .= sprintf('<input type="hidden" name="page" value="%s">', hs($next_page));
+ $goto_next_ht .= sprintf('<input type="hidden" name="ls" value="%s">', hs($aThread->ls));
+ $goto_next_ht .= sprintf('<input type="hidden" name="page" value="%s">', hs($next_page));
} else {
$als = "{$aThread->resrange['to']}-{$after_rnum}n" . $read_navi_next_anchor;
$url .= '&ls=' . $als;
- $goto_select_ht .= sprintf('<input type="hidden" name="ls" value="%s">', hs($als));
+ $goto_next_ht .= sprintf('<input type="hidden" name="ls" value="%s">', hs($als));
}
$read_navi_next_ht = P2View::tagA($url, hs($st));
$read_navi_next_btm_ht = P2View::tagA($url, hs($st), array($_conf['accesskey_for_k'] => $_conf['k_accesskey']['next']));
+
+} else {
+ $goto_next_ht = sprintf('<form style="margin-left: 1px; display:inline;" action="%s">', hs($_conf['read_php']));
}
-
-$goto_select_ht .= sprintf(
+$goto_next_ht .= sprintf(
'<input id="large_next" type="submit" value="%s"%s />',
$read_navi_next_isInvisible ? hs($next_st) . $rnum_range : hs($st) . $rnum_range,
$read_navi_next_isInvisible ? ' disabled' : ''
);
-//$goto_select_ht .= '</form>';
+$goto_next_ht .= '</form>';
+
//----------------------------------------------
// $read_footer_navi_new_ht ‘±‚«‚ð“Ç‚Þ V’…ƒŒƒX‚Ì•\Ž¦
list($read_footer_navi_new_ht, $read_footer_navi_new_btm_ht) = _getReadFooterNaviNewHtmls($aThread, $shinchaku_st);
@@ -228,8 +231,8 @@
EOP;
}
-// {{{ ŒŸõ
-
+// {{{ ƒŒƒXŒŸõƒŠƒ“ƒN i¨ƒI[ƒo[ƒŒƒCƒ|ƒbƒvƒAƒbƒv‚Ì•û‚ð—˜—p‚µ‚Ä‚¢‚éj
+/*
$read_navi_filter_ht = $read_navi_filter_btm_ht = P2View::tagA(
UriUtil::buildQueryUri('read_filter_i.php',
array(
@@ -242,10 +245,10 @@
),
hs($find_st)
);
-
+*/
// }}}
-// ŒŸõŽž‚Ì“Á•Ê‚Ȉ—
+// ƒŒƒXŒŸõŽž‚Ì“Á•Ê‚Ȉ—
if ($_filter_hits !== NULL) {
require_once P2_LIB_DIR . '/read_filter_k.funcs.php';
resetReadNaviHeaderK();
@@ -373,10 +376,6 @@
// smartpopup.iPhone.js needs post_form.js's popUpFootbarFormIPhone().
?><script type="text/javascript" src="iphone/js/smartpopup.iPhone.js?v=20070308"></script><?php
- // ƒtƒHƒ“ƒgƒTƒCƒY“™ conf_user_style.inc.php ‚ð‚¢‚¶‚é‚ÆPC‚à•Ï‚í‚é‚Ì‚Å‚±‚±‚Å‘‚«Š·‚¦
- $STYLE['respop_color'] = "#FFFFFF"; // ("#000") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̃eƒLƒXƒgF
- $STYLE['respop_bgcolor'] = ""; // ("#ffffcc") ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚Ì”wŒiF
- $STYLE['respop_fontsize'] = '13px';
$aThread->showSmartPopUpMenuJs();
}
@@ -466,7 +465,7 @@
*
* @return string
*/
-function _csrangeform($default = '', &$aThread)
+function _csrangeform($default = '', $aThread)
{
global $_conf;
@@ -479,14 +478,10 @@
$required_params = array('host', 'bbs', 'key');
foreach ($required_params as $k) {
- if (!empty($_REQUEST[$k])) {
- $form .= sprintf(
- '<input type="hidden" name="%s" value="%s">',
- htmlspecialchars($k, ENT_QUOTES), htmlspecialchars($_REQUEST[$k], ENT_QUOTES)
- );
- } else {
- return '';
- }
+ $form .= sprintf(
+ '<input type="hidden" name="%s" value="%s">',
+ htmlspecialchars($k, ENT_QUOTES), htmlspecialchars($aThread->$k, ENT_QUOTES)
+ );
}
$form .= '<input type="hidden" name="rescount" value="' . hs($aThread->rescount) . '">';
@@ -515,7 +510,7 @@
*/
$form .= '</select>';
- $form .= '</form>';
+ //$form .= '</form>';
return $form;
}
Modified: p2/trunk/iphone/sb_header_k.inc.php
===================================================================
--- p2/trunk/iphone/sb_header_k.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/iphone/sb_header_k.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -86,7 +86,7 @@
{$_conf['k_input_ht']}
EOP;
-// ƒtƒBƒ‹ƒ^ŒŸõ
+// ƒXƒŒŒŸõ
if ($_conf['enable_exfilter'] == 2) {
$selected_method = array('and' => '', 'or' => '', 'just' => '', 'regex' => '', 'similar' => '');
$selected_method[($sb_filter['method'])] = ' selected';
Modified: p2/trunk/iui/read.css
===================================================================
--- p2/trunk/iui/read.css 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/iui/read.css 2011-06-27 09:39:25 UTC (rev 917)
@@ -150,6 +150,10 @@
-webkit-border-image: url(toolButton.png) 0 5 0 5;
border-width: 0 5px;
}
+/* 2011/06/27 iPhone‚Å‚Ídisabled‚ʼn摜‚ª”–‚‚Ȃ邪AAndroid‚Å‚Í•Ï‚í‚ç‚È‚©‚Á‚½‚Ì‚Å–¾Ž¦“I‚ÉŽw’è‚·‚é */
+#large_next:disabled{
+ opacity:0.4;
+}
.footform form {
/*margin-bottom: 3px;*/
margin: 0px;
@@ -371,7 +375,7 @@
}
/*
-ƒtƒBƒ‹ƒ^•\Ž¦‚ƃŒƒX‘‚«ž‚݃|ƒbƒvƒAƒbƒv
+ƒŒƒXŒŸõ‚ƃŒƒX‘‚«ž‚݃|ƒbƒvƒAƒbƒv
http://pc11.2ch.net/test/read.cgi/iPhone/1225958706/202
*/
body > .dialog_filter, body > .dialog_write {
Modified: p2/trunk/js/smartpopup.js
===================================================================
--- p2/trunk/js/smartpopup.js 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/js/smartpopup.js 2011-06-27 09:39:25 UTC (rev 917)
@@ -61,13 +61,13 @@
}
/*
- //ƒtƒBƒ‹ƒ^ƒŠƒ“ƒO
+ // ƒŒƒXŒŸõ
if (aThread.spmOption['enable_fl_on_spm']) {
- document.writeln("<a href=\"javascript:void(0);\"" + makeOnPopUp(thread_id+"_fl", true) + ">ƒtƒBƒ‹ƒ^•\Ž¦</a>");
+ document.writeln("<a href=\"javascript:void(0);\"" + makeOnPopUp(thread_id+"_fl", true) + ">ƒŒƒXŒŸõ</a>");
}
*/
- // “¯‚¶–¼‘O‚ðƒtƒBƒ‹ƒ^•\Ž¦
+ // “¯‚¶–¼‘O‚ðƒŒƒXŒŸõ
document.writeln('<a id="' + thread_id + '_same_name" href="#" target="' + spmTarget + '">“¯‚¶–¼‘O</a>');
// ‹tŽQÆ
Modified: p2/trunk/lib/HostCheck.php
===================================================================
--- p2/trunk/lib/HostCheck.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/HostCheck.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -449,21 +449,8 @@
$regHost = '/^proxy[0-9a-f]\d\d\.docomo\.ne\.jp$/';
- // @update 2010/12/08
+ // @updated 2011/05/31
$bands = array(
- '210.153.84.0/24',
- '210.136.161.0/24',
- '210.153.86.0/24',
- '124.146.174.0/24',
- '124.146.175.0/24',
- '202.229.176.0/24',
- '202.229.177.0/24',
- '202.229.178.0/24',
- '202.229.179.0/24',
- '111.89.188.0/24',
- '111.89.189.0/24',
- '111.89.190.0/24',
- '111.89.191.0/24',
'210.153.84.0/24',
'210.136.161.0/24',
'210.153.86.0/24',
@@ -472,18 +459,15 @@
'202.229.176.0/24',
'202.229.177.0/24',
'202.229.178.0/24',
- '202.229.179.0/24',
- '111.89.188.0/24',
- '111.89.189.0/24',
- '111.89.190.0/24',
- '111.89.191.0/24',
- '210.153.87.0/24'
+
+ '210.153.87.0/24' // WEBƒAƒNƒZƒXŽžiƒtƒ‹ƒuƒ‰ƒEƒUj
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
}
/**
* IP‚Í au?
+ * 2010/6/6 PCSV‚̑шæ‚à•Ê“rŒöŠJ‚³‚ê‚Ä‚¢‚邪APCSV‚Å‚ÍHTTP_X_UP_SUBNO‚ª‘—M‚³‚ê‚Ä‚±‚È‚¢‚炵‚¢B
*
* @link http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
* @return boolean
@@ -496,12 +480,18 @@
$addr = $_SERVER['REMOTE_ADDR'];
}
- //$regHost = '/^wb\d\dproxy\d\d\.ezweb\.ne\.jp$/';
+ //$regHost = '/^wb\d+proxy\d\d\.ezweb\.ne\.jp$/';
$regHost = '/\.ezweb\.ne\.jp$/';
- // @updated 2010/12/08
+ // @updated 2011/05/31
$bands = array(
- '210.230.128.224/28',
+ // EZŒ“PCSV
+ '111.107.116.0/26',
+ '111.107.116.64/26',
+ '111.107.116.192/28',
+
+ // EZ
+ '210.230.128.224/28',
'121.111.227.160/27',
'61.117.1.0/28',
'219.108.158.0/27',
@@ -543,6 +533,22 @@
'111.86.147.160/27',
'111.86.147.192/27',
'111.86.147.224/27'
+
+ /* PCSV
+ '222.15.68.192/26',
+ '59.135.39.128/27',
+ '118.152.214.160/27',
+ '118.152.214.128/27',
+ '222.1.136.96/27',
+ '222.1.136.64/27',
+ '59.128.128.0/20',
+ '111.86.140.40/30',
+ '111.86.140.44/30',
+ '111.86.140.48/30',
+ '111.86.140.52/30',
+ '111.86.140.56/30',
+ '111.86.140.60/30',
+ */
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
}
@@ -598,11 +604,11 @@
// ml7ts005v11c.pcsitebrowser.ne.jp
$regHost = '/\.(pcsitebrowser)\.ne\.jp$/';
- // 2010”N4ŒŽ16“úŒ»Ý
+ // 2011/05/01
$bands = array(
// PCƒTƒCƒgƒuƒ‰ƒEƒU
'123.108.237.224/27',
- '202.253.96.0/28',
+ '202.253.96.0/27',
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
}
@@ -624,40 +630,29 @@
//$regHost = '/\.panda-world\.ne\.jp$/';
// ŒöŽ®”•\ƒf[ƒ^‚Å‚Í‚È‚¢
- // @updated 2010/10/31
+ // @updated 2011/05/28
$bands = array(
- '126.192.0.0/10',
- '126.196.0.0/16',
- '126.197.0.0/16',
- '126.198.0.0/16',
- '126.199.0.0/16',
- '126.200.0.0/16',
- '126.201.0.0/16',
- '126.202.0.0/16',
- '126.203.0.0/16',
- '126.204.0.0/16',
- '126.205.0.0/16',
- '126.206.0.0/16',
- '126.207.0.0/16',
- '126.208.0.0/16',
- '126.209.0.0/16',
- '126.210.0.0/16',
- '126.211.0.0/16',
- '126.212.0.0/16',
- '126.213.0.0/16',
- '126.214.0.0/16',
- '126.215.0.0/16',
- '126.216.0.0/16',
- '126.217.0.0/16',
- '126.218.0.0/16',
- '126.219.0.0/16',
- '126.220.0.0/16',
- '126.221.0.0/16',
- '126.222.0.0/16',
- '126.223.0.0/16',
- '126.240.0.0/12',
- '126.230.0.0/15',
- '126.232.0.0/13'
+ '126.142.0.0/16',
+ '126.143.0.0/16',
+ '126.144.0.0/16',
+ '126.145.0.0/16',
+ '126.146.0.0/16',
+ '126.147.0.0/16',
+ '126.148.0.0/16',
+ '126.149.0.0/16',
+ '126.150.0.0/16',
+ '126.151.0.0/16',
+ '126.152.0.0/16',
+ '126.154.0.0/15',
+ '126.156.0.0/14',
+ '126.160.0.0/12',
+ '126.176.0.0/12',
+ '126.195.0.0/16',
+ '126.196.0.0/14',
+ '126.200.0.0/13',
+ '126.208.0.0/13',
+ '126.216.0.0/13',
+ '126.224.0.0/11'
);
return HostCheck::isAddrInBand($addr, $bands, $regHost);
}
Modified: p2/trunk/lib/Login.php
===================================================================
--- p2/trunk/lib/Login.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/Login.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -796,7 +796,7 @@
if (!is_null($ignore_cip)) {
if ($ignore_cip) {
- P2Util::setCookie('ignore_cip', '1', $time);
+ P2Util::setCookie('ignore_cip', '1', time() + 60*60*24*365); // ‚±‚±‚ÍŠúŒÀ‚ª’·‚‚Ä‚à\‚í‚È‚¢
$_COOKIE['ignore_cip'] = '1';
} else {
P2Util::unsetCookie('ignore_cip');
@@ -908,8 +908,6 @@
*/
function checkUserPwWithCid($cid)
{
- global $_conf;
-
if (is_null($this->user_u) || is_null($this->pass_x) || is_null($cid)) {
return false;
}
Modified: p2/trunk/lib/P2Util.php
===================================================================
--- p2/trunk/lib/P2Util.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/P2Util.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -289,20 +289,26 @@
* setcookie() ‚Å‚ÍAau‚Å•K—v‚Èmax age‚ªÝ’肳‚ê‚È‚¢‚Ì‚ÅA‚±‚¿‚ç‚ð—˜—p‚·‚é
*
* @access public
+ * @params string $value
* @return boolean
*/
function setCookie($key, $value = '', $expires = null, $path = '', $domain = null, $secure = false, $httponly = true)
{
+ if (headers_sent()) {
+ return false;
+ }
+
if (is_null($domain)) {
$domain = P2Util::getCookieDomain();
}
- is_null($expires) and $expires = time() + 60 * 60 * 24 * 365;
+ $time = time();
- if (headers_sent()) {
- return false;
+ if (is_null($expires)) {
+ $expires = $time + 60 * 60 * 24 * 365;
+ } elseif ($expires < $time) {
+ trigger_error(sprintf('$expires is too early (%s)', $expires), E_USER_WARNING);
}
-
// Mac IE‚ÍA“®ì•s—Ç‚ð‹N‚±‚·‚炵‚¢‚Á‚Û‚¢‚Ì‚ÅAhttponly‚Ì‘ÎÛ‚©‚çŠO‚·Bi‚»‚à‚»‚à‘Ήž‚à‚µ‚Ä‚¢‚È‚¢j
// MAC IE5.1 Mozilla/4.0 (compatible; MSIE 5.16; Mac_PowerPC)
@@ -312,22 +318,23 @@
// setcookie($key, $value, $expires, $path, $domain, $secure = false, $httponly = true);
/*
- if (is_array($name)) {
- list($k, $v) = each($name);
- $name = $k . '[' . $v . ']';
+ if (is_array($value)) {
+ list($k, $v) = each($value);
+ $keys["$key[$k]"] = $v;
}
*/
- if ($expires) {
- $maxage = $expires - time();
+ $maxage = null;
+ if ($expires > $time) {
+ $maxage = $expires - $time;
}
header(
'Set-Cookie: '. P2Util::encodeCookieName($key) . '=' . rawurlencode($value)
- . (empty($domain) ? '' : '; Domain=' . $domain)
- . (empty($expires) ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $expires) . ' GMT')
- . (empty($maxage) ? '' : '; Max-Age=' . $maxage)
- . (empty($path) ? '' : '; Path=' . $path)
- . (!$secure ? '' : '; Secure')
+ . (!$domain ? '' : '; Domain=' . $domain)
+ . (!$expires ? '' : '; expires=' . gmdate('D, d-M-Y H:i:s', $expires) . ' GMT')
+ . (!$maxage ? '' : '; Max-Age=' . $maxage)
+ . (!$path ? '' : '; Path=' . $path)
+ . (!$secure ? '' : '; Secure')
. (!$httponly ? '' : '; HttpOnly'),
$replace = false
);
@@ -336,7 +343,7 @@
}
/**
- * ƒNƒbƒL[‚ðÁ‹Ž‚·‚éB•Ï” $_COOKIE ‚àB
+ * ƒNƒbƒL[‚ðÁ‹Ž‚·‚éB•Ï” $_COOKIE ‚à unset() ‚·‚éB
*
* @access public
* @param string $key key, k1[k2]
@@ -365,7 +372,7 @@
//var_dump($cakey);
}
- // ‘ÎÛCookie’l‚ª”z—ñ‚Å‚ ‚ê‚ÎÄ‹Aˆ—‚ðs‚¤
+ // ‘ÎÛ$_COOKIE’l‚ª”z—ñ‚Å‚ ‚ê‚ÎÄ‹Aˆ—‚ðs‚¤
$cArray = null;
if ($cakey) {
eval("isset(\$_COOKIE{$cakey}) && is_array(\$_COOKIE{$cakey}) and \$cArray = \$_COOKIE{$cakey};");
@@ -848,7 +855,7 @@
/**
* ƒfƒBƒŒƒNƒgƒŠ‚É‘‚«ž‚ÝŒ ŒÀ‚ª‚È‚¯‚ê‚Î’ˆÓ‚ð•\Ž¦ƒZƒbƒg‚·‚é
*
- * @access public
+ * @access private
* @return void P2Util::pushInfoHtml()
*/
function checkDirWritable($aDir)
@@ -893,12 +900,15 @@
*/
function checkDirsWritable($dirs)
{
- $checked_dirs = array();
+ static $checked_dirs_ = array();
+
foreach ($dirs as $dir) {
- if (!in_array($dir, $checked_dirs)) {
- P2Util::checkDirWritable($dir);
- $checked_dirs[] = $dir;
+ // ƒ`ƒFƒbƒNς݂̓XƒLƒbƒv‚·‚é
+ if (array_key_exists($dir, $checked_dirs_)) {
+ continue;
}
+ P2Util::checkDirWritable($dir);
+ $checked_dirs_[$dir] = true;
}
}
Modified: p2/trunk/lib/ShowThreadK.php
===================================================================
--- p2/trunk/lib/ShowThreadK.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/ShowThreadK.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -152,7 +152,7 @@
$date_id = $resar[2];
$msg = $resar[3];
- // ƒfƒtƒHƒ‹ƒg‚Ì–¼‘O‚ÍANGE‚ ‚Ú[‚ñ‚ƃtƒBƒ‹ƒ^ŒŸõ‚Ì‘ÎÛŠO‚Æ‚·‚é
+ // ƒfƒtƒHƒ‹ƒg‚Ì–¼‘O‚ÍANGE‚ ‚Ú[‚ñ‚ƃŒƒXŒŸõ‚Ì‘ÎÛŠO‚Æ‚·‚é
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
if (!$_conf['k_bbs_noname_name']) {
Modified: p2/trunk/lib/ShowThreadPc.php
===================================================================
--- p2/trunk/lib/ShowThreadPc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/ShowThreadPc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -118,7 +118,7 @@
$date_id = $resar[2];
$msg = $resar[3];
- // ƒfƒtƒHƒ‹ƒg‚Ì–¼‘O‚ÍANGE‚ ‚Ú[‚ñ‚ƃtƒBƒ‹ƒ^ŒŸõ‚Ì‘ÎÛŠO‚Æ‚·‚é
+ // ƒfƒtƒHƒ‹ƒg‚Ì–¼‘O‚ÍANGE‚ ‚Ú[‚ñ‚ƃŒƒXŒŸõ‚Ì‘ÎÛŠO‚Æ‚·‚é
$nameForAborn = $name;
if (strlen($this->BBS_NONAME_NAME) && $this->BBS_NONAME_NAME == $name) {
$nameForAborn = '';
Modified: p2/trunk/lib/index_print_k.inc.php
===================================================================
--- p2/trunk/lib/index_print_k.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/index_print_k.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -32,6 +32,11 @@
'user' => $_login->user_u
)
);
+ $p2_login_url_iphone = UriUtil::buildQueryUri($p2_login_url,
+ array(
+ UA::getQueryKey() => UA::getIPhoneGroupQuery()
+ )
+ );
// ‘O‰ñ‚̃ƒOƒCƒ“î•ñ
if ($_conf['login_log_rec'] && $_conf['last_login_log_show']) {
@@ -113,7 +118,7 @@
<?php echo $search_form_htm; ?>
<?php echo $hr; ?>
-<form id="urlform" method="GET" action="<?php eh($_conf['read_php']); ?>" target="read">
+<form id="urlform" method="GET" action="<?php eh($_conf['read_php']); ?>">
2ch‚̽ÚURL‚ð’¼ÚŽw’è
<input id="url_text" type="text" value="" name="url">
<?php echo P2View::getInputHiddenKTag(); ?>
@@ -129,6 +134,8 @@
<a href="<?php eh($p2_login_url_k); ?>"><?php eh($p2_login_url_k); ?></a><br>
p2۸޲ݗpURLiPCj<br>
<a href="<?php eh($p2_login_url_pc); ?>"><?php eh($p2_login_url_pc); ?></a>
+<br>p2۸޲ݗpURLiiPhonej<br>
+<a href="<?php eh($p2_login_url_iphone); ?>"><?php eh($p2_login_url_iphone); ?></a>
</div>
<?php echo $hr; ?>
Modified: p2/trunk/lib/read_header.inc.php
===================================================================
--- p2/trunk/lib/read_header.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/read_header.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -583,7 +583,7 @@
<option value="off"{$selected_match['off']}>ŠÜ‚Ü‚È‚¢</option>
</select>
ƒŒƒX‚ð
- <input type="submit" name="submit_filter" value="ƒtƒBƒ‹ƒ^•\Ž¦">
+ <input type="submit" name="submit_filter" value="ŒŸõ">
</form>\n
EOP;
}
Modified: p2/trunk/lib/sb_footer.inc.php
===================================================================
--- p2/trunk/lib/sb_footer.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/sb_footer.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -64,9 +64,9 @@
// if (!$aThreadList->spmode || $aThreadList->spmode=="fav" || $aThreadList->spmode=="recent" || $aThreadList->spmode=="res_hist") {
$onClick_ht = <<<EOP
-var url_v=document.forms["urlform"].elements["url_text"].value;
-if (url_v=="" || url_v=="{$ini_url_text}") {
- alert("Œ©‚½‚¢ƒXƒŒƒbƒh‚ÌURL‚ð“ü—Í‚µ‚ĉº‚³‚¢B —áFhttp://pc.2ch.net/test/read.cgi/mac/1034199997/");
+var url_v = document.forms['urlform'].elements['url_text'].value;
+if (url_v == '' || url_v == '{$ini_url_text}') {
+ alert('Œ©‚½‚¢ƒXƒŒƒbƒh‚ÌURL‚ð“ü—Í‚µ‚ĉº‚³‚¢B —áFhttp://pc.2ch.net/test/read.cgi/mac/1034199997/');
return false;
}
EOP;
@@ -75,7 +75,7 @@
<form id="urlform" method="GET" action="{$_conf['read_php']}" target="read">
2ch‚̃XƒŒURL‚ð’¼ÚŽw’è
<input id="url_text" type="text" value="{$ini_url_text}" name="url" size="62" onFocus="this.select()">
- <input type="submit" name="btnG" value="•\Ž¦" onClick='{$onClick_ht}'>
+ <input type="submit" name="btnG" value="•\Ž¦" onClick="{$onClick_ht}">
</form>\n
EOP;
Modified: p2/trunk/lib/sb_header.inc.php
===================================================================
--- p2/trunk/lib/sb_header.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/sb_header.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -96,7 +96,7 @@
}
// }}}
-// {{{ ƒtƒBƒ‹ƒ^ŒŸõ ƒtƒH[ƒ€HTML‚ðƒZƒbƒg
+// {{{ ƒXƒŒŒŸõ ƒtƒH[ƒ€HTML‚ðƒZƒbƒg
if ($_conf['enable_exfilter'] == 2) {
Modified: p2/trunk/lib/sb_header_k.inc.php
===================================================================
--- p2/trunk/lib/sb_header_k.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/sb_header_k.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -84,7 +84,7 @@
{$_conf['k_input_ht']}
EOP;
-// ƒtƒBƒ‹ƒ^ŒŸõƒtƒH[ƒ€HTML
+// ƒXƒŒŒŸõƒtƒH[ƒ€HTML
if ($_conf['enable_exfilter'] == 2) {
$selected_method = array('and' => '', 'or' => '', 'just' => '', 'regex' => '', 'similar' => '');
$selected_method[($sb_filter['method'])] = ' selected';
Modified: p2/trunk/lib/sb_print.inc.php
===================================================================
--- p2/trunk/lib/sb_print.inc.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/sb_print.inc.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -145,10 +145,9 @@
//=====================================================
//spmode‚ª‚ ‚ê‚΃NƒGƒŠ[’ljÁ
+ $spmode_q = '';
if ($aThreadList->spmode) {
$spmode_q = "&spmode={$aThreadList->spmode}";
- } else {
- $spmode_q = '';
}
$sid_q = (defined('SID') && strlen(SID)) ? '&' . hs(SID) : '';
@@ -201,7 +200,7 @@
$onclick_at = " onClick=\"return !deleLog('host={$aThread->host}{$bbs_q}{$key_q}{$sid_q}', {$STYLE['info_pop_size']}, 'subject', this);\"";
$title_at = ' title="ƒNƒŠƒbƒN‚·‚é‚ƃƒOíœ"';
- $unum_ht_c = "<a class=\"un\" href=\"{$_conf['subject_php']}?host={$aThread->host}{$bbs_q}{$key_q}{$spmode_q}&dele=1\" target=\"_self\"{$onclick_at}{$title_at}>{$aThread->unum}</a>";
+ $unum_ht_c = "<a class=\"un\" href=\"{$_conf['subject_php']}?host={$aThread->host}{$bbs_q}{$key_q}{$spmode_q}&norefresh=1&dele=1\" target=\"_self\"{$onclick_at}{$title_at}>{$aThread->unum}</a>";
$anum = $aThread->rescount - $aThread->unum + 1 - $_conf['respointer'];
if ($anum > $aThread->rescount) {
@@ -227,7 +226,7 @@
array_merge(
$thread_qs,
array(
- 'spmode' => $aThreadList->spmode, 'dele' => '1',
+ 'spmode' => $aThreadList->spmode, 'norefresh' => '1', 'dele' => '1',
UA::getQueryKey() => UA::getQueryValue()
)
)
@@ -248,9 +247,15 @@
// subject.txt‚É‚È‚¢Žž
if (!$aThread->isonline) {
// JavaScript‚Å‚ÌŠm”Fƒ_ƒCƒAƒƒO‚ ‚è
- $unum_ht_c = "<a class=\"un_n\" href=\"{$_conf['subject_php']}?host={$aThread->host}{$bbs_q}{$key_q}{$spmode_q}&dele=true\" target=\"_self\" onClick=\"if (!window.confirm('ƒƒO‚ð휂µ‚Ü‚·‚©H')) {return false;} return !deleLog('host={$aThread->host}{$bbs_q}{$key_q}{$sid_q}', {$STYLE['info_pop_size']}, 'subject', this)\"{$title_at}>-</a>";
+ $unum_ht_c = "<a class=\"un_n\" href=\"{$_conf['subject_php']}?host={$aThread->host}{$bbs_q}{$key_q}{$spmode_q}&norefresh=1&dele=1\" target=\"_self\" onClick=\"if (!window.confirm('ƒƒO‚ð휂µ‚Ü‚·‚©H')) {return false;} return !deleLog('host={$aThread->host}{$bbs_q}{$key_q}{$sid_q}', {$STYLE['info_pop_size']}, 'subject', this)\"{$title_at}>-</a>";
}
-
+
+ // Šù“¾ó‘Ô‚Å‚È‚¢ê‡
+ } else {
+ if ($aThreadList->spmode) {
+ $onclick_at = " onClick=\"return !deleLog('host={$aThread->host}{$bbs_q}{$key_q}{$sid_q}', {$STYLE['info_pop_size']}, 'subject', this);\"";
+ $unum_ht_c = "<a class=\"un_n\" href=\"{$_conf['subject_php']}?host={$aThread->host}{$bbs_q}{$key_q}{$spmode_q}&norefresh=1&dele=1\" target=\"_self\"{$onclick_at} title=\"ƒƒO‚È‚µBƒNƒŠƒbƒN‚·‚é‚Æ‹L˜^íœ\">*</a>";
+ }
}
$unum_ht = "<td{$class_tu}>" . $unum_ht_c . "</td>";
Modified: p2/trunk/lib/sb_print_k.func.php
===================================================================
--- p2/trunk/lib/sb_print_k.func.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/lib/sb_print_k.func.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -318,6 +318,10 @@
), $sid_qs)
);
$setFavUri_hs = hs($setFavUri);
+
+ $ttitle_en = base64_encode($aThread->ttitle);
+ $ttitle_urlen = rawurlencode($ttitle_en);
+ $ttitle_en_q = "&ttitle_en=" . $ttitle_urlen;
}
//====================================================================================
Modified: p2/trunk/read.php
===================================================================
--- p2/trunk/read.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/read.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -84,7 +84,7 @@
if (isset($_POST['method'])) { $GLOBALS['res_filter']['method'] = $_POST['method']; }
if (isset($_GET['method'])) { $GLOBALS['res_filter']['method'] = $_GET['method']; }
-// $GLOBALS['word'] ‚È‚Ç‚ÌŒŸõŒê‚ÌŽæ‚舵‚¢‚ª‚Ç‚³‚‚³‚È‚Ì‚ÍA‚Å‚«‚ê‚ή—‚µ‚½‚¢‚Æ‚±‚ë...
+// $GLOBALS['word'] ‚È‚Ç‚ÌŒŸõŒê‚ÌŽæ‚舵‚¢‚ÍA‚Å‚«‚ê‚ή—‚µ‚½‚¢‚Æ‚±‚ë...
$GLOBALS['word'] = geti($_POST['word'], geti($_GET['word']));
if (!strlen($GLOBALS['word']) && geti($_GET['popup_filter'])) {
$GLOBALS['word'] = _getFilterWordResNum(
Modified: p2/trunk/read_filter.php
===================================================================
--- p2/trunk/read_filter.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/read_filter.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -1,6 +1,9 @@
<?php
+// 2010/08/05 ”pŽ~B
+// ‚±‚̃XƒNƒŠƒvƒg‚ÍŽg‚킸‚ÉAread.php‚Å‚»‚̂܂܈—‚·‚é‚悤‚É‚µ‚½Bˆø”popup_filter‚Å”»•Ê‚·‚éB
+
+
// p2 - ƒXƒŒƒbƒh•\Ž¦ƒ‰ƒbƒp[
-// 2010/08/05 ‚±‚̃XƒNƒŠƒvƒg‚ÍŽg‚킸‚ÉAread.php‚Å‚»‚̂܂܈—‚·‚é‚悤‚É‚µ‚½Bpopup_filter‚Å”»•ÊB
//define('P2_READ_FILTER_WRAPPER', 1); // ‚±‚̒蔂͎g‚í‚È‚¢
Modified: p2/trunk/read_filter_i.php
===================================================================
--- p2/trunk/read_filter_i.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/read_filter_i.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -1,11 +1,11 @@
<?php
-/* vim: set fileencoding=cp932 ai et ts=4 sw=4 sts=0 fdm=marker: */
-/* mi: charset=Shift_JIS */
+// 2010/08/05 ”pŽ~B
+// ‚±‚̃XƒNƒŠƒvƒg‚ÍŽg‚킸‚ÉAread.php‚Å‚»‚̂܂܈—‚·‚é‚悤‚É‚µ‚½Bˆø”popup_filter‚Å”»•ÊB
+// “ü—̓tƒH[ƒ€‰æ–Ê‚ÍAƒI[ƒo[ƒŒƒCƒ|ƒbƒvƒAƒbƒv‚Ì•û‚ð—˜—p‚µ‚Ä‚¢‚éB
+
// p2 - Œg‘єŃŒƒXƒtƒBƒ‹ƒ^ƒŠƒ“ƒO
-// 2010/08/05 ‚±‚̃XƒNƒŠƒvƒg‚ÍŽg‚킸‚ÉAread.php‚Å‚»‚̂܂܈—‚·‚é‚悤‚É‚µ‚½Bpopup_filter‚Å”»•ÊB
-
require_once './conf/conf.inc.php';
require_once P2_LIB_DIR . '/Thread.php';
require_once P2_LIB_DIR . '/ThreadRead.php';
Modified: p2/trunk/read_filter_k.php
===================================================================
--- p2/trunk/read_filter_k.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/read_filter_k.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -1,8 +1,7 @@
<?php
-/* vim: set fileencoding=cp932 ai et ts=4 sw=4 sts=0 fdm=marker: */
/* mi: charset=Shift_JIS */
-// p2 - Œg‘єŃŒƒXƒtƒBƒ‹ƒ^ƒŠƒ“ƒO
+// p2 - Œg‘Ñ—p ƒXƒŒ“àŒŸõ ƒCƒ“ƒvƒbƒgƒtƒH[ƒ€‰æ–Ê
require_once './conf/conf.inc.php';
Modified: p2/trunk/setting.php
===================================================================
--- p2/trunk/setting.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/setting.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -44,6 +44,11 @@
'user' => $_login->user_u
)
);
+$p2_login_url_i = UriUtil::buildQueryUri($p2_login_url,
+ array(
+ UA::getQueryKey() => UA::getIPhoneGroupQuery()
+ )
+);
$body_onload = '';
if (UA::isPC()) {
@@ -103,10 +108,10 @@
if (UA::isIPhoneGroup()) {
?>
<p>
-<!-- p2ƒƒOƒCƒ“—pURLiŒg‘Ñj<br>
-<a href="<?php eh($p2_login_url_k); ?>"><?php eh($p2_login_url_k); ?></a><br> -->
-p2ƒƒOƒCƒ“—pURLiPCj<br>
-<a href="<?php eh($p2_login_url_pc); ?>"><?php eh($p2_login_url_pc); ?></a>
+rep2ƒƒOƒCƒ“—pURL<br>
+PC <a href="<?php eh($p2_login_url_pc); ?>"><?php eh($p2_login_url_pc); ?></a><br>
+Œg‘Ñ <a href="<?php eh($p2_login_url_k); ?>"><?php eh($p2_login_url_k); ?></a><br>
+iPhone <a href="<?php eh($p2_login_url_i); ?>"><?php eh($p2_login_url_i); ?></a>
</p>
<?php } ?>
Modified: p2/trunk/title.php
===================================================================
--- p2/trunk/title.php 2011-03-28 23:15:36 UTC (rev 916)
+++ p2/trunk/title.php 2011-06-27 09:39:25 UTC (rev 917)
@@ -12,23 +12,9 @@
$p2web_url_r = P2Util::throughIme($_conf['p2web_url']);
-// {{{ ƒf[ƒ^•Û‘¶ƒfƒBƒŒƒNƒgƒŠ‚̃p[ƒ~ƒbƒVƒ‡ƒ“‚Ì’ˆÓ‚ðŠ«‹N‚·‚é
+// ƒf[ƒ^•Û‘¶ƒfƒBƒŒƒNƒgƒŠ‚̃p[ƒ~ƒbƒVƒ‡ƒ“‚Ì’ˆÓ‚ðŠ«‹N‚·‚éiP2Util::printInfoHtml()j
+P2Util::checkDirsWritable(array($_conf['pref_dir'], $_conf['dat_dir'], $_conf['idx_dir']));
-P2Util::checkDirWritable($_conf['dat_dir']);
-$checked_dirs[] = $_conf['dat_dir']; // ƒ`ƒFƒbƒNς݂̃fƒBƒŒƒNƒgƒŠ‚ðŠi”[‚·‚é”z—ñ‚É
-
-// ‚Ü‚¾ƒ`ƒFƒbƒN‚µ‚Ä‚¢‚È‚¯‚ê‚Î
-if (!in_array($_conf['idx_dir'], $checked_dirs)) {
- P2Util::checkDirWritable($_conf['idx_dir']);
- $checked_dirs[] = $_conf['idx_dir'];
-}
-if (!in_array($_conf['pref_dir'], $checked_dirs)) {
- P2Util::checkDirWritable($_conf['pref_dir']);
- $checked_dirs[] = $_conf['pref_dir'];
-}
-
-// }}}
-
//=========================================================
// ‘Oˆ—
//=========================================================
@@ -45,17 +31,16 @@
// ƒvƒŠƒ“ƒgÝ’è
//=========================================================
// ÅV”Ń`ƒFƒbƒN
+$newversion_found_html = '';
if ($_conf['updatan_haahaa']) {
$newversion_found_html = _checkUpdatan();
-} else {
- $newversion_found_html = '';
}
// ƒƒOƒCƒ“ƒ†[ƒUî•ñ
-$htm['auth_user'] = "<p>ƒƒOƒCƒ“ƒ†[ƒU: {$_login->user_u} - " . date("Y/m/d (D) G:i") . '</p>' . "\n";
+$htm['auth_user'] = "<p>ƒƒOƒCƒ“ƒ†[ƒU: {$_login->user_u} - " . date('Y/m/d (D) G:i') . '</p>' . "\n";
-// iŒg‘ÑjƒƒOƒCƒ“—pURL
-$ktai_uri_atag = P2View::tagA(
+// Œg‘Ñ—pƒƒOƒCƒ“URL
+$p2_login_uri_k_atag = P2View::tagA(
UriUtil::buildQueryUri(rtrim(dirname(UriUtil::getMyUri()), '/') . '/',
array(
'user' => $_login->user_u,
@@ -66,8 +51,8 @@
array('target' => '_blank')
);
-// iPhone—pURL
-$iphone_uri_atag = P2View::tagA(
+// iPhone—pƒƒOƒCƒ“URL
+$p2_login_uri_iphone_atag = P2View::tagA(
UriUtil::buildQueryUri(rtrim(dirname(UriUtil::getMyUri()), '/') . '/',
array(
UA::getQueryKey() => UA::getIPhoneGroupQuery()
@@ -77,6 +62,15 @@
array('target' => '_blank')
);
+// PC—pƒƒOƒCƒ“URL
+$p2_login_uri_pc_atag = P2View::tagA(
+ UriUtil::buildQueryUri(rtrim(dirname(UriUtil::getMyUri()), '/') . '/',
+ array(
+ UA::getQueryKey() => UA::getPCQuery()
+ )
+ )
+);
+
// ‘O‰ñ‚̃ƒOƒCƒ“î•ñ
if ($_conf['login_log_rec'] && $_conf['last_login_log_show']) {
if (false !== $log = P2Util::getLastAccessLog($_conf['login_log_file'])) {
@@ -137,8 +131,10 @@
<?php echo $htm['auth_user']; ?>
<p>
- Œg‘уƒOƒCƒ“—pURL <?php echo $ktai_uri_atag; ?><br>
- iPhoneƒƒOƒCƒ“—pURL <?php echo $iphone_uri_atag; ?>
+ rep2ƒƒOƒCƒ“—pURL<br>
+ PC <?php echo $p2_login_uri_pc_atag; ?><br>
+ Œg‘Ñ <?php echo $p2_login_uri_k_atag; ?><br>
+ iPhone <?php echo $p2_login_uri_iphone_atag; ?>
</p>
<?php echo $htm['last_login']; ?>
</div>