diff -u -r1.34 -r1.35
--- webfwlog/include/sql.php	3 Mar 2006 17:27:38 -0000	1.34
+++ webfwlog/include/sql.php	13 Dec 2007 18:48:06 -0000	1.35
@@ -1,6 +1,6 @@
 <?php
 /*
-$Id: sql.php,v 1.34 2006/03/03 17:27:38 bhockney Exp $
+$Id: sql.php,v 1.35 2007/12/13 18:48:06 bhockney Exp $
 (C) 2003-2006 by Bob Hockney <zeus@ix.netcom.com>
 
 sql formulation for webfwlog
@@ -408,51 +408,51 @@
 	unset ($where); // If no criteria are specified, unset $where
 
 // GROUP BY CLAUSE
-	
+
 if (!$FWLOG["nocount"] and isset($FWLOG["summarize"])) {
 	foreach ($columnorder as $col) {
 		if (!isset($FWLOG["$col"])) continue;
 		switch ("$col") {
 		case "c_ip_protocol": $group = $group . "\t$ulog.ip_protocol,\n"; break;
-		case "c_dport": $group = $group . "\t\"{$shortnames['dport']}\",\n"; break;
-		case "c_sport": $group = $group . "\t\"{$shortnames['sport']}\",\n"; break;
-		case "c_src_service": $group = $group . "\t\"{$shortnames['src_service']}\",\n"; break;
-		case "c_dst_service": $group = $group . "\t\"{$shortnames['dst_service']}\",\n"; break;
+		case "c_dport": $group = $group . "\t$q{$shortnames['dport']}$q,\n"; break;
+		case "c_sport": $group = $group . "\t$q{$shortnames['sport']}$q,\n"; break;
+		case "c_src_service": $group = $group . "\t$q{$shortnames['src_service']}$q,\n"; break;
+		case "c_dst_service": $group = $group . "\t$q{$shortnames['dst_service']}$q,\n"; break;
 		case "c_ip_saddr": $group = $group . "\tip_saddr,\n"; break;
 		case "c_ip_daddr": $group = $group . "\tip_daddr,\n"; break;
-		case "c_src_host": $group = $group . "\t\"{$shortnames['src_host']}\",\n"; break;
-		case "c_dst_host": $group = $group . "\t\"{$shortnames['dst_host']}\",\n"; break;
-		case "c_local_hostname": $group = $group . "\t\"{$shortnames['local_hostname']}\",\n"; break;
-		case "c_oob_prefix": $group = $group . "\t\"{$shortnames['oob_prefix']}\",\n"; break;
-		case "c_tcp_options": $group = $group . "\t\"{$shortnames['tcp_options']}\",\n"; break;
-		case "c_oob_in": $group = $group . "\t\"{$shortnames['oob_in']}\",\n"; break;
-		case "c_oob_out": $group = $group . "\t\"{$shortnames['oob_out']}\",\n"; break;
-		case "c_oob_time_usec": $group = $group . "\t\"{$shortnames['oob_time_usec']}\",\n"; break;
-		case "c_oob_mark": $group = $group . "\t\"{$shortnames['oob_mark']}\",\n"; break;
-		case "c_ip_tos": $group = $group . "\t\"{$shortnames['ip_tos']}\",\n"; break;
-		case "c_ip_ttl": $group = $group . "\t\"{$shortnames['ip_ttl']}\",\n"; break;
-		case "c_ip_totlen": $group = $group . "\t\"{$shortnames['ip_totlen']}\",\n"; break;
-		case "c_ip_ihl": $group = $group . "\t\"{$shortnames['ip_ihl']}\",\n"; break;
-		case "c_ip_csum": $group = $group . "\t\"{$shortnames['ip_csum']}\",\n"; break;
-		case "c_ip_id": $group = $group . "\t\"{$shortnames['ip_id']}\",\n"; break;
-		case "c_ip_fragoff": $group = $group . "\t\"{$shortnames['ip_fragoff']}\",\n"; break;
-		case "c_tcp_seq": $group = $group . "\t\"{$shortnames['tcp_seq']}\",\n"; break;
-		case "c_tcp_ackseq": $group = $group . "\t\"{$shortnames['tcp_ackseq']}\",\n"; break;
-		case "c_tcp_window": $group = $group . "\t\"{$shortnames['tcp_window']}\",\n"; break;
-		case "c_tcp_urgp": $group = $group . "\t\"{$shortnames['tcp_urgp']}\",\n"; break;
-		case "c_udp_len": $group = $group . "\t\"{$shortnames['udp_len']}\",\n"; break;
-		case "c_icmp_type": $group = $group . "\t\"{$shortnames['icmp_type']}\",\n"; break;
-		case "c_icmp_code": $group = $group . "\t\"{$shortnames['icmp_code']}\",\n"; break;
-		case "c_icmp_echoid": $group = $group . "\t\"{$shortnames['icmp_echoid']}\",\n"; break;
-		case "c_icmp_echoseq": $group = $group . "\t\"{$shortnames['icmp_echoseq']}\",\n"; break;
-		case "c_icmp_gateway": $group = $group . "\t\"{$shortnames['icmp_gateway']}\",\n"; break;
-		case "c_icmp_fragmtu": $group = $group . "\t\"{$shortnames['icmp_fragmtu']}\",\n"; break;
-		case "c_id": $group = $group . "\t\"{$shortnames['id']}\",\n"; break;
-		case "c_raw_mac": $group = $group . "\t\"{$shortnames['raw_mac']}\",\n"; break;
-		case "c_pwsniff_user": $group = $group . "\t\"{$shortnames['pwsniff_user']}\",\n"; break;
-		case "c_pwsniff_pass": $group = $group . "\t\"{$shortnames['pwsniff_pass']}\",\n"; break;
-		case "c_ahesp_spi": $group = $group . "\t\"{$shortnames['ahesp_spi']}\",\n"; break;
-		case "c_extra": if ($FWLOG["g_extra"]) $group = $group . "\t\"{$shortnames['extra']}\",\n"; break;
+		case "c_src_host": $group = $group . "\t$q{$shortnames['src_host']}$q,\n"; break;
+		case "c_dst_host": $group = $group . "\t$q{$shortnames['dst_host']}$q,\n"; break;
+		case "c_local_hostname": $group = $group . "\t$q{$shortnames['local_hostname']}$q,\n"; break;
+		case "c_oob_prefix": $group = $group . "\t$q{$shortnames['oob_prefix']}$q,\n"; break;
+		case "c_tcp_options": $group = $group . "\t$q{$shortnames['tcp_options']}$q,\n"; break;
+		case "c_oob_in": $group = $group . "\t$q{$shortnames['oob_in']}$q,\n"; break;
+		case "c_oob_out": $group = $group . "\t$q{$shortnames['oob_out']}$q,\n"; break;
+		case "c_oob_time_usec": $group = $group . "\t$q{$shortnames['oob_time_usec']}$q,\n"; break;
+		case "c_oob_mark": $group = $group . "\t$q{$shortnames['oob_mark']}$q,\n"; break;
+		case "c_ip_tos": $group = $group . "\t$q{$shortnames['ip_tos']}$q,\n"; break;
+		case "c_ip_ttl": $group = $group . "\t$q{$shortnames['ip_ttl']}$q,\n"; break;
+		case "c_ip_totlen": $group = $group . "\t$q{$shortnames['ip_totlen']}$q,\n"; break;
+		case "c_ip_ihl": $group = $group . "\t$q{$shortnames['ip_ihl']}$q,\n"; break;
+		case "c_ip_csum": $group = $group . "\t$q{$shortnames['ip_csum']}$q,\n"; break;
+		case "c_ip_id": $group = $group . "\t$q{$shortnames['ip_id']}$q,\n"; break;
+		case "c_ip_fragoff": $group = $group . "\t$q{$shortnames['ip_fragoff']}$q,\n"; break;
+		case "c_tcp_seq": $group = $group . "\t$q{$shortnames['tcp_seq']}$q,\n"; break;
+		case "c_tcp_ackseq": $group = $group . "\t$q{$shortnames['tcp_ackseq']}$q,\n"; break;
+		case "c_tcp_window": $group = $group . "\t$q{$shortnames['tcp_window']}$q,\n"; break;
+		case "c_tcp_urgp": $group = $group . "\t$q{$shortnames['tcp_urgp']}$q,\n"; break;
+		case "c_udp_len": $group = $group . "\t$q{$shortnames['udp_len']}$q,\n"; break;
+		case "c_icmp_type": $group = $group . "\t$q{$shortnames['icmp_type']}$q,\n"; break;
+		case "c_icmp_code": $group = $group . "\t$q{$shortnames['icmp_code']}$q,\n"; break;
+		case "c_icmp_echoid": $group = $group . "\t$q{$shortnames['icmp_echoid']}$q,\n"; break;
+		case "c_icmp_echoseq": $group = $group . "\t$q{$shortnames['icmp_echoseq']}$q,\n"; break;
+		case "c_icmp_gateway": $group = $group . "\t$q{$shortnames['icmp_gateway']}$q,\n"; break;
+		case "c_icmp_fragmtu": $group = $group . "\t$q{$shortnames['icmp_fragmtu']}$q,\n"; break;
+		case "c_id": $group = $group . "\t$q{$shortnames['id']}$q,\n"; break;
+		case "c_raw_mac": $group = $group . "\t$q{$shortnames['raw_mac']}$q,\n"; break;
+		case "c_pwsniff_user": $group = $group . "\t$q{$shortnames['pwsniff_user']}$q,\n"; break;
+		case "c_pwsniff_pass": $group = $group . "\t$q{$shortnames['pwsniff_pass']}$q,\n"; break;
+		case "c_ahesp_spi": $group = $group . "\t$q{$shortnames['ahesp_spi']}$q,\n"; break;
+		case "c_extra": if ($FWLOG["g_extra"]) $group = $group . "\t$q{$shortnames['extra']}$q,\n"; break;
 		default: break;
 		}
 	}
@@ -499,7 +499,7 @@
 	switch ("$sort") {
 	case "s_count": if (!$FWLOG["nocount"] and isset($FWLOG["summarize"])) {
 		if ($FWLOG["o_count"]) {$ord=" DESC";} else {$ord=" ASC";}
-		$order = $order . "\t\"{$shortnames['count']}\"$ord,\n"; break;
+		$order = $order . "\t$q{$shortnames['count']}$q$ord,\n"; break;
 		}
 	case "s_ip_protocol": if ($FWLOG["o_ip_protocol"]) {$ord=" DESC";} else {$ord=" ASC";}
 		$order = $order . "\t$ulog.ip_protocol$ord,\n"; break;
@@ -518,34 +518,34 @@
 		}
 		break;
 	case "s_dport": if ($FWLOG["o_dport"]) {$ord=" DESC";} else {$ord=" ASC";}
-		$order = $order . "\t\"{$shortnames['dport']}\"$ord,\n"; break;
+		$order = $order . "\t$q{$shortnames['dport']}$q$ord,\n"; break;
 	case "s_sport": if ($FWLOG["o_sport"]) {$ord=" DESC";} else {$ord=" ASC";}
-		$order = $order . "\t\"{$shortnames['sport']}\"$ord,\n"; break;
+		$order = $order . "\t$q{$shortnames['sport']}$q$ord,\n"; break;
 	case "s_local_hostname": if ($FWLOG["o_local_hostname"]) {$ord=" DESC";} else {$ord=" ASC";}
 		$order = $order . "\tlocal_hostname$ord,\n"; break;
 	case "s_oob_prefix": if ($FWLOG["o_oob_prefix"]) {$ord=" DESC";} else {$ord=" ASC";}
 		$order = $order . "\toob_prefix$ord,\n"; break;
 	case "s_tcp_options": if ($FWLOG["o_tcp_options"]) {$ord=" DESC";} else {$ord=" ASC";}
-		$order = $order . "\t\"{$shortnames['tcp_options']}\"$ord,\n"; break;
+		$order = $order . "\t$q{$shortnames['tcp_options']}$q$ord,\n"; break;
 	case "s_oob_in": if ($FWLOG["o_oob_in"]) {$ord=" DESC";} else {$ord=" ASC";}
 		$order = $order . "\toob_in$ord,\n"; break;
 	case "s_oob_out": if ($FWLOG["o_oob_out"]) {$ord=" DESC";} else {$ord=" ASC";}
 		$order = $order . "\toob_out$ord,\n"; break;
 	case "s_earliest": if (isset($FWLOG["summarize"])) {
 		if ($FWLOG["o_earliest"]) {$ord=" DESC";} else {$ord=" ASC";}
-		$order = $order . "\t\"{$shortnames['earliest']}\"$ord,\n"; break;
+		$order = $order . "\t$q{$shortnames['earliest']}$q$ord,\n"; break;
 		}
 	case "s_latest": if (isset($FWLOG["summarize"])) {
 		if ($FWLOG["o_latest"]) {$ord=" DESC";} else {$ord=" ASC";}
-		$order = $order . "\t\"{$shortnames['latest']}\"$ord,\n"; break;
+		$order = $order . "\t$q{$shortnames['latest']}$q$ord,\n"; break;
 		}
 	case "s_oob_earliest": if (isset($FWLOG["summarize"])) {
 		if ($FWLOG["o_oob_earliest"]) {$ord=" DESC";} else {$ord=" ASC";}
-		$order = $order . "\t\"{$shortnames['oob_earliest']}\"$ord,\n"; break;
+		$order = $order . "\t$q{$shortnames['oob_earliest']}$q$ord,\n"; break;
 		}
 	case "s_oob_latest": if (isset($FWLOG["summarize"])) {
 		if ($FWLOG["o_oob_latest"]) {$ord=" DESC";} else {$ord=" ASC";}
-		$order = $order . "\t\"{$shortnames['oob_latest']}\"$ord,\n"; break;
+		$order = $order . "\t$q{$shortnames['oob_latest']}$q$ord,\n"; break;
 		}
 	case "s_local_time": if ($FWLOG["o_local_time"]) {$ord=" DESC";} else {$ord=" ASC";}
 		$order = $order . "\tlocal_time$ord,\n"; break;
@@ -604,7 +604,7 @@
 	case "s_extra": 
 		if ($config["allow_raw_sql"] and isset($shortnames["extra"])) {
 			if ($FWLOG["o_extra"]) {$ord=" DESC";} else {$ord=" ASC";}
-			$order = $order . "\t\"{$shortnames['extra']}\"$ord,\n";	
+			$order = $order . "\t$q{$shortnames['extra']}$q$ord,\n";	
 		}
 		break;
 	}