mfile->add_file: Take userid via argument

This allows for easier testing.

Signed-off-by: Florian Pritz <bluewind@xinu.at>

3 files changed, 12 insertions, 6 deletions

diff --git a/application/controllers/api/v1/file.php b/application/controllers/api/v1/file.php
index 784f42555..6536335cb 100644
--- a/application/controllers/api/v1/file.php
+++ b/application/controllers/api/v1/file.php
@@ -30,11 +30,12 @@ class file extends \controllers\api\api_controller {
 		\service\files::verify_uploaded_files($files);
 
 		$limits = $this->muser->get_upload_id_limits();
+		$userid = $this->muser->get_userid();
 		$urls = array();
 
 		foreach ($files as $file) {
 			$id = $this->mfile->new_id($limits[0], $limits[1]);
-			\service\files::add_uploaded_file($id, $file["tmp_name"], $file["name"]);
+			\service\files::add_uploaded_file($userid, $id, $file["tmp_name"], $file["name"]);
 			$ids[] = $id;
 			$urls[] = site_url($id).'/';
 		}
diff --git a/application/controllers/api/v2/file.php b/application/controllers/api/v2/file.php
index ebe717f73..79da1c4b8 100644
--- a/application/controllers/api/v2/file.php
+++ b/application/controllers/api/v2/file.php
@@ -30,11 +30,12 @@ class file extends \controllers\api\api_controller {
 		\service\files::verify_uploaded_files($files);
 
 		$limits = $this->muser->get_upload_id_limits();
+		$userid = $this->muser->get_userid();
 		$urls = array();
 
 		foreach ($files as $file) {
 			$id = $this->mfile->new_id($limits[0], $limits[1]);
-			\service\files::add_uploaded_file($id, $file["tmp_name"], $file["name"]);
+			\service\files::add_uploaded_file($userid, $id, $file["tmp_name"], $file["name"]);
 			$ids[] = $id;
 			$urls[] = site_url($id).'/';
 		}
diff --git a/application/controllers/file.php b/application/controllers/file.php
index d882b9334..d432386ab 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -921,11 +921,12 @@ class File extends MY_Controller {
 
 		if (!empty($files)) {
 			$limits = $this->muser->get_upload_id_limits();
+			$userid = $this->muser->get_userid();
 			service\files::verify_uploaded_files($files);
 
 			foreach ($files as $key => $file) {
 				$id = $this->mfile->new_id($limits[0], $limits[1]);
-				service\files::add_uploaded_file($id, $file["tmp_name"], $file["name"]);
+				service\files::add_uploaded_file($userid, $id, $file["tmp_name"], $file["name"]);
 				$ids[] = $id;
 			}
 		}
@@ -950,6 +951,8 @@ class File extends MY_Controller {
 		}
 
 		$limits = $this->muser->get_upload_id_limits();
+		$userid = $this->muser->get_userid();
+
 		foreach ($contents as $key => $content) {
 			$filename = "stdin";
 			if (isset($filenames[$key]) && $filenames[$key] != "") {
@@ -957,7 +960,7 @@ class File extends MY_Controller {
 			}
 
 			$id = $this->mfile->new_id($limits[0], $limits[1]);
-			service\files::add_file_data($id, $content, $filename);
+			service\files::add_file_data($userid, $id, $content, $filename);
 			$ids[] = $id;
 		}
 
@@ -986,6 +989,8 @@ class File extends MY_Controller {
 		service\files::verify_uploaded_files($files);
 		$limits = $this->muser->get_upload_id_limits();
 
+		$userid = $this->muser->get_userid();
+
 		foreach ($files as $key => $file) {
 			$id = $this->mfile->new_id($limits[0], $limits[1]);
 
@@ -1003,12 +1008,11 @@ class File extends MY_Controller {
 
 			$filename = trim($filename, "\r\n\0\t\x0B");
 
-			service\files::add_uploaded_file($id, $file["tmp_name"], $filename);
+			service\files::add_uploaded_file($userid, $id, $file["tmp_name"], $filename);
 			$ids[] = $id;
 		}
 
 		if ($multipaste !== false) {
-			$userid = $this->muser->get_userid();
 			$ids[] = \service\files::create_multipaste($ids, $userid, $limits)["url_id"];
 		}