OSDN -- Desenvolver e Download de Software Open Source
Estado tradução de Português translation status for pt

[P2-php-svn] [745] expack:

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2009年 12月 29日 (火) 17:21:27 JST 

Revision: 745
          http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=745
Author:   rsk
Date:     2009-12-29 17:21:27 +0900 (Tue, 29 Dec 2009)

Log Message:
-----------
expack:
- Google SOAP APIが(ずっと昔に)ディスコンになったので
  Google検索機能を削除。
- 各携帯キャリアのIPアドレス帯域を更新。
- 縦3ペインモード用にスタイルを微調整。
- cli/fetch-subject-txt.php で定数名をより適切なものに変更。

Modified Paths:
--------------
    p2ex/trunk/cli/fetch-subject-txt.php
    p2ex/trunk/conf/conf_admin_ex.inc.php
    p2ex/trunk/conf/conf_user_def_ex.inc.php
    p2ex/trunk/conf/ip_au.php
    p2ex/trunk/conf/ip_docomo.php
    p2ex/trunk/conf/ip_emobile.php
    p2ex/trunk/conf/ip_iphone.php
    p2ex/trunk/conf/ip_softbank.php
    p2ex/trunk/edit_conf_user.php
    p2ex/trunk/index.php
    p2ex/trunk/lib/menu.inc.php
    p2ex/trunk/lib/read_header.inc.php
    p2ex/trunk/skin/flat.php
    p2ex/trunk/skin/flat2.php
    p2ex/trunk/style/narrow_toolbar_css.inc

Removed Paths:
-------------
    p2ex/trunk/gsearch.php
    p2ex/trunk/lib/expack/google/


-------------- next part --------------
Modified: p2ex/trunk/cli/fetch-subject-txt.php
===================================================================
--- p2ex/trunk/cli/fetch-subject-txt.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/cli/fetch-subject-txt.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -15,8 +15,8 @@
 }
 
 define('P2_CLI_RUN', 1);
-define('P2_FTS_DEBUG', 0);
-define('P2_FTS_DEBUG_OUTPUT_FILE', '/tmp/p2_fetch_subject_txt.log');
+define('P2_FETCH_SUBJECT_TXT_DEBUG', 0);
+define('P2_FETCH_SUBJECT_TXT_DEBUG_OUTPUT_FILE', '/tmp/p2_fetch_subject_txt.log');
 
 $P2_CONF_DIR = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'conf';
 
@@ -154,7 +154,7 @@
 }
 
 // ƒfƒoƒbƒO—pƒƒOƒtƒ@ƒCƒ‹‚ɏ‘‚«ž‚Þ
