Changeset 2268

Timestamp:

11/29/10 11:15:16 (18 months ago)

Author:

nick_ramsay

Message:

[1.5] Reduced upgrade script to two steps, fixing ticket #178 ("delete install folder" notice one step too early). Added constant definitions for SITEURL to fix undefined errors.

Location:

branches/1.5/install

Files:

• index.php (modified) (2 diffs)
• install-upgrade.php (modified) (3 diffs)
• install_language.php (modified) (2 diffs)

branches/1.5/install/index.php

@@ -42 +42 @@
 }
 
+if (!defined("SITEURL")) { define("SITEURL", BASEURL); }
+
 // define path constants
 $path_constants = array(
@@ -811 +813 @@
 
 /**
- * Step 3 of upgrade - shows completion.
- */
-function upgrade_plugins()
-{
-        global $lang;
-        global $cage;
-        $h = new Hotaru();
-        echo html_header();
-
-        // Step title
-        echo "<h2>" . $lang['upgrade_step3'] . "</h2>\n";
-
-        echo "<br/><div class='install_content'>" . $lang['upgrade_step3_details'] . "<br/><br/>\n";
-
-        //send feedback report
-        $systeminfo = new SystemInfo();
-        $systeminfo->hotaru_feedback($h);
-
-        echo "<br/>" . $lang['upgrade_step3_instructions'] . "<br/><br/>\n";
-        
-        echo "<br/>" . $lang['upgrade_step3_go_play'] . "</div><br/><br/>\n";
-
-        // Previous/Next buttons
-        echo "<div class='back button''><a href='index.php?step=2&action=upgrade'>" . $lang['install_back'] . "</a></div>\n";
-        echo "<div class='next button''><a href='" . BASEURL . "admin_index.php'>" . $lang['upgrade_home'] . "</a></div>\n";
-
-        echo html_footer();
-}
-
-/**
  * create new settings file
  */

branches/1.5/install/install-upgrade.php

@@ -29 +29 @@
  */
 
+if (!defined("SITEURL")) { define("SITEURL", BASEURL); }
 
 $h = new Hotaru(); // must come before language inclusion
@@ -103 +104 @@
 {
         global $lang;
-        global $cage;
-        $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" );
-        }
 
         echo html_header();
@@ -121 +111 @@
 
         // 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";
-
-        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=2&action=upgrade' method='post'>\n";
-//          echo "<input type='hidden' name='csrf' value='" . $h->csrfToken . "' />";
-//          echo "<input type='hidden' name='delete' value='folder' />";
-//          echo "<input type='hidden' name='step' value='2' />";
-//
-//          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";
-        }       
 
         // Previous/Next buttons
         echo "<div class='back button''><a href='index.php?step=1&action=upgrade'>" . $lang['install_back'] . "</a></div>\n";
-        echo "<div class='next button''><a href='index.php?step=3&action=upgrade'>" . $lang['install_next'] . "</a></div>\n";
+        echo "<div class='next button''><a href='" . BASEURL . "admin_index.php'>" . $lang['upgrade_home'] . "</a></div>\n";
         
         echo html_footer();    

branches/1.5/install/install_language.php

@@ -27 +27 @@
 $lang["upgrade_title"] = "Hotaru CMS Upgrade";
 
-$lang["upgrade_step1"] = "Step 1/3: Checking your existing setup";
+$lang["upgrade_step1"] = "Step 1/2: Checking your existing setup";
 $lang["upgrade_step1_details"] = "To upgrade Hotaru to version " . $h->version . ", click 'Next'...";
 $lang["upgrade_step1_old_version"] = "You are currently running Hotaru CMS version ";
@@ -34 +34 @@
 
 /* Upgrade Step 2 */
-$lang["upgrade_step2"] = "Step 2/3: Upgrade Complete";
+$lang["upgrade_step2"] = "Step 2/2: Upgrade Complete";
 $lang["upgrade_step2_details"] = "Congratulations! You have successfully upgraded Hotaru CMS.";
-
-/* Upgrade Step 2 */
-$lang["upgrade_step3"] = "Step 3/3: Check Plugins, Templates";
-$lang["upgrade_step3_details"] = "You have successfully upgraded Hotaru CMS.";
-$lang["upgrade_step3_instructions"] = "After clicking \"Finish\" you may find some of your plugins need upgrading. You can check the latest version numbers from the Plugin Management page in your admin dashboard. You may also need to modify any templates you have customised to make sure they work with the latest version of Hotaru CMS.";
-$lang["upgrade_step3_go_play"] = "Click \"Finish\" to access your Hotaru site!";
 $lang["upgrade_home"] = "Finish";