Changeset 6681

Timestamp:

09/17/08 10:43:39 (4 months ago)

Author:

inureyes

Message:

refs #1085

• [6636] [6644] [6652] [6654] [6657] [6659] [6664] 를 1.7 트리에 반영
  

Location:

branches/1.7

Files:

• doc/requirements.txt (modified) (1 diff)
• rewrite.php (modified) (1 diff)
• setup.php (modified) (17 diffs)

branches/1.7/doc/requirements.txt

@@ -29 +29 @@
 2. For Microsoft Windows :
 
- Currently supports IIS7 only :
-  * Windows Vista / Windows Server 2008
-  * IIS 7.0 or above
-    * with URL Rewrite module
+  * IIS 5.0 or above
+    * with ISAPI Rewrite Filter
   * PHP 5.2 or above
     * with iconv / gd module

branches/1.7/rewrite.php

@@ -10 +10 @@
     }
     if (!empty($_SERVER['PRELOAD_CONFIG']) && file_exists('config.php')) require_once ROOT."/config.php";
-    if (isset($_SERVER['HTTP_X_ORIGINAL_URL']))
+    // IIS 7.0 and URL Rewrite Module CTP, but non-ASCII URLs are NOT supported.
+    if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
         $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
+    } // IIS 5.x/6.0/7.0 and Ionics ISAPI Rewrite Filter
+    else if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
+        $_SERVER['REQUEST_URI'] = urldecode($_SERVER['HTTP_X_REWRITE_URL']);
+    }
     /* Retrieve Access Parameter Information. */
     $accessInfo = array(

branches/1.7/setup.php

@@ -30 +30 @@
     $path = stripPath(substr($_SERVER['PHP_SELF'], 0, strlen($_SERVER['PHP_SELF']) - 12));
 }
-
-define ('ROOT', $root);
+$_SERVER['PHP_SELF'] = rtrim($_SERVER['PHP_SELF'], '/');
+
+if (!defined('ROOT'))
+    define ('ROOT', $root);
 
 $__requireBasics = array(
@@ -382 +384 @@
                 }
             }
-            if (!empty($_POST['checked']))
+            if (!empty($_POST['checked']) && $_POST['checked'] == 'yes')
                 return true;
         }
@@ -767 +769 @@
         if ($step == 33) {
             $error = 16;
+            if (checkIIS()) {
+?>
+    <h3><?php echo _t('IIS Rewrite Module');?></h3>
+    <ul style="color:red">
+        <li><?php echo _t('현재 IIS에서의 설치는 실험적으로만 지원하고 있으며 별도의 Rewrite 모듈을 사용해야 합니다.').' '._t('만약 이 페이지를 보고 계시다면 Apache mod_rewrite와 호환되지 않는 모듈을 사용 중이거나 아예 모듈이 없는 경우입니다.'); ?></li>
+        <li><?php echo _t('텍스트큐브와 호환되는 IIS용 Rewrite 모듈을 설치하려면, 오픈스소 무료 모듈을 제공하고 있는 <a href="http://www.codeplex.com/IIRF" target="_blank">Ionics Isapi Rewrite Filter 홈페이지</a>를 방문하십시오.'); ?></li>
+        <li><?php echo _t('여기서 계속 진행하여 설치를 완료한 후, 생성된 <b>.htaccess</b> 파일의 내용을 위 모듈의 설정파일(<b>IsapiRewrite4.ini</b>)에 복사하시기 바랍니다.'); ?></li>
+        <input type="hidden" name="rewriteIIS" value="yes" />
+    </ul>
+<?php
+                $error = 0;
+            } else {
 ?>
     <h3><?php echo _t('Apache Rewrite Engine');?></h3>
@@ -796 +810 @@
     </ul>
 <?php
+            }
         }
 ?>
@@ -804 +819 @@
   </div>
   </div>
-  <input type="hidden" name="checked" value="<?php echo ($error ? '' : 'checked');?>" />
+  <input type="hidden" name="checked" value="<?php echo ($error > 0 ? 'no' : 'yes');?>" />
 <?php
     }
@@ -813 +828 @@
         }
         // mod_rewrite routine.
