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

refactor: retrieval of webroot path chore: add sqlite to docker image
ellite · May 13, 2024 · a524419 · a524419
1 parent 46f933a
commit a524419
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 24 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /var/www/html
 
 # Update packages and install dependencies
 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-enable pdo pdo_sqlite && \
     docker-php-ext-configure gd --with-freetype --with-jpeg && \

diff --git a/README.md b/README.md
@@ -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
 ```
 
-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
 

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

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

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

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

diff --git a/endpoints/notifications/savediscordnotifications.php b/endpoints/notifications/savediscordnotifications.php
@@ -42,7 +42,7 @@
                     $query = "INSERT INTO discord_notifications (enabled, webhook_url, bot_username, bot_avatar_url)
                               VALUES (:enabled, :webhook_url, :bot_username, :bot_avatar_url)";
                 } 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";
                 }
 

diff --git a/includes/connect_endpoint_crontabs.php b/includes/connect_endpoint_crontabs.php
@@ -1,11 +1,15 @@
 <?php
 
-$databaseFile = '/var/www/html/db/wallos.db';
+$databaseFile = __DIR__ . '/../db/wallos.db';
 $db = new SQLite3($databaseFile);
 $db->busyTimeout(5000);
 
 if (!$db) {
     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';
+
 ?>
diff --git a/includes/version.php b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-    $version = "v1.27.0";
+    $version = "v1.27.1";
 ?>