Changeset 9059

Timestamp:

03/01/10 15:55:27 (3 years ago)

Author:

mickecarlsson

Message:

Made versionupgrade generic. All that need to be changed between releases are four global variables in functions.inc.php, the rest of the code is is using these globals.

Files:

• modules/branches/2.6/versionupgrade/functions.inc.php (modified) (3 diffs)
• modules/branches/2.6/versionupgrade/page.versionupgrade.php (modified) (4 diffs)

modules/branches/2.6/versionupgrade/functions.inc.php

@@ -4 +4 @@
- *
- */
+
+// Change the version numbers and text and publish
+$alpha_version   = "2.7.0alpha0";
+$beta1_version   = "2.7.0beta1";
+$beta1_0_version = "2.7.0beta1.0";
+$upgrade_ver     = "2.7";
+$upgrade_final   = "2.7.0 Final";
-
-function versionupgrade_setversion($version) {
@@ -23 +30 @@
-function versionupgrade_configprocess() {
-  global $db;
+  global $alpha_version;
+  global $beta1_version;
+  global $beta1_0_version;
-
-  $moduleinfo = module_getinfo('core');
-  $mainversion = getversion();
-
-"2.7.0alpha0","ge") && version_compare_freepbx($moduleinfo['core']['version'], "2.7.0alpha0"
+$alpha_version,"ge") && version_compare_freepbx($moduleinfo['core']['version'], $alpha_version
-    $sql = "UPDATE admin SET value = 'false' WHERE variable = 'need_reload'"; 
-    $result = $db->query($sql);
@@ -33 +43 @@
-      //can't do much?
-    }
-"2.7.0beta1","ge") && version_compare_freepbx($moduleinfo['core']['version'], "2.7.0beta1.0"
+$beta1_version,"ge") && version_compare_freepbx($moduleinfo['core']['version'], $beta1_0_version
-    $results = module_delete('versionupgrade');
-  }

modules/branches/2.6/versionupgrade/page.versionupgrade.php

@@ -27 +27 @@
-$core_version = $core_xml['core']['version'];
-
-
-
+
+
+
+
+
+
+
+
-  $version = getversion();
-}
-
-_("2.7 Upgrade Module"
+sprintf(_("%s Upgrade Module"),$upgrade_ver
-echo "<p><b>"._("Current Version Info (Updated each stage of upgrade process):")."</b></p>";
-?>
@@ -62 +68 @@
-</table>
-<?php
-
-
-
+
+
-?>
-
@@ -89 +94 @@
-  var theForm = document.upgrade;
-  function upgrade_onsubmit() {
-_("You are about to upgrade your system to FreePBX 2.7.0 Final. You can not reverse this process. Do you want to continue?"
+sprintf(_("You are about to upgrade your system to FreePBX %s. You can not reverse this process. Do you want to continue?"),$upgrade_final
-  
-    if (!confirm(msgConfirmUpgrade)) {
@@ -100 +105 @@
-
-<?php
-"2.7.0beta1"
+$beta_version
-
-2.7, your current version number is %s. The remaining steps you should take are:</p><ol><li>Go to Module Admin, press check for online updates, and upgrade the <b>FreePBX Framework</b> module from the online repository. Do not upgrade other modules.</li><li>Check for online updates again and upgrade all other modules that have upgrades available. If you get dependency warnings, simply repeat the process until all modules are upgraded.</li><li>Press the Apply Configuration Changes bar.</li></ol><p>Once you have completed these steps you will be upgraded to the new 2.7 version and you may disable or remove this module if it it does not do so automatically.</p>"),$version
+%s, your current version number is %s. The remaining steps you should take are:</p><ol><li>Go to Module Admin, press check for online updates, and upgrade the <b>FreePBX Framework</b> module from the online repository. Do not upgrade other modules.</li><li>Check for online updates again and upgrade all other modules that have upgrades available. If you get dependency warnings, simply repeat the process until all modules are upgraded.</li><li>Press the Apply Configuration Changes bar.</li></ol><p>Once you have completed these steps you will be upgraded to the new %s version and you may disable or remove this module if it it does not do so automatically.</p>"),$upgrade_ver,$version,$upgrade_ver
-
-"2.7.0alpha0"
+$alpha_version
-
-2.7, your current version number is %s. You still need to upgrade the Core Module and any other modules that show upgrades available. The remaining steps you should take are:</p><ol><li>Check for online updates again and upgrade all other modules that have upgrades available including Core. If you get dependency warnings simply repeat the process until all modules are upgraded.</li><li>Press the Apply Configuration Changes bar.</li></ol><p>Once you have completed these steps you will be upgraded to the new 2.7 version and you may disable or remove this module if it it does not do so automatically.</p>"),$version
+%s, your current version number is %s. You still need to upgrade the Core Module and any other modules that show upgrades available. The remaining steps you should take are:</p><ol><li>Check for online updates again and upgrade all other modules that have upgrades available including Core. If you get dependency warnings simply repeat the process until all modules are upgraded.</li><li>Press the Apply Configuration Changes bar.</li></ol><p>Once you have completed these steps you will be upgraded to the new %s version and you may disable or remove this module if it it does not do so automatically.</p>"),$upgrade_ver,$version,$upgrade_ver
-
-} else {