Removed display_error_page function.

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

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 2b97322a69201a1ddd57eaeb527dc309d720ebc3..69ee3f9097b2c66d7504ff661bd6b6d905c0df9f 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -221,8 +221,8 @@ class config  {
     /* Check for connection */
     if (is_null($this->ldap) || (is_int($this->ldap) && $this->ldap == 0)){
       $smarty= get_smarty();
-      msg_dialog::display(_("LDAP error"), _("Can't bind to LDAP. Please contact the system administrator."), ERROR_DIALOG);
-      display_error_page();
+      msg_dialog::display(_("LDAP error"), _("Can't bind to LDAP. Please contact the system administrator."), FATAL_ERROR_DIALOG);
+      exit();
     }
 
     if (!session::is_set('size_limit')){
@@ -553,8 +553,8 @@ class config  {
       /* If no samba servers are found, look for configured sid/ridbase */
       if (count($this->data['SERVERS']['SAMBA']) == 0){
         if (!isset($this->current["SID"]) || !isset($this->current["RIDBASE"])){
-          msg_dialog::display(_("Configuration error"), _("SID and/or RIDBASE missing in the configuration!"), ERROR_DIALOG);
-          display_error_page();
+          msg_dialog::display(_("Configuration error"), _("SID and/or RIDBASE missing in the configuration!"), FATAL_ERROR_DIALOG);
+          exit();
         } else {
           $this->data['SERVERS']['SAMBA']['DEFAULT']= array(
               "SID" => $this->current["SID"],

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 489f3954e1adbd2ebe3c9d45f75087d2c53905ad..61ecc9d8a66d4f2f9fc8bd949b950ae8b8dc24f4 100644 (file)
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -558,8 +558,8 @@ class LDAP{
 
           /* Bail out, if we've nothing to do... */
           if ($ocname == ""){
-            msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN '%s': no object class found"),$type), ERROR_DIALOG);
-            display_error_page();
+            msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN '%s': no object class found"),$type), FATAL_ERROR_DIALOG);
+            exit();
           }
 
           /* Assemble_entry */
@@ -606,8 +606,8 @@ class LDAP{
               $na["dc"]= $param;
               break;
             default:
-              msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN '%s': not supported"),$type), ERROR_DIALOG);
-              display_error_page();
+              msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN '%s': not supported"),$type), FATAL_ERROR_DIALOG);
+              exit();
           }
 
         }

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index 8f24af3399412b74debcef9f1c6a407b605cd248..6a68b8d43b2e4fcc1f1bac780c9cc14df7da4bb2 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -144,8 +144,11 @@ class pluglist {
 
                                        /* Read information from class variable */
                                        if (!isset($info['CLASS'])){
-                                               msg_dialog::display(_("Configuration error"), _("The configuration format has changed. Please re-run setup!"), ERROR_DIALOG);
-                                               display_error_page();
+                                               msg_dialog::display(
+                                                               _("Configuration error"), 
+                                                               _("The configuration format has changed. Please re-run setup!"), 
+                                                               FATAL_ERROR_DIALOG);
+                                               exit();
                                        }
                                        if (!plugin_available($info['CLASS'])){
                                                continue;

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index f56bbbd42e11925b4554f391d9d02fd0edf1d0b2..e0561c2bbfc0056c56635bd57d1a249c78b25750 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -2653,14 +2653,5 @@ function send_binary_content($data,$name,$type = "application/octet-stream")
   exit();
 }
 
-
-function display_error_page()
-{
-  $smarty= get_smarty();
-  $smarty->display(get_template_path('headers.tpl'));
-  echo "<body>".msg_dialog::get_dialogs()."</body></html>";
-  exit();
-}
-
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>