X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FBAO%2FCMSUser.php;h=36bb8bdb6f0c31741d5054a7947df32ceb5db8e2;hb=09cc3c2bdeb1c5912ccce1127266268d63ad6ad6;hp=b97e6c7c55581eb7a351eabdf24b5ea154d5c057;hpb=94264777f045154d25cb107ac8f2c92da193a357;p=civicrm-core.git diff --git a/CRM/Core/BAO/CMSUser.php b/CRM/Core/BAO/CMSUser.php index b97e6c7c55..36bb8bdb6f 100644 --- a/CRM/Core/BAO/CMSUser.php +++ b/CRM/Core/BAO/CMSUser.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 5 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2018 | + | Copyright CiviCRM LLC (c) 2004-2019 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -28,7 +28,7 @@ /** * * @package CRM - * @copyright CiviCRM LLC (c) 2004-2018 + * @copyright CiviCRM LLC (c) 2004-2019 */ /** @@ -113,9 +113,9 @@ class CRM_Core_BAO_CMSUser { if ($isCMSUser && $emailPresent) { if ($showUserRegistration) { if ($isCMSUser != 2) { - $extra = array( + $extra = [ 'onclick' => "return showHideByValue('cms_create_account','','details','block','radio',false );", - ); + ]; $form->addElement('checkbox', 'cms_create_account', ts('Create an account?'), NULL, $extra); $required = FALSE; } @@ -132,7 +132,7 @@ class CRM_Core_BAO_CMSUser { $form->add('password', 'cms_confirm_pass', ts('Confirm Password')); } - $form->addFormRule(array('CRM_Core_BAO_CMSUser', 'formRule'), $form); + $form->addFormRule(['CRM_Core_BAO_CMSUser', 'formRule'], $form); } $showCMS = TRUE; } @@ -167,7 +167,7 @@ class CRM_Core_BAO_CMSUser { $isJoomla = ucfirst($config->userFramework) == 'Joomla' ? TRUE : FALSE; $isWordPress = $config->userFramework == 'WordPress' ? TRUE : FALSE; - $errors = array(); + $errors = []; if ($isDrupal || $isJoomla || $isWordPress) { $emailName = NULL; if (!empty($form->_bltID) && array_key_exists("email-{$form->_bltID}", $fields)) { @@ -213,11 +213,11 @@ class CRM_Core_BAO_CMSUser { } // now check that the cms db does not have the user name and/or email - if ($isDrupal OR $isJoomla OR $isWordPress) { - $params = array( + if ($isDrupal or $isJoomla or $isWordPress) { + $params = [ 'name' => $fields['cms_name'], 'mail' => $fields[$emailName], - ); + ]; } $config->userSystem->checkUserNameEmailExists($params, $errors, $emailName);