From 0f31132a8ac982a03921201045985cdecc2dc9bc Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Mon, 28 Mar 2016 19:29:30 -0400
Subject: [PATCH] Don't need this password checking now

Former-commit-id: 1951dfcb6292d6a9bad533f2cfb28a97e108eb8b [formerly cb098a5f59a9a4c00a3b6db270fea0716d7d5c60] [formerly b4f9bee32bc08a279397a714af9c2230070c00fc [formerly 725abe4412fb4aa7f116c6fc45842c0030a5cd52 [formerly 600dd685f14c9c1e6dfe1544684cce9b59d25079]]]
Former-commit-id: c1fbbb182163aee133d42475f14dc0ac207b49ad [formerly 465d4f43772c7146419e2a4bd4ef13ec1567ec01]
Former-commit-id: d39d6f868cbeae584c105bc50ad8b7df3172e833
Former-commit-id: 80d4772b7f34b557c7029cb5e690534e0af7d92a
---
 main.go   |  9 ++-------
 routes.go | 52 +++++++++++++++++++++++-----------------------------
 2 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/main.go b/main.go
index cccab19..6946657 100644
--- a/main.go
+++ b/main.go
@@ -109,10 +109,6 @@ Options:`)
 	r.GET("/:title", editNote)
 	r.PUT("/:title", func(c *gin.Context) {
 		filename := c.Param("title")
-		fmt.Println(filename)
-		fmt.Println(c.Request.Body)
-		fmt.Println(c.Request.ContentLength)
-		fmt.Println(c.Request.Header)
 		contentLength := c.Request.ContentLength
 		var reader io.Reader
 		reader = c.Request.Body
@@ -154,10 +150,9 @@ Options:`)
 		buf := new(bytes.Buffer)
 		buf.ReadFrom(reader)
 		fmt.Println("---------------")
-		fmt.Println(buf.String())
+		fmt.Println(filename)
 		fmt.Println("---------------")
-		fmt.Println(c.ContentType())
-		fmt.Println(c.Request.Header)
+		fmt.Println(buf.String())
 		fmt.Println("---------------")
 		p := WikiData{filename, "", []string{}, []string{}, false, ""}
 		p.save(buf.String())
diff --git a/routes.go b/routes.go
index d471c28..8ce9b6b 100644
--- a/routes.go
+++ b/routes.go
@@ -158,37 +158,31 @@ func editNote(c *gin.Context) {
 	} else if strings.ToLower(title) == "help" { //}&& strings.Contains(AllowedIPs, c.ClientIP()) != true {
 		c.Redirect(302, "/Help/view")
 	} else {
-		locked, _ := hasPassword(title)
-		if locked {
+		version := c.DefaultQuery("version", "-1")
+		versionNum, _ := strconv.Atoi(version)
+		currentText, versions, currentVersion, totalTime, encrypted, locked := getCurrentText(title, versionNum)
+		if encrypted || len(locked) > 0 {
 			c.Redirect(302, "/"+title+"/view")
-		} else {
-			version := c.DefaultQuery("version", "-1")
-			versionNum, _ := strconv.Atoi(version)
-			currentText, versions, currentVersion, totalTime, encrypted, locked := getCurrentText(title, versionNum)
-			if encrypted || len(locked) > 0 {
-				c.Redirect(302, "/"+title+"/view")
-			}
-			if strings.Contains(currentText, "self-destruct\n") || strings.Contains(currentText, "\nself-destruct") {
-				c.Redirect(302, "/"+title+"/view")
-			}
-			numRows := len(strings.Split(currentText, "\n")) + 10
-			totalTimeString := totalTime.String()
-			if totalTime.Seconds() < 1 {
-				totalTimeString = "< 1 s"
-			}
-			c.HTML(http.StatusOK, "index.tmpl", gin.H{
-				"Title":       title,
-				"WikiName":    RuntimeArgs.WikiName,
-				"ExternalIP":  RuntimeArgs.ExternalIP,
-				"CurrentText": currentText,
-				"NumRows":     numRows,
-				"Versions":    versions,
-				"TotalTime":   totalTimeString,
-				"SocketType":  RuntimeArgs.Socket,
-				"NoEdit":      !currentVersion,
-			})
-
 		}
+		if strings.Contains(currentText, "self-destruct\n") || strings.Contains(currentText, "\nself-destruct") {
+			c.Redirect(302, "/"+title+"/view")
+		}
+		numRows := len(strings.Split(currentText, "\n")) + 10
+		totalTimeString := totalTime.String()
+		if totalTime.Seconds() < 1 {
+			totalTimeString = "< 1 s"
+		}
+		c.HTML(http.StatusOK, "index.tmpl", gin.H{
+			"Title":       title,
+			"WikiName":    RuntimeArgs.WikiName,
+			"ExternalIP":  RuntimeArgs.ExternalIP,
+			"CurrentText": currentText,
+			"NumRows":     numRows,
+			"Versions":    versions,
+			"TotalTime":   totalTimeString,
+			"SocketType":  RuntimeArgs.Socket,
+			"NoEdit":      !currentVersion,
+		})
 	}
 }