svnno****@sourc*****
svnno****@sourc*****
2010年 1月 16日 (土) 01:10:50 JST
Revision: 779 http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=779 Author: rsk Date: 2010-01-16 01:10:50 +0900 (Sat, 16 Jan 2010) Log Message: ----------- expack: - ã¹ã¬ããã¿ã¤ãã«æ¤ç´¢çµæã®ã¹ã¿ã¤ã«ã調æ´ã - ã¹ã¬ããã¿ã¤ãã«æ¤ç´¢çµæã§ã¬ã¹è¡¨ç¤ºç¯å²ãæå®ã㦠å ã¹ã¬ãéããããã«ããã - ãªã¼ããã¼ãã¼ãä¿®æ£ã Modified Paths: -------------- p2ex/trunk/js/motolspopup.js p2ex/trunk/lib/expack/tgrep/view.inc.php p2ex/trunk/lib/setup.funcs.php -------------- next part -------------- Modified: p2ex/trunk/js/motolspopup.js =================================================================== --- p2ex/trunk/js/motolspopup.js 2010-01-13 23:31:20 UTC (rev 778) +++ p2ex/trunk/js/motolspopup.js 2010-01-15 16:10:50 UTC (rev 779) @@ -12,7 +12,7 @@ function showMotoLsPopUp(event, origin, title) { - var div, baseUrl, url, anchor, i, l; + var div, baseUrl, url, anchor, target, i, l; l = _MOTOLSPOPUP_PARAMETERS.length; @@ -39,16 +39,16 @@ title = ''; } - //var target = origin.hasAttribute('target') ? origin.getAttribute('target') : null; + target = origin.hasAttribute('target') ? origin.getAttribute('target') : null; baseUrl = origin.getAttribute('href'); for (i = 0; i < l; i++) { anchor = div.childNodes[i]; url = baseUrl + _MOTOLSPOPUP_PARAMETERS[i].parameter; anchor.setAttribute('href', url); anchor.setAttribute('title', title + url); - /*if (tgt) { - anchor.setAttribute('target', tgt); - }*/ + if (target) { + anchor.setAttribute('target', target); + } } showMotoLsPopUpDo(event); Modified: p2ex/trunk/lib/expack/tgrep/view.inc.php =================================================================== --- p2ex/trunk/lib/expack/tgrep/view.inc.php 2010-01-13 23:31:20 UTC (rev 778) +++ p2ex/trunk/lib/expack/tgrep/view.inc.php 2010-01-15 16:10:50 UTC (rev 779) @@ -29,7 +29,7 @@ margin:1em; padding:0 0 0 2em; } div.tgrep_result { - margin:0; padding:2px; line-height:100%; white-space:nowrap; + margin:0; padding:2px 8px; line-height:100%; white-space:nowrap; <?php echo $htm['message_background'], $htm['message_color']; ?> } tr.tablefooter td { @@ -39,13 +39,16 @@ } /* ]]> */ </style> + <script type="text/javascript" src="js/basic.js?<?php echo P2_VERSION_ID; ?>"></script> + <script type="text/javascript" src="js/respopup.js?<?php echo P2_VERSION_ID; ?>"></script> + <script type="text/javascript" src="js/motolspopup.js?<?php echo P2_VERSION_ID; ?>"></script> <script type="text/javascript"> //<![CDATA[ function setWinTitle() { if (top != self) {top.document.title=self.document.title;} } function sf() { - <?php if (strlen($htm['query']) == 0) { echo 'document.getElementById("Q").focus()'; } ?> + <?php if (strlen($htm['query']) == 0) { echo 'document.getElementById("Q").focus();'; } ?> } //]]> </script> @@ -55,15 +58,15 @@ <!-- Toolbar1 --> <table id="sbtoolbar1" class="toolbar" cellspacing="0"> <tr> - <td align="left" valign="middle"><span class="itatitle" id="top"><a class="aitatitle" href="<?php echo $htm['tgrep_url']; ?>" target="_blank"><b>tGrep for rep2</b></a></span></td> - <td align="left" valign="middle"> + <td class="toolbar-title"><span class="itatitle" id="top"><a class="aitatitle" href="<?php echo $htm['tgrep_url']; ?>" target="_blank"><b>tGrep for rep2</b></a></span></td> + <td class="toolbar-filter"> <form id="searchForm" name="searchForm" action="<?php echo $htm['php_self']; ?>" method="get" accept-charset="<?php echo $_conf['accept_charset']; ?>"> <input id="Q" name="Q" <?php echo $htm['search_attr']; ?> /> <input type="submit" value="õ" /> <?php echo $_conf['detect_hint_input_xht'], $_conf['k_input_ht']; ?> </form> </td> - <td align="right" valign="middle"><?php if ($threads) { ?><a class="toolanchor" href="#sbtoolbar2" target="_self">¥</a><?php } else { ?>@<?php } ?></td> + <td class="toolbar-anchor"><?php if ($threads) { ?><a class="toolanchor" href="#sbtoolbar2" target="_self">¥</a><?php } else { ?>@<?php } ?></td> </tr> </table> @@ -137,11 +140,11 @@ $turl = sprintf('%s?host=%s&bbs=%s&key=%d', $_conf['read_php'], $t->host, $t->bbs, $t->tkey); $burl = sprintf('%s?host=%s&bbs=%s&itaj_en=%s&word=%s', $_conf['subject_php'], $t->host, $t->bbs, rawurlencode(base64_encode($t->ita)), $htm['query_en']); if (P2Util::isHostMachiBbs($t->host)) { - $ourl = sprintf('http://%s/bbs/read.pl?BBS=%s&KEY=%s', $t->host, $t->bbs, $t->tkey); + $ourl = sprintf('http://%s/bbs/read.cgi/%s/%s/', $t->host, $t->bbs, $t->tkey); } else { $ourl = sprintf('http://%s/test/read.cgi/%s/%s/', $t->host, $t->bbs, $t->tkey); } - $ourl = P2Util::throughIme($ourl); + $iurl = P2Util::throughIme($ourl); $aThread = new Thread; $aThread->setThreadPathInfo($t->host, $t->bbs, $t->tkey); if ($aThread->getThreadInfoFromIdx() && $aThread->isKitoku()) { @@ -152,11 +155,11 @@ $nnum = ''; } ?> -<tr class="<?php echo $R ? 'r1' : 'r2'; $R = !$R; ?>"> +<tr class="<?php echo $R ? 'r1 r_odd' : 'r2 r_even'; $R = !$R; ?>"> <td class="ti"><?php echo $nnum; ?></td> <td class="ti"><?php echo $rnum; ?></td> <td class="ti"><?php echo $o; ?></td> - <td class="tl"><a href="<?php echo $ourl; ?>" target="read">E</a> <a href="<?php echo $turl; ?>" target="read"><?php echo $t->title; ?></a></td> + <td class="tl"><a href="<?php echo $ourl; ?>" class="moto_thre" onmouseover="showMotoLsPopUp(event, this, this.nextSibling.innerText)" onmouseout="hideMotoLsPopUp()" target="read">E</a><a href="<?php echo $turl; ?>" target="read"><?php echo $t->title; ?></a></td> <td class="t"><a href="<?php echo $burl; ?>"><?php echo $t->ita; ?></a></td> <td class="t"><?php echo date('y/m/d', $t->tkey); ?></td> <td class="ti"><?php echo round($t->dayres, 2); ?></td> @@ -178,15 +181,15 @@ <!-- Toolbar2 --> <table id="sbtoolbar2" class="toolbar" cellspacing="0"> <tr> - <td align="left" valign="middle"><span class="itatitle" id="bottom"><a class="aitatitle" href="<?php echo $htm['tgrep_url']; ?>" target="_blank"><b>tGrep for rep2</b></a></span></td> - <td align="left" valign="middle"> + <td class="toolbar-title"><span class="itatitle" id="bottom"><a class="aitatitle" href="<?php echo $htm['tgrep_url']; ?>" target="_blank"><b>tGrep for rep2</b></a></span></td> + <td class="toolbar-filter"> <form id="searchForm2" name="searchForm2" action="<?php echo $htm['php_self']; ?>" method="get" accept-charset="<?php echo $_conf['accept_charset']; ?>"> <input id="Q2" name="Q" <?php echo $htm['search_attr']; ?> /> <input type="submit" value="õ" /> <?php echo $_conf['detect_hint_input_xht'], $_conf['k_input_ht']; ?> </form> </td> - <td align="right" valign="middle"><a class="toolanchor" href="#sbtoolbar1" target="_self">£</a></td> + <td class="toolbar-anchor"><a class="toolanchor" href="#sbtoolbar1" target="_self">£</a></td> </tr> </table> <?php } ?> Modified: p2ex/trunk/lib/setup.funcs.php =================================================================== --- p2ex/trunk/lib/setup.funcs.php 2010-01-13 23:31:20 UTC (rev 778) +++ p2ex/trunk/lib/setup.funcs.php 2010-01-15 16:10:50 UTC (rev 779) @@ -151,25 +151,25 @@ if (preg_match('/^(?: BbsMap | BrdCtl | - BrdMenu\\w* | + BrdMenu(?:[A-Z][A-Za-z]*)? | DataPhp | FavSetManager | FileCtl | HostCheck | Login | NgAbornCtl | - P2\\w+ | + P2[A-Z][A-Za-z]* | PresetManager | ResHist | Session | SettingTxt | - ShowBrdMenu\\w* | - ShowThread\\w* | + ShowBrdMenu(?:[A-Z][A-Za-z]*)? | + ShowThread(?:[A-Z][A-Za-z]*)? | StrCtl | StrSjis | SubjectTxt | - Thread\\w* | - Wap\\w+ + Thread(?:[A-Z][A-Za-z]*)? | + Wap[A-Z][A-Za-z]* )$/x', $name)) { if ($name == 'P2Lock') { @@ -185,7 +185,7 @@ } else { include P2_LIB_DIR . '/' . $name . '.php'; } - } elseif (preg_match('/^\\w+DataStore$/', $name)) { + } elseif (preg_match('/^[A-Z][A-Za-z]*DataStore$/', $name)) { include P2_LIB_DIR . '/P2DataStore/' . $name . '.php'; } }