v1.10 release

itxchandan · itxchandan · commit a5181a026a47 · 2018-10-17T12:03:08.000+05:30
diff --git a/en-GB.mod_registerlogin.ini b/en-GB.mod_registerlogin.ini
@@ -1,105 +1,48 @@
-COM_USERS_PROFILE_USERNAME_LABEL="Username"
-COM_USERS_REGISTER_EMAIL1_DESC="Enter your email address."
-COM_USERS_REGISTER_EMAIL1_LABEL="Email Address"
-COM_USERS_REGISTER_NAME_DESC="Enter your full name."
+MOD_REGISTERLOGIN="Login Register"
 COM_USERS_REGISTER_NAME_LABEL="Name"
-COM_USERS_REGISTER_PASSWORD1_LABEL="Password"
+COM_USERS_REGISTER_EMAIL1_DESC="Enter your email address."
 COM_USERS_REGISTER_PASSWORD2_DESC="Confirm your password."
-COM_USERS_REGISTER_PASSWORD2_LABEL="Confirm Password"
-COM_USERS_REGISTER_USERNAME_DESC="Enter your desired username."
 COM_USERS_REGISTER_EMAIL2_DESC="Confirm your email address."
 COM_MODULES_FIELD_MODULECLASS_SFX_LABEL="Module Class Suffix"
 COM_MODULES_FIELD_MODULECLASS_SFX_DESC="A suffix to be applied to the CSS class of the module. This allows for individual module styling."
 COM_MODULES_FIELD_CACHING_DESC="Use the global cache setting to cache the content of this module or disable caching for this module."
 MOD_REGISTERLOGIN_USERACTIVATION_DESC="If set to Self the user will be registered immediately. If set to Admin the user will be emailed a link to verify their email address and then all users set to receive system emails and who have the permission to create users will be notified to activate the user's account."
-MOD_REGISTERLOGIN="Login Register"
 MOD_REGISTERLOGIN_USERACTIVATION_LABEL="New User Account Activation"
 MOD_REGISTERLOGIN_USERACTIVATION_OPTION_SELFACTIVATION="Self"
 MOD_REGISTERLOGIN_USERACTIVATION_OPTION_ADMINACTIVATION="Admin"
 MOD_REGISTERLOGIN_DESC_DEFAULTVIEW="Select the default view for the module"
 MOD_REGISTERLOGIN_LABEL_DEFAULTVIEW="Default View"
-MOD_REGISTERLOGIN_LABEL_ACTIVE_USER_AUTOMATICALLY="Activate user Automatically"
 MOD_REGISTERLOGIN_LABEL_AJAX_REGISTRATION="Select Yes If You Would Like to  Notifiy the Site Administrator About New Registrations"
-MOD_REGISTERLOGIN_LABEL_AJAX_REGISTRATION_DESCRIPTION="Ajax Registration"
 MOD_REGISTERLOGIN_LABEL_NOTIFICATION_EMAIL_TO_ADMINISTRATOR="Notifiy Admin"
 MOD_REGISTERLOGIN_LABEL_SITE_KEY="Site Key"
 MOD_REGISTERLOGIN_LABEL_SECRATE_KEY="Secret Key"
-MOD_REGISTERLOGIN_LABEL_ENABLECAPTCHAONLOGIN="Enable Captcha On login"
 MOD_REGISTERLOGIN_LABEL_ENABLE_TERMS_OF_USE_ON_REGISTER="Enable terms of use on Registration"
 MOD_REGISTERLOGIN_LABEL_ENABLE_CHECKBOX_REGISTER_DESC="Enable to add the checkbox to terms of use."
 MOD_REGISTERLOGIN_LABEL_ENABLECAPTCHAONREGISTRE="Enable Captcha on Registration"
 MOD_REGISTERLOGIN_LABEL_ENABLECAPTCHAONREGISTRE_DESCRIPTION="Enable Captcha on Registration"
