changeset 1996:6c4f6efbb36e

merge main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 16 Apr 2007 22:47:28 +0200
parents 1c8edc5706b7 (current diff) aee7c17cea24 (diff)
children 1bf17e0dd6f1
files
diffstat 17 files changed, 36 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/Page.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/Page.py	Mon Apr 16 22:47:28 2007 +0200
@@ -30,7 +30,7 @@
     @copyright: 2000-2004 by Juergen Hermann <jh@web.de>,
                 2005-2007 by MoinMoin:ThomasWaldmann,
                 2006 by MoinMoin:FlorianFesti,
-                2007 by ReimarBauer
+                2007 by MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/PageEditor.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/PageEditor.py	Mon Apr 16 22:47:28 2007 +0200
@@ -12,7 +12,7 @@
   
     @copyright: 2000-2004 by Juergen Hermann <jh@web.de>,
                 2005-2007 by MoinMoin:ThomasWaldmann,
-                2007 by ReimarBauer
+                2007 by MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/CopyPage.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/action/CopyPage.py	Mon Apr 16 22:47:28 2007 +0200
@@ -4,7 +4,7 @@
 
     This action allows you to copy a page.
 
-    @copyright: 2007 ReimarBauer
+    @copyright: 2007 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 import re
--- a/MoinMoin/action/DeletePage.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/action/DeletePage.py	Mon Apr 16 22:47:28 2007 +0200
@@ -5,7 +5,7 @@
     This action allows you to delete a page.
 
     @copyright: 2006 MoinMoin:ThomasWaldmann,
-                2007 ReimarBauer
+                2007 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 import re
--- a/MoinMoin/action/Load.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/action/Load.py	Mon Apr 16 22:47:28 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Action macro for page creation from file or attach file to current page
 
-    @copyright: 2007 Reimar Bauer 
+    @copyright: 2007 MoinMoin:ReimarBauer 
     @license: GNU GPL, see COPYING for details.
 """
 import os
@@ -66,14 +66,15 @@
                          'target': target, 'filename': filename}
                 return status, msg
 
-            if exists and self.request.user.may.delete(self.pagename):
-                try:
-                    os.remove(fpath)
-                except:
-                    pass
-            else:
-                msg = _("You are not allowed to delete attachments on this page.")
-                return status, msg
+            if exists and overwrite:
+                if self.request.user.may.delete(self.pagename):
+                    try:
+                        os.remove(fpath)
+                    except:
+                        pass
+                else:
+                    msg = _("You are not allowed to delete attachments on this page.")
+                    return status, msg
 
             AttachFile.add_attachment(self.request, self.pagename, target, filecontent)
             bytes = len(filecontent)
--- a/MoinMoin/action/RenamePage.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/action/RenamePage.py	Mon Apr 16 22:47:28 2007 +0200
@@ -6,7 +6,7 @@
 
     @copyright: 2002-2004 Michael Reinsch <mr@uue.org>,
                 2006 MoinMoin:ThomasWaldmann,
-                2007 ReimarBauer
+                2007 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 import re
--- a/MoinMoin/action/Save.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/action/Save.py	Mon Apr 16 22:47:28 2007 +0200
@@ -2,7 +2,7 @@
 """
     MoinMoin - Action for saving a page
 
-    @copyright: 2007 Reimar Bauer 
+    @copyright: 2007 MoinMoin:ReimarBauer 
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/action/supplementation.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/action/supplementation.py	Mon Apr 16 22:47:28 2007 +0200
@@ -5,7 +5,7 @@
     Note:
     derived from the newpage macro by Vito Miliano (vito_moinnewpagewithtemplate@perilith.com) et al
 
