OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh

[P2-php-svn] [894] p2/ for version 1.8.66

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2010年 12月 29日 (水) 06:14:22 JST 

Revision: 894
          http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=894
Author:   akid
Date:     2010-12-29 06:14:22 +0900 (Wed, 29 Dec 2010)

Log Message:
-----------
p2/ for version 1.8.66

Modified Paths:
--------------
    p2/trunk/conf/conf_hostcheck.php
    p2/trunk/doc/ChangeLog.txt
    p2/trunk/iphone/ShowThreadK.php
    p2/trunk/iphone/read_header_k.inc.php
    p2/trunk/lib/BrdCtl.php
    p2/trunk/lib/HostCheck.php
    p2/trunk/lib/ShowThreadPc.php
    p2/trunk/lib/StrSjis.php
    p2/trunk/lib/ThreadRead.php
    p2/trunk/lib/login_first.inc.php
    p2/trunk/read.php
    p2/trunk/read_filter_i.php
    p2/trunk/subject.php


-------------- next part --------------
Modified: p2/trunk/conf/conf_hostcheck.php
===================================================================
--- p2/trunk/conf/conf_hostcheck.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/conf/conf_hostcheck.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -12,6 +12,7 @@
 // $_conf['secure']['auth_host'] == 0 ‚Ì‚Æ‚«Aƒ`ƒFƒbƒN‚µ‚È‚¢B
 // $_conf['secure']['auth_host'] == 1 ‚Ì‚Æ‚«A’l‚ª1i^j‚̃zƒXƒg‚Ì‚Ý‹–‰ÂB
 // $_conf['secure']['auth_host'] == 2 ‚Ì‚Æ‚«A’l‚ª0i‹Uj‚̃zƒXƒg‚Ì‚Ý‹‘”ہB
+// @ref lib/HostCheck.php
 $GLOBALS['_HOSTCHKCONF']['host_type'] = array(
     // p2‚ª“®ì‚µ‚Ä‚¢‚éƒ}ƒVƒ“
     'localhost' => 1,

Modified: p2/trunk/doc/ChangeLog.txt
===================================================================
--- p2/trunk/doc/ChangeLog.txt	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/doc/ChangeLog.txt	2010-12-28 21:14:22 UTC (rev 894)
@@ -1,3 +1,10 @@
+2010/12/29
+	* rep2 version 1.8.66
+
+	[XV] Œg‘Ñ‚ÌIPƒAƒhƒŒƒX‘шæ‚̍XV‚µ‚½B
+	[‰ü—Ç] udocomoŒÅ—L’[––”FØv‚̃Šƒ“ƒN‚ÅGETƒNƒGƒŠ[‚ðˆÛŽ‚·‚é‚悤‚É‚µ‚½B
+	[C³] –¼‘O‚È‚Ç‚Ì––”ö‚Å•¶Žš•ö‚ꂪ”­¶‚·‚邱‚Æ‚ª‚ ‚Á‚½‚Ì‚ðC³‚µ‚½BiStrSjis::fixSjis()j
+
 2010/08/10
 	* rep2 version 1.8.65
 

Modified: p2/trunk/iphone/ShowThreadK.php
===================================================================
--- p2/trunk/iphone/ShowThreadK.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/iphone/ShowThreadK.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -365,7 +365,7 @@
                 $is_sage = true;
             } else {
                 //$tores .= $mail . " :";
-                $tores .= ':<span class="tmail">' . StrSjis::fixSjis($mail). '</span>';
+                $tores .= ':<span class="tmail">' . StrSjis::fixSjis($mail) . '</span>';
             }
         }
         

Modified: p2/trunk/iphone/read_header_k.inc.php
===================================================================
--- p2/trunk/iphone/read_header_k.inc.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/iphone/read_header_k.inc.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -431,7 +431,7 @@
 /*
 ?><h3><font color="<?php eh($STYLE['read_k_thread_title_color']); ?>"><?php eh($aThread->ttitle); ?></font></h3><?php
 */
-?><h4 class="thread_title"><?php eh($aThread->ttitle); ?></h4><?php
+?><h4 class="thread_title"><?php eh($aThread->ttitle_hc); ?></h4><?php
 
 $filter_fields = array(
     'whole' => '',

Modified: p2/trunk/lib/BrdCtl.php
===================================================================
--- p2/trunk/lib/BrdCtl.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/lib/BrdCtl.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -119,7 +119,7 @@
         }
         
         // htmlŒ`Ž®‚È‚ç
-        if (preg_match('/html?$/', $_conf['brdfile_online'])) {
+        if (preg_match('/\\.html?$/', $_conf['brdfile_online'])) {
         
             // XV‚³‚ê‚Ä‚¢‚½‚çV‹KƒLƒƒƒbƒVƒ…ì¬
             if ($isNewDL) {
@@ -137,7 +137,8 @@
             } else {
                 $cache_brd = $cachefile;
             }
-            
+        
+        // ¶brdƒtƒ@ƒCƒ‹
         } else {
             $cache_brd = $cachefile;
         }

Modified: p2/trunk/lib/HostCheck.php
===================================================================
--- p2/trunk/lib/HostCheck.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/lib/HostCheck.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -449,23 +449,35 @@
 
         $regHost = '/^proxy[0-9a-f]\d\d\.docomo\.ne\.jp$/';
         
-        // @update 2010/07/04
+        // @update 2010/12/08
         $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.87.0/24', // WEBƒAƒNƒZƒXŽžiƒtƒ‹ƒuƒ‰ƒEƒUj
+          '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',
+           '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.87.0/24'
         );
         return HostCheck::isAddrInBand($addr, $bands, $regHost);
     }
