mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

The service status icon (get_service_status_icon) is not always in a table.

Browse Source 
So the caller should apply table td element, rather than the function.

Document type does not allow element "td" here <td class="listr" align="center">
The element named above was found in a context where it is not allowed.
This commit is contained in:
N0YB 2014-01-26 21:58:25 -08:00
parent 8467c588e4
commit cd6173f48c
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/inc/service-utils.inc
View File

@ -442,23 +442,21 @@ function get_service_status_icon($service, $withtext = true, $smallicon = false)
$output = "";
if(get_service_status($service)) {
$statustext = gettext("Running");
$output .= '<td class="listr" align="center">' . "\n";
$output .= "<img style=\"vertical-align:middle\" title=\"" . sprintf(gettext("%s Service is"),$service["name"]) . " {$statustext}\" src=\"/themes/" . $g["theme"] . "/images/icons/";
$output .= ($smallicon) ? "icon_pass.gif" : "icon_service_running.gif";
$output .= "\" alt=\"status\" />";
if ($withtext)
$output .= "&nbsp;&nbsp;" . $statustext;
$output .= "</td>\n";
$output .= "\n";
} else {
$service_enabled = is_service_enabled($service['name']);
$statustext = ($service_enabled) ? gettext("Stopped") : gettext("Disabled");
$output .= '<td class="listbg" align="center">' . "\n";
$output .= "<img style=\"vertical-align:middle\" title=\"" . sprintf(gettext("%s Service is"),$service["name"]) . " {$statustext}\" src=\"/themes/" . $g["theme"] . "/images/icons/";
$output .= ($smallicon) ? "icon_block.gif" : "icon_service_stopped.gif";
$output .= "\" alt=\"status\" />";
if ($withtext)
$output .= "&nbsp;&nbsp;" . "<font color=\"white\">{$statustext}</font>";
$output .= "</td>\n";
$output .= "\n";
}
return $output;
}

6
usr/local/www/status_openvpn.php
View File

@ -195,7 +195,9 @@ include("head.inc"); ?>
<table>
<tr>
<?php $ssvc = find_service_by_openvpn_vpnid($server['vpnid']); ?>
<td class="listr" align="center">
<?= get_service_status_icon($ssvc, true, true); ?>
</td>
<td><?= get_service_control_links($ssvc, true); ?></td>
</tr>
</table>
@ -308,7 +310,9 @@ include("head.inc"); ?>
<table>
<tr>
<?php $ssvc = find_service_by_openvpn_vpnid($sk_server['vpnid']); ?>
<td class="listr" align="center">
<?= get_service_status_icon($ssvc, false, true); ?>
</td>
<td><?= get_service_control_links($ssvc, true); ?></td>
</tr>
</table>
@ -371,7 +375,9 @@ include("head.inc"); ?>
<table>
<tr>
<?php $ssvc = find_service_by_openvpn_vpnid($client['vpnid']); ?>
<td class="listr" align="center">
<?= get_service_status_icon($ssvc, false, true); ?>
</td>
<td><?= get_service_control_links($ssvc, true); ?></td>
</tr>
</table>

2
usr/local/www/status_services.php
View File

@ -95,7 +95,9 @@ if (count($services) > 0) {
$service['description'] = get_pkg_descr($service['name']);
echo '<tr><td class="listlr" width="20%">' . $service['name'] . '</td>' . "\n";
echo '<td class="listr" width="55%">' . $service['description'] . '</td>' . "\n";
echo '<td class="listr" align="center">' . "\n";
echo get_service_status_icon($service, true, true);
echo "</td>\n";
echo '<td valign="middle" class="list nowrap">';
echo get_service_control_links($service);
$scut = get_shortcut_by_service_name($service['name']);

2
usr/local/www/widgets/widgets/services_status.widget.php
View File

@ -75,7 +75,9 @@ if (count($services) > 0) {
$service_desc = explode(".",$service['description']);
echo '<tr><td class="listlr">' . $service['name'] . '</td>' . "\n";
echo '<td class="listr">' . $service_desc[0] . '</td>' . "\n";
echo '<td class="listr" align="center">' . "\n";
echo get_service_status_icon($service, false, true);
echo "</td>\n";
echo '<td valign="middle" class="list nowrap">';
echo get_service_control_links($service);
echo "</td></tr>\n";