diff --git a/modules/discojuice/config-templates/disojuicecentral.php b/modules/discojuice/config-templates/discojuicecentral.php
similarity index 93%
rename from modules/discojuice/config-templates/disojuicecentral.php
rename to modules/discojuice/config-templates/discojuicecentral.php
index b77c57a688ed860f87dcf69a3f0349c61ed63c5b..b4233ba67a0361d47ff45c39f04ceec812c4fd4a 100644
--- a/modules/discojuice/config-templates/disojuicecentral.php
+++ b/modules/discojuice/config-templates/discojuicecentral.php
@@ -20,7 +20,7 @@ $config = array(
"type"=> false,
"country"=> true,
"location"=> true,
- "debug.weight" => true,
+ "debug.weight" => false,
),
diff --git a/modules/discojuice/config-templates/discojuiceembed.php b/modules/discojuice/config-templates/discojuiceembed.php
new file mode 100644
index 0000000000000000000000000000000000000000..44a281ca1087117028863d115c10f65b96965725
--- /dev/null
+++ b/modules/discojuice/config-templates/discojuiceembed.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This is the configuration file for the Auth MemCookie example.
+ */
+
+$config = array(
+ 'target' => 'a.signin',
+ 'discojuice.options' => array(
+ "title"=> 'Sign in to <strong>Foodle</strong>',
+ "subtitle"=> "Select your Provider",
+
+ "always"=> false,
+ "overlay"=> true,
+ "cookie"=> true,
+ "type"=> false,
+ "country"=> true,
+ "location"=> true,
+ "debug.weight" => false,
+ ),
+
+ "callback" => "
+
+function(e) {
+
+ console.log(e);
+
+ var auth = e.auth || null;
+ var returnto = window.location.href || 'https://foodl.org';
+ switch(auth) {
+
+ case 'twitter':
+ window.location = 'https://foodl.org/simplesaml/module.php/core/as_login.php?AuthId=twitter&ReturnTo=' + escape(returnto);
+ break;
+
+
+ case 'saml':
+ default:
+ window.location = 'https://foodl.org/simplesaml/module.php/core/as_login.php?AuthId=saml&ReturnTo=' + escape(returnto) + '&saml:idp=' + escape(e.entityID);
+ break;
+
+ }
+}
+
+ "
+
+
+);
\ No newline at end of file
diff --git a/modules/discojuice/config-templates/discojuicefeed.php b/modules/discojuice/config-templates/discojuicefeed.php
new file mode 100644
index 0000000000000000000000000000000000000000..3247be869c00784a12760d942e811261bf5b3222
--- /dev/null
+++ b/modules/discojuice/config-templates/discojuicefeed.php
@@ -0,0 +1,350 @@
+<?php
+
+/**
+ * This is the configuration file for the Auth MemCookie example.
+ */
+
+$config = array(
+
+ 'insert' => array(
+ 'https://twitter.com' => array(
+ 'icon' => 'twitter.png',
+ // 'descr' => 'Login with your Twitter account',
+ 'title' => 'Twitter',
+ 'weight' => -1,
+ 'auth' => 'twitter',
+ 'country' => '_all_',
+ 'distance' => null,
+ // 'keywords' => array(
+ // 'Organizations' => array('Twitter'),
+ // ),
+ ),
+ ),
+
+
+ 'exclude' => array(
+ 'https://testidp.wayf.dk',
+ 'https://betawayf.wayf.dk',
+ ),
+
+ 'overrides' => array(
+ 'https://twitter.com' => array(
+ 'icon' => 'twitter.png',
+ 'weight' => -1,
+ 'auth' => 'twitter',
+ 'country' => '_all_',
+ ),
+ 'https://idp.feide.no' => array(
+ 'icon' => 'feide2.png',
+ 'descr' => 'Brukere i norske utdanningsinstitusjoner [beta]',
+ 'weight' => -10,
+ 'keywords' => array(
+ 'Organizations' => array('UNINETT', 'Feide', 'UiO', 'NTNU', 'UiB', 'UiT'),
+ 'Places' => array('Norway', 'Norge', 'Trondheim', 'Oslo', 'Bergen', 'Tromsø', 'Stavanger'),
+ ),
+ ),
+ 'https://idp-test.feide.no' => array(
+ 'icon' => 'feide2.png',
+ 'weight' => 10,
+ 'country' => 'XX',
+ ),
+ 'https://betawayf.wayf.dk' => array(
+ 'icon' => 'wayf2.png',
+ 'weight' => 10,
+ 'country' => 'XX',
+ ),
+
+ 'https://www.rediris.es/sir/redirisidp' => array(
+ 'icon' => 'rediris.png',
+ 'weight' => -1,
+ ),
+ 'https://idp.nordu.net/idp/shibboleth' => array(
+ 'icon' => 'nordunet.png',
+ 'weight' => -3,
+ ),
+ 'https://openidp.feide.no' => array(
+ 'icon' => 'openidp.png',
+ 'title' => 'Feide OpenIdP',
+ 'descr' => 'If you do not have an institutional account, register here.',
+ 'country' => '_all_',
+ 'weight' => -5,
+ 'keywords' => array(
+ 'Keyword' => array('Guest', 'OpenIdP', 'Orphanage', 'Homeless', 'Create Account', 'Register'),
+ ),
+ ),
+ 'https://idp.protectnetwork.org/protectnetwork-idp' => array(
+ 'icon' => 'protectnetwork.png',
+ 'title' => 'Protect Network',
+ 'descr' => 'If you do not have an institutional account, register here.',
+ 'country' => '_all_',
+ 'weight' => -6,
+ 'geo' => null,
+ 'keywords' => array(
+ 'Keyword' => array('Guest', 'OpenIdP', 'Orphanage', 'Homeless', 'Create Account', 'Register'),
+ ),
+ ),
+
+ 'https://login.terena.org/idp/saml2/idp/metadata.php' => array(
+ 'icon' => 'terena2.png',
+ 'descr' => 'Terena offices Netherlands',
+ 'country' => 'NL',
+ 'weight' => -3,
+ ),
+ 'https://idp.csc.fi/idp/shibboleth' => array(
+ 'icon' => 'csc.png',
+ 'weight' => -2,
+ ),
+ 'https://wayf.wayf.dk' => array(
+ 'weight' => -3,
+ 'icon' => 'wayf2.png',
+ ),
+
+ 'https://www.rediris.es/sir/umaidp' => array(
+ 'weight' => -2,
+ 'icon' => 'uma.png',
+ ),
+ 'https://idp.uma.es/simplesaml/saml2/idp/metadata.php' => array(
+ 'weight' => -2,
+ 'icon' => 'uma.png',
+ ),
+ 'https://idpguest.fccn.pt/idp/shibboleth' => array(
+ 'weight' => -2,
+ 'icon' => 'fccn.png',
+ ),
+ 'https://whoami.cesnet.cz/idp/shibboleth' => array(
+ 'weight' => -2,
+ 'icon' => 'cesnet.png',
+ 'country' => 'CZ',
+ ),
+ 'https://login.ntua.gr/idp/shibboleth' => array(
+ 'weight' => -2,
+ 'icon' => 'ntua.png',
+ 'country' => 'GR',
+ ),
+ 'https://idp.umu.se/saml2/idp/metadata.php' => array(
+ 'title' => 'UmeĂĄ Universitet',
+ 'weight' => -3,
+ 'icon' => 'umeaa.png',
+ # 'country' => 'sweden',
+ ),
+ 'SURFnet%20BV' => array(
+ 'icon' => 'surfnet.png',
+ 'weight' => -2
+ ),
+
+ 'gidp.geant.net' => array(
+ 'country' => '_all_',
+ 'icon' => 'geant.png',
+ ),
+ 'urn:mace:cru.fr:federation:sac' => array(
+ 'icon' => 'cru.png',
+ ),
+ 'https://stc-test16.cis.brown.edu/idp/shibboleth' => array(
+ 'icon' => 'brown.png',
+ 'title' => 'Brown University',
+ ),
+
+
+
+
+
+
+'https://www.rediris.es/sir/uvigoidp' => array(
+ 'geo' => array('lat' => 42.169185 , 'lon' => -8.683609)
+),
+
+'https://www.rediris.es/sir/uahidp' => array(
+ 'geo' => array('lat' => 40.510597 , 'lon' => -3.343858)
+),
+
+'https://www.rediris.es/sir/bcblidp' => array(
+ 'geo' => array('lat' => 43.294269, 'lon' => -1.9861)
+),
+
+'https://www.rediris.es/sir/ullidp' => array(
+ 'geo' => array('lat' => 28.4816, 'lon' => -16.3168)
+),
+
+'https://www.rediris.es/sir/ubuidp' => array(
+ 'geo' => array('lat' => 42.340197, 'lon' => -3.7277)
+),
+
+'https://www.rediris.es/sir/upctidp' => array(
+ 'geo' => array('lat' => 37.6018, 'lon' => -0.9794)
+),
+
+'https://www.rediris.es/sir/umidp' => array(
+ 'geo' => array('lat' => 38.022, 'lon' => -1.174)
+),
+
+'https://www.rediris.es/sir/uclmidp' => array(
+ 'geo' => array('lat' => 38.986096 , 'lon' => -3.927262)
+),
+
+'https://www.rediris.es/sir/upmidp' => array(
+ 'geo' => array('lat' => 40.449, 'lon' => 3.7191)
+),
+
+'https://www.rediris.es/sir/boeidp' => array(
+ 'geo' => array('lat' => 40.4867, 'lon' => -3.6604)
+),
+
+'https://www.rediris.es/sir/usidp' => array(
+ 'geo' => array('lat' => 37.382, 'lon' => -5.99158)
+),
+
+'https://www.rediris.es/sir/usalidp'=> array(
+ 'geo' => array('lat' => 40.790887, 'lon' => -5.539856)
+ ),
+
+'https://www.rediris.es/sir/deustoidp' => array(
+ 'geo' => array('lat' => 43.270891, 'lon' => -2.938769)
+),
+
+'https://www.rediris.es/sir/uaidp' => array(
+ 'geo' => array('lat' => 38.385975, 'lon' => -0.514267)
+),
+
+'https://www.rediris.es/sir/ucoidp' => array(
+ 'geo' => array('lat' => 37.9157009, 'lon' => -4.721796)
+),
+
+'https://www.rediris.es/sir/dipcidp' => array(
+ 'geo' => array('lat' => 43.1819, 'lon' => -2.0039)
+),
+
+'https://www.rediris.es/sir/uaxidp' => array(
+ 'geo' => array('lat' => 40.452, 'lon' => -3.984)
+),
+
+'https://www.rediris.es/sir/iacidp' => array(
+ 'geo' => array('lat' => 28.47468, 'lon' => -16.308303)
+),
+
+'https://www.rediris.es/sir/redirisidp' => array(
+ 'geo' => array('lat' => 40.447636, 'lon' => -3.694236)
+),
+
+'https://www.rediris.es/sir/ujaenidp' => array(
+ 'geo' => array('lat' => 37.789800, 'lon' => -3.77795)
+),
+
+'https://www.rediris.es/sir/uabidp' => array(
+ 'geo' => array('lat' => 41.500742, 'lon' => 2.110714)
+),
+
+'https://www.rediris.es/sir/uscidp' => array(
+ 'geo' => array('lat' => 42.876, 'lon' => -8.554)
+),
+
+'https://www.rediris.es/sir/uhuidp' => array(
+ 'geo' => array('lat' => 37.266847 , 'lon' => -6.921586)
+),
+
+'https://www.rediris.es/sir/iteidp' => array(
+ 'geo' => array('lat' => 40.445684, 'lon' => -3.655001)
+),
+
+'https://www.rediris.es/sir/uniriojaidp' => array(
+ 'geo' => array('lat' => 42.463, 'lon' => -2.427)
+),
+
+'https://www.rediris.es/sir/upcomillasidp' => array(
+ 'geo' => array('lat' => 40.43000, 'lon' => -3.71127)
+),
+
+'https://www.rediris.es/sir/unedidp' => array(
+ 'geo' => array('lat' => 40.4381, 'lon' => -3.7041)
+),
+
+'https://www.rediris.es/sir/udcidp' => array(
+ 'geo' => array( 'lat' => 43.33127, 'lon' => -8.412184)
+),
+
+'https://www.rediris.es/sir/funepidp' => array(
+ 'geo' => array('lat' => 40.4287, 'lon' => -3.7156)
+),
+
+'https://www.rediris.es/sir/cemfiidp' => array(
+ 'geo' => array('lat' => 40.4140, 'lon' => -3.6896)
+),
+
+'https://www.rediris.es/sir/cesgaidp' => array(
+ 'geo' => array('lat' => 42.875, 'lon' => -8.553)
+),
+
+'https://www.rediris.es/sir/upnaidp' => array(
+ 'geo' => array('lat' => 42.8000, 'lon' => -1.6361)
+),
+
+'https://www.rediris.es/sir/ehuidp' => array(
+ 'geo' => array('lat' => 43.331611, 'lon' => -2.971557)
+),
+
+'https://www.rediris.es/sir/unizaridp' => array(
+ 'geo' => array('lat' => 41.643, 'lon' => -0.899)
+),
+
+'https://www.rediris.es/sir/unicanidp' => array(
+ 'geo' => array('lat' => 43.471111, 'lon' => 3.805)
+),
+
+'https://www.rediris.es/sir/ufvidp' => array(
+ 'geo' => array('lat' => 40.262, 'lon' => -3.500)
+),
+
+'https://www.rediris.es/sir/cicaidp' => array(
+ 'geo' => array('lat' => 37.359058, 'lon' => -5.988909)
+),
+
+'https://www.rediris.es/sir/ciematidp' => array(
+ 'geo' => array('lat' => 40.4553, 'lon' => -3.7246)
+),
+
+'https://www.rediris.es/sir/i2catidp' => array(
+ 'geo' => array('lat' => 41.386984, 'lon' => 2.111435)
+),
+
+'https://www.rediris.es/sir/ivieidp' => array(
+ 'geo' => array('lat' => 39.490507, 'lon' => -0.355907)
+),
+
+'https://www.rediris.es/sir/uamidp' => array(
+ 'geo' => array('lat' => 40.547220, 'lon' => -3.692075)
+),
+
+'https://www.rediris.es/sir/uc3midp' => array(
+ 'geo' => array('lat' => 40.332488, 'lon' => -3.765700)
+),
+
+'https://www.rediris.es/sir/umaidp' => array(
+ 'geo' => array('lat' => 36.719645, 'lon' => -4.420018)
+),
+
+'https://www.rediris.es/sir/esaidp' => array (
+ 'geo' => array('lat' => 40.445259, 'lon' => -3.953927)
+),
+
+'https://www.rediris.es/sir/ubidp' => array(
+ 'geo' => array('lat' => 41.386843, 'lon' => 2.163652)
+),
+
+'https://www.rediris.es/sir/ucaidp' => array(
+ 'geo' => array('lat' => 36.53388, 'lon' => -6.298031 )
+),
+
+'https://www.rediris.es/sir/unileonidp' => array(
+ 'geo' => array('lat' => 42.612, 'lon' => -5.559)
+)
+
+
+
+
+
+
+ ),
+
+
+
+
+);
\ No newline at end of file
diff --git a/modules/discojuice/config-templates/disojuicefeed.php b/modules/discojuice/config-templates/disojuicefeed.php
deleted file mode 100644
index 1354f839f0e660a716b2fb0b8629afdcb996c00f..0000000000000000000000000000000000000000
--- a/modules/discojuice/config-templates/disojuicefeed.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-/**
- * This is the configuration file for the Auth MemCookie example.
- */
-
-$config = array(
-
- 'insert' => array(
- 'https://twitter.com' => array(
- 'icon' => 'twitter.png',
- // 'descr' => 'Login with your Twitter account',
- 'title' => 'Twitter',
- 'weight' => -1,
- 'auth' => 'twitter',
- 'country' => 'XX',
- 'distance' => null,
- // 'keywords' => array(
- // 'Organizations' => array('Twitter'),
- // ),
- ),
- ),
-
-
- 'exclude' => array(
- 'https://testidp.wayf.dk',
- 'https://betawayf.wayf.dk',
- ),
-
- 'overrides' => array(
- 'https://twitter.com' => array(
- 'icon' => 'twitter.png',
- 'weight' => -1,
- 'auth' => 'twitter',
- 'country' => '_all_',
- ),
- 'https://idp.feide.no' => array(
- 'icon' => 'feide2.png',
- 'descr' => 'Brukere i norske utdanningsinstitusjoner [beta]',
- 'weight' => -10,
- 'keywords' => array(
- 'Organizations' => array('UNINETT', 'Feide', 'UiO', 'NTNU', 'UiB', 'UiT'),
- 'Places' => array('Norway', 'Norge', 'Trondheim', 'Oslo', 'Bergen', 'Tromsø', 'Stavanger'),
- ),
- ),
- 'https://idp-test.feide.no' => array(
- 'icon' => 'feide2.png',
- 'weight' => 10,
- 'country' => 'XX',
- ),
- 'https://betawayf.wayf.dk' => array(
- 'icon' => 'wayf2.png',
- 'weight' => 10,
- 'country' => 'XX',
- ),
-
- 'https://www.rediris.es/sir/redirisidp' => array(
- 'icon' => 'rediris.png',
- 'weight' => -1,
- ),
- 'https://idp.nordu.net/idp/shibboleth' => array(
- 'icon' => 'nordunet.png',
- 'weight' => -3,
- ),
- 'https://openidp.feide.no' => array(
- 'icon' => 'openidp.png',
- 'title' => 'Feide OpenIdP',
- 'descr' => 'If you do not have an institutional account, register here.',
- 'country' => '_all_',
- 'weight' => -5,
- 'keywords' => array(
- 'Keyword' => array('Guest', 'OpenIdP', 'Orphanage', 'Homeless', 'Create Account', 'Register'),
- ),
- ),
- 'https://idp.protectnetwork.org/protectnetwork-idp' => array(
- 'icon' => 'protectnetwork.png',
- 'title' => 'Protect Network',
- 'descr' => 'If you do not have an institutional account, register here.',
- 'country' => '_all_',
- 'weight' => -6,
- 'geo' => null,
- 'keywords' => array(
- 'Keyword' => array('Guest', 'OpenIdP', 'Orphanage', 'Homeless', 'Create Account', 'Register'),
- ),
- ),
-
- 'https://login.terena.org/idp/saml2/idp/metadata.php' => array(
- 'icon' => 'terena2.png',
- 'descr' => 'Terena offices Netherlands',
- 'country' => 'NL',
- 'weight' => -3,
- ),
- 'https://idp.csc.fi/idp/shibboleth' => array(
- 'icon' => 'csc.png',
- 'weight' => -2,
- ),
- 'https://wayf.wayf.dk' => array(
- 'weight' => -3,
- 'icon' => 'wayf2.png',
- ),
-
- 'https://www.rediris.es/sir/umaidp' => array(
- 'weight' => -2,
- 'icon' => 'uma.png',
- ),
- 'https://idp.uma.es/simplesaml/saml2/idp/metadata.php' => array(
- 'weight' => -2,
- 'icon' => 'uma.png',
- ),
- 'https://idpguest.fccn.pt/idp/shibboleth' => array(
- 'weight' => -2,
- 'icon' => 'fccn.png',
- ),
- 'https://whoami.cesnet.cz/idp/shibboleth' => array(
- 'weight' => -2,
- 'icon' => 'cesnet.png',
- 'country' => 'CZ',
- ),
- 'https://login.ntua.gr/idp/shibboleth' => array(
- 'weight' => -2,
- 'icon' => 'ntua.png',
- 'country' => 'GR',
- ),
- 'https://idp.umu.se/saml2/idp/metadata.php' => array(
- 'title' => 'UmeĂĄ Universitet',
- 'weight' => -3,
- 'icon' => 'umeaa.png',
- # 'country' => 'sweden',
- ),
- 'SURFnet%20BV' => array(
- 'icon' => 'surfnet.png',
- 'weight' => -2
- ),
-
- 'gidp.geant.net' => array(
- 'country' => '_all_',
- 'icon' => 'geant.png',
- ),
- 'urn:mace:cru.fr:federation:sac' => array(
- 'icon' => 'cru.png',
- ),
- 'https://stc-test16.cis.brown.edu/idp/shibboleth' => array(
- 'icon' => 'brown.png',
- 'title' => 'Brown University',
- ),
-
- 'https://www.rediris.es/sir/uvigoidp' => array(
- 'geo' => array('lat' => 42.169185 , 'lon' => -8.683609)
- ),
-
- 'https://www.rediris.es/sir/uahidp' => array(
- 'geo' => array('lat' => 40.510597 , 'lon' => -3.343858)
- ),
-
- 'https://www.rediris.es/sir/bcblidp' => array(
- 'geo' => array('lat' => 43.294269, 'lon' => -1.9861)
- ),
-
- 'https://www.rediris.es/sir/ullidp' => array(
- 'geo' => array('lat' => 28.4816, 'lon' => -16.3168)
- ),
-
- 'https://www.rediris.es/sir/ubuidp' => array(
- 'geo' => array('lat' => 42.340197, 'lon' => -3.7277)
- ),
-
- 'https://www.rediris.es/sir/upctidp' => array(
- 'geo' => array('lat' => 37.6018, 'lon' => -0.9794)
- ),
-
- 'https://www.rediris.es/sir/umidp' => array(
- 'geo' => array('lat' => 38.022, 'lon' => -1.174)
- ),
-
- 'https://www.rediris.es/sir/uclmidp' => array(
- 'geo' => array('lat' => 38.986096 , 'lon' => -3.927262)
- ),
-
- 'https://www.rediris.es/sir/upmidp' => array(
- 'geo' => array('lat' => 40.449, 'lon' => 3.7191)
- ),
-
- 'https://www.rediris.es/sir/boeidp' => array(
- 'geo' => array('lat' => 40.4867, 'lon' => -3.6604)
- ),
-
- 'https://www.rediris.es/sir/usidp' => array(
- 'geo' => array('lat' => 37.382, 'lon' => -5.99158)
- ),
-
- 'https://www.rediris.es/sir/usalidp'=> array(
- 'geo' => array('lat' => 40.790887, 'lon' => -5.539856)
- ),
-
- 'https://www.rediris.es/sir/deustoidp' => array(
- 'geo' => array('lat' => 43.270891, 'lon' => -2.938769)
- ),
-
- 'https://www.rediris.es/sir/uaidp' => array(
- 'geo' => array('lat' => 38.385975, 'lon' => -0.514267)
- ),
-
- 'https://www.rediris.es/sir/ucoidp' => array(
- 'geo' => array('lat' => 37.9157009, 'lon' => -4.721796)
- ),
-
- 'https://www.rediris.es/sir/dipcidp' => array(
- 'geo' => array('lat' => 43.1819, 'lon' => -2.0039)
- ),
-
- 'https://www.rediris.es/sir/uaxidp' => array(
- 'geo' => array('lat' => 40.452, 'lon' => -3.984)
- ),
-
- 'https://www.rediris.es/sir/iacidp' => array(
- 'geo' => array('lat' => 28.47468, 'lon' => -16.308303)
- ),
-
- 'https://www.rediris.es/sir/redirisidp' => array(
- 'geo' => array('lat' => 40.447636, 'lon' => -3.694236)
- ),
-
-
- ),
-
-
-
-
-);
\ No newline at end of file
diff --git a/modules/discojuice/lib/CentralHelper.php b/modules/discojuice/lib/CentralHelper.php
index 770622c150488357fb5858103b992da66d9d2048..ccb4e9d149a1836f305cccece692114a041725cc 100644
--- a/modules/discojuice/lib/CentralHelper.php
+++ b/modules/discojuice/lib/CentralHelper.php
@@ -8,7 +8,7 @@ class sspmod_discojuice_CentralHelper {
public static function show($path = '/simplesaml/module.php/discojuice/discojuice/') {
- $djconfig = SimpleSAML_Configuration::getOptionalConfig('disojuicecentral.php');
+ $djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuicecentral.php');
$config = SimpleSAML_Configuration::getInstance();
diff --git a/modules/discojuice/lib/EmbedHelper.php b/modules/discojuice/lib/EmbedHelper.php
index f1fd871eff965e52628ae3f6c2245fdb7d6d9ff3..490befd4c81184a421689c7e54d47362bfa74453 100644
--- a/modules/discojuice/lib/EmbedHelper.php
+++ b/modules/discojuice/lib/EmbedHelper.php
@@ -10,7 +10,7 @@ class sspmod_discojuice_EmbedHelper {
$version = '0.1';
$config = SimpleSAML_Configuration::getInstance();
- $djconfig = SimpleSAML_Configuration::getOptionalConfig('disojuiceembed.php');
+ $djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuiceembed.php');
if ($includeJQuery) {
diff --git a/modules/discojuice/lib/Feed.php b/modules/discojuice/lib/Feed.php
index 04d270fc8f82f675c3b3434c8d02256e6f918bfe..3038dd7fb8ae48622e2fe36e21860312322272bc 100644
--- a/modules/discojuice/lib/Feed.php
+++ b/modules/discojuice/lib/Feed.php
@@ -17,7 +17,7 @@ class sspmod_discojuice_Feed {
function __construct() {
$this->config = SimpleSAML_Configuration::getInstance();
- $this->djconfig = SimpleSAML_Configuration::getOptionalConfig('disojuicefeed.php');
+ $this->djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuicefeed.php');
$metadatah = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
$this->metadata = $metadatah->getList('saml20-idp-remote');
@@ -74,7 +74,7 @@ class sspmod_discojuice_Feed {
if (!is_writable($datadir))
throw new Exception('Data directory [' . $datadir. '] is not writable');
- $djdatadir = $datadir . 'disojuice/';
+ $djdatadir = $datadir . 'discojuice/';
if (!is_dir($djdatadir)) {
mkdir($djdatadir);
}
@@ -89,7 +89,7 @@ class sspmod_discojuice_Feed {
public function read() {
- $djdatafile = $this->config->getPathValue('datadir', 'data/') . 'disojuice/' . 'discojuice.cache';
+ $djdatafile = $this->config->getPathValue('datadir', 'data/') . 'discojuice/' . 'discojuice.cache';
if (!file_exists($djdatafile)) {
error_log('Did not find cached version, generating content again...');
diff --git a/modules/discojuice/www/central.php b/modules/discojuice/www/central.php
index 3c39d97b94a6dfc07e768986fa04bf8f9bb70b80..eb964585e716e744cb09e36afbff73de05d502cd 100644
--- a/modules/discojuice/www/central.php
+++ b/modules/discojuice/www/central.php
@@ -1,7 +1,7 @@
<?php
-$djconfig = SimpleSAML_Configuration::getOptionalConfig('disojuicecentral.php');
+$djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuicecentral.php');
$config = SimpleSAML_Configuration::getInstance();
diff --git a/modules/discojuice/www/country.php b/modules/discojuice/www/country.php
index 50c73438552c418f23619787d09f9cf9395d0dd9..1e09dc61ab386c93e01135af47e672dce5d98ebd 100644
--- a/modules/discojuice/www/country.php
+++ b/modules/discojuice/www/country.php
@@ -5,7 +5,7 @@ header('Content-type: application/json; utf-8');
try {
- $djconfig = SimpleSAML_Configuration::getOptionalConfig('disojuicecentral.php');
+ $djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuicecentral.php');
$options = $djconfig->getConfigItem('discojuice.options');
$enableCountryAPI = $options->getValue('country', FALSE);