Changeset 1465

Show
Ignore:
Timestamp:
04/10/06 18:52:31 (7 years ago)
Author:
rcourtna
Message:

detect modules that requre upgrading and display upgrade button.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/functions.inc.php

    r1413 r1465  
    241241        1=disabled 
    242242        2=enabled 
     243        3=enabled and needs upgrade 
    243244        */ 
    244245        if(is_array($xmlarray[ $result['modulename'] ])) { 
    245           if ($result['enabled'] != 0) 
    246             $xmlarray[ $result['modulename'] ]["status"] = 2; 
    247           else 
     246          if ($result['enabled'] != 0) { 
     247            // check if file and registered versions are the same 
     248            // version_compare returns 0 if no difference 
     249            if (version_compare($result['version'],$xmlarray[ $result['modulename'] ]["version"]) === 0) 
     250              $xmlarray[ $result['modulename'] ]["status"] = 2; 
     251            else  
     252              $xmlarray[ $result['modulename'] ]["status"] = 3; 
     253          } else { 
    248254            $xmlarray[ $result['modulename'] ]["status"] = 1; 
     255          } 
    249256        } else { 
    250257          $xmlarray[ $result['modulename'] ]["status"] = -1; 

  • freepbx/trunk/amp_conf/htdocs/admin/page.modules.php

    r1442 r1465  
    2727    case "delete": 
    2828      deleteModule($_POST['modname']); 
    29       //echo "<script language=\"Javascript\">document.location='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."'</script>"; 
    3029    break; 
    3130    case "download": 
    3231      fetchModule($_POST['location']); 
    33       //echo "<script language=\"Javascript\">document.location='".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']."'</script>"; 
     32    break; 
     33    case "upgrade": 
     34      upgradeModule($_POST['modname']); 
    3435    break; 
    3536  } 
    …… 
    124125        $action .= "<input type=\"submit\" name=\"submit\" value=\""._("Disable")."\">"; 
    125126        $action .= "</form>"; 
     127      } else if($mod['status'] == 3){ 
     128        $status = _("Enabled - needs upgrade"); 
     129        //disable form 
     130        $action = "<form method=\"POST\" action=\"{$_SERVER['REQUEST_URI']}\" style=display:inline>"; 
     131        $action .= "<input type=\"hidden\" name=\"modname\" value=\"{$key}\">"; 
     132        $action .= "<input type=\"hidden\" name=\"modaction\" value=\"disable\">"; 
     133        $action .= "<input type=\"submit\" name=\"submit\" value=\""._("Disable")."\">"; 
     134        $action .= "</form>"; 
     135        //upgrade form 
     136        $action .= "<form method=\"POST\" action=\"{$_SERVER['REQUEST_URI']}\" style=display:inline>"; 
     137        $action .= "<input type=\"hidden\" name=\"modname\" value=\"{$key}\">"; 
     138        $action .= "<input type=\"hidden\" name=\"modversion\" value=\"{$mod['version']}\">"; 
     139        $action .= "<input type=\"hidden\" name=\"modaction\" value=\"upgrade\">"; 
     140        $action .= "<input type=\"submit\" name=\"submit\" value=\""._("Upgrade")."\">"; 
     141        $action .= "</form>"; 
    126142      } else if($mod['status'] == -1){ 
    127143        $status = _("Broken"); 
    …… 
    376392} 
    377393 
     394function upgradeModule($module) { 
     395  if(is_file("modules/$module/install.php")) 
     396    include "modules/$module/install.php"; 
     397} 
     398 
    378399?> 
    379400