X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=0b8e422c199a3cd4230e42859e0ed981e3776df9;hb=692a3638ba5d82ad1e13ae1d9b703bfbcfa834d1;hp=470752de0d44076f31272693a206bf0a1ed9cdc2;hpb=0a5c27be02429f5fb00be79c4e11b70666713530;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index 470752d..0b8e422 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -27,10 +27,11 @@ title_done = False
 import cgi, sys, os, re, errno, stat
 
 # FIXME: we accept stuff like foo/../bar and we shouldn't
-file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$")
-img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico|ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE)
-video_re = re.compile(r"^.*\.(ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE)
-url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
+file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)")
+video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
+img_re = re.compile(r".*\.(png|gif|jpg|jpeg|bmp|ico|" +  video_ext + ")", re.IGNORECASE)
+video_re = re.compile(r".*\.(" + video_ext + ")", re.IGNORECASE)
+url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S")
 ext_re = re.compile(r"\.([^\./]+)$")
 
 # CGI stuff ---------------------------------------------------------
@@ -79,7 +80,7 @@ def permalink(s):
     return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip())
 
 def humanlink(s):
-    return re.sub(r'([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' '))
+    return re.sub(r'(?:.*[/:]|)([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' '))
 
 # Split arg lists like "blah| blah blah| width=100 | align = center",
 # return a list containing anonymous arguments and a map containing the named arguments
@@ -634,7 +635,7 @@ class Page:
         except IOError, err:
             if err.errno == errno.ENOENT:
                 if default is None:
-                    default = '//[[%s|Describe %s|action=edit]]//' % (self.page_name, self.page_name)
+                    default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name)
                 return default
             if err.errno == errno.EISDIR:
                 return self.format_dir()
@@ -741,7 +742,7 @@ class Page:
             + ' from ' + cgi.escape(get_hostname(remote_host()))
             + '</b></p>'))
         print('<div class="editor"><form name="editform" method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name))
-        print('<input type="hidden" name="edit" value="%s">' % (self.page_name))
+        print('<input type="hidden" name="a" value="edit" /><input type="hidden" name="q" value="' + self.page_name + '" />')
         print('<input type="input" id="editor" name="changelog" value="Edit page %s" accesskey="c" /><br />' % (self.page_name))
         print('<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100" accesskey="e">%s</textarea>' \
             % cgi.escape(preview or self.get_raw_body(default='')))