X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FUploadImagePage.kt;h=782c90df809f65bf0dc0703a3fdff68e939374f7;hb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;hp=774a17940f4bf8e34f10695cbaab42c2f2c28e4a;hpb=51ab1ab2da27d02a884295cea31c4f6d30b5211b;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
index 774a179..782c90d 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
@@ -11,7 +11,6 @@ import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
-import org.bouncycastle.asn1.x500.style.RFC4519Style.title
 import java.awt.image.BufferedImage
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
@@ -23,15 +22,15 @@ import javax.imageio.ImageIO
 class UploadImagePage(template: Template, webInterface: WebInterface):
 		SoneTemplatePage("uploadImage.html", template, "Page.UploadImage.Title", webInterface, true) {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		if (request.isPOST) {
-			val parentAlbum = request.parameters["parent"]!!.let(webInterface.core::getAlbum) ?: throw RedirectException("noPermission.html")
-			if (parentAlbum.sone != getCurrentSone(request.toadletContext)) {
+	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+		if (freenetRequest.isPOST) {
+			val parentAlbum = freenetRequest.parameters["parent"]!!.let(webInterface.core::getAlbum) ?: throw RedirectException("noPermission.html")
+			if (parentAlbum.sone != getCurrentSone(freenetRequest.toadletContext)) {
 				throw RedirectException("noPermission.html")
 			}
-			val title = request.parameters["title", 200].emptyToNull ?: throw RedirectException("emptyImageTitle.html")
+			val title = freenetRequest.parameters["title", 200].emptyToNull ?: throw RedirectException("emptyImageTitle.html")
 
-			val uploadedFile = request.httpRequest.getUploadedFile("image")
+			val uploadedFile = freenetRequest.httpRequest.getUploadedFile("image")
 			val bytes = uploadedFile.data.use { it.toByteArray() }
 			val bufferedImage = bytes.toImage()
 			if (bufferedImage == null) {
@@ -40,11 +39,11 @@ class UploadImagePage(template: Template, webInterface: WebInterface):
 			}
 
 			val temporaryImage = webInterface.core.createTemporaryImage(bytes.mimeType, bytes)
-			webInterface.core.createImage(getCurrentSone(request.toadletContext), parentAlbum, temporaryImage).modify().apply {
+			webInterface.core.createImage(getCurrentSone(freenetRequest.toadletContext), parentAlbum, temporaryImage).modify().apply {
 				setWidth(bufferedImage.width)
 				setHeight(bufferedImage.height)
 				setTitle(title)
-				setDescription(TextFilter.filter(request.headers["Host"], request.parameters["description", 4000]))
+				setDescription(TextFilter.filter(freenetRequest.headers["Host"], freenetRequest.parameters["description", 4000]))
 			}.update()
 			throw RedirectException("imageBrowser.html?album=${parentAlbum.id}")
 		}