diff --git a/src/include/functions_common.php b/src/include/functions_common.php index ebc287a..0b73195 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -393,7 +393,7 @@ function CreatePagesizesList() $content['pagesizes'][ $_SESSION['PAGESIZE_ID'] ]["Selected"] = "selected"; // The content variable will now contain the user selected oaging size - $content["ViewEntriesPerPage"] = $content['pagesizes'][ $_SESSION['PAGESIZE_ID'] ]["Value"]; + $content["CurrentViewEntriesPerPage"] = $content['pagesizes'][ $_SESSION['PAGESIZE_ID'] ]["Value"]; } function CreateReloadTimesList() diff --git a/src/index.php b/src/index.php index 362ed33..e3d3198 100644 --- a/src/index.php +++ b/src/index.php @@ -625,14 +625,14 @@ if ( isset($content['Sources'][$currentSourceID]) ) // Increment Counter $counter++; - } while ($counter < $content['ViewEntriesPerPage'] && ($ret = $stream->ReadNext($uID, $logArray)) == SUCCESS); + } while ($counter < $content['CurrentViewEntriesPerPage'] && ($ret = $stream->ReadNext($uID, $logArray)) == SUCCESS); //print_r ( $content['syslogmessages'] ); // Move below processing - Read First and LAST UID's before start reading the stream! $content['uid_last'] = $stream->GetLastPageUID(); $content['uid_first'] = $stream->GetFirstPageUID(); - if ( $content['main_recordcount'] == -1 || $content['main_recordcount'] > $content['ViewEntriesPerPage'] ) + if ( $content['main_recordcount'] == -1 || $content['main_recordcount'] > $content['CurrentViewEntriesPerPage'] ) { // Enable Pager in any case here! $content['main_pagerenabled'] = true; diff --git a/src/templates/admin/admin_groups.html b/src/templates/admin/admin_groups.html index 9b9af7b..2d461c7 100644 --- a/src/templates/admin/admin_groups.html +++ b/src/templates/admin/admin_groups.html @@ -49,7 +49,7 @@ - {LN_GROUP_MEMBERS} + {LN_GROUP_MEMBERS} @@ -77,7 +77,7 @@ - {LN_GROUP_DESCRIPTION} + {LN_GROUP_DESCRIPTION} diff --git a/src/templates/admin/admin_index.html b/src/templates/admin/admin_index.html index 830490e..d90cbc9 100644 --- a/src/templates/admin/admin_index.html +++ b/src/templates/admin/admin_index.html @@ -11,7 +11,7 @@ - - + - + - + diff --git a/src/templates/admin/admin_upgrade.html b/src/templates/admin/admin_upgrade.html index 923d8bd..5e47340 100644 --- a/src/templates/admin/admin_upgrade.html +++ b/src/templates/admin/admin_upgrade.html @@ -56,8 +56,8 @@ - - + + diff --git a/src/templates/admin/admin_views.html b/src/templates/admin/admin_views.html index 7e2914c..016a177 100644 --- a/src/templates/admin/admin_views.html +++ b/src/templates/admin/admin_views.html @@ -74,12 +74,12 @@ - + - + - + - + - +
  + {LN_GEN_DISABLEUSEROPTIONS}
diff --git a/src/templates/admin/admin_parsers.html b/src/templates/admin/admin_parsers.html index ec9f59c..c309f10 100644 --- a/src/templates/admin/admin_parsers.html +++ b/src/templates/admin/admin_parsers.html @@ -69,12 +69,12 @@ 		{DisplayName}
{LN_PARSERS_DESCRIPTION}{LN_PARSERS_DESCRIPTION} {Description}
{LN_PARSERS_CUSTOMFIELDS}{LN_PARSERS_CUSTOMFIELDS}
{FieldCaption} ({FieldDefine}) diff --git a/src/templates/admin/admin_sources.html b/src/templates/admin/admin_sources.html index f297449..852f595 100644 --- a/src/templates/admin/admin_sources.html +++ b/src/templates/admin/admin_sources.html @@ -103,7 +103,7 @@
{LN_SOURCES_DESCRIPTION}{LN_SOURCES_DESCRIPTION}
{LN_DBUPGRADE_ONESTATEMENTFAILED}
{LN_DBUPGRADE_ERRMSG}SQL Statement{LN_DBUPGRADE_ERRMSG}SQL Statement
{LN_GEN_USERONLY_LONG}{LN_GEN_USERONLY_LONG}
{LN_GEN_GROUPONLY_LONG}{LN_GEN_GROUPONLY_LONG}
{LN_FILTER_FACILITY}{LN_FILTER_FACILITY} {LN_FILTER_SEVERITY}{LN_FILTER_SEVERITY}
{LN_FILTER_MESSAGETYPE}{LN_FILTER_MESSAGETYPE}