@@ -487,34 +499,50 @@
         //$regHost = '/^wb\d\dproxy\d\d\.ezweb\.ne\.jp$/';
         $regHost = '/\.ezweb\.ne\.jp$/';
         
-        // @updated 2010/04/26
+        // @updated 2010/12/08
         $bands = array(
-            '210.230.128.224/28',
-            '121.111.227.160/27',
-            '61.117.1.0/28',
-            '219.108.158.0/27',
-            '219.125.146.0/28',
-            '61.117.2.32/29',
-            '61.117.2.40/29',
-            '219.108.158.40/29',
-            '219.125.148.0/25',
-            '222.5.63.0/25',
-            '222.5.63.128/25',
-            '222.5.62.128/25',
-            '59.135.38.128/25',
-            '219.108.157.0/25',
-            '219.125.145.0/25',
-            '121.111.231.0/25',
-            '121.111.227.0/25',
-            '118.152.214.192/26',
-            '118.159.131.0/25',
-            '118.159.133.0/25',
-            '118.159.132.160/27',
-            '111.86.142.0/26',
-            '111.86.141.64/26',
-            '111.86.141.128/26',
-            '111.86.141.192/26',
-            '118.159.133.192/26',
+          '210.230.128.224/28',
+           '121.111.227.160/27',
+           '61.117.1.0/28',
+           '219.108.158.0/27',
+           '219.125.146.0/28',
+           '61.117.2.32/29',
+           '61.117.2.40/29',
+           '219.108.158.40/29',
+           '219.125.148.0/25',
+           '222.5.63.0/25',
+           '222.5.63.128/25',
+           '222.5.62.128/25',
+           '59.135.38.128/25',
+           '219.108.157.0/25',
+           '219.125.145.0/25',
+           '121.111.231.0/25',
+           '121.111.227.0/25',
+           '118.152.214.192/26',
+           '118.159.131.0/25',
+           '118.159.133.0/25',
+           '118.159.132.160/27',
+           '111.86.142.0/26',
+           '111.86.141.64/26',
+           '111.86.141.128/26',
+           '111.86.141.192/26',
+           '118.159.133.192/26',
+           '111.86.143.192/27',
+           '111.86.143.224/27',
+           '111.86.147.0/27',
+           '111.86.142.128/27',
+           '111.86.142.160/27',
+           '111.86.142.192/27',
+           '111.86.142.224/27',
+           '111.86.143.0/27',
+           '111.86.143.32/27',
+           '111.86.147.32/27',
+           '111.86.147.64/27',
+           '111.86.147.96/27',
+           '111.86.147.128/27',
+           '111.86.147.160/27',
+           '111.86.147.192/27',
+           '111.86.147.224/27'
         );
         return HostCheck::isAddrInBand($addr, $bands, $regHost);
     }
