From ccf5e61a075c35d24befc175994b5cb8957ca322 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Wed, 26 Aug 2026 21:45:53 +0000
Subject: [PATCH] =Extra JVB() calls replaced, minor tweaks
---
inc/rest/Rest.php | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/inc/rest/Rest.php b/inc/rest/Rest.php
index 89f0343..621329e 100644
--- a/inc/rest/Rest.php
+++ b/inc/rest/Rest.php
@@ -1,10 +1,14 @@
<?php
namespace JVBase\rest;
+use JVBase\Instance;
+use JVBase\integrations\services\Cloudflare;
use JVBase\managers\Cache;
+use JVBase\managers\Errors;
use JVBase\meta\Meta;
use JVBase\registrar\Registrar;
use JVBase\base\Site;
+use JVBase\rest\routes\TermRoutes;
use WP_REST_Request;
use WP_REST_Response;
use Exception;
@@ -30,7 +34,7 @@
protected string $namespace = 'jvb/v1';
protected ?Cache $cache = null;
protected string $cacheName = '';
- protected int $cacheTtl = 3600;
+ protected int $cacheTtl = HOUR_IN_SECONDS;
protected static ?string $action;
public function __construct()
@@ -180,7 +184,7 @@
/**
* Convert MySQL datetime to ISO 8601 timestamp
*/
- protected function formatTimestamp(?string $mysqlDatetime): ?string
+ public function formatTimestamp(?string $mysqlDatetime): ?string
{
return Response::formatTimestamp($mysqlDatetime);
}
@@ -555,11 +559,11 @@
*/
protected function verifyTurnstile(string $token): bool
{
- if (!Site::hasIntegration('cloudflare') || !JVB()->connect('cloudflare')->isSetUp()) {
+ if (!Site::hasIntegration('cloudflare') || !Cloudflare::getInstance()->isSetUp()) {
return true;
}
- return !empty($token) && JVB()->connect('cloudflare')->verifyTurnstile($token);
+ return !empty($token) && Cloudflare::getInstance()->verifyTurnstile($token);
}
/**
@@ -632,7 +636,7 @@
]);
try {
- JVB()->error()->log('security_audit', $event, $context, 'info');
+ Errors::getInstance()->log('security_audit', $event, $context, 'info');
} catch (Exception $e) {
error_log("Security Audit: {$event} - " . json_encode($context));
}
@@ -644,7 +648,7 @@
protected function logError(string $message, array $context = [], string $severity = 'error'): void
{
try {
- JVB()->error()->log(static::class, $message, $context, $severity);
+ Errors::getInstance()->log(static::class, $message, $context, $severity);
} catch (Exception $e) {
error_log(static::class . " Error: {$message} - " . json_encode($context));
}
@@ -896,7 +900,7 @@
'name' => $term->name,
'slug' => $term->slug,
'parent' => $term->parent,
- 'path' => JVB()->routes('term')->getTermPath($term->term_id, $term->name, $taxonomy),
+ 'path' => TermRoutes::getInstance()->getTermPath($term->term_id, $term->name, $taxonomy),
'taxonomy' => jvbNoBase($term->taxonomy),
'count' => $term->count,
];
--
Gitblit v1.10.0