Changeset 1730
- Timestamp:
- 08/05/08 12:32:07 (5 months ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (1 diff)
- cherokee/trunk/admin/Form.py (modified) (1 diff)
- cherokee/trunk/admin/PageIcon.py (modified) (1 diff)
- cherokee/trunk/admin/PageMime.py (modified) (2 diffs)
- cherokee/trunk/admin/Post.py (modified) (1 diff)
- cherokee/trunk/admin/Theme.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r1726 r1730 1 2008-08-05 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 3 * admin/Theme.py, admin/Post.py, admin/PageMime.py, admin/Form.py, 4 admin/PageIcon.py: Fixes a problem with some post entries. For 5 instance, the Mime encoding page could not remove entries 6 containing the '+' character. 7 1 8 2008-08-04 Alvaro Lopez Ortega <alvaro@alobbs.com> 2 9 cherokee/trunk/admin/Form.py
r1697 r1730 89 89 90 90 while '%(' in render: 91 render = render % keys 91 for replacement in re.findall (r'\%\((\w+)\)s', render): 92 macro = '%('+replacement+')s' 93 render = render.replace (macro, keys[replacement]) 94 92 95 return render 93 96 cherokee/trunk/admin/PageIcon.py
r1697 r1730 23 23 if uri.startswith('/update'): 24 24 return self._op_apply_changes (post) 25 25 26 elif uri.startswith('/add_file'): 26 27 return self._op_add_file (post) 28 27 29 elif uri.startswith('/add_suffix'): 28 30 return self._op_add_suffix (post) 29 raise 'Unknown method' 31 32 raise Exception ('Unknown method') 30 33 31 34 def _op_add_file (self, post): cherokee/trunk/admin/PageMime.py
r1728 r1730 1 1 import validations 2 from urllib import quote 2 3 3 4 from Page import * … … 63 64 e1 = self.InstanceEntry('%s!extensions'%(cfg_key), 'text', size=20) 64 65 e2 = self.InstanceEntry('%s!max-age'%(cfg_key), 'text', size=6, maxlength=6) 65 js = "post_del_key('/ajax/update', '%s');" % ( cfg_key)66 js = "post_del_key('/ajax/update', '%s');" % (quote(cfg_key)) 66 67 link_del = self.InstanceImage ("bin.png", "Delete", border="0", onClick=js) 67 68 table += (mime, e1, e2, link_del) cherokee/trunk/admin/Post.py
r1184 r1730 1 1 import cgi 2 from urllib import unquote 2 3 3 4 class Post: 4 5 def __init__ (self, raw=''): 5 self._vars = cgi.parse_qs (raw, keep_blank_values=1) 6 self._vars = {} 7 8 tmp = cgi.parse_qs (raw, keep_blank_values=1) 9 for key in tmp: 10 self._vars[key] = [] 11 for n in range(len(tmp[key])): 12 value = tmp[key][n] 13 self._vars[key] += [unquote (value)] 6 14 7 15 def _smart_chooser (self, key): cherokee/trunk/admin/Theme.py
r1045 r1730 1 import re 2 1 3 _global_file_cache = {} 2 4 … … 14 16 render = self._template 15 17 while '%(' in render: 16 render = render % keys 18 for replacement in re.findall (r'\%\((\w+)\)s', render): 19 macro = '%('+replacement+')s' 20 render = render.replace (macro, keys[replacement]) 21 17 22 return render 18 23