Remove mailserver field in email reporters

res/include/md/filesystem.md

@@ -91,15 +91,7 @@ server is hosted at `pixeldrain.com` on port 990. The encryption mode used is
 
 ![FTP configuration](/res/img/misc/ftp_login.webp)
 
-There are a two different ways to log in to the FTP server:
+There are two different ways to log in to the FTP server:
-
-#### Read-only shared directory
-
-To access a shared directory in read-only mode you need to enter the directory
-ID as username in your FTP client. The directory ID can be found at the end of a
-shared directory URL. Example: `https://pixeldrain.com/d/abcd1234`, in this case
-`abcd1234` is the directory ID. The ID will always be 8 characters long and is
-case-sensitive. The password must be left empty
 
 #### Read-write personal directory
 
@@ -108,3 +100,11 @@ as username in the FTP client. The password needs to be an API key from the [API
 keys page](/user/api_keys). If you connect now you will be able to access your
 personal directory (called `/me`). Here you can upload and download to your
 heart's desire.
+
+#### Read-only shared directory
+
+To access a shared directory in read-only mode you need to enter the directory
+ID as username in your FTP client. The directory ID can be found at the end of a
+shared directory URL. Example: `https://pixeldrain.com/d/abcd1234`, in this case
+`abcd1234` is the directory ID. The ID will always be 8 characters long and is
+case-sensitive. The password must be left empty

svelte/src/admin_panel/AbuseReporterTable.svelte

@@ -18,10 +18,7 @@ export let reporters = []
 	</tr>
 	{#each reporters as rep}
 		<tr>
-			<td>
+			<td>{rep.from_address}</td>
-				{rep.from_address}<br/>
-				{rep.mail_server}
-			</td>
 			<td>{rep.name}</td>
 			<td>{rep.reports_sent}</td>
 			<td>{rep.files_blocked}</td>

svelte/src/admin_panel/EmailReporters.svelte

@@ -45,7 +45,6 @@ const get_reporters = async () => {
 let edit_button
 let creating = false
 let new_reporter_from_address
-let new_reporter_mail_server
 let new_reporter_name
 let new_reporter_status = "trusted"
 
@@ -53,9 +52,6 @@ const create_reporter = async () => {
 	if (!new_reporter_from_address.value) {
 		alert("Please enter an e-mail address")
 		return
-	} else if (!new_reporter_mail_server.value) {
-		alert("Please enter a mail server")
-		return
 	} else if (!new_reporter_name.value) {
 		alert("Please enter a name")
 		return
@@ -67,7 +63,6 @@ const create_reporter = async () => {
 	try {
 		const form = new FormData()
 		form.append("from_address", new_reporter_from_address.value)
-		form.append("mail_server", new_reporter_mail_server.value)
 		form.append("name", new_reporter_name.value)
 		form.append("status", new_reporter_status)
 
@@ -90,7 +85,6 @@ const approve_reporter = async reporter => {
 	try {
 		const form = new FormData()
 		form.append("from_address", reporter.from_address)
-		form.append("mail_server", reporter.mail_server)
 		form.append("name", reporter.name)
 		form.append("status", "trusted")
 
@@ -110,7 +104,6 @@ const spam_reporter = async reporter => {
 	try {
 		const form = new FormData()
 		form.append("from_address", reporter.from_address)
-		form.append("mail_server", reporter.mail_server)
 		form.append("name", reporter.name)
 		form.append("status", "rejected")
 
@@ -132,7 +125,6 @@ const edit_reporter = async reporter => {
 	creating = true
 	await tick()
 	new_reporter_from_address.value = reporter.from_address
-	new_reporter_mail_server.value = reporter.mail_server
 	new_reporter_name.value = reporter.name
 	new_reporter_status = reporter.status
 }
@@ -140,9 +132,7 @@ const edit_reporter = async reporter => {
 const delete_reporter = async reporter => {
 	try {
 		const resp = await fetch(
-			window.api_endpoint+"/admin/abuse_reporter/"+
+			window.api_endpoint+"/admin/abuse_reporter/"+encodeURI(reporter.from_address),
-				encodeURI(reporter.from_address)+"/"+
-				encodeURI(reporter.mail_server),
 			{ method: "DELETE" }
 		);
 		if(resp.status >= 400) {
@@ -173,10 +163,8 @@ onMount(get_reporters);
 				<div class="form">
 					<label for="field_from_address">E-mail address</label>
 					<input id="field_from_address" type="text" bind:this={new_reporter_from_address}/>
-					<label for="field_mailserver">Mail server</label>
-					<input id="field_mailserver" type="text" bind:this={new_reporter_mail_server}/>
 					<label for="field_name">Name</label>
-					<input id="field_name" type="text" bind:this={new_reporter_name} value="Anonymous tip"/>
+					<input id="field_name" type="text" bind:this={new_reporter_name}/>
 					<label for="reporter_status">Status</label>
 					<div>
 						<input id="reporter_status_1" name="reporter_status" type="radio" bind:group={new_reporter_status} value="trusted" />