Removing local librairies 2

cli/cron.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+wget -qO- https://spot.lutran.fr/index.php?a=update_project > /dev/null
+
+#Crontab job: 0 * * * * . /var/www/spot/spot_cron.sh > /dev/null

composer.json

@@ -14,7 +14,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Franzz\\Spot\\": "inc/"
+            "Franzz\\Spot\\": "api/"
         },
         "files": [
             "settings.php"

index.php

@@ -25,9 +25,6 @@ $oValue		= $_REQUEST['value']		?? '';
 $iId		= $_REQUEST['id']			?? 0 ;
 $sType		= $_REQUEST['type']			?? '';
 $sEmail		= $_REQUEST['email']		?? '';
-$sLat		= $_REQUEST['latitude']		?? '';
-$sLng		= $_REQUEST['longitude']	?? '';
-$iTimestamp = $_REQUEST['timestamp']	?? 0;
 
 //Initiate class
 $oSpot = new Spot(__FILE__, $sTimezone);
@@ -73,9 +70,6 @@ if($sAction!='')
 					case 'add_comment':
 						$sResult = $oSpot->addComment($iId, $sContent);
 						break;
-					case 'add_position':
-						$sResult = $oSpot->addPosition($sLat, $sLng, $iTimestamp);
-						break;
 					case 'admin_new':
 						$sResult = $oSpot->createProject();
 						break;
@@ -94,9 +88,6 @@ if($sAction!='')
 					case 'sql':
 						$sResult = $oSpot->getDbBuildScript();
 						break;
-					case 'build_geojson':
-						$sResult = $oSpot->buildGeoJSON($sName);
-						break;
 					default:
 						$sResult = Main::getJsonResult(false, Main::NOT_FOUND);
 				}

lib/Converter.php