-if (P2_FTS_DEBUG) {
+if (P2_FETCH_SUBJECT_TXT_DEBUG) {
     $debug_output = '====================' . PHP_EOL;
     $debug_output .= __FILE__ . PHP_EOL;
     $debug_output .= 'date: ' . date('Y-m-d H:i:s') . PHP_EOL;
@@ -185,9 +185,9 @@
         $debug_output = mb_convert_encoding($debug_output, 'UTF-8', 'SJIS-win');
     }
 
-    if (file_put_contents(P2_FTS_DEBUG_OUTPUT_FILE, $debug_output, LOCK_EX | FILE_APPEND) === false) {
+    if (file_put_contents(P2_FETCH_SUBJECT_TXT_DEBUG_OUTPUT_FILE, $debug_output, LOCK_EX | FILE_APPEND) === false) {
         $errmsg .= sprintf("<p><b>cannot write to `%s'.</b></p>\n",
-                           htmlspecialchars(P2_FTS_DEBUG_OUTPUT_FILE, ENT_QUOTES)
+                           htmlspecialchars(P2_FETCH_SUBJECT_TXT_DEBUG_OUTPUT_FILE, ENT_QUOTES)
                            );
     }
 }

Modified: p2ex/trunk/conf/conf_admin_ex.inc.php
===================================================================
--- p2ex/trunk/conf/conf_admin_ex.inc.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/conf/conf_admin_ex.inc.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -108,15 +108,6 @@
 $_conf['expack.ic2.switch_path'] = $_conf['pref_dir'] . '/ic2_switch.txt';
 
 // }}}
-// {{{ GoogleŒŸõ
-
-// GoogleŒŸõioff:0, on:1j
-$_conf['expack.google.enabled'] = 0; // (0)
-
-// WSDL ‚̃pƒXi—áF/path/to/googleapi/GoogleSearch.wsdlj
-$_conf['expack.google.wsdl'] = "./conf/GoogleSearch.wsdl"; // ("./conf/GoogleSearch.wsdl")
-
-// }}}
 // {{{ AAS
 
 // AASioff:0, on:1j

Modified: p2ex/trunk/conf/conf_user_def_ex.inc.php
===================================================================
--- p2ex/trunk/conf/conf_user_def_ex.inc.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/conf/conf_user_def_ex.inc.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -182,24 +182,6 @@
 $conf_user_rad['expack.ic2.newres_ignore_limit_k'] = array('1' => '‚·‚é', '0' => '‚µ‚È‚¢');
 
 // }}}
-// {{{ GoogleŒŸõ
-
-// Google Web APIs ‚Ì“o˜^ƒL[
-$conf_user_def['expack.google.key'] = ""; // ("")
-
-// ŒŸõ—š—ð‚ð‹L˜^‚·‚鐔ioff:0j
-//$conf_user_def['expack.google.recent_num'] = 10; // (10)
-//$conf_user_rules['expack.google.recent_num'] = array('notIntExceptMinusToDef');
-
-// ƒT[ƒ`ƒ{ƒbƒNƒX‚ÉŒŸõ—š—ð‚ð‹L˜^‚·‚鐔ASafariê—pioff:0j
-$conf_user_def['expack.google.recent2_num'] = 10; // (10)
-$conf_user_rules['expack.google.recent2_num'] = array('notIntExceptMinusToDef');
-
-// SOAP ƒGƒNƒXƒeƒ“ƒVƒ‡ƒ“ ‚ª—˜—p‰Â”\‚È‚Æ‚«‚à PEAR ‚Ì SOAP ƒpƒbƒP[ƒW‚ðŽg‚¤i0:no; 1:yes;j
-$conf_user_def['expack.google.force_pear'] = 0; // (0)
-$conf_user_rad['expack.google.force_pear'] = array('1' => 'PEAR', '0' => 'SOAPƒGƒNƒXƒeƒ“ƒVƒ‡ƒ“');
-
-// }}}
 // {{{ AAS
 
 // Œg‘Ñ‚Å AA ‚ÆŽ©“®”»’肳‚ꂽ‚Æ‚«ƒCƒ“ƒ‰ƒCƒ“ AAS •\Ž¦‚·‚éi0:‚µ‚È‚¢; 1:‚·‚é;j

Modified: p2ex/trunk/conf/ip_au.php
===================================================================
--- p2ex/trunk/conf/ip_au.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/conf/ip_au.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * KDDI au EZweb’[––‚̃Šƒ‚[ƒgƒzƒXƒg³‹K•\Œ»‚ÆIPƒAƒhƒŒƒX‘шæ (2008/12/11 Žž“_)
+ * KDDI au EZweb’[––‚̃Šƒ‚[ƒgƒzƒXƒg³‹K•\Œ»‚ÆIPƒAƒhƒŒƒX‘шæ (2009/10/05 Žž“_)
  *
  * @link http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
  */
@@ -10,51 +10,27 @@
 
 $band = array(
     '59.135.38.128/25',
-    '61.117.0.128/25',
     '61.117.1.0/28',
-    '61.117.1.128/25',
     '61.117.2.32/29',
     '61.117.2.40/29',
-    '61.202.3.64/28',
     '118.152.214.192/26',
     '118.159.131.0/25',
+    '118.159.132.160/27',
     '118.159.133.0/25',
+    '118.159.133.192/26',
     '121.111.227.0/25',
     '121.111.227.160/27',
     '121.111.231.0/25',
-    '121.111.231.160/27',
     '210.230.128.224/28',
-    '218.222.1.0/25',
-    '218.222.1.128/28',
-    '218.222.1.144/28',
-    '218.222.1.160/28',
     '219.108.157.0/25',
     '219.108.158.0/27',
     '219.108.158.40/29',
     '219.125.145.0/25',
     '219.125.146.0/28',
     '219.125.148.0/25',
-    '219.125.148.160/27',
-    '219.125.148.192/27',
-    '219.125.151.128/27',
-    '219.125.151.160/27',
-    '219.125.151.192/27',
     '222.5.62.128/25',
     '222.5.63.0/25',
     '222.5.63.128/25',
-    '222.7.56.0/27',
-    '222.7.56.32/27',
-    '222.7.56.96/27',
-    '222.7.56.128/27',
-    '222.7.56.192/27',
-    '222.7.56.224/27',
-    '222.7.57.32/27',
-    '222.7.57.64/27',
-    '222.7.57.96/27',
-    '222.7.57.128/27',
-    '222.7.57.160/27',
-    '222.7.57.192/27',
-    '222.7.57.224/27',
 );
 
 /*

Modified: p2ex/trunk/conf/ip_docomo.php
===================================================================
--- p2ex/trunk/conf/ip_docomo.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/conf/ip_docomo.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * NTTƒhƒRƒ‚ iƒ‚[ƒh’[––‚̃Šƒ‚[ƒgƒzƒXƒg³‹K•\Œ»‚ÆIPƒAƒhƒŒƒX‘шæ (2008/09 Žž“_)
+ * NTTƒhƒRƒ‚ iƒ‚[ƒh’[––‚̃Šƒ‚[ƒgƒzƒXƒg³‹K•\Œ»‚ÆIPƒAƒhƒŒƒX‘шæ (2009/11 Žž“_)
  *
  * @link http://www.nttdocomo.co.jp/service/imode/make/content/ip/index.html
  */
@@ -9,11 +9,16 @@
 $host = '/^proxy[0-9a-f]\\d\\d\\.docomo\\.ne\\.jp$/';
 
 $band = array(
+    //'124.146.174.0/24',
+    //'124.146.175.0/24',
+    '124.146.174.0/23', // ã“ñ‚‚𓝈ê
+    '210.136.161.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.176.0/23', // ã“ñ‚‚𓝈ê
+    '202.229.178.0/24',
     // ƒtƒ‹ƒuƒ‰ƒEƒU
     '210.153.87.0/24',
 );

Modified: p2ex/trunk/conf/ip_emobile.php
===================================================================
--- p2ex/trunk/conf/ip_emobile.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/conf/ip_emobile.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -1,9 +1,13 @@
 <?php
 
 /**
- * ƒC[ƒ‚ƒoƒCƒ‹’[––‚̃Šƒ‚[ƒgƒzƒXƒg³‹K•\Œ»‚ÆIPƒAƒhƒŒƒX‘шæ (2008/02/26 Žž“_)
+ * ƒC[Eƒ‚ƒoƒCƒ‹’[––‚̃Šƒ‚[ƒgƒzƒXƒg³‹K•\Œ»‚ÆIPƒAƒhƒŒƒX‘шæ (2008/02/26 Žž“_)
  *
+ * JPNIC Whois Gateway‚Å’²‚ׂ½IPƒAƒhƒŒƒX‘шæ‚̓C[Eƒ‚ƒoƒCƒ‹‚ÉŠ„‚è“–‚Ä‚ç‚ê‚Ä‚¢‚é
+ * ‘ш悷‚ׂĂŁAƒlƒbƒgƒ[ƒNuEM-INFRAvuEM-USERvˆÈŠO‚àŠÜ‚ށB
+ *
  * @link http://developer.emnet.ne.jp/ipaddress.html
+ * @link http://whois.nic.ad.jp/cgi-bin/whois_gw
  */
 
 $host = '/\\.pool\\.e(?:mnet|-?mobile)\\.ne\\.jp$/';

Modified: p2ex/trunk/conf/ip_iphone.php
===================================================================
--- p2ex/trunk/conf/ip_iphone.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/conf/ip_iphone.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -7,7 +7,8 @@
 $host = '/\\.(?:[0-9]|1[0-5])\\.tik\\.panda-world\\.ne\\.jp$/';
 
 $band = array(
-    '126.240.0.0/12',
+    '126.240.0.0/12', // ƒ\ƒtƒgƒoƒ“ƒNBB‚ª 126.0.0.0/8 ‚È‚Ì‚Å
+                      // iPhone‚ÉŒÀ’è‚Å‚«‚È‚¢‚¨‚»‚ê‚ ‚è
 );
 
 /*

Modified: p2ex/trunk/conf/ip_softbank.php
===================================================================
--- p2ex/trunk/conf/ip_softbank.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/conf/ip_softbank.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -2,7 +2,7 @@
 
 /**
  * ƒ\ƒtƒgƒoƒ“ƒN’[––‚̃Šƒ‚[ƒgƒzƒXƒg³‹K•\Œ»‚ÆIPƒAƒhƒŒƒX‘шæ
- * (Yahoo!ƒP[ƒ^ƒCEPCƒTƒCƒgƒuƒ‰ƒEƒU‚Í 2008/02/29 Žž“_AXƒVƒŠ[ƒY‚Í 2008/09/19 Žž“_)
+ * (Yahoo!ƒP[ƒ^ƒCEPCƒTƒCƒgƒuƒ‰ƒEƒU‚Í 2009/08/18 Žž“_AXƒVƒŠ[ƒY‚Í 2009/10/23 Žž“_)
  *
  * @link http://creation.mb.softbank.jp/web/web_ip.html
  * @link http://creation.mb.softbank.jp/xseries/xseries_ip.html
@@ -19,19 +19,16 @@
     '210.146.7.192/26',
     '210.146.60.192/26',
     '210.151.9.128/26',
-    '210.169.130.112/28',
     '210.175.1.128/25',
-    '210.228.189.0/24',
     '211.8.159.128/25',
     // PCƒTƒCƒgƒuƒ‰ƒEƒU
-    '123.108.237.240/28',
+    '123.108.237.224/27',
     '202.253.96.0/28',
     // XƒVƒŠ[ƒY (IE)
-    '123.108.237.240/28',
+    '123.108.237.224/27',
     '202.253.96.0/28',
     // XƒVƒŠ[ƒY (‘¼ƒAƒvƒŠ)
-    '219.73.128.0/17',
-    '117.46.128.0/17',
+    '126.243.0.0/16',
 );
 
 /*

Modified: p2ex/trunk/edit_conf_user.php
===================================================================
--- p2ex/trunk/edit_conf_user.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/edit_conf_user.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -614,24 +614,6 @@
 }
 
 // }}}
-// {{{ expack - GoogleŒŸõ
-
-$groupname = 'GoogleŒŸõ';
-$groups[] = $groupname;
-$flags = getGroupShowFlags($groupname, 'expack.google.enabled');
-if ($flags & P2_EDIT_CONF_USER_SKIPPED) {
-    $keep_old = true;
-} else {
-    $conflist = array(
-        array('expack.google.key', 'Google Web APIs ‚Ì“o˜^ƒL[', P2_EDIT_CONF_USER_LONGTEXT),
-        //array('expack.google.recent_num', 'ŒŸõ—š—ð‚ð‹L˜^‚·‚鐔i‹L˜^‚µ‚È‚¢:0j'),
-        array('expack.google.recent2_num', 'ƒT[ƒ`ƒ{ƒbƒNƒX‚ÉŒŸõ—š—ð‚ð‹L˜^‚·‚鐔ASafariê—p (‹L˜^‚µ‚È‚¢:0)'),
-        array('expack.google.force_pear', 'SOAP ƒGƒNƒXƒeƒ“ƒVƒ‡ƒ“ ‚ª—˜—p‰Â”\‚È‚Æ‚«‚à PEAR ‚Ì SOAP ƒpƒbƒP[ƒW‚ðŽg‚¤'),
-    );
-    printEditConfGroupHtml($groupname, $conflist, $flags);
-}
-
-// }}}
 // {{{ expack - AAS
 
 $groupname = 'AAS';

Deleted: p2ex/trunk/gsearch.php
===================================================================
--- p2ex/trunk/gsearch.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/gsearch.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -1,182 +0,0 @@
-<?php
-/**
- * 2ch‚©‚çGoogle API‚ðŽg‚Á‚ÄŒŸõ‚µAp2‚Å“Ç‚Þ‚½‚߂̃Šƒ“ƒN‚É•ÏŠ·‚·‚é
- *
- * —\’èF
- * E1“ú1,000‰ñ‚܂ł̐§ŒÀ‚ª‚ ‚é‚Ì‚ÅŒŸõŒ‹‰Ê‚ðƒLƒƒƒbƒVƒ…‚µ‚čĖ₢‡‚킹‚ð–h‚®B
- * EƒƒO‚É‚»‚Ì“ú‚ÌŒŸõ‰ñ”‚ð‹L˜^‚·‚é‚悤‚É‚·‚éB
- *
- * ŽQl‚É‚µ‚½‚Æ‚±‚ëF
- * Ehttp://www.itmedia.co.jp/enterprise/0405/28/epn04_3.html
- * E‚܂邲‚ÆPHP! (Vol.1) ŒŽ‹{‚³‚ñ‚Ì‹LŽ–uPHP‚ÅŠÈ’P SOAPƒT[ƒrƒXv
- *
- * •K—v‚È‚à‚́F
- * EGoogle ƒAƒJƒEƒ“ƒg
- * EGoogle Web APIs ‚̃y[ƒW‚©‚ç“üŽè‚Å‚«‚é Developerfs Kit ‚ÉŠÜ‚Ü‚ê‚éWSDLƒtƒ@ƒCƒ‹
- * EPHP‚Ìmbstring‹@”\Šg’£
- * EPHP4‚È‚çPEAR::SOAPAPHP5‚È‚çSOAPŠg’£‹@”\
- * EPEAR::Pager (2.x)
- * EPEAR::Var_Dump (1.x)
- */
-
-// {{{ p2Šî–{Ý’è“ǂݍž‚Ý&”FØ
-
-require_once './conf/conf.inc.php';
-
-$_login->authorize();
-
-// }}}
-
-if ($_conf['expack.google.enabled'] == 0) {
-    p2die('GoogleŒŸõ‚Í–³Œø‚Å‚·B', 'conf/conf_admin_ex.inc.php ‚̐ݒè‚ð•Ï‚¦‚Ä‚­‚¾‚³‚¢B');
-}
-
-if ($_conf['view_forced_by_query']) {
-    output_add_rewrite_var('b', $_conf['b']);
-}
-
-// {{{ Init
-
-// ƒ‰ƒCƒuƒ‰ƒŠ“ǂݍž‚Ý
-require_once P2EX_LIB_DIR . '/google/Search.php';
-require_once P2EX_LIB_DIR . '/google/Converter.php';
-require_once P2EX_LIB_DIR . '/google/Renderer.php';
-
-// Google Search WSDLƒtƒ@ƒCƒ‹‚̃pƒX
-$wsdl = $_conf['expack.google.wsdl'];
-
-// Google Web APIs ‚̃‰ƒCƒZƒ“ƒXƒL[
-$key = $_conf['expack.google.key'];
-
-// 1ƒy[ƒW“–‚½‚è‚Ì•\Ž¦Œ” (Max:10)
-$perPage = 10;
-
-// ŒŸõ•¶Žš—ñ
-if (isset($_GET['word'])) {
-    $_GET['q'] = $_GET['word'];
-    unset($_GET['word']);
-}
-if (isset($_GET['q'])) {
-    $q = mb_convert_encoding($_GET['q'], 'UTF-8', 'CP932');
-    $word = htmlspecialchars($_GET['q'], ENT_QUOTES);
-} else {
-    $word = $q = '';
-}
-
-// ƒy[ƒW”ԍ†
-$p = isset($_GET['p']) ? max((int)$_GET['p'], 1) : 1;
-$start = ($p - 1) * $perPage;
-
-// o—Í—p•Ï”
-$totalItems = 0;
-$result = NULL;
-$popups = NULL;
-
-// }}}
-// {{{ Search
-
-if (!empty($q)) {
-    // ŒŸõ•¶Žš—ñ‚ð2ch“àŒŸõ—p‚É•ÏŠ·
-    //$q = trim(preg_replace('/( |@)\w+:.*( |@)/u', '', $q));
-    //$q .= ' site:2ch.net -site:www.2ch.net -site:info.2ch.net -site:find.2ch.net -site:p2.2ch.net';
-    $q .= ' site:2ch.net';
-
-    // GoogleŒŸõƒNƒ‰ƒX‚̃Cƒ“ƒXƒ^ƒ“ƒX‚𐶐¬‚·‚é
-    $google = Google_Search::factory($wsdl, $key);
-
-    // ƒCƒ“ƒXƒ^ƒ“ƒX¶¬‚ÉŽ¸”s
-    if (PEAR::isError($google)) {
-        $result = '<b>Error: ' . $google->getMessage() . '</b>';
-    // ƒCƒ“ƒXƒ^ƒ“ƒX¶¬‚ɐ¬Œ÷
-    } else {
-        $resultObj = $google->doSearch($q, $perPage, $start);
-        // ƒGƒ‰[”­¶
-        if (PEAR::isError($resultObj)) {
-            $result = '<b>Error: ' . $resultObj->getMessage() . '</b>';
-            if (!empty($resultObj->userinfo)) {
-                if (!class_exists('Var_Dump', false)) {
-                    require 'Var_Dump.php';
-                }
-                $result .= Var_Dump::display($resultObj->getUserInfo(), TRUE, 'HTML4_Table');
-            }
-        // ƒŠƒNƒGƒXƒg¬Œ÷
-        } else {
-            $totalItems = $resultObj->estimatedTotalResultsCount;
-            // ƒqƒbƒg‚ ‚è
-            if ($totalItems > 0) {
-                $converter = new Google_Converter;
-                $result = array();
-                $popups = array();
-                $id = 1;
-                foreach ($resultObj->resultElements as $obj) {
-                    $result[$id] = $converter->toOutputValue($obj);
-                    $popups[$id] = $converter->toPopUpValue($obj);
-                    $id++;
-                }
-            // ƒqƒbƒg”ƒ[ƒ
-            } else {
-                $result = '&quot;' . $word . '&quot; Not Found.';
-                // ŒŸõŒ‹‰Ê‚̍Ōã‚̃y[ƒW‚ð•\Ž¦‚µ‚悤‚Æ‚µ‚½‚Æ‚«A
-                // ƒqƒbƒg”‚ªƒuƒŒ‚Ä$start‚æ‚菬‚³‚­‚È‚èAŒ‹‰Ê‚Æ‚µ‚Ä0Œ‚ƂȂ邱‚Æ‚ª‚ ‚é
-                if ($start > 0) {
-                    $result .= '<br><a href="javascript:history.back();">Back</a>';
-                }
-            }
-        } // end of ƒŠƒNƒGƒXƒg¬Œ÷
-    } // end of ƒCƒ“ƒXƒ^ƒ“ƒX¶¬‚ɐ¬Œ÷
-
-}
-
-// }}}
-// {{{ Display
-
-$renderer = new Google_Renderer;
-
-$search_element_type = 'text';
-$search_element_extra_attributes = '';
-if ($_conf['input_type_search']) {
-    $search_element_type = 'search';
-    $search_element_extra_attributes = " autosave=\"rep2.expack.search.google\" results=\"{$_conf['expack.google.recent2_num']}\" placeholder=\"Google\"";
-}
-
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="ja">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-    <meta http-equiv="Content-Script-Type" content="text/javascript">
-    <meta name="ROBOTS" content="NOINDEX, NOFOLLOW">
-    <?php echo $_conf['extra_headers_ht']; ?>
-    <title>2chŒŸõ by Google : <?php echo $word; ?></title>
-    <link rel="stylesheet" type="text/css" href="css.php?css=style&amp;skin=<?php echo $skin_en; ?>">
-    <link rel="stylesheet" type="text/css" href="css.php?css=read&amp;skin=<?php echo $skin_en; ?>">
-    <link rel="stylesheet" type="text/css" href="css.php?css=subject&amp;skin=<?php echo $skin_en; ?>">
-    <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-    <script type="text/javascript" src="js/basic.js?<?php echo $_conf['p2_version_id']; ?>"></script>
-    <script type="text/javascript" src="js/gpopup.js?<?php echo $_conf['p2_version_id']; ?>"></script>
-</head>
-<body>
-<table id="sbtoolbar1" class="toolbar" cellspacing="0"><tr><td class="toolbar-title">
-    <span class="itatitle"><a class="aitatitle" href="<?php echo $_SERVER['SCRIPT_NAME']; ?>"><b>2chŒŸõ by Google</b></a></span>
-    <form action="<?php echo $_SERVER['SCRIPT_NAME']; ?>" method="get" accept-charset="<?php echo $_conf['accept_charset']; ?>" style="display:inline;">
-        <input type="<?php echo $search_element_type; ?>" name="q" value="<?php echo $word; ?>"<?php echo $search_element_extra_attributes; ?>>
-        <input type="submit" value="ŒŸõ">
-    </form>
-</td></tr></table>
-<?php $renderer->printSearchResult($result, $word, $perPage, $start, $totalItems); ?>
-<?php $renderer->printPager($perPage, $totalItems); ?>
-<?php $renderer->printPopup($popups); ?>
-</body>
-</html>
-<?php
-/*
- * 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: p2ex/trunk/index.php
===================================================================
--- p2ex/trunk/index.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/index.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -65,12 +65,8 @@
     if (array_key_exists('panes', $_GET) && is_string($_GET['panes'])) {
         switch ($_GET['panes']) {
         case 'v3':
-            $panes = 'v3';
-            $direction = 'cols';
-            $_SESSION['use_narrow_toolbars'] = true;
-            break;
         case 'v2':
-            $panes = 'v2';
+            $panes = $_GET['panes'];
             $direction = 'cols';
             $_SESSION['use_narrow_toolbars'] = true;
             break;

Modified: p2ex/trunk/lib/menu.inc.php
===================================================================
--- p2ex/trunk/lib/menu.inc.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/lib/menu.inc.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -156,13 +156,6 @@
 <div id="c_search">\n
 EOP;
 
-if ($_conf['expack.google.enabled'] && $_conf['expack.google.key'] && file_exists($_conf['expack.google.wsdl'])) {
-    $google_search_enabled = TRUE;
-} else {
-    $google_search_enabled = FALSE;
-}
-
-
 if ($_conf['input_type_search']) {
 // {{{ <input type="search">‚ðŽg‚¤
 
@@ -180,15 +173,6 @@
         {$_conf['detect_hint_input_ht']}{$_conf['k_input_ht']}
     </form><br>\n
 EOP;
-    // GoogleŒŸõ
-    if ($google_search_enabled) {
-        echo <<<EOP
-    <form method="GET" action="gsearch.php" accept-charset="{$_conf['accept_charset']}" target="subject" class="inline-form">
-        <input type="search" name="q" value="" size="16" autosave="rep2.expack.search.google" results="{$_conf['expack.google.recent2_num']}" placeholder="GoogleŒŸõ">
-        {$_conf['detect_hint_input_ht']}{$_conf['k_input_ht']}
-    </form><br>\n
-EOP;
-    }
 
 // }}}
 } else {
@@ -208,15 +192,6 @@
         {$_conf['detect_hint_input_ht']}{$_conf['k_input_ht']}
     </form><br>\n
 EOP;
-    // GoogleŒŸõ
-    if ($google_search_enabled) {
-        echo <<<EOP
-    <form method="GET" action="gsearch.php" accept-charset="{$_conf['accept_charset']}" target="subject" class="inline-form" style="white-space:nowrap">
-        <input type="text" name="q" value="" size="12"><input type="submit" value="G">
-        {$_conf['detect_hint_input_ht']}{$_conf['k_input_ht']}
-    </form><br>\n
-EOP;
-    }
 
 // }}}
 }

Modified: p2ex/trunk/lib/read_header.inc.php
===================================================================
--- p2ex/trunk/lib/read_header.inc.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/lib/read_header.inc.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -329,6 +329,8 @@
         $selected_method[($res_filter['method'])] = ' selected';
         $select_method_ht = <<<EOP
     ‚Ì
+    </span>
+    <span class="param">
     <select id="method" name="method">
         <option value="or"{$selected_method['or']}>‚¢‚¸‚ê‚©</option>
         <option value="and"{$selected_method['and']}>‚·‚ׂÄ</option>
@@ -340,8 +342,14 @@
 
     $hd['word'] = htmlspecialchars($GLOBALS['word'], ENT_QUOTES);
 
+    if (empty($_SESSION['use_narrow_toolbars'])) {
+        $header_style = 'style="white-space:nowrap"';
+    } else {
+        $header_style = '';
+    }
+
     echo <<<EOP
-<form id="header" method="GET" action="{$_conf['read_php']}" accept-charset="{$_conf['accept_charset']}" style="white-space:nowrap">
+<form id="header" method="get" action="{$_conf['read_php']}" accept-charset="{$_conf['accept_charset']}" {$header_style}>
     <input type="hidden" name="bbs" value="{$aThread->bbs}">
     <input type="hidden" name="key" value="{$aThread->key}">
     <input type="hidden" name="host" value="{$aThread->host}">
@@ -355,13 +363,17 @@
         <option value="id"{$selected_field['id']}>ID‚ª</option>
         <option value="msg"{$selected_field['msg']}>ƒƒbƒZ[ƒW‚ª</option>
     </select>
+    <span class="param">
     <input id="word" name="word" value="{$hd['word']}" size="24">{$select_method_ht}
     ‚ð
+    </span>
+    <span class="param">
     <select id="match" name="match">
         <option value="on"{$selected_match['on']}>ŠÜ‚Þ</option>
         <option value="off"{$selected_match['off']}>ŠÜ‚Ü‚È‚¢</option>
     </select>
     ƒŒƒX‚ð
+    </span>
     <input type="submit" name="submit_filter" value="ƒtƒBƒ‹ƒ^•\Ž¦">
     {$_conf['detect_hint_input_ht']}{$_conf['k_input_ht']}
 </form>\n
@@ -390,7 +402,7 @@
         $id_header = '';
     }
     echo <<<EOP
-<table{$id_header} width="100%" style="padding:0px 0px 10px 0px;">
+<table{$id_header} class="toolbar">
     <tr>
         <td class="lblock">
             <a href="{$_conf['read_php']}?host={$aThread->host}{$bbs_q}{$key_q}&amp;ls=all">{$all_st}</a>

Modified: p2ex/trunk/skin/flat.php
===================================================================
--- p2ex/trunk/skin/flat.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/skin/flat.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -178,7 +178,7 @@
 $MYSTYLE['read']['form#header']['padding'] = "2px 10px 5px 10px";
 $MYSTYLE['read']['form#header']['line-height'] = "100%";
 $MYSTYLE['read']['form#header']['vertical-align'] = "middle";
-$MYSTYLE['read']['form#header']['background'] = "transparent url('./skin/flat/header.png') bottom repeat-x";
+$MYSTYLE['read']['form#header']['background'] = "#E3E3E3 url('./skin/flat/header.png') top repeat-x";
 $MYSTYLE['read']['form#header']['border-bottom'] = "1px #CACACA solid";
 $MYSTYLE['read']['div#kakiko']['border-top'] = "1px #CACACA solid";
 $MYSTYLE['read']['div#kakiko']['margin'] = "5px -10px -5px -10px";

Modified: p2ex/trunk/skin/flat2.php
===================================================================
--- p2ex/trunk/skin/flat2.php	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/skin/flat2.php	2009-12-29 08:21:27 UTC (rev 745)
@@ -178,7 +178,7 @@
 $MYSTYLE['read']['form#header']['padding'] = "2px 10px 5px 10px";
 $MYSTYLE['read']['form#header']['line-height'] = "100%";
 $MYSTYLE['read']['form#header']['vertical-align'] = "middle";
-$MYSTYLE['read']['form#header']['background'] = "transparent url('./skin/flat/header2.png') bottom repeat-x";
+$MYSTYLE['read']['form#header']['background'] = "#000000 url('./skin/flat/header2.png') top repeat-x";
 $MYSTYLE['read']['form#header']['border-bottom'] = "1px #3E3E3E solid";
 $MYSTYLE['read']['form#header']['color'] = "#FFFFFF";
 $MYSTYLE['read']['div#kakiko']['border-top'] = "1px #CACACA solid";

Modified: p2ex/trunk/style/narrow_toolbar_css.inc
===================================================================
--- p2ex/trunk/style/narrow_toolbar_css.inc	2009-12-25 08:50:42 UTC (rev 744)
+++ p2ex/trunk/style/narrow_toolbar_css.inc	2009-12-29 08:21:27 UTC (rev 745)
@@ -22,6 +22,10 @@
 	display: inline-block;
 }
 
+span.param {
+	display: inline-block;
+}
+
 EOSTYLE;
 
 /*


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