2 files changed, 13 insertions, 46 deletions
diff --git a/application/controllers/api/v1/file.php b/application/controllers/api/v1/file.php
index 0035d0a02..fc5565416 100644
--- a/application/controllers/api/v1/file.php
+++ b/application/controllers/api/v1/file.php
@@ -67,5 +67,15 @@ class file extends \controllers\api\api_controller {
 		$ids = $this->input->post("ids");
 		return \service\files::delete($ids);
 	}
+
+	public function create_multipaste()
+	{
+		$this->muser->require_access("apikey");
+		$ids = $this->input->post("ids");
+		$userid = $this->muser->get_userid();
+		$limits = $this->muser->get_upload_id_limits();
+
+		return \service\files::create_multipaste($ids, $userid, $limits);
+	}
 }
 # vim: set noet:
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 1b45c1ba3..c60831cba 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -700,55 +700,12 @@ class File extends MY_Controller {
 		$this->muser->require_access("apikey");
 
 		$ids = $this->input->post("ids");
-		$errors = array();
-
-		if (!$ids || !is_array($ids)) {
-			show_error("No IDs specified");
-		}
-
-		if (count(array_unique($ids)) != count($ids)) {
-			show_error("Duplicate IDs are not supported");
-		}
-
-		foreach ($ids as $id) {
-			if (!$this->mfile->id_exists($id)) {
-				$errors[] = array(
-					"id" => $id,
-					"reason" => "doesn't exist",
-				);
-			}
-
-			$filedata = $this->mfile->get_filedata($id);
-			if ($filedata["user"] != $this->muser->get_userid()) {
-				$errors[] = array(
-					"id" => $id,
-					"reason" => "not owned by you",
-				);
-			}
-		}
-
-		if (!empty($errors)) {
-			$errorstring = "";
-			foreach ($errors as $error) {
-				$errorstring .= $error["id"]." ".$error["reason"]."<br>\n";
-			}
-			show_error($errorstring);
-		}
-
+		$userid = $this->muser->get_userid();
 		$limits = $this->muser->get_upload_id_limits();
-		$url_id = $this->mmultipaste->new_id($limits[0], $limits[1]);
-
-		$multipaste_id = $this->mmultipaste->get_multipaste_id($url_id);
-		assert($multipaste_id !== false);
 
-		foreach ($ids as $id) {
-			$this->db->insert("multipaste_file_map", array(
-				"file_url_id" => $id,
-				"multipaste_id" => $multipaste_id,
-			));
-		}
+		$ret = \service\files::create_multipaste($ids, $userid, $limits);
 
-		return $this->_show_url(array($url_id), false);
+		return $this->_show_url(array($ret["url_id"]), false);
 	}
 
 	function delete()