From 5479df470b7e2c66693871cc53ce3ae356fcbd65 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 3 Dec 2010 09:15:35 -0500
Subject: Fix this code a bit, my first attempt yesterday didn't work properly
 (this should).

---
 etc/inc/certs.inc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/etc/inc/certs.inc b/etc/inc/certs.inc
index 5e01a50..e82baba 100644
--- a/etc/inc/certs.inc
+++ b/etc/inc/certs.inc
@@ -309,10 +309,14 @@ function cert_get_subject($str_crt, $decode = true) {
 
 	foreach ($components as $a => $v) {
 		if (is_array($v))
-			foreach ($v as $w)
-				$subject = "{$a}={$w}" . (strlen($subject)) ? ", {$subject}" : "" ;
-		else
-			$subject = "{$a}={$v}" . (strlen($subject)) ? ", {$subject}" : "" ;
+			foreach ($v as $w) {
+				$asubject = "{$a}={$w}";
+				$subject = (strlen($subject)) ? "{$asubject}, {$subject}" : $asubject;
+			}
+		else {
+			$asubject = "{$a}={$v}";
+			$subject = (strlen($subject)) ? "{$asubject}, {$subject}" : $asubject;
+		}
 	}
 
 	return $subject;
-- 
cgit v1.1