Ticket #3368: freepbx.php.patch

File freepbx.php.patch, 3.7 kB (added by Nick_Lewis, 3 years ago)
  • freepbx.php

    old new  
    3939} 
    4040 
    4141?><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> 
     42<!-- should also validate ok with DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd" --> 
    4243<html> 
    4344 
    4445<head> 
    4546  <title><?php  echo _($title) ?></title> 
    46   <meta http-equiv="Content-Type" content="text/html"
    47   <link href="common/mainstyle.css" rel="stylesheet" type="text/css"
     47  <meta http-equiv="Content-Type" content="text/html" /
     48  <link href="common/mainstyle.css" rel="stylesheet" type="text/css" /
    4849<?php if (isset($use_nav_background) && $use_nav_background) { ?> 
    4950  <style type="text/css"> 
    5051    body { 
     
    5455    } 
    5556  </style> 
    5657<?php } ?> 
    57   <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="favicon.ico"
     58  <link rel="shortcut icon" type="image/vnd.microsoft.icon" href="favicon.ico" /
    5859  <!--[if IE]> 
    59   <link href="common/ie.css" rel="stylesheet" type="text/css"
     60  <link href="common/ie.css" rel="stylesheet" type="text/css" /
    6061  <![endif]-->   
    61   <meta http-equiv="Content-Type" content="text/html;charset=utf-8"
     62  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /
    6263<?php  
    6364  // check if in the amp configuration the user has set that 
    6465  // he wants to use an alternative style-sheet. 
     
    6869    if (($amp_conf["ALTERNATIVE_CSS"] == "1") || 
    6970      ($amp_conf["ALTERNATIVE_CSS"] == "yes") || 
    7071      ($amp_conf["ALTERNATIVE_CSS"] == "true")) 
    71       echo "\t<link href=\"common/mainstyle-alternative.css\" rel=\"stylesheet\" type=\"text/css\">"; 
     72      echo "\t<link href=\"common/mainstyle-alternative.css\" rel=\"stylesheet\" type=\"text/css\" />"; 
    7273  } 
    7374 
    7475  if (isset($module_name)) { 
    7576    if (is_file('modules/'.$module_name.'/'.$module_name.'.css')) { 
    76       echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_name.'.css" rel="stylesheet" type="text/css">'."\n"; 
     77      echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_name.'.css" rel="stylesheet" type="text/css" />'."\n"; 
    7778    } 
    7879    if (isset($module_page) && ($module_page != $module_name) && is_file('modules/'.$module_name.'/'.$module_page.'.css')) { 
    79       echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_page.'.css" rel="stylesheet" type="text/css">'."\n"; 
     80      echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_page.'.css" rel="stylesheet" type="text/css" />'."\n"; 
    8081    } 
    8182    if (is_file('modules/'.$module_name.'/'.$module_name.'.js')) { 
    8283      echo "\t".'<script type="text/javascript" src="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_name.'.js"></script>'."\n"; 
     
    156157 
    157158  $help_args = "?freepbx_version=".urlencode($version); 
    158159  if (isset($_REQUEST['display'])) { 
    159     $help_args .= "&freepbx_menuitem=".urlencode($_REQUEST['display']); 
     160    $help_args .= "&amp;freepbx_menuitem=".urlencode($_REQUEST['display']); 
    160161  } 
    161162   
    162163  echo "\t\t<ul id=\"metanav\">\n"; 
     
    169170  } 
    170171  print_sub_tool( _("Recordings"), "../recordings/index.php"  ,0, NULL, "ari" ); 
    171172  print_sub_tool( _("Help"), "http://www.freepbx.org/freepbx-help-system$help_args"  ,0, NULL, "help" ); 
    172   echo "<li class=\"last\"><a >&nbsp</a></li>"; 
     173  echo "<li class=\"last\"><a>&nbsp;</a></li>"; 
    173174  echo "\t\t</ul>\n"; 
    174175 
    175176  $freepbx_logo = (isset($amp_conf["AMPADMINLOGO"]) && is_file($amp_conf["AMPWEBROOT"]."/admin/images/".$amp_conf["AMPADMINLOGO"])) ? $amp_conf["AMPADMINLOGO"] : 'logo.png';