From: James French <frenchie@frenchie.id.au>
Date: Wed, 6 Mar 2013 15:38:08 +0000 (+0800)
Subject: Minor code cleanup
X-Git-Tag: 1.0
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=c50d84b9a5feb92381ee2cdb28b6e9a055ae88b6;p=frenchie%2Ficalparse.git

Minor code cleanup

- Corrected exitQuiet() & added missing call
- Disabled cgitb (left on by accident)
---

diff --git a/icalparse.py b/icalparse.py
index a573b48..95d5208 100755
--- a/icalparse.py
+++ b/icalparse.py
@@ -201,7 +201,7 @@ def runLocal():
 
 def exitQuiet(exitstate=0):
 	'''When called as a CGI script, exit quietly if theres any errors'''
-	print('Content-Type: text/html\n')
+	print('Content-Type: text/calendar\n')
 	sys.exit(exitstate)
 
 
@@ -210,14 +210,13 @@ def runCGI():
 	to process facebook ical files'''
 	import cgi
 	import re
-	import cgitb; cgitb.enable()
+	#import cgitb; cgitb.enable()
 
 	ruleConfig["facebook"] = True
 
 	form = cgi.FieldStorage()
 	if "uid" not in form or "key" not in form:
-		print('Content-Type: text/calendar\n')
-		sys.exit(0)
+		exitQuiet()
 	try:
 		# UID should be numeric, if it's not we have someone playing games
 		uid = int(form['uid'].value)