CRM-21272: move definition of isPasswordUserGenerated to CMS classes

CRM/Core/BAO/CMSUser.php

@@ -127,7 +127,7 @@ public static function buildForm(&$form, $gid, $emailPresent, $action = CRM_Core
         $form->assign('isCMS', $required);
         if (!$userID || $action & CRM_Core_Action::PREVIEW || $action & CRM_Core_Action::PROFILE) {
           $form->add('text', 'cms_name', ts('Username'), NULL, $required);
-          if (($isDrupal && !variable_get('user_email_verification', TRUE)) OR ($isJoomla) OR ($isWordPress)) {
+          if ($config->userSystem->isPasswordUserGenerated()) {
             $form->add('password', 'cms_pass', ts('Password'));
             $form->add('password', 'cms_confirm_pass', ts('Confirm Password'));
           }
@@ -197,7 +197,7 @@ public static function formRule($fields, $files, $form) {
         $errors[$emailName] = ts('Please specify a valid email address.');
       }
 
-      if (($isDrupal && !variable_get('user_email_verification', TRUE)) OR ($isJoomla) OR ($isWordPress)) {
+      if ($config->userSystem->isPasswordUserGenerated()) {
         if (empty($fields['cms_pass']) ||
           empty($fields['cms_confirm_pass'])
         ) {

CRM/Utils/System/Backdrop.php

@@ -422,6 +422,16 @@ public function isUserRegistrationPermitted() {
     return TRUE;
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function isPasswordUserGenerated() {
+    if (config_get('system.core', 'user_email_verification') == TRUE) {
+      return FALSE;
+    }
+    return TRUE;
+  }
+
   /**
    * @inheritDoc
    */

CRM/Utils/System/Base.php

@@ -404,6 +404,15 @@ public function isUserRegistrationPermitted() {
     return FALSE;
   }
 
+  /**
+   * Check if user can create passwords or is initially assigned a system-generated one.
+   *
+   * @return bool
+   */
+  public function isPasswordUserGenerated() {
+    return FALSE;
+  }
+
   /**
    * Get user login URL for hosting CMS (method declared in each CMS system class)
    *

CRM/Utils/System/Drupal8.php

@@ -536,6 +536,16 @@ public function isUserRegistrationPermitted() {
     return TRUE;
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function isPasswordUserGenerated() {
+    if (\Drupal::config('user.settings')->get('verify_mail') == TRUE) {
+      return FALSE;
+    }
+    return TRUE;
+  }
+
   /**
    * @inheritDoc
    */

CRM/Utils/System/DrupalBase.php

@@ -424,6 +424,16 @@ public function isUserRegistrationPermitted() {
     return TRUE;
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function isPasswordUserGenerated() {
+    if (variable_get('user_email_verification', TRUE)) {
+      return FALSE;
+    }
+    return TRUE;
+  }
+
   /**
    * @inheritDoc
    */

CRM/Utils/System/Joomla.php

@@ -589,6 +589,13 @@ public function isUserRegistrationPermitted() {
     return TRUE;
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function isPasswordUserGenerated() {
+    return TRUE;
+  }
+
   /**
    * @inheritDoc
    */

CRM/Utils/System/WordPress.php

@@ -619,6 +619,13 @@ public function isUserRegistrationPermitted() {
     return TRUE;
   }
 
+  /**
+   * @inheritDoc
+   */
+  public function isPasswordUserGenerated() {
+    return TRUE;
+  }
+
   /**
    * @return mixed
    */