From 4d529b75857597dedd181045ba1bf97b99c66b3e Mon Sep 17 00:00:00 2001
From: Nick Daly <Nick.M.Daly@gmail.com>
Date: Sun, 27 Oct 2013 10:26:06 -0500
Subject: [PATCH] Moved privilegedactions to the actions directory.

---
 privilegedactions.py => actions/privilegedactions.py |  0
 modules/installed/apps/apps.py                       | 10 +++++-----
 modules/installed/services/xmpp.py                   |  4 ++--
 modules/installed/system/config.py                   |  3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename privilegedactions.py => actions/privilegedactions.py (100%)

diff --git a/privilegedactions.py b/actions/privilegedactions.py
similarity index 100%
rename from privilegedactions.py
rename to actions/privilegedactions.py
diff --git a/modules/installed/apps/apps.py b/modules/installed/apps/apps.py
index d6ba9d662..279f05c6f 100644
--- a/modules/installed/apps/apps.py
+++ b/modules/installed/apps/apps.py
@@ -3,7 +3,7 @@ from gettext import gettext as _
 from modules.auth import require
 from plugin_mount import PagePlugin
 from forms import Form
-from privilegedactions import privilegedaction_run
+from actions.privilegedactions import privilegedaction_run
 import cfg
 
 class Apps(PagePlugin):
@@ -18,7 +18,7 @@ class Apps(PagePlugin):
     def index(self):
         main = """
         <p>User Applications are web apps hosted on your %s.</p>
-        
+
         <p>Eventually this box could be your photo sharing site, your
         instant messaging site, your social networking site, your news
         site.  Remember web portals?  We can be one of those too.
@@ -35,7 +35,7 @@ class Apps(PagePlugin):
 digital property you have, so why trust it to companies that have no
 investment in the sentimental value of your family snaps?  Keep those
 photos local, backed up, easily accessed and free from the whims of
-some other websites business model.</p>
+some other website's business model.</p>
 """)
 
     @cherrypy.expose
@@ -67,8 +67,8 @@ some other websites business model.</p>
 
         main="""
 """
-        form = Form(title="Configuration", 
-                        action="/apps/owncloud", 
+        form = Form(title="Configuration",
+                        action="/apps/owncloud",
                         name="configure_owncloud",
                         message='')
         form.checkbox(_("Enable Owncloud"), name="owncloud_enable", id="owncloud_enable", checked=checkedinfo['enable'])
diff --git a/modules/installed/services/xmpp.py b/modules/installed/services/xmpp.py
index 6140cf1c5..2a6b6f14c 100644
--- a/modules/installed/services/xmpp.py
+++ b/modules/installed/services/xmpp.py
@@ -4,7 +4,7 @@ from modules.auth import require
 from plugin_mount import PagePlugin, FormPlugin
 import cfg
 from forms import Form
-from privilegedactions import privilegedaction_run
+from actions.privilegedactions import privilegedaction_run
 from util import Message
 
 class xmpp(PagePlugin):
@@ -46,7 +46,7 @@ class xmpp(PagePlugin):
                     action="/services/xmpp",
                     name="configure_xmpp",
                     message='')
-        form.checkbox(_("Allow In-Band Registration"), name="xmpp_inband_enable", 
+        form.checkbox(_("Allow In-Band Registration"), name="xmpp_inband_enable",
                         id="xmpp_inband_enable", checked=checkedinfo['inband_enable'])
         form.hidden(name="submitted", value="True")
         form.html(_("<p>When enabled, anyone who can reach this server will be allowed to register an account through an XMPP client.</p>"))
diff --git a/modules/installed/system/config.py b/modules/installed/system/config.py
index 6863b22bd..758a33c9c 100644
--- a/modules/installed/system/config.py
+++ b/modules/installed/system/config.py
@@ -9,8 +9,9 @@ from gettext import gettext as _
 from filedict import FileDict
 from modules.auth import require
 from plugin_mount import PagePlugin, FormPlugin
-from privilegedactions import privilegedaction_run
+from actions.privilegedactions import privilegedaction_run
 import cfg
+import re
 from forms import Form
 from model import User
 from util import *