featherbb
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎COPYING‎
Lines changed: 0 additions & 340 deletions b/‎COPYING‎
Lines changed: 0 additions & 340 deletions
diff --git a/‎controller/admin/index.php‎
Lines changed: 20 additions & 5 deletions b/‎controller/admin/index.php‎
Lines changed: 20 additions & 5 deletions
@@ -3,3 +3,4 @@ include/config.php
 .idea/
 nbproject/
 lang/French
+.htaccess
@@ -26,10 +26,25 @@ public function __autoload($class_name)
     {
         require FEATHER_ROOT . $class_name . '.php';
     }
+
+    public function remove_install_folder($directory)
+    {
+        foreach(glob("{$directory}/*") as $file)
+        {
+            if(is_dir($file)) {
+                $this->remove_install_folder($file);
+            } else {
+                unlink($file);
+            }
+        }
+        $deleted = rmdir($directory);
+
+        return $deleted;
+    }
 
     public function display($action = null)
     {
-        global $lang_common, $lang_admin_common;
+        global $lang_common, $lang_admin_common, $lang_admin_index;
 
         require FEATHER_ROOT.'include/common_admin.php';
 
@@ -59,9 +74,9 @@ public function display($action = null)
                 message(sprintf($lang_admin_index['New version available message'], '<a href="http://featherbb.org/">FeatherBB.org</a>'));
             }
         }
-        // Remove install.php
+        // Remove /install
         elseif ($action == 'remove_install_file') {
-            $deleted = @unlink(FEATHER_ROOT.'install.php');
+            $deleted = $this->remove_install_folder(FEATHER_ROOT.'install');
 
             if ($deleted) {
                 redirect(get_link('admin/'), $lang_admin_index['Deleted install.php redirect']);
@@ -70,7 +85,7 @@ public function display($action = null)
             }
         }
 
-        $install_file_exists = is_file(FEATHER_ROOT.'install.php');
+        $install_folder_exists = is_dir(FEATHER_ROOT.'install');
 
         $page_title = array(feather_escape($this->config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Index']);
 
@@ -82,7 +97,7 @@ public function display($action = null)
 
         $this->feather->render('admin/index.php', array(
                             'lang_admin_index'    =>    $lang_admin_index,
-                            'install_file_exists'    =>    $install_file_exists,
+                            'install_file_exists'    =>    $install_folder_exists,
                             'feather_config'    =>    $this->config,
                             )
                     );