tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-26 11:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2-stable' into beta

Browse Source 
Conflicts:

	ChangeLog
	src/include/functions_common.php
This commit is contained in:
Andre Lorbach 2010-02-23 16:03:46 +01:00
commit e9e70403c4
11 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -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 3.0.0 (beta), 2010-02-16
- All references to phpLogCon have now been renamed to LogAnalyzer,
which will be the new name for the phpLogCon project from now on.

8
src/admin/index.php
View File

@ -149,6 +149,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; }
@ -203,6 +204,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
@ -227,6 +229,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'] = ""; }
@ -239,6 +245,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'] = ""; }
@ -312,6 +319,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!

1
src/include/config.sample.php
View File

@ -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

2
src/include/functions_common.php
View File

@ -1536,6 +1536,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 );
@ -1579,6 +1580,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'] );

4
src/include/functions_users.php
View File

@ -330,8 +330,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 )

9
src/index.php
View File

@ -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!

3
src/lang/de/admin.php
View File

@ -90,6 +90,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";

1
src/lang/en/admin.php
View File

@ -91,6 +91,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";

1
src/lang/it_IT/admin.php
View File

@ -91,6 +91,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";

3
src/lang/pt_BR/admin.php
View File

@ -90,6 +90,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";

7
src/templates/admin/admin_index.html
View File

@ -215,6 +215,13 @@
<td align="right" class="line1" ><input type="checkbox" name="TreatNotFoundFiltersAsTrue" value="yes" {TreatNotFoundFiltersAsTrue_checked} {DISABLE_GLOBALEDIT_FORMCONTROL}></td>
<!-- IF ENABLEUSEROPTIONS="true" -->
<td align="right" class="line1" ><input type="checkbox" name="User_TreatNotFoundFiltersAsTrue" value="yes" {User_TreatNotFoundFiltersAsTrue_checked}></td>
<!-- ENDIF ENABLEUSEROPTIONS="true" -->
</tr>
<tr>
<td align="left" class="cellmenu2" nowrap><b>{LN_GEN_INLINESEARCHICONS}</b></td>
<td align="right" class="line1" ><input type="checkbox" name="InlineOnlineSearchIcons" value="yes" {InlineOnlineSearchIcons_checked} {DISABLE_GLOBALEDIT_FORMCONTROL}></td>
<!-- IF ENABLEUSEROPTIONS="true" -->
<td align="right" class="line1" ><input type="checkbox" name="User_InlineOnlineSearchIcons" value="yes" {User_InlineOnlineSearchIcons_checked}></td>
<!-- ENDIF ENABLEUSEROPTIONS="true" -->
</tr>
<tr>