diff --git a/html/main.php b/html/main.php
index fd5afa99b898c36ed4fcfb82aa702a6a931cf713..dc952df2e8348b6cb121647799b9c7cc16e88229 100644 (file)
--- a/html/main.php
+++ b/html/main.php
}
}
-/* Install eGOsa hooks, convert _POST to _SESSION['POST'] */
-if(isset($_GET['explorer'])){
- $_SESSION{'eGosa'}=1;
-}
-if(isset($_SESSION['POST'])){
- $_SERVER["REQUEST_METHOD"] = "POST";
- foreach ($_SESSION['POST'] as $key => $dummy){
- $_POST[$key]=$_SESSION['POST'][$key];
- }
- unset($_SESSION['POST']);
+/* Place IE workaround */
+if (isset($config->data['MAIN']['IE_PNG_WORKAROUND']) && preg_match("/true/i",$config->data['MAIN']['IE_PNG_WORKAROUND'])){
+ $smarty->assign('ieworkaround', 1);
}
/* show web frontend */
if (isset($_SESSION['errors'])){
$smarty->assign("errors", $_SESSION['errors']);
}
+
if ($error_collector != ""){
- $smarty->assign("php_errors", $error_collector."</div>");
+ $smarty->assign("php_errors", preg_replace("/%BUGBODY%/",$error_collector_mailto,$error_collector)."</div>");
} else {
$smarty->assign("php_errors", "");
}
+
+/* Set focus to the error button if we've an error message */
+$focus= "";
+if (isset($_SESSION['errors']) && $_SESSION['errors'] != ""){
+ $focus= '<script language="JavaScript" type="text/javascript">';
+ $focus.= 'document.forms[0].error_accept.focus();';
+ $focus.= '</script>';
+}
+$smarty->assign("focus", $focus);
+
$display= $header.$smarty->fetch(get_template_path('framework.tpl'));
if ((isset($config->data['MAIN']['W3CTEST']) && preg_match('/true/i', $config->data['MAIN']['W3CTEST']))&&(!empty($display))&&(is_callable("tidy_parse_string"))) {
@@ -396,13 +400,6 @@ if ((isset($config->data['MAIN']['W3CTEST']) && preg_match('/true/i', $config->d
/* Show page... */
echo $display;
-/* Set focus to the error button if we've an error message */
-if (isset($_SESSION['errors']) && $_SESSION['errors'] != ""){
- echo '<script language="JavaScript" type="text/javascript">';
- echo 'document.forms[0].error_accept.focus();';
- echo '</script>';
-}
-
/* Save plist and config */
$_SESSION['plist']= $plist;
$_SESSION['config']= $config;