-    @copyright: 2006-2007 ReimarBauer  
+    @copyright: 2006-2007 MoinMoin:ReimarBauer  
     @license: GNU GPL, see COPYING for details.  
 """
 from MoinMoin.Page import Page
--- a/MoinMoin/filter/EXIF.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/filter/EXIF.py	Mon Apr 16 22:47:28 2007 +0200
@@ -88,7 +88,7 @@
 # 15-FEB-04 CEC Finally fixed bit shift warning by converting Y to 0L.
 #
 #############
-# 2006-08-04 ReimarBauer added an optional parameter name to process_file and dump_IFD. Using this parameter the 
+# 2006-08-04 MoinMoin:ReimarBauer added an optional parameter name to process_file and dump_IFD. Using this parameter the 
 #            loop is breaked after that tag_name is processed.
 #            Example:
 #                    f = open(infile, 'rb')
--- a/MoinMoin/macro/AttachList.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/macro/AttachList.py	Mon Apr 16 22:47:28 2007 +0200
@@ -9,7 +9,7 @@
     If mime_type isn't given, all files are listed.
 
     @copyright: 2004 Jacob Cohen, Nigel Metheringham,
-                2006 Reimar Bauer
+                2006 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/macro/FootNote.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/macro/FootNote.py	Mon Apr 16 22:47:28 2007 +0200
@@ -6,7 +6,7 @@
     text cannot contain wiki markup.
 
     @copyright: 2002 Juergen Hermann <jh@web.de>,
-                2007 Reimar Bauer,
+                2007 MoinMoin:ReimarBauer,
                 2007 Johannes Berg
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/macro/ImageLink.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/macro/ImageLink.py	Mon Apr 16 22:47:28 2007 +0200
@@ -87,7 +87,7 @@
 
     @copyright: 2001 by Jeff Kunce,
                 2004 by Marcin Zalewski,
-                2004-2006 by Reimar Bauer,
+                2004-2006 by MoinMoin:ReimarBauer,
                 2006 by Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
--- a/MoinMoin/macro/Login.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/macro/Login.py	Mon Apr 16 22:47:28 2007 +0200
@@ -3,7 +3,7 @@
     MoinMoin - login and sendmail form
 
     @copyright: 2005-2006 Radomirs Cirskis <nad2000@gmail.com>,
-                2007 Reimar Bauer, Oliver Siemoneit
+                2007 MoinMoin:Reimar Bauer, Oliver Siemoneit
     @license: GNU GPL, see COPYING for details.
 """
 from MoinMoin.widget import html
--- a/MoinMoin/macro/SystemInfo.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/macro/SystemInfo.py	Mon Apr 16 22:47:28 2007 +0200
@@ -5,7 +5,7 @@
     This macro shows some info about your wiki, wiki software and your system.
 
     @copyright: 2006 MoinMoin:ThomasWaldmann,
-                2007 ReimarBauer
+                2007 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
@@ -164,4 +164,4 @@
         return buf.getvalue()
 
 def execute(macro, args):
-    return SystemInfo(macro, args).render()
+        return SystemInfo(macro, args).render()
--- a/MoinMoin/packages.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/packages.py	Mon Apr 16 22:47:28 2007 +0200
@@ -3,7 +3,7 @@
     MoinMoin - Package Installer
 
     @copyright: 2005 MoinMoin:AlexanderSchremmer,
-                2007 ReimarBauer
+                2007 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/MoinMoin/wikiutil.py	Mon Apr 16 22:46:57 2007 +0200
+++ b/MoinMoin/wikiutil.py	Mon Apr 16 22:47:28 2007 +0200
@@ -4,7 +4,7 @@
 
     @copyright: 2000-2004 Juergen Hermann <jh@web.de>,
                 2005-2007 MoinMoin:ThomasWaldmann,
-                2007 Reimar Bauer
+                2007 MoinMoin:ReimarBauer
     @license: GNU GPL, see COPYING for details.
 """
 
--- a/docs/CHANGES	Mon Apr 16 22:46:57 2007 +0200
+++ b/docs/CHANGES	Mon Apr 16 22:47:28 2007 +0200
@@ -220,7 +220,11 @@
     * We use rel="nofollow" for some action links in the hope that some search
       engines don't fetch the targets (if they do, they will just get 403 and
       cause unnecessary traffic).
-    * Included EmbedObject macro for embedding shockwave flash, mp3, visio, ...
+    * Included EmbedObject macro for embedding different major mimetypes:
+      application, audio, image, video, chemical, x-world. 
+      You are able to change the defaults of allowed mimetypes in the config var mimetypes_embed.
+      The config var mimetypes_xss_protect is used to deny mimetypes. The order of both variables  
+      is Allow, Deny  (mimetypes_embed, mimetypes_xss_protect)
     * @SIG@ etc. generate local time stamps now, no difference visible on page
       view.
     * Speeded up linkto search by avoiding read locks on the pagelinks file.
@@ -342,6 +346,11 @@
       and your local moin will autocreate an account with these values.
     * Antispam master url is now configurable via cfg.antispam_master_url.
       The default is to fetch the antispam patterns from MoinMaster wiki.
+    * inline is changed to use mimetypes of EmbedObject too. e.g.
+      inline:song.mp3 embeds the audio controls into your page
+    * action=view does use mimetypes of EmbedObject too and text files will be shown
+      by using their colorized parsers
+
 
   Bugfixes:
     * on action "info" page, "revert" link will not be displayed for empty page