X-Git-Url: https://jfr.im/git/uguu.git/blobdiff_plain/4112f8f60692196e45fb5b47d4f633d2b2c8f992..f2750d4234677ac5ab998305342107f3611d67d6:/api.php?ds=sidebyside

diff --git a/api.php b/api.php
index 8b2a78d..a58709e 100644
--- a/api.php
+++ b/api.php
@@ -1,10 +1,19 @@
 <?php
+//Loading configuration file
+require_once "includes/config.php";
+
 //If the value d doesn't exist, redirect back to front page *1
 if(isset($_GET['d'])) {
     //Include the core file with the functions
-    include_once('includes/core.php');
+    include_once(CONFIG_ROOT_PATH.'includes/core.php');
     switch ($_GET['d']) {
+    	//Uploading with HTML response and errors
         case 'upload':
+        //If no file is being posted, show the error page and exit.
+        if(empty($_FILES['file']['name'])){
+        	include_once(CONFIG_ROOT_PATH.'error.php');
+        	exit(0);
+        }
         //Set the name value to the original filename
 	$name = $_FILES['file']['name'];
 	$arg = 'custom_original';
@@ -16,13 +25,32 @@ if(isset($_GET['d'])) {
         $name = $_FILES['file']['name'];
 	$arg = 'random';}
 	//Call the save function which sends the file+name
-	save_file($_FILES['file']['tmp_name'], $name, $arg);
+	save_file($_FILES['file']['tmp_name'], $name, $arg, 'normal');
+	break;
+	//Uploading without HTML response or errors
+	case 'upload-tool':
+	        //If no file is being posted, show the error page and exit.
+        if(empty($_FILES['file']['name'])){
+		exit('You did not send a file, try again.');
+        }
+        //Set the name value to the original filename
+	$name = $_FILES['file']['name'];
+	$arg = 'custom_original';
+	//If the value name contains a custom name, set the name value
+	if(!empty($_POST['name'])){
+	$name = $_POST['name'];}
+	//If value contains anything, keep original filename
+	if(!empty($_POST['randomname'])){
+        $name = $_FILES['file']['name'];
+	$arg = 'random';}
+	//Call the save function which sends the file+name
+	save_file($_FILES['file']['tmp_name'], $name, $arg, 'tool');
 	break;
         case 'extend-time':
             break;
 	default:
 	//If no correct valid argument for the api to perform on, tell them to enter a valid one
-	exit('Please provide a valid argument. Example: curl -i -F name=test.jpg -F file=@localfile.jpg http://uguu.se/api.php?d=upload');
+	exit('Please provide a valid argument. Example: curl -i -F name=test.jpg -F file=@localfile.jpg '.CONFIG_ROOT_URL.'/api.php?d=upload-tool');
 	break;
     }
 }else{