From a6413da67a4579866f0fd0323ddb23a7b6b9654a Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Fri, 18 Sep 2026 17:00:53 +0000
Subject: [PATCH] =Cleaning up the Integrations setup a bit, started the Helcim integration work too
---
inc/rest/Rest.php | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/inc/rest/Rest.php b/inc/rest/Rest.php
index 4741e66..81c6fcb 100644
--- a/inc/rest/Rest.php
+++ b/inc/rest/Rest.php
@@ -1,12 +1,14 @@
<?php
namespace JVBase\rest;
-use JVBase\Instance;
+use JVBase\inc\managers\ErrorHelper;
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;
@@ -29,6 +31,7 @@
*/
abstract class Rest
{
+ use ErrorHelper;
protected string $namespace = 'jvb/v1';
protected ?Cache $cache = null;
protected string $cacheName = '';
@@ -485,10 +488,20 @@
*/
protected function checkUser(int $userId): bool
{
- $cache = Cache::for('checkUser', DAY_IN_SECONDS)->connect('user');
+ $cache = Cache::for('checkUser', 'user',DAY_IN_SECONDS);
return $cache->remember($userId, fn() => (bool) get_userdata($userId));
}
+ protected function checkArray(string $value, array $search, bool $lowercase = true):string|false
+ {
+ if ($lowercase) {
+ $value = strtolower($value);
+ }
+
+ return in_array($value, $search) ? $value : false;
+
+ }
+
/**
* Check if term exists (cached)
*/
@@ -501,7 +514,7 @@
return false;
}
- $cache = Cache::for('checkTerm', DAY_IN_SECONDS)->connect('taxonomy');
+ $cache = Cache::for('checkTerm', 'term', DAY_IN_SECONDS);
return $cache->remember($termId, fn() => (bool) term_exists($termId, jvbCheckBase($taxonomy)));
}
@@ -510,7 +523,7 @@
*/
protected function isVerifiedUser(int $userId): bool
{
- $cache = Cache::for('verifiedUsers', DAY_IN_SECONDS)->connect('user');
+ $cache = Cache::for('verifiedUsers', 'user',DAY_IN_SECONDS);
return $cache->remember($userId, fn() => user_can($userId, 'skip_moderation'));
}
@@ -634,24 +647,12 @@
]);
try {
- JVB()->error()->log('security_audit', $event, $context, 'info');
+ $this->logError($event,'auditLog', $context);
} catch (Exception $e) {
error_log("Security Audit: {$event} - " . json_encode($context));
}
}
- /**
- * Log errors with proper context
- */
- protected function logError(string $message, array $context = [], string $severity = 'error'): void
- {
- try {
- JVB()->error()->log(static::class, $message, $context, $severity);
- } catch (Exception $e) {
- error_log(static::class . " Error: {$message} - " . json_encode($context));
- }
- }
-
/************************************************************
SESSION FINGERPRINT
************************************************************/
@@ -880,12 +881,12 @@
return $terms;
}
$ids = array_map('absint', explode(',',$value));
- $cache = Cache::for('term_data')->connect('taxonomy');
+ $cache = Cache::for('term_data','term');
$cache->flush();
if (!array_key_exists($taxonomy, $terms)) {
$terms[$taxonomy] = [];
$registrar = Registrar::getInstance($taxonomy);
- $terms[$taxonomy]['icon'] = $registrar ? $registrar->getIcon() : jvbDefaultIcon();;
+ $terms[$taxonomy]['icon'] = $registrar ? $registrar->getIcon() : jvbDefaultIcon();
}
foreach ($ids as $id) {
$data = $cache->remember(
@@ -898,7 +899,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