From dada6ce79b18fef6aeb56ab6c8dc75e0f13d08e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 1 Apr 2011 11:47:35 +0000
Subject: [PATCH] Adding central disco helper
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2790 44740490-163a-0410-bde0-09ae8108e29a
---
modules/discojuice/lib/CentralHelper.php | 36 ++++++++++++++++++++
modules/discojuice/templates/central.tpl.php | 5 ++-
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 modules/discojuice/lib/CentralHelper.php
diff --git a/modules/discojuice/lib/CentralHelper.php b/modules/discojuice/lib/CentralHelper.php
new file mode 100644
index 000000000..770622c15
--- /dev/null
+++ b/modules/discojuice/lib/CentralHelper.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * ...
+ */
+class sspmod_discojuice_CentralHelper {
+
+ public static function show($path = '/simplesaml/module.php/discojuice/discojuice/') {
+
+
+ $djconfig = SimpleSAML_Configuration::getOptionalConfig('disojuicecentral.php');
+ $config = SimpleSAML_Configuration::getInstance();
+
+
+ $feed = new sspmod_discojuice_Feed();
+ $metadata = json_decode($feed->read(), TRUE);
+
+
+ $t = new SimpleSAML_XHTML_Template($config, 'discojuice:central.tpl.php');
+ $t->data['metadata'] = $metadata;
+ $t->data['discojuice.options'] = $djconfig->getValue('discojuice.options');
+ $t->data['discojuice.options']['discoPath'] = $path;
+ $t->data['acl'] = $djconfig->getValue('acl');
+ $t->show();
+
+
+
+ }
+
+
+
+
+
+
+}
+
diff --git a/modules/discojuice/templates/central.tpl.php b/modules/discojuice/templates/central.tpl.php
index 2a809af0c..eae3d6f0e 100644
--- a/modules/discojuice/templates/central.tpl.php
+++ b/modules/discojuice/templates/central.tpl.php
@@ -69,7 +69,10 @@ if (empty($options['metadata'])) {
}
echo 'options.disco = { url: "' . SimpleSAML_Module::getModuleURL('discojuice/discojuiceDiscoveryResponse.html?'). '" }; ' . "\n";
-echo 'options.discoPath = "discojuice/"; ' . "\n";
+
+if (empty($options['discoPath'])) {
+ echo 'options.discoPath = "discojuice/"; ' . "\n";
+}
echo 'var acl = ' . json_encode($this->data['acl']) . ';' . "\n";
echo 'acl.push("' . SimpleSAML_Utilities::getSelfHost() . '");' . "\n\n";
--
GitLab