Move php classes

composer.json

@@ -14,10 +14,10 @@
     },
     "autoload": {
         "psr-4": {
-            "Franzz\\Spot\\": "api/"
+            "Franzz\\Spot\\": "lib/"
         },
         "files": [
-            "settings.php"
+            "config/settings.php"
         ]
     }
 }

composer.lock

@@ -27,16 +27,16 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.8.0",
+            "version": "v6.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "df16b615e371d81fb79e506277faea67a1be18f1"
+                "reference": "e88da8d679acc3824ff231fdc553565b802ac016"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/df16b615e371d81fb79e506277faea67a1be18f1",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e88da8d679acc3824ff231fdc553565b802ac016",
-                "reference": "df16b615e371d81fb79e506277faea67a1be18f1",
+                "reference": "e88da8d679acc3824ff231fdc553565b802ac016",
                 "shasum": ""
             },
             "require": {
@@ -46,13 +46,13 @@
                 "php": ">=5.5.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
                 "doctrine/annotations": "^1.2.6 || ^1.13.3",
                 "php-parallel-lint/php-console-highlighter": "^1.0.0",
                 "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcompatibility/php-compatibility": "^9.3.5",
                 "roave/security-advisories": "dev-latest",
-                "squizlabs/php_codesniffer": "^3.7.1",
+                "squizlabs/php_codesniffer": "^3.7.2",
                 "yoast/phpunit-polyfills": "^1.0.4"
             },
             "suggest": {
@@ -95,7 +95,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.8.0"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.8.1"
             },
             "funding": [
                 {
@@ -103,7 +103,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-06T14:43:22+00:00"
+            "time": "2023-08-29T08:26:30+00:00"
         }
     ],
     "packages-dev": [],

index.php

@@ -1,103 +0,0 @@
-<?php
-
-/* Requests Handler */
-
-//Start buffering
-ob_start();
-
-$oLoader = require __DIR__.'/vendor/autoload.php';
-
-use Franzz\Objects\ToolBox;
-use Franzz\Objects\Main;
-use Franzz\Spot\Spot;
-use Franzz\Spot\User;
-
-ToolBox::fixGlobalVars($argv ?? array());
-
-//Available variables
-$sAction	= $_REQUEST['a']			?? '';
-$sTimezone	= $_REQUEST['t']			?? '';
-$sName		= $_GET['name']				?? '';
-$sContent	= $_GET['content']			?? '';
-$iProjectId	= $_REQUEST['id_project']	?? 0 ;
-$sField		= $_REQUEST['field']		?? '';
-$oValue		= $_REQUEST['value']		?? '';
-$iId		= $_REQUEST['id']			?? 0 ;
-$sType		= $_REQUEST['type']			?? '';
-$sEmail		= $_REQUEST['email']		?? '';
-
-//Initiate class
-$oSpot = new Spot(__FILE__, $sTimezone);
-$oSpot->setProjectId($iProjectId);
-
-$sResult = '';
-if($sAction!='')
-{
-	switch($sAction)
-	{
-		case 'markers':
-			$sResult = $oSpot->getMarkers();
-			break;
-		case 'next_feed':
-			$sResult = $oSpot->getNextFeed($iId);
-			break;
-		case 'new_feed':
-			$sResult = $oSpot->getNewFeed($iId);
-			break;
-		case 'add_post':
-			$sResult = $oSpot->addPost($sName, $sContent);
-			break;
-		case 'subscribe':
-			$sResult = $oSpot->subscribe($sEmail, $sName);
-			break;
-		case 'unsubscribe':
-			$sResult = $oSpot->unsubscribe();
-			break;
-		case 'unsubscribe_email':
-			$sResult = $oSpot->unsubscribeFromEmail($iId);
-			break;
-		case 'update_project':
-			$sResult = $oSpot->updateProject();
-			break;
-		default:
-			if($oSpot->checkUserClearance(User::CLEARANCE_ADMIN))
-			{
-				switch($sAction)
-				{
-					case 'upload':
-						$sResult = $oSpot->upload();
-						break;
-					case 'add_comment':
-						$sResult = $oSpot->addComment($iId, $sContent);
-						break;
-					case 'admin_new':
-						$sResult = $oSpot->createProject();
-						break;
-					case 'admin_get':
-						$sResult = $oSpot->getAdminSettings();
-						break;
-					case 'admin_set':
-						$sResult = $oSpot->setAdminSettings($sType, $iId, $sField, $oValue);
-						break;
-					case 'admin_del':
-						$sResult = $oSpot->delAdminSettings($sType, $iId);
-						break;
-					case 'generate_cron':
-						$sResult = $oSpot->genCronFile();
-						break;
-					case 'sql':
-						$sResult = $oSpot->getDbBuildScript();
-						break;
-					default:
-						$sResult = Main::getJsonResult(false, Main::NOT_FOUND);
-				}
-			}
-			else $sResult = Main::getJsonResult(false, Main::NOT_FOUND);
-	}
-}
-else $sResult = $oSpot->getAppMainPage();
-
-$sDebug = ob_get_clean();
-if(Settings::DEBUG && $sDebug!='') $oSpot->addUncaughtError($sDebug);
-
-echo $sResult;

lib/Media.php

@@ -12,7 +12,7 @@ class Media extends PhpObject {
 	const MEDIA_TABLE = 'medias';
 
 	//Media folders
-	const MEDIA_FOLDER = '../files/';
+	const MEDIA_FOLDER = 'files/';
 	const THUMB_FOLDER = self::MEDIA_FOLDER.'thumbs/';
 
 	const THUMB_MAX_WIDTH = 400;

lib/Uploader.php

@@ -25,7 +25,12 @@ class Uploader extends UploadHandler
 		$this->oMedia = &$oMedia;
 		$this->oLang = &$oLang;
 		$this->sBody = '';
-		parent::__construct(array('image_versions'=>array(), 'accept_file_types'=>'/\.(gif|jpe?g|png|mov|mp4)$/i'));
+
+		parent::__construct(array(
+			'upload_dir'		=> Media::MEDIA_FOLDER,
+			'image_versions'	=> array(),
+			'accept_file_types'	=> '/\.(gif|jpe?g|png|mov|mp4)$/i'
+		));
 	}
 
 	protected function validate($uploaded_file, $file, $error, $index, $content_range) {