@@ -597,8 +625,37 @@
         //$regHost = '/\d+\.tik\.panda-world\.ne\.jp$/';
         
         // ŒöŽ®”­•\ƒf[ƒ^‚Å‚Í‚È‚¢
-        // @updated 2010/03/19
+        // @updated 2010/10/31
         $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'
@@ -622,163 +679,187 @@
         
         $regHost = '/^[Pp]\d{12}\.ppp\.prin\.ne\.jp$/';
         
-        // @updated 2010/02/03
+        // @updated 2010/10/06
         $bands = array(
-            '61.198.128.0/24',
-            '61.198.129.0/24',
-            '61.198.130.0/24',
-            '61.198.131.0/24',
-            '61.198.132.0/24',
-            '61.198.133.0/24',
-            '61.198.134.0/24',
-            '61.198.135.0/24',
-            '61.198.136.0/24',
-            '61.198.137.0/24',
-            '61.198.138.100/32',
-            '61.198.138.101/32',
-            '61.198.138.102/32',
-            '61.198.138.103/32',
-            '61.198.139.0/29',
-            '61.198.139.128/27',
-            '61.198.139.160/28',
-            '61.198.140.0/24',
-            '61.198.141.0/24',
-            '61.198.142.0/24',
-            '61.198.143.0/24',
-            '61.198.160.0/24',
-            '61.198.161.0/24',
-            '61.198.162.0/24',
-            '61.198.163.0/24',
-            '61.198.164.0/24',
-            '61.198.165.0/24',
-            '61.198.166.0/24',
-            '61.198.168.0/24',
-            '61.198.169.0/24',
-            '61.198.170.0/24',
-            '61.198.171.0/24',
-            '61.198.172.0/24',
-            '61.198.173.0/24',
-            '61.198.174.0/24',
-            '61.198.175.0/24',
-            '61.198.248.0/24',
-            '61.198.249.0/24',
-            '61.198.250.0/24',
-            '61.198.251.0/24',
-            '61.198.252.0/24',
-            '61.198.253.0/24',
-            '61.198.254.0/24',
-            '61.198.255.0/24',
-            '61.204.0.0/24',
-            '61.204.2.0/24',
-            '61.204.3.0/25',
-            '61.204.3.128/25',
-            '61.204.4.0/24',
-            '61.204.5.0/24',
-            '61.204.6.0/25',
-            '61.204.6.128/25',
-            '61.204.7.0/25',
-            '61.204.92.0/24',
-            '61.204.93.0/24',
-            '61.204.94.0/24',
-            '61.204.95.0/24',
-            '114.20.49.0/24',
-            '114.20.50.0/24',
-            '114.20.51.0/24',
-            '114.20.52.0/24',
-            '114.20.53.0/24',
-            '114.20.54.0/24',
-            '114.20.55.0/24',
-            '114.20.56.0/24',
-            '114.20.57.0/24',
-            '114.20.58.0/24',
-            '114.20.59.0/24',
-            '114.20.60.0/24',
-            '114.20.61.0/24',
-            '114.20.62.0/24',
-            '114.20.63.0/24',
-            '114.20.64.0/24',
-            '114.20.65.0/24',
-            '114.20.66.0/24',
-            '114.20.67.0/24',
-            '114.21.255.0/27',
-            '125.28.0.0/24',
-            '125.28.1.0/24',
-            '125.28.15.0/24',
-            '125.28.16.0/24',
-            '125.28.17.0/24',
-            '125.28.2.0/24',
-            '125.28.3.0/24',
-            '125.28.4.0/24',
-            '125.28.5.0/24',
-            '125.28.8.0/24',
-            '210.168.246.0/24',
-            '210.168.247.0/24',
-            '210.169.92.0/24',
-            '210.169.93.0/24',
-            '210.169.94.0/24',
-            '210.169.95.0/24',
-            '210.169.96.0/24',
-            '210.169.97.0/24',
-            '210.169.98.0/24',
-            '210.169.99.0/24',
-            '211.126.192.128/25',
-            '211.18.232.0/24',
-            '211.18.233.0/24',
-            '211.18.234.0/24',
-            '211.18.235.0/24',
-            '211.18.236.0/24',
-            '211.18.237.0/24',
-            '219.108.10.0/24',
-            '219.108.11.0/24',
-            '219.108.12.0/24',
-            '219.108.13.0/24',
-            '219.108.14.0/24',
-            '219.108.15.0/24',
-            '219.108.7.0/24',
-            '219.108.8.0/24',
-            '219.108.9.0/24',
-            '221.119.0.0/24',
-            '221.119.1.0/24',
-            '221.119.2.0/24',
-            '221.119.3.0/24',
-            '221.119.4.0/24',
-            '221.119.6.0/24',
-            '221.119.7.0/24',
-            '221.119.8.0/24',
-            '221.119.9.0/24',
-            '114.20.49.0/24',
-            '114.20.50.0/24',
-            '114.20.51.0/24',
-            '114.20.52.0/24',
-            '114.20.54.0/24',
-            '114.20.55.0/24',
-            '114.20.56.0/24',
-            '114.20.57.0/24',
-            '114.20.58.0/24',
-            '114.20.59.0/24',
-            '114.20.60.0/24',
-            '114.20.61.0/24',
-            '114.20.62.0/24',
-            '114.20.63.0/24',
-            '114.20.64.0/24',
-            '114.20.65.0/24',
-            '114.20.66.0/24',
-            '114.20.67.0/24',
-            '114.21.255.0/27',
-            '219.108.2.0/24',
-            '219.108.3.0/24',
-            '125.28.6.0/24',
-            '125.28.7.0/24',
-            '125.28.11.0/24',
-            '125.28.12.0/24',
-            '125.28.13.0/24',
-            '125.28.14.0/24',
-            '211.18.238.0/24',
-            '211.18.239.0/24',
-            '219.108.4.0/24',
-            '219.108.5.0/24',
-            '219.108.6.0/24',
-            '221.119.5.0/24',
+           '61.198.128.0/24',
+           '61.198.129.0/24',
+           '61.198.130.0/24',
+           '61.198.131.0/24',
+           '61.198.132.0/24',
+           '61.198.133.0/24',
+           '61.198.134.0/24',
+           '61.198.135.0/24',
+           '61.198.136.0/24',
+           '61.198.137.0/24',
+           '61.198.138.100/32',
+           '61.198.138.101/32',
+           '61.198.138.102/32',
+           '61.198.138.103/32',
+           '61.198.139.0/29',
+           '61.198.139.128/27',
+           '61.198.139.160/28',
+           '61.198.140.0/24',
+           '61.198.141.0/24',
+           '61.198.142.0/24',
+           '61.198.143.0/24',
+           '61.198.160.0/24',
+           '61.198.161.0/24',
+           '61.198.162.0/24',
+           '61.198.163.0/24',
+           '61.198.164.0/24',
+           '61.198.165.0/24',
+           '61.198.166.0/24',
+           '61.198.168.0/24',
+           '61.198.169.0/24',
+           '61.198.170.0/24',
+           '61.198.171.0/24',
+           '61.198.172.0/24',
+           '61.198.173.0/24',
+           '61.198.174.0/24',
+           '61.198.175.0/24',
+           '61.198.248.0/24',
+           '61.198.249.0/24',
+           '61.198.250.0/24',
+           '61.198.251.0/24',
+           '61.198.252.0/24',
+           '61.198.253.0/24',
+           '61.198.254.0/24',
+           '61.198.255.0/24',
+           '61.204.0.0/24',
+           '61.204.2.0/24',
+           '61.204.3.0/25',
+           '61.204.3.128/25',
+           '61.204.4.0/24',
+           '61.204.5.0/24',
+           '61.204.6.0/25',
+           '61.204.6.128/25',
+           '61.204.7.0/25',
+           '61.204.92.0/24',
+           '61.204.93.0/24',
+           '61.204.94.0/24',
+           '61.204.95.0/24',
+           '114.20.49.0/24',
+           '114.20.50.0/24',
+           '114.20.51.0/24',
+           '114.20.52.0/24',
+           '114.20.53.0/24',
+           '114.20.54.0/24',
+           '114.20.55.0/24',
+           '114.20.56.0/24',
+           '114.20.57.0/24',
+           '114.20.58.0/24',
+           '114.20.59.0/24',
+           '114.20.60.0/24',
+           '114.20.61.0/24',
+           '114.20.62.0/24',
+           '114.20.63.0/24',
+           '114.20.64.0/24',
+           '114.20.65.0/24',
+           '114.20.66.0/24',
+           '114.20.67.0/24',
+           '125.28.0.0/24',
+           '125.28.1.0/24',
+           '125.28.15.0/24',
+           '125.28.16.0/24',
+           '125.28.17.0/24',
+           '125.28.2.0/24',
+           '125.28.3.0/24',
+           '125.28.4.0/24',
+           '125.28.5.0/24',
+           '125.28.8.0/24',
+           '210.168.246.0/24',
+           '210.168.247.0/24',
+           '210.169.92.0/24',
+           '210.169.93.0/24',
+           '210.169.94.0/24',
+           '210.169.95.0/24',
+           '210.169.96.0/24',
+           '210.169.97.0/24',
+           '210.169.98.0/24',
+           '210.169.99.0/24',
+           '211.126.192.128/25',
+           '211.18.232.0/24',
+           '211.18.233.0/24',
+           '211.18.234.0/24',
+           '211.18.235.0/24',
+           '211.18.236.0/24',
+           '211.18.237.0/24',
+           '219.108.10.0/24',
+           '219.108.11.0/24',
+           '219.108.12.0/24',
+           '219.108.13.0/24',
+           '219.108.14.0/24',
+           '219.108.15.0/24',
+           '219.108.7.0/24',
+           '219.108.8.0/24',
+           '219.108.9.0/24',
+           '221.119.0.0/24',
+           '221.119.1.0/24',
+           '221.119.2.0/24',
+           '221.119.3.0/24',
+           '221.119.4.0/24',
+           '221.119.6.0/24',
+           '221.119.7.0/24',
+           '221.119.8.0/24',
+           '221.119.9.0/24',
+           '61.198.255.0/24',
+           '114.21.128.0/24',
+           '114.21.129.0/24',
+           '114.21.130.0/24',
+           '114.21.132.0/24',
+           '114.21.133.0/24',
+           '114.21.134.0/24',
+           '114.21.135.0/24',
+           '114.21.136.0/24',
+           '114.21.137.0/24',
+           '114.21.138.0/24',
+           '114.21.139.0/24',
+           '114.21.140.0/24',
+           '114.21.141.0/24',
+           '114.21.142.0/24',
+           '114.21.143.0/24',
+           '114.21.144.0/24',
+           '114.21.145.0/24',
+           '114.21.146.0/24',
+           '114.21.147.0/24',
+           '114.21.148.0/24',
+           '114.21.149.0/24',
+           '114.21.254.0/27',
+           '210.255.190.0/24',
+           '114.20.49.0/24',
+           '114.20.50.0/24',
+           '114.20.51.0/24',
+           '114.20.52.0/24',
+           '114.20.54.0/24',
+           '114.20.55.0/24',
+           '114.20.56.0/24',
+           '114.20.57.0/24',
+           '114.20.58.0/24',
+           '114.20.59.0/24',
+           '114.20.60.0/24',
+           '114.20.61.0/24',
+           '114.20.62.0/24',
+           '114.20.63.0/24',
+           '114.20.64.0/24',
+           '114.20.65.0/24',
+           '114.20.66.0/24',
+           '114.20.67.0/24',
+           '114.21.255.0/27',
+           '114.21.255.0/27',
+           '219.108.2.0/24',
+           '219.108.3.0/24',
+           '125.28.6.0/24',
+           '125.28.7.0/24',
+           '125.28.11.0/24',
+           '125.28.12.0/24',
+           '125.28.13.0/24',
+           '125.28.14.0/24',
+           '211.18.238.0/24',
+           '211.18.239.0/24',
+           '219.108.4.0/24',
+           '219.108.5.0/24',
+           '219.108.6.0/24',
+           '221.119.5.0/24',
         );
         return HostCheck::isAddrInBand($addr, $bands, $regHost);
     }
