joshuacoles/wallos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: import of translations for cronjobs was missing (#321)

Browse Source 
refactor: retrieval of webroot path
chore: add sqlite to docker image
This commit is contained in:
Miguel Ribeiro 2024-05-13 17:45:59 +02:00 committed by GitHub
parent 46f933ade7
commit a524419e0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -6,7 +6,7 @@ WORKDIR /var/www/html
# Update packages and install dependencies # Update packages and install dependencies
RUN apk upgrade --no-cache && \ RUN apk upgrade --no-cache && \
apk add --no-cache sqlite-dev libpng libpng-dev libjpeg-turbo libjpeg-turbo-dev freetype freetype-dev curl autoconf libgomp icu-dev nginx dcron tzdata imagemagick imagemagick-dev libzip-dev && \ apk add --no-cache sqlite-dev libpng libpng-dev libjpeg-turbo libjpeg-turbo-dev freetype freetype-dev curl autoconf libgomp icu-dev nginx dcron tzdata imagemagick imagemagick-dev libzip-dev sqlite && \
docker-php-ext-install pdo pdo_sqlite && \ docker-php-ext-install pdo pdo_sqlite && \
docker-php-ext-enable pdo pdo_sqlite && \ docker-php-ext-enable pdo pdo_sqlite && \
docker-php-ext-configure gd --with-freetype --with-jpeg && \ docker-php-ext-configure gd --with-freetype --with-jpeg && \

2
README.md
View File

@ -83,7 +83,7 @@ See instructions to run Wallos below.
0 9 * * * php /var/www/html/endpoints/cronjobs/sendnotifications.php >> /var/log/cron/sendnotifications.log 2>&1 0 9 * * * php /var/www/html/endpoints/cronjobs/sendnotifications.php >> /var/log/cron/sendnotifications.log 2>&1
``` ```
5. If your web root is not `/var/www/html/` adjust both the cronjobs above and `/endpoints/cronjobs/conf.php` accordingly. 5. If your web root is not `/var/www/html/` adjust the cronjobs above accordingly.
#### Updating #### Updating

6
endpoints/cronjobs/conf.php
View File

@ -1,6 +0,0 @@
<?php
#Webroot path
$webPath = "/var/www/html/";
?>

5
endpoints/cronjobs/createdatabase.php
View File

@ -1,8 +1,6 @@
<?php <?php
require_once 'conf.php'; $databaseFile = __DIR__ . '/../../db/wallos.db';
$databaseFile = $webPath . 'db/wallos.db';
if (!file_exists($databaseFile)) { if (!file_exists($databaseFile)) {
echo "Database does not exist. Creating it...\n"; echo "Database does not exist. Creating it...\n";
@ -234,7 +232,6 @@ if (!file_exists($databaseFile)) {
} else { } else {
echo "Database already exist. Checking for upgrades...\n"; echo "Database already exist. Checking for upgrades...\n";
$databaseFile = $webPath . 'db/wallos.db';
$db = new SQLite3($databaseFile); $db = new SQLite3($databaseFile);
$db->busyTimeout(5000); $db->busyTimeout(5000);

9
endpoints/cronjobs/sendnotifications.php
View File

@ -3,8 +3,7 @@
use PHPMailer\PHPMailer\SMTP; use PHPMailer\PHPMailer\SMTP;
use PHPMailer\PHPMailer\Exception; use PHPMailer\PHPMailer\Exception;
require_once 'conf.php'; require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';
require_once $webPath . 'includes/connect_endpoint_crontabs.php';
$days = 1; $days = 1;
$emailNotificationsEnabled = false; $emailNotificationsEnabled = false;
@ -152,9 +151,9 @@
// Email notifications if enabled // Email notifications if enabled
if ($emailNotificationsEnabled) { if ($emailNotificationsEnabled) {
require $webPath . 'libs/PHPMailer/PHPMailer.php'; require __DIR__ . '/../../libs/PHPMailer/PHPMailer.php';
require $webPath . 'libs/PHPMailer/SMTP.php'; require __DIR__ . '/../../libs/PHPMailer/SMTP.php';
require $webPath . 'libs/PHPMailer/Exception.php'; require __DIR__ . '/../../libs/PHPMailer/Exception.php';
$stmt = $db->prepare('SELECT * FROM user WHERE id = :id'); $stmt = $db->prepare('SELECT * FROM user WHERE id = :id');
$stmt->bindValue(':id', 1, SQLITE3_INTEGER); $stmt->bindValue(':id', 1, SQLITE3_INTEGER);

3
endpoints/cronjobs/updateexchange.php
View File

@ -1,6 +1,5 @@
<?php <?php
require_once 'conf.php'; require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';
require_once $webPath . 'includes/connect_endpoint_crontabs.php';
$query = "SELECT api_key FROM fixer"; $query = "SELECT api_key FROM fixer";
$result = $db->query($query); $result = $db->query($query);

4
endpoints/cronjobs/updatenextpayment.php
View File

@ -1,6 +1,6 @@
<?php <?php
require_once 'conf.php';
require_once $webPath . 'includes/connect_endpoint_crontabs.php'; require_once __DIR__ . '/../../includes/connect_endpoint_crontabs.php';
$currentDate = new DateTime(); $currentDate = new DateTime();
$currentDateString = $currentDate->format('Y-m-d'); $currentDateString = $currentDate->format('Y-m-d');

2
endpoints/notifications/savediscordnotifications.php
View File

@ -42,7 +42,7 @@ require_once '../../includes/connect_endpoint.php';
$query = "INSERT INTO discord_notifications (enabled, webhook_url, bot_username, bot_avatar_url) $query = "INSERT INTO discord_notifications (enabled, webhook_url, bot_username, bot_avatar_url)
VALUES (:enabled, :webhook_url, :bot_username, :bot_avatar_url)"; VALUES (:enabled, :webhook_url, :bot_username, :bot_avatar_url)";
} else { } else {
$query = "UPDATE pushover_notifications $query = "UPDATE discord_notifications
SET enabled = :enabled, webhook_url = :webhook_url, bot_username = :bot_username, bot_avatar_url = :bot_avatar_url"; SET enabled = :enabled, webhook_url = :webhook_url, bot_username = :bot_username, bot_avatar_url = :bot_avatar_url";
} }

6
includes/connect_endpoint_crontabs.php
View File

@ -1,6 +1,6 @@
<?php <?php
$databaseFile = '/var/www/html/db/wallos.db'; $databaseFile = __DIR__ . '/../db/wallos.db';
$db = new SQLite3($databaseFile); $db = new SQLite3($databaseFile);
$db->busyTimeout(5000); $db->busyTimeout(5000);
@ -8,4 +8,8 @@ if (!$db) {
die('Connection to the database failed.'); die('Connection to the database failed.');
} }
require_once __DIR__ . '/../includes/i18n/languages.php';
require_once __DIR__ . '/../includes/i18n/getlang.php';
require_once __DIR__ . '/../includes/i18n/' . $lang . '.php';
?> ?>

2
includes/version.php
View File

@ -1,3 +1,3 @@
<?php <?php
$version = "v1.27.0"; $version = "v1.27.1";
?> ?>