Changeset 7058

Show
Ignore:
Timestamp:
10/21/08 14:11:41 (5 years ago)
Author:
p_lindheimer
Message:

send raw asterisk version info if the parsed version is blank, and escape the & when sending to wget

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7002 r7058  
    34413441  } 
    34423442  $engver=engine_getinfo(); 
    3443   if ($engver['engine'] == 'asterisk') { 
     3443  if ($engver['engine'] == 'asterisk' && trim($engver['engine']) != "") { 
    34443444    $options .="&astver=".urlencode($engver['version']); 
     3445  } else { 
     3446    $options .="&astver=".urlencode($engver['raw']); 
    34453447  } 
    34463448 
    …… 
    34523454  } 
    34533455  if (empty($announcement)) { 
    3454     exec("wget -O - $fn 2> /dev/null", $data_arr, $retcode); 
     3456    $fn2 = str_replace('&','\\&',$fn); 
     3457    exec("wget -O - $fn2 2>> /tmp/freepbx_debug.log", $data_arr, $retcode); 
    34553458    $announcement = implode("\n",$data_arr); 
    34563459  } 

  • freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx_admin.php

    r6987 r7058  
    5555  foreach ($fpbx_types as $key=>$val) { 
    5656    $type_name = (isset($fpbx_type_names[$val]) ? $fpbx_type_names[$val] : ucfirst($val)); 
    57     echo '<li><a href="#nav-'.str_replace(' ','_',$val).'"><span>'.$type_name.'</span></a></li>'; 
     57    echo '<li><a href="#nav-'.str_replace(' ','_',$val).'"><span>'._($type_name).'</span></a></li>'; 
    5858    if ($val == $fpbx_type) { 
    5959      $tab_num = $key+1;