commit 9bdf8fe9f4dfc8118770230d8bf5367aa5c49d17 parent 21b74cf1b3cea1304b6d109523cef3211a5885fa Author: Christian Grothoff <christian@grothoff.org> Date: Sun, 2 Nov 2025 16:38:59 +0100 restrict to active subscriptions Diffstat:
| M | admin/class-admin-settings.php | | | 2 | +- |
| M | includes/class-taler-merchant-api.php | | | 6 | ++++-- |
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/admin/class-admin-settings.php b/admin/class-admin-settings.php @@ -262,7 +262,7 @@ class Taler_Turnstile_Admin_Settings { } private function validate_http_status($http_status) { - if ($http_status !== 200 && $http_status !== 204) { + if ($http_status === 200 || $http_status === 204) { return; } $messages = array( diff --git a/includes/class-taler-merchant-api.php b/includes/class-taler-merchant-api.php @@ -203,9 +203,11 @@ class Taler_Merchant_API { } $token_families = $jbody['token_families']; - + $now = time (); // in seconds since Epoch foreach ($token_families as $family) { - if (isset($family['kind']) && $family['kind'] === 'subscription') { + if ( ($family['kind'] === 'subscription') && + ($family['valid_before']['t_s'] < $now) && + ($family['valid_after']['t_s'] >= $now) ) { $slug = $family['slug']; $result[$slug] = array( 'name' => $family['name'],