Restore .htaccess feature

capkokoon · capkokoon · commit 803a982e1d22 · 2015-08-18T15:19:08.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ include/config.php
 .idea/
 nbproject/
 lang/French
+.htaccess
diff --git a/.htaccess b/.htaccess
@@ -1,3 +1,3 @@
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [QSA,L]
+RewriteRule ^ index.php [QSA,L]
diff --git a/.htaccess.dist b/.htaccess.dist
@@ -0,0 +1,3 @@
+RewriteEngine On
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^ index.php [QSA,L]
diff --git a/controller/install.php b/controller/install.php
@@ -195,6 +195,11 @@ public function create_db(array $data)
         // Store config in DB
         $this->model->save_config($this->load_default_config($data));
 
+        // Handle .htaccess
+        if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules())) {
+            $this->write_htaccess();
+        }
+        
         // Redirect to homepage
         redirect(get_link('/'));
     }
@@ -204,6 +209,12 @@ public function write_config($json)
         return file_put_contents($this->feather->forum_env['FEATHER_ROOT'].$this->config_file, $json);
     }
 
+    public function write_htaccess()
+    {
+        $data = file_get_contents($this->feather->forum_env['FEATHER_ROOT'].'.htaccess.dist');
+        return file_put_contents($this->feather->forum_env['FEATHER_ROOT'].'.htaccess', $data);
+    }
+
     public function load_default_config(array $data)
     {
         return array(
diff --git a/style/FeatherBB/view/header.php b/style/FeatherBB/view/header.php
@@ -102,7 +102,7 @@ function process_form(the_form)
                 <a href="<?php echo get_base_url() ?>" title="" class="site-name">
                     <p><?php echo feather_escape($feather_config['o_board_title']) ?></p>
                 </a>
-                <div id="brddesc"><?php echo $feather_config['o_board_desc'] ?></div>
+                <div id="brddesc"><?php echo htmlspecialchars_decode($feather_config['o_board_desc']) ?></div>
             </h1>
             <div class="status-avatar">
                 <?php echo $page_info ?>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+RewriteEngine On`
	`2`	`+RewriteCond %{REQUEST_FILENAME} !-f`
	`3`	`+RewriteRule ^ index.php [QSA,L]`