Changeset 6664

Timestamp:

09/14/08 01:30:56 (4 months ago)

Author:

daybreaker

Message:

refs #1085: 상용 IIS mod_rewrite 호환모듈 사용시 setup flow 오류 수정

Files:

• trunk/setup.php (modified) (6 diffs)

trunk/setup.php

@@ -878 +878 @@
   <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>
@@ -972 +973 @@
   <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">
@@ -1052 +1054 @@
   <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'] : '');?>" />
@@ -1624 +1627 @@
             @chmod($filename, 0666);
         }
-        if(!isset($_POST['disableRewrite']) || !$_POST['disableRewrite']) { 
+        if(!isset($_POST['disableRewrite']) || !$_POST['disableRewrite']) {
             $filename = $root . '/.htaccess';
             $fp = fopen($filename, 'w+');
         
-        if (checkIIS()) {
-            // Users must copy these rules to IsapiRewrite4.ini
-            $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]
@@ -1641 +1645 @@
 RewriteRule ^$path/(.*)$ $path/rewrite.php?%{QUERY_STRING} [L,U]
 ";
-        } else {
-            $htaccessContent = 
+                break;
+            case 'mod_rewrite':
+            default:
+                $htaccessContent = 
 "#<IfModule mod_url.c>
 #CheckURL Off
@@ -1657 +1663 @@
 RewriteRule ^(.*)$ rewrite.php [L,QSA]
 ";
-        }
+            }
 
             if ($fp) {