aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlie Root <tigersharke@gmail.com>2012-11-21 00:46:38 +0000
committerCharlie Root <tigersharke@gmail.com>2012-11-21 00:46:38 +0000
commit255d993832f2c7a3b0ea523a98da05f6e77f7fde (patch)
tree066b919e0bdfeefe13eb0e4899dc1698017ac765
parentf034443b1c7271197dcd00b18a62e4b30c408541 (diff)
downloadpfsense-packages-255d993832f2c7a3b0ea523a98da05f6e77f7fde.tar.gz
pfsense-packages-255d993832f2c7a3b0ea523a98da05f6e77f7fde.tar.bz2
pfsense-packages-255d993832f2c7a3b0ea523a98da05f6e77f7fde.zip
This is a fix for an empty array condition that causes a dashboard
error message: Warning: Invalid argument supplied for foreach() in /usr/local/www/widgets/widgets/snort_alerts.widget.php on line 36
-rw-r--r--config/widget-snort/snort_alerts.widget.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/config/widget-snort/snort_alerts.widget.php b/config/widget-snort/snort_alerts.widget.php
index 6d6193d8..b7b60a07 100644
--- a/config/widget-snort/snort_alerts.widget.php
+++ b/config/widget-snort/snort_alerts.widget.php
@@ -32,7 +32,11 @@ function sksort(&$array, $subkey="id", $sort_ascending=false) {
if (count($array)) {
$temp_array[key($array)] = array_shift($array);
};
-
+ /* an empty array causes sksort to fail - this test alleviates the error */
+ if(empty($array))
+ {
+ return false;
+ }
foreach ($array as $key => $val){
$offset = 0;
$found = false;
@@ -49,6 +53,8 @@ function sksort(&$array, $subkey="id", $sort_ascending=false) {
if ($sort_ascending) {
$array = array_reverse($temp_array);
} else $array = $temp_array;
+ /* below is the complement for empty array test */
+ return true;
};
/* check if firewall widget variable is set */
@@ -128,4 +134,4 @@ if (is_array($snort_alerts)) {
};
?>
</tbody>
-</table> \ No newline at end of file
+</table>