Show
Ignore:
Timestamp:
02/19/11 11:03:19 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11469 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.4

........

r11464 | p_lindheimer | 2011-02-19 07:26:31 -0800 (Sat, 19 Feb 2011) | 1 line


adds PHP version information when update checks are sent so we can make decisions on min version number requirements

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.3

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/branches/2.4:1-5454,5492,5517,5648,5656,5710,5828,6057,6564,6700,9514,10467 to /freepbx/branches/2.4:1-5454,5492,5517,5648,5656,5710,5828,6057,6564,6700,9514,10467,11469 /freepbx/branches/2.2:1-4145,4434,4437

  • freepbx/branches/2.3/amp_conf/htdocs/admin/functions.inc.php

    r5829 r11470  
    29262926    $options .="&astver=".urlencode($engver['version']); 
    29272927  } 
     2928  $options .= "&phpver=".urlencode(phpversion()); 
    29282929 
    29292930  $announcement = @ file_get_contents("http://mirror.freepbx.org/version-".getversion().".html".$options); 

  • freepbx/branches/2.3/amp_conf/htdocs/admin/page.modules.php

    r10468 r11470  
    516516    echo "<a href='config.php?display=modules&amp;type=tool'>"._("Manage local modules")."</a>\n"; 
    517517    if (!EXTERNAL_PACKAGE_MANAGEMENT) { 
    518       echo " | <a class='info' href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX and Asterisk version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span></a>\n"; 
     518      echo " | <a class='info' href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX, Asterisk and PHP version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span></a>\n"; 
    519519    } 
    520520         
    …… 
    575575    } else { 
    576576      if (!EXTERNAL_PACKAGE_MANAGEMENT) { 
    577         echo "<a class='info' href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX and Asterisk version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span></a>\n"; 
     577        echo "<a class='info' href='config.php?display=modules&amp;type=tool&amp;online=1'>"._("Check for updates online")."<span>"._("Checking for updates will transmit your FreePBX, Asterisk and PHP version numbers along with a unique but random identifier. This is used to provide proper update information and track version usage to focus development and maintenance efforts. No private information is transmitted.")."</span></a>\n"; 
    578578      } 
    579579      echo " | <a href='config.php?display=modules&amp;type=tool&amp;extdisplay=upload'>"._("Upload module")."</a><br />\n";