From: hickert Date: Thu, 14 Dec 2006 04:45:48 +0000 (+0000) Subject: Removed tidy stuff, because there are very nice plugins for mozilla firefox available. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9fb66349a9eca632b26842821e8606de50b816f7;p=gosa.git Removed tidy stuff, because there are very nice plugins for mozilla firefox available. Removed warning of browsers back,reload was used. Seems not to work in all cases. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5385 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/main.php b/html/main.php index 478fd0f00..ba5668e11 100644 --- a/html/main.php +++ b/html/main.php @@ -18,12 +18,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* Basic setup, remove eventually registered sessions */ +/* Save start time */ $start = microtime(); -$timing= array(); + +/* Basic setup, remove eventually registered sessions */ require_once ("../include/php_setup.inc"); require_once ("functions.inc"); require_once ("functions_FAI.inc"); + +/* Set header */ header("Content-type: text/html; charset=UTF-8"); /* Find all class files and include them */ @@ -339,20 +342,6 @@ if (isset ($_SESSION['post_cnt'])){ echo "\n"; } -$start = microtime(); - - -/* Check if the user has used the browsers back button, - and display a warning, because using the back button could cause strange things - like tagging twice, moving an object twice ... */ -if(!isset($_SESSION['back_button_test'])){ - $_SESSION['back_button_test'] = 0; -} -if(isset($_POST['back_button_test']) && $_POST['back_button_test'] != $_SESSION['back_button_test']){ - print_red(_("Please do not use the browsers 'back' or 'reload' buttons, this could cause GOsa to perform actions twice. If you have not used those actions, check the php log files possibly the memory limit was exhausted.")); -} - - /* check if we are using account expiration */ if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) && preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){ @@ -377,10 +366,7 @@ if (is_file("$plugin_dir/main.inc")){ /* Print_out last ErrorMessage repeated string. */ print_red(NULL); -/* Second part of browser 'back button used' check */ -$_SESSION['back_button_test'] ++; -$bb = ""; -$smarty->assign("contents", $bb.$display); +$smarty->assign("contents", $display); /* Assign erros to smarty */ if (isset($_SESSION['errors'])){ @@ -393,18 +379,6 @@ if ($error_collector != ""){ } $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"))) { - tidy_parse_string(utf8_decode($display)); - $err = nl2br(htmlentities(tidy_get_error_buffer())); - - if($err){ - echo "
\"W3C\" "._("Generating this page caused the W3C conformance checker to raise some errors!")."
"; - } - - tidy_clean_repair($display); -} - /* Show page... */ echo $display;