diff options
author | Charlie Marshall <charlie0440@gmail.com> | 2013-08-06 23:46:42 +0100 |
---|---|---|
committer | Charlie Marshall <charlie0440@gmail.com> | 2013-08-06 23:46:42 +0100 |
commit | 9b50c0ed68c80e59c040d4c11d986f32661d4c47 (patch) | |
tree | 7f4122fb336d5ee566a111d42deb8daea8fe6e73 /usr/local | |
parent | b05a8f356f3ae9b2ffb8ed71f632c97936737247 (diff) | |
download | pfsense-9b50c0ed68c80e59c040d4c11d986f32661d4c47.zip pfsense-9b50c0ed68c80e59c040d4c11d986f32661d4c47.tar.gz |
remove whitespaces from widgets
Diffstat (limited to 'usr/local')
7 files changed, 95 insertions, 95 deletions
diff --git a/usr/local/www/widgets/widgets/dyn_dns_status.widget.php b/usr/local/www/widgets/widgets/dyn_dns_status.widget.php index 2ae268b..6fc9da7 100644 --- a/usr/local/www/widgets/widgets/dyn_dns_status.widget.php +++ b/usr/local/www/widgets/widgets/dyn_dns_status.widget.php @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ /* - pfSense_BUILDER_BINARIES: /usr/bin/host + pfSense_BUILDER_BINARIES: /usr/bin/host pfSense_MODULE: dyndns */ @@ -109,8 +109,8 @@ if($_REQUEST['getdyndnsstatus']) { <?php $types = explode(",", DYNDNS_PROVIDER_DESCRIPTIONS); $vals = explode(" ", DYNDNS_PROVIDER_VALUES); - for ($j = 0; $j < count($vals); $j++) - if ($vals[$j] == $dyndns['type']) { + for ($j = 0; $j < count($vals); $j++) + if ($vals[$j] == $dyndns['type']) { if (!isset($dyndns['enable'])) echo "<span class=\"gray\">".htmlspecialchars($types[$j])."</span>"; else diff --git a/usr/local/www/widgets/widgets/interface_statistics.widget.php b/usr/local/www/widgets/widgets/interface_statistics.widget.php index ff14a2e..3feba5f 100644 --- a/usr/local/www/widgets/widgets/interface_statistics.widget.php +++ b/usr/local/www/widgets/widgets/interface_statistics.widget.php @@ -1,6 +1,6 @@ <?php /* - $Id: interface_statistics.widget.php + $Id: interface_statistics.widget.php Copyright 2007 Scott Dale Part of pfSense widgets (www.pfsense.com) originally based on m0n0wall (http://m0n0.ch/wall) @@ -39,7 +39,7 @@ require_once("functions.inc"); require_once("/usr/local/www/widgets/include/interface_statistics.inc"); $ifdescrs = get_configured_interface_with_descr(); - + $array_in_packets = array(); $array_out_packets = array(); $array_in_bytes = array(); @@ -49,12 +49,12 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); $array_collisions = array(); $array_interrupt = array(); $interfacecounter = 0; - + //build data arrays foreach ($ifdescrs as $ifdescr => $ifname){ $ifinfo = get_interface_info($ifdescr); $interfacecounter++; - if ($ifinfo['status'] != "down"){ + if ($ifinfo['status'] != "down"){ $array_in_packets[] = $ifinfo['inpkts']; $array_out_packets[] = $ifinfo['outpkts']; $array_in_bytes[] = format_bytes($ifinfo['inbytes']); @@ -72,84 +72,84 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); else $array_collisions[] = "n/a"; } - - + + }//end for - - - - + + + + ?> - <div style="padding: 5px"> + <div style="padding: 5px"> <div id="int_labels" style="float:left;width:32%"> <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="interfaces statistics"> - <tr><td class="widgetsubheader" style="height:25px"> </td></tr> + <tr><td class="widgetsubheader" style="height:25px"> </td></tr> <tr> <td class="vncellt" style="height:25px">Packets In</td> - </tr> + </tr> <tr> <td class="vncellt" style="height:25px">Packets Out</td> - </tr> + </tr> <tr> <td class="vncellt" style="height:25px">Bytes In</td> - </tr> + </tr> <tr> <td class="vncellt" style="height:25px">Bytes Out</td> - </tr> + </tr> <tr> <td class="vncellt" style="height:25px">Errors In</td> - </tr> + </tr> <tr> <td class="vncellt" style="height:25px">Errors Out</td> - </tr> + </tr> <tr> <td class="vncellt" style="height:25px">Collisions</td> - </tr> + </tr> </table> </div> <div id="interfacestats" style="float:right;overflow: auto; width:68%"> - + <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="the stats"> <tr> - <?php + <?php $interface_names = array(); - foreach ($ifdescrs as $ifdescr => $ifname): + foreach ($ifdescrs as $ifdescr => $ifname): $ifinfo = get_interface_info($ifdescr); if ($ifinfo['status'] != "down"){ ?> <td class="widgetsubheader nowrap" style="height:25px"> <?=htmlspecialchars($ifname);?> </td> - <?php + <?php //build array of interface names $interface_names[] = $ifname; - } + } endforeach; ?> </tr> - + <tr> - <?php + <?php $counter = 1; foreach ($array_in_packets as $data): ?> <td class="listr nowrap" id="stat<?php echo $counter?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> - <?php + <?php $counter = $counter + 7; endforeach; ?> </tr> - + <tr> - <?php + <?php $counter = 2; foreach ($array_out_packets as $data): ?> <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> - <?php + <?php $counter = $counter + 7; endforeach; ?> </tr> - + <tr> <?php $counter = 3; @@ -157,23 +157,23 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> - <?php + <?php $counter = $counter + 7; endforeach; ?> </tr> - + <tr> - <?php + <?php $counter = 4; foreach ($array_out_bytes as $data): ?> <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> - <?php + <?php $counter = $counter + 7; endforeach; ?> </tr> - + <tr> <?php $counter = 5; @@ -181,34 +181,34 @@ require_once("/usr/local/www/widgets/include/interface_statistics.inc"); <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> - <?php + <?php $counter = $counter + 7; endforeach; ?> </tr> - + <tr> - <?php + <?php $counter = 6; foreach ($array_out_errors as $data): ?> <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> - <?php + <?php $counter = $counter + 7; endforeach; ?> </tr> - - <tr> - <?php + + <tr> + <?php $counter = 7; foreach ($array_collisions as $data): ?> <td class="listr nowrap" id="stat<?php echo $counter;?>" style="height:25px"> <?=htmlspecialchars($data);?> </td> - <?php + <?php $counter = $counter + 7; endforeach; ?> </tr> </table> </div> - </div>
\ No newline at end of file + </div> diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php index 1a9398b..ebef0ba 100644 --- a/usr/local/www/widgets/widgets/interfaces.widget.php +++ b/usr/local/www/widgets/widgets/interfaces.widget.php @@ -38,42 +38,42 @@ require_once("pfsense-utils.inc"); require_once("functions.inc"); require_once("/usr/local/www/widgets/include/interfaces.inc"); - $i = 0; + $i = 0; $ifdescrs = get_configured_interface_with_descr(); ?> - + <table bgcolor="#990000" width="100%" border="0" cellspacing="0" cellpadding="0" summary="interfaces"> - <?php + <?php foreach ($ifdescrs as $ifdescr => $ifname) { $ifinfo = get_interface_info($ifdescr); $iswireless = is_interface_wireless($ifdescr); ?> - <tr> + <tr> <td class="vncellt" width="40%"> - <?php + <?php if($ifinfo['ppplink']) { echo "<img src='./themes/{$g['theme']}/images/icons/icon_3g.gif' alt='3g' />"; } else if($iswireless) { - if($ifinfo['status'] == "associated") { ?> + if($ifinfo['status'] == "associated") { ?> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wlan.gif" alt="wlan" /> <?php } else { ?> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_wlan_d.gif" alt="wlan_d" /> <?php } ?> <?php } else { ?> <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_cablenic.gif" alt="cablenic" /> - <?php } ?> + <?php } ?> <strong><u> <span onclick="location.href='/interfaces.php?if=<?=$ifdescr; ?>'" style="cursor:pointer"> <?=htmlspecialchars($ifname);?></span></u></strong> - <?php - if ($ifinfo['dhcplink']) + <?php + if ($ifinfo['dhcplink']) echo " (DHCP)"; ?> </td> <td width="60%" class="listr"> <table width="100%" border="0" cellspacing="0" cellpadding="0" summary="status"> <tr> - <?php if($ifinfo['status'] == "up" || $ifinfo['status'] == "associated") { ?> + <?php if($ifinfo['status'] == "up" || $ifinfo['status'] == "associated") { ?> <td> <div id="<?php echo $ifname;?>-up" style="display:inline" ><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_interface_up.gif" title="<?=$ifname;?> is up" alt="up" /></div> </td> diff --git a/usr/local/www/widgets/widgets/openvpn.widget.php b/usr/local/www/widgets/widgets/openvpn.widget.php index 6413353..5c7d756 100644 --- a/usr/local/www/widgets/widgets/openvpn.widget.php +++ b/usr/local/www/widgets/widgets/openvpn.widget.php @@ -107,9 +107,9 @@ $clients = openvpn_get_active_clients(); <td class="listhdrr">Real/Virtual IP</td> </tr> <?php $rowIndex = 0; - foreach ($server['conns'] as $conn): + foreach ($server['conns'] as $conn): $evenRowClass = $rowIndex % 2 ? " listMReven" : " listMRodd"; - $rowIndex++; + $rowIndex++; ?> <tr name='<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>' class="<?=$evenRowClass?>"> <td class="listMRlr"> diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php index d19627d..2bba499 100644 --- a/usr/local/www/widgets/widgets/system_information.widget.php +++ b/usr/local/www/widgets/widgets/system_information.widget.php @@ -165,7 +165,7 @@ $curcfg = $config['system']['firmware']; <td width="75%" class="listr"> <div id="datetime"><?= date("D M j G:i:s T Y"); ?></div> </td> - </tr> + </tr> <tr> <td width="30%" class="vncellt"><?=gettext("DNS server(s)");?></td> <td width="70%" class="listr"> diff --git a/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/usr/local/www/widgets/widgets/thermal_sensors.widget.php index 4413ba6..99ed40a 100644 --- a/usr/local/www/widgets/widgets/thermal_sensors.widget.php +++ b/usr/local/www/widgets/widgets/thermal_sensors.widget.php @@ -4,7 +4,7 @@ Description: Thermal Sensors Widget. NOTE: depends on proper cofing in System >> Advanced >> Miscellaneous tab >> Thermal Sensors section. - File location: + File location: \usr\local\www\widgets\widgets\ Depends on: \usr\local\www\widgets\javascript\thermal_sensors.js @@ -179,73 +179,73 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) { </tr> <tr> <td align="right"> - Zone Warning: + Zone Warning: </td> <td> - <input type="text" maxlength="3" size="3" class="formfld unknown" - name="thermal_sensors_widget_zone_warning_threshold" - id="thermal_sensors_widget_zone_warning_threshold" + <input type="text" maxlength="3" size="3" class="formfld unknown" + name="thermal_sensors_widget_zone_warning_threshold" + id="thermal_sensors_widget_zone_warning_threshold" value="<?= $thermal_sensors_widget_zoneWarningTempThreshold; ?>" /> </td> <td align="right"> <label for="thermal_sensors_widget_show_raw_output">Show raw output (no graph): </label> - <input type="checkbox" - id="thermal_sensors_widget_show_raw_output" - name="thermal_sensors_widget_show_raw_output" + <input type="checkbox" + id="thermal_sensors_widget_show_raw_output" + name="thermal_sensors_widget_show_raw_output" value="<?= $thermal_sensors_widget_showRawOutput; ?>" <?= ($thermal_sensors_widget_showRawOutput) ? " checked='checked'" : ""; ?> /> </td> </tr> <tr> <td align="right"> - Zone Critical: + Zone Critical: </td> <td> - <input type="text" maxlength="3" size="3" class="formfld unknown" - name="thermal_sensors_widget_zone_critical_threshold" - id="thermal_sensors_widget_zone_critical_threshold" + <input type="text" maxlength="3" size="3" class="formfld unknown" + name="thermal_sensors_widget_zone_critical_threshold" + id="thermal_sensors_widget_zone_critical_threshold" value="<?= $thermal_sensors_widget_zoneCriticalTempThreshold; ?>" /> </td> <td align="right"> <label for="thermal_sensors_widget_show_full_sensor_name">Show full sensor name: </label> - <input type="checkbox" - id="thermal_sensors_widget_show_full_sensor_name" - name="thermal_sensors_widget_show_full_sensor_name" + <input type="checkbox" + id="thermal_sensors_widget_show_full_sensor_name" + name="thermal_sensors_widget_show_full_sensor_name" value="<?= $thermal_sensors_widget_showFullSensorName; ?>" <?= ($thermal_sensors_widget_showFullSensorName) ? " checked='checked'" : ""; ?> /> </td> </tr> <tr> <td align="right"> - Core Warning: + Core Warning: </td> <td> - <input type="text" maxlength="3" size="3" class="formfld unknown" - name="thermal_sensors_widget_core_warning_threshold" - id="thermal_sensors_widget_core_warning_threshold" + <input type="text" maxlength="3" size="3" class="formfld unknown" + name="thermal_sensors_widget_core_warning_threshold" + id="thermal_sensors_widget_core_warning_threshold" value="<?= $thermal_sensors_widget_coreWarningTempThreshold ?>" /> </td> <td align="right"> <label for="thermal_sensors_widget_pulsate_warning">Pulsate Warning: </label> - <input type="checkbox" - id="thermal_sensors_widget_pulsate_warning" - name="thermal_sensors_widget_pulsate_warning" + <input type="checkbox" + id="thermal_sensors_widget_pulsate_warning" + name="thermal_sensors_widget_pulsate_warning" value="<?= $thermal_sensors_widget_pulsateWarning; ?>" <?= ($thermal_sensors_widget_pulsateWarning) ? " checked='checked'" : ""; ?> /> </td> </tr> <tr> <td align="right"> - Core Critical: + Core Critical: </td> <td> - <input type="text" maxlength="3" size="3" class="formfld unknown" - name="thermal_sensors_widget_core_critical_threshold" - id="thermal_sensors_widget_core_critical_threshold" + <input type="text" maxlength="3" size="3" class="formfld unknown" + name="thermal_sensors_widget_core_critical_threshold" + id="thermal_sensors_widget_core_critical_threshold" value="<?= $thermal_sensors_widget_coreCriticalTempThreshold ?>" /> </td> <td align="right"> <label for="thermal_sensors_widget_pulsate_critical">Pulsate Critical: </label> - <input type="checkbox" - id="thermal_sensors_widget_pulsate_critical" - name="thermal_sensors_widget_pulsate_critical" + <input type="checkbox" + id="thermal_sensors_widget_pulsate_critical" + name="thermal_sensors_widget_pulsate_critical" value="<?= $thermal_sensors_widget_pulsateCritical; ?>" <?= ($thermal_sensors_widget_pulsateCritical) ? " checked='checked'" : ""; ?> /> </td> </tr> diff --git a/usr/local/www/widgets/widgets/wake_on_lan.widget.php b/usr/local/www/widgets/widgets/wake_on_lan.widget.php index 6deb74b..6639601 100644 --- a/usr/local/www/widgets/widgets/wake_on_lan.widget.php +++ b/usr/local/www/widgets/widgets/wake_on_lan.widget.php @@ -2,17 +2,17 @@ /* wake_on_lan.widget.php Copyright (C) 2010 Yehuda Katz - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INClUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -50,7 +50,7 @@ if (count($wolcomputers) > 0) { foreach($wolcomputers as $wolent) { echo '<tr><td class="listlr">' . $wolent['descr'] . '<br />' . $wolent['mac'] . '</td>' . "\n"; echo '<td class="listr">' . convert_friendly_interface_to_friendly_descr($wolent['interface']) . '</td>' . "\n"; - + $is_active = exec("/usr/sbin/arp -an |/usr/bin/grep {$wolent['mac']}| /usr/bin/wc -l|/usr/bin/awk '{print $1;}'"); if($is_active == 1) { echo '<td class="listr" align="center">' . "\n"; |