[Frameworkspider-svn] spider-commit [113] RewriteDocumentRootタグの修正。同じ名称のフォルダが階層内にあった場合にリンク変換が正しく行われない問題の再修正

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2010年 6月 24日 (木) 10:33:57 JST


Revision: 113
          http://sourceforge.jp/projects/frameworkspider/svn/view?view=rev&revision=113
Author:   m_nakashima
Date:     2010-06-24 10:33:57 +0900 (Thu, 24 Jun 2010)

Log Message:
-----------
RewriteDocumentRootタグの修正。同じ名称のフォルダが階層内にあった場合にリンク変換が正しく行われない問題の再修正

Modified Paths:
--------------
    current/spider/lib/spider/tags/Module.class.php
    current/spider/lib/spider/tags/RewriteDocumentRoot.class.php
    current/spider/lib/spider/tags/Write.class.php


-------------- next part --------------
Modified: current/spider/lib/spider/tags/Module.class.php
===================================================================
--- current/spider/lib/spider/tags/Module.class.php	2010-06-23 11:10:08 UTC (rev 112)
+++ current/spider/lib/spider/tags/Module.class.php	2010-06-24 01:33:57 UTC (rev 113)
@@ -1,7 +1,7 @@
 <?php
 /*
  * framework-spider
- * spider/tags/If.class.php
+ * spider/tags/Module.class.php
  * 
  * CopyRight(C)Framework-Spider Developer Team. 2010. All Right Reserved. 
  * URL         : http://sourceforge.jp/projects/frameworkspider/

Modified: current/spider/lib/spider/tags/RewriteDocumentRoot.class.php
===================================================================
--- current/spider/lib/spider/tags/RewriteDocumentRoot.class.php	2010-06-23 11:10:08 UTC (rev 112)
+++ current/spider/lib/spider/tags/RewriteDocumentRoot.class.php	2010-06-24 01:33:57 UTC (rev 113)
@@ -1,7 +1,7 @@
 <?php
 /*
  * framework-spider
- * spider/tags/PageTitle.class.php
+ * spider/tags/RewriteDocumentRoot.class.php
  * 
  * CopyRight(C)Framework-Spider Developer Team. 2010. All Right Reserved. 
  * URL         : http://sourceforge.jp/projects/frameworkspider/
@@ -64,7 +64,7 @@
 			$process_code .= ', PREG_PATTERN_ORDER ) > 0 ) { ';
 			$process_code .= 'foreach ( $output_array as $output ) { ';
 			$process_code .= 'foreach ( $output as $target ) { ';
-			$process_code .= 'if( preg_match(\'/^\'.\''.$regxUri.'\'.\'/\', $target ) == 0 ) { '."\n";
+			$process_code .= 'if( preg_match(\'/^[sS][rR][cC]\\\\=([\\\'"])'.$regxUri.'/\', $target ) == 0 ) { '."\n";
 			$process_code .= '$repstr = preg_replace(\'/[sS][rR][cC]\\\\=([\\\'"])(\\/[^\\\'"]*)([\\\'"])/\',\'src=${1}'.$replaceUri.'${2}${3}\',$target); '."\n";
 			$process_code .= '$outstr = str_replace( $target, $repstr, $outstr );'."\n";
 			$process_code .= ' }'."\n";
@@ -77,7 +77,7 @@
 			$process_code .= ', PREG_PATTERN_ORDER ) > 0 ) { ';
 			$process_code .= 'foreach ( $output_array as $output ) { ';
 			$process_code .= 'foreach ( $output as $target ) { ';
-			$process_code .= 'if( preg_match(\'/^\'.\''.$regxUri.'\'.\'/\', $target ) == 0 ) { '."\n";
+			$process_code .= 'if( preg_match(\'/^[hH][rR][eE][fF]\\\\=([\\\'"])'.$regxUri.'/\', $target ) == 0 ) { '."\n";
 			$process_code .= '$repstr = preg_replace(\'/[hH][rR][eE][fF]\\\\=([\\\'"])(\\/[^\\\'"]*)([\\\'"])/\',\'href=${1}'.$replaceUri.'${2}${3}\',$target); '."\n";
 			$process_code .= '$outstr = str_replace( $target, $repstr, $outstr );'."\n";
 			$process_code .= ' }'."\n";
@@ -90,7 +90,7 @@
 			$process_code .= ', PREG_PATTERN_ORDER ) > 0 ) { ';
 			$process_code .= 'foreach ( $output_array as $output ) { ';
 			$process_code .= 'foreach ( $output as $target ) { ';
-			$process_code .= 'if( preg_match(\'/^\'.\''.$regxUri.'\'.\'/\', $target ) == 0 ) { '."\n";
+			$process_code .= 'if( preg_match(\'/^[aA][cC][tT][iI][oO][nN]\\\\=([\\\'"])'.$regxUri.'/\', $target ) == 0 ) { '."\n";
 			$process_code .= '$repstr = preg_replace(\'/[aA][cC][tT][iI][oO][nN]\\\\=([\\\'"])(\\/[^\\\'"]*)([\\\'"])/\',\'action=${1}'.$replaceUri.'${2}${3}\',$target); '."\n";
 			$process_code .= '$outstr = str_replace( $target, $repstr, $outstr );'."\n";
 			$process_code .= ' }'."\n";
@@ -103,7 +103,7 @@
 			$process_code .= ', PREG_PATTERN_ORDER ) > 0 ) { ';
 			$process_code .= 'foreach ( $output_array as $output ) { ';
 			$process_code .= 'foreach ( $output as $target ) { ';
-			$process_code .= 'if( preg_match(\'/^\'.\''.$regxUri.'\'.\'/\', $target ) == 0 ) { '."\n";
+			$process_code .= 'if( preg_match(\'/^window\\\\.open\\\\(([\\\'"])'.$regxUri.'/\', $target ) == 0 ) { '."\n";
 			$process_code .= '$repstr = preg_replace(\'/window\\\\.open\\\\(([\\\'"])(\\/[^\\\'"]*)([\\\'"])/\',\'window.open(${1}'.$replaceUri.'${2}${3}\',$target); '."\n";
 			$process_code .= '$outstr = str_replace( $target, $repstr, $outstr );'."\n";
 			$process_code .= ' }'."\n";
@@ -116,7 +116,7 @@
 			$process_code .= ', PREG_PATTERN_ORDER ) > 0 ) { ';
 			$process_code .= 'foreach ( $output_array as $output ) { ';
 			$process_code .= 'foreach ( $output as $target ) { ';
-			$process_code .= 'if( preg_match(\'/^\'.\''.$regxUri.'\'.\'/\', $target ) == 0 ) { '."\n";
+			$process_code .= 'if( preg_match(\'/^'.$regxUri.'/\', $target ) == 0 ) { '."\n";
 			$process_code .= '$repstr = preg_replace(\'/url\\\\(([\\\'"])(\\/[^\\\'"]*)([\\\'"])/\',\'url(${1}'.$replaceUri.'${2}${3}\',$target); '."\n";
 			$process_code .= '$outstr = str_replace( $target, $repstr, $outstr );'."\n";
 			$process_code .= ' }'."\n";

Modified: current/spider/lib/spider/tags/Write.class.php
===================================================================
--- current/spider/lib/spider/tags/Write.class.php	2010-06-23 11:10:08 UTC (rev 112)
+++ current/spider/lib/spider/tags/Write.class.php	2010-06-24 01:33:57 UTC (rev 113)
@@ -1,7 +1,7 @@
 <?php
 /*
  * framework-spider
- * spider/tags/Widget.class.php
+ * spider/tags/Write.class.php
  * 
  * CopyRight(C)Framework-Spider Developer Team. 2010. All Right Reserved. 
  * URL         : http://sourceforge.jp/projects/frameworkspider/



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