Code review

joomla · Apr 16, 2018 · 813561e · 813561e
1 parent f02831d
commit 813561e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
@@ -17,8 +17,8 @@ COM_USERS_CATEGORIES_TITLE="User Notes: Categories"
 COM_USERS_CATEGORY_HEADING="Category"
 COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC="If set to Yes, new Users are allowed to self-register."
 COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL="Allow User Registration"
-COM_USERS_CONFIG_FIELD_BLACKLIST_MAILDOMAIN_LABEL="Blacklist mail domain"
 COM_USERS_CONFIG_FIELD_BLACKLIST_MAILDOMAIN_DESC="Accept all mail domain except for those in the blacklist. Enter each domain in a new line. Example of a domain: gmail.com"
+COM_USERS_CONFIG_FIELD_BLACKLIST_MAILDOMAIN_LABEL="Blacklist mail domain"
 COM_USERS_CONFIG_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the registration, password and username reminder forms. You may need to enter required information for your captcha plugin in the Plugin Manager.<br />If 'Use Global' is selected, make sure a captcha plugin is selected in Global Configuration."
 COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL="Captcha"
 COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC="Allow users to change their Username when editing their profile."

diff --git a/components/com_users/controllers/registration.php b/components/com_users/controllers/registration.php
@@ -105,7 +105,7 @@ public function activate()
 	 *
 	 * @since   1.6
 	 */
-	public function register() 
+	public function register()
 	{
 		// Check for request forgeries.
 		$this->checkToken();

diff --git a/components/com_users/models/registration.php b/components/com_users/models/registration.php
@@ -424,7 +424,7 @@ public function register($temp)
 		$sendpassword = $params->get('sendpassword', 1);
 		$whiteListMailDomain = explode("\r\n", $params->get('whiteListMailDomain'));
 		$blackListMailDomain = explode("\r\n", $params->get('blackListMailDomain'));
-		$userMailDomain = explode('@',$data['email']);
+		$userMailDomain = explode('@', $data['email']);
 
 		// Check if the user mail domain is disallowed
 		if ((!empty($blackListMailDomain) && in_array($userMailDomain[1], $blackListMailDomain)) || (!empty($whiteListMailDomain) && !in_array($userMailDomain[1], $whiteListMailDomain))) 

diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini
@@ -125,8 +125,8 @@ COM_USERS_REGISTRATION_DEFAULT_LABEL="User Registration"
 COM_USERS_REGISTRATION_SAVE_FAILED="Registration failed: %s"
 COM_USERS_REGISTRATION_SAVE_SUCCESS="Thank you for registering. You may now log in using the username and password you registered with."
 COM_USERS_REGISTRATION_SEND_MAIL_FAILED="An error was encountered while sending the registration email. A message has been sent to the administrator of this site."
-COM_USERS_REGISTRATION_VERIFY_SUCCESS="Your email address has been verified. Once an administrator approves your account you will be notified by email and you can login to the site."
 COM_USERS_REGISTRATION_USER_MAIL_DOMAIN_NOT_ALLOWED_MESSAGE="Your mail domain <strong>%s</strong> is not allowed"
+COM_USERS_REGISTRATION_VERIFY_SUCCESS="Your email address has been verified. Once an administrator approves your account you will be notified by email and you can login to the site."
 COM_USERS_REMIND="Reminder"
 COM_USERS_REMIND_DEFAULT_LABEL="Please enter the email address associated with your User account. Your username will be emailed to the email address on file."
 COM_USERS_REMIND_EMAIL_LABEL="Your Email"