escape richtext content

- added lipsum descriptions
yast · Mar 12, 2014 · c3affba · c3affba
1 parent c3c8bc9
commit c3affba
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/clients/inst_scc.rb b/src/clients/inst_scc.rb
@@ -25,6 +25,8 @@
 # use external rubygem for SCC communication
 require "scc_api"
 
+require "cgi"
+
 require "registration/addon"
 require "registration/exceptions"
 require "registration/helpers"
@@ -295,15 +297,14 @@ def addon_selection_dialog_content(addons)
     end
 
     def show_addon_details(addon)
-      details = "<p><big><b>#{addon.label}</b></big></p><p>#{addon.description}</p>"
+      details = "<p><big><b>#{CGI.escape_html(addon.label)}</b></big></p><p>#{CGI.escape_html(addon.description)}</p>"
 
-      # label, %s is "yes" or "no" (translated)
-      details << (_("<p><b>Registration Key Required:</b> %s</p>") % (addon.regkey_needed ? _("yes") : _("no")))
-
       if !addon.depends_on.empty?
-        details << _("<p><b>Required Add-ons:</b> %s</p>") % addon.depends_on.map(&:label).join(", ")
+        details << _("<p><b>Required Add-ons:</b> %s</p>") % CGI.escape_html(addon.depends_on.map(&:label).join(", "))
       end
 
+      details << _("<p><b>A Registration Key is Required</b></p>") if addon.regkey_needed
+
       UI.ChangeWidget(Id(:details), :Value, details)
     end
 
@@ -369,10 +370,11 @@ def addon_regkeys_dialog_content(addons)
 
     def get_available_addons
       # TODO FIXME: query SCC for available add-ons
+      hae = ::Registration::Addon.new("SUSE_HAE", "12", "x86_64", label: "SLES12 High Availability Extension", description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pulvinar sollicitudin mollis. Morbi sit amet purus at purus eleifend elementum in sed tortor. Cras volutpat et augue ac vulputate. Sed pretium eget turpis id sodales. Maecenas ultricies volutpat egestas. Proin ut adipiscing risus", regkey_needed: false)
       [
-        ::Registration::Addon.new("SUSE_SDK", "12", "x86_64", label: "SLE12 SDK"),
-        ::Registration::Addon.new("SUSE_HAE", "12", "x86_64", label: "SLES12 High Availability Extension"),
-        ::Registration::Addon.new("SUSE_HAE_GEO", "12", "x86_64", label: "SLES12 High Availability GEO Extension"),
+        ::Registration::Addon.new("SUSE_SDK", "12", "x86_64", label: "SLE12 SDK", description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec molestie felis vel arcu mollis, non dapibus mi dapibus. Duis felis augue, tincidunt quis lectus in, scelerisque aliquam velit. Nam iaculis viverra imperdiet. Cras ac dignissim mi. Duis dignissim quam metus, nec pharetra augue imperdiet et. Sed vel tellus nisl. Fusce a risus nec dui suscipit interdum ut id sapien. Suspendisse nibh velit, ullamcorper nec orci ac, semper bibendum arcu"),
+        hae,
+        ::Registration::Addon.new("SUSE_HAE_GEO", "12", "x86_64", label: "SLES12 High Availability GEO Extension", description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent id justo nibh. Cras congue pharetra mauris, vel tincidunt sem commodo a. Morbi in est feugiat, adipiscing purus sed, porttitor metus. Sed sem libero, mollis sed lobortis id, tempor quis tortor. Curabitur posuere ante sed pharetra mollis.", depends_on: [hae])
       ]
     end