Index: webfwlog.conf.in
===================================================================
RCS file: /cvsroot/webfwlog/webfwlog/webfwlog.conf.in,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- webfwlog.conf.in	9 Nov 2004 20:37:38 -0000	1.2
+++ webfwlog.conf.in	29 Nov 2004 06:30:32 -0000	1.4
@@ -96,9 +96,14 @@
 verbosity_level = 2
 
 #
-# Report Options
+# REPORT OPTIONS
 #
 
+# Default data source.  Set to one of syslog | ulogd.
+#
+# Default: ulogd
+default_data_source = syslog
+
 # title appears as the heading for all output
 #
 # Default: 'Firewall Log Report'
@@ -109,11 +114,6 @@
 # Default: 0
 refresh = 300
 
-# Default data source.  Set to one of syslog | ulogd.
-#
-# Default: ulogd
-data_source = syslog
-
 # Dates are presented using this PHP format string.
 # See http://www.php.net/manual/en/function.date.php
 #
Index: webfwlog/webfwlog.php
===================================================================
RCS file: /cvsroot/webfwlog/webfwlog/webfwlog/webfwlog.php,v
retrieving revision 1.10
retrieving revision 1.12
diff -u -r1.10 -r1.12
--- webfwlog/webfwlog.php	9 Nov 2004 20:37:38 -0000	1.10
+++ webfwlog/webfwlog.php	29 Nov 2004 06:30:00 -0000	1.12
@@ -40,7 +39,9 @@
 	}
 
 	unset($source);
-	if (strtolower($FWLOG["data_source"]) == "syslog")
+	if (strtolower($FWLOG["data_source"]) == "syslog"
+		or (!isset($FWLOG["data_source"])
+		  and strtolower($config["default_data_source"]) == "syslog"))
 		$source = "syslog";
 
 	db("init", "", "$source");
Index: webfwlog/include/config.php.in
===================================================================
RCS file: /cvsroot/webfwlog/webfwlog/webfwlog/include/config.php.in,v
retrieving revision 1.2
diff -u -r1.2 config.php.in
--- webfwlog/include/config.php.in	9 Nov 2004 20:37:38 -0000	1.2
+++ webfwlog/include/config.php.in	6 Dec 2004 16:44:36 -0000
@@ -55,6 +56,7 @@
 		case "syslog_dir":
 		case "verbosity_level":
 		case "default_data_source":
+		case "data_source":
 		case "title":
 		case "refresh":
 		case "dformat":
@@ -119,6 +122,11 @@
 	unset ($config["allow_show_sql"]);
 }
 
+if (isset($config["data_source"])) {
+	$config["default_data_source"] = "{$config["data_source"]}";
+	unset ($config["data_source"]);
+}
+
 $webfwlog_version = "@PACKAGE_VERSION@";
 
 ?>