X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=geekigeeki.py;h=e6cfeca70ef5501177e27af3711418b1636cb81c;hb=05e3e729c0e20765f418c5efd35ab4426afb2fb7;hp=99234c539c0d23b2cd69c587773de617bdc05a70;hpb=64737bb01dc7cf5cb5759f7a077e8edbede2dbca;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 99234c5..e6cfeca 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -19,12 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-__version__ = '$Revision: 1.63+gerry+bernie $'[11:-2];
+__version__ = '$Id$'[3:-2]
import cgi, sys, string, os, re, errno, time, stat
from os import path, environ
-from socket import gethostbyaddr
-from time import localtime, strftime
# Regular expression defining a WikiWord
# (but this definition is also assumed in other places)
@@ -35,24 +33,39 @@ url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
title_done = False
-def emit_header(type="text/html"):
- print "Content-type: " + type + "; charset=utf-8"
- print
+# CGI stuff ---------------------------------------------------------
-# Formatting stuff --------------------------------------------------
-
-def get_scriptname():
+def script_name():
return environ.get('SCRIPT_NAME', '')
+def privileged_path():
+ return privileged_url or script_name()
+
+def remote_user():
+ user = environ.get('REMOTE_USER', '')
+ if user is None or user == '' or user == 'anonymous':
+ user = 'AnonymousCoward'
+ return user
+
+def remote_host():
+ return environ.get('REMOTE_ADDR', '')
+
def get_hostname(addr):
try:
+ from socket import gethostbyaddr
return gethostbyaddr(addr)[0] + ' (' + addr + ')'
except:
- return addr;
+ return addr
+
+# Formatting stuff --------------------------------------------------
+
+def emit_header(type="text/html"):
+ print "Content-type: " + type + "; charset=utf-8"
+ print
def send_guru(msg, msg_type):
- if msg is None or len(msg) == 0: return
+ if msg is None or msg == '': return
print '
'
if msg_type == 'error':
print ' Software Failure. Press left mouse button to continue.\n'
@@ -60,7 +73,7 @@ def send_guru(msg, msg_type):
if msg_type == 'error':
print ' Guru Meditation #DEADBEEF.ABADC0DE'
print '
'
- # FIXME: This simple JS code is harder to pass than ACID 3.0
+ # FIXME: This simple JS snippet is harder to pass than ACID 3.0
print """
"""
-def send_title(name, text="Limbo", msg=None, msg_type = 'error'):
+def send_title(name, text="Limbo", msg=None, msg_type='error'):
global title_done
if title_done: return
@@ -94,55 +107,61 @@ def send_title(name, text="Limbo", msg=None, msg_type = 'error'):
"""
print "%s: %s" % (site_name, text)
- print ' '
+ print ' '
if not name:
- print ' '
+ print ' '
if css_url:
print ' ' % css_url
print ''
# Body
- if name and allow_edit:
- print ''
+ if name and privileged_url is not None:
+ print ''
else:
print ''
+ title_done = True
send_guru(msg, msg_type)
# Navbar
- print '