Various fixes

capkokoon · capkokoon · commit a5c586660d5f · 2015-08-18T13:31:36.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,3 @@ include/config.php
 .idea/
 nbproject/
 lang/French
-.htaccess
diff --git a/.htaccess b/.htaccess
@@ -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
@@ -128,9 +128,10 @@ public function run()
                 $this->create_config($data);
             }
         } else {
+            $base_url = str_replace('index.php', '', $this->feather->request->getUrl().$this->feather->request->getRootUri());
             $data = array('title' => __('My FeatherBB Forum'),
                           'description' => __('Description'),
-                          'base_url' => $this->feather->request->getUrl().$this->feather->request->getRootUri(),
+                          'base_url' => $base_url,
                           'default_lang' => $this->install_lang);
             if (isset($this->environment['slim.flash'])) {
                 $this->feather->view()->set('flash', $this->environment['slim.flash']);
@@ -193,6 +194,9 @@ public function create_db(array $data)
         $this->model->add_mock_forum($this->model->load_mock_forum_data($data));
         // Store config in DB
         $this->model->save_config($this->load_default_config($data));
+
+        // Redirect to homepage
+        redirect(get_link('/'));
     }
 
     public function write_config($json)

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]`