From b780bc536d119f6ec87d1f1dc7b288b4bbedb536 Mon Sep 17 00:00:00 2001
From: Hanne Moa <hanne.moa@uninett.no>
Date: Thu, 1 Sep 2016 15:04:02 +0200
Subject: [PATCH] Split logic and data for authYubiKey-module
For: #454
---
modules/authYubiKey/templates/yubikeylogin.php | 4 ++--
modules/authYubiKey/www/yubikeylogin.php | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/authYubiKey/templates/yubikeylogin.php b/modules/authYubiKey/templates/yubikeylogin.php
index 962d1d4f3..732904dec 100644
--- a/modules/authYubiKey/templates/yubikeylogin.php
+++ b/modules/authYubiKey/templates/yubikeylogin.php
@@ -19,8 +19,8 @@ if ($this->data['errorcode'] !== NULL) {
}
?>
- <img style="float: right" src="<?php echo(SimpleSAML\Module::getModuleURL('authYubiKey/resources/logo.jpg')); ?>" alt="" />
- <img style="clear: right; float: right" src="<?php echo(SimpleSAML\Module::getModuleURL('authYubiKey/resources/yubikey.jpg')); ?>" alt="YubiKey" />
+ <img style="float: right" src="<?php echo($this->data['logo_url']); ?>" alt="" />
+ <img style="clear: right; float: right" src="<?php echo($this->data['devicepic_url']); ?>" alt="YubiKey" />
<h2 style=""><?php echo $this->t('{authYubiKey:yubikey:header}'); ?></h2>
diff --git a/modules/authYubiKey/www/yubikeylogin.php b/modules/authYubiKey/www/yubikeylogin.php
index 010613c25..91df92ee3 100644
--- a/modules/authYubiKey/www/yubikeylogin.php
+++ b/modules/authYubiKey/www/yubikeylogin.php
@@ -31,5 +31,7 @@ $globalConfig = SimpleSAML_Configuration::getInstance();
$t = new SimpleSAML_XHTML_Template($globalConfig, 'authYubiKey:yubikeylogin.php');
$t->data['stateparams'] = array('AuthState' => $authStateId);
$t->data['errorcode'] = $errorCode;
+$t->data['logo_url'] = SimpleSAML\Module::getModuleURL('authYubiKey/resources/logo.jpg');
+$t->data['devicepic_url'] = SimpleSAML\Module::getModuleURL('authYubiKey/resources/yubikey.jpg')
$t->show();
exit();
--
GitLab