Changeset 2227 for branches

Timestamp:

11/10/10 13:33:23 (18 months ago)

Author:

nick_ramsay

Message:

[1.4.2] Removed non-functional option to delete the install folder. The feature can't work in its current form because it would delete the file that's doing the deletion. ;)

Location:

branches/1.4

Files:

• Hotaru.php (modified) (1 diff)
• install/index.php (modified) (6 diffs)
• install/install_functions.php (modified) (1 diff)
• install/install_language.php (modified) (1 diff)

branches/1.4/Hotaru.php

@@ -1491 +1491 @@
         {
                 $maintenance = new Maintenance();
-                $maintenance->deleteFiles($dir);
+                return $maintenance->deleteFiles($dir);
         }
         

branches/1.4/install/index.php

@@ -102 +102 @@
                 } else {
                         $db = init_database();
-                        database_creation();        // Creates the database tables
+                        database_creation($h);        // Creates the database tables
                 }
                 break;
@@ -470 +470 @@
  * Step 2 of installation - Creates database tables
  */
-function database_creation()
+function database_creation($h)
 {
         global $lang;
@@ -594 +594 @@
 
         // Step content
-        echo "<div class='install_content'>" . $lang['install_step3_instructions'] . ":<br />\n";
+        echo "<div class='install_content'>" . $lang['install_step3_instructions'] . ":<br /><br />\n";
 
         $error = 0;
@@ -749 +749 @@
         
         $phpinfo = $cage->post->getAlpha('phpinfo');        // delete install folder.
-        $delete = $cage->post->getAlpha('delete');        // delete install folder.
-        
-        $folder_deleted = 0;
-
-        if ($delete) {
-            // try to delete the folder
-            //$folder_deleted = delTree('install');
-            $folder_deleted = 2;
-            // if was deleted then redirect to baseurl
-            if ($folder_deleted == 1) header("Location: /index.php" );
-        }
-
-        if (!$delete && !$phpinfo) {
-            //send feedback report
-            $systeminfo = new SystemInfo();
-            $systeminfo->hotaru_feedback($h);
-        }
 
         echo html_header();
@@ -773 +756 @@
 
         // Step content
-        
-        if ($folder_deleted == 0) echo "<div class='install_content'>" . $lang['install_step4_installation_complete'] . "</div>\n";
+        echo "<div class='install_content'>" . $lang['install_step4_installation_complete'] . "</div>\n";
         echo "<div class='install_content'>" . $lang['install_step4_installation_delete'] . "</div>\n";
 
@@ -811 +793 @@
             echo "<input class='update button' type='submit' value='" . $lang['install_step4_form_check_php'] . "' />";
             echo "</div></form>\n";
-        }
-
-        if ($folder_deleted == 0) {
-            // Confirm delete and continue install
-            echo "<div class='install_content'>" . $lang['install_step4_installation_delete_folder'] . "</div>\n";
-            echo "<form name='install_admin_reg_form' action='index.php?step=4' method='post'>\n";          
-            echo "<input type='hidden' name='delete' value='folder' />";
-            echo "<input type='hidden' name='step' value='4' />";
-
-            echo "<input class='update button' type='submit' value='" . $lang['install_step4_form_delete_folder'] . "' />";
-            echo "</div></form>\n";
-        } else {
-            echo "<br/><img src='../content/admin_themes/admin_default/images/delete.png' style='float:left; margin-left:12px;'>";
-            echo "<div class='install_content'><span style='color: red;'>" . $lang['install_step1_warning'] . "</span>: " . $lang['install_step4_installation_delete_failed'] . "</div>\n";
         }
 

branches/1.4/install/install_functions.php

@@ -135 +135 @@
  */
 function delTree($dir) {
-    $files = glob( $dir . '*', GLOB_MARK );
-    foreach( $files as $file ){
-        if( is_dir( $file ) )
-            delTree( $file );
-        else
-            unlink( $file );
-    }
 
-    if (is_dir($dir)) return rmdir( $dir );
+        $files = glob( $dir . '*', GLOB_MARK );
+
+        foreach( $files as $file ){
+                if( is_dir( $file ) )
+                        delTree( $file );
+                else
+                        @unlink( $file );
+        }
+        
+        if (is_dir($dir)) return @rmdir( $dir );
 }

branches/1.4/install/install_language.php

@@ -139 +139 @@
 $lang["install_step4"] = "Step 4/4: Completion";
 $lang["install_step4_installation_complete"] = "Installation has been successfully completed.";
-$lang["install_step4_installation_delete"] = "You <b>must</b> delete the install folder or someone else could run the install script and wipe everything!";
-$lang["install_step4_installation_delete_folder"] = "Shall we try and delete the 'install' folder for you?";
-$lang["install_step4_form_delete_folder"] = "Delete Folder";
-$lang["install_step4_installation_delete_failed"] = "We were not able to delete the install folder. Please delete it manually.";
+$lang["install_step4_installation_delete"] = "<span style='color: red;'><b>WARNING:</b> You <b>must</b> delete the install folder or someone else could run the install script and wipe everything!</span>";
+
 $lang["install_step4_form_check_php"] = "Check PHP Setup";
 $lang["install_step4_form_check_php_warning"] = "Note: Your server is missing the PHP module: ";