From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 9 Jan 2008 16:39:22 +0000 (+0000)
Subject: Removed a couple of print_red's
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a2a7f9e701d635e3b2a38f0d6f2e1b0bebb5c3a5;p=gosa.git

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 e21e91ccc..529196e43 100644
--- 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 d5a16b3d2..becb455c1 100644
--- 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 5a6d266ab..c5283e11f 100644
--- 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 34cb303fe..5d54f4d89 100644
--- 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;