-MOD_REGISTERLOGIN_NO="No"
-MOD_REGISTERLOGIN_YES="Yes"
-MOD_REGISTERLOGIN_PARAM_RECAPTCHATHEME_RED="Red"
-MOD_REGISTERLOGIN_PARAM_RECAPTCHATHEME_WHITE="White"
-MOD_REGISTERLOGIN_PARAM_RECAPTCHATHEME_BLACKGLASS="Blackglass"
-MOD_REGISTERLOGIN_PARAM_RECAPTCHATHEME_CLEAN="Clean"
-MOD_REGISTERLOGIN_DESC_RECAPTCHATHEME="Select ReCaptcha theme"
-COM_MODULES_RECAPTCHA_FIELDSET_LABEL="Recaptcha settings"
 MOD_REGISTERLOGIN_LOGINLEBEL="Login"
 MOD_REGISTERLOGIN_REGISTERLEBEL="Register"
-MOD_REGISTERLOGIN_PARAM_ENABLECAPTCHA_01="No"
-MOD_REGISTERLOGIN_PARAM_ENABLECAPTCHA_="Yes"
-MOD_REGISTERLOGIN_DESC_ENABLECAPTCHA=""
-MOD_REGISTERLOGIN_LABEL_PUBLICKEY=" Public Key"
-MOD_REGISTERLOGIN_DESC_PUBLICKEY="ReCaptcha Public Key. Visit www.google.com/recaptcha"
-MOD_REGISTERLOGIN_LABEL_PRIVATEKEY="Private Key"
-MOD_REGISTERLOGIN_DESC_PRIVATEKEY="ReCaptcha Public Key. Visit www.google.com/recaptcha"
-MOD_REGISTERLOGIN_LABEL_RECAPTCHATHEME="ReCaptcha Theme"
-MOD_REGISTERLOGIN_LABEL_CAPTCHA="Captcha"
 MOD_REGISTERLOGIN_DISPLAY_LABEL="Display label"
 MOD_REGISTERLOGIN_DISPLAY_LABEL_DESC="An option to specify label to the input fields."
-MOD_INVALID_KEY="Invalid Private Key"
-MOD_INVALID_CAPTCHA="Invalid Captcha"
 MOD_REGISTERLOGIN_PARAM_DEFAULTVIEW_LOGIN="Login"
 MOD_REGISTERLOGIN_PARAM_DEFAULTVIEW_REGISTER="Register"
-MOD_REGISTERLOGIN_NAME="Name"
-MOD_REGISTERLOGIN_USERNAME="Username"
-MOD_REGISTERLOGIN_PASSWORD="Password"
-MOD_REGISTERLOGIN_CONFIRM_PASSWORD="Confirm Password"
-MOD_REGISTERLOGIN_EMAIL="Email Address"
-MOD_REGISTERLOGIN_CONFIRM_EMAIL="Confirm email Address"
-MOD_REGISTERLOGIN_REQUIRED_FIELD=" Required field"
 MOD_REGISTERLOGIN_AJAX_REGISTRATION="Ajax Registration"
 MOD_REGISTERLOGIN_AJAX_REGISTRATION_DESCRIPTION="Ajax Registration helps you to register without reloading the entire page."
-MOD_REGISTERLOGIN_REMEMBER_ME="Remember Me"
 MOD_REGISTERLOGIN_FORGOT_YOUR_USERNAME="Forgot your username?"
 MOD_REGISTERLOGIN_FORGOT_YOUR_PASSWORD="Forgot your password?"
-MOD_REGISTERLOGIN_VALUE_USERNAME="Username"
 MOD_REGISTERLOGIN_HINAME="Hi %s,"
