From 812185f0e721bc2e500c590eb3ffe96a5cd1a518 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sat, 25 Apr 2015 16:53:52 +0200
Subject: API 1.3.0: Allow multipaste creation for basic access

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/controllers/api/v1/api_info.php | 2 +-
 application/controllers/api/v1/file.php     | 2 +-
 application/controllers/file.php            | 2 +-
 application/tests/test_api_v1.php           | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'application')

diff --git a/application/controllers/api/v1/api_info.php b/application/controllers/api/v1/api_info.php
index e7738294e..abc4fd51e 100644
--- a/application/controllers/api/v1/api_info.php
+++ b/application/controllers/api/v1/api_info.php
@@ -11,6 +11,6 @@ namespace controllers\api\v1;
 class api_info extends \controllers\api\api_controller {
 	static public function get_version()
 	{
-		return "1.2.0";
+		return "1.3.0";
 	}
 }
diff --git a/application/controllers/api/v1/file.php b/application/controllers/api/v1/file.php
index 266b1aff8..ccc83f404 100644
--- a/application/controllers/api/v1/file.php
+++ b/application/controllers/api/v1/file.php
@@ -70,7 +70,7 @@ class file extends \controllers\api\api_controller {
 
 	public function create_multipaste()
 	{
-		$this->muser->require_access("apikey");
+		$this->muser->require_access("basic");
 		$ids = $this->input->post("ids");
 		$userid = $this->muser->get_userid();
 		$limits = $this->muser->get_upload_id_limits();
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 06ab4fc71..12fb793bd 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -750,7 +750,7 @@ class File extends MY_Controller {
 
 	function do_multipaste()
 	{
-		$this->muser->require_access("apikey");
+		$this->muser->require_access("basic");
 
 		$ids = $this->input->post("ids");
 		$userid = $this->muser->get_userid();
diff --git a/application/tests/test_api_v1.php b/application/tests/test_api_v1.php
index 8277f14d5..50264b6da 100644
--- a/application/tests/test_api_v1.php
+++ b/application/tests/test_api_v1.php
@@ -324,7 +324,7 @@ class test_api_v1 extends Test {
 
 	public function test_create_multipaste_canCreate()
 	{
-		$apikey = $this->createUserAndApikey();
+		$apikey = $this->createUserAndApikey("basic");
 		$ret = $this->uploadFile($apikey, "data/tests/small-file");
 		$id = $ret["data"]["ids"][0];
 
@@ -344,7 +344,7 @@ class test_api_v1 extends Test {
 
 	public function test_create_multipaste_errorOnWrongID()
 	{
-		$apikey = $this->createUserAndApikey();
+		$apikey = $this->createUserAndApikey("basic");
 		$ret = $this->uploadFile($apikey, "data/tests/small-file");
 		$id = $ret["data"]["ids"][0];
 
@@ -373,8 +373,8 @@ class test_api_v1 extends Test {
 
 	public function test_create_multipaste_errorOnWrongOwner()
 	{
-		$apikey = $this->createUserAndApikey();
-		$apikey2 = $this->createUserAndApikey();
+		$apikey = $this->createUserAndApikey("basic");
+		$apikey2 = $this->createUserAndApikey("basic");
 		$ret = $this->uploadFile($apikey, "data/tests/small-file");
 		$id = $ret["data"]["ids"][0];
 
-- 
cgit v1.2.3-24-g4f1b