@@ -36,18 +36,18 @@ class Converter extends PhpObject {
 
 	public static function isGeoJsonValid($sCodeName) {
 		$bResult = false;
-		$sGpxFilePath = Geo::getFilePath($sCodeName, Gpx::EXT);
+		$sGpxFilePath = Gpx::getFilePath($sCodeName);
-		$sGeoJsonFilePath = Geo::getFilePath($sCodeName, GeoJson::EXT);
+		$sGeoJsonFilePath = GeoJson::getFilePath($sCodeName);
 		
 		//No need to generate if gpx is missing
-		if(!file_exists($sGpxFilePath) || file_exists($sGeoJsonFilePath) && filemtime($sGeoJsonFilePath) > filemtime(Geo::getFilePath($sCodeName, Gpx::EXT))) $bResult = true;
+		if(!file_exists($sGpxFilePath) || file_exists($sGeoJsonFilePath) && filemtime($sGeoJsonFilePath) > filemtime(Gpx::getFilePath($sCodeName))) $bResult = true;
 		return $bResult;
 	}
 }
 
 class Geo extends PhpObject {
 
-	const GEO_FOLDER = 'geo/';
+	const GEO_FOLDER = '../geo/';
 	const OPT_SIMPLE = 'simplification';
 
 	protected $asTracks;
@@ -55,12 +55,16 @@ class Geo extends PhpObject {
 
 	public function __construct($sCodeName) {
 		parent::__construct(get_class($this), Settings::DEBUG, PhpObject::MODE_HTML);
-		$this->sFilePath = self::getFilePath($sCodeName, static::EXT);
+		$this->sFilePath = self::getFilePath($sCodeName);
 		$this->asTracks = array();
 	}
 
-	public static function getFilePath($sCodeName, $sExt) {
+	public static function getFilePath($sCodeName) {
-		return self::GEO_FOLDER.$sCodeName.$sExt;
+		return self::GEO_FOLDER.$sCodeName.static::EXT;
+	}
+
+	public static function getDistFilePath($sCodeName) {
+		return 'geo/'.$sCodeName.static::EXT;
 	}
 
 	public function getLog() {

lib/Feed.php

@@ -168,31 +168,6 @@ class Feed extends PhpObject {
 		return $bNewMsg;
 	}
 
-	public function addManualPosition($sLat, $sLng, $iTimestamp) {
-		$sTimeZone = date_default_timezone_get();
-		$oDateTime = new \DateTime('@'.$iTimestamp);
-		$oDateTime->setTimezone(new \DateTimeZone($sTimeZone));
-		$asWeather = $this->getWeather(array($sLat, $sLng), $iTimestamp);
-
-		$asMsg = [
-			'ref_msg_id'	=> $iTimestamp.'/man',
-			'id_feed'		=> $this->getFeedId(),
-			'type'			=> 'OK',
-			'latitude'		=> $sLat,
-			'longitude'		=> $sLng,
-			'iso_time' 		=> $oDateTime->format("Y-m-d\TH:i:sO"), //Incorrect ISO 8601 format, but compliant with Spot data
-			'site_time'		=> $oDateTime->format(Db::TIMESTAMP_FORMAT),
-			'timezone'		=> $sTimeZone,
-			'unix_time'		=> $iTimestamp,
-			'content'		=> '',
-			'battery_state'	=> '',
-			'posted_on'		=> date(Db::TIMESTAMP_FORMAT),
-		];
-
-		$iMessageId = $this->oDb->insertRow(self::MSG_TABLE, array_merge($asMsg, $asWeather));
-		return $iMessageId;
-	}
-
 	private function updateFeed() {
 		$bNewMsg = false;
 		$asData = $this->retrieveFeed();

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/Project.php

@@ -144,8 +144,8 @@ class Project extends PhpObject {
 
 			if($sCodeName != '' && !Converter::isGeoJsonValid($sCodeName)) Converter::convertToGeoJson($sCodeName);
 
-			$asProject['geofilepath'] = Spot::addTimestampToFilePath(Geo::getFilePath($sCodeName, GeoJson::EXT));
+			$asProject['geofilepath'] = Spot::addTimestampToFilePath(GeoJson::getDistFilePath($sCodeName));
-			$asProject['gpxfilepath'] = Spot::addTimestampToFilePath(Geo::getFilePath($sCodeName, Gpx::EXT));
+			$asProject['gpxfilepath'] = Spot::addTimestampToFilePath(Gpx::getDistFilePath($sCodeName));
 			$asProject['codename'] = $sCodeName;
 		}
 		return $bSpecificProj?$asProject:$asProjects;

lib/Spot.php

@@ -40,6 +40,8 @@ class Spot extends Main
 
 	const DEFAULT_LANG = 'en';
 
+	const MAIN_PAGE = 'index';
+
 	private Project $oProject;
 	private Media $oMedia;
 	private User $oUser;
@@ -158,42 +160,42 @@ class Spot extends Main
 		);
 	}
 
-	public function getAppMainPage()
+	public function getAppParams() {
-	{
+
 		//Cache Page List
 		$asPages = array_diff($this->asMasks, array('email_update', 'email_conf'));
 		if(!$this->oUser->checkUserClearance(User::CLEARANCE_ADMIN)) {
 			$asPages = array_diff($asPages, array('admin', 'upload'));
 		}
 
+		$asGlobalVars = array(
+			'vars' => array(
+				'chunk_size'				=> self::FEED_CHUNK_SIZE,
+				'default_project_codename'	=> $this->oProject->getProjectCodeName(),
+				'projects'					=> $this->oProject->getProjects(),
+				'user'						=> $this->oUser->getUserInfo()
+			),
+			'consts' => array(
+				'server'					=> $this->asContext['serv_name'],
+				'modes'						=> Project::MODES,
+				'clearances'				=> User::CLEARANCES,
+				'default_timezone'			=> Settings::TIMEZONE
+			)
+		);
+
+		return self::getJsonResult(true, '', parent::getParams($asGlobalVars, self::MAIN_PAGE, $asPages));
+	}
+
+	public function getAppMainPage()
+	{
 		return parent::getMainPage(
+			self::MAIN_PAGE,
 			array(
-				'vars' => array(
+				'language'		=> $this->oLang->getLanguage(),
-					'chunk_size'				=> self::FEED_CHUNK_SIZE,
+				'host_url'		=> $this->asContext['serv_name'],
-					'default_project_codename'	=> $this->oProject->getProjectCodeName(),
+				'filepath_css'	=> self::addTimestampToFilePath('spot.css'),
-					'projects'					=> $this->oProject->getProjects(),
+				'filepath_js'	=> self::addTimestampToFilePath('../dist/app.js')
-					'user'						=> $this->oUser->getUserInfo()
+			)
-				),
-				'consts' => array(
-					'server'					=> $this->asContext['serv_name'],
-					'modes'						=> Project::MODES,
-					'clearances'				=> User::CLEARANCES,
-					'default_timezone'			=> Settings::TIMEZONE
-				)
-			),
-			'index',
-			array(
-				'language'					=> $this->oLang->getLanguage(),
-				'host_url'					=> $this->asContext['serv_name'],
-				'filepath_css'				=> self::addTimestampToFilePath('style/spot.css'),
-				'filepath_js_d3'			=> self::addTimestampToFilePath('script/d3.min.js'),
-				'filepath_js_leaflet'		=> self::addTimestampToFilePath('script/leaflet.min.js'),
-				'filepath_js_jquery'		=> self::addTimestampToFilePath('script/jquery.min.js'),
-				'filepath_js_jquery_mods'	=> self::addTimestampToFilePath('script/jquery.mods.js'),
-				'filepath_js_spot'			=> self::addTimestampToFilePath('script/spot.js'),
-				'filepath_js_lightbox'		=> self::addTimestampToFilePath('script/lightbox.js')
-			),
-			$asPages
 		);
 	}
 
@@ -630,13 +632,6 @@ class Spot extends Main
 		return self::getJsonResult($asResult['result'], $asResult['desc'], $asResult['data']);
 	}
 
-	public function addPosition($sLat, $sLng, $iTimestamp) {
-		$oFeed = new Feed($this->oDb, $this->oProject->getFeedIds()[0]);
-		$bResult = ($oFeed->addManualPosition($sLat, $sLng, $iTimestamp) > 0);
-
-		return self::getJsonResult($bResult, $bResult?'':$this->oDb->getLastError());
-	}
-
 	public function getAdminSettings($sType='') {
 		$oFeed = new Feed($this->oDb);
 		$asData = array(
@@ -751,10 +746,6 @@ class Spot extends Main
 		));
 	}
 
-	public function buildGeoJSON($sCodeName) {
-		return Converter::convertToGeoJson($sCodeName);
-	}
-
 	public static function decToDms($dValue, $sType) {
 		if($sType=='lat')	$sDirection = ($dValue >= 0)?'N':'S'; //Latitude
 		else				$sDirection = ($dValue >= 0)?'E':'W'; //Longitude

lib/index.php

@@ -0,0 +1,107 @@
+<?php
+
+/* Requests Handler */
+
+//Start buffering
+ob_start();
+
+//Run from /dist/
+$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 'params':
+			$sResult = $oSpot->getAppParams();
+			break;
+		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;

masks/upload.html

@@ -6,9 +6,6 @@
     	<div class="bar" style="width: 0%;"></div>
 	</div>
 	<div id="comments"></div>
-	<div id="location">
-		<button id="add_loc"><i class="fa fa-message push"></i>New Position</button>
-	</div>
 	<div id="status"></div>
 </div>
 <script type="text/javascript">
@@ -38,27 +35,6 @@ oSpot.pageInit = function(asHash) {
 					$('#progress .bar').css('width', progress+'%');
 				}
 			});
