corecting certificate information for redirected profiles and profile…

…s without any certificates
GEANT · Jun 21, 2024 · 18aa87b · 18aa87b
1 parent fbb5f66
commit 18aa87b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/core/AbstractProfile.php b/core/AbstractProfile.php
@@ -150,6 +150,7 @@ abstract class AbstractProfile extends EntityWithDBProperties
     const READINESS_LEVEL_SHOWTIME = 2;
 
 
+    const CERT_STATUS_NONE = -1;
     const CERT_STATUS_OK = 0;
     const CERT_STATUS_WARN = 1;
     const CERT_STATUS_ERROR = 2;
@@ -941,7 +942,7 @@ public function certificateStatus()
         $result = $this->databaseHandle->exec($query, "i", $this->identifier);
         $rows = $result->fetch_all();
         $x509 = new \core\common\X509();
-        $profileStatus = self::CERT_STATUS_OK;
+        $profileStatus = self::CERT_STATUS_NONE;
         foreach ($rows as $row) {
             $encodedCert = $row[0];
             $tm = $x509->processCertificate(base64_decode($encodedCert))['full_details']['validTo_time_t']- time();

diff --git a/web/admin/overview_org.php b/web/admin/overview_org.php
@@ -148,22 +148,23 @@ function displayRadiusPropertyWidget(&$theProfile, $readonly, &$uiElements, $edi
             $iconData = $uiElements->iconData('PROFILES_REDIRECTED');
             $iconData['text'] = _("Profile redirected");
             $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
-        } else {
-            $certStatus = $theProfile->certificateStatus();
-            switch ($certStatus) {
-                case core\AbstractProfile::CERT_STATUS_OK:
-                    $iconData = $uiElements->iconData('CERT_STATUS_OK');
-                    $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
-                    break;
-                case core\AbstractProfile::CERT_STATUS_WARN:
-                    $iconData = $uiElements->iconData('CERT_STATUS_WARN');
-                    $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));                
-                    break;
-                case core\AbstractProfile::CERT_STATUS_ERROR:
-                    $iconData = $uiElements->iconData('CERT_STATUS_ERROR');
-                    $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
-                    break;            
-            }
+
+        } 
+
+        $certStatus = $theProfile->certificateStatus();
+        switch ($certStatus) {
+            case core\AbstractProfile::CERT_STATUS_OK:
+                $iconData = $uiElements->iconData('CERT_STATUS_OK');
+                $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
+                break;
+            case core\AbstractProfile::CERT_STATUS_WARN:
+                $iconData = $uiElements->iconData('CERT_STATUS_WARN');
+                $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));                
+                break;
+            case core\AbstractProfile::CERT_STATUS_ERROR:
+                $iconData = $uiElements->iconData('CERT_STATUS_ERROR');
+                $buffer_headline .= "<br/>" . $uiElements->catIcon(($iconData));
+                break;            
         }
         $buffer_headline .= "</div>";