Merge branch 'master' of ssh://people.ipfire.org/pub/git/ipfire.org

[ipfire.org.git] / src / web / __init__.py

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 76d23edd4298bbc0da79dd99483cf0cb48eff8e6..4821c43824ec55176d6f6401b34bb66593558773 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -23,7 +23,6 @@ from . import fireinfo
 from . import iuse
 from . import location
 from . import mirrors
-from . import newsletter
 from . import nopaste
 from . import people
 from . import ui_modules
@@ -74,6 +73,7 @@ class Application(tornado.web.Application):
 
                                # People
                                "AccountsList"         : people.AccountsListModule,
+                               "Agent"                : people.AgentModule,
                                "CDR"                  : people.CDRModule,
                                "Channels"             : people.ChannelsModule,
                                "MOS"                  : people.MOSModule,
@@ -96,6 +96,7 @@ class Application(tornado.web.Application):
                                "WikiList"             : wiki.WikiListModule,
 
                                # Misc
+                               "ChristmasBanner"      : ui_modules.ChristmasBannerModule,
                                "Markdown"             : ui_modules.MarkdownModule,
                                "Map"                  : ui_modules.MapModule,
                                "ProgressBar"          : ui_modules.ProgressBarModule,
@@ -128,9 +129,6 @@ class Application(tornado.web.Application):
                        (r"/donate/error", donate.ErrorHandler),
                        (r"/donation", tornado.web.RedirectHandler, { "url" : "/donate" }),
 
-                       # Newsletter
-                       (r"/newsletter/subscribe", newsletter.SubscribeHandler),
-
                        # RSS feed
                        (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),
 
@@ -138,7 +136,6 @@ class Application(tornado.web.Application):
                        (r"/news/(.*)", handlers.NewsHandler),
 
                        # Static Pages
-                       (r"/chat", StaticHandler, { "template" : "chat.html" }),
                        (r"/features", StaticHandler, { "template" : "features.html" }),
                        (r"/legal", StaticHandler, { "template" : "legal.html" }),
                        (r"/support", StaticHandler, { "template" : "support.html" }),
@@ -201,6 +198,9 @@ class Application(tornado.web.Application):
                self.add_handlers(r"fireinfo(\.dev)?\.ipfire\.org", [
                        (r"/", fireinfo.IndexHandler),
 
+                       # Admin
+                       (r"/admin", fireinfo.AdminIndexHandler),
+
                        # Vendors
                        (r"/vendors", fireinfo.VendorsHandler),
                        (r"/vendors/(pci|usb)/([0-9a-f]{4})", fireinfo.VendorHandler),
@@ -218,7 +218,7 @@ class Application(tornado.web.Application):
 
                        # Send profiles
                        (r"/send/([a-z0-9]+)", fireinfo.ProfileSendHandler),
-               ])
+               ] + authentication_handlers)
 
                # i-use.ipfire.org
                self.add_handlers(r"i-use(\.dev)?\.ipfire\.org", [
@@ -272,7 +272,7 @@ class Application(tornado.web.Application):
                        (r"/activate/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.ActivateHandler),
                        (r"/conferences", people.ConferencesHandler),
                        (r"/groups", people.GroupsHandler),
-                       (r"/groups/(\w+)", people.GroupHandler),
+                       (r"/groups/([a-z_][a-z0-9_-]{0,31})", people.GroupHandler),
                        (r"/register", auth.RegisterHandler),
                        (r"/search", people.SearchHandler),
                        (r"/users", people.UsersHandler),
@@ -284,6 +284,10 @@ class Application(tornado.web.Application):
                        (r"/users/([a-z_][a-z0-9_-]{0,31})/passwd", people.UserPasswdHandler),
                        (r"/users/([a-z_][a-z0-9_-]{0,31})/sip", people.SIPHandler),
 
+                       # Promotional Consent Stuff
+                       (r"/subscribe", people.SubscribeHandler),
+                       (r"/unsubscribe", people.UnsubscribeHandler),
+
                        # Single-Sign-On for Discourse
                        (r"/sso/discourse", people.SSODiscourse),
 
@@ -291,7 +295,11 @@ class Application(tornado.web.Application):
                        (r"/password\-reset", auth.PasswordResetInitiationHandler),
                        (r"/password\-reset/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.PasswordResetHandler),
 
+                       # Stats
+                       (r"/stats", people.StatsHandler),
+
                        # API
+                       (r"/api/check/email", auth.APICheckEmail),
                        (r"/api/check/uid", auth.APICheckUID),
                ]  + authentication_handlers)