" .
"";
exit;
}
@@ -1005,6 +1005,12 @@ function RedirectPage( $newpage )
function RedirectResult( $szMsg, $newpage )
{
+ global $content;
+
+ if ( defined('PHPLOGCON_INERROR') )
+ DieWithErrorMsg( GetAndReplaceLangStr($content["LN_ERROR_REDIRECTABORTED"], $newpage) );
+
+ // Perform redirect!
header("Location: result.php?msg=" . urlencode($szMsg) . "&redir=" . urlencode($newpage));
exit;
}
@@ -1507,6 +1513,22 @@ function list_files($directory, $failOnError = true)
}
}
+/*
+* Helper function to flush html output to avoid redirects if errors happen!
+*/
+function FlushHtmlOutput()
+{
+ global $RUNMODE;
+
+ // not needed in console mode
+ if ( $RUNMODE == RUNMODE_COMMANDLINE )
+ return;
+
+ //Flush php output
+ @flush();
+ @ob_flush();
+}
+
/*
* Helper function to get the errorCode
*/
diff --git a/src/include/functions_db.php b/src/include/functions_db.php
index d70302b..26e2d03 100644
--- a/src/include/functions_db.php
+++ b/src/include/functions_db.php
@@ -216,6 +216,9 @@ function DB_PrintError($MyErrorMsg, $DieOrNot)
$errdesc = mysql_error();
$errno = mysql_errno();
+ // Define global variable so we know an error has occured!
+ define('PHPLOGCON_INERROR', true);
+
$errormsg="Database error: $MyErrorMsg $linesep";
$errormsg.="mysql error: $errdesc $linesep";
$errormsg.="mysql error number: $errno $linesep";
diff --git a/src/lang/de/main.php b/src/lang/de/main.php
index de2b657..051cad3 100644
--- a/src/lang/de/main.php
+++ b/src/lang/de/main.php
@@ -97,6 +97,7 @@ $content['LN_ERROR_NORECORDS'] = "Es wurden keine syslog-Einträge gefunden.
$content['LN_WARNING_LOGSTREAMDISK_TIMEOUT'] = "While reading the logstream, the php script timeout forced me to abort at this point.
If you want to avoid this, please increase the phpLogCon script timeout in your config.php. If the user system is installed, you can do that in Admin center.";
$content['LN_WARNING_DBUPGRADE'] = "Database Upgrade required";
$content['LN_WARNING_DBUPGRADE_TEXT'] = "The current installed database version is '%1'. An update to version '%2' is available.";
+ $content['LN_ERROR_REDIRECTABORTED'] = 'Automatic redirect to the page was aborted, as an internal error occured. Please see the error details above and contact our support forums if you need assistance.';
// Topmenu Entries
$content['LN_MENU_SEARCH'] = "Suchen";
diff --git a/src/lang/en/main.php b/src/lang/en/main.php
index 9157725..b1153bf 100644
--- a/src/lang/en/main.php
+++ b/src/lang/en/main.php
@@ -99,6 +99,7 @@ $content['LN_ERROR_DB_DBFIELDNOTFOUND'] = "Database Field mapping for at least o
$content['LN_ERROR_FILE_NOMORETIME'] = "No more time for processing left";
$content['LN_WARNING_DBUPGRADE'] = "Database Upgrade required";
$content['LN_WARNING_DBUPGRADE_TEXT'] = "The current installed database version is '%1'. An update to version '%2' is available.";
+ $content['LN_ERROR_REDIRECTABORTED'] = 'Automatic redirect to the page was aborted, as an internal error occured. Please see the error details above and contact our support forums if you need assistance.';
// Topmenu Entries
$content['LN_MENU_SEARCH'] = "Search";
diff --git a/src/lang/pt_BR/main.php b/src/lang/pt_BR/main.php
index 6ef5ad4..ebe4583 100644
--- a/src/lang/pt_BR/main.php
+++ b/src/lang/pt_BR/main.php
@@ -101,6 +101,7 @@ $content['LN_ERROR_NORECORDS'] = "Sem mensagens encontradas.";
$content['LN_WARNING_LOGSTREAMDISK_TIMEOUT'] = "While reading the logstream, the php script timeout forced me to abort at this point.
If you want to avoid this, please increase the phpLogCon script timeout in your config.php. If the user system is installed, you can do that in Admin center.";
$content['LN_WARNING_DBUPGRADE'] = "Database Upgrade required";
$content['LN_WARNING_DBUPGRADE_TEXT'] = "The current installed database version is '%1'. An update to version '%2' is available.";
+ $content['LN_ERROR_REDIRECTABORTED'] = 'Automatic redirect to the page was aborted, as an internal error occured. Please see the error details above and contact our support forums if you need assistance.';
// Topmenu Entries
$content['LN_MENU_SEARCH'] = "Search";