=Switched the /base/options.php to the same pattern as Site.php: a class ba...

Jake Vanderwerf

yesterday f4be611c51473359e6d41780f0313c446079e9d3

 inc/registrar/Registrar.php

@@ -14,6 +14,7 @@
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;
@@ -212,6 +213,7 @@
   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;
@@ -468,7 +470,8 @@
   {
      return $this->integrationConfigs;
   }
   public function hasIntegration(string $integration) {
   public function hasIntegration(string $integration):bool
   {
      return array_key_exists($integration, $this->integrationConfigs);
   }
    public function hasAnyIntegrations(array $integrations = []):bool
@@ -562,6 +565,24 @@
      }
      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);
@@ -634,7 +655,7 @@

   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 [];
@@ -643,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(),
@@ -651,10 +673,17 @@
         'verification' => $this->getVerification()
      };
   }
        protected function getLogin():Register|false
        {
            if (!isset($this->login)) {
                $this->login = new Register();
            }
            return $this->login;
        }
      protected function getBreadcrumbs():Breadcrumbs
      {
         if (!isset($this->breadcrumbs)) {
            $this->breadcrumbs = new Breadcrumbs($this->slug, $this);
            $this->breadcrumbs = new Breadcrumbs($this->slug);
         }

         return $this->breadcrumbs;
@@ -672,7 +701,7 @@
      protected function getDashboard():Dashboard
      {
         if (!isset($this->dashboard)) {
            $this->dashboard = new Dashboard($this->plural, $this);
            $this->dashboard = new Dashboard($this->plural);
         }

         return $this->dashboard;
@@ -705,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;
      }
@@ -715,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) {
@@ -767,7 +826,7 @@
            $this->hideSingleHandler = new HideSingle($this->slug, $this);
         }
         if ($this->is_timeline) {
            $this->isTimelineHandler = new MakeTimelineType($this->slug, $this);
            $this->isTimelineHandler = new MakeTimelineType($this->slug);
            $this->registrar->hierarchical = true;
         }
         if ($this->is_calendar) {
@@ -1104,8 +1163,8 @@
   public static function ensureInstanced():void
   {
      if (empty(self::$instances)) {
         do_action('jvbDefineRegistrar');
         do_action('jvbDefineRegistrarFields');
         do_action('jvb_define_registrar');
         do_action('jvb_define_fields');
      }
   }