-MOD_REGISTERLOGIN_EMAIL_ACCOUNT_DETAILS="Account Details for %s at %s"
-MOD_REGISTERLOGIN_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY="Hello %s,\n\nThank you for registering at %s. Your account is created and must be verified before you can use it.\nTo verify the account click on the following link or copy-paste it in your browser:\n %s \n\nAfter verification an administrator will be notified to activate your account. You'll receive a confirmation when it's done.\nOnce that account has been activated you may login to %s using the following username and password:\n\nUsername: %s\nPassword: %s"
-
-MOD_REGISTERLOGIN_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY_NOPW="Hello %s,\n\nThank you for registering at %s. Your account is created and must be verified before you can use it.\nTo verify the account click on the following link or copy-paste it in your browser:\n %s \n\nAfter verification an administrator will be notified to activate your account. You'll receive a confirmation when it's done.\nOnce that account has been activated you may login to %s using the following username and the password you entered during registration:\n\nUsername: %s"
-MOD_REGISTERLOGIN_EMAIL_REGISTERED_WITH_ACTIVATION_BODY="Hello %s,\n\nThank you for registering at %s. Your account is created and must be activated before you can use it.\nTo activate the account click on the following link or copy-paste it in your browser:\n%s \n\nAfter activation you may login to %s using the following username and password:\n\nUsername: %s\nPassword: %s"
-MOD_REGISTERLOGIN_EMAIL_REGISTERED_WITH_ACTIVATION_BODY_NOPW="Hello %s,\n\nThank you for registering at %s. Your account is created and must be activated before you can use it.\nTo activate the account click on the following link or copy-paste it in your browser:\n%s \n\nAfter activation you may login to %s using the following username and the password you entered during registration:\n\nUsername: %s"
-MOD_REGISTERLOGIN_EMAIL_REGISTERED_BODY="Hello %s,\n\nThank you for registering at %s.\n\nYou may now log in to %s using the following username and password:\n\nUsername: %s\nPassword: %s"
-
-MOD_REGISTERLOGIN_EMAIL_REGISTERED_BODY_NOPW="Hello %s,\n\nThank you for registering at %s.\n\nYou may now log in to %s using the username and password you registered with."
-MOD_REGISTERLOGIN_EMAIL_REGISTERED_NOTIFICATION_TO_ADMIN_BODY="Hello administrator, \n\nA new user '%s', username '%s', has registered at %s."
-MOD_REGISTERLOGIN_DATABASE_ERROR="Error getting the user from the database: %s"
 MOD_REGISTERLOGIN_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED="An error was encountered while sending activation notification email"
 MOD_REGISTERLOGIN_WRONG_LOGIN_MESSAGE="Username and password do not match or you do not have an account yet"
 MOD_REGISTERLOGIN_CAPTCHA_ERROR="Captcha code is incorrect. enter a valid captcha code."
-MOD_REGISTERLOGIN_REGISTRATION_SAVE_SUCCESS="Thank you for registering. You may now log in using the username and password you registered with."
-MOD_REGISTERLOGIN_REGISTRATION_ACTIVATE_SUCCESS="Your Account has been successfully activated. You can now log in using the username and password you chose during the registration."
-MOD_REGISTERLOGIN_REGISTRATION_ADMINACTIVATE_SUCCESS="The user's account has been successfully activated and the user has been notified about it."
-MOD_REGISTERLOGIN_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."
-MOD_REGISTERLOGIN_USERNAME_ALREADY_EXIST="This Username is already registered."
 MOD_REGISTERLOGIN_LOGIN_SUCCESS="You have been logged in successfully."
