Changeset 12987

Show
Ignore:
Timestamp:
12/04/11 16:27:54 (1 year ago)
Author:
p_lindheimer
Message:

don't need to pass MODULE_REPO to functions as it is the default

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r12642 r12987  
    1414 
    1515$extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:''; 
    16 $repo = $amp_conf['MODULE_REPO']; 
    1716 
    1817global $active_repos; 
    …… 
    159158 
    160159if ($online) { 
    161   $modules_online = module_getonlinexml(false, $repo); 
     160  $modules_online = module_getonlinexml(); 
    162161   
    163162  // $module_getonlinexml_error is a global set by module_getonlinexml() 
    164163  if ($module_getonlinexml_error) { 
    165     echo "<div class=\"warning\"><p>".sprintf(_("Warning: Cannot connect to online repository (%s). Online modules are not available."), $amp_conf['MODULE_REPO'])."</p></div><br />"; 
     164    echo "<div class=\"warning\"><p>".sprintf(_("Warning: Cannot connect to online repository(s) (%s). Online modules are not available."), $amp_conf['MODULE_REPO'])."</p></div><br />"; 
    166165    $online = 0; 
    167166    unset($modules_online); 
    168167  } else if (!is_array($modules_online)) { 
    169     echo "<div class=\"warning\"><p>".sprintf(_("Warning: Error retrieving updates from online repository (%s). Online modules are not available."), $amp_conf['MODULE_REPO'])."</p></div><br />"; 
     168    echo "<div class=\"warning\"><p>".sprintf(_("Warning: Error retrieving updates from online repository(s) (%s). Online modules are not available."), $amp_conf['MODULE_REPO'])."</p></div><br />"; 
    170169    $online = 0; 
    171170    unset($modules_online); 
    …… 
    222221          if (!EXTERNAL_PACKAGE_MANAGEMENT) { 
    223222            echo sprintf(_('Downloading %s'), $modulename).' <span id="downloadprogress_'.$modulename.'"></span>'; 
    224             if (is_array($errors = module_download($modulename, false, 'download_progress', false, $repo))) { 
     223            if (is_array($errors = module_download($modulename, false, 'download_progress'))) { 
    225224              echo '<span class="error">'.sprintf(_("Error(s) downloading %s"),$modulename).': '; 
    226225              echo '<ul><li>'.implode('</li><li>',$errors).'</li></ul>';