From f6a4ae8d9d4e747bb89eccf4dbf773ef9867a0b3 Mon Sep 17 00:00:00 2001
From: Greg Neagle <gregneagle@mac.com>
Date: Wed, 26 Mar 2014 19:16:45 -0700
Subject: [PATCH] Fix more quoting issues!

---
 .../Managed Software Center/MunkiItems.py                   | 6 +++---
 .../Managed Software Center/msuhtml.py                      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/Managed Software Center/Managed Software Center/MunkiItems.py b/code/Managed Software Center/Managed Software Center/MunkiItems.py
index 99bb0e1a..e0304f53 100644
--- a/code/Managed Software Center/Managed Software Center/MunkiItems.py	
+++ b/code/Managed Software Center/Managed Software Center/MunkiItems.py	
@@ -25,7 +25,7 @@ import msulib
 import munki
 
 from operator import itemgetter
-from urllib import quote_plus, unquote_plus
+from urllib import quote, unquote
 
 from Foundation import NSLocalizedString
 from Foundation import NSDate
@@ -597,7 +597,7 @@ class OptionalItem(GenericItem):
             self['size'] = munki.humanReadable(self['installed_size'])
         else:
             self['size'] = u''
-        self['detail_link'] = u'detail-%s.html' % quote_plus(self['name'])
+        self['detail_link'] = u'detail-%s.html' % quote(self['name'])
         self['hide_cancel_button'] = u''
             
     def _get_status(self):
@@ -701,7 +701,7 @@ class UpdateItem(GenericItem):
         super(UpdateItem, self).__init__(*arg, **kw)
         identifier = self.get('name', '') + '--version-' + self.get('version_to_install', '')
         self['detail_link'] = ('updatedetail-%s.html'
-                                   % quote_plus(identifier))
+                                   % quote(identifier))
         if not self['status'] == 'will-be-removed':
             force_install_after_date = self.get('force_install_after_date')
             if force_install_after_date:
diff --git a/code/Managed Software Center/Managed Software Center/msuhtml.py b/code/Managed Software Center/Managed Software Center/msuhtml.py
index 49d5e461..3c8ea811 100644
--- a/code/Managed Software Center/Managed Software Center/msuhtml.py	
+++ b/code/Managed Software Center/Managed Software Center/msuhtml.py	
@@ -55,7 +55,7 @@ def write_page(page_name, html):
 def build_detail_page(item_name):
     '''Build page showing detail for a single optional item'''
     items = MunkiItems.getOptionalInstallItems()
-    page_name = u'detail-%s.html' % quote(item_name)
+    page_name = u'detail-%s.html' % item_name
     for item in items:
         if item['name'] == item_name:
             page = MunkiItems.OptionalItem(item)
@@ -479,7 +479,7 @@ def get_warning_text():
 def build_updatedetail_page(identifier):
     '''Build detail page for a non-optional update'''
     items = MunkiItems.getUpdateList()
-    page_name = u'updatedetail-%s.html' % quote(identifier)
+    page_name = u'updatedetail-%s.html' % identifier
     name, sep, version = identifier.partition('--version-')
     for item in items:
         if item['name'] == name and item['version_to_install'] == version: