From 1998538fe1274c2a2e44bc518c5f66932df70bf6 Mon Sep 17 00:00:00 2001
From: Zack Scholl <zack.scholl@gmail.com>
Date: Wed, 22 Mar 2017 13:42:51 -0600
Subject: [PATCH] Prevent locking encrypted

Former-commit-id: e986e1b8094f80c479c7f97bdefdcc216ba17ef4 [formerly e4eb6b192ca3af6951acb574d56f2ddd003d6d16] [formerly 142979758915d24210fbc4085270e49611047d59 [formerly 59af266a124a8f1497772830fa7543b09bfac5db]]
Former-commit-id: f218c28663c6d35b1f9fddb4e618e9cf9f3d12d2 [formerly f665f59e08d5b84845baab64c27fd6a45d3d1dd9]
Former-commit-id: 9877bf4627091886f47a176b88373375e2dbe942
---
 handlers.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/handlers.go b/handlers.go
index 142c5fe..5adffaa 100755
--- a/handlers.go
+++ b/handlers.go
@@ -75,10 +75,15 @@ func handlePageRequest(c *gin.Context) {
 		p.Update("*This page has now self-destructed.*\n\n" + p.Text.GetCurrent())
 		p.Erase()
 	}
-	if command == "/erase" && !p.IsLocked && !p.IsEncrypted {
-		p.Erase()
-		c.Redirect(302, "/"+page+"/edit")
-		return
+	if command == "/erase" {
+		if !p.IsLocked && !p.IsEncrypted {
+			p.Erase()
+			c.Redirect(302, "/"+page+"/edit")
+			return
+		} else {
+			c.Redirect(302, "/"+page+"/view")
+			return
+		}
 	}
 	rawText := p.Text.GetCurrent()
 	rawHTML := p.RenderedPage
@@ -189,6 +194,10 @@ func handleLock(c *gin.Context) {
 		return
 	}
 	p := Open(json.Page)
+	if p.IsEncrypted {
+		c.JSON(http.StatusOK, gin.H{"success": false, "message": "Encrypted"})
+		return
+	}
 	var message string
 	if p.IsLocked {
 		err2 := CheckPasswordHash(json.Passphrase, p.PassphraseToUnlock)