@@ -822,29 +903,20 @@
         // br***.jig.jp
         $reghost = '/^br\d+\.jig\.jp$/';
         
-        // @updated 2010/05/27
+        // @updated 2010/10/31
         $bands = array(
-            '59.106.14.175/32',
-            '59.106.14.176/32',
             '59.106.23.169/32',
             '59.106.23.170/31',
             '59.106.23.172/31',
-            '59.106.23.174/32',
-            '112.78.114.171/32',
-            '112.78.114.172/30',
-            '112.78.114.176/29',
-            '112.78.114.184/30',
-            '112.78.114.188/31',
-            '112.78.114.191/32',
-            '112.78.114.192/29',
-            '112.78.114.200/30',
-            '112.78.114.204/31',
-            '112.78.114.206/32',
+            '82.48.6.10/31',
+            '82.48.6.12/30',
             '112.78.114.208/32',
-            '112.78.207.18/31',
-            '112.78.207.20/30',
-            '112.78.207.24/29',
-            '112.78.207.32/28',
+            '112.78.207.6/31',
+            '112.78.207.8/29',
+            '112.78.207.16/29',
+            '112.78.207.24/31',
+            '112.78.207.38/31',
+            '112.78.207.40/29',
             '112.78.207.48/29',
             '112.78.207.56/31',
             '112.78.215.70/31',
@@ -875,40 +947,15 @@
             '182.48.5.200/29',
             '182.48.5.208/29',
             '182.48.5.216/31',
-            '202.181.96.94/32',
-            '202.181.98.153/32',
-            '202.181.98.156/32',
+            '182.48.5.230/31',
+            '182.48.5.232/29',
+            '182.48.6.6/31',
+            '182.48.6.8/29',
             '202.181.98.160/32',
             '202.181.98.179/32',
-            '202.181.98.182/32',
-            '202.181.98.185/32',
             '202.181.98.196/32',
-            '202.181.98.218/32',
-            '202.181.98.221/32',
-            '202.181.98.223/32',
-            '202.181.98.247/32',
             '210.188.205.81/32',
             '210.188.205.83/32',
-            '210.188.205.97/32',
-            '210.188.205.166/31',
-            '210.188.205.168/31',
-            '210.188.205.170/32',
-            '210.188.220.169/32',
-            '210.188.220.170/31',
-            '210.188.220.172/30',
-            '219.94.133.167/32',
-            '219.94.133.192/32',
-            '219.94.133.243/32',
-            '219.94.144.5/32',
-            '219.94.144.6/31',
-            '219.94.144.23/32',
-            '219.94.144.24/32',
-            '219.94.147.35/32',
-            '219.94.147.36/30',
-            '219.94.147.42/31',
-            '219.94.147.44/32',
-            '219.94.166.8/30',
-            '219.94.166.173/32',
             '219.94.177.6/31',
             '219.94.177.8/29',
             '219.94.177.16/29',
@@ -922,10 +969,8 @@
             '219.94.183.112/29',
             '219.94.183.120/31',
             '219.94.184.70/31',
-            '219.94.184.72/29',
-            '219.94.197.196/30',
-            '219.94.197.200/30',
-            '219.94.197.204/31'
+            '219.94.184.72/30',
+            '219.94.184.76/32'
         );
         return HostCheck::isAddrInBand($addr, $bands, $reghost);
     }

