From f4be611c51473359e6d41780f0313c446079e9d3 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 09 Jun 2026 15:19:24 +0000
Subject: [PATCH] =Switched the /base/options.php to the same pattern as Site.php: a class based approached rather than a filter. Updated Meta.php to play along with the defined fields from there in Meta::forOptions. Had to change openingHoursSpecificationsTrait.php to not use the translater functions __('text','textdomain') for now, as we load before init.
---
inc/registrar/Registrar.php | 636 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 582 insertions(+), 54 deletions(-)
diff --git a/inc/registrar/Registrar.php b/inc/registrar/Registrar.php
index 33a8687..1ecadf3 100644
--- a/inc/registrar/Registrar.php
+++ b/inc/registrar/Registrar.php
@@ -1,22 +1,27 @@
<?php
namespace JVBase\registrar;
+
+use JVBase\base\Site;
+use JVBase\inc\registrar\helpers\HideSingle;
use JVBase\managers\Cache;
use JVBase\managers\CRUD;
use JVBase\managers\IconsManager;
+use JVBase\managers\KarmaManager;
use JVBase\meta\Meta;
use JVBase\registrar\config\Breadcrumbs;
use JVBase\registrar\config\Dashboard;
use JVBase\registrar\config\Directory;
use JVBase\registrar\config\Feed;
use JVBase\registrar\config\Integration;
+use JVBase\registrar\config\Register;
use JVBase\registrar\config\Section;
use JVBase\registrar\config\SEO;
use JVBase\registrar\helpers\AddIntegrationFields;
use JVBase\registrar\helpers\MakeCalendarType;
+use JVBase\registrar\helpers\MakeTimelineType;
use JVBase\registrar\helpers\MakeTrackChanges;
use JVBase\registrar\helpers\MakeVerification;
-use JVBase\utility\Features;
use WP_Query;
if (!defined('ABSPATH')) {
@@ -28,6 +33,7 @@
protected string $type;
protected string $singular;
protected string $plural;
+ protected string $profile;
protected string $description ='';
protected Fields $fields;
protected array $sections = [];
@@ -41,15 +47,25 @@
protected int|false $page = false;
+ public ?string $rewrite_taxonomy = null;
+
+ public bool $add_image_column = false;
+ public bool $prefix_post_type = false;
+ public string $prefix_with = 'by';
+
+ public bool $system = false;
+
protected static array $allFlags = [
//Shared Flags
'favouritable', 'karma', 'show_feed', 'show_directory', 'approve_new', 'has_responses', 'invitable',
//Post Flags
- 'hide_single', 'redirect_to_author', 'is_calendar', 'single_image', 'is_timeline', 'is_gallery',
+ 'hide_single', 'redirect_to_author', 'is_calendar', 'single_image', 'is_timeline', 'is_gallery', 'is_faq', 'is_glossary', 'rewrite_taxonomy', 'add_image_column',
//Taxonomy Flags
- 'is_content', 'is_ownable', 'verify_entry', 'track_changes', 'associate_user_content',
+ 'is_content', 'is_ownable', 'verify_entry', 'track_changes', 'associate_user_content', 'prefix_post_type',
//User Flags
- 'has_dashboard', 'can_register', 'can_create', 'keep_stats', 'can_favourite', 'member_verified', 'profile_link', 'manage_others'
+ 'has_dashboard', 'can_register', 'can_create', 'keep_stats', 'can_favourite', 'member_verified', 'profile_link', 'manage_others',
+ //System
+ 'system'
];
/**********************************************************************************************
SHARED FLAGS
@@ -62,6 +78,7 @@
* @var bool Whether to setup karma for this content
*/
protected bool $karma = false;
+ protected ?KarmaManager $karmaManager = null;
/**
* @var bool Whether this should be available in the feed block
*/
@@ -90,6 +107,7 @@
* @var bool Whether single items of this content should be hidden
*/
protected bool $hide_single = false;
+ protected ?HideSingle $hideSingleHandler = null;
/**
* @var bool Whether single items should just go to the author's page
@@ -98,11 +116,21 @@
/**
* @var bool Whether to make this a calendar type (example: events)
*/
- protected bool $is_calendar;
+ protected bool $is_calendar = false;
+ protected ?MakeCalendarType $isCalendarHandler = null;
/**
* @var bool Whether this is a before/after post type
*/
protected bool $is_timeline = false;
+ protected ?MakeTimelineType $isTimelineHandler = null;
+ /**
+ * @var bool Whether this is a defined term post type
+ */
+ protected bool $is_glossary = false;
+ /**
+ * @var bool Whether this is a faq post type
+ */
+ protected bool $is_faq = false;
/**
* @var bool Whether the uploader can group images prior to upload
*/
@@ -113,7 +141,7 @@
/**
* @var bool For taxonomy types only. Treats the taxonomy as a content (ie: tattoo shops))
*/
- protected bool $is_content;
+ protected bool $is_content = false;
/**
* @var bool Whether this taxonomy can be owned/managed by specific people only
*/
@@ -121,11 +149,13 @@
/**
* @var bool Whether users/content need to request the owner for admission
*/
- protected bool $verify_entry;
+ protected bool $verify_entry = false;
+ protected ?MakeVerification $verifyEntryHandler = null;
/**
* @var bool Whether we should track post movements from term to term (ie. artists in tattoo shops)
*/
- protected bool $track_changes;
+ protected bool $track_changes = false;
+ protected ?MakeTrackChanges $trackChangesHandler = null;
/**
* @var bool Whether any content by members in this taxonomy should show up in this taxonomy
@@ -158,21 +188,32 @@
/**
* @var bool Whether to generate a profile for this user role
*/
- protected bool $profile_link;
+ public bool $profile_link;
/**
* @var array|string
*/
- protected array|string $can_create = [];
+ protected array $can_create = [];
/**
* @var array slugs of other user roles this role can manage
*/
protected array $manage_others = [];
+ /**
+ * @var string The slug of the taxonomy that defines different access points
+ * Example, for edmonton.ink, we have artist_type, and $this->>can_create would be:
+ * [
+ * 'piercer' => ['piercings', 'artwork', 'events'],
+ * 'tattoo_artist'=> ['tattoos', 'artwork', 'events'],
+ * 'artist' => ['artwork']
+ * ]
+ */
+ protected string $user_subtype;
/** Configs **/
protected Breadcrumbs $breadcrumbs;
protected Dashboard $dashboard;
protected Directory|false $directory;
protected Feed|false $feed;
+ protected Register|false $login;
// protected Management $management;
// protected Responses $responses;
protected ?SEO $seo = null;
@@ -186,8 +227,10 @@
private static array $instances = [];
+ protected string $based;
private function __construct(string $slug, string $singular, string $plural, string $type) {
$this->slug = $slug;
+ $this->based = jvbCheckBase($slug);
$this->type = $type;
$this->singular = $singular;
$this->plural = $plural;
@@ -197,10 +240,63 @@
// $this->initClasses();
$this->setFields();
- add_action('init', [$this, 'register'], 0);
+ add_action('init', [$this, 'register'], 2);
add_filter('jvbDashboardPage', [$this, 'renderDashPage'], 10, 3);
}
+ public static function maybeExcludeSingles(array $IDs):array
+ {
+ self::ensureInstanced();
+
+ $features = ['hide_single', 'is_timeline'];
+ foreach ($features as $feature) {
+ foreach (self::withFeature($feature) as $instance) {
+ $instance = self::getInstance($instance);
+ $cache = Cache::for('tsf')->connect($instance->getType());
+ $cache->flush();
+
+ $exclude = $cache->remember(
+ $feature,
+ function () use ($instance, $feature) {
+ switch ($feature) {
+ case 'hide_single':
+ return $instance->excludeSingle();
+ case 'is_timeline':
+ return $instance->excludeTimeline();
+ default:
+ return [];
+ }
+ }
+ );
+
+ if (!empty($exclude)) {
+ $IDs = array_merge($IDs, $exclude);
+ }
+ }
+ }
+
+ return $IDs;
+ }
+ protected function excludeSingle():array
+ {
+ return get_posts([
+ 'post_type' => $this->based,
+ 'posts_per_page'=> -1,
+ 'fields' => 'ids',
+ 'post_status' => 'publish',
+ ]);
+ }
+ protected function excludeTimeline():array
+ {
+ return get_posts([
+ 'post_type' => $this->based,
+ 'posts_per_page'=> -1,
+ 'fields' => 'ids',
+ 'post_status' => 'publish',
+ 'post_parent__not_in' => [0], // Only get posts with a parent
+ ]);
+ }
+
protected function initRegistrar():void {
$this->registrar = match ($this->type) {
'post' => new Posts($this->slug, $this->singular, $this->plural),
@@ -272,8 +368,16 @@
return $this;
}
$this->args = $args;
+
foreach ($args as $property => $value) {
- $this->registrar->$property = $value;
+ if (property_exists($this->registrar, $property)) {
+ $this->registrar->$property = $value;
+ }
+
+ if (property_exists($this, $property)) {
+ $this->$property = $value;
+ }
+
}
if (isset($this->icon) && !str_contains($this->icon, 'dashicons')){
$this->registrar->menu_icon = IconsManager::for()->getCSSIcon($this->icon);
@@ -340,7 +444,8 @@
}
public function setIntegration(string $integration):self
{
- if (!Features::forSite()->has($integration)){
+
+ if (!Site::hasIntegration($integration)){
error_log('Integration not available for '.$this->slug.': '.$integration);
return $this;
}
@@ -351,7 +456,7 @@
public function getIntegrationFields(string $integration):AddIntegrationFields|false
{
- if (!Features::forSite()->has($integration)){
+ if (!Site::has($integration)){
error_log('Integration not available for '.$this->slug.': '.$integration);
return false;
}
@@ -365,9 +470,18 @@
{
return $this->integrationConfigs;
}
- public function hasIntegration(string $integration) {
- return in_array($integration, $this->integrationConfigs);
+ public function hasIntegration(string $integration):bool
+ {
+ return array_key_exists($integration, $this->integrationConfigs);
}
+ public function hasAnyIntegrations(array $integrations = []):bool
+ {
+ if (empty($integrations)) {
+ $integrations = array_keys($this->integrationConfigs);
+ return !empty($integrations);
+ }
+ return !empty(array_intersect($integrations, array_keys($this->integrationConfigs)));
+ }
public function setUploadTitle(string $title):self
{
$this->upload_title = $title;
@@ -383,6 +497,35 @@
return $this->slug;
}
+ public function getBased():string
+ {
+ return $this->based;
+ }
+
+ public function setGlossary(bool $set):self
+ {
+ $this->is_glossary = $set;
+// if ($set) {
+// $this->timeline = new MakeTimelineType($this->slug, $this);
+// }
+ return $this;
+ }
+ public function isGlossary():bool
+ {
+ return $this->is_glossary;
+ }
+ public function setFaq(bool $set):self
+ {
+ $this->is_faq = $set;
+// if ($set) {
+// $this->timeline = new MakeTimelineType($this->slug, $this);
+// }
+ return $this;
+ }
+ public function isFaq():bool
+ {
+ return $this->is_faq;
+ }
public function setTimeline(bool $set):self
{
$this->is_timeline = $set;
@@ -415,10 +558,36 @@
case 'is_content':
add_action('init', [$this, 'setupContent'], 20);
break;
+ case 'is_glossary':
+ $this->hide_single = true;
+ break;
}
}
return $this;
}
+ public function unsetAll(array $flags):self
+ {
+ $flags = array_filter($flags, function($flag) {
+ return in_array($flag, static::$allFlags);
+ });
+ foreach ($flags as $flag) {
+ $this->$flag = false;
+ switch ($flag) {
+ case 'is_content':
+ remove_action('init', [$this, 'setupContent'], 20);
+ break;
+ case 'is_glossary':
+ $this->hide_single = false;
+ break;
+ }
+ }
+ return $this;
+ }
+ public function prefixWith(string $prefix):self
+ {
+ $this->prefix_with = sanitize_title($prefix);
+ return $this;
+ }
public function removeAll(array $flags):self
{
$flags = array_filter($flags, function($flag) {
@@ -438,21 +607,55 @@
}
return isset($this->$feature) && $this->$feature === true;
}
+
+ /**
+ * @deprecated use withFeature
+ * @param string $feature
+ * @param string|null $type
+ * @return array
+ */
public static function getFeatured(string $feature, ?string $type = null):array
{
+ return self::withFeature($feature, $type);
+ }
+
+ public static function withFeature(string $feature, ?string $type = null):array
+ {
+ self::ensureInstanced();
+
if (!in_array($feature, static::$allFlags)) {
error_log('Feature requested not found: '.$feature);
return [];
}
return array_map(function($inst) { return $inst->slug; },array_filter(self::$instances, function ($inst) use ($feature, $type){
- return isset($inst->$feature) && $inst->$feature === true && (is_null($type) || $inst->type === $type);
+ if ((!is_null($type) && $inst->type !== $type) || $inst->system) {
+ return false;
+ }
+ return property_exists($inst, $feature) && isset($inst->$feature) && $inst->$feature === true;
+ }));
+ }
+
+ public static function withIntegration(string $integration, ?string $type = null):array
+ {
+ self::ensureInstanced();
+
+ if (!Site::has($integration)) {
+ error_log('[Registrar]::withIntegration Integration not available to fetch: '.$integration);
+ return [];
+ }
+
+ return array_map(function($inst) { return $inst->slug; },array_filter(self::$instances, function ($inst) use ($integration, $type){
+ if (!is_null($type) && $inst->type !== $type) {
+ return false;
+ }
+ return array_key_exists($integration, $this->integrationConfigs);
}));
}
public function config(string $config):mixed
{
- $allowed = ['breadcrumbs','calendar','dashboard','directory','feed','management','has_responses','seo','trackchanges','verification'];
+ $allowed = ['breadcrumbs','calendar','register','login','dashboard','directory','feed','management','has_responses','seo','trackchanges','verification'];
if (!in_array(strtolower($config), $allowed)) {
error_log('Invalid config requested from Registrar: '.$config);
return [];
@@ -461,6 +664,7 @@
'breadcrumbs' => $this->getBreadcrumbs(),
'dashboard' => $this->getDashboard(),
'directory' => $this->getDirectory(),
+ 'register','login' => $this->getLogin(),
'feed' => $this->getFeed(),
'management' => $this->getManagement(),
'has_responses' => $this->getResponses(),
@@ -469,14 +673,24 @@
'verification' => $this->getVerification()
};
}
+ protected function getLogin():Register|false
+ {
+ if (!isset($this->login)) {
+ $this->login = new Register();
+ }
+ return $this->login;
+ }
protected function getBreadcrumbs():Breadcrumbs
{
- $this->breadcrumbs = new Breadcrumbs($this->slug, $this);
+ if (!isset($this->breadcrumbs)) {
+ $this->breadcrumbs = new Breadcrumbs($this->slug);
+ }
+
return $this->breadcrumbs;
}
protected function getCalendar():MakeCalendarType|false
{
- if ($this->is_calendar){
+ if ($this->is_calendar && !isset($this->calendar)){
$this->calendar = new MakeCalendarType($this->slug, $this);
} else {
$this->calendar = false;
@@ -486,26 +700,25 @@
protected function getDashboard():Dashboard
{
- $this->dashboard = new Dashboard($this->plural, $this);
+ if (!isset($this->dashboard)) {
+ $this->dashboard = new Dashboard($this->plural);
+ }
+
return $this->dashboard;
}
protected function getDirectory():Directory|false
{
- if ($this->show_directory) {
- $this->directory = new Directory($this->singular, $this);
- } else {
- $this->directory = false;
+ if (!isset($this->directory)) {
+ $this->directory = new Directory($this->singular);
}
return $this->directory;
}
protected function getFeed():Feed|false
{
- if ($this->show_feed) {
- $this->feed = new Feed($this->slug, $this);
- } else {
- $this->feed = false;
+ if (!isset($this->feed)) {
+ $this->feed = new Feed($this->slug);
}
return $this->feed;
}
@@ -513,7 +726,7 @@
public function getSEO():SEO
{
if (!isset($this->seo)){
- $this->seo = new SEO($this->slug, $this);
+ $this->seo = new SEO($this->slug);
}
return $this->seo;
}
@@ -521,9 +734,10 @@
public function getSections():array
{
$allSections = array_map(function($section) {
- return $section->getConfig;
+ return $section->getConfig();
}, $this->sections);
+
if (!empty($this->sectionOrder)) {
$allSections['order'] = $this->sectionOrder;
}
@@ -531,11 +745,40 @@
}
public function addSection(string $title):Section
{
- $section = new Section($title, $this);
- $this->sections[] = $section;
- return $section;
+ $slug = sanitize_title($title);
+ if (!array_key_exists($slug, $this->sections)) {
+ $section = new Section($title, $this);
+ $this->sections[$slug] = $section;
+ }
+
+ return $this->sections[$slug];
}
+ public static function maybeBuildSections():void
+ {
+ foreach (self::$instances as $inst) {
+ $inst->buildSections();
+ }
+ }
+ protected function buildSections():void
+ {
+ $fields = $this->getFields();
+ $sections = array_unique(array_values(array_map(function ($f) {
+ return array_key_exists('section', $f) && !is_null($f['section']) ? $f['section'] : 'main';
+ }, $fields)));
+
+ foreach ($sections as $s) {
+ $section = new Section($s, $this);
+ $section->setTitle(ucwords(implode(' ', explode('-', $s))));
+ $sectionFields = array_filter($fields, function ($f) use ($s) {
+ $tmp = array_key_exists('section', $f) && !is_null($f['section']) ? $f['section'] : 'main';
+ return $s === $tmp;
+ });
+ $section->setFields(array_keys($sectionFields));
+ $this->sections[$s] = $section;
+ }
+ }
+
public function setSectionOrder(array $sections):self
{
$allSections = array_map(function($section) {
@@ -578,13 +821,56 @@
public function register():void
{
- if ($this->registrar) {
- $this->registrar->register();
+ if ($this->type === 'post') {
+ if ($this->hide_single) {
+ $this->hideSingleHandler = new HideSingle($this->slug, $this);
+ }
+ if ($this->is_timeline) {
+ $this->isTimelineHandler = new MakeTimelineType($this->slug);
+ $this->registrar->hierarchical = true;
+ }
+ if ($this->is_calendar) {
+ $this->isCalendarHandler = new MakeCalendarType($this->slug, $this);
+ }
+
+ if (!is_null($this->rewrite_taxonomy)) {
+ $this->registrar->addTaxonomyRewrite($this->rewrite_taxonomy);
+ }
+
+ if ($this->registrar) {
+ $this->registrar->register();
+ }
+ if ($this->add_image_column) {
+ add_filter("manage_{$this->based}_posts_columns", [$this, 'addImageColumn']);
+ add_action("manage_{$this->based}_posts_custom_column", [$this, 'showImageColumn'], 10, 2);
+ }
+ } elseif ($this->type === 'term') {
+ if ($this->is_content) {
+ if ($this->verify_entry) {
+ $this->verifyEntryHandler = new MakeVerification();
+ }
+ if ($this->track_changes) {
+ $this->trackChangesHandler = new MakeTrackChanges($this->slug);
+ }
+ }
+
+ if ($this->prefix_post_type) {
+ $this->addPostTypeRewrites();
+ }
+
+ if ($this->registrar) {
+ $this->registrar->register();
+ }
}
+ if ($this->karma) {
+ $this->karmaManager = KarmaManager::for($this->slug, $this->type);
+ }
}
public static function getInstance(string $slug):Registrar|false
{
+ self::ensureInstanced();
+
$slug = jvbNoBase($slug);
if (array_key_exists($slug, static::$instances)) {
return static::$instances[$slug];
@@ -594,6 +880,7 @@
public static function getFieldsFor(string $slug):array
{
+ self::ensureInstanced();
if (!array_key_exists($slug, static::$instances)) {
return [];
}
@@ -603,33 +890,38 @@
public static function getRegistered(?string $type = null):array
{
+ self::ensureInstanced();
$instances = ($type) ? array_filter(static::$instances, function($instance) use ($type) {
- return $instance->type === $type;
+ return $instance->type === $type && !$instance->system;
}) : static::$instances;
return array_keys($instances);
}
public static function getLabels():array
{
+ self::ensureInstanced();
return array_map(function ($instance) {
return ['singular' => $instance->getSingular(),
'plural' => $instance->getPlural()];
}, static::$instances);
}
- public function getCreatable():array
+ public function getCreatable(bool $based = false):array
{
if ($this->type !== 'user') {
return [];
}
- return $this->can_create;
+ return $based ? array_map(function ($item) { return jvbCheckBase($item); },$this->can_create) : $this->can_create;
}
public function setCreatable(string|array $creatable):self
{
- $this->can_create = $creatable;
+ $this->can_create = is_string($creatable) ? [jvbNoBase($creatable)] : array_map(function ($type) {
+ return jvbNoBase($type);
+ }, $creatable);
return $this;
}
+
public function getManageOthers():array
{
if ($this->type !== 'user'){
@@ -686,9 +978,49 @@
}
wp_reset_postdata();
}
-
add_filter('jvb_post_content_output', [$this, 'renderContent'], 20, 2);
+
+
+ //Add a date published and date modified fields, and auto-update them on term creation/modification
+ $this->fields()->addField('date_published', [
+ 'type' => 'datetime',
+ 'label' => 'Published',
+ 'hidden' => true,
+ ]);
+ $this->fields()->addField('date_modified', [
+ 'type' => 'datetime',
+ 'label' => 'Modified',
+ 'hidden' => true,
+ ]);
+ add_action('created_'.$this->based, [$this, 'addTermCreatedMeta']);
+ add_action('edited_'.$this->based, [$this, 'addTermUpdatedMeta']);
}
+ public function addTermCreatedMeta(int $termId):void
+ {
+ update_term_meta($termId, BASE . 'date_published', date('Y-m-d H:i:s'));
+ update_term_meta($termId, BASE . 'date_modified', date('Y-m-d H:i:s'));
+ }
+ public function handleContentTermMetaChange(int $meta_id, int $term_id, string $meta_key, $meta_value):void
+ {
+ $term = get_term($term_id);
+ $taxonomy = $term->taxonomy;
+ if ($taxonomy === $this->based && $meta_key !== BASE . 'date_modified') {
+ $meta = Meta::forTerm($term_id);
+ $meta->set('date_modified', date('Y-m-d H:i:s'));
+ }
+
+ }
+ public function addTermUpdatedMeta(int $termId):void
+ {
+
+ static $processing = [];
+ if (isset($processing[$termId])) return;
+ $processing[$termId] = true;
+
+ update_term_meta($termId, BASE . 'date_modified', date('Y-m-d H:i:s'));
+
+ unset($processing[$termId]);
+ }
public function renderContent(string $content, array $block):string
{
if (!is_page($this->page)) {
@@ -701,24 +1033,85 @@
Cache::for($this->slug)->flush();
}
- $out = Cache::for($this->slug)->remember(
- get_the_ID(),
- function() {
+ $per_page = 10;
+ $page = $_GET['tp']??1;
- $items = get_terms([
- 'taxonomy' => jvbCheckBase($this->slug),
+ $args = apply_filters('jvb_content_tax_args_'.$this->slug, [
+ 'taxonomy' => $this->based,
// 'hide_empty' => true,
- 'fields' => 'ids',
+ 'fields' => 'ids',
+ 'number' => $per_page,
+ 'offset' => ($page - 1) * $per_page,
+ 'meta_key' => BASE.'date_modified',
+ 'meta_type' => 'DATETIME',
+ 'orderby' => 'meta_value',
+ 'order' => 'desc',
+ ]);
+
+ $cache = Cache::for($this->slug)->connect('taxonomy');
+ $max = $cache->remember(
+ 'max',
+ function () {
+ $max = get_terms([
+ 'taxonomy' => $this->based,
+ 'fields' => 'ids',
+ 'number' => 0,
+ 'hide_empty' => true
]);
+ return count($max??[]);
+ }
+ );
+
+
+ $totalPages = floor($max/$per_page);
+
+ global $wp;
+ $current = get_home_url(null, '/'.$wp->request.'/');
+
+ $pages = '';
+ for ($i = 1; $i<=$totalPages; $i++) {
+ $pages .= (int)$page === $i ?
+ sprintf(
+ '<li class="current">%s</li>',
+ $i
+ ): sprintf(
+ '<li><a href="%s">%s</a></li>',
+ add_query_arg('tp', $i, $current),
+ $i
+ );
+ }
+
+ $nav = sprintf(
+ '<nav class="pagination">%s<ul>%s</ul>%s</nav>',
+ $page > 1 ? '<a href="'.add_query_arg('tp', $page-1, $current).'" title="Next Page" class="btn">'.jvbIcon('arrow-circle-left').'<span class="screen-reader-text">Previous Page</span></a>' : '',
+ $pages,
+ $page < $totalPages ? '<a href="'.add_query_arg('tp', $page+1, $current).'" title="Next Page" class="btn">'.jvbIcon('arrow-circle-right').'<span class="screen-reader-text">Next Page</span></a>' : '',
+ );
+
+
+ $out = $nav. Cache::for($this->slug)->remember(
+ $cache->generateKey(['type' =>'contentArchive', ... $args]),
+ function() use ($args) {
+
+
+ $items = get_terms($args);
$out = [];
+
+
+ $method = BASE.'render_'.$this->slug.'_content';
if ($items && !is_wp_error($items)) {
- foreach ($items as $item) {
- $meta = Meta::forTerm($item);
+ foreach ($items as $termID) {
+ $meta = Meta::forTerm($termID);
+ if (function_exists($method)) {
+ $out[] = $method($termID);
+ continue;
+ }
+ $meta = Meta::forTerm($termID);
$slug = sanitize_title($meta->get('name'));
$item = sprintf(
- '<li id="%s"><h3><a href="%s">%s</a></h3><p>%s</p><ul>',
+ '<li id="%s"><h2><a href="%s">%s</a></h2><p>%s</p><ul class="loop scroll">',
$slug,
- get_term_link($item, jvbCheckBase($this->slug))??'',
+ get_term_link($termID, $this->based)??'',
$meta->get('name'),
$meta->get('description')
);
@@ -728,6 +1121,12 @@
'post_status' => 'publish',
'posts_per_page' => 3,
'fields' => 'ids',
+ 'tax_query' => [
+ [
+ 'taxonomy' => $this->based,
+ 'terms' => $termID
+ ]
+ ]
]);
if ($posts->have_posts()) {
while($posts->have_posts()) {
@@ -737,7 +1136,7 @@
$img = $postMeta->get('post_thumbnail');
$img = !empty($img) ? jvbFormatImage((int)$img, 'tiny', 'medium') : '';
$item .= sprintf(
- '<li id="%s"><h4><a href="%s">%s</a></h4>%s</li>',
+ '<li id="%s" class="item"><h3><a href="%s">%s</a></h3>%s</li>',
$slug.'-'.sanitize_title(get_the_title($ID)),
get_the_permalink($ID),
$postMeta->get('post_title'),
@@ -750,10 +1149,139 @@
$out[] = $item;
}
}
- return empty($out) ? '' : '<ul class="content-term-list">'.implode('',$out).'</ul>';
+
+ $before = apply_filters(BASE.'before_'.$this->slug.'_content','');
+ $out = empty($out) ? '' : '<ul class="content-term-list">'.implode('',$out).'</ul>';
+ $after = apply_filters(BASE.'after_'.$this->slug.'_content', '');
+ return $before.$out.$after;
}
- );
+ ).$nav;
error_log('Built the '.$this->slug.' page content.');
return $content . $out;
}
+
+ public static function ensureInstanced():void
+ {
+ if (empty(self::$instances)) {
+ do_action('jvb_define_registrar');
+ do_action('jvb_define_fields');
+ }
+ }
+
+ /*****************************************************************
+ * FLAGGED FEATURES
+ *****************************************************************/
+
+ public function profile(?string $slug = null, ?string $singular = null, ?string $plural = null):self
+ {
+ if (!$slug) {
+ $slug = $this->slug.'_profile';
+ }
+ if (!$singular) {
+ $singular = $this->singular;
+ }
+ if (!$plural) {
+ $plural = $this->plural;
+ }
+ $this->profile_link = true;
+
+ $this->profile = $slug;
+
+ return Registrar::forPost($slug, $singular, $plural);
+ }
+ public function getProfile():self|false
+ {
+ if (!$this->profile_link) {
+ return false;
+ }
+ return self::getInstance($this->profile);
+ }
+
+ public static function getProfileTypes():array
+ {
+ $hasProfiles = self::withFeature('profile_link');
+ if (empty($hasProfiles)) {
+ return [];
+ }
+ return array_filter(array_map(function($profile) {
+ $instance = self::getInstance($profile);
+ return $instance->getProfile()->based??false;
+ }, $hasProfiles));
+ }
+
+ public function setUserSubtype(string $type):self
+ {
+ $this->user_subtype = sanitize_text_field($type);
+ return $this;
+ }
+ public function getUserSubtype():string|false
+ {
+ return $this->user_subtype??false;
+ }
+
+ public function addImageColumn(array $columns):array
+ {
+ $keys = array_keys($columns);
+ $index = array_search('cb', $keys);
+ if ($index !== false) {
+ $pos = $index+1;
+ $columns = array_slice($columns, 0, $pos, true) + ['jvb_featured_image' => 'Image'] + array_slice($columns, $pos, null, true);
+ }
+ return $columns;
+ }
+ public function showImageColumn(string $column, int $postID):void
+ {
+ if ($column === 'jvb_featured_image') {
+ echo get_the_post_thumbnail($postID, 'tiny');
+ }
+ }
+
+ protected function addPostTypeRewrites():void
+ {
+ $for = $this->registrar->for;
+ foreach ($for as $type) {
+ $registrar = Registrar::getInstance($type);
+ if ($registrar) {
+ $base = $registrar->registrar->rewrite['slug']??$registrar->slug;
+
+ $prefix = empty($this->prefix_with) ? '' : '/'.$this->prefix_with;
+ $prefix = str_replace('//', '/', $prefix);
+
+ $slug = str_contains($this->slug, '_') ? str_replace('_','-', $this->slug) : $this->slug;
+ add_rewrite_rule(
+ $base.$prefix.'/'.$slug.'/([a-z0-9-]+)/?$',
+ 'index.php?post_type='.$registrar->getBased().'&'.$this->based.'=$matches[1]',
+ 'top'
+ );
+ add_rewrite_rule(
+ $base.$prefix.'/'.$slug.'/([a-z0-9-]+)/page/([0-9-]+)/?$',
+ 'index.php?post_type='.$registrar->getBased().'&'.$this->based.'=$matches[1]&paged=$matches[2]',
+ 'top'
+ );
+ }
+ }
+ }
+
+ public function getFeedFields():array
+ {
+ $config = $this->getConfig('feed');
+ $all = $this->getFields();
+ $img = $config['images']??['post_thumbnail'];
+ $f = $config['fields']??['post_title', 'post_date', 'post_excerpt'];
+
+ $f = array_filter($f, function($field) use ($img) {
+ return !in_array($field, $img);
+ });
+ $images = [];
+ $fields = [];
+
+ foreach($img as $i) {
+ $images[] = $all[$i];
+ }
+ foreach ($f as $x) {
+ $fields[] = $all[$x];
+ }
+
+ return [$images,$fields];
+ }
}
--
Gitblit v1.10.0