X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditAlbumPage.kt;h=26d7c3a316d00d0285dea8833e7273b5f595619a;hb=74cbe983cd38da24847e6247ac595cb70d8e115b;hp=1e457445d68906497ff7ceb3f4d1a50946f2368c;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
index 1e45744..26d7c3a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
@@ -1,8 +1,8 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
+import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.template.Template
@@ -12,25 +12,25 @@ import net.pterodactylus.util.template.TemplateContext
  * Page that lets the user edit the name and description of an album.
  */
 class EditAlbumPage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("editAlbum.html", template, "Page.EditAlbum.Title", webInterface, true) {
+		LoggedInPage("editAlbum.html", template, "Page.EditAlbum.Title", webInterface) {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		if (request.isPOST) {
-			val album = webInterface.core.getAlbum(request.httpRequest.getPartAsStringFailsafe("album", 36)) ?: throw RedirectException("invalid.html")
+	override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
+		if (freenetRequest.isPOST) {
+			val album = webInterface.core.getAlbum(freenetRequest.httpRequest.getPartAsStringFailsafe("album", 36)) ?: throw RedirectException("invalid.html")
 			album.takeUnless { it.sone.isLocal }?.run { throw RedirectException("noPermission.html") }
-			if (request.httpRequest.getPartAsStringFailsafe("moveLeft", 4) == "true") {
+			if (freenetRequest.httpRequest.getPartAsStringFailsafe("moveLeft", 4) == "true") {
 				album.parent?.moveAlbumUp(album)
 				webInterface.core.touchConfiguration()
 				throw RedirectException("imageBrowser.html?album=${album.parent?.id}")
-			} else if (request.httpRequest.getPartAsStringFailsafe("moveRight", 4) == "true") {
+			} else if (freenetRequest.httpRequest.getPartAsStringFailsafe("moveRight", 4) == "true") {
 				album.parent?.moveAlbumDown(album)
 				webInterface.core.touchConfiguration()
 				throw RedirectException("imageBrowser.html?album=${album.parent?.id}")
 			} else {
 				try {
 					album.modify()
-							.setTitle(request.httpRequest.getPartAsStringFailsafe("title", 100))
-							.setDescription(request.httpRequest.getPartAsStringFailsafe("description", 1000))
+							.setTitle(freenetRequest.httpRequest.getPartAsStringFailsafe("title", 100))
+							.setDescription(freenetRequest.httpRequest.getPartAsStringFailsafe("description", 1000))
 							.update()
 				} catch (e: AlbumTitleMustNotBeEmpty) {
 					throw RedirectException("emptyAlbumTitle.html")