Merge pull request #2801 from piotrmocko/patch-10

Two factor authentication on front-end
joomla · Apr 16, 2014 · 0a18e21 · 0a18e21
2 parents d495b3c + 18d0ba0
commit 0a18e21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php
@@ -52,9 +52,7 @@
 				<?php endif; ?>
 			<?php endforeach; ?>
 
-			<?php $tfa = JPluginHelper::getPlugin('twofactorauth'); ?>
-
-			<?php if (!is_null($tfa) && $tfa != array()): ?>
+			<?php if ($this->tfa): ?>
 				<div class="control-group">
 					<div class="control-label">
 						<?php echo $this->form->getField('secretkey')->label; ?>

diff --git a/components/com_users/views/login/view.html.php b/components/com_users/views/login/view.html.php
@@ -53,6 +53,10 @@ public function display($tpl = null)
 		{
 			$this->setLayout($active->query['layout']);
 		}
+
+		require_once JPATH_ADMINISTRATOR . '/components/com_users/helpers/users.php';
+		$tfa = UsersHelper::getTwoFactorMethods();
+		$this->tfa = is_array($tfa) && count($tfa) > 1;
 
 		//Escape strings for HTML output
 		$this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx'));