Changeset 6288
- Timestamp:
- 08/05/08 16:26:41 (2 months ago)
- Files:
-
- modules/branches/2.4/versionupgrade (copied) (copied from modules/branches/2.3/versionupgrade)
- modules/branches/2.4/versionupgrade/functions.inc.php (copied) (copied from modules/branches/2.3/versionupgrade/functions.inc.php) (2 diffs)
- modules/branches/2.4/versionupgrade/install.php (copied) (copied from modules/branches/2.3/versionupgrade/install.php)
- modules/branches/2.4/versionupgrade/module.xml (copied) (copied from modules/branches/2.3/versionupgrade/module.xml) (1 diff)
- modules/branches/2.4/versionupgrade/page.versionupgrade.php (copied) (copied from modules/branches/2.3/versionupgrade/page.versionupgrade.php) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.4/versionupgrade/functions.inc.php
r5708 r6288 27 27 $mainversion = getversion(); 28 28 29 if (version_compare_freepbx($mainversion,"2. 4.0alpha0","ge") && version_compare_freepbx($moduleinfo['core']['version'], "2.4.0alpha0", "lt")) {29 if (version_compare_freepbx($mainversion,"2.5.0alpha0","ge") && version_compare_freepbx($moduleinfo['core']['version'], "2.5.0alpha0", "lt")) { 30 30 $sql = "UPDATE admin SET value = 'false' WHERE variable = 'need_reload'"; 31 31 $result = $db->query($sql); … … 33 33 //can't do much? 34 34 } 35 } else if (version_compare_freepbx($mainversion,"2. 4.0","ge") && version_compare_freepbx($moduleinfo['core']['version'], "2.4.0.0", "ge")) {35 } else if (version_compare_freepbx($mainversion,"2.5.0beta1","ge") && version_compare_freepbx($moduleinfo['core']['version'], "2.5.0beta1.0", "ge")) { 36 36 $results = module_delete('versionupgrade'); 37 37 } modules/branches/2.4/versionupgrade/module.xml
r5709 r6288 1 1 <module> 2 2 <rawname>versionupgrade</rawname> 3 <name>2. 4Upgrade Tool</name>4 <version>2. 3.0.1</version>3 <name>2.5 Upgrade Tool</name> 4 <version>2.4.0.0</version> 5 5 <changelog> 6 *2.4.0.0* Modify for 2.4 to 2.5 upgrade tool to beta1 6 7 *2.3.0.1* delete the current xml file so the 2.3 version is not cached 7 8 *2.3.0* Upgrade module to upgrade from 2.3 to 2.4 8 9 </changelog> 9 10 <description> 10 This module allows a 2. 3 system to be upgraded to a 2.4system. It provides a button that will11 bump up the major version number to 2. 4.0alpha0 which has the effect of directing Module Admin12 to use the 2. 4repository. Doing such will then allow the user to upgrade all require modules13 and framework to enable 2. 4.11 This module allows a 2.4 system to be upgraded to a 2.5 system. It provides a button that will 12 bump up the major version number to 2.5.0alpha0 which has the effect of directing Module Admin 13 to use the 2.5 repository. Doing such will then allow the user to upgrade all require modules 14 and framework to enable 2.5. 14 15 </description> 15 16 <type>tool</type> 16 17 <menuitems> 17 <versionupgrade1 display="versionupgrade" type="tool" category="Admin" sort="10">2. 4Upgrade Tool</versionupgrade1>18 <versionupgrade2 display="versionupgrade" type="setup" category="Admin" sort="10">2. 4Upgrade Tool</versionupgrade2>18 <versionupgrade1 display="versionupgrade" type="tool" category="Admin" sort="10">2.5 Upgrade Tool</versionupgrade1> 19 <versionupgrade2 display="versionupgrade" type="setup" category="Admin" sort="10">2.5 Upgrade Tool</versionupgrade2> 19 20 </menuitems> 20 21 <depends> 21 <version>lt 2. 4.0</version>22 <version>lt 2.5.0alpha1</version> 22 23 </depends> 23 24 <category>Basic</category> modules/branches/2.4/versionupgrade/page.versionupgrade.php
r5699 r6288 27 27 $core_version = $core_xml['core']['version']; 28 28 29 if (version_compare_freepbx($version, "2. 4.0alpha0","lt") && $upgraderequest == "UPGRADE") {30 versionupgrade_setversion("2. 4.0alpha0");29 if (version_compare_freepbx($version, "2.5.0alpha0","lt") && $upgraderequest == "UPGRADE") { 30 versionupgrade_setversion("2.5.0alpha0"); 31 31 $version = getversion(); 32 32 } 33 33 34 echo "<h2>".sprintf(_("2. 4Upgrade Module"))."</h2>";34 echo "<h2>".sprintf(_("2.5 Upgrade Module"))."</h2>"; 35 35 ?> 36 36 <table> … … 63 63 <?php 64 64 65 if (version_compare_freepbx($version, "2. 4.0alpha0","lt")) {66 echo sprintf(_("This module will allow you to upgrade to FreePBX version 2. 4 from the current version, %s, that you are running.<br />The upgrade process is a simple but multi-step process that you should complete all at one time. As always when upgrading a system, it is advisable that you complete this process when the system is not actively being used.<br /><b>IMPORTANT:</b> Do NOT Apply Configuration Changes (reload bar) until you have gone through all the steps! The steps you will take are:<ol><li>Press the upgrade button below</li><li>Go to Module Admin, check for online updates, and upgrade the <b>FreePBX Framework</b> module ONLY from the online repository which will now be connected to version 2.4. <b>DO NOT</b> Press Apply Configuration Changes</li><li>Now, Check for online updates again and upgrade all other modules that have upgrades available</li><li>Now press the Apply Configuration bar</li></ol>Once you have completed these step you will be upgraded to the new 2.4version and you may disable or remove this module if it does not do so automatically.<br />If you accidentally press the Apply Configuration Changes part way through the process, just go back and finish the process to remove the errors you are getting"),$version);65 if (version_compare_freepbx($version, "2.5.0alpha0","lt")) { 66 echo sprintf(_("This module will allow you to upgrade to FreePBX version 2.5 from the current version, %s, that you are running.<br />The upgrade process is a simple but multi-step process that you should complete all at one time. As always when upgrading a system, it is advisable that you complete this process when the system is not actively being used.<br /><b>IMPORTANT:</b> Do NOT Apply Configuration Changes (reload bar) until you have gone through all the steps! The steps you will take are:<ol><li>Press the upgrade button below</li><li>Go to Module Admin, check for online updates, and upgrade the <b>FreePBX Framework</b> module ONLY from the online repository which will now be connected to version 2.5. <b>DO NOT</b> Press Apply Configuration Changes</li><li>Now, Check for online updates again and upgrade all other modules that have upgrades available</li><li>Now press the Apply Configuration bar</li></ol>Once you have completed these step you will be upgraded to the new 2.5 version and you may disable or remove this module if it does not do so automatically.<br />If you accidentally press the Apply Configuration Changes part way through the process, just go back and finish the process to remove the errors you are getting"),$version); 67 67 ?> 68 68 … … 89 89 var theForm = document.upgrade; 90 90 function upgrade_onsubmit() { 91 var msgConfirmUpgrade = "<?php echo _("You are about to upgrade your system to FreePBX 2. 4. You can not reverse this process. Do you want to continue?"); ?>";91 var msgConfirmUpgrade = "<?php echo _("You are about to upgrade your system to FreePBX 2.5. You can not reverse this process. Do you want to continue?"); ?>"; 92 92 93 93 if (!confirm(msgConfirmUpgrade)) { … … 100 100 101 101 <?php 102 } else if (version_compare_freepbx($version, "2. 4.0","lt")) {102 } else if (version_compare_freepbx($version, "2.5.0beta1","lt")) { 103 103 104 echo sprintf(_("You appear to have partially upgraded to version 2. 4, your current version number is %s. <br /><b>IMPORTANT:</b> Do NOT Apply Configuration Changes (reload bar) until you have gone through all the steps! The remaining steps you should take are:<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. <b>DO NOT</b> press Apply Configuration Changes</li><li>Check for online updates again and upgrade all other modules that have upgrades available</li><li>Press the Reload Configuration bar</li></ol>Once you have completed those step you will be upgraded to the new 2.4version and you may disable or remove this module if it it does not do so automatically.<br />If you accidentally press the Apply Configuration Changes part way through the process, just go back and finish the process to remove the errors you are getting"),$version);104 echo sprintf(_("You appear to have partially upgraded to version 2.5, your current version number is %s. <br /><b>IMPORTANT:</b> Do NOT Apply Configuration Changes (reload bar) until you have gone through all the steps! The remaining steps you should take are:<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. <b>DO NOT</b> press Apply Configuration Changes</li><li>Check for online updates again and upgrade all other modules that have upgrades available</li><li>Press the Reload Configuration bar</li></ol>Once you have completed those step you will be upgraded to the new 2.5 version and you may disable or remove this module if it it does not do so automatically.<br />If you accidentally press the Apply Configuration Changes part way through the process, just go back and finish the process to remove the errors you are getting"),$version); 105 105 106 } else if (version_compare_freepbx($core_version, "2. 4.0alpha0", "lt")) {106 } else if (version_compare_freepbx($core_version, "2.5.0alpha0", "lt")) { 107 107 108 echo sprintf(_("You appear to have upgraded Framework to version 2. 4, your current version number is %s. You still need to upgrade the Core Module and any other modules that show upgrades available.<br /><b>IMPORTANT:</b> Do NOT Apply Configuration Changes (reload bar) until you have gone through all the steps! The remaining steps you should take are:<ol><li>Check for online updates again and upgrade all other modules that have upgrades available including Core</li><li>Press the Reload Configuration bar</li></ol>Once you have completed those step you will be upgraded to the new 2.4version and you may disable or remove this module if it it does not do so automatically.<br />If you accidentally press the Apply Configuration Changes part way through the process, just go back and finish the process to remove the errors you are getting"),$version);108 echo sprintf(_("You appear to have upgraded Framework to version 2.5, your current version number is %s. You still need to upgrade the Core Module and any other modules that show upgrades available.<br /><b>IMPORTANT:</b> Do NOT Apply Configuration Changes (reload bar) until you have gone through all the steps! The remaining steps you should take are:<ol><li>Check for online updates again and upgrade all other modules that have upgrades available including Core</li><li>Press the Reload Configuration bar</li></ol>Once you have completed those step you will be upgraded to the new 2.5 version and you may disable or remove this module if it it does not do so automatically.<br />If you accidentally press the Apply Configuration Changes part way through the process, just go back and finish the process to remove the errors you are getting"),$version); 109 109 110 110 } else {
