From 48dec8cdbd860a84f73388eb42e2a282a677d997 Mon Sep 17 00:00:00 2001
From: Joshua Roys <joshua.roys@gtri.gatech.edu>
Date: Mon, 9 May 2011 13:52:55 -0400
Subject: [PATCH 1/2] Display user-supplied extension details on the request review page

Signed-off-by: Joshua Roys <joshua.roys@gtri.gatech.edu>
---
 .../cms/profile/def/UserExtensionDefault.java      |    2 +-
 .../webapps/ca/agent/ca/ProfileReview.template     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
index a559491..1da9c32 100644
--- a/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
+++ b/base/common/src/com/netscape/cms/profile/def/UserExtensionDefault.java
@@ -92,17 +92,17 @@ public class UserExtensionDefault extends EnrollExtDefault {
         }
         if (name.equals(VAL_OID)) {
             Extension ext = getExtension(getConfig(CONFIG_OID), info);
 
             if (ext == null) {
                 // do something here
                 return "";
             }
-            return ext.getExtensionId().toString();
+            return ext.toString();
         } else {
             throw new EPropertyException(CMS.getUserMessage( 
                         locale, "CMS_INVALID_PROPERTY", name));
         }
     }
 
     public String getText(Locale locale) {
         return CMS.getUserMessage(locale, "CMS_PROFILE_DEF_USER_EXT", getConfig(CONFIG_OID));
diff --git a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
index 4e27f52..b89e995 100644
--- a/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
+++ b/dogtag/ca-ui/shared/webapps/ca/agent/ca/ProfileReview.template
@@ -324,17 +324,17 @@ document.writeln('</FONT>');
       document.writeln('<td width=30%><i>');
       document.writeln('<FONT size="-1" face="PrimaSans BT, Verdana, sans-serif">');
       document.writeln(recordSet[i].defListSet[j].defName + ':');
       document.writeln('</FONT>');
       document.writeln('</i></td>');
       document.writeln('<td width=70%>');
       if (recordSet[i].defListSet[j].defConstraint == 'readonly') {
           document.writeln('<FONT size="-1" face="PrimaSans BT, Verdana, sans-serif">');
-          document.writeln(recordSet[i].defListSet[j].defVal);
+          document.writeln(addEscapes(recordSet[i].defListSet[j].defVal));
           document.writeln('</FONT>');
       } else {
         if (recordSet[i].defListSet[j].defSyntax == 'string') {
           document.writeln('<input size=32 type=text name="' + recordSet[i].defListSet[j].defId + '" value="' + escapeValue(recordSet[i].defListSet[j].defVal) + '">');
         } else if (recordSet[i].defListSet[j].defSyntax == 'string_list') {
           document.writeln('<textarea cols=40 rows=5 name="' + recordSet[i].defListSet[j].defId + '">' + recordSet[i].defListSet[j].defVal + '</textarea>');
         } else if (recordSet[i].defListSet[j].defSyntax == 'integer') {
           document.writeln('<input size=6 type=text name="' + recordSet[i].defListSet[j].defId + '" value="' + recordSet[i].defListSet[j].defVal + '">');
-- 
1.7.3.4