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

Merge branch 'v2-stable' into beta

Browse Source
This commit is contained in:
Andre Lorbach 2010-02-23 15:01:18 +01:00
commit 5fac073242
10 changed files with 205 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/admin/parsers.php
View File

@ -139,6 +139,11 @@ if ( isset($_GET['op']) )
}
else if ($_GET['op'] == "removeparser")
{
// --- Only if the user is an admin!
if ( !isset($_SESSION['SESSION_ISADMIN']) || $_SESSION['SESSION_ISADMIN'] == 0 )
DieWithFriendlyErrorMsg( $content['LN_ADMIN_ERROR_NOTALLOWED'] );
// ---
if ( isset($_GET['id']) )
{
//PreInit these values
@ -194,6 +199,11 @@ if ( isset($_GET['op']) )
}
else if ($_GET['op'] == "initparser")
{
// --- Only if the user is an admin!
if ( !isset($_SESSION['SESSION_ISADMIN']) || $_SESSION['SESSION_ISADMIN'] == 0 )
DieWithFriendlyErrorMsg( $content['LN_ADMIN_ERROR_NOTALLOWED'] );
// ---
if ( isset($_GET['id']) )
{
//PreInit these values

22
src/admin/views.php
View File

@ -336,7 +336,7 @@ if ( isset($_POST['op']) )
$content['groupid'] = "null";
}
}
// --- Check mandotary values
if ( $content['DisplayName'] == "" )
{
@ -347,6 +347,26 @@ if ( isset($_POST['op']) )
if ( !isset($content['ISERROR']) )
{
// --- Set SUBOP Helpers
if ( $content['userid'] == "null" )
$content['CHECKED_ISUSERONLY'] = "";
else
$content['CHECKED_ISUSERONLY'] = "checked";
if ( $content['ISGROUPSAVAILABLE'] && $content['groupid'] != "null" )
{
// Process All Groups
for($i = 0; $i < count($content['SUBGROUPS']); $i++)
{
if ( $content['SUBGROUPS'][$i]['mygroupid'] == $content['groupid'] )
$content['SUBGROUPS'][$i]['group_selected'] = "selected";
else
$content['SUBGROUPS'][$i]['group_selected'] = "";
}
}
// ---
// Check subop's first!
if ( isset($_POST['subop']) )
{

49
src/include/functions_filters.php
View File

@ -78,6 +78,13 @@ function InitFilterHelpers()
$content['months'][] = $i;
for ( $i = 1; $i <= 31; $i++ )
$content['days'][] = $i;
// Init Hour, minute and second array
for ( $i = 0; $i <= 23; $i++ )
$content['hours'][] = ($i < 10) ? '0' . $i : $i;
for ( $i = 0; $i <= 59; $i++ )
$content['minutes'][] = ($i < 10) ? '0' . $i : $i;
for ( $i = 0; $i <= 59; $i++ )
$content['seconds'][] = ($i < 10) ? '0' . $i : $i;
// Init filter_daterange_from_year
if ( isset($_SESSION['filter_daterange_from_year']) )
@ -121,6 +128,48 @@ function InitFilterHelpers()
$filters['filter_daterange_to_day'] = $tomorrowDay;
FillDateRangeArray($content['days'], "filter_daterange_to_day_list", "filter_daterange_to_day");
// Init filter_daterange_from_hour
if ( isset($_SESSION['filter_daterange_from_hour']) )
$filters['filter_daterange_from_hour'] = intval($_SESSION['filter_daterange_from_hour']);
else
$filters['filter_daterange_from_hour'] = 0;
FillDateRangeArray($content['hours'], "filter_daterange_from_hour_list", "filter_daterange_from_hour");
// Init filter_daterange_from_minute
if ( isset($_SESSION['filter_daterange_from_minute']) )
$filters['filter_daterange_from_minute'] = intval($_SESSION['filter_daterange_from_minute']);
else
$filters['filter_daterange_from_minute'] = 0;
FillDateRangeArray($content['minutes'], "filter_daterange_from_minute_list", "filter_daterange_from_minute");
// Init filter_daterange_from_second
if ( isset($_SESSION['filter_daterange_from_second']) )
$filters['filter_daterange_from_second'] = intval($_SESSION['filter_daterange_from_second']);
else
$filters['filter_daterange_from_second'] = 0;
FillDateRangeArray($content['seconds'], "filter_daterange_from_second_list", "filter_daterange_from_second");
// Init filter_daterange_to_hour
if ( isset($_SESSION['filter_daterange_to_hour']) )
$filters['filter_daterange_to_hour'] = intval($_SESSION['filter_daterange_to_hour']);
else
$filters['filter_daterange_to_hour'] = 23;
FillDateRangeArray($content['hours'], "filter_daterange_to_hour_list", "filter_daterange_to_hour");
// Init filter_daterange_to_minute
if ( isset($_SESSION['filter_daterange_to_minute']) )
$filters['filter_daterange_to_minute'] = intval($_SESSION['filter_daterange_to_minute']);
else
$filters['filter_daterange_to_minute'] = 59;
FillDateRangeArray($content['minutes'], "filter_daterange_to_minute_list", "filter_daterange_to_minute");
// Init filter_daterange_to_second
if ( isset($_SESSION['filter_daterange_to_second']) )
$filters['filter_daterange_to_second'] = intval($_SESSION['filter_daterange_to_second']);
else
$filters['filter_daterange_to_second'] = 59;
FillDateRangeArray($content['seconds'], "filter_daterange_to_second_list", "filter_daterange_to_second");
// --- Define LASTX Array
// Init Default DateMode from SESSION!

28
src/js/searchhelpers.js
View File

@ -25,6 +25,12 @@ function toggleDatefiltervisibility(FormName)
toggleformelement('filter_daterange_to_year', false);
toggleformelement('filter_daterange_to_month', false);
toggleformelement('filter_daterange_to_day', false);
toggleformelement('filter_daterange_from_hour', false);
toggleformelement('filter_daterange_from_minute', false);
toggleformelement('filter_daterange_from_second', false);
toggleformelement('filter_daterange_to_hour', false);
toggleformelement('filter_daterange_to_minute', false);
toggleformelement('filter_daterange_to_second', false);
toggleformelement('filter_daterange_last_x', false);
}
@ -39,6 +45,12 @@ function toggleDatefiltervisibility(FormName)
toggleformelement('filter_daterange_to_year', true);
toggleformelement('filter_daterange_to_month', true);
toggleformelement('filter_daterange_to_day', true);
toggleformelement('filter_daterange_from_hour', true);
toggleformelement('filter_daterange_from_minute', true);
toggleformelement('filter_daterange_from_second', true);
toggleformelement('filter_daterange_to_hour', true);
toggleformelement('filter_daterange_to_minute', true);
toggleformelement('filter_daterange_to_second', true);
toggleformelement('filter_daterange_last_x', false);
}
@ -53,6 +65,12 @@ function toggleDatefiltervisibility(FormName)
toggleformelement('filter_daterange_to_year', false);
toggleformelement('filter_daterange_to_month', false);
toggleformelement('filter_daterange_to_day', false);
toggleformelement('filter_daterange_from_hour', false);
toggleformelement('filter_daterange_from_minute', false);
toggleformelement('filter_daterange_from_second', false);
toggleformelement('filter_daterange_to_hour', false);
toggleformelement('filter_daterange_to_minute', false);
toggleformelement('filter_daterange_to_second', false);
toggleformelement('filter_daterange_last_x', true);
}
@ -70,10 +88,16 @@ function CalculateSearchPreview(szSearchFormName, szPreviewArea)
{
szOutString += "datefrom:" + mySearchform.elements['filter_daterange_from_year'].value + "-"
+ mySearchform.elements['filter_daterange_from_month'].value + "-"
+ mySearchform.elements['filter_daterange_from_day'].value + "T00:00:00 ";
+ mySearchform.elements['filter_daterange_from_day'].value + "T"
+ mySearchform.elements['filter_daterange_from_hour'].value + ":"
+ mySearchform.elements['filter_daterange_from_minute'].value + ":"
+ mySearchform.elements['filter_daterange_from_second'].value + " ";
szOutString += "dateto:" + mySearchform.elements['filter_daterange_to_year'].value + "-"
+ mySearchform.elements['filter_daterange_to_month'].value + "-"
+ mySearchform.elements['filter_daterange_to_day'].value + "T00:00:00 ";
+ mySearchform.elements['filter_daterange_to_day'].value + "T"
+ mySearchform.elements['filter_daterange_to_hour'].value + ":"
+ mySearchform.elements['filter_daterange_to_minute'].value + ":"
+ mySearchform.elements['filter_daterange_to_second'].value + " ";
}
else if (mySearchform.elements['filter_datemode'].value == DATEMODE_LASTX)
{

2
src/lang/de/main.php
View File

@ -164,6 +164,8 @@ $content['LN_DATEMODE_RANGE'] = "Zeitspanne";
$content['LN_DATEMODE_LASTX'] = "Seit heute, x Uhr";
$content['LN_FILTER_DATEFROM'] = "Zeitraum seit x";
$content['LN_FILTER_DATETO'] = "Zeitraum bis x";
$content['LN_FILTER_TIMEFROM'] = "Time range from";
$content['LN_FILTER_TIMETO'] = "Time range to";
$content['LN_FILTER_DATELASTX'] = "Zeit seit";
$content['LN_FILTER_ADD2SEARCH'] = "Zur Suche hinzuf&uuml;gen";
$content['LN_DATE_LASTX_HOUR'] = "in der letzten Stunde";

2
src/lang/en/main.php
View File

@ -170,6 +170,8 @@ $content['LN_DATEMODE_RANGE'] = "Time range";
$content['LN_DATEMODE_LASTX'] = "Time x since today";
$content['LN_FILTER_DATEFROM'] = "Date range from";
$content['LN_FILTER_DATETO'] = "Date range to";
$content['LN_FILTER_TIMEFROM'] = "Time range from";
$content['LN_FILTER_TIMETO'] = "Time range to";
$content['LN_FILTER_DATELASTX'] = "Time since";
$content['LN_FILTER_ADD2SEARCH'] = "Add to search";
$content['LN_DATE_LASTX_HOUR'] = "Last hour";

2
src/lang/it_IT/main.php
View File

@ -102,6 +102,8 @@ $content['LN_DATEMODE_RANGE'] = "Intervallo orario";
$content['LN_DATEMODE_LASTX'] = "Ultimi x ore/giorni";
$content['LN_FILTER_DATEFROM'] = "Dalla data";
$content['LN_FILTER_DATETO'] = "Alla data";
$content['LN_FILTER_TIMEFROM'] = "Time range from";
$content['LN_FILTER_TIMETO'] = "Time range to";
$content['LN_FILTER_DATELASTX'] = "Ultime ore oppure ultimi giorni";
$content['LN_FILTER_ADD2SEARCH'] = "Aggiungi alla ricerca";
$content['LN_DATE_LASTX_HOUR'] = "Ultima ora";

2
src/lang/pt_BR/main.php
View File

@ -165,6 +165,8 @@ $content['LN_DATEMODE_RANGE'] = "Intervalo de tempo";
$content['LN_DATEMODE_LASTX'] = "Tempo X desde hoje";
$content['LN_FILTER_DATEFROM'] = "Data a partir de ";
$content['LN_FILTER_DATETO'] = "At&eacute;";
$content['LN_FILTER_TIMEFROM'] = "Time range from";
$content['LN_FILTER_TIMETO'] = "Time range to";
$content['LN_FILTER_DATELASTX'] = "Tempo desde";
$content['LN_FILTER_ADD2SEARCH'] = "Adicionar a busca";
$content['LN_DATE_LASTX_HOUR'] = "&Uacute;ltima hora";

49
src/search.php
View File

@ -90,14 +90,59 @@ if ( (isset($_POST['search']) || isset($_GET['search'])) )
$filters['filter_daterange_to_month'] = intval($_GET['filter_daterange_to_month']);
if ( isset($_GET['filter_daterange_to_day']) )
$filters['filter_daterange_to_day'] = intval($_GET['filter_daterange_to_day']);
// Read range values and prepend leading zeroes for values < 10
if ( isset($_GET['filter_daterange_from_hour']) )
{
$filters['filter_daterange_from_hour'] = intval($_GET['filter_daterange_from_hour']);
if ($filters['filter_daterange_from_hour'] < 10)
$filters['filter_daterange_from_hour'] = '0' . $filters['filter_daterange_from_hour'];
}
if ( isset($_GET['filter_daterange_from_minute']) )
{
$filters['filter_daterange_from_minute'] = intval($_GET['filter_daterange_from_minute']);
if ($filters['filter_daterange_from_minute'] < 10)
$filters['filter_daterange_from_minute'] = '0' . $filters['filter_daterange_from_minute'];
}
if ( isset($_GET['filter_daterange_from_second']) )
{
$filters['filter_daterange_from_second'] = intval($_GET['filter_daterange_from_second']);
if ($filters['filter_daterange_from_second'] < 10)
$filters['filter_daterange_from_second'] = '0' . $filters['filter_daterange_from_second'];
}
if ( isset($_GET['filter_daterange_to_hour']) )
{
$filters['filter_daterange_to_hour'] = intval($_GET['filter_daterange_to_hour']);
if ($filters['filter_daterange_to_hour'] < 10)
$filters['filter_daterange_to_hour'] = '0' . $filters['filter_daterange_to_hour'] = '0';
}
if ( isset($_GET['filter_daterange_to_minute']) )
{
$filters['filter_daterange_to_minute'] = intval($_GET['filter_daterange_to_minute']);
if ($filters['filter_daterange_to_minute'] < 10)
$filters['filter_daterange_to_minute'] = '0' . $filters['filter_daterange_to_minute'];
}
if ( isset($_GET['filter_daterange_to_second']) )
{
$filters['filter_daterange_to_second'] = intval($_GET['filter_daterange_to_second']);
if ($filters['filter_daterange_to_second'] < 10)
$filters['filter_daterange_to_second'] = '0' . $filters['filter_daterange_to_second'] = '0';
}
// Append to searchstring
$content['searchstr'] .= "datefrom:" . $filters['filter_daterange_from_year'] . "-" .
$filters['filter_daterange_from_month'] . "-" .
$filters['filter_daterange_from_day'] . "T00:00:00 ";
$filters['filter_daterange_from_day'] . "T" .
$filters['filter_daterange_from_hour'] . ":" .
$filters['filter_daterange_from_minute'] . ":" .
$filters['filter_daterange_from_second'] . " ";
$content['searchstr'] .= "dateto:" . $filters['filter_daterange_to_year'] . "-" .
$filters['filter_daterange_to_month'] . "-" .
$filters['filter_daterange_to_day'] . "T23:59:59 ";
$filters['filter_daterange_to_day'] . "T" .
$filters['filter_daterange_to_hour'] . ":" .
$filters['filter_daterange_to_minute'] . ":" .
$filters['filter_daterange_to_second'] . " ";
}
else if ( $filters['filter_datemode'] == DATEMODE_LASTX )

44
src/templates/search.html
View File

@ -81,6 +81,50 @@
</select>
</td>
</tr>
<tr>
<td align="left" class="cellmenu2" width="150" nowrap><b>{LN_FILTER_TIMEFROM}</b></td>
<td align="right" class="line1" width="100%">
<select name="filter_daterange_from_hour" size="1">
<!-- BEGIN filter_daterange_from_hour_list -->
<option {selected} value="{value}">{value}</option>
<!-- END filter_daterange_from_hour_list -->
</select>
-
<select name="filter_daterange_from_minute" size="1">
<!-- BEGIN filter_daterange_from_minute_list -->
<option {selected} value="{value}">{value}</option>
<!-- END filter_daterange_from_minute_list -->
</select>
-
<select name="filter_daterange_from_second" size="1">
<!-- BEGIN filter_daterange_from_second_list -->
<option {selected} value="{value}">{value}</option>
<!-- END filter_daterange_from_second_list -->
</select>
</td>
</tr>
<tr>
<td align="left" class="cellmenu2" width="150" nowrap><b>{LN_FILTER_TIMETO}</b></td>
<td align="right" class="line1" width="100%">
<select name="filter_daterange_to_hour" size="1">
<!-- BEGIN filter_daterange_to_hour_list -->
<option {selected} value="{value}">{value}</option>
<!-- END filter_daterange_to_hour_list -->
</select>
-
<select name="filter_daterange_to_minute" size="1">
<!-- BEGIN filter_daterange_to_minute_list -->
<option {selected} value="{value}">{value}</option>
<!-- END filter_daterange_to_minute_list -->
</select>
-
<select name="filter_daterange_to_second" size="1">
<!-- BEGIN filter_daterange_to_second_list -->
<option {selected} value="{value}">{value}</option>
<!-- END filter_daterange_to_second_list -->
</select>
</td>
</tr>
</table>
</div>