Changeset 1130

Show
Ignore:
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:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/htdocs/system/classes/installhandler.php

    r1081 r1130  
    604604    /** 
    605605     * returns an array of .htaccess declarations used by Habari 
    606     **/ 
     606     */ 
    607607    public function htaccess() 
    608608    { 
    609         return array( 
     609        $htaccess= array( 
    610610            'open_block' => '### HABARI START', 
    611611            'engine_on' => 'RewriteEngine On', 
    612612            'rewrite_cond_f' => 'RewriteCond %{REQUEST_FILENAME} !-f', 
    613613            'rewrite_cond_d' => 'RewriteCond %{REQUEST_FILENAME} !-d', 
     614            'rewrite_base' => '#RewriteBase /',  
    614615            'rewrite_rule' => 'RewriteRule . index.php [PT]', 
    615616            'close_block' => '### HABARI END', 
    616617        ); 
     618        $rewrite_base= trim( dirname( $_SERVER['SCRIPT_NAME'] ), '/\\' ); 
     619        if ( $rewrite_base != '' ) 
     620            $htaccess['rewrite_base']= 'RewriteBase /' . $rewrite_base; 
     621             
     622        return $htaccess; 
    617623    } 
    618624 
     
    620626     * checks for the presence of an .htaccess file 
    621627     * invokes write_htaccess() as needed 
    622     **/ 
     628     */ 
    623629    public function check_htaccess() 
    624630    {