Fix bugs as suggested by scrutinizer-ci.com .

cilogon · Nov 25, 2019 · b2c8b64 · b2c8b64
1 parent 4f0147e
commit b2c8b64
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/Service/Content.php b/src/Service/Content.php
@@ -38,7 +38,6 @@ public static function printHeader($title = '', $extra = '', $csrfcookie = true)
         $skin = Util::getSkin();
         $skinpoweredbyimg = (string)$skin->getConfigOption('poweredbyimg');
         if (
-            (!is_null($skinpoweredbyimg)) &&
             (strlen($skinpoweredbyimg) > 0) &&
             (is_readable('/var/www/html' . $skinpoweredbyimg))
         ) {
@@ -244,7 +243,7 @@ public static function printWAYF($showremember = true, $samlidps = false)
         // If no previous providerId, get from skin, or default to Google.
         if (strlen($providerId) == 0) {
             $initialidp = (string)$skin->getConfigOption('initialidp');
-            if ((!is_null($initialidp)) && (isset($idps[$initialidp]))) {
+            if ((strlen($initialidp) > 0) && (isset($idps[$initialidp]))) {
                 $providerId = $initialidp;
             } else {
                 $providerId = Util::getAuthzUrl('Google');
@@ -2123,7 +2122,7 @@ public static function reformatDN($dn)
     {
         $newdn = $dn;
         $dnformat = (string)Util::getSkin()->getConfigOption('dnformat');
-        if (!is_null($dnformat)) {
+        if (strlen($dnformat) > 0) {
             if (
                 ($dnformat == 'rfc2253') &&
                 (preg_match(