From bcf872bbbcd3898240df508e40f8e6d4d2df4c1e Mon Sep 17 00:00:00 2001
From: Terry Fleury <tfleury@illinois.edu>
Date: Mon, 9 Dec 2019 15:55:04 -0600
Subject: [PATCH] Scrutinizer CI - Remove dead code and fix bugs.

---
 src/Service/Content.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Service/Content.php b/src/Service/Content.php
index 61bdf60..5e27fb2 100644
--- a/src/Service/Content.php
+++ b/src/Service/Content.php
@@ -427,9 +427,6 @@ public static function printGetCertificate()
             echo $disabledmsg;
             echo '</div>';
         } else { // PKCS12 downloading is okay
-            $downloadcerttext = 'Clicking this button will generate a link ' .
-                'to a new certificate, which you can download to your local ' .
-                'computer. The certificate is valid for up to 13 months.';
             $p12linktext = "Left-click this link to import the certificate " .
                 "into your broswer / operating system. (Firefox users see " .
                 "the FAQ.) Right-click this link and select 'Save As...' to " .
@@ -722,7 +719,6 @@ public static function printUserAttributes()
     {
         $idplist = Util::getIdpList();
         $idp = Util::getSessionVar('idp');
-        $gotattrs = Util::gotUserAttributes();
         $samlidp = ((!empty($idp)) && (!$idplist->isOAuth2($idp)));
 
         // Set various booleans for warning/error messages early so that we
@@ -987,15 +983,9 @@ public static function printIdPMetadata()
     {
         $idplist = Util::getIdpList();
         $idp = Util::getSessionVar('idp');
-        $gotattrs = Util::gotUserAttributes();
         $samlidp = ((!empty($idp)) && (!$idplist->isOAuth2($idp)));
         $shibarray = $idplist->getShibInfo($idp);
 
-        // Set various booleans for warning/error messages early so that we
-        // can display a "general" warning/error icon on the card title.
-        $warnings = array();
-        $errors = array();
-
         // CIL-416 Check for eduGAIN IdPs without both REFEDS R&S and SIRTFI
         // since these IdPs are not allowed to get certificates.
         $eduGainWithoutRandSandSIRTFI = 0;
@@ -1789,7 +1779,6 @@ public static function handleLogOnButtonClicked()
 
         // Set the cookie for keepidp if the checkbox was checked
         $pc = new PortalCookie();
-        $pn = $pc->getPortalName();
         Util::setPortalOrCookie(
             $pc,
             'keepidp',
@@ -2279,8 +2268,7 @@ public static function handleGotUser()
         ) {
             $log->error(
                 'Failed to getuser' .
-                ($isEduGAINAndGetCert ? : ' due to eduGAIN IdP restriction') .
-                '.'
+                ($isEduGAINAndGetCert ? ' due to eduGAIN IdP restriction.' : '.')
             );
 
             // Is this a SAML IdP?