projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15322 from alifrumin/removePrintIcon
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
CMSUser.php
diff --git
a/CRM/Core/BAO/CMSUser.php
b/CRM/Core/BAO/CMSUser.php
index b97e6c7c55581eb7a351eabdf24b5ea154d5c057..36bb8bdb6f0c31741d5054a7947df32ceb5db8e2 100644
(file)
--- a/
CRM/Core/BAO/CMSUser.php
+++ b/
CRM/Core/BAO/CMSUser.php
@@
-3,7
+3,7
@@
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
8
|
+ | Copyright CiviCRM LLC (c) 2004-201
9
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
8
+ * @copyright CiviCRM LLC (c) 2004-201
9
*/
/**
*/
/**
@@
-113,9
+113,9
@@
class CRM_Core_BAO_CMSUser {
if ($isCMSUser && $emailPresent) {
if ($showUserRegistration) {
if ($isCMSUser != 2) {
if ($isCMSUser && $emailPresent) {
if ($showUserRegistration) {
if ($isCMSUser != 2) {
- $extra =
array(
+ $extra =
[
'onclick' => "return showHideByValue('cms_create_account','','details','block','radio',false );",
'onclick' => "return showHideByValue('cms_create_account','','details','block','radio',false );",
-
)
;
+
]
;
$form->addElement('checkbox', 'cms_create_account', ts('Create an account?'), NULL, $extra);
$required = 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->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;
}
}
$showCMS = TRUE;
}
@@
-167,7
+167,7
@@
class CRM_Core_BAO_CMSUser {
$isJoomla = ucfirst($config->userFramework) == 'Joomla' ? TRUE : FALSE;
$isWordPress = $config->userFramework == 'WordPress' ? TRUE : FALSE;
$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)) {
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
}
// 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],
'name' => $fields['cms_name'],
'mail' => $fields[$emailName],
-
)
;
+
]
;
}
$config->userSystem->checkUserNameEmailExists($params, $errors, $emailName);
}
$config->userSystem->checkUserNameEmailExists($params, $errors, $emailName);