changeset 5363:c3b6639e101a

merged moin-1.8
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Tue, 08 Dec 2009 19:34:07 +0100
parents 71d0252a92a9 (current diff) 8fc12793ba3e (diff)
children 0a2d5a05cd9b
files MoinMoin/action/CopyPage.py MoinMoin/action/diff.py MoinMoin/action/revert.py MoinMoin/macro/EmbedObject.py MoinMoin/script/maint/cleancache.py MoinMoin/script/maint/mkpagepacks.py MoinMoin/xmlrpc/__init__.py
diffstat 7 files changed, 17 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/CopyPage.py	Tue Dec 08 15:52:54 2009 +0100
+++ b/MoinMoin/action/CopyPage.py	Tue Dec 08 19:34:07 2009 +0100
@@ -4,8 +4,8 @@
 
     This action allows you to copy a page.
 
-    @copyright: 2007 MoinMoin:ReimarBauer,
-                2007 MoinMoin:ThomasWaldmann
+    @copyright: 2007 MoinMoin:ThomasWaldmann,
+                2007-2009 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 import re
--- a/MoinMoin/action/diff.py	Tue Dec 08 15:52:54 2009 +0100
+++ b/MoinMoin/action/diff.py	Tue Dec 08 19:34:07 2009 +0100
@@ -3,7 +3,8 @@
     MoinMoin - show diff between 2 page revisions
 
     @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
-                2006-2008 MoinMoin:ThomasWaldmann
+                2006-2008 MoinMoin:ThomasWaldmann,
+                2009 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/revert.py	Tue Dec 08 15:52:54 2009 +0100
+++ b/MoinMoin/action/revert.py	Tue Dec 08 19:34:07 2009 +0100
@@ -4,8 +4,8 @@
 
     @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
                 2006-2008 MoinMoin:ThomasWaldmann,
-                2007 MoinMoin:ReimarBauer,
-                2008 MoinMoin:JohannesBerg
+                2008 MoinMoin:JohannesBerg,
+                2007-2009 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin import wikiutil
--- a/MoinMoin/macro/EmbedObject.py	Tue Dec 08 15:52:54 2009 +0100
+++ b/MoinMoin/macro/EmbedObject.py	Tue Dec 08 19:34:07 2009 +0100
@@ -8,7 +8,7 @@
 
     <<EmbedObject(attachment[,width=width][,height=height][,alt=alternate Text])>>
 
-    @copyright: 2006-2008 MoinMoin:ReimarBauer,
+    @copyright: 2006-2009 MoinMoin:ReimarBauer,
                 2006 TomSi,
                 2007 OliverSiemoneit
 
--- a/MoinMoin/script/maint/cleancache.py	Tue Dec 08 15:52:54 2009 +0100
+++ b/MoinMoin/script/maint/cleancache.py	Tue Dec 08 19:34:07 2009 +0100
@@ -3,7 +3,7 @@
 MoinMoin - cleancache script
 
 @copyright: 2005-2007 MoinMoin:ThomasWaldmann,
-            2007-2008 MoinMoin:ReimarBauer
+            2007-2009 MoinMoin:ReimarBauer
 @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/script/maint/mkpagepacks.py	Tue Dec 08 15:52:54 2009 +0100
+++ b/MoinMoin/script/maint/mkpagepacks.py	Tue Dec 08 19:34:07 2009 +0100
@@ -1,9 +1,14 @@
+# -*- coding: iso-8859-1 -*-
+"""
+MoinMoin - Package Generator
+
 # -*- coding: iso-8859-1 -*-
 """
 MoinMoin - Package Generator
 
 @copyright: 2005 Alexander Schremmer,
-            2006-2009 MoinMoin:ThomasWaldmann
+            2006-2009 MoinMoin:ThomasWaldmann,
+            2009 MoinMoin:ReimarBauer
 @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/xmlrpc/__init__.py	Tue Dec 08 15:52:54 2009 +0100
+++ b/MoinMoin/xmlrpc/__init__.py	Tue Dec 08 19:34:07 2009 +0100
@@ -1016,8 +1016,8 @@
         if not self.request.user.may.read(pagename):
             return self.notAllowedFault()
 
-        filename = wikiutil.taintfilename(self._instr(attachname))
-        filename = AttachFile.getFilename(self.request, pagename, filename)
+        attachname = wikiutil.taintfilename(self._instr(attachname))
+        filename = AttachFile.getFilename(self.request, pagename, attachname)
         if not os.path.isfile(filename):
             return self.noSuchPageFault()
         return self._outlob(open(filename, 'rb').read())
@@ -1041,7 +1041,7 @@
         if not self.request.user.may.write(pagename):
             return xmlrpclib.Fault(1, "You are not allowed to edit this page")
 
-        attachname = wikiutil.taintfilename(attachname)
+        attachname = wikiutil.taintfilename(self._instr(attachname))
         filename = AttachFile.getFilename(self.request, pagename, attachname)
         if os.path.exists(filename) and not os.path.isfile(filename):
             return self.noSuchPageFault()