From 5732adef0f5ad59003da9312a707d4ca3676b87c Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Fri, 2 May 2008 17:33:21 +0200
Subject: [PATCH] Appended changes into changelog, and made a few bugfixes to
 the new features

---
 ChangeLog                                 | 16 ++++++++++++++--
 src/include/functions_common.php          |  6 +++---
 src/include/functions_frontendhelpers.php |  7 ++++++-
 src/index.php                             | 19 +++++++++++++------
 src/templates/index.html                  |  2 ++
 5 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8c5213a..4d627f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,21 @@
 ---------------------------------------------------------------------------
+Version 2.3.1 (devel), 2008-05-02
+- The page title is now created with Source, and other useful informations. 
+  It is also possible to configure a custom title string with the 
+  configuration, which will be prepended into each phpLogcon page.
+- Added support for gzip compression (configurable), this will reduce
+  bandwidth and page load time.
+- Added Auto reload function into main list view, can be enabled by default
+  in the configuration as well. Done using a META REFRESH.
+- Added new configuration variable to set the default SourceID. The source
+  parameter will be appened to all necessary links and forms within 
+  phplogcon, if the session sources differs from the default one. 
+---------------------------------------------------------------------------
 Version 2.3.0 (devel), 2008-04-30
 - Added "Back to Listview" button in the detailview. 
 - Added filter for message type 
-- Added inline button menus into the listview. Most values can be clicked now, 
-  which opens a menu with additional useful links. 
+- Added inline button menus into the listview. Most values can be clicked 
+  now, which opens a menu with additional useful links. 
 - Added Pagesite Selection into listview, so you can change the amount of
   records you want to see on one page at any time you want. 
 - greatly improved database performance, runs much better now, but there
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index dcacce6..a13679b 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -618,12 +618,12 @@ function InitPageTitle()
 	else
 		$szReturn = "";
 
+	if ( isset($currentSourceID) && isset($content['Sources'][$currentSourceID]['Name']) )
+		$szReturn .= "Source '" . $content['Sources'][$currentSourceID]['Name'] . "' :: ";
+
 	// Append phpLogCon
 	$szReturn .= "phpLogCon";
 
-	if ( isset($currentSourceID) && isset($content['Sources'][$currentSourceID]['Name']) )
-		$szReturn .= " :: Source '" . $content['Sources'][$currentSourceID]['Name'] . "'";
-
 	// return result
 	return $szReturn;
 }
diff --git a/src/include/functions_frontendhelpers.php b/src/include/functions_frontendhelpers.php
index 9520aab..749a892 100644
--- a/src/include/functions_frontendhelpers.php
+++ b/src/include/functions_frontendhelpers.php
@@ -86,7 +86,7 @@ function CreateCurrentUrl()
 		// If the DefaultSourceID differes from the SourceID in our Session, we will append the sourceid within all URL's!
 		if ( $CFG['DefaultSourceID'] != $_SESSION['currentSourceID'] )
 		{
-			$content['additional_url'] .= "&sourceid=" . $_SESSION['currentSourceID'];
+//			$content['additional_url'] .= "&sourceid=" . $_SESSION['currentSourceID'];
 			$content['additional_url_uidonly'] = "&sourceid=" . $_SESSION['currentSourceID'];
 			$content['additional_url_sortingonly'] = "&sourceid=" . $_SESSION['currentSourceID'];
 			$content['additional_url_sourceonly'] = "&sourceid=" . $_SESSION['currentSourceID'];
@@ -132,6 +132,11 @@ function CreateCurrentUrl()
 							if ( strlen($content['additional_url_sortingonly']) <= 0 )
 								$content['additional_url_sortingonly'] .= "&" . $tmpvars[0] . "=" . $tmpvars[1];
 						}
+						else if ( $tmpvars[0] == "sourceid" )
+						{	
+							// Skip this entry
+							continue;
+						}
 						else
 							$content['additional_url'] .= "&" . $tmpvars[0] . "=" . $tmpvars[1];
 					}
diff --git a/src/index.php b/src/index.php
index 3dcbbfe..7e8da2f 100644
--- a/src/index.php
+++ b/src/index.php
@@ -57,18 +57,25 @@ $content['EXTRA_STYLESHEET']  = '<link rel="stylesheet" href="css/highlight.css"
 $content['EXTRA_STYLESHEET'] .= '<link rel="stylesheet" href="css/menu.css" type="text/css">';
 // --- 
 
-// --- Set Autoreload as meta refresh
-if ( $content['ViewEnableAutoReloadSeconds'] > 0 )
-	$content['EXTRA_METATAGS'] = '<META HTTP-EQUIV=REFRESH CONTENT=' . $content['ViewEnableAutoReloadSeconds'] . '>' . "\r\n";
-// ---
-
-
 // --- CONTENT Vars
 if ( isset($_GET['uid']) ) 
 	$content['uid_current'] = intval($_GET['uid']);
 else
 	$content['uid_current'] = UID_UNKNOWN;
 
+// --- Set Autoreload as meta refresh
+if ( $content['uid_current'] == UID_UNKNOWN )
+{
+	$content['ViewEnableAutoReloadSeconds_visible'] = true;
+	if ( $content['ViewEnableAutoReloadSeconds'] > 0 )
+		$content['EXTRA_METATAGS'] = '<META HTTP-EQUIV=REFRESH CONTENT=' . $content['ViewEnableAutoReloadSeconds'] . '>' . "\r\n";
+}
+else
+	$content['ViewEnableAutoReloadSeconds_visible'] = false;
+
+// ---
+
+
 // Init Pager variables
 // $content['uid_previous'] = UID_UNKNOWN;
 $content['uid_next'] = UID_UNKNOWN;
diff --git a/src/templates/index.html b/src/templates/index.html
index 1e0aaea..8a664a3 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -100,6 +100,7 @@
 <!-- ENDIF main_currentpagenumber_found="true" -->
 	</td>
 
+<!-- IF ViewEnableAutoReloadSeconds_visible="true" -->
 	<td nowrap width="105" class="cellmenu2">{LN_AUTORELOAD}:</td>
 	<td nowrap width="50" class="line2">
 		<form action="userchange.php" method="get" name="autoreload">
@@ -118,6 +119,7 @@
 		</table>
 		</form>
 	</td>
+<!-- ENDIF ViewEnableAutoReloadSeconds_visible="true" -->
 
 <!-- IF main_recordcount_found="true" -->
 	<td nowrap width="125" class="cellmenu2">{LN_GEN_RECORDCOUNT}:</td>