From 6088ddb1547cb5e50352565ad32360cfa1bf0d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 20 May 2011 10:53:14 +0000
Subject: [PATCH] SimpleSAMLphp discojuice module automatically sets entityid
in discojuice config. Bumbing js cache ID to force new versions of js.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2842 44740490-163a-0410-bde0-09ae8108e29a
---
modules/discojuice/lib/EmbedHelper.php | 2 +-
modules/discojuice/templates/central.tpl.php | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/modules/discojuice/lib/EmbedHelper.php b/modules/discojuice/lib/EmbedHelper.php
index caf0e221d..c1819fb1c 100644
--- a/modules/discojuice/lib/EmbedHelper.php
+++ b/modules/discojuice/lib/EmbedHelper.php
@@ -7,7 +7,7 @@ class sspmod_discojuice_EmbedHelper {
public static function head($includeJQuery = TRUE) {
- $version = '0.1-3';
+ $version = '0.1-4';
$config = SimpleSAML_Configuration::getInstance();
$djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuiceembed.php');
diff --git a/modules/discojuice/templates/central.tpl.php b/modules/discojuice/templates/central.tpl.php
index a33af7482..55b4695fc 100644
--- a/modules/discojuice/templates/central.tpl.php
+++ b/modules/discojuice/templates/central.tpl.php
@@ -1,7 +1,7 @@
<?php
-$version = '0.1-3';
+$version = '0.1-4';
header('P3P:CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"');
@@ -64,7 +64,14 @@ global $options;
global $returnidparam, $returnto;
$options = $this->data['discojuice.options'];
-// echo '<pre>opts';
+if (!empty($_REQUEST['entityID'])) {
+ if (!array_key_exists('disco', $options)) {
+ $options['disco'] = array();
+ }
+ $options['disco']['spentityid'] = $_REQUEST['entityID'];
+}
+
+// echo '</script><pre>opts';
// print_r($options);
// exit;
--
GitLab