Udpated some error messages that cause execution to abort.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7541 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/index.php b/html/index.php
index 8a569a87408ea7944daa67cfd98e8df4d70790b7..5f8850dbece6625246f950f5e22e9d1fea87164e 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -126,7 +126,7 @@ if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
 
 /* Check if gosa.conf (.CONFIG_FILE) is accessible */
 if (!is_readable(CONFIG_DIR."/".CONFIG_FILE)){
-  echo sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE);
+  msg_dialog::display(_("Configuration accessibility"),sprintf(_("GOsa configuration %s/%s is not readable. Aborted."), CONFIG_DIR,CONFIG_FILE),FATAL_ERROR_DIALOG);
   exit();
 }
 
@@ -152,8 +152,8 @@ $smarty->assign ('nextfield', 'username');
 
 /* Check for compile directory */
 if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
-  echo sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
-      $smarty->compile_dir);
+  msg_dialog::display(_("Smarty"),sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
+    $smarty->compile_dir),FATAL_ERROR_DIALOG);
   exit();
 }
 

diff --git a/include/class_config.inc b/include/class_config.inc
index 369f5da9884b0dba6cf3c213dccd25f4a65ef682..f1431443cffc69c2abc8f0877408d40d5d165594 100644 (file)
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -68,10 +68,10 @@ class config  {
     $xmldata= fread($fh, 100000);
     fclose($fh); 
     if(!xml_parse($this->parser, chop($xmldata))){
-      print_red(sprintf(_("XML error in gosa.conf: %s at line %d"),
+      $msg = sprintf(_("XML error in gosa.conf: %s at line %d"),
             xml_error_string(xml_get_error_code($this->parser)),
-            xml_get_current_line_number($this->parser)));
-      echo $_SESSION['errors'];
+            xml_get_current_line_number($this->parser));
+      msg_dialog::display(_("Config file parsing"), $msg, FATAL_ERROR_DIALOG);
       exit;
     }
   }