Unified Error message display

[gosa.git] / html / main.php

diff --git a/html/main.php b/html/main.php
index ed76758fa542827151f0e50ee34992834f40c5e5..8743d378c3ce95928156212ba1c7d0ef2c08fd71 100644 (file)
--- a/html/main.php
+++ b/html/main.php
@@ -24,10 +24,6 @@ require_once ("../include/php_setup.inc");
 require_once ("functions.inc");
 header("Content-type: text/html; charset=UTF-8");
 
-/* Reset error handler */
-$error_collector= "";
-set_error_handler('gosaRaiseError');
-
 /* Find all class files and include them */
 get_dir_list("$BASE_DIR/plugins");
 
@@ -212,8 +208,9 @@ if ($_SESSION['js']==FALSE){
   $smarty->assign("help_method", "href='helpviewer.php$plug' target='_new'");
 } else {
   $smarty->assign("javascript", "true");
-  $smarty->assign("help_method", "href='' onClick=\"window.open('helpviewer.php$plug','{t}GOsa help{/t}','width=600,height=700,location=no,toolbar=no,directories=no,menubar=no,status=no')\"");
+  $smarty->assign("help_method"," onclick=\"return popup('helpviewer.php$plug','GOsa help');\"");
 }
+
 $smarty->assign ("username", $ui->username);
 $smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
 $smarty->assign ("go_base", get_template_path('images/dtree.png'));
@@ -262,8 +259,6 @@ if (isset ($_SESSION['post_cnt'])){
 /* Load plugin */
 if (is_file("$plugin_dir/main.inc")){
   require_once ("$plugin_dir/main.inc");
-if(file_exists("dow3ccheck.chk"))
-  print $plugin_dir."/main.inc";
 } else {
   print_red(sprintf(_("Can't find any plugin definitions for plugin '%s'!"), $plug));
   echo $_SESSION['errors'];
@@ -280,23 +275,25 @@ if ($error_collector != ""){
 } else {
   $smarty->assign("php_errors", "");
 }
-$smarty->assign("w3c", "");
 $display= $header.$smarty->fetch(get_template_path('framework.tpl'));
 
 /* For development, perform a W3C conformance check if specified in gosa.conf */
-if (isset($config->data['MAIN']['W3CTEST'])) {
-  $fp = fopen("/tmp/gosa.html","w+");
-  fwrite($fp, $display, strlen($display));
-  $url= $config->data['MAIN']['W3CTEST'];
-  $str = shell_exec( "curl -F uploaded_file=@/tmp/gosa.html $url/check");
-  if(!preg_match("/This Page Is Valid/i",$str )){
-    /* Show errors */
-    echo $str;
-  } else {
-    /* Re-render page with W3C logo */
-    $smarty->assign("w3c", "<a href=\"$url/check?uri=referer\"><img alt=\"\" border=\"0\" src=\"$url/images/vh401.png\" alt=\"Valid HTML 4.01!\" height=\"31\" width=\"88\"></a>");
-    $display= $header.$smarty->fetch(get_template_path('framework.tpl'));
+if (isset($config->data['MAIN']['W3CTEST']) && preg_match('/true/i', $config->data['MAIN']['W3CTEST'])) {
+
+  /* Use PHP tidy for debugging */
+  $tidy = new tidy();
+  $config = array('indent' => TRUE,
+               'output-xhtml' => TRUE,
+               'wrap' => 200);
+  $display = tidy_parse_string($display, $config, 'UTF8');
+  tidy_clean_repair($display);
+  $cnt =  (tidy_error_count($display))+(tidy_warning_count($display));
+  if($cnt != 0){
+    echo "<table width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black'><tr><td><img alt=\"\" align=\"middle\" src='images/warning.png'>&nbsp;<font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the W3C conformance checker to raise some errors!")."</font></td><td align=right><button onClick='toggle(\"w3cbox\")'>"._("Toggle information")."</button></td></tr></table><div id='w3cbox' style='width:100%; position:absolute; z-index:0; visibility: hidden; background-color:white; border-bottom:1px solid black;'>";
+
+    echo nl2br(htmlentities($display->errorBuffer))."</div>";
   }
+  tidy_clean_repair($display);
 }
 
 /* Show page... */