Moved pwminlen to passwordMinLength

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

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index f2853762560cb6173dd80547db79b1bd6919dc5e..f38978dff8399eb3b55703fcbf3ef1133bcd2bf3 100644 (file)
--- a/gosa-core/FAQ
+++ b/gosa-core/FAQ
@@ -98,8 +98,8 @@ 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 "pwminlen" and "pwdiffer" in the main section of your
-   gosa.conf. "pwminlen" specifies how many characters a password must have to be
+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.
 

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index dfcee8c3544772a83238efec057d0ea4f1233332..b1fe48d8ce67e42d927090ce9f4bd858c561c337 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -412,7 +412,7 @@
         listSummary="false"
 {/if}
 {if $cv.pwd_rules.pwminlen_active}
-        pwminlen="{$cv.pwd_rules.pwminlen}"
+        passwordMinLength="{$cv.pwd_rules.pwminlen}"
 {/if}
 {if $cv.pwd_rules.pwdiffer_active}
         pwdiffer="{$cv.pwd_rules.pwdiffer}"

diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5
index 76219ccce93b6b325cd08605297a7b16eea869e5..d0e2d5a9b09486f123f2842ac5f3fa8e10b61546 100644 (file)
--- a/gosa-core/contrib/gosa.conf.5
+++ b/gosa-core/contrib/gosa.conf.5
@@ -536,11 +536,11 @@ instead.
 
 .B Password options
 .PP
-.B pwminlen
+.B passwordMinLength
 .I integer
 .PP
 The
-.I pwminlen
+.I passwordMinLength
 statement determines whether a newly entered password has to be of
 a minimum length.
 .PP

diff --git a/gosa-core/html/password.php b/gosa-core/html/password.php
index 5aadb15a201d1687eda5d261fa54495a17062ee8..84752db9cec0159a9ba367f5d3cd18616cd6bdd7 100644 (file)
--- a/gosa-core/html/password.php
+++ b/gosa-core/html/password.php
@@ -204,8 +204,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['apply'])){
                  $message[]= _("The password used as new and current are too similar.");
          }
   }
-  if ($config->get_cfg_value("pwminlen") != ""){
-         if (strlen($_POST['new_password']) < $config->get_cfg_value("pwminlen")){
+  if ($config->get_cfg_value("passwordMinLength") != ""){
+         if (strlen($_POST['new_password']) < $config->get_cfg_value("passwordMinLength")){
                  $message[]= _("The password used as new is to short.");
          }
   }

diff --git a/gosa-core/plugins/personal/password/class_password.inc b/gosa-core/plugins/personal/password/class_password.inc
index 907a707f0d8b65d77371a4fcf9cb7c3ad17f7d92..89cc68b463e5664810af486c6c4e8657be6d45e7 100644 (file)
--- a/gosa-core/plugins/personal/password/class_password.inc
+++ b/gosa-core/plugins/personal/password/class_password.inc
@@ -59,8 +59,8 @@ class password extends plugin
       $differ       = $this->config->get_cfg_value("pwdiffer", 0);
 
       /* Enable length check ? */
-      $check_length = $this->config->get_cfg_value("pwminlen") != "";
-      $length       = $this->config->get_cfg_value("pwminlen", 0);
+      $check_length = $this->config->get_cfg_value("passwordMinLength") != "";
+      $length       = $this->config->get_cfg_value("passwordMinLength", 0);
 
       /* Call external password quality hook ?*/
       $check_hook   = $this->config->get_cfg_value("externalpwdhook") != "";