%s: %s

X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=ec64ca9f42d41eebedeaf7e7f385b77429be360a;hp=190964478d979134e3c699776a5656923f0ed183;hb=2d4c364b47b01894842b7ae21535ea00cf420722;hpb=01057766514a73e0df07470e71c94b0508b2e5bf diff --git a/geekigeeki.py b/geekigeeki.py index 1909644..ec64ca9 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -36,9 +36,12 @@ title_done = False # CGI stuff --------------------------------------------------------- -def get_scriptname(): +def script_name(): return environ.get('SCRIPT_NAME', '') +def privileged_path(): + return privileged_url or script_name() + def remote_user(): return environ.get('REMOTE_USER', 'AnonymousCoward') @@ -67,7 +70,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 @@ -103,14 +106,14 @@ def send_title(name, text="Limbo", msg=None, msg_type = 'error'): print "%s: %s" % (site_name, text) 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 '' @@ -118,7 +121,7 @@ def send_title(name, text="Limbo", msg=None, msg_type = 'error'): # Navbar print '

' - print ' ' + site_name + ': ' + print ' ' + site_name + ': ', if name: print link_tag('?fullsearch=' + name, text) + ' ' else: @@ -130,8 +133,8 @@ def send_title(name, text="Limbo", msg=None, msg_type = 'error'): if name: print ' | Page History' print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink') - if allow_edit: - print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink') + if privileged_url is not None: + print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', authentication=True) else: print ' | Immutable Page' @@ -140,21 +143,24 @@ def send_title(name, text="Limbo", msg=None, msg_type = 'error'): print ' | logged in as ' + cgi.escape(user) + '' print '

' - title_done = True + title_done = True -def link_tag(params, text=None, ss_class=None): +def link_tag(params, text=None, ss_class=None, authentication=False): if text is None: text = params # default classattr = '' - # Prevent crawlers from following links to generated pages - # and links added by potential spammers - if ss_class == 'external' or ss_class == 'navlink': - classattr += 'rel="nofollow" ' if ss_class: classattr += 'class="%s" ' % ss_class - return '%s' % (classattr, get_scriptname(), - params, text) + # Prevent crawlers from following links to generated pages + # and links added by potential spammers + if ss_class == 'external' or ss_class == 'navlink': + classattr += 'rel="nofollow" ' + if authentication: + path = privileged_path() + else: + path = script_name() + return '%s' % (classattr, path, params, text) # Search --------------------------------------------------- @@ -212,7 +218,7 @@ def do_raw(pagename): Page(pagename).send_raw() def do_savepage(pagename): - if not allow_edit: + if privileged_url is None: raise 'editing disallowed for ' + pagename global form @@ -243,6 +249,10 @@ def page_list(): def send_footer(name, mod_string=None): + if debug_cgi: + cgi.print_arguments() + cgi.print_form(cgi.FieldStorage()) + cgi.print_environ() print '

' if mod_string: print "last modified %s" % mod_string @@ -262,7 +272,7 @@ def _macro_search(type): default = form["value"].value else: default = '' - return """
""" % (type, default) + return """
""" % (type, default) def _macro_WordIndex(): s = make_index_key() @@ -358,7 +368,7 @@ class PageFormatter: return Page(word).link_to() def _img_repl(self, word): - return '' % (get_scriptname(), word) + return '' % (script_name(), word) def _url_repl(self, word): if img_re.match(word): @@ -600,7 +610,7 @@ class Page: + ' for ' + cgi.escape(remote_user()) + ' from ' + cgi.escape(get_hostname(remote_host())) + '

') - print '

' % (get_scriptname(), self.page_name) + print '

' % (script_name(), self.page_name) print '' % (self.page_name) print """""" % (preview or self.get_raw_body()) print """ @@ -616,6 +626,7 @@ class Page: print "

" PageFormatter(preview).print_html() print "

" + send_footer(self.page_name) def send_raw(self): emit_header("text/plain") @@ -661,20 +672,25 @@ def send_verbatim(filename, mime_type='application/octet-stream'): emit_header(mime_type) sys.stdout.write(data) -# --------------------------------------------------------------- +# Main --------------------------------------------------------------- try: # Configuration values + site_name = 'Codewiz' + + # set to None for read-only sites + # leave empty ('') to allow anonymous edits + # otherwise, set to a URL that requires authentication + privileged_url = 'https://www.codewiz.org/~bernie/wiki' + data_dir = '/home/bernie/public_html/wiki' text_dir = path.join(data_dir, 'text') - allow_edit = True # Is it possible to edit pages? - site_name = 'codewiz.org' - changed_time_fmt = '[%I:%M %p] ' - date_fmt = '%a %d %b %Y' + css_url = '../wikidata/geekigeeki.css' # optional stylesheet link + post_edit_hook = './post_edit_hook.sh' datetime_fmt = '%a %d %b %Y %I:%M %p' + allow_edit = True # Is it possible to edit pages? show_hosts = True # show hostnames? - css_url = '../wikidata/geekigeeki.css' # optional stylesheet link nonexist_qm = False # show '?' for nonexistent? - post_edit_hook = './post_edit_hook.sh' + debug_cgi = False # Set to True for CGI var dump form = cgi.FieldStorage() @@ -699,6 +715,7 @@ try: if word_re.match(query): Page(query).send_page() elif img_re.match(query): + #FIXME: use correct mime type send_verbatim(query, 'image/jpeg') else: send_verbatim(query)