svnno****@sourc*****
svnno****@sourc*****
2009年 12月 25日 (金) 17:50:42 JST
Revision: 744
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=744
Author: rsk
Date: 2009-12-25 17:50:42 +0900 (Fri, 25 Dec 2009)
Log Message:
-----------
[expack]
- rev.091225.1800
- rep2拡張パックã®ã‚µã‚¤ãƒˆURLを変更。
- index.php ã®ãƒšã‚¤ãƒ³æŒ‡å®šãƒ‘ラメータを v3pane=yes ã‹ã‚‰
panes={default,v3,v2,h2} ã«å¤‰æ›´ã€‚
Modified Paths:
--------------
p2ex/trunk/conf/conf.inc.php
p2ex/trunk/conf/conf_user_def.inc.php
p2ex/trunk/index.php
p2ex/trunk/title.php
-------------- next part --------------
Modified: p2ex/trunk/conf/conf.inc.php
===================================================================
--- p2ex/trunk/conf/conf.inc.php 2009-12-23 19:51:38 UTC (rev 743)
+++ p2ex/trunk/conf/conf.inc.php 2009-12-25 08:50:42 UTC (rev 744)
@@ -7,7 +7,7 @@
// ƒo[ƒWƒ‡ƒ“î•ñ
$_conf = array(
'p2version' => '1.7.29+1.8.x', // rep2‚̃o[ƒWƒ‡ƒ“
- 'p2expack' => '090912.1710', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
+ 'p2expack' => '091225.1800', // Šg’£ƒpƒbƒN‚̃o[ƒWƒ‡ƒ“
'p2name' => 'expack', // rep2‚Ì–¼‘O
);
@@ -86,11 +86,11 @@
$_conf['p2web_url'] = 'http://akid.s17.xrea.com/';
$_conf['p2ime_url'] = 'http://akid.s17.xrea.com/p2ime.php';
$_conf['favrank_url'] = 'http://akid.s17.xrea.com/favrank/favrank.php';
-$_conf['expack.web_url'] = 'http://page2.xrea.jp/expack/';
-$_conf['expack.download_url'] = 'http://page2.xrea.jp/expack/index.php/download';
-$_conf['expack.history_url'] = 'http://page2.xrea.jp/expack/index.php/history';
+$_conf['expack.web_url'] = 'http://page2.skr.jp/rep2/';
+$_conf['expack.download_url'] = 'http://page2.skr.jp/rep2/downloads.html';
+$_conf['expack.history_url'] = 'http://page2.skr.jp/rep2/history.html';
$_conf['expack.tgrep_url'] = 'http://page2.xrea.jp/tgrep/search';
-$_conf['expack.ime_url'] = 'http://page2.xrea.jp/r.p';
+$_conf['expack.ime_url'] = 'http://page2.skr.jp/gate.php';
$_conf['menu_php'] = 'menu.php';
$_conf['subject_php'] = 'subject.php';
$_conf['read_php'] = 'read.php';
Modified: p2ex/trunk/conf/conf_user_def.inc.php
===================================================================
--- p2ex/trunk/conf/conf_user_def.inc.php 2009-12-23 19:51:38 UTC (rev 743)
+++ p2ex/trunk/conf/conf_user_def.inc.php 2009-12-25 08:50:42 UTC (rev 744)
@@ -311,17 +311,17 @@
// ŠO•”URLƒWƒƒƒ“ƒv‚·‚éÛ‚É’Ê‚·ƒQ[ƒgB
// i’¼Ú:"", p2 ime(Ž©“®“]‘—):"p2", p2 ime(Žè“®“]‘—):"p2m", p2 ime(p‚Ì‚ÝŽè“®“]‘—):"p2pm",
-// r.p(Ž©“®“]‘—1•b):"ex", r.p(Ž©“®“]‘—0•b):"exq", r.p(Žè“®“]‘—):"exm", r.p(p‚Ì‚ÝŽè“®“]‘—):"expm"j
-$conf_user_def['through_ime'] = "google"; // ("google")
+// gate.php(Ž©“®“]‘—1•b):"ex", gate.php(Ž©“®“]‘—0•b):"exq", gate.php(Žè“®“]‘—):"exm", gate.php(p‚Ì‚ÝŽè“®“]‘—):"expm", Google:"google"j
+$conf_user_def['through_ime'] = "exm"; // ("exm")
$conf_user_sel['through_ime'] = array(
'' => '’¼Ú',
- 'p2' => 'p2 ime(Ž©“®“]‘—)',
- 'p2m' => 'p2 ime(Žè“®“]‘—)',
- 'p2pm' => 'p2 ime(p‚Ì‚ÝŽè“®“]‘—)',
- 'ex' => 'r.p(Ž©“®“]‘—1•b)',
- 'exq' => 'r.p(Ž©“®“]‘—0•b)',
- 'exm' => 'r.p(Žè“®“]‘—)',
- 'expm' => 'r.p(p‚Ì‚ÝŽè“®“]‘—)',
+ 'p2' => 'p2 ime (Ž©“®“]‘—)',
+ 'p2m' => 'p2 ime (Žè“®“]‘—)',
+ 'p2pm' => 'p2 ime (p‚Ì‚ÝŽè“®“]‘—)',
+ 'ex' => 'gate.php (Ž©“®“]‘—1•b)',
+ 'exq' => 'gate.php (Ž©“®“]‘—0•b)',
+ 'exm' => 'gate.php (Žè“®“]‘—)',
+ 'expm' => 'gate.php (p‚Ì‚ÝŽè“®“]‘—)',
'google' => 'Google',
);
Modified: p2ex/trunk/index.php
===================================================================
--- p2ex/trunk/index.php 2009-12-23 19:51:38 UTC (rev 743)
+++ p2ex/trunk/index.php 2009-12-25 08:50:42 UTC (rev 744)
@@ -56,16 +56,30 @@
}
}
- $sidebar = !empty($_GET['sidebar']);
+ // ƒfƒtƒHƒ‹ƒg‚̃yƒCƒ“•ªŠ„
+ $panes = 'default';
+ $direction = 'rows';
+ $_SESSION['use_narrow_toolbars'] = false;
- if (empty($_GET['v3pane'])) {
- $v3pane = false;
- $direction = 'rows';
- $_SESSION['use_narrow_toolbars'] = false;
- } else {
- $v3pane = true;
- $direction = 'cols';
- $_SESSION['use_narrow_toolbars'] = true;
+ // index.php?panes={v3,v2,h2} or index.php?sidebar=1 ‚ŃyƒCƒ“Žw’è
+ 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';
+ $direction = 'cols';
+ $_SESSION['use_narrow_toolbars'] = true;
+ break;
+ case 'h2':
+ $panes = 'h2';
+ break;
+ }
+ } elseif (!empty($_GET['sidebar'])) {
+ $panes = 'h2';
}
$ptitle = "rep2";
@@ -90,14 +104,13 @@
</head>\n
EOHEADER;
- if (!$sidebar) {
+ if ($panes === 'default' || $panes === 'v3') {
echo <<<EOMENUFRAME
<frameset id="menuframe" cols="{$_conf['frame_menu_width']},*" border="1">
<frame src="menu.php" id="menu" name="menu" scrolling="auto" frameborder="1">\n
EOMENUFRAME;
}
- $direction = ($v3pane) ? 'cols' : 'rows';
echo <<<EOMAINFRAME
<frameset id="mainframe" {$direction}="{$_conf['frame_subject_width']},{$_conf['frame_read_width']}" border="2">
<frame src="{$title_page}" id="subject" name="subject" scrolling="auto" frameborder="1">
@@ -105,9 +118,11 @@
</frameset>\n
EOMAINFRAME;
- if (!$sidebar) {
- echo <<<EONOFRAMES
-</frameset>
+ if ($panes === 'default' || $panes === 'v3') {
+ echo "</frameset>\n";
+ }
+
+ echo <<<EONOFRAMES
<noframes>
<body>
<h1>{$ptitle}</h1>
@@ -118,7 +133,6 @@
</body>
</noframes>\n
EONOFRAMES;
- }
echo '</html>';
}
Modified: p2ex/trunk/title.php
===================================================================
--- p2ex/trunk/title.php 2009-12-23 19:51:38 UTC (rev 743)
+++ p2ex/trunk/title.php 2009-12-25 08:50:42 UTC (rev 744)
@@ -183,7 +183,7 @@
$no_p2status_dl_flag = false;
- $ver_txt_url = $_conf['expack.web_url'] . 'expack-status2.txt';
+ $ver_txt_url = $_conf['expack.web_url'] . 'version.txt';
$cachefile = P2Util::cacheFileForDL($ver_txt_url);
FileCtl::mkdir_for($cachefile);