From 6b5ac5fe13213b621e1ff8f0f35ff2a4b82657c7 Mon Sep 17 00:00:00 2001
From: trungch <trungch@joomsolutions.com>
Date: Fri, 15 Jul 2016 09:53:50 +0700
Subject: [PATCH] Add login/logout redirect link

In the login menu type, user can configure redirect to a url link or a
menu item when login.
---
 .../base-bs3/html/com_users/login/default_login.php    |  7 ++++++-
 .../base-bs3/html/com_users/login/default_logout.php   | 10 ++++++++--
 .../base/html/com_users/login/default_login.php        |  8 +++++++-
 .../base/html/com_users/login/default_logout.php       |  8 +++++++-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/source/plg_system_t3/base-bs3/html/com_users/login/default_login.php b/source/plg_system_t3/base-bs3/html/com_users/login/default_login.php
index 464f9911f5..2c3daada28 100644
--- a/source/plg_system_t3/base-bs3/html/com_users/login/default_login.php
+++ b/source/plg_system_t3/base-bs3/html/com_users/login/default_login.php
@@ -10,6 +10,7 @@
 defined('_JEXEC') or die;
 
 JHtml::_('behavior.keepalive');
+JHtml::_('behavior.formvalidator');
 ?>
 
 <div class="login-wrap">
@@ -39,7 +40,7 @@
 		</div>
 		<?php endif; ?>
 
-		<form action="<?php echo JRoute::_('index.php?option=com_users&task=user.login'); ?>" method="post" class="form-horizontal">
+		<form action="<?php echo JRoute::_('index.php?option=com_users&task=user.login'); ?>" method="post" class="form-validate form-horizontal">
 
 			<fieldset>
 				<?php foreach ($this->form->getFieldset('credentials') as $field) : ?>
@@ -87,7 +88,11 @@
 					</div>
 				</div>
 
+			<?php if ($this->params->get('login_redirect_url')) : ?>
 				<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('login_redirect_url', $this->form->getValue('return'))); ?>" />
+			<?php else : ?>
+				<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('login_redirect_menuitem', $this->form->getValue('return'))); ?>" />
+			<?php endif; ?>
 				<?php echo JHtml::_('form.token'); ?>
 			</fieldset>
 		</form>
diff --git a/source/plg_system_t3/base-bs3/html/com_users/login/default_logout.php b/source/plg_system_t3/base-bs3/html/com_users/login/default_logout.php
index 65501ac2b8..8c98b8ce06 100644
--- a/source/plg_system_t3/base-bs3/html/com_users/login/default_logout.php
+++ b/source/plg_system_t3/base-bs3/html/com_users/login/default_logout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -40,7 +40,13 @@
 				<button type="submit" class="btn btn-primary"><span class="fa fa-arrow-left"></span> <?php echo JText::_('JLOGOUT'); ?></button>
 			</div>
 		</div>
-		<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('logout_redirect_url', $this->form->getValue('return'))); ?>" />
+    
+		<?php if ($this->params->get('logout_redirect_url')) : ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('logout_redirect_url', $this->form->getValue('return'))); ?>" />
+		<?php else : ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('logout_redirect_menuitem', $this->form->getValue('return'))); ?>" />
+		<?php endif; ?>
+    
 		<?php echo JHtml::_('form.token'); ?>
 	</form>
 </div>
diff --git a/source/plg_system_t3/base/html/com_users/login/default_login.php b/source/plg_system_t3/base/html/com_users/login/default_login.php
index 9677a7689d..39d4d6468d 100644
--- a/source/plg_system_t3/base/html/com_users/login/default_login.php
+++ b/source/plg_system_t3/base/html/com_users/login/default_login.php
@@ -83,7 +83,13 @@
 						<button type="submit" class="btn btn-primary"><?php echo JText::_('JLOGIN'); ?></button>
 					</div>
 				</div>
-				<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('login_redirect_url', $this->form->getValue('return'))); ?>" />
+        
+        <?php if ($this->params->get('login_redirect_url')) : ?>
+          <input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('login_redirect_url', $this->form->getValue('return'))); ?>" />
+        <?php else : ?>
+          <input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('login_redirect_menuitem', $this->form->getValue('return'))); ?>" />
+        <?php endif; ?>
+        
 				<?php echo JHtml::_('form.token'); ?>
 			</fieldset>
 		</form>
diff --git a/source/plg_system_t3/base/html/com_users/login/default_logout.php b/source/plg_system_t3/base/html/com_users/login/default_logout.php
index da0ef30b31..f5a47cbd77 100644
--- a/source/plg_system_t3/base/html/com_users/login/default_logout.php
+++ b/source/plg_system_t3/base/html/com_users/login/default_logout.php
@@ -40,7 +40,13 @@
 				<button type="submit" class="btn btn-primary"><span class="icon-arrow-left icon-white"></span> <?php echo JText::_('JLOGOUT'); ?></button>
 			</div>
 		</div>
-		<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('logout_redirect_url', $this->form->getValue('return'))); ?>" />
+    
+		<?php if ($this->params->get('logout_redirect_url')) : ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('logout_redirect_url', $this->form->getValue('return'))); ?>" />
+		<?php else : ?>
+			<input type="hidden" name="return" value="<?php echo base64_encode($this->params->get('logout_redirect_menuitem', $this->form->getValue('return'))); ?>" />
+		<?php endif; ?>
+    
 		<?php echo JHtml::_('form.token'); ?>
 	</form>
 </div>