Removed a couple of print_red's

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

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index e21e91ccc87c71f7cc38c261b7ef2cf211c52ae6..529196e43288dbac7fb185e72787644f3e5b26d9 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -500,7 +500,7 @@ class MultiSelectWindow{
     if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
       $s_entry = base64_decode($_GET['dep_id']);
       if (!isset($this->config->departments[$s_entry])){
-        print_red(_("Error: The requested subtree has an inconsistent DN encoding, check your LDAP!"));
+        msg_dialog::display(_("LDAP error"), sprintf(_("Inconsistent DN encoding detected: '%s'"), LDAP::fix($s_entry)), ERROR_DIALOG);
       } else {
         $this->selectedBase = $this->config->departments[$s_entry];
       }

diff --git a/gosa-core/include/class_location.inc b/gosa-core/include/class_location.inc
index d5a16b3d258b9938dfafeedd7e8b28d99a612dee..becb455c1b7886be08ec7c9130e232c94b9c328e 100644 (file)
--- a/gosa-core/include/class_location.inc
+++ b/gosa-core/include/class_location.inc
@@ -33,7 +33,6 @@ $class_mapping= array(
                 "passwordMethodMd5" => "include/password-methods/class_password-methods-md5.inc",
                 "passwordMethodssha" => "include/password-methods/class_password-methods-ssha.inc",
                 "passwordMethodheimdal" => "include/password-methods/class_password-methods-heimdal.inc",
-                "passwordMethodkerberos" => "include/password-methods/class_password-methods-kerberos.inc",
                 "passwordMethodsmd5" => "include/password-methods/class_password-methods-smd5.inc",
                 "passwordMethodCrypt" => "include/password-methods/class_password-methods-crypt.inc",
                 "passwordMethodsha" => "include/password-methods/class_password-methods-sha.inc",

diff --git a/gosa-core/include/password-methods/class_password-methods-sha.inc b/gosa-core/include/password-methods/class_password-methods-sha.inc
index 5a6d266ab6f3fea471adb7bf6fe3f6b4a864e825..c5283e11f31f589674815426fb381685f4b5a178 100644 (file)
--- a/gosa-core/include/password-methods/class_password-methods-sha.inc
+++ b/gosa-core/include/password-methods/class_password-methods-sha.inc
@@ -43,7 +43,7 @@ class passwordMethodsha extends passwordMethod
     }elseif (function_exists('mhash')) {
       $hash = "{SHA}" . base64_encode(mHash(MHASH_SHA1, $password));
     }else{
-      print_red(_("Can't use sha for encryption, missing function sha1 / mhash"));
+      msg_dialog::display(_("Configuration error"), sprintf(_("Cannot use %s encryption: no PHP functions for sha1/mhash available"), 'SHA'), ERROR_DIALOG);
       return false;
     }
 

diff --git a/gosa-core/include/password-methods/class_password-methods-ssha.inc b/gosa-core/include/password-methods/class_password-methods-ssha.inc
index 34cb303fe8fe75dd7a208b710ce12ec568113b9b..5d54f4d8999bd03d5d689ca12e57117cf0931d25 100644 (file)
--- a/gosa-core/include/password-methods/class_password-methods-ssha.inc
+++ b/gosa-core/include/password-methods/class_password-methods-ssha.inc
@@ -48,7 +48,7 @@ class passwordMethodssha extends passwordMethod
       $salt=mhash_keygen_s2k(MHASH_SHA1,$pwd, substr(pack("h*",md5(mt_rand())),0,8),4);
       $pwd= "{SSHA}".base64_encode(mhash(MHASH_SHA1, $pwd.$salt).$salt);
     } else {
-      print_red(_("Can't use ssha for encryption. (Missing function mhash / sha1)"));
+      msg_dialog::display(_("Configuration error"), sprintf(_("Cannot use %s encryption: no PHP functions for sha1/mhash available"), 'SSHA'), ERROR_DIALOG);
       return(false);
     }
     return $pwd;