removed show_errors

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

diff --git a/gosa-core/contrib/openldap/slapd.conf b/gosa-core/contrib/openldap/slapd.conf
index ba0c98680dc7163279d432c59ce82ce573fb19c8..afb48de0474fa36847478fdc4079bffa6f7166ba 100644 (file)
--- a/gosa-core/contrib/openldap/slapd.conf
+++ b/gosa-core/contrib/openldap/slapd.conf
@@ -14,7 +14,7 @@ include       /etc/ldap/schema/inetorgperson.schema
 include        /etc/ldap/schema/openldap.schema
 include                /etc/ldap/schema/nis.schema
 include                /etc/ldap/schema/misc.schema
-include          /etc/ldap/schema/trust.schema
+include                /etc/ldap/schema/trust.schema
 #include       /etc/ldap/schema/krb5-kdc.schema
 
 # These should be present for GOsa. In case of samba3,
@@ -60,7 +60,6 @@ password-hash         {CRYPT}
 # Search base
 defaultsearchbase      dc=gonicus,dc=de
 
-
 # Where clients are refered to if no
 # match is found locally
 #referral      ldap://some.other.ldap.server
@@ -125,7 +124,6 @@ access to dn.subtree=cn=Monitor
 # Others should not be able to see it, except the admin
 # entry below
 access to attrs=userPassword,sambaPwdLastSet,sambaPwdMustChange,sambaPwdCanChange,shadowMax,shadowExpire
-       by dn="cn=ldapadmin,dc=gonicus,dc=de" write
        by dn.regex="uid=[^/]+/admin\+(realm=GONICUS.LOCAL)?" write
        by anonymous auth
        by self write
@@ -134,15 +132,12 @@ access to attrs=userPassword,sambaPwdLastSet,sambaPwdMustChange,sambaPwdCanChang
 # Deny access to imap/fax/kerberos admin passwords stored
 # in ldap tree
 access to attrs=goImapPassword
-       by dn="cn=ldapadmin,dc=gonicus,dc=de" write
        by dn.regex="uid=[^/]+/admin\+(realm=GONICUS.LOCAL)?" write
        by * none 
 access to attrs=goKrbPassword
-       by dn="cn=ldapadmin,dc=gonicus,dc=de" write
        by dn.regex="uid=[^/]+/admin\+(realm=GONICUS.LOCAL)?" write
        by * none 
 access to attrs=goFaxPassword
-       by dn="cn=ldapadmin,dc=gonicus,dc=de" write
        by dn.regex="uid=[^/]+/admin\+(realm=GONICUS.LOCAL)?" write
        by * none 
 
@@ -155,25 +150,11 @@ access to attrs=gotoLastUser
 # Others should not be able to see it, except the
 # admin entry below
 access to attrs=sambaLmPassword,sambaNtPassword
-       by dn="cn=ldapadmin,dc=gonicus,dc=de" write
        by dn.regex="uid=[^/]+/admin\+(realm=GONICUS.LOCAL)?" write
        by anonymous auth
        by self write
        by * none 
 
-# Enable write create access for the terminal admin
-access to dn="ou=incoming,dc=gonicus,dc=de"
-       by dn="cn=terminal-admin,dc=gonicus,dc=de" write
-       by dn="cn=ldapadmin,dc=gonicus,dc=de" write
-       by dn.regex="uid=[^/]+/admin\+(realm=GONICUS.LOCAL)?" write
-       by * none
-
-access to dn.sub="ou=incoming,dc=gonicus,dc=de"
-       by dn="cn=terminal-admin,dc=gonicus,dc=de" write
-       by dn="cn=ldapadmin,dc=gonicus,dc=de" write
-       by dn.regex="uid=[^/]+/admin\+(realm=GONICUS.LOCAL)?" write
-       by * none
-
 # What trees should be readable, depends on your policy. Either
 # use this entry and specify what should be readable, or leave
 # the access to * => by * read below untouched
@@ -182,7 +163,6 @@ access to dn.sub="ou=incoming,dc=gonicus,dc=de"
 
 # The admin dn has full write access
 access to *
-       by dn="cn=ldapadmin,dc=gonicus,dc=de" =wrscx
        by dn.regex="uid=[^/]+/admin\+(realm=GONICUS.LOCAL)?" =wrscx
        by * read
 #      by peername="ip=127\.0\.0\.1" read

diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php
index 5bef30f7251132069e5742918b56c35a41c96338..1391d03a787a0320f96e523fec6050a8964f28e8 100644 (file)
--- a/gosa-core/html/password.php
+++ b/gosa-core/html/password.php
@@ -237,7 +237,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])){
   /* Do we need to show error messages? */
   if (count ($message) != 0){
          /* Show error message and continue editing */
-         show_errors($message);
+         msgDialog::displayChecks($message);
   } else {
 
          /* Passed quality check, just try to change the password now */
@@ -251,7 +251,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])){
          }
          if ($output != ""){
                  $message[]= _("External password changer reported a problem: ".$output);
-                 show_errors($message);
+                 msgDialog::displayChecks($message);
          } else {
                  if ($method != ""){
                          change_password ($ui->dn, $_POST['new_password'], 0, $method);

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 972281137b136257002ad14f7b35cd9c8fea8263..f27171e8dce7e3654c52d96e21a86f002b15e8e0 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1357,23 +1357,6 @@ function get_printer_list()
 }
 
 
-function show_ldap_error($message, $addon= "")
-{
-  if (!preg_match("/Success/i", $message)){
-    if ($addon == ""){
-      msg_dialog::display(_("LDAP error:"), $message, ERROR_DIALOG);
-    } else {
-      if(!preg_match("/No such object/i",$message)){
-        msg_dialog::display(_("LDAP error"), sprintf(_("Plugin '%s':%s"),"<i>".$addon."</i>", "<br><br>$message"),ERROR_DIALOG);
-      }
-    }
-    return TRUE;
-  } else {
-    return FALSE;
-  }
-}
-
-
 function rewrite($s)
 {
   global $REWRITE;

diff --git a/gosa-core/plugins/admin/acl/class_aclManagement.inc b/gosa-core/plugins/admin/acl/class_aclManagement.inc
index 80c82530dd90a53ea44c0c07258c6e9b08737269..b6f97d368aa7efa0d07140a2a7208ab7ec4e3c9e 100644 (file)
--- a/gosa-core/plugins/admin/acl/class_aclManagement.inc
+++ b/gosa-core/plugins/admin/acl/class_aclManagement.inc
@@ -395,7 +395,7 @@ class aclManagement extends plugin
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
-        show_errors($message);
+        msgDialog::displayChecks($message);
       }
     }
 

diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index effbb5717833f3438d52f657c8ab2d2972b6e439..74d15307829705fb95f19e42409b7a2303b8ae1a 100644 (file)
--- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
@@ -317,7 +317,7 @@ class departmentManagement extends plugin
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
-        show_errors($message);
+        msgDialog::displayChecks($message);
       }
     }
 

diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index 6b64a03eb8d1071d9a05568552fa0a77a176d2b4..23b264a97615d9e27426df25e57282685fcd1e26 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupManagement.inc
+++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc
@@ -270,7 +270,7 @@ class groupManagement extends plugin
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
-        show_errors($message);
+        msgDialog::displayChecks($message);
       }
     }
 

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index 07fcbeff7507b5936dff1e0547ea1adbe4f7a065..67d092a38a52cf687d9bc7bbba7510ca7127d489 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -421,7 +421,7 @@ class ogroupManagement extends plugin
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
-        show_errors($message);
+        msgDialog::displayChecks($message);
       }
     }
 

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 9b695c8a7798fcbb97481f9f85653c3dbfa503a3..1dfb05833399b542d4187b3d5a2039d1de2209bd 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -251,7 +251,7 @@ class userManagement extends plugin
         if (count($message) != 0){
 
           /* Show error message and continue editing */
-          show_errors ($message);
+          msgDialog::displayChecks($message);
           return($smarty->fetch(get_template_path('password.tpl', TRUE)));
         }
 
@@ -679,7 +679,7 @@ class userManagement extends plugin
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
-        show_errors($message);
+        msgDialog::displayChecks($message);
       }
     }
 
@@ -743,7 +743,7 @@ class userManagement extends plugin
     
       /* Show error message / continue editing */
       if (count($message) > 0){
-        show_errors ($message);
+        msgDialog::displayChecks($message);
 
         foreach(array("sn", "givenName", "uid", "template") as $attr){
           if(isset($_POST[$attr])){
@@ -830,7 +830,7 @@ class userManagement extends plugin
 
       /* Show error message / continue editing */
       if (count($message) > 0){
-        show_errors ($message);
+        msgDialog::displayChecks($message);
       } else {
         $attributes= array('sn' => $this->sn, 'givenName' => $this->givenName);
         if (isset($this->config->current['IDGEN']) &&

diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc
index 382e958b1b00122f7bb288be8b8ba85e2743edb1..fbfcb823eceb2e05cf042264703bb5cf5dcc383b 100644 (file)
--- a/gosa-core/plugins/personal/generic/main.inc
+++ b/gosa-core/plugins/personal/generic/main.inc
@@ -91,7 +91,7 @@ if (!$remove_lock){
       if (count($message) != 0){
 
         /* Show error message and continue editing */
-        show_errors ($message);
+        msgDialog::displayChecks($message);
         $display.= $smarty->fetch(get_template_path('password.tpl', TRUE));
         return ($display);
       }
@@ -133,7 +133,7 @@ if (!$remove_lock){
 
     } else {
       /* Errors found, show message */
-      show_errors ($message);
+      msgDialog::displayChecks($message);
     }
   }
 

diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc
index a234b4b46fbc789f782b13591954913db9398c8e..4aedfd346381a4bb6e9a09ce9f8a82aee7682c31 100644 (file)
--- a/gosa-core/plugins/personal/posix/main.inc
+++ b/gosa-core/plugins/personal/posix/main.inc
@@ -82,7 +82,7 @@ if (!$remove_lock){
       session::un_set ('posixAccount');
     } else {
       /* Errors found, show message */
-      show_errors ($message);
+      msgDialog::displayChecks($message);
     }
   }