From 26df8f0218520786a36e8ec07330e3f91c38e789 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 24 Sep 2010 08:34:51 -0400
Subject: More HAVP fixes from vcoque

---
 config/havp/antivirus.php | 6 +++---
 config/havp/havp.inc      | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/config/havp/antivirus.php b/config/havp/antivirus.php
index 451918dc..51926681 100644
--- a/config/havp/antivirus.php
+++ b/config/havp/antivirus.php
@@ -254,10 +254,10 @@ if (pfsense_version_A() == '1') {
                         <?php
                           $scanlist = get_scanlist();
                           if (is_array($scanlist))
-                              foreach($scanlist as $key => $val) {
-                                  echo "<span onclick=\"document.getElementById('scanpath').value='{$val}';\" style=\"cursor: pointer;\">\n";
+                              foreach($scanlist as $scan) {
+                                  echo "<span onclick=\"document.getElementById('scanpath').value='{$scan['path']}';\" style=\"cursor: pointer;\">\n";
                                   echo "<img src='./themes/".$g['theme']."/images/icons/icon_pass.gif'>\n";
-                                  echo "<u>{$key}</u>\n";
+                                  echo "<u>{$scan['descr']}</u>\n";
                                   echo "</span>";
                                   echo "<br>";
                               }
diff --git a/config/havp/havp.inc b/config/havp/havp.inc
index 0c2f688b..072d90b4 100644
--- a/config/havp/havp.inc
+++ b/config/havp/havp.inc
@@ -1617,9 +1617,12 @@ function havp_get_scan_log()
 function havp_get_filescanlist()
 {
     $slist = array();
-    $slist['Squid cache path (scan you squid cache now).'] = '/var/squid';
-    $slist['Common DB path.'] = '/var/db';
-    $slist['Temp path'] = '/tmp';
+    $slist[0]['descr'] = 'Squid cache path (scan you squid cache now).';
+    $slist[0]['path']  = '/var/squid';
+    $slist[1]['descr'] = 'Common DB path.';
+    $slist[1]['path']  = '/var/db';
+    $slist[2]['descr'] = 'Temp path.';
+    $slist[2]['path']  = '/tmp';
     return $slist;
 }
 
-- 
cgit v1.2.3