Changeset 1130

Timestamp:

11/23/07 17:52:55 (12 months ago)

Author:

moeffju

Message:

Attempt to fix installation in subdirectories on certain setups, such as WAMP/XAMPP and some php-cgi setups.

Files:

• trunk/htdocs/system/classes/installhandler.php (modified) (2 diffs)

trunk/htdocs/system/classes/installhandler.php

@@ -604 +604 @@
     /**
      * returns an array of .htaccess declarations used by Habari
-    **/
+     */
     public function htaccess()
     {
-        return array(
+        $htaccess= array(
             'open_block' => '### HABARI START',
             'engine_on' => 'RewriteEngine On',
             'rewrite_cond_f' => 'RewriteCond %{REQUEST_FILENAME} !-f',
             'rewrite_cond_d' => 'RewriteCond %{REQUEST_FILENAME} !-d',
+            'rewrite_base' => '#RewriteBase /', 
             'rewrite_rule' => 'RewriteRule . index.php [PT]',
             'close_block' => '### HABARI END',
         );
+        $rewrite_base= trim( dirname( $_SERVER['SCRIPT_NAME'] ), '/\\' );
+        if ( $rewrite_base != '' )
+            $htaccess['rewrite_base']= 'RewriteBase /' . $rewrite_base;
+            
+        return $htaccess;
     }
 
@@ -620 +626 @@
      * checks for the presence of an .htaccess file
      * invokes write_htaccess() as needed
-    **/
+     */
     public function check_htaccess()
     {