Changeset 325 for binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs

Timestamp:

Sep 4, 2018, 1:00:48 PM (6 years ago)

Author:

alloc

Message:

Code style cleanup (mostly whitespace changes, enforcing braces, using cleanup)

File:

• binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs (modified) (6 diffs)

binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
-using System.Threading;
 
-namespace AllocsFixes.NetConnections.Servers.Web.Handlers
-{
+namespace AllocsFixes.NetConnections.Servers.Web.Handlers {
         public class SessionHandler : PathHandler {
-                private string staticPart;
-                private Web parent;
-                private string header = "";
-                private string footer = "";
+                private readonly string footer = "";
+                private readonly string header = "";
+                private readonly Web parent;
+                private readonly string staticPart;
 
-                public SessionHandler (string _staticPart, string _dataFolder, Web _parent, string moduleName = null) : base(moduleName) {
-                        this.staticPart = _staticPart;
-                        this.parent = _parent;
+                public SessionHandler (string _staticPart, string _dataFolder, Web _parent, string moduleName = null) :
+                        base (moduleName) {
+                        staticPart = _staticPart;
+                        parent = _parent;
 
                         if (File.Exists (_dataFolder + "/sessionheader.tmpl")) {
@@ -27 +24 @@
                 }
 
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, int permissionLevel) {
+                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user,
+                        int permissionLevel) {
                         string subpath = req.Url.AbsolutePath.Remove (0, staticPart.Length);
 
@@ -37 +35 @@
                                         resp.Redirect ("/static/index.html");
                                         return;
-                                } else {
-                                        result.Append ("<h1>Login failed, <a href=\"/static/index.html\">click to return to main page</a>.</h1>");
                                 }
+
+                                result.Append (
+                                        "<h1>Login failed, <a href=\"/static/index.html\">click to return to main page</a>.</h1>");
                         } else if (subpath.StartsWith ("logout")) {
                                 if (user != null) {
@@ -48 +47 @@
                                         resp.Redirect ("/static/index.html");
                                         return;
-                                } else {
-                                        result.Append ("<h1>Not logged in, <a href=\"/static/index.html\">click to return to main page</a>.</h1>");
                                 }
+
+                                result.Append (
+                                        "<h1>Not logged in, <a href=\"/static/index.html\">click to return to main page</a>.</h1>");
                         } else if (subpath.StartsWith ("login")) {
                                 string host = (Web.isSslRedirected (req) ? "https://" : "http://") + req.UserHostName;
@@ -57 +57 @@
                                 return;
                         } else {
-                                result.Append ("<h1>Unknown command, <a href=\"/static/index.html\">click to return to main page</a>.</h1>");
+                                result.Append (
+                                        "<h1>Unknown command, <a href=\"/static/index.html\">click to return to main page</a>.</h1>");
                         }
 
@@ -68 +69 @@
                         resp.OutputStream.Write (buf, 0, buf.Length);
                 }
-
         }
-
 }
-