diff --git a/development/idp-local/config/config.php b/development/idp-local/config/config.php index 5494f11a..685f66f1 100644 --- a/development/idp-local/config/config.php +++ b/development/idp-local/config/config.php @@ -56,8 +56,6 @@ // Options: https://github.com/silinternational/simplesamlphp-module-material/blob/develop/README.md#branding $THEME_COLOR_SCHEME = Env::get('THEME_COLOR_SCHEME', null); -$IDPDISCO_LAYOUT = Env::get('IDPDISCO_LAYOUT', 'links'); // Options: [links,dropdown] - $SECURE_COOKIE = Env::get('SECURE_COOKIE', true); $SESSION_DURATION = (int)(Env::get('SESSION_DURATION', (60 * 60 * 10))); // 10 hours. $SESSION_STORE_TYPE = Env::get('SESSION_STORE_TYPE', 'phpsession'); @@ -1072,7 +1070,7 @@ * * Options: [links,dropdown] */ - 'idpdisco.layout' => $IDPDISCO_LAYOUT, + 'idpdisco.layout' => 'links', /************************************* diff --git a/development/idp2-local/config/config.php b/development/idp2-local/config/config.php index 51596669..ac0501e0 100644 --- a/development/idp2-local/config/config.php +++ b/development/idp2-local/config/config.php @@ -56,7 +56,6 @@ $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days $SECURE_COOKIE = Env::get('SECURE_COOKIE', true); $THEME_USE = Env::get('THEME_USE', 'default'); -$IDPDISCO_LAYOUT = Env::get('IDPDISCO_LAYOUT', 'dropdown'); // Options: [links,dropdown] $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true); $GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false); @@ -547,7 +546,7 @@ * Options: [links,dropdown] * */ - 'idpdisco.layout' => $IDPDISCO_LAYOUT, + 'idpdisco.layout' => 'links', /* * Whether simpleSAMLphp should sign the response or the assertion in SAML 1.1 authentication diff --git a/development/sp-local/config/config.php b/development/sp-local/config/config.php index c5815a99..4bd8af87 100644 --- a/development/sp-local/config/config.php +++ b/development/sp-local/config/config.php @@ -38,7 +38,6 @@ $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days $SECURE_COOKIE = Env::get('SECURE_COOKIE', true); $THEME_USE = Env::get('THEME_USE', 'default'); -$IDPDISCO_LAYOUT = Env::get('IDPDISCO_LAYOUT', 'dropdown'); // Options: [links,dropdown] $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true); $GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false); @@ -517,7 +516,7 @@ * Options: [links,dropdown] * */ - 'idpdisco.layout' => $IDPDISCO_LAYOUT, + 'idpdisco.layout' => 'links', /* * Whether simpleSAMLphp should sign the response or the assertion in SAML 1.1 authentication diff --git a/development/sp2-local/config/config.php b/development/sp2-local/config/config.php index d26855df..3c42682a 100644 --- a/development/sp2-local/config/config.php +++ b/development/sp2-local/config/config.php @@ -38,7 +38,6 @@ $SESSION_REMEMBERME_LIFETIME = (int)(Env::get('SESSION_REMEMBERME_LIFETIME', (14 * 86400))); // 14 days $SECURE_COOKIE = Env::get('SECURE_COOKIE', true); $THEME_USE = Env::get('THEME_USE', 'default'); -$IDPDISCO_LAYOUT = Env::get('IDPDISCO_LAYOUT', 'dropdown'); // Options: [links,dropdown] $SAML20_IDP_ENABLE = Env::get('SAML20_IDP_ENABLE', true); $GOOGLE_ENABLE = Env::get('GOOGLE_ENABLE', false); @@ -517,7 +516,7 @@ * Options: [links,dropdown] * */ - 'idpdisco.layout' => $IDPDISCO_LAYOUT, + 'idpdisco.layout' => 'links', /* * Whether simpleSAMLphp should sign the response or the assertion in SAML 1.1 authentication diff --git a/dockerbuild/ssp-overrides/config.php b/dockerbuild/ssp-overrides/config.php index 2702bc17..7f0280c6 100644 --- a/dockerbuild/ssp-overrides/config.php +++ b/dockerbuild/ssp-overrides/config.php @@ -56,8 +56,6 @@ // Options: https://github.com/silinternational/simplesamlphp-module-material/blob/develop/README.md#branding $THEME_COLOR_SCHEME = Env::get('THEME_COLOR_SCHEME', null); -$IDPDISCO_LAYOUT = Env::get('IDPDISCO_LAYOUT', 'links'); // Options: [links,dropdown] - $SECURE_COOKIE = Env::get('SECURE_COOKIE', true); $SESSION_DURATION = (int)(Env::get('SESSION_DURATION', (60 * 60 * 10))); // 10 hours. $SESSION_STORE_TYPE = Env::get('SESSION_STORE_TYPE', 'phpsession'); @@ -1072,7 +1070,7 @@ * * Options: [links,dropdown] */ - 'idpdisco.layout' => $IDPDISCO_LAYOUT, + 'idpdisco.layout' => 'links', /************************************* diff --git a/local.env.dist b/local.env.dist index eba75656..c847edfd 100644 --- a/local.env.dist +++ b/local.env.dist @@ -14,7 +14,6 @@ COMPOSER_AUTH={"github-oauth":{"github.com":"token-here"}} COMPOSER_CACHE_DIR=/composer GOOGLE_ENABLE= HUB_MODE=false -IDPDISCO_LAYOUT= ENABLE_DEBUG=