Modified: p2/trunk/lib/ShowThreadPc.php
===================================================================
--- p2/trunk/lib/ShowThreadPc.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/lib/ShowThreadPc.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -289,7 +289,7 @@
             // ”ԍ†iV’…ƒŒƒXŽžj
             if ($onPopUp_at) {
                 //  style=\"cursor:pointer;\"
-                $tores .= "<dt id=\"r{$i}\"><a class=\"resnum\"{$onPopUp_at}><font color=\"{$STYLE['read_newres_color']}\" class=\"newres\">{$i}</font></a> F";
+                $tores .= "<dt id=\"r{$i}\"><a href=\"javascript:void(0);\" class=\"resnum\"{$onPopUp_at}><font color=\"{$STYLE['read_newres_color']}\" class=\"newres\">{$i}</font></a> F";
             } else {
                 $tores .= "<dt id=\"r{$i}\"><font color=\"{$STYLE['read_newres_color']}\" class=\"newres\">{$i}</font> F";
             }
@@ -298,7 +298,7 @@
             // ”ԍ†
             if ($onPopUp_at) {
                 //  style=\"cursor:pointer;\"
-                $tores .= "<dt id=\"r{$i}\"><a href=\"#\" class=\"resnum\"{$onPopUp_at}>{$i}</a> F";
+                $tores .= "<dt id=\"r{$i}\"><a href=\"javascript:void(0);\" class=\"resnum\"{$onPopUp_at}>{$i}</a> F";
             } else {
                 $tores .= "<dt id=\"r{$i}\">{$i} F";
             }