-        if(empty($_POST['disableRewrite'])) {
+        if(empty($_POST['disableRewrite']) && empty($_POST['rewriteIIS'])) {
             $filename = $root . '/.htaccess';
             $fp = fopen($filename, 'w+');
@@ -841 +856 @@
             }
             @unlink($filename);
+        } else if (!empty($_POST['rewriteIIS'])) {
+            $rewrite = -1;
         } else {
             $rewrite = 0;
@@ -855 +872 @@
   <input type="hidden" name="checked" value="<?php echo (isset($_POST['checked']) ? $_POST['checked'] : '');?>" />
   <input type="hidden" name="domain" value="<?php echo $domain;?>" />
-  <input type="hidden" name="disableRewrite" value="<?php echo (isset($_POST['disableRewrite']) ? $_POST['disableRewrite'] : false);?>" />
+  <input type="hidden" name="disableRewrite" value="<?php echo (isset($_POST['disableRewrite']) ? $_POST['disableRewrite'] : '');?>" />
+  <input type="hidden" name="rewriteMode" value="<?php echo ($rewrite == -1) ? 'ISAPI' : 'mod_rewrite';?>" />
   <div id="inner">
   <h2><span class="step"><?php echo _f('%1단계', $step);?></span> : <?php echo _t('사용 가능한 운영 방법은 다음과 같습니다. 선택하여 주십시오.');?></h2>
@@ -861 +879 @@
     <table class="inputs">
 <?php
-        if ($rewrite >= 1) {
+        if ($rewrite != 0) {
 ?>
       <tr>
@@ -875 +893 @@
             }
 ?>
-        <label for="type2"><input type="radio" id="type2" name="type" value="path"<?php echo ($rewrite == 1 ? ' checked="checked"' : '');?> onclick="show('typePath');" />
+        <label for="type2"><input type="radio" id="type2" name="type" value="path"<?php echo (($rewrite == 1 || $rewrite == -1) ? ' checked="checked"' : '');?> onclick="show('typePath');" />
         <?php echo _t('하위 경로(Path)로 블로그 식별');?></label></td>
       </tr>
@@ -949 +967 @@
   <input type="hidden" name="checked" value="<?php echo (isset($_POST['checked']) ? $_POST['checked'] : '');?>" />
   <input type="hidden" name="domain" value="<?php echo (isset($_POST['domain']) ? $_POST['domain'] : '');?>" />
-  <input type="hidden" name="disableRewrite" value="<?php echo (isset($_POST['disableRewrite']) ? $_POST['disableRewrite'] : false);?>" />
+  <input type="hidden" name="disableRewrite" value="<?php echo (isset($_POST['disableRewrite']) ? $_POST['disableRewrite'] : '');?>" />
+  <input type="hidden" name="rewriteMode" value="<?php echo (isset($_POST['rewriteMode']) ? $_POST['rewriteMode'] : '');?>" />
   <input type="hidden" name="type" value="<?php echo (isset($_POST['type']) ? $_POST['type'] : '');?>" />
   <div id="inner">
@@ -1029 +1048 @@
   <input type="hidden" name="domain" value="<?php echo (isset($_POST['domain']) ? $_POST['domain'] : '');?>" />
   <input type="hidden" name="disableRewrite" value="<?php echo (isset($_POST['disableRewrite']) ? $_POST['disableRewrite'] : false);?>" />
+  <input type="hidden" name="rewriteMode" value="<?php echo (isset($_POST['rewriteMode']) ? $_POST['rewriteMode'] : '');?>" />
   <input type="hidden" name="type" value="<?php echo (isset($_POST['type']) ? $_POST['type'] : '');?>" />
   <input type="hidden" name="blog" value="<?php echo (isset($_POST['blog']) ? $_POST['blog'] : '');?>" />
@@ -1601 +1621 @@
             @chmod($filename, 0666);
         }
-        if(!isset($_POST['disableRewrite']) || !$_POST['disableRewrite']) { 
+        if(!isset($_POST['disableRewrite']) || !$_POST['disableRewrite']) {
             $filename = $root . '/.htaccess';
             $fp = fopen($filename, 'w+');
         
-        $htaccessContent = 
+            switch ($_POST['rewriteMode']) {
+            case 'ISAPI':
+                // Users must copy these rules to IsapiRewrite4.ini
+                $htaccessContent = 
+"RewriteCond %{REQUEST_FILENAME} -f
+RewriteRule ^$path/(cache)+/+(.+[^/])\.(cache|xml|txt|log)$ - [NC,F,L,U]
+RewriteCond %{REQUEST_FILENAME} -d
+RewriteRule ^$path/([^?]+[^/])$ $path/$1/ [L,U]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^$path/(thumbnail)/([0-9]+/.+)$ $path/cache/$1/$2 [L,U]
+RewriteCond %{QUERY_STRING} ^$
+RewriteRule ^$path/(.*)$ $path/rewrite.php [L,U]
+RewriteRule ^$path/(.*)$ $path/rewrite.php?%{QUERY_STRING} [L,U]
+";
+                break;
+            case 'mod_rewrite':
+            default:
+                $htaccessContent = 
 "#<IfModule mod_url.c>
 #CheckURL Off
@@ -1612 +1649 @@
 RewriteEngine On
 RewriteBase $path/
-RewriteRule ^(thumbnail)/([0-9]+/.+)$ cache/$1/$2 [L]
 RewriteCond %{REQUEST_FILENAME} -f
 RewriteRule ^(cache)+/+(.+[^/])\.(cache|xml|txt|log)$ - [NC,F,L]
@@ -1618 +1654 @@
 RewriteRule ^(.+[^/])$ $1/ [L]
 RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(thumbnail)/([0-9]+/.+)$ cache/$1/$2 [L]
 RewriteRule ^(.*)$ rewrite.php [L,QSA]
 ";
+            }
 
             if ($fp) {
@@ -1654 +1692 @@
       </ul>
       <p>
+        <?php if (checkIIS()) echo _t('새로 IIS용 Rewrite 모듈을 설치하셨다면 <b>ISAPI Rewrite Filter 설정</b>을 해주십시오.<br />'); ?>
         <?php echo _t('텍스트큐브 관리 툴로 로그인 하신 후 필요사항을 수정해 주십시오.');?><br />
         <?php echo _t('텍스트큐브를 이용해 주셔서 감사합니다.');?>
@@ -1891 +1930 @@
         return testMyself_socket($host,$path,$port);
     }
+    return false;
+}
+
+function checkIIS() {
+    if (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== FALSE)
+        return true;
     return false;
 }