franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change log folder

Browse Source
This commit is contained in:
Franzz
2023-08-06 13:54:59 +02:00
parent 402d8f271e
commit 04f5ce8a9c
11 changed files with 61 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -1,11 +1,5 @@
/build.xml
/settings.php
/.externalToolBuilders/
/.sass-cache/
/.buildpath
/.project
/style/.sass-cache/
/.settings/
/files/**/*.jpg
/files/**/*.JPG
/files/**/*.jpeg
@@ -17,3 +11,4 @@
/geo/*.geojson
/spot_cron.sh
/vendor/*
/log.html

30
composer.lock generated
View File

@@ -12,7 +12,7 @@
"dist": {
"type": "path",
"url": "../objects",
"reference": "25c0f66cff31e30c730a6891e5e15b1cc209af67"
"reference": "e1cf78b992a6f52742d6834f7508c0ef373ac860"
},
"type": "library",
"autoload": {
@@ -27,16 +27,16 @@
},
{
"name": "phpmailer/phpmailer",
"version": "v6.6.4",
"version": "v6.8.0",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b"
"reference": "df16b615e371d81fb79e506277faea67a1be18f1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a94fdebaea6bd17f51be0c2373ab80d3d681269b",
"reference": "a94fdebaea6bd17f51be0c2373ab80d3d681269b",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/df16b615e371d81fb79e506277faea67a1be18f1",
"reference": "df16b615e371d81fb79e506277faea67a1be18f1",
"shasum": ""
},
"require": {
@@ -46,22 +46,24 @@
"php": ">=5.5.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"doctrine/annotations": "^1.2",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"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.6.2",
"yoast/phpunit-polyfills": "^1.0.0"
"squizlabs/php_codesniffer": "^3.7.1",
"yoast/phpunit-polyfills": "^1.0.4"
},
"suggest": {
"ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
"ext-openssl": "Needed for secure SMTP sending and DKIM signing",
"greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
"hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
"league/oauth2-google": "Needed for Google XOAUTH2 authentication",
"psr/log": "For optional PSR-3 debug logging",
"stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
"symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
"thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
},
"type": "library",
"autoload": {
@@ -93,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.6.4"
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.8.0"
},
"funding": [
{
@@ -101,7 +103,7 @@
"type": "github"
}
],
"time": "2022-08-22T09:22:00+00:00"
"time": "2023-03-06T14:43:22+00:00"
}
],
"packages-dev": [],
@@ -114,5 +116,5 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "2.2.0"
"plugin-api-version": "2.3.0"
}

10
inc/Converter.php
View File

@@ -19,7 +19,7 @@ use \Settings;
class Converter extends PhpObject {
public function __construct() {
parent::__construct(__CLASS__, Settings::DEBUG);
parent::__construct(__CLASS__);
}
public static function convertToGeoJson($sCodeName) {
@@ -36,8 +36,11 @@ class Converter extends PhpObject {
public static function isGeoJsonValid($sCodeName) {
$bResult = false;
$sGpxFilePath = Geo::getFilePath($sCodeName, Gpx::EXT);
$sGeoJsonFilePath = Geo::getFilePath($sCodeName, GeoJson::EXT);
if(file_exists($sGeoJsonFilePath) && filemtime($sGeoJsonFilePath) > filemtime(Geo::getFilePath($sCodeName, Gpx::EXT))) $bResult = true;
//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;
return $bResult;
}
}
@@ -80,6 +83,8 @@ class Gpx extends Geo {
private function parseFile() {
$this->addNotice('Parsing: '.$this->sFilePath);
if(!file_exists($this->sFilePath)) $this->addError($this->sFilePath.' file missing');
else {
$oXml = simplexml_load_file($this->sFilePath);
//Tracks
@@ -109,6 +114,7 @@ class Gpx extends Geo {
$this->addNotice('Ignoring '.count($oXml->wpt).' waypoints');
}
}
}
class GeoJson extends Geo {

1
inc/Email.php
View File

@@ -22,6 +22,7 @@ class Email extends PhpObject {
private $asDests;
public function __construct($sServName, $sTemplateName='') {
parent::__construct(__CLASS__);
$this->sServName = $sServName;
$this->setTemplate($sTemplateName);
$this->asDests = array();

2
inc/Feed.php
View File

@@ -54,7 +54,7 @@ class Feed extends PhpObject {
private $iLastUpdate;
public function __construct(Db &$oDb, $iFeedId=0) {
parent::__construct(__CLASS__, Settings::DEBUG);
parent::__construct(__CLASS__);
$this->oDb = &$oDb;
if($iFeedId > 0) $this->setFeedId($iFeedId);
}

2
inc/Map.php
View File

@@ -15,7 +15,7 @@ class Map extends PhpObject {
private $asMaps;
public function __construct(Db &$oDb) {
parent::__construct(__CLASS__, Settings::DEBUG);
parent::__construct(__CLASS__);
$this->oDb = &$oDb;
$this->setMaps();
}

2
inc/Media.php
View File

@@ -35,7 +35,7 @@ class Media extends PhpObject {
private $iMediaId;
public function __construct(Db &$oDb, &$oProject, $iMediaId=0) {
parent::__construct(__CLASS__, Settings::DEBUG);
parent::__construct(__CLASS__);
$this->oDb = &$oDb;
$this->oProject = &$oProject;
$this->asMedia = array();

10
inc/Project.php
View File

@@ -22,14 +22,16 @@ class Project extends PhpObject {
*/
private $oDb;
private $iProjectId;
private $sMode;
private $sName;
private $sCodeName;
private $sMode;
private $asActive;
private $asGeo;
public function __construct(Db &$oDb, $iProjectId=0) {
parent::__construct(__CLASS__, Settings::DEBUG);
parent::__construct(__CLASS__);
$this->oDb = &$oDb;
if($iProjectId > 0) $this->setProjectId($iProjectId);
}
@@ -179,10 +181,10 @@ class Project extends PhpObject {
if($this->getProjectId() > 0) {
$asProject = $this->getProject();
$this->sName = $asProject['name'];
$this->sCodeName = $asProject['codename'];
$this->sMode = $asProject['mode'];
$this->asActive = array('from'=>$asProject['active_from'], 'to'=>$asProject['active_to']);
$this->sCodeName = $asProject['codename'];
$this->sName = $asProject['name'];
$this->asGeo = array('geofile'=>$asProject['geofilepath'], 'gpxfile'=>$asProject['gpxfilepath']);
}
else $this->addError('Error while setting project: no project ID');

5
inc/Spot.php
View File

@@ -47,7 +47,7 @@ class Spot extends Main
public function __construct($sProcessPage, $sTimezone)
{
parent::__construct($sProcessPage, true, __FILE__, $sTimezone);
parent::__construct($sProcessPage, true, $sTimezone);
$this->oUser = new User($this->oDb);
@@ -248,8 +248,7 @@ class Spot extends Main
}
$bSuccess = $oEmail->send();
if(!$bSuccess) $sDesc = $oEmail->ErrorInfo;
else $sDesc = 'mail_sent';
$sDesc = $bSuccess?'mail_sent':'mail_failure';
}
else $sDesc = 'no_new_msg';

2
inc/User.php
View File

@@ -31,7 +31,7 @@ class User extends PhpObject {
private $asUserInfo;
public function __construct(Db &$oDb) {
parent::__construct(__CLASS__, Settings::DEBUG);
parent::__construct(__CLASS__);
$this->oDb = &$oDb;
$this->iUserId = 0;
$this->asUserInfo = array(

1
settings-sample.php
View File

@@ -16,4 +16,5 @@ class Settings
const WEATHER_TOKEN = ''; //visualcrossing.com
const TIMEZONE_USER = ''; //geonames.org
const DEBUG = true;
const LOG_FOLDER = __DIR__;
}