Modified: p2/trunk/lib/StrSjis.php
===================================================================
--- p2/trunk/lib/StrSjis.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/lib/StrSjis.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -1,7 +1,7 @@
 <?php
 /**
  * SJIS‚Ì‚½‚߂̃Nƒ‰ƒXBƒXƒ^ƒeƒBƒbƒNƒƒ\ƒbƒh‚Å—˜—p‚·‚éB
- * SJIS•¶Žš—ñ‚Ì––”ö‚ª‰ó‚ê‚Ä‚¢‚é‚Ì‚ðC³ƒJƒbƒg‚·‚éB
+ * SJIS•¶Žš—ñ‚Ì––”ö‚ª‰ó‚ê‚Ä‚¢‚é‚Ì‚ðƒJƒbƒgC³‚·‚éB
  *
  * @author aki
  * @created  2006/10/02
@@ -11,7 +11,7 @@
     /**
      * ŽQlƒf[ƒ^
      * SJIS 2ƒoƒCƒg‚Ì‘æ1ƒoƒCƒg”ÍˆÍ 129`159A224`239i0x81`0x9FA0xE0`0xEFj
-     * SJIS 2ƒoƒCƒg‚Ì‘æ2ƒoƒCƒg”ÍˆÍ 64`126A128`252i0x40`0x7EA0x80`0xFCji‘æ1ƒoƒCƒg”͈͂ð•ïŠ‡‚µ‚Ä‚¢‚éj
+     * SJIS 2ƒoƒCƒg‚Ì‘æ2ƒoƒCƒg”ÍˆÍ 64`126A128`252i0x40`0x7EA0x80`0xFCji‘æ1ƒoƒCƒg”͈͂ð•ïŠÜ‚µ‚Ä‚¢‚éj
      * SJIS ‰p”Žš(ASCII) 33`126i0x21`0x7Ej 32 ‹ó”’
      * SJIS ”¼ŠpƒJƒi161`223i0xA1`0xDFj(‘æ2ƒoƒCƒg—̈æ) 
      */
