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

fix: calling htmlspecialchars_decode on null objects (#338)

Browse Source
This commit is contained in:
Miguel Ribeiro 2024-05-20 14:32:20 +02:00 committed by GitHub
parent 9e8b84b794
commit 5050a28f0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
endpoints/subscription/get.php
View File

@ -13,20 +13,20 @@
if ($row = $result->fetchArray(SQLITE3_ASSOC)) { if ($row = $result->fetchArray(SQLITE3_ASSOC)) {
$subscriptionData['id'] = $subscriptionId; $subscriptionData['id'] = $subscriptionId;
$subscriptionData['name'] = htmlspecialchars_decode($row['name']); $subscriptionData['name'] = htmlspecialchars_decode($row['name'] ?? "");
$subscriptionData['logo'] = $row['logo']; $subscriptionData['logo'] = $row['logo'];
$subscriptionData['price'] = $row['price']; $subscriptionData['price'] = $row['price'];
$subscriptionData['currency_id'] = $row['currency_id']; $subscriptionData['currency_id'] = $row['currency_id'];
$subscriptionData['next_payment'] = $row['next_payment']; $subscriptionData['next_payment'] = $row['next_payment'];
$subscriptionData['frequency'] = $row['frequency']; $subscriptionData['frequency'] = $row['frequency'];
$subscriptionData['cycle'] = $row['cycle']; $subscriptionData['cycle'] = $row['cycle'];
$subscriptionData['notes'] = htmlspecialchars_decode($row['notes']); $subscriptionData['notes'] = htmlspecialchars_decode($row['notes'] ?? "");
$subscriptionData['payment_method_id'] = $row['payment_method_id']; $subscriptionData['payment_method_id'] = $row['payment_method_id'];
$subscriptionData['payer_user_id'] = $row['payer_user_id']; $subscriptionData['payer_user_id'] = $row['payer_user_id'];
$subscriptionData['category_id'] = $row['category_id']; $subscriptionData['category_id'] = $row['category_id'];
$subscriptionData['notify'] = $row['notify']; $subscriptionData['notify'] = $row['notify'];
$subscriptionData['inactive'] = $row['inactive']; $subscriptionData['inactive'] = $row['inactive'];
$subscriptionData['url'] = htmlspecialchars_decode($row['url']); $subscriptionData['url'] = htmlspecialchars_decode($row['url'] ?? "");
$subscriptionData['notify_days_before'] = $row['notify_days_before']; $subscriptionData['notify_days_before'] = $row['notify_days_before'];
$subscriptionJson = json_encode($subscriptionData); $subscriptionJson = json_encode($subscriptionData);

6
endpoints/subscriptions/get.php
View File

@ -76,7 +76,7 @@
$id = $subscription['id']; $id = $subscription['id'];
$print[$id]['id'] = $id; $print[$id]['id'] = $id;
$print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/".$subscription['logo'] : $defaultLogo; $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/".$subscription['logo'] : $defaultLogo;
$print[$id]['name'] = htmlspecialchars_decode($subscription['name']); $print[$id]['name'] = htmlspecialchars_decode($subscription['name'] ?? "");
$cycle = $subscription['cycle']; $cycle = $subscription['cycle'];
$frequency = $subscription['frequency']; $frequency = $subscription['frequency'];
$print[$id]['billing_cycle'] = getBillingCycle($cycle, $frequency, $i18n); $print[$id]['billing_cycle'] = getBillingCycle($cycle, $frequency, $i18n);
@ -92,8 +92,8 @@
$print[$id]['payer_user_id'] = $subscription['payer_user_id']; $print[$id]['payer_user_id'] = $subscription['payer_user_id'];
$print[$id]['price'] = floatval($subscription['price']); $print[$id]['price'] = floatval($subscription['price']);
$print[$id]['inactive'] = $subscription['inactive']; $print[$id]['inactive'] = $subscription['inactive'];
$print[$id]['url'] = htmlspecialchars_decode($subscription['url']); $print[$id]['url'] = htmlspecialchars_decode($subscription['url'] ?? "");
$print[$id]['notes'] = htmlspecialchars_decode($subscription['notes']); $print[$id]['notes'] = htmlspecialchars_decode($subscription['notes'] ?? "");
if (isset($settings['convertCurrency']) && $settings['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) { if (isset($settings['convertCurrency']) && $settings['convertCurrency'] === 'true' && $currencyId != $mainCurrencyId) {
$print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db); $print[$id]['price'] = getPriceConverted($print[$id]['price'], $currencyId, $db);

2
includes/version.php
View File

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