composer v1
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -16,3 +16,4 @@
|
|||||||
/files/**/*.MOV
|
/files/**/*.MOV
|
||||||
/geo/*.geojson
|
/geo/*.geojson
|
||||||
/spot_cron.sh
|
/spot_cron.sh
|
||||||
|
/vendor/*
|
||||||
|
|||||||
23
composer.json
Normal file
23
composer.json
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"name": "franzz/spot",
|
||||||
|
"description": "Spotty",
|
||||||
|
"type": "project",
|
||||||
|
"repositories": [
|
||||||
|
{
|
||||||
|
"type": "path",
|
||||||
|
"url": "../objects"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"require": {
|
||||||
|
"franzz/objects": "dev-composer",
|
||||||
|
"phpmailer/phpmailer": "^6.5"
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Franzz\\Spot\\": "inc/"
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"settings.php"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
116
composer.lock
generated
Normal file
116
composer.lock
generated
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
{
|
||||||
|
"_readme": [
|
||||||
|
"This file locks the dependencies of your project to a known state",
|
||||||
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
|
"This file is @generated automatically"
|
||||||
|
],
|
||||||
|
"content-hash": "164c903fea5bdcfb36cf6ea31ec0c307",
|
||||||
|
"packages": [
|
||||||
|
{
|
||||||
|
"name": "franzz/objects",
|
||||||
|
"version": "dev-composer",
|
||||||
|
"dist": {
|
||||||
|
"type": "path",
|
||||||
|
"url": "../objects",
|
||||||
|
"reference": "b4f1225a56a5e0e8a784e8406ea6ddbc0cc6f307"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Franzz\\Objects\\": "inc"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"description": "Objects",
|
||||||
|
"transport-options": {
|
||||||
|
"relative": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "phpmailer/phpmailer",
|
||||||
|
"version": "v6.5.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/PHPMailer/PHPMailer.git",
|
||||||
|
"reference": "a5b5c43e50b7fba655f793ad27303cd74c57363c"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a5b5c43e50b7fba655f793ad27303cd74c57363c",
|
||||||
|
"reference": "a5b5c43e50b7fba655f793ad27303cd74c57363c",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-ctype": "*",
|
||||||
|
"ext-filter": "*",
|
||||||
|
"ext-hash": "*",
|
||||||
|
"php": ">=5.5.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
|
||||||
|
"doctrine/annotations": "^1.2",
|
||||||
|
"phpcompatibility/php-compatibility": "^9.3.5",
|
||||||
|
"roave/security-advisories": "dev-latest",
|
||||||
|
"squizlabs/php_codesniffer": "^3.5.6",
|
||||||
|
"yoast/phpunit-polyfills": "^0.2.0"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
|
||||||
|
"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)"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"PHPMailer\\PHPMailer\\": "src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"LGPL-2.1-only"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Marcus Bointon",
|
||||||
|
"email": "phpmailer@synchromedia.co.uk"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Jim Jagielski",
|
||||||
|
"email": "jimjag@gmail.com"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Andy Prevost",
|
||||||
|
"email": "codeworxtech@users.sourceforge.net"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Brent R. Matzelle"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"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.5.0"
|
||||||
|
},
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"url": "https://github.com/Synchro",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"time": "2021-06-16T14:33:43+00:00"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"packages-dev": [],
|
||||||
|
"aliases": [],
|
||||||
|
"minimum-stability": "stable",
|
||||||
|
"stability-flags": {
|
||||||
|
"franzz/objects": 20
|
||||||
|
},
|
||||||
|
"prefer-stable": false,
|
||||||
|
"prefer-lowest": false,
|
||||||
|
"platform": [],
|
||||||
|
"platform-dev": [],
|
||||||
|
"plugin-api-version": "2.1.0"
|
||||||
|
}
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* PHPMailer Exception class.
|
|
||||||
* PHP Version 5.5.
|
|
||||||
*
|
|
||||||
* @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
|
|
||||||
*
|
|
||||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
|
||||||
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
|
|
||||||
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
|
|
||||||
* @author Brent R. Matzelle (original founder)
|
|
||||||
* @copyright 2012 - 2017 Marcus Bointon
|
|
||||||
* @copyright 2010 - 2012 Jim Jagielski
|
|
||||||
* @copyright 2004 - 2009 Andy Prevost
|
|
||||||
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
|
|
||||||
* @note This program is distributed in the hope that it will be useful - WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace PHPMailer\PHPMailer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* PHPMailer exception handler.
|
|
||||||
*
|
|
||||||
* @author Marcus Bointon <phpmailer@synchromedia.co.uk>
|
|
||||||
*/
|
|
||||||
class Exception extends \Exception
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Prettify error message output.
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function errorMessage()
|
|
||||||
{
|
|
||||||
return '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* PHPMailer - PHP email creation and transport class.
|
|
||||||
* PHP Version 5.5.
|
|
||||||
*
|
|
||||||
* @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
|
|
||||||
*
|
|
||||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
|
||||||
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
|
|
||||||
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
|
|
||||||
* @author Brent R. Matzelle (original founder)
|
|
||||||
* @copyright 2012 - 2015 Marcus Bointon
|
|
||||||
* @copyright 2010 - 2012 Jim Jagielski
|
|
||||||
* @copyright 2004 - 2009 Andy Prevost
|
|
||||||
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
|
|
||||||
* @note This program is distributed in the hope that it will be useful - WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace PHPMailer\PHPMailer;
|
|
||||||
|
|
||||||
use League\OAuth2\Client\Grant\RefreshToken;
|
|
||||||
use League\OAuth2\Client\Provider\AbstractProvider;
|
|
||||||
use League\OAuth2\Client\Token\AccessToken;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* OAuth - OAuth2 authentication wrapper class.
|
|
||||||
* Uses the oauth2-client package from the League of Extraordinary Packages.
|
|
||||||
*
|
|
||||||
* @see http://oauth2-client.thephpleague.com
|
|
||||||
*
|
|
||||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
|
||||||
*/
|
|
||||||
class OAuth
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* An instance of the League OAuth Client Provider.
|
|
||||||
*
|
|
||||||
* @var AbstractProvider
|
|
||||||
*/
|
|
||||||
protected $provider;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The current OAuth access token.
|
|
||||||
*
|
|
||||||
* @var AccessToken
|
|
||||||
*/
|
|
||||||
protected $oauthToken;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The user's email address, usually used as the login ID
|
|
||||||
* and also the from address when sending email.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $oauthUserEmail = '';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The client secret, generated in the app definition of the service you're connecting to.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $oauthClientSecret = '';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The client ID, generated in the app definition of the service you're connecting to.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $oauthClientId = '';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The refresh token, used to obtain new AccessTokens.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $oauthRefreshToken = '';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* OAuth constructor.
|
|
||||||
*
|
|
||||||
* @param array $options Associative array containing
|
|
||||||
* `provider`, `userName`, `clientSecret`, `clientId` and `refreshToken` elements
|
|
||||||
*/
|
|
||||||
public function __construct($options)
|
|
||||||
{
|
|
||||||
$this->provider = $options['provider'];
|
|
||||||
$this->oauthUserEmail = $options['userName'];
|
|
||||||
$this->oauthClientSecret = $options['clientSecret'];
|
|
||||||
$this->oauthClientId = $options['clientId'];
|
|
||||||
$this->oauthRefreshToken = $options['refreshToken'];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a new RefreshToken.
|
|
||||||
*
|
|
||||||
* @return RefreshToken
|
|
||||||
*/
|
|
||||||
protected function getGrant()
|
|
||||||
{
|
|
||||||
return new RefreshToken();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a new AccessToken.
|
|
||||||
*
|
|
||||||
* @return AccessToken
|
|
||||||
*/
|
|
||||||
protected function getToken()
|
|
||||||
{
|
|
||||||
return $this->provider->getAccessToken(
|
|
||||||
$this->getGrant(),
|
|
||||||
['refresh_token' => $this->oauthRefreshToken]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate a base64-encoded OAuth token.
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function getOauth64()
|
|
||||||
{
|
|
||||||
// Get a new token if it's not available or has expired
|
|
||||||
if (null === $this->oauthToken || $this->oauthToken->hasExpired()) {
|
|
||||||
$this->oauthToken = $this->getToken();
|
|
||||||
}
|
|
||||||
|
|
||||||
return base64_encode(
|
|
||||||
'user=' .
|
|
||||||
$this->oauthUserEmail .
|
|
||||||
"\001auth=Bearer " .
|
|
||||||
$this->oauthToken .
|
|
||||||
"\001\001"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,421 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* PHPMailer POP-Before-SMTP Authentication Class.
|
|
||||||
* PHP Version 5.5.
|
|
||||||
*
|
|
||||||
* @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
|
|
||||||
*
|
|
||||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
|
||||||
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
|
|
||||||
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
|
|
||||||
* @author Brent R. Matzelle (original founder)
|
|
||||||
* @copyright 2012 - 2019 Marcus Bointon
|
|
||||||
* @copyright 2010 - 2012 Jim Jagielski
|
|
||||||
* @copyright 2004 - 2009 Andy Prevost
|
|
||||||
* @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
|
|
||||||
* @note This program is distributed in the hope that it will be useful - WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace PHPMailer\PHPMailer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* PHPMailer POP-Before-SMTP Authentication Class.
|
|
||||||
* Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
|
|
||||||
* 1) This class does not support APOP authentication.
|
|
||||||
* 2) Opening and closing lots of POP3 connections can be quite slow. If you need
|
|
||||||
* to send a batch of emails then just perform the authentication once at the start,
|
|
||||||
* and then loop through your mail sending script. Providing this process doesn't
|
|
||||||
* take longer than the verification period lasts on your POP3 server, you should be fine.
|
|
||||||
* 3) This is really ancient technology; you should only need to use it to talk to very old systems.
|
|
||||||
* 4) This POP3 class is deliberately lightweight and incomplete, implementing just
|
|
||||||
* enough to do authentication.
|
|
||||||
* If you want a more complete class there are other POP3 classes for PHP available.
|
|
||||||
*
|
|
||||||
* @author Richard Davey (original author) <rich@corephp.co.uk>
|
|
||||||
* @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
|
|
||||||
* @author Jim Jagielski (jimjag) <jimjag@gmail.com>
|
|
||||||
* @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
|
|
||||||
*/
|
|
||||||
class POP3
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The POP3 PHPMailer Version number.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
const VERSION = '6.1.5';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default POP3 port number.
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
const DEFAULT_PORT = 110;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Default timeout in seconds.
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
const DEFAULT_TIMEOUT = 30;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Debug display level.
|
|
||||||
* Options: 0 = no, 1+ = yes.
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
public $do_debug = 0;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POP3 mail server hostname.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
public $host;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POP3 port number.
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
public $port;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POP3 Timeout Value in seconds.
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
public $tval;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POP3 username.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
public $username;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POP3 password.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
public $password;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resource handle for the POP3 connection socket.
|
|
||||||
*
|
|
||||||
* @var resource
|
|
||||||
*/
|
|
||||||
protected $pop_conn;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Are we connected?
|
|
||||||
*
|
|
||||||
* @var bool
|
|
||||||
*/
|
|
||||||
protected $connected = false;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Error container.
|
|
||||||
*
|
|
||||||
* @var array
|
|
||||||
*/
|
|
||||||
protected $errors = [];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Line break constant.
|
|
||||||
*/
|
|
||||||
const LE = "\r\n";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Simple static wrapper for all-in-one POP before SMTP.
|
|
||||||
*
|
|
||||||
* @param string $host The hostname to connect to
|
|
||||||
* @param int|bool $port The port number to connect to
|
|
||||||
* @param int|bool $timeout The timeout value
|
|
||||||
* @param string $username
|
|
||||||
* @param string $password
|
|
||||||
* @param int $debug_level
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public static function popBeforeSmtp(
|
|
||||||
$host,
|
|
||||||
$port = false,
|
|
||||||
$timeout = false,
|
|
||||||
$username = '',
|
|
||||||
$password = '',
|
|
||||||
$debug_level = 0
|
|
||||||
) {
|
|
||||||
$pop = new self();
|
|
||||||
|
|
||||||
return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Authenticate with a POP3 server.
|
|
||||||
* A connect, login, disconnect sequence
|
|
||||||
* appropriate for POP-before SMTP authorisation.
|
|
||||||
*
|
|
||||||
* @param string $host The hostname to connect to
|
|
||||||
* @param int|bool $port The port number to connect to
|
|
||||||
* @param int|bool $timeout The timeout value
|
|
||||||
* @param string $username
|
|
||||||
* @param string $password
|
|
||||||
* @param int $debug_level
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
|
|
||||||
{
|
|
||||||
$this->host = $host;
|
|
||||||
// If no port value provided, use default
|
|
||||||
if (false === $port) {
|
|
||||||
$this->port = static::DEFAULT_PORT;
|
|
||||||
} else {
|
|
||||||
$this->port = (int) $port;
|
|
||||||
}
|
|
||||||
// If no timeout value provided, use default
|
|
||||||
if (false === $timeout) {
|
|
||||||
$this->tval = static::DEFAULT_TIMEOUT;
|
|
||||||
} else {
|
|
||||||
$this->tval = (int) $timeout;
|
|
||||||
}
|
|
||||||
$this->do_debug = $debug_level;
|
|
||||||
$this->username = $username;
|
|
||||||
$this->password = $password;
|
|
||||||
// Reset the error log
|
|
||||||
$this->errors = [];
|
|
||||||
// connect
|
|
||||||
$result = $this->connect($this->host, $this->port, $this->tval);
|
|
||||||
if ($result) {
|
|
||||||
$login_result = $this->login($this->username, $this->password);
|
|
||||||
if ($login_result) {
|
|
||||||
$this->disconnect();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// We need to disconnect regardless of whether the login succeeded
|
|
||||||
$this->disconnect();
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Connect to a POP3 server.
|
|
||||||
*
|
|
||||||
* @param string $host
|
|
||||||
* @param int|bool $port
|
|
||||||
* @param int $tval
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function connect($host, $port = false, $tval = 30)
|
|
||||||
{
|
|
||||||
// Are we already connected?
|
|
||||||
if ($this->connected) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//On Windows this will raise a PHP Warning error if the hostname doesn't exist.
|
|
||||||
//Rather than suppress it with @fsockopen, capture it cleanly instead
|
|
||||||
set_error_handler([$this, 'catchWarning']);
|
|
||||||
|
|
||||||
if (false === $port) {
|
|
||||||
$port = static::DEFAULT_PORT;
|
|
||||||
}
|
|
||||||
|
|
||||||
// connect to the POP3 server
|
|
||||||
$errno = 0;
|
|
||||||
$errstr = '';
|
|
||||||
$this->pop_conn = fsockopen(
|
|
||||||
$host, // POP3 Host
|
|
||||||
$port, // Port #
|
|
||||||
$errno, // Error Number
|
|
||||||
$errstr, // Error Message
|
|
||||||
$tval
|
|
||||||
); // Timeout (seconds)
|
|
||||||
// Restore the error handler
|
|
||||||
restore_error_handler();
|
|
||||||
|
|
||||||
// Did we connect?
|
|
||||||
if (false === $this->pop_conn) {
|
|
||||||
// It would appear not...
|
|
||||||
$this->setError(
|
|
||||||
"Failed to connect to server $host on port $port. errno: $errno; errstr: $errstr"
|
|
||||||
);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Increase the stream time-out
|
|
||||||
stream_set_timeout($this->pop_conn, $tval, 0);
|
|
||||||
|
|
||||||
// Get the POP3 server response
|
|
||||||
$pop3_response = $this->getResponse();
|
|
||||||
// Check for the +OK
|
|
||||||
if ($this->checkResponse($pop3_response)) {
|
|
||||||
// The connection is established and the POP3 server is talking
|
|
||||||
$this->connected = true;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Log in to the POP3 server.
|
|
||||||
* Does not support APOP (RFC 2828, 4949).
|
|
||||||
*
|
|
||||||
* @param string $username
|
|
||||||
* @param string $password
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function login($username = '', $password = '')
|
|
||||||
{
|
|
||||||
if (!$this->connected) {
|
|
||||||
$this->setError('Not connected to POP3 server');
|
|
||||||
}
|
|
||||||
if (empty($username)) {
|
|
||||||
$username = $this->username;
|
|
||||||
}
|
|
||||||
if (empty($password)) {
|
|
||||||
$password = $this->password;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send the Username
|
|
||||||
$this->sendString("USER $username" . static::LE);
|
|
||||||
$pop3_response = $this->getResponse();
|
|
||||||
if ($this->checkResponse($pop3_response)) {
|
|
||||||
// Send the Password
|
|
||||||
$this->sendString("PASS $password" . static::LE);
|
|
||||||
$pop3_response = $this->getResponse();
|
|
||||||
if ($this->checkResponse($pop3_response)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Disconnect from the POP3 server.
|
|
||||||
*/
|
|
||||||
public function disconnect()
|
|
||||||
{
|
|
||||||
$this->sendString('QUIT');
|
|
||||||
//The QUIT command may cause the daemon to exit, which will kill our connection
|
|
||||||
//So ignore errors here
|
|
||||||
try {
|
|
||||||
@fclose($this->pop_conn);
|
|
||||||
} catch (Exception $e) {
|
|
||||||
//Do nothing
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a response from the POP3 server.
|
|
||||||
*
|
|
||||||
* @param int $size The maximum number of bytes to retrieve
|
|
||||||
*
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
protected function getResponse($size = 128)
|
|
||||||
{
|
|
||||||
$response = fgets($this->pop_conn, $size);
|
|
||||||
if ($this->do_debug >= 1) {
|
|
||||||
echo 'Server -> Client: ', $response;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $response;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send raw data to the POP3 server.
|
|
||||||
*
|
|
||||||
* @param string $string
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
protected function sendString($string)
|
|
||||||
{
|
|
||||||
if ($this->pop_conn) {
|
|
||||||
if ($this->do_debug >= 2) { //Show client messages when debug >= 2
|
|
||||||
echo 'Client -> Server: ', $string;
|
|
||||||
}
|
|
||||||
|
|
||||||
return fwrite($this->pop_conn, $string, strlen($string));
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks the POP3 server response.
|
|
||||||
* Looks for for +OK or -ERR.
|
|
||||||
*
|
|
||||||
* @param string $string
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
protected function checkResponse($string)
|
|
||||||
{
|
|
||||||
if (strpos($string, '+OK') !== 0) {
|
|
||||||
$this->setError("Server reported an error: $string");
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add an error to the internal error store.
|
|
||||||
* Also display debug output if it's enabled.
|
|
||||||
*
|
|
||||||
* @param string $error
|
|
||||||
*/
|
|
||||||
protected function setError($error)
|
|
||||||
{
|
|
||||||
$this->errors[] = $error;
|
|
||||||
if ($this->do_debug >= 1) {
|
|
||||||
echo '<pre>';
|
|
||||||
foreach ($this->errors as $e) {
|
|
||||||
print_r($e);
|
|
||||||
}
|
|
||||||
echo '</pre>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get an array of error messages, if any.
|
|
||||||
*
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public function getErrors()
|
|
||||||
{
|
|
||||||
return $this->errors;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* POP3 connection error handler.
|
|
||||||
*
|
|
||||||
* @param int $errno
|
|
||||||
* @param string $errstr
|
|
||||||
* @param string $errfile
|
|
||||||
* @param int $errline
|
|
||||||
*/
|
|
||||||
protected function catchWarning($errno, $errstr, $errfile, $errline)
|
|
||||||
{
|
|
||||||
$this->setError(
|
|
||||||
'Connecting to the POP3 server raised a PHP warning:' .
|
|
||||||
"errno: $errno errstr: $errstr; errfile: $errfile; errline: $errline"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
namespace Franzz\Spot;
|
||||||
|
use Franzz\Objects\PhpObject;
|
||||||
|
use Franzz\Objects\ToolBox;
|
||||||
|
use \Settings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* GPX to GeoJSON Converter
|
* GPX to GeoJSON Converter
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
namespace Franzz\Spot;
|
||||||
|
use Franzz\Objects\PhpObject;
|
||||||
|
use Franzz\Objects\Mask;
|
||||||
use PHPMailer\PHPMailer\PHPMailer;
|
use PHPMailer\PHPMailer\PHPMailer;
|
||||||
use PHPMailer\PHPMailer\SMTP;
|
use PHPMailer\PHPMailer\SMTP;
|
||||||
use PHPMailer\PHPMailer\Exception;
|
use PHPMailer\PHPMailer\Exception;
|
||||||
|
use \Settings;
|
||||||
require_once 'inc/PHPMailer/Exception.php';
|
|
||||||
require_once 'inc/PHPMailer/PHPMailer.php';
|
|
||||||
require_once 'inc/PHPMailer/SMTP.php';
|
|
||||||
|
|
||||||
class Email extends PhpObject {
|
class Email extends PhpObject {
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
namespace Franzz\Spot;
|
||||||
|
use Franzz\Objects\PhpObject;
|
||||||
|
use Franzz\Objects\Db;
|
||||||
|
use \Settings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Feed Class
|
* Feed Class
|
||||||
* Also manages spots (devices) & messages
|
* Also manages spots (devices) & messages
|
||||||
@@ -110,8 +115,8 @@ class Feed extends PhpObject {
|
|||||||
|
|
||||||
//Spam Check: no more than 1 API request per 5 minutes
|
//Spam Check: no more than 1 API request per 5 minutes
|
||||||
if($sProjectMode == Project::MODE_BLOG) {
|
if($sProjectMode == Project::MODE_BLOG) {
|
||||||
$oLastUpdate = new DateTime('@'.$this->iLastUpdate);
|
$oLastUpdate = new \DateTime('@'.$this->iLastUpdate);
|
||||||
$oNow = new DateTime('now');
|
$oNow = new \DateTime('now');
|
||||||
$iSecDiff = $oNow->getTimestamp() - $oLastUpdate->getTimestamp();
|
$iSecDiff = $oNow->getTimestamp() - $oLastUpdate->getTimestamp();
|
||||||
|
|
||||||
if($iSecDiff > self::FEED_MAX_REFRESH && !Settings::DEBUG) $bNewMsg = $this->updateFeed();
|
if($iSecDiff > self::FEED_MAX_REFRESH && !Settings::DEBUG) $bNewMsg = $this->updateFeed();
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
namespace Franzz\Spot;
|
||||||
|
use Franzz\Objects\PhpObject;
|
||||||
|
use Franzz\Objects\Db;
|
||||||
|
use Franzz\Objects\ToolBox;
|
||||||
|
use \Settings;
|
||||||
|
|
||||||
class Media extends PhpObject {
|
class Media extends PhpObject {
|
||||||
|
|
||||||
//DB Tables
|
//DB Tables
|
||||||
@@ -219,7 +225,7 @@ class Media extends PhpObject {
|
|||||||
//Assign the correct Time Zone to $sTakenOn if it is not already contained in it. Then get Unix Timestamp
|
//Assign the correct Time Zone to $sTakenOn if it is not already contained in it. Then get Unix Timestamp
|
||||||
//Time Zone (2nd parameter) will be ignored if already contained in $sTakenOn
|
//Time Zone (2nd parameter) will be ignored if already contained in $sTakenOn
|
||||||
if($sTakenOn != '') {
|
if($sTakenOn != '') {
|
||||||
$oTakenOn = new DateTime($sTakenOn, new DateTimeZone($sTimeZone));
|
$oTakenOn = new \DateTime($sTakenOn, new \DateTimeZone($sTimeZone));
|
||||||
$iTakenOn = $oTakenOn->format('U');
|
$iTakenOn = $oTakenOn->format('U');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
namespace Franzz\Spot;
|
||||||
|
use Franzz\Objects\PhpObject;
|
||||||
|
use Franzz\Objects\Db;
|
||||||
|
use \Settings;
|
||||||
|
|
||||||
class Project extends PhpObject {
|
class Project extends PhpObject {
|
||||||
|
|
||||||
//Spot Mode
|
//Spot Mode
|
||||||
|
|||||||
26
inc/spot.php
26
inc/spot.php
@@ -1,5 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
namespace Franzz\Spot;
|
||||||
|
use Franzz\Objects\Db;
|
||||||
|
use Franzz\Objects\Main;
|
||||||
|
use Franzz\Objects\Translator;
|
||||||
|
use Franzz\Objects\ToolBox;
|
||||||
|
use Franzz\Objects\Mask;
|
||||||
|
use \Settings;
|
||||||
|
|
||||||
/* Timezones
|
/* Timezones
|
||||||
* ---------
|
* ---------
|
||||||
* Site Time: Time Zone in which the User is viewing the Site (default PHP/SQL Timezone)
|
* Site Time: Time Zone in which the User is viewing the Site (default PHP/SQL Timezone)
|
||||||
@@ -48,21 +56,12 @@ class Spot extends Main
|
|||||||
*/
|
*/
|
||||||
private $oUser;
|
private $oUser;
|
||||||
|
|
||||||
public function __construct($oClassManagement, $sProcessPage, $sTimezone)
|
public function __construct($sProcessPage, $sTimezone)
|
||||||
{
|
{
|
||||||
$asClasses = array(
|
parent::__construct($sProcessPage, true, __FILE__, $sTimezone);
|
||||||
array('name'=>'feed', 'project'=>true),
|
|
||||||
array('name'=>'project', 'project'=>true),
|
|
||||||
array('name'=>'media', 'project'=>true),
|
|
||||||
array('name'=>'converter', 'project'=>true),
|
|
||||||
array('name'=>'user', 'project'=>true),
|
|
||||||
array('name'=>'email', 'project'=>true)
|
|
||||||
);
|
|
||||||
parent::__construct($oClassManagement, $sProcessPage, $asClasses, true, __FILE__, $sTimezone);
|
|
||||||
|
|
||||||
$this->oUser = new User($this->oDb);
|
$this->oUser = new User($this->oDb);
|
||||||
|
|
||||||
$this->oClassManagement->incClass('translator');
|
|
||||||
$this->oLang = new Translator('', self::DEFAULT_LANG);
|
$this->oLang = new Translator('', self::DEFAULT_LANG);
|
||||||
|
|
||||||
$this->oProject = new Project($this->oDb);
|
$this->oProject = new Project($this->oDb);
|
||||||
@@ -494,7 +493,6 @@ class Spot extends Main
|
|||||||
|
|
||||||
public function upload()
|
public function upload()
|
||||||
{
|
{
|
||||||
$this->oClassManagement->incClass('uploader', true);
|
|
||||||
$oUploader = new Uploader($this->oMedia, $this->oLang);
|
$oUploader = new Uploader($this->oMedia, $this->oLang);
|
||||||
|
|
||||||
return $oUploader->sBody;
|
return $oUploader->sBody;
|
||||||
@@ -644,8 +642,8 @@ class Spot extends Main
|
|||||||
public function getTimeFormat($iTime, $sTimeZone='') {
|
public function getTimeFormat($iTime, $sTimeZone='') {
|
||||||
if($sTimeZone=='') $sTimeZone = date_default_timezone_get();
|
if($sTimeZone=='') $sTimeZone = date_default_timezone_get();
|
||||||
|
|
||||||
$oDate = new DateTime('@'.$iTime);
|
$oDate = new \DateTime('@'.$iTime);
|
||||||
$oDate->setTimezone(new DateTimeZone($sTimeZone));
|
$oDate->setTimezone(new \DateTimeZone($sTimeZone));
|
||||||
|
|
||||||
$sDate = $oDate->format('d/m/Y');
|
$sDate = $oDate->format('d/m/Y');
|
||||||
$sTime = $oDate->format('H:i');
|
$sTime = $oDate->format('H:i');
|
||||||
|
|||||||
1486
inc/uploader.php
1486
inc/uploader.php
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
namespace Franzz\Spot;
|
||||||
|
use Franzz\Objects\PhpObject;
|
||||||
|
use Franzz\Objects\Db;
|
||||||
|
use \Settings;
|
||||||
|
|
||||||
class User extends PhpObject {
|
class User extends PhpObject {
|
||||||
|
|
||||||
//DB Tables
|
//DB Tables
|
||||||
|
|||||||
14
index.php
14
index.php
@@ -1,11 +1,19 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
//namespace Franzz\Spot;
|
||||||
|
|
||||||
/* Requests Handler */
|
/* Requests Handler */
|
||||||
|
|
||||||
//Start buffering
|
//Start buffering
|
||||||
ob_start();
|
ob_start();
|
||||||
require_once '../objects/class_management.php';
|
|
||||||
$oClassManagement = new ClassManagement('spot');
|
$oLoader = require __DIR__.'/vendor/autoload.php';
|
||||||
|
|
||||||
|
use Franzz\Objects\ToolBox;
|
||||||
|
use Franzz\Objects\Main;
|
||||||
|
use Franzz\Spot\Spot;
|
||||||
|
use Franzz\Spot\User;
|
||||||
|
|
||||||
ToolBox::cleanPost($_POST);
|
ToolBox::cleanPost($_POST);
|
||||||
ToolBox::cleanPost($_GET);
|
ToolBox::cleanPost($_GET);
|
||||||
ToolBox::cleanPost($_REQUEST);
|
ToolBox::cleanPost($_REQUEST);
|
||||||
@@ -25,7 +33,7 @@ $sType = isset($_REQUEST['type'])?$_REQUEST['type']:'';
|
|||||||
$sEmail = isset($_REQUEST['email'])?$_REQUEST['email']:'';
|
$sEmail = isset($_REQUEST['email'])?$_REQUEST['email']:'';
|
||||||
|
|
||||||
//Initiate class
|
//Initiate class
|
||||||
$oSpot = new Spot($oClassManagement, __FILE__, $sTimezone);
|
$oSpot = new Spot(__FILE__, $sTimezone);
|
||||||
$oSpot->setProjectId($iProjectId);
|
$oSpot->setProjectId($iProjectId);
|
||||||
|
|
||||||
$sResult = '';
|
$sResult = '';
|
||||||
|
|||||||
Reference in New Issue
Block a user