@@ -39,7 +39,7 @@
     function fixSjis($str)
     {
         if (strlen($str) == 0) {
-            return;
+            return '';
         }
 
         $un = unpack('C*', $str);
@@ -63,7 +63,7 @@
         }
 
         if ($after_crasher) {
-            $str = substr($str, 0, -1);
+            $str = StrSjis::fixSjis(substr($str, 0, -1));
         }
         return $str;
 
@@ -78,7 +78,7 @@
 
     /**
      * SJIS‚Å––”ö‚É‚ ‚é‚Ɓi‘±‚­ŠJŽnƒ^ƒO‚Æ‚­‚Á‚‚¢‚āj•¶Žš‰»‚¯‚·‚é‰Â”\«‚Ì‚ ‚éƒR[ƒh‚͈̔́i10i”j
-     * ‘æ1ƒoƒCƒg”͈͂¾‚¯‚Å‚È‚­‘æ2ƒoƒCƒg”ÍˆÍ‚Å‚à•¶Žš‰»‚¯‚·‚éƒR[ƒh‚Í‚ ‚é
+     * ‘æ1ƒoƒCƒg”͈͂¾‚¯‚Å‚È‚­‘æ2ƒoƒCƒg”ÍˆÍ‚Å‚à•¶Žš‰»‚¯‚·‚éƒR[ƒh‚ª‚ ‚é
      * 129-159 224-252 i–ÚŽ‹‚Å’²‚ׂ½j
      * –ÚŽ‹—pƒeƒXƒgƒR[ƒh
      * for ($i = 0; $i <= 255; $i++) {
@@ -90,7 +90,7 @@
      */
     function isSjisCrasherCode($int)
     {
-        if (129 <= $int && $int <= 159 or 224 <= $int && $int <= 252) {
+        if (129 <= $int && $int <= 159 or 224 <= $int && $int <= 252) { //  or 255 < $int
             return true;
         }
         return false;

Modified: p2/trunk/lib/ThreadRead.php
===================================================================
--- p2/trunk/lib/ThreadRead.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/lib/ThreadRead.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -303,7 +303,7 @@
         if ($code == '200' || $code == '206') {
             // OKB‰½‚à‚µ‚È‚¢
         
-        // Found
+        // 302 Found (Redirection)
         } elseif ($code == '302') {
         
             // ”ˆړ]‚ðŽ©“®’ǐÕ

Modified: p2/trunk/lib/login_first.inc.php
===================================================================
--- p2/trunk/lib/login_first.inc.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/lib/login_first.inc.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -77,12 +77,16 @@
         $form_login_pass_hs = hs($post['form_login_pass']);
     }
 
-    // docomo‚̌ŗL’[––”FØiƒZƒbƒVƒ‡ƒ“—˜—pŽž‚Ì‚Ý—LŒøj
+    // docomo‚̌ŗL’[––”FØiƒZƒbƒVƒ‡ƒ“—˜—pÝ’莞‚Ì‚Ý—LŒøj
     $docomo_utn_ht = '';
     
     //if ($_conf['use_session'] && $_login->user_u && $mobile->isDoCoMo()) {
     if ($_conf['use_session'] && $mobile->isDoCoMo()) {
-        $uri = $myname . '?guid=ON&user=' . urlencode($_login->user_u);
+        //$uri = $myname . '?guid=ON&user=' . urlencode($_login->user_u);
+        $uri = UriUtil::addQueryToUri($_SERVER['REQUEST_URI'], array(
+            'guid' => 'ON',
+            'user' => $_login->user_u
+        ));
         $docomo_utn_ht = '<p><a href="' . hs($uri) . '" utn>docomoŒÅ—L’[––”FØ</a></p>';
     }
 

Modified: p2/trunk/read.php
===================================================================
--- p2/trunk/read.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/read.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -87,7 +87,9 @@
 // $GLOBALS['word'] ‚È‚Ç‚ÌŒŸõŒê‚ÌŽæ‚舵‚¢‚ª‚Ç‚³‚­‚³‚Ȃ̂́A‚Å‚«‚ê‚ΐ®—‚µ‚½‚¢‚Æ‚±‚ë...
 $GLOBALS['word'] = geti($_POST['word'], geti($_GET['word']));
 if (!strlen($GLOBALS['word']) && geti($_GET['popup_filter'])) {
-    $GLOBALS['word'] = _getFilterWordResNum($host, $bbs, $key, geti($_GET['resnum']), $GLOBALS['res_filter']['field']);
+    $GLOBALS['word'] = _getFilterWordResNum(
+        $host, $bbs, $key, geti($_GET['resnum']), $GLOBALS['res_filter']['field']
+    );
 }
 $GLOBALS['word_fm'] = null;
 

Modified: p2/trunk/read_filter_i.php
===================================================================
--- p2/trunk/read_filter_i.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/read_filter_i.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -4,7 +4,7 @@
 
 // p2 - Œg‘єŃŒƒXƒtƒBƒ‹ƒ^ƒŠƒ“ƒO
 
-// 2010/08/05 ‚±‚̃XƒNƒŠƒvƒg‚Í—˜—p‚µ‚Ä‚¢‚È‚¢B
+// 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';

Modified: p2/trunk/subject.php
===================================================================
--- p2/trunk/subject.php	2010-10-10 13:15:53 UTC (rev 893)
+++ p2/trunk/subject.php	2010-12-28 21:14:22 UTC (rev 894)
@@ -849,7 +849,7 @@
     $GLOBALS['word_fm'] = null;
     $GLOBALS['wakati_word'] = null;
 
-    // uXVv‚Å‚Í‚È‚­‚āAŒŸõŽw’肪‚ ‚ê‚Î
+    // uXVv‚Å‚Í‚È‚­‚āAŒŸõŽw’肪‚ ‚ê‚΁AŒŸõƒ[ƒh‚ðƒZƒbƒg‚·‚é
     if (empty($_REQUEST['submit_refresh']) or !empty($_REQUEST['submit_kensaku'])) {
 
         if (isset($_GET['word'])) {


P2-php-svn メーリングリストの案内
Back to archive index