mirror of
https://github.com/rsyslog/loganalyzer.git
synced 2025-09-25 18:59:12 +02:00
Enhanced error display in all admin templates. Fixed minor issues.
This commit is contained in:
parent
c8c1e45226
commit
bdf77d5208
@ -58,6 +58,9 @@ IncludeLanguageFile( $gl_root_path . '/lang/' . $LANG . '/admin.php' );
|
|||||||
//if ( !isset($_SESSION['SESSION_ISADMIN']) || $_SESSION['SESSION_ISADMIN'] == 0 )
|
//if ( !isset($_SESSION['SESSION_ISADMIN']) || $_SESSION['SESSION_ISADMIN'] == 0 )
|
||||||
// DieWithFriendlyErrorMsg( $content['LN_ADMIN_ERROR_NOTALLOWED'] );
|
// DieWithFriendlyErrorMsg( $content['LN_ADMIN_ERROR_NOTALLOWED'] );
|
||||||
|
|
||||||
|
// Init helper variable to empty string
|
||||||
|
$content['FormUrlAddOP'] = "";
|
||||||
|
|
||||||
if ( isset($_GET['op']) )
|
if ( isset($_GET['op']) )
|
||||||
{
|
{
|
||||||
if ($_GET['op'] == "add")
|
if ($_GET['op'] == "add")
|
||||||
@ -72,6 +75,7 @@ if ( isset($_GET['op']) )
|
|||||||
$content['userid'] = null;
|
$content['userid'] = null;
|
||||||
$content['CHECKED_ISUSERONLY'] = "";
|
$content['CHECKED_ISUSERONLY'] = "";
|
||||||
$content['VIEWID'] = "";
|
$content['VIEWID'] = "";
|
||||||
|
$content['FormUrlAddOP'] = "?op=add";
|
||||||
|
|
||||||
// --- Check if groups are available
|
// --- Check if groups are available
|
||||||
$content['SUBGROUPS'] = GetGroupsForSelectfield();
|
$content['SUBGROUPS'] = GetGroupsForSelectfield();
|
||||||
@ -88,7 +92,6 @@ if ( isset($_GET['op']) )
|
|||||||
$content['VIEW_FORMACTION'] = "editview";
|
$content['VIEW_FORMACTION'] = "editview";
|
||||||
$content['VIEW_SENDBUTTON'] = $content['LN_VIEWS_EDIT'];
|
$content['VIEW_SENDBUTTON'] = $content['LN_VIEWS_EDIT'];
|
||||||
|
|
||||||
|
|
||||||
// Copy Views array for further modifications
|
// Copy Views array for further modifications
|
||||||
$content['VIEWS'] = $content['Views'];
|
$content['VIEWS'] = $content['Views'];
|
||||||
|
|
||||||
@ -99,6 +102,10 @@ if ( isset($_GET['op']) )
|
|||||||
$content['VIEWID'] = DB_RemoveBadChars($_GET['id']);
|
$content['VIEWID'] = DB_RemoveBadChars($_GET['id']);
|
||||||
if ( isset($content['VIEWS'][ $content['VIEWID'] ]) )
|
if ( isset($content['VIEWS'][ $content['VIEWID'] ]) )
|
||||||
{
|
{
|
||||||
|
|
||||||
|
//Set the FormAdd URL
|
||||||
|
$content['FormUrlAddOP'] = "?op=edit&id=" . $content['VIEWID'];
|
||||||
|
|
||||||
$myview = $content['VIEWS'][ $content['VIEWID'] ];
|
$myview = $content['VIEWS'][ $content['VIEWID'] ];
|
||||||
|
|
||||||
$content['DisplayName'] = $myview['DisplayName'] ;
|
$content['DisplayName'] = $myview['DisplayName'] ;
|
||||||
|
@ -57,6 +57,8 @@ $content['LN_GEN_SOURCE_DB'] = "Datenbank";
|
|||||||
$content['LN_GEN_DB_SQLITE'] = "SQLite 2";
|
$content['LN_GEN_DB_SQLITE'] = "SQLite 2";
|
||||||
$content['LN_GEN_SELECTVIEW'] = "Select View";
|
$content['LN_GEN_SELECTVIEW'] = "Select View";
|
||||||
$content['LN_GEN_CRITERROR_UNKNOWNTYPE'] = "The source type '%1' is not supported by phpLogCon yet. This is a critical error, please fix your configuration.";
|
$content['LN_GEN_CRITERROR_UNKNOWNTYPE'] = "The source type '%1' is not supported by phpLogCon yet. This is a critical error, please fix your configuration.";
|
||||||
|
$content['LN_GEN_ERRORRETURNPREV'] = "Click here to return to the previous site.";
|
||||||
|
$content['LN_GEN_ERRORDETAILS'] = "Error Details:";
|
||||||
|
|
||||||
// Topmenu Entries
|
// Topmenu Entries
|
||||||
$content['LN_MENU_SEARCH'] = "Suchen";
|
$content['LN_MENU_SEARCH'] = "Suchen";
|
||||||
|
@ -58,7 +58,9 @@ $content['LN_GEN_DB_INFORMIX'] = "IBM Informix Dynamic Server";
|
|||||||
$content['LN_GEN_DB_SQLITE'] = "SQLite 2";
|
$content['LN_GEN_DB_SQLITE'] = "SQLite 2";
|
||||||
$content['LN_GEN_SELECTVIEW'] = "Select View";
|
$content['LN_GEN_SELECTVIEW'] = "Select View";
|
||||||
$content['LN_GEN_CRITERROR_UNKNOWNTYPE'] = "The source type '%1' is not supported by phpLogCon yet. This is a critical error, please fix your configuration.";
|
$content['LN_GEN_CRITERROR_UNKNOWNTYPE'] = "The source type '%1' is not supported by phpLogCon yet. This is a critical error, please fix your configuration.";
|
||||||
|
$content['LN_GEN_ERRORRETURNPREV'] = "Click here to return to the previous site.";
|
||||||
|
$content['LN_GEN_ERRORDETAILS'] = "Error Details:";
|
||||||
|
|
||||||
// Topmenu Entries
|
// Topmenu Entries
|
||||||
$content['LN_MENU_SEARCH'] = "Search";
|
$content['LN_MENU_SEARCH'] = "Search";
|
||||||
$content['LN_MENU_SHOWEVENTS'] = "Show Events";
|
$content['LN_MENU_SHOWEVENTS'] = "Show Events";
|
||||||
|
@ -61,7 +61,8 @@ $content['LN_GEN_DB_INFORMIX'] = "IBM Informix Dynamic Server";
|
|||||||
$content['LN_GEN_DB_SQLITE'] = "SQLite 2";
|
$content['LN_GEN_DB_SQLITE'] = "SQLite 2";
|
||||||
$content['LN_GEN_SELECTVIEW'] = "Visão";
|
$content['LN_GEN_SELECTVIEW'] = "Visão";
|
||||||
$content['LN_GEN_CRITERROR_UNKNOWNTYPE'] = "The source type '%1' is not supported by phpLogCon yet. This is a critical error, please fix your configuration.";
|
$content['LN_GEN_CRITERROR_UNKNOWNTYPE'] = "The source type '%1' is not supported by phpLogCon yet. This is a critical error, please fix your configuration.";
|
||||||
$content['LN_GEN_CRITERROR_UNKNOWNTYPE'] = "The source type '%1' is not supported by phpLogCon yet. This is a critical error, please fix your configuration.";
|
$content['LN_GEN_ERRORRETURNPREV'] = "Click here to return to the previous site.";
|
||||||
|
$content['LN_GEN_ERRORDETAILS'] = "Error Details:";
|
||||||
|
|
||||||
// Topmenu Entries
|
// Topmenu Entries
|
||||||
$content['LN_MENU_SEARCH'] = "Search";
|
$content['LN_MENU_SEARCH'] = "Search";
|
||||||
|
@ -1,19 +1,20 @@
|
|||||||
<!-- INCLUDE include_header.html -->
|
<!-- INCLUDE include_header.html -->
|
||||||
|
|
||||||
|
<!-- IF ISERROR="true" -->
|
||||||
|
<br>
|
||||||
|
<center>
|
||||||
|
<h3 class="ErrorMsg">{LN_GEN_ERRORDETAILS} {ERROR_MSG}</h3>
|
||||||
|
<a href="javascript:history.back();" target="_top">{LN_GEN_ERRORRETURNPREV}</a>
|
||||||
|
</center>
|
||||||
|
<br>
|
||||||
|
<!-- ENDIF ISERROR="true" -->
|
||||||
|
|
||||||
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="3" class="title" nowrap><B>{LN_GROUP_CENTER}</B></td>
|
<td colspan="3" class="title" nowrap><B>{LN_GROUP_CENTER}</B></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center" class="line2">
|
<td align="center" class="line2">
|
||||||
|
|
||||||
<!-- IF ISERROR="true" -->
|
|
||||||
<br><br>
|
|
||||||
<center>
|
|
||||||
<h3><font color="red">{ERROR_MSG}</font></h3>
|
|
||||||
</center>
|
|
||||||
<!-- ENDIF ISERROR="true" -->
|
|
||||||
|
|
||||||
<br><br>
|
<br><br>
|
||||||
|
|
||||||
<!-- IF LISTGROUPS="true" -->
|
<!-- IF LISTGROUPS="true" -->
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
<!-- INCLUDE include_header.html -->
|
<!-- INCLUDE include_header.html -->
|
||||||
|
|
||||||
<!-- IF ISERROR="true" -->
|
<!-- IF ISERROR="true" -->
|
||||||
|
<br>
|
||||||
<center>
|
<center>
|
||||||
<h3><font color="red">{ERROR_MSG}</font></h3>
|
<h3 class="ErrorMsg">{LN_GEN_ERRORDETAILS} {ERROR_MSG}</h3>
|
||||||
|
<a href="javascript:history.back();" target="_top">{LN_GEN_ERRORRETURNPREV}</a>
|
||||||
</center>
|
</center>
|
||||||
|
<br>
|
||||||
<!-- ENDIF ISERROR="true" -->
|
<!-- ENDIF ISERROR="true" -->
|
||||||
|
|
||||||
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
||||||
|
@ -30,9 +30,12 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- IF ISERROR="true" -->
|
<!-- IF ISERROR="true" -->
|
||||||
|
<br>
|
||||||
<center>
|
<center>
|
||||||
<h3><font color="red">{ERROR_MSG}</font></h3>
|
<h3 class="ErrorMsg">{LN_GEN_ERRORDETAILS} {ERROR_MSG}</h3>
|
||||||
|
<a href="javascript:history.back();" target="_top">{LN_GEN_ERRORRETURNPREV}</a>
|
||||||
</center>
|
</center>
|
||||||
|
<br>
|
||||||
<!-- ENDIF ISERROR="true" -->
|
<!-- ENDIF ISERROR="true" -->
|
||||||
|
|
||||||
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
<!-- INCLUDE include_header.html -->
|
<!-- INCLUDE include_header.html -->
|
||||||
|
|
||||||
<!-- IF ISERROR="true" -->
|
<!-- IF ISERROR="true" -->
|
||||||
|
<br>
|
||||||
<center>
|
<center>
|
||||||
<h3><font color="red">{ERROR_MSG}</font></h3>
|
<h3 class="ErrorMsg">{LN_GEN_ERRORDETAILS} {ERROR_MSG}</h3>
|
||||||
|
<a href="javascript:history.back();" target="_top">{LN_GEN_ERRORRETURNPREV}</a>
|
||||||
</center>
|
</center>
|
||||||
|
<br>
|
||||||
<!-- ENDIF ISERROR="true" -->
|
<!-- ENDIF ISERROR="true" -->
|
||||||
|
|
||||||
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
<!-- INCLUDE include_header.html -->
|
<!-- INCLUDE include_header.html -->
|
||||||
|
|
||||||
<!-- IF ISERROR="true" -->
|
<!-- IF ISERROR="true" -->
|
||||||
|
<br>
|
||||||
<center>
|
<center>
|
||||||
<h3><font color="red">{ERROR_MSG}</font></h3>
|
<h3 class="ErrorMsg">{LN_GEN_ERRORDETAILS} {ERROR_MSG}</h3>
|
||||||
|
<a href="javascript:history.back();" target="_top">{LN_GEN_ERRORRETURNPREV}</a>
|
||||||
</center>
|
</center>
|
||||||
|
<br>
|
||||||
<!-- ENDIF ISERROR="true" -->
|
<!-- ENDIF ISERROR="true" -->
|
||||||
|
|
||||||
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="with_border">
|
||||||
@ -57,7 +60,7 @@
|
|||||||
<!-- ENDIF LISTVIEWS="true" -->
|
<!-- ENDIF LISTVIEWS="true" -->
|
||||||
|
|
||||||
<!-- IF ISEDITORNEWVIEW="true" -->
|
<!-- IF ISEDITORNEWVIEW="true" -->
|
||||||
<form action="" method="post">
|
<form action="{BASEPATH}admin/views.php{FormUrlAddOP}" method="post">
|
||||||
<table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="600" class="with_border_alternate">
|
<table border="0" cellpadding="1" cellspacing="1" bgcolor="#DDDDDD" width="600" class="with_border_alternate">
|
||||||
<tr>
|
<tr>
|
||||||
<td align="center" class="cellmenu1" colspan="2"><b>{LN_VIEWS_ADDEDIT}</b></td>
|
<td align="center" class="cellmenu1" colspan="2"><b>{LN_VIEWS_ADDEDIT}</b></td>
|
||||||
|
@ -88,7 +88,7 @@
|
|||||||
<center>
|
<center>
|
||||||
<font color="red">
|
<font color="red">
|
||||||
<br>
|
<br>
|
||||||
<h3>{LN_ERROR_NORECORDS} (code {error_code} ) - Error Details: </h3>
|
<h3>{LN_ERROR_NORECORDS} (code {error_code} ) - {LN_GEN_ERRORDETAILS}</h3>
|
||||||
{detailederror}
|
{detailederror}
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
|
@ -343,7 +343,7 @@
|
|||||||
<center>
|
<center>
|
||||||
<font color="red">
|
<font color="red">
|
||||||
<br>
|
<br>
|
||||||
<h3>{LN_ERROR_NORECORDS} - Error Details: </h3>
|
<h3>{LN_ERROR_NORECORDS} - {LN_GEN_ERRORDETAILS}</h3>
|
||||||
{detailederror}
|
{detailederror}
|
||||||
<br>
|
<br>
|
||||||
<br>
|
<br>
|
||||||
|
@ -333,9 +333,6 @@ A.cellmenu1_link:hover
|
|||||||
{
|
{
|
||||||
font: bold 12px Verdana, Arial, Helvetica, sans-serif;
|
font: bold 12px Verdana, Arial, Helvetica, sans-serif;
|
||||||
COLOR: #FF2222;
|
COLOR: #FF2222;
|
||||||
border-top: 1px solid;
|
|
||||||
border-bottom: 1px solid;
|
|
||||||
border-color: #58363E;
|
|
||||||
}
|
}
|
||||||
.PriorityEmergency
|
.PriorityEmergency
|
||||||
{
|
{
|
||||||
|
@ -339,9 +339,6 @@ A.cellmenu1_link:hover
|
|||||||
{
|
{
|
||||||
font: bold 12px Verdana, Arial, Helvetica, sans-serif;
|
font: bold 12px Verdana, Arial, Helvetica, sans-serif;
|
||||||
COLOR: #FF0000;
|
COLOR: #FF0000;
|
||||||
border-top: 1px solid;
|
|
||||||
border-bottom: 1px solid;
|
|
||||||
border-color: #58363E;
|
|
||||||
}
|
}
|
||||||
.PriorityEmergency
|
.PriorityEmergency
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user