-
-		$('#add_loc').click(() => {
-			if(navigator.geolocation) {
-				addStatus('Determining position...');
-				navigator.geolocation.getCurrentPosition(
-					(position) => {
-						addStatus('Sending position...');
-						oSpot.get(
-							'add_position',
-							function(asData){addStatus('Position sent');},
-							{'latitude':position.coords.latitude, 'longitude':position.coords.longitude, 'timestamp':Math.round(position.timestamp / 1000)},
-							function(sMsgId){addStatus(self.lang(sMsgId));},
-						);
-					},
-					(error) => {
-						addStatus(error.message);
-					}
-				);
-			} 
-			else addStatus('This browser does not support geolocation');
-		});
 	}
 	else addStatus(self.lang('upload_mode_archived', [asProject.name]), true);
 };

readme.md

@@ -22,7 +22,6 @@
 4. Copy settings-sample.php to settings.php and populate
 5. Go to #admin and create a new project, feed & maps
 6. Add a GPX file named <project_codename>.gpx to /geo/
-7. Run composer install
 ## To Do List
 * ECMA import/export
 * Add mail frequency slider

src/styles/_leaflet.scss

@@ -9,7 +9,7 @@ $stroke-width-mouse-focus : 1;
 $stroke-width-height-focus: 2;
 $stroke-width-axis : 2;
 
-@import 'leaflet/leaflet';
+@import '../../node_modules/leaflet/dist/leaflet';
 @import 'leaflet/leaflet_heightgraph';
 
 /* Leaflet fixes */
@@ -108,3 +108,7 @@ $stroke-width-axis : 2;
 		}
 	}
 }
+
+.leaflet-default-icon-path {
+	background-image: none;
+}

src/styles/_lightbox.scss

@@ -1,4 +1,4 @@
-@import 'lightbox/lightbox';
+@import '../../node_modules/lightbox2/dist/css/lightbox.css';
 
 @mixin lightbox-icon($icon) {
 	background: none;