Re: Cumulative comments.py 1.3.0 patch that includes utf8 fix
Michael Olson <mwolson-mXXj517/[email protected]>
| Newsgroups | gmane.comp.web.pyblosxom.user |
|---|---|
| Message-ID | <[email protected]> |
"Benj. Mako Hill" <[email protected]> writes: > If that's the case, it would be useful if you could send the diff > against my patched version. Thanks! Unfortunately, I can't do that easily, because your diff does not apply cleanly against the 1.3.0 version of comments.py. I've attached a comments.py file that has been modified with my patch, in hopes that this will be of use. -- Michael Olson -- FSF Associate Member #652 -- http://www.mwolson.org/ Interests: Emacs Lisp, text markup, protocols -- Jabber: mwolson_at_hcoop.net /` |\ | | | Projects: Emacs, Muse, ERC, EMMS, Planner, ErBot, DVC |_] | \| |_| Reclaim your digital rights by eliminating DRM. See http://www.defectivebydesign.org/what_is_drm for details. ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ pyblosxom-users mailing list pyblosxom-users-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org https://lists.sourceforge.net/lists/listinfo/pyblosxom-users
signature.asc
(application/pgp-signature, 188 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFWPk9+1Ho2POo0xkRAkOTAJ9AeA07ZlQgROCs6wskCgYaLYSikQCfTMfE CnBtQAQwd/3HqBiTPMT1yDg= =nOY0 -----END PGP SIGNATURE-----
comments.py
(text/x-python, 27.8 KB)
""" This module contains an extension to Blosxom file entries to support comments. Contributors: Ted Leung Will Guaraldi Wari Wahab Robert Wall Bill Mill Roberto De Almeida David Geller David Pashley If you make any changes to this plugin, please a send a patch with your changes to [email protected] so that we can incorporate your changes. Thanks! Note: This plugin requires the PyXML module. This module supports the following config parameters (they are not required): comment_dir - the directory we're going to store all our comments in. this defaults to datadir + "comments". comment_ext - the file extension used to denote a comment file. this defaults to "cmt". comment_draft_ext - the file extension used for new comments that have not been manually approved by you. this defaults to comment_ext (i.e. there is no draft stage) comment_smtp_server - the smtp server to send comments notifications through. comment_smtp_from - the person comment notifications will be from. If you omit this, the from address will be the e-mail address as input in the comment form comment_smtp_to - the person to send comment notifications to. comment_nofollow - set this to 1 to add rel="nofollow" attributes to links in the description -- these attributes are embedded in the stored representation. Comments are stored 1 per file in a parallel hierarchy to the datadir hierarchy. The filename of the comment is the filename of the blog entry, plus the creation time of the comment as a float, plus the comment extension. Comments now follow the blog_encoding variable specified in config.py . If you don't include a blog_encoding variable, this will default to iso-8859-1. Comments will be shown for a given page if one of the following is true: 1. the page has only one blog entry on it and the request is for a specific blog entry as opposed to a category with only one entry in it 2. if "showcomments=yes" is in the querystring then comments will be shown IMPLEMENTING COMMENT PREVIEW ============================ If you would like comment previews, you need to do 2 things. 1) Add a preview button to comment-form.html like this: <input name="preview" type="submit" value="Preview" /> You may change the contents of the value attribute, but the name of the input must be "preview". 2) Still in your comment-form.html template, you need to use the comment values to fill in the values of your input fields like so: <input name="author" type="text" value="$cmt_author"> <input name="email" type="text" value="$cmt_email"> <input name="url" type="text" value="$cmt_link"> <textarea name="body">$cmt_description</textarea> If there is no preview available, these variables will be stripped from the text and cause no problem. 3) Copy comment.html to a template called comment-preview.html. All of the available variables from the comment template are available for this template. NOFOLLOW SUPPORT ================ This plugin implements Google's nofollow support for links in the body of the comment. If you display the link of the comment poster in your HTML template then you must add the rel="nofollow" attribute to your template as well NOTE TO DEVELOPERS WHO ARE WRITING PLUGINS THAT CREATE COMMENTS =============================================================== Each entry has to have the following properties in order to work with comments: 1. absolute_path - the category of the entry. ex. "dev/pyblosxom" 2. fn - the filename of the entry without the file extension and without the directory. ex. "staticrendering" 3. file_path - the absolute_path plus the fn. ex. "dev/pyblosxom/staticrendering" Also, if you don't want comments for an entry, add "nocomments" = 1 to the properties for the entry. WHERE TO FIND ADDITIONAL MATERIAL ================================= There is a README file that comes with the contributed plugins pack in contrib/plugins/comments/ which has more information on installing the comments plugin. Additionally, there is a chapter in the PyBlosxom manual that covers installing and configuring the comments plugin. The manual is on the PyBlosxom web-site: http://pyblosxom.sourceforge.net/ Copyright (c) 2003-2005 Ted Leung Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ __author__ = "Ted Leung" __version__ = "$Id: comments.py 893 2006-05-09 23:27:38Z willhelm $" __url__ = "http://pyblosxom.sourceforge.net/" __description__ = "Allows for comments on each blog entry." import cgi, glob, os.path, re, time, cPickle, os, codecs from xml.sax.saxutils import escape from Pyblosxom import tools from Pyblosxom.entries.base import EntryBase def cb_start(args): request = args["request"] config = request.getConfiguration() if not config.has_key('comment_dir'): config['comment_dir'] = os.path.join(config['datadir'],'comments') if not config.has_key('comment_ext'): config['comment_ext'] = 'cmt' if not config.has_key('comment_draft_ext'): config['comment_draft_ext'] = config['comment_ext'] if not config.has_key('comment_nofollow'): config['comment_nofollow'] = 0 def verify_installation(request): config = request.getConfiguration() retval = 1 if config.has_key('comment_dir') and not os.path.isdir(config['comment_dir']): print 'The "comment_dir" property in the config file must refer to a directory' retval = 0 smtp_keys_defined = [] smtp_keys=['comment_smtp_server', 'comment_smtp_from', 'comment_smtp_to'] for k in smtp_keys: if config.has_key(k): smtp_keys_defined.append(k) if smtp_keys_defined: for i in smtp_keys: if i not in smtp_keys_defined: print("Missing comment SMTP property: '%s'" % i) retval = 0 optional_keys = ['comment_dir', 'comment_ext', 'comment_draft_ext'] for i in optional_keys: if not config.has_key(i): print("missing optional property: '%s'" % i) return retval def createhtmlmail (html, headers): """Create a mime-message that will render HTML in popular MUAs, text in better ones Based on: http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/67083""" import MimeWriter import mimetools import cStringIO out = cStringIO.StringIO() # output buffer for our message htmlin = cStringIO.StringIO(html) text = re.sub('<.*?>', '', html) txtin = cStringIO.StringIO(text) writer = MimeWriter.MimeWriter(out) for header,value in headers: writer.addheader(header, value) writer.addheader("MIME-Version", "1.0") writer.startmultipartbody("alternative") writer.flushheaders() subpart = writer.nextpart() subpart.addheader("Content-Transfer-Encoding", "quoted-printable") pout = subpart.startbody("text/plain", [("charset", 'us-ascii')]) mimetools.encode(txtin, pout, 'quoted-printable') txtin.close() subpart = writer.nextpart() subpart.addheader("Content-Transfer-Encoding", "quoted-printable") pout = subpart.startbody("text/html", [("charset", 'us-ascii')]) mimetools.encode(htmlin, pout, 'quoted-printable') htmlin.close() writer.lastpart() msg = out.getvalue() out.close() return msg def readComments(entry, config): """ @param: a file entry @type: dict @returns: a list of comment dicts """ encoding = config['blog_encoding'] filelist = glob.glob(cmtExpr(entry, config)) if not entry.has_key('num_comments'): entry['num_comments'] = len(filelist) comments = [readComment(f, encoding) for f in filelist] comments = [(cmt['cmt_time'], cmt) for cmt in comments] comments.sort() return [c[1] for c in comments] def getCommentCount(entry, config): """ @param: a file entry @type: dict @returns: the number of comments for the entry """ if entry['absolute_path'] == None: return 0 filelist = glob.glob(cmtExpr(entry,config)) if filelist is not None: return len(filelist) return 0 def cmtExpr(entry, config): """ Return a string containing the regular expression for comment entries @param: a file entry @type: dict @returns: a string with the directory path for the comment @param: configuratioin dictionary @type: dict @returns: a string containing the regular expression for comment entries """ cmtDir = os.path.join(config['comment_dir'], entry['absolute_path']) cmtExpr = os.path.join(cmtDir,entry['fn']+'-*.'+config['comment_ext']) return cmtExpr def readComment(filename, encoding): """ Read a comment from filename @param filename: filename containing a comment @type filename: string @param encoding: encoding of comment files @type encoding: string @returns: a comment dict """ from xml.sax import make_parser, SAXException from xml.sax.handler import feature_namespaces, ContentHandler class cmtHandler(ContentHandler): def __init__(self, cmt): self._data = "" self.cmt = cmt def startElement(self, name, atts): self._data = "" def endElement(self, name): self.cmt['cmt_'+name] = self._data def characters(self, content): self._data += content cmt = {} try: parser = make_parser() parser.setFeature(feature_namespaces, 0) handler = cmtHandler(cmt) parser.setContentHandler(handler) parser.parse(filename) cmt['cmt_time'] = float(cmt['cmt_pubDate']) #time.time() cmt['cmt_pubDate'] = time.ctime(float(cmt['cmt_pubDate'])) #pretty time return cmt except: #don't error out on a bad comment logger = tools.getLogger() logger.error("bad comment file: %s" % filename) def writeComment(request, config, data, comment, encoding): """ Write a comment @param config: dict containing pyblosxom config info @type config: dict @param data: dict containing entry info @type data: dict @param comment: dict containing comment info @type comment: dict @return: The success or failure of creating the comment. @rtype: string """ entry_list = data.get("entry_list", []) if not entry_list: return "No such entry exists." entry = data['entry_list'][0] cdir = os.path.join(config['comment_dir'],entry['absolute_path']) cdir = os.path.normpath(cdir) if not os.path.isdir(cdir): os.makedirs(cdir) cfn = os.path.join(cdir,entry['fn']+"-"+comment['pubDate']+"."+config['comment_draft_ext']) argdict = { "request": request, "comment": comment } reject = tools.run_callback("comment_reject", argdict, donefunc=lambda x:x != 0) if (isinstance(reject, tuple) or isinstance(reject, list)) and len(reject) == 2: reject_code, reject_message = reject else: reject_code, reject_message = reject, "Comment rejected." if reject_code == 1: return reject_message def makeXMLField(name, field): return "<"+name+">" + cgi.escape(field.get(name, "")) + "</"+name+">\n"; filedata = '<?xml version="1.0" encoding="%s"?>\n' % encoding filedata += "<item>\n" filedata += makeXMLField('title', comment) filedata += makeXMLField('ipaddress', comment) filedata += makeXMLField('author', comment) filedata += makeXMLField('link', comment) filedata += makeXMLField('email', comment) filedata += makeXMLField('source', comment) filedata += makeXMLField('pubDate', comment) filedata += makeXMLField('description', comment) filedata += "</item>\n" try : cfile = codecs.open(cfn, "w", encoding) except IOError: logger = tools.getLogger() logger.error("couldn't open comment file '%s' for writing" % cfn) return "Internal error: Your comment could not be saved." cfile.write(filedata) cfile.close() #write latest pickle latest = None latestFilename = os.path.join(config['comment_dir'],'LATEST.cmt') try: latest = open(latestFilename,"w") except IOError: logger = tools.getLogger() logger.error("couldn't open latest comment pickle for writing") return "Couldn't open latest comment pickle for writing." else: modTime = float(comment['pubDate']) try: cPickle.dump(modTime, latest) latest.close() except IOError: if latest: latest.close() logger = tools.getLogger() logger.error("comment may not have been saved to pickle file.") return "Internal error: Your comment may not have been saved." if config.has_key('comment_smtp_server') and \ config.has_key('comment_smtp_to'): # FIXME - removed grabbing send_email's return error message # so there's no way to know if email is getting sent or not. send_email(config, entry, comment, cdir, cfn) # figure out if the comment was submitted as a draft if config["comment_ext"] != config["comment_draft_ext"]: return "Comment was submitted for approval. Thanks!" return "Comment submitted. Thanks!" def send_email(config, entry, comment, comment_dir, comment_filename): """Send an email to the blog owner on a new comment @param config: configuration as parsed by Pyblosxom @type config: dictionary @param entry: a file entry @type config: dictionary @param comment: comment as generated by readComment @type comment: dictionary @param comment_dir: the comment directory @type comment_dir: string @param comment_filename: file name of current comment @type comment_filename: string """ import smtplib # import the formatdate function which is in a different # place in Python 2.3 and up. try: from email.Utils import formatdate except ImportError: from rfc822 import formatdate from socket import gethostbyaddr author = escape_SMTP_commands(clean_author(comment['author'])) description = escape_SMTP_commands(comment['description']) ipaddress = escape_SMTP_commands(comment.get('ipaddress', '?')) if comment.has_key('email'): email = escape_SMTP_commands(clean_author(comment['email'])) else: email = config['comment_smtp_from'] try: server = smtplib.SMTP(config['comment_smtp_server']) curl = config['base_url']+'/'+entry['file_path'] comment_dir = os.path.join(config['comment_dir'], entry['absolute_path']) # create the message body message = [] message.append("Name: %s" % author) if comment.has_key('email'): message.append("Email: %s" % comment['email']) if comment.has_key('link'): message.append("URL: %s" % comment['link']) try: message.append("Hostname: %s (%s)" % (gethostbyaddr(ipaddress)[0], ipaddress)) except: message.append("IP: %s" % ipaddress) message.append("Entry URL: %s" % curl) message.append("Comment location: %s" % comment_filename) message.append("\n\n%s" % description) # encode the message from email.MIMEText import MIMEText body = "\n".join(message) message = MIMEText(body.encode('utf-8'), 'plain', 'utf-8') message['From'] = email message['To'] = config["comment_smtp_to"] message['Date'] = formatdate(float(comment['pubDate'])) message['Subject'] = ("write back by %s" % author) rv = server.sendmail(email, config['comment_smtp_to'], message.as_string()) server.close() except Exception, e: logger = tools.getLogger() logger.error("error sending email: %s" % e) def clean_author(s): """ Guard against blasterattacko style attacks that embedd SMTP commands in author field. If author field is more than one line, reduce to one line @param the string to be checked @type string @returns the sanitized string """ return s.splitlines()[0] def escape_SMTP_commands(s): """ Guard against blasterattacko style attacks that embed SMTP commands by using an HTML span to make the command syntactically invalid to SMTP but renderable by HTML @param the string to be checked @type string @returns the sanitized string """ def repl_fn(mo): return '<span>'+mo.group(0)+'</span>' s = re.sub('([Tt]o:.*)',repl_fn,s) s = re.sub('([Ff]rom:.*)',repl_fn,s) s = re.sub('([Ss]ubject:.*)',repl_fn,s) return s def sanitize(body): """ This code shamelessly lifted from Sam Ruby's mombo/post.py """ body=re.sub(r'\s+$','',body) body=re.sub('\r\n?','\n', body) # naked urls become hypertext links body=re.sub('(^|[\\s.:;?\\-\\]<])' + '(http://[-\\w;/?:@&=+$.!~*\'()%,#]+[\\w/])' + '(?=$|[\\s.:;?\\-\\[\\]>])', '\\1<a href="\\2">\\2</a>',body) # html characters used in text become escaped body=escape(body) # passthru <a href>, <em>, <i>, <b>, <blockquote>, <br/>, <p>, # <abbr>, <acronym>, <big>, <cite>, <code>, <dfn>, <kbd>, <pre>, <small> # <strong>, <sub>, <sup>, <tt>, <var> body=re.sub('<a href="([^"]*)">([^&]*)</a>', '<a href="\\1">\\2</a>', body) body=re.sub('<a href=\'([^\']*)\'>([^&]*)</a>', '<a href="\\1">\\2</a>', body) body=re.sub('<em>([^&]*)</em>', '<em>\\1</em>', body) body=re.sub('<i>([^&]*)</i>', '<i>\\1</i>', body) body=re.sub('<b>([^&]*)</b>', '<b>\\1</b>', body) body=re.sub('<blockquote>([^&]*)</blockquote>', '<blockquote>\\1</blockquote>', body) body=re.sub('<br\s*/?>\n?','\n',body) body=re.sub('<abbr>([^&]*)</abbr>', '<abbr>\\1</abbr>', body) body=re.sub('<acronym>([^&]*)</acronym>', '<acronym>\\1</acronym>', body) body=re.sub('<big>([^&]*)</big>', '<big>\\1</big>', body) body=re.sub('<cite>([^&]*)</cite>', '<cite>\\1</cite>', body) body=re.sub('<code>([^&]*)</code>', '<code>\\1</code>', body) body=re.sub('<dfn>([^&]*)</dfn>', '<dfn>\\1</dfn>', body) body=re.sub('<kbd>([^&]*)</kbd>', '<kbd>\\1</kbd>', body) body=re.sub('<pre>([^&]*)</pre>', '<pre>\\1</pre>', body) body=re.sub('<small>([^&]*)</small>', '<small>\\1</small>', body) body=re.sub('<strong>([^&]*)</strong>', '<strong>\\1</strong>', body) body=re.sub('<sub>([^&]*)</sub>', '<sub>\\1</sub>', body) body=re.sub('<sup>([^&]*)</sup>', '<sup>\\1</sup>', body) body=re.sub('<tt>([^&]*)</tt>', '<tt>\\1</tt>', body) body=re.sub('<var>([^&]*)</var>', '<var>\\1</var>', body) body=re.sub('</?p>','\n\n',body).strip() # wiki like support: _em_, *b*, [url title] body=re.sub(r'\b_(\w.*?)_\b', r'<em>\1</em>', body) body=re.sub(r'\*(\w.*?)\*', r'<b>\1</b>', body) body=re.sub(r'\[(\w+:\S+\.gif) (.*?)\]', r'<img src="\1" alt="\2" />', body) body=re.sub(r'\[(\w+:\S+\.jpg) (.*?)\]', r'<img src="\1" alt="\2" />', body) body=re.sub(r'\[(\w+:\S+\.png) (.*?)\]', r'<img src="\1" alt="\2" />', body) body=re.sub(r'\[(\w+:\S+) (.*?)\]', r'<a href="\1">\2</a>', body).strip() # unordered lists: consecutive lines starting with spaces and an asterisk chunk=re.compile(r'^( *\*.*(?:\n *\*.*)+)',re.M).split(body) for i in range(1, len(chunk), 2): (html,stack)=('', ['']) for indent,line in re.findall(r'( +)\* +(.*)', chunk[i]) + [('','')]: if indent>stack[-1]: (stack,html)=(stack+[indent],html+'<ul>\r') while indent<stack[-1]: (stack,html)=(stack[:-1],html+'</ul>\r') if line: html += '<li>'+line+'</li>\r' chunk[i]=html # white space chunk=re.split('\n\n+', ''.join(chunk)) # if len(chunk)>1: body='<p>' + '</p>\r<p>'.join(chunk) + '</p>\r' body=re.sub('\n','<br />\n', body) body=re.compile('<p>(<ul>.*?</ul>)\r</p>?',re.M).sub(r'\1',body) body=re.compile('<p>(<blockquote>.*?</blockquote>)</p>?',re.M).sub(r'\1',body) body=re.sub('\r', '\n', body) body=re.sub(' +', ' ', body) return body def dont_follow(mo): return '<a rel="nofollow" '+mo.group(1)+'>' def add_dont_follow(s, config): url_pat_str = '<a ([^>]+)>' url_pat = re.compile(url_pat_str) if config['comment_nofollow'] == 1: return url_pat.sub(dont_follow, s) else: return s def cb_prepare(args): """ Handle comment related HTTP POST's. @param request: pyblosxom request object @type request: a Pyblosxom request object """ request = args["request"] form = request.getHttp()['form'] config = request.getConfiguration() data = request.getData() pyhttp = request.getHttp() # first we check to see if we're going to print out comments # the default is not to show comments data['display_comment_default'] = 0 # check to see if they have "showcomments=yes" in the querystring qstr = pyhttp.get('QUERY_STRING', None) if qstr != None: parsed_qs = cgi.parse_qs(qstr) if parsed_qs.has_key('showcomments'): if parsed_qs['showcomments'][0] == 'yes': data['display_comment_default'] = 1 # check to see if the bl_type is "file" if data.has_key("bl_type") and data["bl_type"] == "file": data["bl_type_file"] = "yes" data['display_comment_default'] = 1 # second, we check to see if they're posting a comment and we # need to write the comment to disk. if form.has_key("post"): if not (form.has_key("title") and form.has_key("author") and \ form.has_key("body") and not form.has_key("preview")): data['comment_message'] = \ "Please fill out at least the Name and Comment fields." return encoding = config.get('blog_encoding', 'iso-8859-1') decode_form(form, encoding) body = form['body'].value author = form['author'].value url = (form.has_key('url') and [form['url'].value] or [''])[0] # sanitize incoming data body = sanitize(body) author = sanitize(author) # it doesn't make sense to add nofollow to link here, but we should # escape it. If you don't like the link escaping, I'm not attached # to it. cdict = {'title': form['title'].value, \ 'author' : author, \ 'pubDate' : str(time.time()), \ 'link' : escape_link(url), \ 'source' : '', \ 'description' : add_dont_follow(body, config) } keys = form.keys() keys = [k for k in keys if k not in ["title", "url", "author", "body"]] for k in keys: cdict[k] = form[k].value if form.has_key('email'): cdict['email'] = form['email'].value cdict['ipaddress'] = pyhttp.get('REMOTE_ADDR', '') data["comment_message"] = writeComment(request, config, data, \ cdict, encoding) def escape_link(linkstring): """Don't allow html in the link string""" for c in "<>'\"": linkstring = linkstring.replace(c, '') return linkstring def decode_form(d, encoding): for key in d.keys(): d[key].value = d[key].value.decode(encoding) def cb_head(args): renderer = args['renderer'] template = args['template'] newtemplate = renderer.flavour.get('comment-head','') if not newtemplate == '' and len(renderer.getContent()) == 1: args['template'] = newtemplate # expand all of entry vars for expansion entry = args['entry'] single_entry = entry['entry_list'][0] single_entry['title'] # force lazy evaluation entry.update(single_entry) args['entry'] = entry return template def cb_story(args): renderer = args['renderer'] entry = args['entry'] template = args['template'] request = args["request"] data = request.getData() config = request.getConfiguration() if len(renderer.getContent()) == 1 \ and renderer.flavour.has_key('comment-story') \ and not entry.has_key("nocomments") \ and data['display_comment_default'] == 1: template = renderer.flavour.get('comment-story','') args['template'] = args['template'] + template entry['num_comments'] = getCommentCount(entry, config) return template def build_preview_comment(form, entry): """Build a prevew comment by brute force @param form: cgi form object (or compatible) @type form: Dictionary of objects with a .value propery @param entry: pyblosxom entry object @type entry: pyblosxom entry object """ c = {} #required fields try: c['cmt_time'] = str(time.time()) c['cmt_author'] = form['author'].value c['cmt_title'] = form['title'].value c['cmt_item'] = sanitize(form['body'].value) c['cmt_pubDate'] = time.ctime(time.time()) c['cmt_description'] = sanitize(form['body'].value) except KeyError, e: c['cmt_error'] = 'Missing value: %s' % e # optional fields if form.has_key("url"): c['cmt_link'] = form['url'].value if form.has_key("email"): c['cmt_email'] = form['email'].value for key in c: entry[key] = c[key] entry['comment_message'] = "A preview of your comment is available above." return c def cb_story_end(args): renderer = args['renderer'] entry = args['entry'] template = args['template'] request = args["request"] data = request.getData() form = request.getHttp()['form'] config = request.getConfiguration() if len(renderer.getContent()) == 1 \ and renderer.flavour.has_key('comment-story') \ and not entry.has_key("nocomments") \ and data['display_comment_default'] == 1: output = [] entry['comments'] = readComments(entry, config) if entry.has_key('comments'): for comment in entry['comments']: renderer.outputTemplate(output, comment, 'comment') if form.has_key('preview')\ and renderer.flavour.has_key('comment-preview'): com = build_preview_comment(form, entry) renderer.outputTemplate(output, com, 'comment-preview') renderer.outputTemplate(output, entry, 'comment-form') args['template'] = template +u"".join(output) entry['num_comments'] = getCommentCount(entry, config) return template