Merge pull request #7765 from lcdservices/patch-1

user activation link doesn't enforce frontend base URL
joomla · Oct 1, 2015 · 881dbc2 · 881dbc2
2 parents 79bd2ad + 6200c59
commit 881dbc2
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/components/com_users/models/registration.php b/components/com_users/models/registration.php
@@ -83,6 +83,14 @@ public function activate($token)
 			$data['siteurl'] = JUri::base();
 			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
 			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
+
+			// Remove administrator/ from activate url in case this method is called from admin
+			if (JFactory::getApplication()->isAdmin())
+			{
+				$adminPos         = strrpos($data['activate'], 'administrator/');
+				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
+			}
+
 			$data['fromname'] = $config->get('fromname');
 			$data['mailfrom'] = $config->get('mailfrom');
 			$data['sitename'] = $config->get('sitename');
@@ -409,6 +417,13 @@ public function register($temp)
 			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
 			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
 
+			// Remove administrator/ from activate url in case this method is called from admin
+			if (JFactory::getApplication()->isAdmin())
+			{
+				$adminPos         = strrpos($data['activate'], 'administrator/');
+				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
+			}
+
 			$emailSubject = JText::sprintf(
 				'COM_USERS_EMAIL_ACCOUNT_DETAILS',
 				$data['name'],
@@ -446,6 +461,13 @@ public function register($temp)
 			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
 			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
 
+			// Remove administrator/ from activate url in case this method is called from admin
+			if (JFactory::getApplication()->isAdmin())
+			{
+				$adminPos         = strrpos($data['activate'], 'administrator/');
+				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
+			}
+
 			$emailSubject = JText::sprintf(
 				'COM_USERS_EMAIL_ACCOUNT_DETAILS',
 				$data['name'],