--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/action/SubscribeUser.py	Sat Oct 01 07:58:16 2005 +0000
@@ -0,0 +1,129 @@
+"""
+   MoinMoin - Subscribeuser - Action
+   Subscribe a user to a page
+
+   @copyright: Daniela Nicklas <nicklas@informatik.uni-stuttgart.de>, 2003
+   @copyright: 2005 MoinMoin:AlexanderSchremmer
+   
+   @license: GNU GPL, see COPYING for details.
+"""
+
+import sys, os
+sys.path.append("YOUR CONFIG DIRECTORY HERE")
+
+from MoinMoin import wikiutil
+from MoinMoin.Page import Page
+from MoinMoin import user
+
+def show_form(pagename, request):
+    _ = request.getText
+    request.http_headers()
+    wikiutil.send_title(request, _("Subscribe users to the page %s") % pagename, pagename=pagename)
+
+    request.write("""
+<form action="" method="POST" enctype="multipart/form-data">
+<input type="hidden" name="action" value="SubscribeUser">
+Enter user names (comma separated): <input type="text" name="users" size="50">
+<input type="submit" value="Subscribe">
+</form>
+""")
+    wikiutil.send_footer(request, pagename, showpage = 1)
+
+def show_result(pagename, request):
+    _ = request.getText
+    request.http_headers()
+
+    wikiutil.send_title(request, _("Subscribed for %s:") % pagename, pagename=pagename)
+
+    from MoinMoin.formatter.text_html import Formatter
+    formatter = Formatter(request)
+    
+    result = subscribe_users(request, request.form['users'][0].split(","), pagename, formatter)
+
+    # print result
+    request.write(result)
+    wikiutil.send_footer(request, pagename, showpage=1)
+
+
+def subscribe_users(request, usernamelist, pagename, formatter):
+    _ = request.getText
+
+    if not Page(request, pagename).exists():
+        return u"Page does not exist."
+
+    result = []
+
+    realusers = []              # usernames that are really wiki users
+
+    # get user object - only with IDs!
+    for userid in user.getUserList(request):
+        success = False
+        userobj = user.User(request, userid)
+
+        if userobj.name in usernamelist:   # found a user
+            realusers.append(userobj.name)
+            if userobj.isSubscribedTo([pagename]):
+                success = True
+            elif not userobj.email:
+                success = False
+            elif userobj.subscribePage(pagename):
+                userobj.save()
+                success = True
+            if success:
+                result.append(formatter.smiley('{OK}'))
+                result.append(formatter.text(" "))
+            else:
+                result.append(formatter.smiley('{X}'))
+                result.append(formatter.text(" "))
+            result.append(formatter.url(1, Page(request, userobj.name).url(request)))
+            result.append(formatter.text(userobj.name))
+            result.append(formatter.url(0))
+            result.append(formatter.linebreak(preformatted=0))
+
+    result.extend([''.join([formatter.smiley('{X}'), formatter.text(" " + _("Not a user:") + " " + username), formatter.linebreak(preformatted=0)]) for username in usernamelist if username not in realusers])
+
+    return ''.join(result)
+    
+def execute(pagename, request):
+    _ = request.getText
+    if not request.user.may.admin(pagename):
+        request.http_headers()
+        wikiutil.send_title(request, _("You are not allowed to perform this action."), pagename=pagename)
+    elif not request.form.has_key('users'):
+        show_form(pagename, request)
+    else:
+        show_result(pagename,request)
+
+if __name__ == '__main__':
+    args = sys.argv
+    if not len(args) > 1:
+        print >>sys.stderr, """Subscribe users
+
+%(myname)s pagename username[,username[,username[,...]]] [URL]
+
+Subscribes the users to a page.
+URL is just needed for a farmconfig scenario.
+
+Example:
+%(myname)s FrontPage TestUser,SaddamHussein
+
+""" % {"myname": os.path.basename(args[0])}
+        raise SystemExit
+
+    pagename = args[1]
+    usernames = args[2]
+
+    if len(args) > 3:
+        request_url = args[3]
+    else:
+        request_url = "localhost/"
+
+    # Setup MoinMoin environment
+    from MoinMoin.request import RequestCLI
+    request = RequestCLI(url = request_url)
+    request.form = request.args = request.setup_args()
+
+    from MoinMoin.formatter.text_plain import Formatter
+    formatter = Formatter(request)
+
+    print subscribe_users(request, usernames.split(","), pagename, formatter)

--- a/docs/CHANGES	Sat Oct 01 03:12:53 2005 +0000
+++ b/docs/CHANGES	Sat Oct 01 07:58:16 2005 +0000
@@ -130,7 +130,7 @@
        pages. If you are not in the user_homewiki, you will get redirected
        there first.
 
-  Other changes:
+  Other changes/new features:
     * added WSGI server support, thanks to Anakim Border, see:
       wiki/server/moinwsgi.py (moin as WSGI app, uses the flup WSGI server,
                                see http://www.saddi.com/software/flup/)
@@ -158,6 +158,8 @@
       backup in case you don't configure it correctly.
       If you put your data_dir there, the backup will contain private
       user data like email addresses and encrypted passwords.
+    * Added a SubscribeUser action which allows the administrator to subscribe users to the
+      current page.
 
   International support:    
     * mail_from can be now a unicode name-address