From ae788a12032f7b87ec70922088da9fa70b6cd0e1 Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 23 Feb 2010 16:01:14 +0100 Subject: [PATCH] Added changelog entry for 2.8.1 --- ChangeLog | 13 +++++++++++++ src/admin/index.php | 8 ++++++++ src/include/config.sample.php | 1 + src/include/functions_common.php | 4 +++- src/include/functions_users.php | 4 ++-- src/index.php | 9 ++++++--- src/lang/de/admin.php | 3 +++ src/lang/en/admin.php | 1 + src/lang/it_IT/admin.php | 1 + src/lang/pt_BR/admin.php | 3 +++ src/templates/admin/admin_index.html | 7 +++++++ 11 files changed, 48 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e8c22c..d3fdaad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,17 @@ --------------------------------------------------------------------------- +Version 2.8.1 (v2-stable), 2010-02-23 +- Added Inline searchicon, will be visible in each online + searchable field. Can be disabled in admin center. +- Added Updatecheck which will be performed during login only, so once per + session. If a newer Version is available, you will be notified in + Admin Center. +- Secured Views, Sources, Searches and Charts Admin access from users + without admin access. +- Settings will be remembered now when configuring columns in Views + Admin Panel. +- Normal users cannot init or remove message parsers anymore +- Added Time-extension on search page (send by Sergey Sireskin). +--------------------------------------------------------------------------- Version 2.8.0 (v2-stable), 2010-01-14 - Merged previous Beta branch into Stable branch and set new version number 2.8 diff --git a/src/admin/index.php b/src/admin/index.php index 0949be7..afab4dd 100644 --- a/src/admin/index.php +++ b/src/admin/index.php @@ -134,6 +134,7 @@ if ( isset($_POST['op']) ) if ( isset ($_POST['MiscEnableGzipCompression']) ) { $content['MiscEnableGzipCompression'] = 1; } else { $content['MiscEnableGzipCompression'] = 0; } if ( isset ($_POST['SuppressDuplicatedMessages']) ) { $content['SuppressDuplicatedMessages'] = 1; } else { $content['SuppressDuplicatedMessages'] = 0; } if ( isset ($_POST['TreatNotFoundFiltersAsTrue']) ) { $content['TreatNotFoundFiltersAsTrue'] = 1; } else { $content['TreatNotFoundFiltersAsTrue'] = 0; } + if ( isset ($_POST['InlineOnlineSearchIcons']) ) { $content['InlineOnlineSearchIcons'] = 1; } else { $content['InlineOnlineSearchIcons'] = 0; } if ( isset ($_POST['DebugUserLogin']) ) { $content['DebugUserLogin'] = 1; } else { $content['DebugUserLogin'] = 0; } if ( isset ($_POST['MiscDebugToSyslog']) ) { $content['MiscDebugToSyslog'] = 1; } else { $content['MiscDebugToSyslog'] = 0; } @@ -188,6 +189,7 @@ if ( isset($_POST['op']) ) if ( isset ($_POST['User_MiscShowPageRenderStats']) ) { $USERCFG['MiscShowPageRenderStats'] = 1; } else { $USERCFG['MiscShowPageRenderStats'] = 0; } if ( isset ($_POST['User_MiscEnableGzipCompression']) ) { $USERCFG['MiscEnableGzipCompression'] = 1; } else { $USERCFG['MiscEnableGzipCompression'] = 0; } if ( isset ($_POST['User_SuppressDuplicatedMessages']) ) { $USERCFG['SuppressDuplicatedMessages'] = 1; } else { $USERCFG['SuppressDuplicatedMessages'] = 0; } + if ( isset ($_POST['User_InlineOnlineSearchIcons']) ) { $USERCFG['InlineOnlineSearchIcons'] = 1; } else { $USERCFG['InlineOnlineSearchIcons'] = 0; } if ( isset ($_POST['User_TreatNotFoundFiltersAsTrue']) ) { $USERCFG['TreatNotFoundFiltersAsTrue'] = 1; } else { $USERCFG['TreatNotFoundFiltersAsTrue'] = 0; } // Read Text number fields @@ -212,6 +214,10 @@ if ( isset($_POST['op']) ) } } +// PreInit newer values if necessary +if ( !isset($content['SuppressDuplicatedMessages']) ) { $content['SuppressDuplicatedMessages'] = 0; } +if ( !isset($content['TreatNotFoundFiltersAsTrue']) ) { $content['TreatNotFoundFiltersAsTrue'] = 0; } +if ( !isset($content['InlineOnlineSearchIcons']) ) { $content['InlineOnlineSearchIcons'] = 1; } // Set checkbox States if (isset($content['ViewUseTodayYesterday']) && $content['ViewUseTodayYesterday'] == 1) { $content['ViewUseTodayYesterday_checked'] = "checked"; } else { $content['ViewUseTodayYesterday_checked'] = ""; } @@ -224,6 +230,7 @@ if (isset($content['MiscShowPageRenderStats']) && $content['MiscShowPageRenderSt if (isset($content['MiscEnableGzipCompression']) && $content['MiscEnableGzipCompression'] == 1) { $content['MiscEnableGzipCompression_checked'] = "checked"; } else { $content['MiscEnableGzipCompression_checked'] = ""; } if (isset($content['SuppressDuplicatedMessages']) && $content['SuppressDuplicatedMessages'] == 1) { $content['SuppressDuplicatedMessages_checked'] = "checked"; } else { $content['SuppressDuplicatedMessages_checked'] = ""; } if (isset($content['TreatNotFoundFiltersAsTrue']) && $content['TreatNotFoundFiltersAsTrue'] == 1) { $content['TreatNotFoundFiltersAsTrue_checked'] = "checked"; } else { $content['TreatNotFoundFiltersAsTrue_checked'] = ""; } +if (isset($content['InlineOnlineSearchIcons']) && $content['InlineOnlineSearchIcons'] == 1) { $content['InlineOnlineSearchIcons_checked'] = "checked"; } else { $content['InlineOnlineSearchIcons_checked'] = ""; } if (isset($content['DebugUserLogin']) && $content['DebugUserLogin'] == 1) { $content['DebugUserLogin_checked'] = "checked"; } else { $content['DebugUserLogin_checked'] = ""; } if (isset($content['MiscDebugToSyslog']) && $content['MiscDebugToSyslog'] == 1) { $content['MiscDebugToSyslog_checked'] = "checked"; } else { $content['MiscDebugToSyslog_checked'] = ""; } @@ -297,6 +304,7 @@ if ( $content['ENABLEUSEROPTIONS'] ) if ( GetConfigSetting('MiscEnableGzipCompression', $content['MiscEnableGzipCompression'], CFGLEVEL_USER) == 1) { $content['User_MiscEnableGzipCompression_checked'] = "checked"; } else { $content['User_MiscEnableGzipCompression_checked'] = ""; } if ( GetConfigSetting('SuppressDuplicatedMessages', $content['SuppressDuplicatedMessages'], CFGLEVEL_USER) == 1) { $content['User_SuppressDuplicatedMessages_checked'] = "checked"; } else { $content['User_SuppressDuplicatedMessages_checked'] = ""; } if ( GetConfigSetting('TreatNotFoundFiltersAsTrue', $content['TreatNotFoundFiltersAsTrue'], CFGLEVEL_USER) == 1) { $content['User_TreatNotFoundFiltersAsTrue_checked'] = "checked"; } else { $content['User_TreatNotFoundFiltersAsTrue_checked'] = ""; } + if ( GetConfigSetting('InlineOnlineSearchIcons', $content['InlineOnlineSearchIcons'], CFGLEVEL_USER) == 1) { $content['User_InlineOnlineSearchIcons_checked'] = "checked"; } else { $content['User_InlineOnlineSearchIcons_checked'] = ""; } // --- // --- Set TextFields! diff --git a/src/include/config.sample.php b/src/include/config.sample.php index 64cb0aa..1433179 100644 --- a/src/include/config.sample.php +++ b/src/include/config.sample.php @@ -84,6 +84,7 @@ $CFG['SuppressDuplicatedMessages'] = 0; // If enabled, duplicated messages will $CFG['TreatNotFoundFiltersAsTrue'] = 0; // If you filter / search for messages, and the fields you are filtering for is not found, the filter result is treaten as TRUE! $CFG['PopupMenuTimeout'] = 3000; // This variable defines the default timeout value for popup menus in milliseconds. (those menus which popup when you click on the value of a field. $CFG['PhplogconLogoUrl'] = ""; // Put an Url to a custom toplogo you want to use. +$CFG['InlineOnlineSearchIcons'] = 0; // Show online search icons // --- // --- Custom HTML Code diff --git a/src/include/functions_common.php b/src/include/functions_common.php index eef6196..898d21e 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -66,7 +66,7 @@ $LANG_EN = "en"; // Used for fallback $LANG = "en"; // Default language // Default Template vars -$content['BUILDNUMBER'] = "2.8.0"; +$content['BUILDNUMBER'] = "2.8.1"; $content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt"; $content['TITLE'] = "phpLogCon :: Release " . $content['BUILDNUMBER']; // Default page title $content['BASEPATH'] = $gl_root_path; @@ -1481,6 +1481,7 @@ function SaveGeneralSettingsIntoDB($bForceStripSlahes = false) WriteConfigValue( "MiscEnableGzipCompression", true, null, null,$bForceStripSlahes ); WriteConfigValue( "SuppressDuplicatedMessages", true, null, null,$bForceStripSlahes ); WriteConfigValue( "TreatNotFoundFiltersAsTrue", true, null, null,$bForceStripSlahes ); + WriteConfigValue( "InlineOnlineSearchIcons", true, null, null,$bForceStripSlahes ); WriteConfigValue( "ViewMessageCharacterLimit", true, null, null,$bForceStripSlahes ); WriteConfigValue( "ViewStringCharacterLimit", true, null, null,$bForceStripSlahes ); @@ -1524,6 +1525,7 @@ function SaveUserGeneralSettingsIntoDB() WriteConfigValue( "MiscEnableGzipCompression", false, $content['SESSION_USERID'] ); WriteConfigValue( "SuppressDuplicatedMessages", false, $content['SESSION_USERID'] ); WriteConfigValue( "TreatNotFoundFiltersAsTrue", false, $content['SESSION_USERID'] ); + WriteConfigValue( "InlineOnlineSearchIcons", false, $content['SESSION_USERID'] ); WriteConfigValue( "ViewMessageCharacterLimit", false, $content['SESSION_USERID'] ); WriteConfigValue( "ViewStringCharacterLimit", false, $content['SESSION_USERID'] ); diff --git a/src/include/functions_users.php b/src/include/functions_users.php index 3371085..cdce533 100644 --- a/src/include/functions_users.php +++ b/src/include/functions_users.php @@ -323,8 +323,8 @@ function GetGroupsForSelectfield() function CompareVersionNumbers( $oldVer, $newVer ) { // Split version numbers - $currentVersion = explode(".", $oldVer); - $newVersion = explode(".", $newVer); + $currentVersion = explode(".", trim($oldVer) ); + $newVersion = explode(".", trim($newVer) ); // Check if the format is correct! if ( count($newVersion) != 3 ) diff --git a/src/index.php b/src/index.php index 0eaa78d..7e27bcd 100644 --- a/src/index.php +++ b/src/index.php @@ -967,9 +967,12 @@ function AddOnClickMenu(&$fieldGridItem, $fieldType, $FieldID) 'IconSource' => $content['MENU_NETWORK'] ); - // Enable SearchOnline Icon - $fieldGridItem['searchonline'] = true; - $fieldGridItem['SearchOnlineUrl'] = 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . $FieldID . '&q=' . $szEncodedFieldValue; + if ( GetConfigSetting("InlineOnlineSearchIcons", 0, CFGLEVEL_USER) == 1 ) + { + // Enable SearchOnline Icon + $fieldGridItem['searchonline'] = true; + $fieldGridItem['SearchOnlineUrl'] = 'http://kb.monitorware.com/kbsearch.php?sa=Search&origin=phplogcon&oid=' . $FieldID . '&q=' . $szEncodedFieldValue; + } } // Search for links within the fieldcontent! diff --git a/src/lang/de/admin.php b/src/lang/de/admin.php index 43ab035..da7eaa1 100644 --- a/src/lang/de/admin.php +++ b/src/lang/de/admin.php @@ -89,6 +89,9 @@ $content['LN_GEN_ACCESSDENIED'] = "Der Zugriff auf diese Funktion wurde verweige $content['LN_GEN_DEFVIEWS'] = "Standard Anzeige"; $content['LN_GEN_DEFSOURCE'] = "Standard Quelle"; $content['LN_GEN_SUPPRESSDUPMSG'] = "Doppelte Meldungen nur einmal anzeigen"; +$content['LN_GEN_TREATFILTERSTRUE'] = "Treat filters of not found fields as true"; +$content['LN_GEN_INLINESEARCHICONS'] = "Show Onlinesearch icons within fields"; + $content['LN_GEN_OPTIONNAME'] = "Option Name"; $content['LN_GEN_GLOBALVALUE'] = "Globale Werte"; $content['LN_GEN_PERSONALVALUE'] = "Persönliche (benutzerbezogene)Werte"; diff --git a/src/lang/en/admin.php b/src/lang/en/admin.php index a418851..cb83013 100644 --- a/src/lang/en/admin.php +++ b/src/lang/en/admin.php @@ -90,6 +90,7 @@ $content['LN_GEN_DEFVIEWS'] = "Default selected view"; $content['LN_GEN_DEFSOURCE'] = "Default selected source"; $content['LN_GEN_SUPPRESSDUPMSG'] = "Suppress duplicated messages"; $content['LN_GEN_TREATFILTERSTRUE'] = "Treat filters of not found fields as true"; +$content['LN_GEN_INLINESEARCHICONS'] = "Show Onlinesearch icons within fields"; $content['LN_GEN_OPTIONNAME'] = "Option name"; $content['LN_GEN_GLOBALVALUE'] = "Global value"; diff --git a/src/lang/it_IT/admin.php b/src/lang/it_IT/admin.php index d164cf0..3fe1d89 100644 --- a/src/lang/it_IT/admin.php +++ b/src/lang/it_IT/admin.php @@ -90,6 +90,7 @@ $content['LN_GEN_DEFVIEWS'] = "Default selected view"; $content['LN_GEN_DEFSOURCE'] = "Default selected source"; $content['LN_GEN_SUPPRESSDUPMSG'] = "Suppress duplicated messages"; $content['LN_GEN_TREATFILTERSTRUE'] = "Treat filters of not found fields as true"; +$content['LN_GEN_INLINESEARCHICONS'] = "Show Onlinesearch icons within fields"; $content['LN_GEN_OPTIONNAME'] = "Option name"; $content['LN_GEN_GLOBALVALUE'] = "Global value"; diff --git a/src/lang/pt_BR/admin.php b/src/lang/pt_BR/admin.php index 83e69d5..67a44d3 100644 --- a/src/lang/pt_BR/admin.php +++ b/src/lang/pt_BR/admin.php @@ -89,6 +89,9 @@ $content['LN_GEN_ACCESSDENIED'] = "Access denied to this function"; $content['LN_GEN_DEFVIEWS'] = "Default selected view"; $content['LN_GEN_DEFSOURCE'] = "Default selected source"; $content['LN_GEN_SUPPRESSDUPMSG'] = "Suppress duplicated messages"; +$content['LN_GEN_TREATFILTERSTRUE'] = "Treat filters of not found fields as true"; +$content['LN_GEN_INLINESEARCHICONS'] = "Show Onlinesearch icons within fields"; + $content['LN_GEN_OPTIONNAME'] = "Option name"; $content['LN_GEN_GLOBALVALUE'] = "Global value"; $content['LN_GEN_PERSONALVALUE'] = "Personal (User)value"; diff --git a/src/templates/admin/admin_index.html b/src/templates/admin/admin_index.html index 19c5e30..bbdfb89 100644 --- a/src/templates/admin/admin_index.html +++ b/src/templates/admin/admin_index.html @@ -215,6 +215,13 @@ + + + + {LN_GEN_INLINESEARCHICONS} + + +