From 0a32df9d171c843b5871c27cafcdee5a3019da86 Mon Sep 17 00:00:00 2001
From: otrok7 <50595291+otrok7@users.noreply.github.com>
Date: Tue, 27 Oct 2026 15:08:15 +0100
Subject: [PATCH 1/4] Refactor how service bodies are stored in configuration.
 Previously, the service bodies were stored in the options table as an array
 of arrays. Now, they are stored as an associative array with the service body
 ID as the key and the service body data as the value. This change allows for
 easier access to service body data by ID and improves performance when
 retrieving service body information.

---
 admin/class-bread-admin.php                   |   2 +-
 admin/js/bmlt_meeting_list.js                 |   3 +-
 admin/js/bread-wizard.js                      |   5 +-
 admin/partials/_bmlt_server_setup.php         |   2 +-
 bmlt-meeting-list.php                         |   4 +-
 includes/class-bread-bmlt.php                 |  44 ++---
 includes/class-bread.php                      | 185 +++++++++---------
 public/class-bread-content-generator.php      |   9 +-
 public/class-bread-meeting-enhancer.php       |  21 +-
 public/class-bread-meetingslist-structure.php |  12 +-
 readme.txt                                    |   2 +-
 tests/mock/class-bread-bmlt.php               |   9 -
 12 files changed, 131 insertions(+), 167 deletions(-)

diff --git a/admin/class-bread-admin.php b/admin/class-bread-admin.php
index ed1642d..5a6e875 100644
--- a/admin/class-bread-admin.php
+++ b/admin/class-bread-admin.php
@@ -511,7 +511,7 @@ function pwsix_process_wizard()
         while (0 === strpos(bin2hex($encode_options), 'efbbbf')) {
             $encode_options = substr($encode_options, 3);
         }
-        $settings = json_decode($encode_options, true);
+        $settings = $this->bread->upgrade_settings(json_decode($encode_options, true));
         $ncols = substr_count($settings['meeting_template_content'], '<td');
         $id = $this->bread->loadAllSettings([]);
         $id = $this->bread->isInitialSetting() ? 1 : ((is_numeric($_POST['wizard_setting_id'])) ? intval($_POST['wizard_setting_id']) : $this->bread->getMaxSetting() + 1);
