Code review updates

ubccr · Oct 15, 2018 · 81fb137 · 81fb137
1 parent 1cf90b6
commit 81fb137
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/configuration/portal_settings.ini b/configuration/portal_settings.ini
@@ -50,7 +50,9 @@ multiple_service_providers = "off"
 
 [sso]
 force_default_organization = "on"
-colapse_local_login = "true"
+; used to collapse the local sign in portion of the sign in modal
+; setting to false will show it.
+collapse_local_login = "true"
 
 [internal]
 dw_desc_cache = "off"

diff --git a/html/gui/js/CCR.js b/html/gui/js/CCR.js
@@ -1113,7 +1113,7 @@ CCR.xdmod.ui.actionLogin = function (config, animateTarget) {
 
     if (CCR.xdmod.isSSOConfigured) {
         loginItems.push(SSOLoginFrm);
-        if (CCR.xdmod.SSOcolapseLocalLogin) {
+        if (CCR.xdmod.SSOcollapseLocalLogin) {
             localLoginFrm.collapsible = true;
             localLoginFrm.collapsed = true;
             localLoginFrm.titleCollapse = true;

diff --git a/html/index.php b/html/index.php
@@ -312,18 +312,18 @@ function isReferrer($referrer)
                 // This will catch when a configuration directory does not exist if it is set in the environment level
             }
             if ($auth && $auth->isSamlConfigured()) {
-                $ssoColapse = 'true';
+                $ssoCollapse = 'true';
                 try {
-                    $ssoColapseSetting = filter_var(xd_utilities\getConfiguration('sso', 'colapse_local_login'), FILTER_VALIDATE_BOOLEAN, array('flags' => FILTER_NULL_ON_FAILURE));
-                    if($ssoColapseSetting === false){
-                        $ssoColapse = 'false';
+                    $ssoCollapseSetting = filter_var(xd_utilities\getConfiguration('sso', 'collapse_local_login'), FILTER_VALIDATE_BOOLEAN, array('flags' => FILTER_NULL_ON_FAILURE));
+                    if($ssoCollapseSetting === false){
+                        $ssoCollapse = 'false';
                     }
                 } catch (exception $ex) {
                 }
 
                 print "CCR.xdmod.isSSOConfigured = true;\n";
                 print "CCR.xdmod.SSOLoginLink = " . json_encode($auth->getLoginLink()) . ";\n";
-                print "CCR.xdmod.SSOcolapseLocalLogin = " . $ssoColapse . "\n";
+                print "CCR.xdmod.SSOcollapseLocalLogin = " . $ssoCollapse . "\n";
             } else {
                 print "CCR.xdmod.isSSOConfigured = false;\n";
             }

diff --git a/templates/portal_settings.template b/templates/portal_settings.template
@@ -50,7 +50,9 @@ multiple_service_providers = "off"
 
 [sso]
 force_default_organization = "on"
-colapse_local_login = "true"
+; used to collapse the local sign in portion of the sign in modal
+; setting to false will show it.
+collapse_local_login = "true"
 
 [internal]
 dw_desc_cache = "off"