-MOD_REGISTERLOGIN_REGISTRATION_COMPLETE_ACTIVATE="Your account has been created and an activation link has been sent to the email address you entered. Note that you must activate the account by clicking on the activation link when you get the email before you can login."
-MOD_REGISTERLOGIN_REGISTRATION_COMPLETE_VERIFY="Your account has been created and a verification link has been sent to the email address you entered. Note that you must verify the account by clicking on the verification link when you get the email and then an administrator will activate your account before you can login."
 MOD_REGISTERLOGIN_FIELD_LOGIN_REDIRECTURL_LABEL="Login Redirection Page"
 MOD_REGISTERLOGIN_FIELD_LOGIN_REDIRECTURL_DESC="Select the page the user will be redirected to after a successful login. Select from all the pages listed in the dropdown menu. Choosing &quot;Default&quot; will return to the same page."
 MOD_REGISTERLOGIN_FIELD_LOGOUT_REDIRECTURL_LABEL="Logout Redirection Page"
 MOD_REGISTERLOGIN_FIELD_LOGOUT_REDIRECTURL_DESC="Select the page the user will be redirected to after a successful logout. Select from all the pages listed in the dropdown menu. Choosing "Default" will return to the same page"
 MOD_REGISTERLOGIN_TERMFOUSE_ENABLE="Enable"
 MOD_REGISTERLOGIN_TERMFOUSE_DISABLE="Disable"
 MOD_REGISTERLOGIN_LABEL_TERMFOUSE="Terms Of Use"
-MOD_REGISTERLOGIN_DESC_TERMFOUSE="Select if you want to enable the Terms of Use Check Box to display before the register button."
 MOD_REGISTERLOGIN_LABEL_CHECKBOX="Check box"
-MOD_REGISTERLOGIN_DESC_CHECKBOX="Select whether you want the Terms of Use Check Box to be pre-checked or not."
 MOD_REGISTERLOGIN_CHECKBOX="Checked"
 MOD_REGISTERLOGIN_UNCHECKBOX="Not Checked"
 MOD_REGISTERLOGIN_LABEL_ARTICLEID="Article ID"
@@ -113,4 +56,5 @@ MOD_REGISTERLOGIN_OPENINMODEL="Open in Modal/Popup"
 MOD_REGISTERLOGIN_CHOOSELAYOUT="Select a Layout"
 MOD_REGISTERLOGIN_CHOOSELAYOUT_DES="Select a Layout"
 MOD_REGISTERLOGIN_CHOOSELAYOUT_VALUE="Radio Buttons"
-MOD_REGISTERLOGIN_CHOOSELAYOUT_VALUE1="Tabs"
+MOD_REGISTERLOGIN_CHOOSELAYOUT_VALUE1="Tabs"
+MOD_REGISTERLOGIN_NOT_ALLWED="User Registration Not allowed at this moment."
diff --git a/helper.php b/helper.php
@@ -1,12 +1,10 @@
 <?php
 /**
  * @package		Register Login Joomla Module
- * @version		1.9
- * @author		www.joomdev.com
- * @copyright	Copyright (C) 2009 - 2018 www.joomdev.com. All rights reserved.
- * @license	   GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author		JoomDev
+ * @copyright	Copyright (C) 2018 Joomdev, Inc. All rights reserved.
+ * @license    GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
-
 defined('_JEXEC') or die;
 class modRegisterLoginHelper
 {	
@@ -407,7 +405,8 @@ public static function getUserRegister($params = array()){
 
 					// Check for an error.
 					if ($return !== true){
-						JError::raiseError( 4711, JText::_('MOD_REGISTERLOGIN_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED') );
+						echo $return;
+						//JError::raiseError( 4711, JText::_('MOD_REGISTERLOGIN_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED') );
 						return false;
 					}
 				}
@@ -419,17 +418,15 @@ public static function getReturnUrl($params, $type)
 	{
 		$app  = JFactory::getApplication();
 		$item = $app->getMenu()->getItem($params->get($type));
+
 		// Stay on the same page
 		$url = JUri::getInstance()->toString();
+
 		if ($item)
 		{
-			$lang = '';
-			if ($item->language !== '*' && JLanguageMultilang::isEnabled())
-			{
-				$lang = '&lang=' . $item->language;
-			}
-			$url = JURI::root().'index.php?Itemid=' . $item->id . $lang;
+			$url = JRoute::_('index.php?Itemid=' . $item->id);
 		}
+
 		return base64_encode($url);
 	}
 	public static function getType()
diff --git a/mod_registerlogin.php b/mod_registerlogin.php
@@ -1,10 +1,9 @@
 <?php
 /**
  * @package		Register Login Joomla Module
- * @version		1.9
- * @author		www.joomdev.com
- * @copyright	Copyright (C) 2009 - 2018 www.joomdev.com. All rights reserved.
- * @license	   GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author		JoomDev
+ * @copyright	Copyright (C) 2018 Joomdev, Inc. All rights reserved.
+ * @license    GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 defined('_JEXEC') or die;
diff --git a/mod_registerlogin.xml b/mod_registerlogin.xml
@@ -2,12 +2,12 @@
 <extension type="module" version="3.0" client="site" method="upgrade">
 	<name>Register Login</name>
 	<author>JoomDev</author>
-	<creationDate>June, 2018</creationDate>
+	<creationDate>Oct, 2018</creationDate>
 	<copyright>All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<authorEmail>support@joomdev.com</authorEmail>
-	<authorUrl>www.joomDev.com</authorUrl>
-	<version>1.9</version>
+	<authorEmail>info@joomdev.com</authorEmail>
+	<authorUrl>www.joomdev.com</authorUrl>
+	<version>1.10</version>
 	<description>
 		<![CDATA[<div style="font-size:16px; font-weight:bold; color:black; text-align:left; margin:0px; padding:0px 5px;"><h3>Register Login By JoomDev</h3></div>
 <div style="font-weight:normal; border-bottom:1px solid #f0dc7e;display:block; padding-bottom:5px; margin:5px; background-color:#fff;"></div>
diff --git a/tmpl/assets/jquery.registerloginplugin.js b/tmpl/assets/jquery.registerloginplugin.js
@@ -1,9 +1,8 @@
 /**
  * @package		Register Login Joomla Module
- * @version		1.9
- * @author		www.joomdev.com
- * @copyright	Copyright (C) 2009 - 2018 www.joomdev.com. All rights reserved.
- * @license	   GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author		JoomDev
+ * @copyright	Copyright (C) 2018 Joomdev, Inc. All rights reserved.
+ * @license    GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 (function ($) {
 	$.fn.jdRegisterLogin = function () {
diff --git a/tmpl/assets/registerlogin.css b/tmpl/assets/registerlogin.css
@@ -1,9 +1,8 @@
 /**
  * @package		Register Login Joomla Module
- * @version		1.9
- * @author		www.joomdev.com
- * @copyright	Copyright (C) 2009 - 2018 www.joomdev.com. All rights reserved.
- * @license	   GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author		JoomDev
+ * @copyright	Copyright (C) 2018 Joomdev, Inc. All rights reserved.
+ * @license    GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 .jd-register-login-wrapper * {
@@ -52,11 +51,13 @@
 	margin: 0;
 	padding: 0;
 	list-style: none;
+	display: flex;
 }
 
 .jd-register-login-wrapper .jd-register-login-tab li {
-	margin-right: 5px;
 	display: inline-block;
+	width: 50%;
+	text-align: center;
 }
 
 .jd-register-login-wrapper .jd-register-login-tab li span {
@@ -71,11 +72,6 @@
 	border-bottom: 0;
 	color: #212529;
 	background-color: #f8f9fa;
-	-webkit-transition: all 0.5s ease;
-	-moz-transition: all 0.5s ease;
-	-ms-transition: all 0.5s ease;
-	-o-transition: all 0.5s ease;
-	transition: all 0.5s ease;
 }
 
 .jd-register-login-wrapper .jd-register-login-tab li span.active,
@@ -105,6 +101,7 @@
 .jd-register-login-wrapper .jd-register-login-box .jd-inputbox-control {
 	display: block;
 	margin-bottom: 1rem;
+	position: relative;
 }
 
 .jd-register-login-wrapper .jd-register-login-box .jd-button-control:last-child,
@@ -114,7 +111,7 @@
 
 .jd-register-login-wrapper .jd-control-check-raido {
 	position: relative;
-	display: block;
+	display: flex;
 	padding-left: 0;
 }
 
@@ -143,6 +140,8 @@
 .jd-register-login-wrapper .jd-register-login-tab .jd-inputbox-control.jd-control-check-raido {
 	margin-bottom: 0;
 	padding: 15px;
+	width: 50%;
+	text-align: center;
 }
 
 .jd-register-login-wrapper .jd-register-login-box .jd-inputbox-control .jd-form-input {
@@ -158,7 +157,7 @@
 	font-size: 16px;
 	font-weight: 500;
 	line-height: 40px;
-	padding: 0 19px;
+	padding: 0 15px;
 	background-color: #fff;
 	border: 1px solid #efefef;
 	-webkit-border-radius: 3px;
@@ -252,6 +251,7 @@
 	font-size: 16px;
 	line-height: 24px;
 	padding: 8px 15px;
+	margin-top: 10px;
 	text-align: center;
 	text-decoration: none;
 	-webkit-transition: all 0.3s ease-out 0s;
@@ -278,11 +278,11 @@
 	display: inline-block;
 }
 
-.error {
+.jd-register-login-wrapper .error {
 	color: red;
 }
 
-#error_message1 {
+.jd-register-login-wrapper #error_message1 {
 	margin-bottom: 10px;
 }
 
@@ -299,4 +299,24 @@
 
 .jd-register-login-wrapper .jd-inputbox-control label.error {
 	float: none !important;
+}
+
+.jd-input-group-addon {
+	padding: 0 10px;
+	margin-bottom: 0;
+	font-size: 16px;
+	font-weight: 400;
+	line-height: 40px;
+	color: #495057;
+	text-align: center;
+	background-color: #e9ecef;
+	border: 1px solid #ced4da;
+	border-radius: 0;
+	position: absolute;
+	bottom: 0;
+	right: 0;
+}
+
+.jd-register-login-wrapper .showpass {
+	cursor: pointer;
 }
diff --git a/tmpl/assets/registerlogin.js b/tmpl/assets/registerlogin.js
@@ -1,9 +1,8 @@
 /**
  * @package		Register Login Joomla Module
- * @version		1.9
- * @author		www.joomdev.com
- * @copyright	Copyright (C) 2009 - 2018 www.joomdev.com. All rights reserved.
- * @license	   GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author		JoomDev
+ * @copyright	Copyright (C) 2018 Joomdev, Inc. All rights reserved.
+ * @license    GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 jQuery(document).ready(function () {
diff --git a/tmpl/assets/registerloginajax.js b/tmpl/assets/registerloginajax.js
@@ -1,9 +1,8 @@
 /**
  * @package		Register Login Joomla Module
- * @version		1.9
- * @author		www.joomdev.com
- * @copyright	Copyright (C) 2009 - 2018 www.joomdev.com. All rights reserved.
- * @license	   GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
+ * @author		JoomDev
+ * @copyright	Copyright (C) 2018 Joomdev, Inc. All rights reserved.
+ * @license    GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
 jQuery(document).ready(function () {
@@ -21,18 +20,6 @@ jQuery(document).ready(function () {
 		}
 	});
 	jQuery("#registration_form").validate({
-		rules: {
-			recaptcha_response_field: "required"
-		},
-		errorPlacement: function (error, element) {
-			if (element.attr("name") == "recaptcha_response_field") {
-				error.insertAfter("#registration_form #recaptcha_area");
-			} else if (element.attr("name") == "terms") {
-				error.insertAfter("#registration_form #terms_");
-			} else {
-				error.insertAfter(element);
-			}
-		},
 		submitHandler: function () {
 			var submit = jQuery('#register_submit');
 			jQuery.ajax({
diff --git a/tmpl/default.php b/tmpl/default.php
diff --git a/tmpl/default_logout.php b/tmpl/default_logout.php