diff --git a/admin/js/bmlt_meeting_list.js b/admin/js/bmlt_meeting_list.js
index c806032..bcfb1bb 100644
--- a/admin/js/bmlt_meeting_list.js
+++ b/admin/js/bmlt_meeting_list.js
@@ -380,10 +380,9 @@
 	) {
 		let prefix = "";
 		for (i = 0; i < level; i++) prefix += "-";
-		const sbVal = [sb.name, sb.id, sb.parent_id, my_parent].join(",");
 		const option =
 			'<option value="' +
-			sbVal +
+			sb.id +
 			'" ' +
 			(bread_admin.service_bodies_selected.includes(sb.id)
 				? "selected"
diff --git a/admin/js/bread-wizard.js b/admin/js/bread-wizard.js
index 0e51fac..5e2e404 100644
--- a/admin/js/bread-wizard.js
+++ b/admin/js/bread-wizard.js
@@ -91,8 +91,7 @@ jQuery(document).ready(function($){
         BreadWizard.write_service_body_with_childern = function(options, sb, parents, my_parent, level) {
             let prefix = '';
             for (i=0; i<level; i++) prefix += '-';
-            const sbVal = [sb.name,sb.id,sb.parent_id, my_parent].join(',');
-            options.push('<option value="'+sbVal+'">'+prefix+sb.name+'</option>');
+            options.push('<option value="'+sb.id+'">'+prefix+sb.name+'</option>');
             found = parents.find((p) => p.id == sb.id);
             if (typeof found !== 'undefined')
                 found.children.forEach((child) =>
@@ -178,7 +177,7 @@ jQuery(document).ready(function($){
                     break;
                 case 2:
                     const services = $('#wizard_service_bodies').val().reduce((carry,item) => {
-                        carry += '&services[]='+item.split(',')[1];
+                        carry += '&services[]='+item;
                         return carry;
                     }, '&recursive=1');
                     const formats = (Number($('#wizard_format_filter').val()) > 0) ? '&formats='+$('#wizard_format_filter').val() : '';
diff --git a/admin/partials/_bmlt_server_setup.php b/admin/partials/_bmlt_server_setup.php
index 995a89d..20a0c6e 100644
--- a/admin/partials/_bmlt_server_setup.php
+++ b/admin/partials/_bmlt_server_setup.php
@@ -18,7 +18,7 @@ function Bread_bmlt_server_setup_page_render(Bread_AdminDisplay $breadAdmin)
 <script type="text/javascript">
     window.bread_admin = {};
     window.bread_admin.root_server = '<?php echo esc_js($bread->getOption('root_server')); ?>';
-    window.bread_admin.service_bodies_selected = <?php echo json_encode($bread->getOption('service_bodies')); ?>.map(x => x.split(',')[1]);
+    window.bread_admin.service_bodies_selected = <?php echo json_encode($bread->getOption('service_bodies')); ?>;
     window.bread_admin.extra_meetings = <?php echo json_encode($bread->getOption('extra_meetings')); ?>;
     window.bread_admin.used_format = '<?php echo esc_js($bread->getOption('used_format_1')); ?>';
     window.bread_admin.additional_list_format_key = '<?php echo esc_js($bread->getOption('additional_list_format_key')); ?>';
diff --git a/bmlt-meeting-list.php b/bmlt-meeting-list.php
index d6b13bd..7751298 100644
--- a/bmlt-meeting-list.php
+++ b/bmlt-meeting-list.php
@@ -11,7 +11,7 @@
  * Plugin Name:       Bread
  * Plugin URI:        https://bmlt.app
  * Description:       Maintains and generates PDF Meeting Lists from BMLT.
- * Version:           2.10.9
+ * Version:           2.11.0
  * Author:            bmlt-enabled
  * Author URI:        https://bmlt.app/
  * License:           GPL-2.0+
@@ -30,7 +30,7 @@
  * Start at version 2.8.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define('BREAD_VERSION', '2.10.5');
+define('BREAD_VERSION', '2.11.0');
 
 /**
  * The code that runs during plugin activation.
diff --git a/includes/class-bread-bmlt.php b/includes/class-bread-bmlt.php
index 2bd8e76..3690d9c 100644
--- a/includes/class-bread-bmlt.php
+++ b/includes/class-bread-bmlt.php
@@ -6,7 +6,6 @@ class Bread_Bmlt
 {
     public $connection_error;
     private $bmlt_server_lang = '';
-    private array $unique_areas;
     private array $service_bodies_by_id = [];
     private Bread $bread;
     private ?array $preloaded = null;
@@ -58,42 +57,28 @@ private function get(string $url): WP_Error | array
         }
         return wp_remote_get($url, $args);
     }
-    /**
-     * Generates a list of service bodies to be used in the admin UI's drop downs.
-     *
-     * @return array the service bodies.
-     */
-    public function get_areas()
+    private function load_service_bodies()
     {
-        if (!empty($this->unique_areas)) {
-            return $this->unique_areas;
-        }
-        $result = ($this->preloaded !== null) ? $this->preloaded['serviceBodies']
-            : $this->get_configured_root_server_request("client_interface/json/?switcher=GetServiceBodies");
-        $this->unique_areas = array();
+        if (empty($this->service_bodies_by_id)) {
+            $result = ($this->preloaded !== null) ? $this->preloaded['serviceBodies']
+                : $this->get_configured_root_server_request("client_interface/json/?switcher=GetServiceBodies");
 
-        foreach ($result as $value) {
-            $this->service_bodies_by_id[$value['id']] = $value;
-            $parent_name = 'Parent ID';
-            foreach ($result as $parent) {
-                if ($value['parent_id'] == $parent['id']) {
-                    $parent_name = $parent['name'];
-                }
+            foreach ($result as $value) {
+                $this->service_bodies_by_id[$value['id']] = $value;
             }
-            if ($value['parent_id'] == '') {
-                $value['parent_id'] = '0';
-            }
-            $this->unique_areas[] = $value['name'] . ',' . $value['id'] . ',' . $value['parent_id'] . ',' . $parent_name;
         }
-
-        return $this->unique_areas;
+    }
+    public function get_service_bodies(): array
+    {
+        $this->load_service_bodies();
+        return $this->service_bodies_by_id ?? [];
     }
     /**
      * Returns the GetServiceBodies entry for $id, or null.
      */
     public function get_service_body(string $id): ?array
     {
-        $this->get_areas();
+        $this->load_service_bodies();
         return $this->service_bodies_by_id[$id] ?? null;
     }
     public function generateMainQuery($json = 'json')
@@ -250,9 +235,8 @@ public function generateDefaultQuery(): string
         if (!$this->default_query) {
             $this->default_query = ($this->bread->getOption('recurse_service_bodies')) ? '&recursive=1' : '';
             for ($i=0; $i<count($this->bread->getOption('service_bodies')); $i++) {
-                $area_data = explode(',', $this->bread->getOption('service_bodies')[$i]);
-                $service_body_id = $this->bread->arraySafeGet($area_data, 1);
-                $this->default_query .= '&services[]=' . $service_body_id;
+                ;
+                $this->default_query .= '&services[]=' . $this->bread->getOption('service_bodies')[$i];
             }
         }
         return $this->default_query;
diff --git a/includes/class-bread.php b/includes/class-bread.php
index f2c2eb5..f10354d 100644
--- a/includes/class-bread.php
+++ b/includes/class-bread.php
@@ -385,7 +385,7 @@ public function setOptions(array $theOptions)
     {
         $this->options = $theOptions;
         $this->fillUnsetOptions();
-        $this->upgrade_settings();
+        $this->options = $this->upgrade_settings($this->options);
     }
     public function getOptionsName()
     {
@@ -756,116 +756,125 @@ private function fillUnsetOptionsInner()
     /**
      * Does the work of upgrading from earlier versions.
     */
-    private function upgrade_settings(): void
-    {
-        $this->options['base_font'] = $this->options['base_font'] == "freesans" ? "dejavusanscondensed" : $this->options['base_font'];
-        if (!isset($this->options['bread_version'])) {
-            if (!($this->options['meeting_sort'] === 'weekday_area'
-                || $this->options['meeting_sort'] === 'weekday_city'
-                || $this->options['meeting_sort'] === 'weekday_county'
-                || $this->options['meeting_sort'] === 'day')) {
-                $this->options['weekday_language'] = 'en';
+    public function upgrade_settings(array$settings): array
+    {
+        $settings['base_font'] = $settings['base_font'] == "freesans" ? "dejavusanscondensed" : $settings['base_font'];
+        if (!isset($settings['bread_version'])) {
+            if (!($settings['meeting_sort'] === 'weekday_area'
+                || $settings['meeting_sort'] === 'weekday_city'
+                || $settings['meeting_sort'] === 'weekday_county'
+                || $settings['meeting_sort'] === 'day')) {
+                $settings['weekday_language'] = 'en';
             }
-            if ($this->options['page_fold'] == 'half') {
-                if ($this->options['page_size'] == 'A5') {
-                    $this->options['page_size'] = 'A4';
+            if ($settings['page_fold'] == 'half') {
+                if ($settings['page_size'] == 'A5') {
+                    $settings['page_size'] = 'A4';
                 }
-                $this->options['page_orientation'] = 'L';
+                $settings['page_orientation'] = 'L';
             }
-            if ($this->options['page_fold'] == 'tri') {
-                $this->options['page_orientation'] = 'L';
+            if ($settings['page_fold'] == 'tri') {
+                $settings['page_orientation'] = 'L';
             }
-            if (substr($this->options['meeting_sort'], 0, 8) == 'weekday_') {
-                $this->options['sub_header_shown'] = 'display';
+            if (substr($settings['meeting_sort'], 0, 8) == 'weekday_') {
+                $settings['sub_header_shown'] = 'display';
             }
-            if (isset($this->options['pageheader_text'])) {
-                $this->options['pageheader_content'] = $this->options['pageheader_text'];
-                unset($this->options['pageheader_text']);
+            if (isset($settings['pageheader_text'])) {
+                $settings['pageheader_content'] = $settings['pageheader_text'];
+                unset($settings['pageheader_text']);
             }
-            if (substr($this->options['root_server'], -1) == '/') {
-                $this->options['root_server'] = substr($this->options['root_server'], 0, strlen($this->options['root_server']) - 1);
+            if (substr($settings['root_server'], -1) == '/') {
+                $settings['root_server'] = substr($settings['root_server'], 0, strlen($settings['root_server']) - 1);
             }
-            if (substr($this->options['root_server'], 0, 4) !== 'http') {
-                $this->options['root_server'] = 'http://' . $this->options['root_server'];
+            if (substr($settings['root_server'], 0, 4) !== 'http') {
+                $settings['root_server'] = 'http://' . $settings['root_server'];
             }
         }
-        if ($this->options['weekday_language'] == 'both') {
-            $this->options['weekday_language'] = "en_es";
+        if ($settings['weekday_language'] == 'both') {
+            $settings['weekday_language'] = "en_es";
         }
-        if ($this->options['weekday_language'] == 'both_po') {
-            $this->options['weekday_language'] = "en_po";
+        if ($settings['weekday_language'] == 'both_po') {
+            $settings['weekday_language'] = "en_po";
         }
-        if ($this->options['sub_header_shown'] == '0') {
-            $this->options['sub_header_shown'] = 'none';
+        if ($settings['sub_header_shown'] == '0') {
+            $settings['sub_header_shown'] = 'none';
         }
-        if ($this->options['sub_header_shown'] == '1') {
-            $this->options['sub_header_shown'] = 'display';
+        if ($settings['sub_header_shown'] == '1') {
+            $settings['sub_header_shown'] = 'display';
         }
-        $this->renamed_option('asm_format_key', 'additional_list_format_key');
-        $this->renamed_option('asm_sort_order', 'additional_list_sort_order');
-        $this->renamed_option('asm_language', 'additional_list_language');
-        $this->renamed_option('asm_custom_query', 'additional_list_custom_query');
-        $this->renamed_option('asm_template_content', 'additional_list_template_content');
+        $this->renamed_option('asm_format_key', 'additional_list_format_key', $settings);
+        $this->renamed_option('asm_sort_order', 'additional_list_sort_order', $settings);
+        $this->renamed_option('asm_language', 'additional_list_language', $settings);
+        $this->renamed_option('asm_custom_query', 'additional_list_custom_query', $settings);
+        $this->renamed_option('asm_template_content', 'additional_list_template_content', $settings);
 
-        $this->boolify_option('recurse_service_bodies');
-        $this->boolify_option('extra_meetings_enabled');
-        $this->boolify_option('include_protection');
-        $this->boolify_option('include_additional_list');
-        $this->boolify_option('column_line');
-        $this->boolify_option('sslverify');
-        $this->boolify_option('suppress_heading');
-        $this->boolify_option('header_uppercase');
-        $this->boolify_option('header_bold');
-        $this->boolify_option('cont_header_shown');
-        if ($this->options['weekday_language'] == 'dk') {
-            $this->options['weekday_language'] = 'da';
+        $this->boolify_option('recurse_service_bodies', $settings);
+        $this->boolify_option('extra_meetings_enabled', $settings);
+        $this->boolify_option('include_protection', $settings);
+        $this->boolify_option('include_additional_list', $settings);
+        $this->boolify_option('column_line', $settings);
+        $this->boolify_option('sslverify', $settings);
+        $this->boolify_option('suppress_heading', $settings);
+        $this->boolify_option('header_uppercase', $settings);
+        $this->boolify_option('header_bold', $settings);
+        $this->boolify_option('cont_header_shown', $settings);
+        if ($settings['weekday_language'] == 'dk') {
+            $settings['weekday_language'] = 'da';
         }
 
-        if ($this->versionLessThan('2.8')) {
-            if (($this->options['page_fold'] == 'half' || $this->options['page_fold'] == 'full') && isset($this->options['last_page_content']) && trim($this->options['last_page_content']) !== '') {
-                $this->options['custom_section_content'] = $this->options['last_page_content'];
-                $this->options['custom_section_font_size'] = $this->options['last_page_font_size'];
-                $this->options['custom_section_line_height'] = $this->options['last_page_line_height'];
-                unset($this->options['last_page_content']);
-                unset($this->options['last_page_line_height']);
-                unset($this->options['last_page_font_size']);
+        if ($this->versionLessThan('2.8', $settings)) {
+            if (($settings['page_fold'] == 'half' || $settings['page_fold'] == 'full') && isset($settings['last_page_content']) && trim($settings['last_page_content']) !== '') {
+                $settings['custom_section_content'] = $settings['last_page_content'];
+                $settings['custom_section_font_size'] = $settings['last_page_font_size'];
+                $settings['custom_section_line_height'] = $settings['last_page_line_height'];
+                unset($settings['last_page_content']);
+                unset($settings['last_page_line_height']);
+                unset($settings['last_page_font_size']);
             }
         }
-        if ($this->versionLessThan('2.10')) {
-            $this->options['service_bodies'] = [];
-            if (!empty($this->options['service_body_1']) && $this->options['service_body_1'] != 'Not Used') {
-                $this->options['service_bodies'][] = $this->options['service_body_1'];
+        if ($this->versionLessThan('2.10', $settings)) {
+            $settings['service_bodies'] = [];
+            if (!empty($settings['service_body_1']) && $settings['service_body_1'] != 'Not Used') {
+                $settings['service_bodies'][] = $settings['service_body_1'];
             }
-            if (!empty($this->options['service_body_2']) && $this->options['service_body_2'] != 'Not Used') {
-                $this->options['service_bodies'][] = $this->options['service_body_2'];
+            if (!empty($settings['service_body_2']) && $settings['service_body_2'] != 'Not Used') {
+                $settings['service_bodies'][] = $settings['service_body_2'];
             }
-            if (!empty($this->options['service_body_3']) && $this->options['service_body_3'] != 'Not Used') {
-                $this->options['service_bodies'][] = $this->options['service_body_3'];
+            if (!empty($settings['service_body_3']) && $settings['service_body_3'] != 'Not Used') {
+                $settings['service_bodies'][] = $settings['service_body_3'];
             }
-            if (!empty($this->options['service_body_4']) && $this->options['service_body_4'] != 'Not Used') {
-                $this->options['service_bodies'][] = $this->options['service_body_4'];
+            if (!empty($settings['service_body_4']) && $settings['service_body_4'] != 'Not Used') {
+                $settings['service_bodies'][] = $settings['service_body_4'];
             }
-            if (!empty($this->options['service_body_5']) && $this->options['service_body_5'] != 'Not Used') {
-                $this->options['service_bodies'][] = $this->options['service_body_5'];
+            if (!empty($settings['service_body_5']) && $settings['service_body_5'] != 'Not Used') {
+                $settings['service_bodies'][] = $settings['service_body_5'];
             }
-            unset($this->options['service_body_1']);
-            unset($this->options['service_body_2']);
-            unset($this->options['service_body_3']);
-            unset($this->options['service_body_4']);
-            unset($this->options['service_body_5']);
+            unset($settings['service_body_1']);
+            unset($settings['service_body_2']);
+            unset($settings['service_body_3']);
+            unset($settings['service_body_4']);
+            unset($settings['service_body_5']);
 
-            if ($this->options['base_font'] == 'arial') {
-                $this->options['base_font'] = 'dejabusanscondensed';
+            if ($settings['base_font'] == 'arial') {
+                $settings['base_font'] = 'dejabusanscondensed';
             }
         }
-        $this->options['bread_version'] = BREAD_VERSION;
+        if ($this->versionLessThan('2.11', $settings)) {
+            if (!empty($settings['service_bodies'])) {
+                $settings['service_bodies'] = array_map(function ($sb) {
+                    $area_data = explode(',', $sb);
+                    return $this->arraySafeGet($area_data, 1);
+                }, $settings['service_bodies']);
+            }
+        }
+        $settings['bread_version'] = BREAD_VERSION;
+        return $settings;
     }
-    private function versionLessThan($version): bool
+    private function versionLessThan($version, $settings): bool
     {
-        if (empty($this->options['bread_version'])) {
+        if (empty($settings['bread_version'])) {
             return true;
         }
-        $current = explode('.', $this->options['bread_version']);
+        $current = explode('.', $settings['bread_version']);
         $test = explode('.', $version);
         for ($i=0; $i<count($current); $i++) {
             if ($i >= count($test)) {
@@ -880,18 +889,18 @@ private function versionLessThan($version): bool
         }
         return false;
     }
-    private function renamed_option(string $old, string $new)
+    private function renamed_option(string $old, string $new, array $settings): void
     {
-        if (!empty($this->options[$old])) {
-            if (empty($this->options[$new])) {
-                $this->options[$new] = $this->options[$old];
-                unset($this->options[$old]);
+        if (!empty($settings[$old])) {
+            if (empty($settings[$new])) {
+                $settings[$new] = $settings[$old];
+                unset($settings[$old]);
             }
         }
     }
-    private function boolify_option(string $option)
+    private function boolify_option(string $option, $settings): void
     {
-        $this->options[$option] = boolval($this->options[$option]);
+        $settings[$option] = boolval($settings[$option]);
     }
     /**
      * Stores the current settings in the Wordpress Options DB.
diff --git a/public/class-bread-content-generator.php b/public/class-bread-content-generator.php
index 3bcef1f..1ad4eb7 100644
--- a/public/class-bread-content-generator.php
+++ b/public/class-bread-content-generator.php
@@ -136,7 +136,7 @@ function __construct(Mpdf $mpdf, Bread $bread, array $result_meetings, Bread_For
 
         );
         $this->addServiceBodyShortcodes();
-        $this->shortcodes = apply_filters("Bread_Section_Shortcodes", $this->shortcodes, $this->bread->bmlt()->get_areas(), $formatsManager->getFormatsUsed());
+        $this->shortcodes = apply_filters("Bread_Section_Shortcodes", $this->shortcodes, $this->bread->bmlt()->get_service_bodies(), $formatsManager->getFormatsUsed());
         if ($this->options['page_fold'] == 'half' || $this->options['page_fold'] == 'full') {
             @$this->mpdf->DefHTMLFooterByName('MyFooter', '<div style="text-align:center;font-size:' . $this->options['pagenumbering_font_size'] . 'pt;font-style: italic;">' . $this->options['nonmeeting_footer'] . '</div>');
             @$this->mpdf->DefHTMLFooterByName('_default', '<div style="text-align:center;font-size:' . $this->options['pagenumbering_font_size'] . 'pt;font-style: italic;">' . $this->options['nonmeeting_footer'] . '</div>');
@@ -181,10 +181,9 @@ private function addServiceBodyShortcodes(): void
             $description = 'Not Used';
             $helpline = 'Not Used';
             if (isset($this->options['service_bodies'][$i])) {
-                $area_data = explode(',', $this->options['service_bodies'][$i]);
-                $name = $area_data[0];
-                $service_body = isset($area_data[1]) ? $this->bread->bmlt()->get_service_body($area_data[1]) : null;
+                $service_body = $this->bread->bmlt()->get_service_body($this->options['service_bodies'][$i]);
                 $description = $service_body['description'] ?? '';
+                $name = $service_body['name'] ?? '';
                 $helpline = $service_body['helpline'] ?? '';
             }
             $n = $i + 1;
@@ -225,7 +224,7 @@ public function generate(int $num_columns): void
         if ($this->options['page_fold'] == 'half' || $this->options['page_fold'] == 'full') {
             $this->WriteHTML('<sethtmlpagefooter name="Meeting1Footer" page="ALL" />');
         }
-        $this->meetingEnhancer = new Bread_Meeting_Enhancer($this->bread, $this->bread->bmlt()->get_areas());
+        $this->meetingEnhancer = new Bread_Meeting_Enhancer($this->bread);
         foreach ($this->result_meetings as &$value) {
             $value = $this->meetingEnhancer->enhance_meeting($value, $lang, $this->formatsManager);
         }
diff --git a/public/class-bread-meeting-enhancer.php b/public/class-bread-meeting-enhancer.php
index 7190b4a..d517d7f 100644
--- a/public/class-bread-meeting-enhancer.php
+++ b/public/class-bread-meeting-enhancer.php
@@ -6,12 +6,10 @@ class Bread_Meeting_Enhancer
 {
     private Bread $bread;
     private array $options;
-    private array $areas;
-    function __construct(Bread $bread, array $areas)
+    function __construct(Bread $bread)
     {
         $this->bread = $bread;
         $this->options = $bread->getOptions();
-        $this->areas = $areas;
     }
     /**
      * Enhance the meeting fields (in place) with calculated values.
@@ -79,9 +77,9 @@ public function enhance_meeting(&$meeting_value, string $lang, Bread_FormatsMana
         }
         $meeting_value['day_abbr'] = $this->bread->getday($meeting_value['weekday_tinyint'], true, $lang);
         $meeting_value['day'] = $this->bread->getday($meeting_value['weekday_tinyint'], false, $lang);
-        $area_name = $this->get_area_name($meeting_value);
-        $meeting_value['area_name'] = $area_name;
-        $meeting_value['area_i'] = substr($area_name, 0, 1);
+        $service_body = $this->bread->bmlt()->get_service_body($meeting_value['service_body_bigint']);
+        $meeting_value['area_name'] = $service_body['name'] ?? '';
+        $meeting_value['area_i'] = $meeting_value['service_body_bigint'];
 
         $meeting_value['wheelchair'] = '';
         $wheelchair_format = $formatsManager->getWheelchairFormat($this->options['weekday_language']);
@@ -101,17 +99,6 @@ private function noon(string $time): string
         }
         return $time;
     }
-    private function get_area_name(array $meeting_value): string
-    {
-        foreach ($this->areas as $unique_area) {
-            $area_data = explode(',', $unique_area);
-            $area_id = $this->bread->arraySafeGet($area_data, 1);
-            if ($area_id === $meeting_value['service_body_bigint']) {
-                return $this->bread->arraySafeGet($area_data);
-            }
-        }
-        return '';
-    }
 
     private function toPersianNum(string $number): string
     {
diff --git a/public/class-bread-meetingslist-structure.php b/public/class-bread-meetingslist-structure.php
index 53ba0db..ccf8dda 100644
--- a/public/class-bread-meetingslist-structure.php
+++ b/public/class-bread-meetingslist-structure.php
@@ -350,15 +350,11 @@ private function getHeaderItem(array $value, array $names): string
         $name = $this->options[$names['name']];
         $name_alt = (!empty($names['name_alt'])) && !empty($this->options[$names['name_alt']]) ? $this->options[$names['name_alt']] : '';
         if ($name == 'service_body_bigint') {
-            foreach ($this->bread->bmlt()->get_areas() as $unique_area) {
-                $area_data = explode(',', $unique_area);
-                $area_name = Bread::arraySafeGet($area_data);
-                $area_id = Bread::arraySafeGet($area_data, 1);
-                if ($area_id === $value['service_body_bigint']) {
-                    return $area_name;
-                }
+            $service_body = $this->bread->bmlt()->get_service_body($value['service_body_bigint']);
+            if (empty($service_body)) {
+                return 'Area not found';
             }
-            return 'Area not found';
+            return $service_body['name'] ?? 'Area not found';
         } elseif ($name == 'day') {
             $off = intval($this->options['weekday_start']);
             $day = intval($value['weekday_tinyint']);
diff --git a/readme.txt b/readme.txt
index 400c0e7..9430e1d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ Tags: meeting list, bmlt, narcotics anonymous, na
 Requires PHP: 8.1
 Requires at least: 6.2
 Tested up to: 7.1
-Stable tag: 2.10.9
+Stable tag: 2.11.0
 
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
diff --git a/tests/mock/class-bread-bmlt.php b/tests/mock/class-bread-bmlt.php
index 2768bda..1fbd2bf 100644
--- a/tests/mock/class-bread-bmlt.php
+++ b/tests/mock/class-bread-bmlt.php
@@ -1,7 +1,6 @@
 <?php
 class Bread_Bmlt
 {
-    private array $areas = array();
     private array $service_bodies = array();
     private string $format_base;
     function __construct($bread)
@@ -11,14 +10,6 @@ public function setFormatBase($format_base)
     {
         $this->format_base = $format_base;
     }
-    public function set_areas(array $areas)
-    {
-        $this->areas = $areas;
-    }
-    public function get_areas()
-    {
-        return $this->areas;
-    }
     public function set_service_bodies(array $service_bodies)
     {
         foreach ($service_bodies as $service_body) {

From 9f9ce3192518ae3f7889a212b70b310e138ff15c Mon Sep 17 00:00:00 2001
From: otrok7 <50595291+otrok7@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:20:17 +0100
Subject: [PATCH 2/4] Fix tests and service-id in query string

---
 includes/class-bread-bmlt.php            |  5 +--
 includes/class-bread.php                 |  3 ++
 public/class-bread-content-generator.php |  6 ++--
 tests/BreadContentGeneratorTest.php      | 24 +++++++++------
 tests/mock/class-bread-bmlt.php          |  4 +++
 tests/mock/class-bread.php               | 39 ++++++++++++++++++++++++
 6 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/includes/class-bread-bmlt.php b/includes/class-bread-bmlt.php
index 3690d9c..38ff05e 100644
--- a/includes/class-bread-bmlt.php
+++ b/includes/class-bread-bmlt.php
@@ -234,10 +234,7 @@ public function generateDefaultQuery(): string
         // needs to be called once.
         if (!$this->default_query) {
             $this->default_query = ($this->bread->getOption('recurse_service_bodies')) ? '&recursive=1' : '';
-            for ($i=0; $i<count($this->bread->getOption('service_bodies')); $i++) {
-                ;
-                $this->default_query .= '&services[]=' . $this->bread->getOption('service_bodies')[$i];
-            }
+            $this->default_query .= '&services[]=' . implode('&services[]=', $this->bread->getOption('service_bodies'));
         }
         return $this->default_query;
     }
diff --git a/includes/class-bread.php b/includes/class-bread.php
index f10354d..c98b5ed 100644
--- a/includes/class-bread.php
+++ b/includes/class-bread.php
@@ -866,6 +866,9 @@ public function upgrade_settings(array$settings): array
                 }, $settings['service_bodies']);
             }
         }
+        if ($_GET['service_bodies'] ?? false) {
+            $settings['service_bodies'] = explode(',', $_GET['service_bodies']);
+        }
         $settings['bread_version'] = BREAD_VERSION;
         return $settings;
     }
diff --git a/public/class-bread-content-generator.php b/public/class-bread-content-generator.php
index 1ad4eb7..182a9c6 100644
--- a/public/class-bread-content-generator.php
+++ b/public/class-bread-content-generator.php
@@ -182,9 +182,9 @@ private function addServiceBodyShortcodes(): void
             $helpline = 'Not Used';
             if (isset($this->options['service_bodies'][$i])) {
                 $service_body = $this->bread->bmlt()->get_service_body($this->options['service_bodies'][$i]);
-                $description = $service_body['description'] ?? '';
-                $name = $service_body['name'] ?? '';
-                $helpline = $service_body['helpline'] ?? '';
+                $description = $service_body['description'] ?? 'Not Found';
+                $name = $service_body['name'] ?? 'Not Found';
+                $helpline = $service_body['helpline'] ?? 'Not Found';
             }
             $n = $i + 1;
             $this->shortcodes["[service_body_$n]"] = $name == 'Not Used' ? $name : mb_strtoupper($name, 'UTF-8');
diff --git a/tests/BreadContentGeneratorTest.php b/tests/BreadContentGeneratorTest.php
index 7295a4e..958232c 100644
--- a/tests/BreadContentGeneratorTest.php
+++ b/tests/BreadContentGeneratorTest.php
@@ -52,11 +52,13 @@ public function testServiceBodyShortcodesMultiple()
     {
         $this->doTest(
             'berlin-booklet',
-            ['service_bodies' => [
-                'Gebiet Süd,7,1,Deutschsprachige Region',
-                'Gebiet Österreich,10,1,Deutschsprachige Region',
-                'Online Gebiet,12,1,Deutschsprachige Region',
-            ]],
+            [
+                'service_bodies' => [
+                    'Gebiet Süd,7,1,Deutschsprachige Region',
+                    'Gebiet Österreich,10,1,Deutschsprachige Region',
+                    'Online Gebiet,12,1,Deutschsprachige Region',
+                ]
+            ],
             'berlin-service-bodies',
             [
                 '[service_body_1]' => 'GEBIET SÜD',
@@ -79,13 +81,15 @@ public function testServiceBodyMissingFromBmlt()
     {
         $this->doTest(
             'berlin-booklet',
-            ['service_bodies' => ['Gebiet Gelöscht,99,1,Deutschsprachige Region']],
+            [
+                'service_bodies' => ['Deleted,122334,1,Deutschsprachige Region'],
+            ],
             'berlin-service-bodies',
             [
-                '[service_body_1]' => 'GEBIET GELÖSCHT',
-                '[service_body_1_name]' => 'Gebiet Gelöscht',
-                '[service_body_1_description]' => '',
-                '[service_body_1_helpline]' => '',
+                '[service_body_1]' => 'NOT FOUND',
+                '[service_body_1_name]' => 'Not Found',
+                '[service_body_1_description]' => 'Not Found',
+                '[service_body_1_helpline]' => 'Not Found',
             ]
         );
     }
diff --git a/tests/mock/class-bread-bmlt.php b/tests/mock/class-bread-bmlt.php
index 1fbd2bf..066a94a 100644
--- a/tests/mock/class-bread-bmlt.php
+++ b/tests/mock/class-bread-bmlt.php
@@ -20,6 +20,10 @@ public function get_service_body(string $id): ?array
     {
         return $this->service_bodies[$id] ?? null;
     }
+    public function get_service_bodies(): array
+    {
+        return $this->service_bodies;
+    }
     public static function parse_field($text)
     {
         if ($text != '') {
diff --git a/tests/mock/class-bread.php b/tests/mock/class-bread.php
index 4bba7f5..1b6bbf2 100644
--- a/tests/mock/class-bread.php
+++ b/tests/mock/class-bread.php
@@ -11,6 +11,25 @@ function __construct($options)
             require_once '../../../wp-includes/class-wp-error.php';
         }
         $this->load_translations();
+        if ($this->versionLessThan('2.11', $options)) {
+            if (empty($options['service_bodies'])) {
+                for ($i = 1; $i <= 5; $i++) {
+                    if (isset($options['service_body_' . $i])) {
+                        $area_data = explode(',', $options['service_body_' . $i]);
+                        $options['service_bodies'][] = $area_data[1];
+                    }
+                    $options['service_bodies'][$i] = $options['service_body_' . $i];
+                }
+            } else {
+                for ($i = 1; $i <= 5; $i++) {
+                    $parts = explode(',', $options['service_bodies'][$i - 1] ?? '');
+                    if (count($parts) > 1) {
+                        $options['service_bodies'][$i - 1] = $parts[1];
+                    }
+                }
+            }
+        }
+        $settings['bread_version'] = "2.11.0";
         $this->options = $options;
         $this->bmlt1 = new Bread_Bmlt($this);
     }
@@ -46,4 +65,24 @@ public function getday($day, $abbreviate = false, $language = 'en')
         }
         return $this->translate[$language][$key][$day];
     }
+    private function versionLessThan($version, $settings): bool
+    {
+        if (empty($settings['bread_version'])) {
+            return true;
+        }
+        $current = explode('.', $settings['bread_version']);
+        $test = explode('.', $version);
+        for ($i=0; $i<count($current); $i++) {
+            if ($i >= count($test)) {
+                return false;
+            }
+            if (intval($current[$i]) > intval($test[$i])) {
+                return false;
+            }
+            if (intval($current[$i]) < intval($test[$i])) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

From 2c18a60844e85bc35fe72e1b1acf7644c4ade3e3 Mon Sep 17 00:00:00 2001
From: otrok7 <50595291+otrok7@users.noreply.github.com>
Date: Thu, 29 Oct 2026 15:45:56 +0100
Subject: [PATCH 3/4] css from steve

---
 admin/css/admin.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/css/admin.css b/admin/css/admin.css
index 5404521..8f249cd 100644
--- a/admin/css/admin.css
+++ b/admin/css/admin.css
@@ -404,7 +404,7 @@ input.bmlt-input {width: 60% !important;}input.borough-by-suffix, input.county-b
 width: 80% !important;
 }
 input.bmlt-input-field {
-width: 4em !important;
+width: 6em !important;
 }
 .mce-listbox button {
   text-align: left;
@@ -559,4 +559,4 @@ select.bread_service_body_select {
 .select2-search--inline { display: contents; }
 #custom-fonts .bulkactions {
     display: none;
-}
\ No newline at end of file
+}

From 75f65241bc3d7cb20efcbab0cf69efcf2dcac036 Mon Sep 17 00:00:00 2001
From: otrok7 <50595291+otrok7@users.noreply.github.com>
Date: Mon, 9 Nov 2026 23:17:47 +0100
Subject: [PATCH 4/4] Temp folder created per PDF generation (0777 permissions)
 and PHP 8.5 deprecation notices from myclabs/deep-copy Fixes #265

---
 composer.json            |  2 +-
 composer.lock            | 23 ++++++++++++-----------
 includes/class-bread.php |  7 +++++--
 readme.txt               |  7 +++++++
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 0d07a5b..a0202f2 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "mpdf/mpdf": "8.3.1",
     "monolog/monolog": "3.8.1",
     "mpdf/qrcode": "^1.0",
-    "myclabs/deep-copy": "1.11.1"
+    "myclabs/deep-copy": "^1.14"
   },
   "require-dev": {
     "squizlabs/php_codesniffer": "3.*",
diff --git a/composer.lock b/composer.lock
index 5a8dee5..3b01784 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c1abca03a9f90ce7b858909fcbbcba2f",
+    "content-hash": "d519099d0a8e7059f2cf1eb4b198fcea",
     "packages": [
         {
             "name": "monolog/monolog",
@@ -353,28 +353,29 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
+                "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.0"
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -400,15 +401,15 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.14.0"
             },
             "funding": [
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
+                    "url": "https://github.com/mnapoli",
+                    "type": "github"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2026-08-11T10:17:44+00:00"
         },
         {
             "name": "paragonie/random_compat",
diff --git a/includes/class-bread.php b/includes/class-bread.php
index c98b5ed..3a67072 100644
--- a/includes/class-bread.php
+++ b/includes/class-bread.php
@@ -153,7 +153,10 @@ private static function setup_temp_dir(): string
         $path = '';
         do {
             $path = sprintf('%s%s%s%s', $dir, DIRECTORY_SEPARATOR, 'bread', wp_rand(100000));
-        } while (!$filesystem->mkdir($path, 0777) && $attempts++ < 100);
+        } while (!$filesystem->mkdir($path, 0755) && $attempts++ < 100);
+        if ($attempts >= 100) {
+            return false;
+        }
         return $path;
     }
     private static function brute_force_cleanup($filesystem, $dir)
@@ -203,7 +206,7 @@ public static function get_log_files():array
     }
     public function removeTempDir()
     {
-        if (!isset($this->options['logging'])) {
+        if (!empty($this->tmp_dir)) {
             Bread::rrmdir(new WP_Filesystem_Direct(null), $this->temp_dir());
         }
     }
diff --git a/readme.txt b/readme.txt
index 9430e1d..b3af07c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -55,6 +55,13 @@ Follow all these steps, keep in mind that once you start using bread, it's not g
 
 == Changelog ==
 
+= 2.11.0 =
+* Added shortcodes for service body description and URL
+* Refactor how service bodies are stored
+* Set service body in query string
+* Update DeepCopy for PHP 8.5 Compatibility
+* Clean up temp directory after every PDF generation.
+
 = 2.10.9 =
 * Danish is "da" not "dk"