MDL-21346 fixed various print_password_policy() issues, merged from 1.9

diff --git a/lib/weblib.php b/lib/weblib.php
index 59ceb513b1b5e9f6676c3c6e32c534867ec24a26..607e75fb464b5bf8c289c2eb256bff90123567ae 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -3325,35 +3325,34 @@ function auth_get_plugin_title($authtype) {
 }
 
 /**
- * Print password policy.
+ * Returns a localized sentence in the current language summarizing the current password policy
+ *
+ * @todo this should be handled by a function/method in the language pack library once we have a support for it
  * @uses $CFG
  * @return string
  */
-function print_password_policy(){
+function print_password_policy() {
     global $CFG;
-    $messages = array();
-
-    if(!empty($CFG->passwordpolicy)){
-           $messages[] = get_string('informminpasswordlength', 'auth', $CFG->minpasswordlength);
-           if(!empty($CFG->minpassworddigits)){
-               $messages[] = get_string('informminpassworddigits', 'auth', $CFG->minpassworddigits);
-           }
-           if(!empty($CFG->minpasswordlower)){
-               $messages[] = get_string('informminpasswordlower', 'auth', $CFG->minpasswordlower);
-           }
-           if(!empty($CFG->minpasswordupper)){
-               $messages[] = get_string('informminpasswordupper', 'auth', $CFG->minpasswordupper);
-           }
-           if(!empty($CFG->minpasswordnonalphanum)){
-               $messages[] = get_string('informminpasswordnonalphanum', 'auth', $CFG->minpasswordnonalphanum);
-           }
-
-           $lastmessage = new stdClass;
-           $lastmessage->one = '';
-           $lastmessage->two = array_pop($messages);
-           $messages[] = get_string('and','moodle',$lastmessage);
-           $message = join(', ', $messages);
-           $message = '<div class="fitemtitle">&nbsp;</div><div class="felement ftext">'. get_string('informpasswordpolicy', 'auth', $message) . '</div>';
-       }
-       return $message;
+
+    $message = '';
+    if (!empty($CFG->passwordpolicy)) {
+        $messages = array();
+        $messages[] = get_string('informminpasswordlength', 'auth', $CFG->minpasswordlength);
+        if (!empty($CFG->minpassworddigits)) {
+            $messages[] = get_string('informminpassworddigits', 'auth', $CFG->minpassworddigits);
+        }
+        if (!empty($CFG->minpasswordlower)) {
+            $messages[] = get_string('informminpasswordlower', 'auth', $CFG->minpasswordlower);
+        }
+        if (!empty($CFG->minpasswordupper)) {
+            $messages[] = get_string('informminpasswordupper', 'auth', $CFG->minpasswordupper);
+        }
+        if (!empty($CFG->minpasswordnonalphanum)) {
+            $messages[] = get_string('informminpasswordnonalphanum', 'auth', $CFG->minpasswordnonalphanum);
+        }
+
+        $messages = join(', ', $messages); // this is ugly but we do not have anything better yet...
+        $message = get_string('informpasswordpolicy', 'auth', $messages);
+    }
+    return $message;
 }

diff --git a/login/change_password_form.php b/login/change_password_form.php
index b874f1d6e5dd053f56f311f24f3888518a418df8..f49a6654cd39326322a16a7113ac0deb76a99976 100644 (file)
--- a/login/change_password_form.php
+++ b/login/change_password_form.php
@@ -14,9 +14,8 @@ class login_change_password_form extends moodleform {
         // visible elements
         $mform->addElement('static', 'username', get_string('username'), $USER->username);
 
-        if(!empty($CFG->passwordpolicy)){
-            $passwordpolicy = print_password_policy();
-            $mform->addElement('html', $passwordpolicy);
+        if (!empty($CFG->passwordpolicy)){
+            $mform->addElement('static', 'passwordpolicyinfo', '', print_password_policy());
         }
         $mform->addElement('password', 'password', get_string('oldpassword'));
         $mform->addRule('password', get_string('required'), 'required', null, 'client');

diff --git a/login/signup_form.php b/login/signup_form.php
index 0e7b03ee2e22609f4cc07bf926c170b24497e0d3..41a5bc80c1e529e97c317b6646db4a97cb92360e 100644 (file)
--- a/login/signup_form.php
+++ b/login/signup_form.php
@@ -16,9 +16,8 @@ class login_signup_form extends moodleform {
         $mform->setType('username', PARAM_NOTAGS);
         $mform->addRule('username', get_string('missingusername'), 'required', null, 'server');
 
-        if(!empty($CFG->passwordpolicy)){
-            $passwordpolicy = print_password_policy();
-            $mform->addElement('html', $passwordpolicy);
+        if (!empty($CFG->passwordpolicy)){
+            $mform->addElement('static', 'passwordpolicyinfo', '', print_password_policy());
         }
         $mform->addElement('passwordunmask', 'password', get_string('password'), 'maxlength="32" size="12"');
         $mform->setType('password', PARAM_RAW);

diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index 5b90dfc0c7c6313b01dded1e48a2c70a3b6a70ab..31a7635a3f78d1c75468d546bbe223731159dcf6 100644 (file)
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -42,9 +42,8 @@ class user_editadvanced_form extends moodleform {
         $mform->setHelpButton('auth', array('authchange', get_string('chooseauthmethod','auth')));
         $mform->setAdvanced('auth');
 
-        if(!empty($CFG->passwordpolicy)){
-            $passwordpolicy = print_password_policy();
-            $mform->addElement('html', '<div class="fitem">'.$passwordpolicy . '</div>');
+        if (!empty($CFG->passwordpolicy)){
+            $mform->addElement('static', 'passwordpolicyinfo', '', print_password_policy());
         }
         $mform->addElement('passwordunmask', 'newpassword', get_string('newpassword'), 'size="20"');
         $mform->setHelpButton('newpassword',array('newpassword', get_string('leavetokeep')));