X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDeleteAlbumPage.kt;h=deeadfb196907ffcb7225eb6911451d38307f7cc;hp=02a0f6550a69c52e1c7553a0819c81d1102b89f5;hb=cd72add62ab407336b471d4b7cda8e33dd2df5c6;hpb=acf40290db822d7cbdaed590850f692953f51ac1

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
index 02a0f65..deeadfb 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
@@ -3,7 +3,7 @@ package net.pterodactylus.sone.web.pages
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.isPOST
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 import javax.inject.Inject
@@ -14,19 +14,19 @@ import javax.inject.Inject
 class DeleteAlbumPage @Inject constructor(template: Template, webInterface: WebInterface):
 		LoggedInPage("deleteAlbum.html", template, "Page.DeleteAlbum.Title", webInterface) {
 
-	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")
+	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+		if (soneRequest.isPOST) {
+			val album = soneRequest.core.getAlbum(soneRequest.httpRequest.getPartAsStringFailsafe("album", 36)) ?: throw RedirectException("invalid.html")
 			if (!album.sone.isLocal) {
 				throw RedirectException("noPermission.html")
 			}
-			if (freenetRequest.httpRequest.getPartAsStringFailsafe("abortDelete", 4) == "true") {
+			if (soneRequest.httpRequest.getPartAsStringFailsafe("abortDelete", 4) == "true") {
 				throw RedirectException("imageBrowser.html?album=${album.id}")
 			}
-			webInterface.core.deleteAlbum(album)
+			soneRequest.core.deleteAlbum(album)
 			throw RedirectException(if (album.parent.isRoot) "imageBrowser.html?sone=${album.sone.id}" else "imageBrowser.html?album=${album.parent.id}")
 		}
-		val album = webInterface.core.getAlbum(freenetRequest.httpRequest.getParam("album"))
+		val album = soneRequest.core.getAlbum(soneRequest.httpRequest.getParam("album"))
 		templateContext["album"] = album ?: throw RedirectException("invalid.html")
 	}