Moved pwdiffer to passwordMinDiffer

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

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index f38978dff8399eb3b55703fcbf3ef1133bcd2bf3..dded880f2821edf66aa4adcedcc41c2eecdedf02 100644 (file)
--- a/gosa-core/FAQ
+++ b/gosa-core/FAQ
@@ -98,10 +98,10 @@ A: Yes. Just go to the doc/guide/user/en directory and copy the lyx-source direc
    
 Q: Can I specify some kind of password policies?
 
-A: You can place the keywords "passwordMinLength" and "pwdiffer" in the main section of your
-   gosa.conf. "passwordMinLength" specifies how many characters a password must have to be
-   accepted. "pwdiffer" contains the number of characters that must be different
-   from the previous password.
+A: You can place the keywords "passwordMinLength" and "passwordMinDiffer" in the main
+   section of your gosa.conf. "passwordMinLength" specifies how many characters a
+   password must have to be accepted. "passwordMinDiffer" contains the number of
+   characters that must be different from the previous password.
 
    Note that these only affect passwords that are set by the user, not by the admins.
 

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index b1fe48d8ce67e42d927090ce9f4bd858c561c337..2a2e5c916bd87b2aded29534121fd8a8f0e4974c 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -415,7 +415,7 @@
         passwordMinLength="{$cv.pwd_rules.pwminlen}"
 {/if}
 {if $cv.pwd_rules.pwdiffer_active}
-        pwdiffer="{$cv.pwd_rules.pwdiffer}"
+        passwordMinDiffer="{$cv.pwd_rules.pwdiffer}"
 {/if}
 {if $cv.pwd_rules.externalpwdhook_active}
         externalpwdhook="{$cv.pwd_rules.externalpwdhook}"

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index d0e2d5a9b09486f123f2842ac5f3fa8e10b61546..7580154b8f510a79b0413eec695f51586538bfb0 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -545,11 +545,11 @@ statement determines whether a newly entered password has to be of
 a minimum length.
 .PP
 
-.B pwdiffer
+.B passwordMinDiffer
 .I integer
 .PP
 The
-.I pwdiffer
+.I passwordMinDiffer
 statement determines whether a newly entered password has to be checked
 to have at least n different characters.
 .PP

diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php
index 84752db9cec0159a9ba367f5d3cd18616cd6bdd7..13f614b7d0e377df412442a054857f18f94d98d4 100644 (file)
--- a/gosa-core/html/password.php
+++ b/gosa-core/html/password.php
@@ -198,8 +198,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])){
   }
 
   /* Password policy fulfilled? */
-  if ($config->get_cfg_value("pwdiffer") != ""){
-         $l= $config->get_cfg_value("pwdiffer");
+  if ($config->get_cfg_value("passwordMinDiffer") != ""){
+         $l= $config->get_cfg_value("passwordMinDiffer");
          if (substr($_POST['current_password'], 0, $l) == substr($_POST['new_password'], 0, $l)){
                  $message[]= _("The password used as new and current are too similar.");
          }

diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index 89cc68b463e5664810af486c6c4e8657be6d45e7..ac4a43eebbae10ce5495f23e4e51f8f40d856674 100644 (file)
--- a/gosa-core/plugins/personal/password/class_password.inc
+++ b/gosa-core/plugins/personal/password/class_password.inc
@@ -55,8 +55,8 @@ class password extends plugin
     if (isset($_POST['password_finish'])){
 
       /* Should we check different characters in new password */
-      $check_differ = $this->config->get_cfg_value("pwdiffer") != "";
-      $differ       = $this->config->get_cfg_value("pwdiffer", 0);
+      $check_differ = $this->config->get_cfg_value("passwordMinDiffer") != "";
+      $differ       = $this->config->get_cfg_value("passwordMinDiffer", 0);
 
       /* Enable length check ? */
       $check_length = $this->config->get_cfg_value("passwordMinLength") != "";