diff --git a/.htaccess b/.htaccess index f334076..b0a8024 100644 --- a/.htaccess +++ b/.htaccess @@ -12,6 +12,7 @@ RewriteRule . - [e=HTTP_AUTHORIZATION:%1] # serve all files from public subfolder RewriteCond %{REQUEST_FILENAME} !.php RewriteCond %{REQUEST_FILENAME} !.log +RewriteCond %{REQUEST_FILENAME} !.ttfnot RewriteCond %{REQUEST_FILENAME} \. RewriteRule (.*) ./public/$1 [L] diff --git a/app/Bootstrap.php b/app/Bootstrap.php index 77ccb0f..267f939 100644 --- a/app/Bootstrap.php +++ b/app/Bootstrap.php @@ -51,6 +51,7 @@ class ErrorHandler { 'message' => $exception->getMessage(), 'file' => $exception->getFile(), 'line' => $exception->getLine(), + 'trace' => $exception->getTraceAsString(), ]; echo json_encode($message); diff --git a/app/api/EndpointsApi.php b/app/api/EndpointsApi.php index fea218b..834a584 100644 --- a/app/api/EndpointsApi.php +++ b/app/api/EndpointsApi.php @@ -186,6 +186,6 @@ class EndpointsApi extends ApiController{ $this->response($jsonAnswer); // this method returns response as json - unset($logManager) + unset($logManager); } } diff --git a/app/api/GoogleHomeApi.php b/app/api/GoogleHomeApi.php index f96258c..1446ab8 100644 --- a/app/api/GoogleHomeApi.php +++ b/app/api/GoogleHomeApi.php @@ -42,7 +42,7 @@ class GoogleHomeApi{ $apiLogManager->setLevel(LOGLEVEL); $apiLogManager->write("[API] request body\n" . json_encode($obj, JSON_PRETTY_PRINT), LogRecordTypes::INFO); $apiLogManager->write("[API] GET body\n" . json_encode($_GET, JSON_PRETTY_PRINT), LogRecordTypes::INFO); - unset($apiLogManager) + unset($apiLogManager); $get = [ "access_token"=>"2222255888", //TODO: FIX diff --git a/app/models/managers/NotificationManager.php b/app/models/managers/NotificationManager.php index 393899b..dcb73d6 100644 --- a/app/models/managers/NotificationManager.php +++ b/app/models/managers/NotificationManager.php @@ -5,7 +5,7 @@ //TODO: Working timestamp to $title class NotificationManager { - function addSubscriber($userID = '', $token = ''){ + public static function addSubscriber($userID = '', $token = ''){ $notificationSubscriber = $subDeviceId = Db::loadOne('SELECT id FROM notifications WHERE token = ?;', array($token)); if ($notificationSubscriber == ''){ $notification = array ( @@ -16,11 +16,11 @@ class NotificationManager } } - function getSubscription () { + public static function getSubscription () { return Db::loadAll ("SELECT * FROM notifications"); } - function sendSimpleNotification(string $serverKey, string $to, array $data, bool $timeStamp = false){ + public static function sendSimpleNotification(string $serverKey, string $to, array $data, bool $timeStamp = false){ $dataTemplate = [ 'title' => '', 'body' => '', diff --git a/config/config_sample.php b/config/config_sample.php index 7398d64..3eca337 100644 --- a/config/config_sample.php +++ b/config/config_sample.php @@ -19,7 +19,7 @@ define('LOGTIMOUT', 5); //Deleate logfiles older than XX days LogRecordTypes::WARNING LogRecordTypes::INFO */ -define('LOGLEVEL', LogRecordTypes::WARNING); +define('LOGLEVEL', LogRecordTypes::INFO); //Restrict acess to API $allowerdIp = [ diff --git a/manifest.json b/public/manifest.json similarity index 100% rename from manifest.json rename to public/manifest.json diff --git a/serviceWorker.js b/public/serviceWorker.js similarity index 100% rename from serviceWorker.js rename to public/serviceWorker.js