Changeset 6288

Show
Ignore:
Timestamp:
08/05/08 16:26:41 (2 months ago)
Author:
p_lindheimer
Message:

add verisonupgrade to 2.4 for 2.4 to 2.5 upgrade

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.4/versionupgrade/functions.inc.php

    r5708 r6288  
    2727        $mainversion = getversion(); 
    2828 
    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")) { 
    3030                $sql = "UPDATE admin SET value = 'false' WHERE variable = 'need_reload'";  
    3131                $result = $db->query($sql); 
     
    3333                        //can't do much? 
    3434                } 
    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")) { 
    3636                $results = module_delete('versionupgrade'); 
    3737        } 
  • modules/branches/2.4/versionupgrade/module.xml

    r5709 r6288  
    11<module> 
    22        <rawname>versionupgrade</rawname> 
    3         <name>2.4 Upgrade Tool</name> 
    4         <version>2.3.0.1</version> 
     3        <name>2.5 Upgrade Tool</name> 
     4        <version>2.4.0.0</version> 
    55        <changelog> 
     6                *2.4.0.0* Modify for 2.4 to 2.5 upgrade tool to beta1 
    67                *2.3.0.1* delete the current xml file so the 2.3 version is not cached 
    78                *2.3.0* Upgrade module to upgrade from 2.3 to 2.4 
    89        </changelog> 
    910        <description> 
    10                 This module allows a 2.3 system to be upgraded to a 2.4 system. It provides a button that will 
    11                 bump up the major version number to 2.4.0alpha0 which has the effect of directing Module Admin 
    12                 to use the 2.4 repository. Doing such will then allow the user to upgrade all require modules 
    13                 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.  
    1415        </description> 
    1516        <type>tool</type> 
    1617        <menuitems> 
    17                 <versionupgrade1 display="versionupgrade" type="tool" category="Admin" sort="10">2.4 Upgrade Tool</versionupgrade1> 
    18                 <versionupgrade2 display="versionupgrade" type="setup" category="Admin" sort="10">2.4 Upgrade 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> 
    1920        </menuitems> 
    2021        <depends> 
    21                 <version>lt 2.4.0</version> 
     22                <version>lt 2.5.0alpha1</version> 
    2223        </depends> 
    2324        <category>Basic</category> 
  • modules/branches/2.4/versionupgrade/page.versionupgrade.php

    r5699 r6288  
    2727$core_version = $core_xml['core']['version']; 
    2828 
    29 if (version_compare_freepbx($version, "2.4.0alpha0","lt") && $upgraderequest == "UPGRADE") { 
    30         versionupgrade_setversion("2.4.0alpha0"); 
     29if (version_compare_freepbx($version, "2.5.0alpha0","lt") && $upgraderequest == "UPGRADE") { 
     30        versionupgrade_setversion("2.5.0alpha0"); 
    3131        $version = getversion(); 
    3232} 
    3333 
    34 echo "<h2>".sprintf(_("2.4 Upgrade Module"))."</h2>"; 
     34echo "<h2>".sprintf(_("2.5 Upgrade Module"))."</h2>"; 
    3535?> 
    3636<table> 
     
    6363<?php 
    6464 
    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.4 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); 
     65if (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); 
    6767?> 
    6868 
     
    8989        var theForm = document.upgrade; 
    9090        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?"); ?>"; 
    9292         
    9393                if (!confirm(msgConfirmUpgrade)) { 
     
    100100 
    101101<?php 
    102 } else if (version_compare_freepbx($version, "2.4.0","lt")) { 
     102} else if (version_compare_freepbx($version, "2.5.0beta1","lt")) { 
    103103 
    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.4 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); 
     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); 
    105105 
    106 }       else if (version_compare_freepbx($core_version, "2.4.0alpha0", "lt")) { 
     106}       else if (version_compare_freepbx($core_version, "2.5.0alpha0", "lt")) { 
    107107 
    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.4 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); 
     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); 
    109109 
    110110} else { 
Donate



Support
Download
Develop
Forums
News
Documentation
Paid Support
About

Paid Ads