From 55bae1d4a4f5da648b3df5095b31231dc835cb4e Mon Sep 17 00:00:00 2001
From: otrok7 <50595291+otrok7@users.noreply.github.com>
Date: Thu, 7 Nov 2024 15:08:42 +0100
Subject: [PATCH] Test no connection

---
 admin/partials/_bmlt_server_setup.php |  2 +-
 public/class-bread-public.php         | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/admin/partials/_bmlt_server_setup.php b/admin/partials/_bmlt_server_setup.php
index 5a274ef..ef7bf87 100644
--- a/admin/partials/_bmlt_server_setup.php
+++ b/admin/partials/_bmlt_server_setup.php
@@ -39,7 +39,7 @@
                             <label for="sslverify">Disable SSL verification of server</label>
                         <?php }
                     } else {
-                        ?><span style='color: #f00;'><div style='font-size: 16px;vertical-align: middle;' class='dashicons dashicons-dismiss'></div>ERROR: Problem Connecting to BMLT Server<br/><?php echo $this->connection_error; ?></span>
+                        ?><span style='color: #f00;'><div style='font-size: 16px;vertical-align: middle;' class='dashicons dashicons-dismiss'></div>ERROR: Problem Connecting to BMLT Server<br/><?php echo Bread_Bmlt::$connection_error; ?></span>
                         <p>
                         <label for="user_agent">Try a different user agent or "None" for Wordpress default: "</label>
                         <input class="bmlt-input" id="user_agent" type="text" name="user_agent" value="<?php echo Bread::getOption('user_agent'); ?>" />
diff --git a/public/class-bread-public.php b/public/class-bread-public.php
index 6f50a6e..6fbfdd8 100644
--- a/public/class-bread-public.php
+++ b/public/class-bread-public.php
@@ -165,6 +165,14 @@ public function bmlt_meeting_list($atts = null, $content = null)
         } elseif ($this->options['used_format_1'] != '') {
             $result = Bread_Bmlt::get_configured_root_server_request("client_interface/json/?switcher=GetSearchResults$services&sort_keys=$sort_keys&get_used_formats&formats[]=" . $this->options['used_format_1'] . $select_language);
         }
+
+        if ($result_meetings == null) {
+            echo "<script type='text/javascript'>\n";
+            echo "document.body.innerHTML = ''";
+            echo "</script>";
+            echo '<div style="font-size: 20px;text-align:center;font-weight:normal;color:#F00;margin:0 auto;margin-top: 30px;"><p>No Meetings Found</p><p>Or</p><p>Internet or Server Problem</p><p>' . $this->options['root_server'] . '</p><p>Please try again or contact your BMLT Administrator</p></div>';
+            exit;
+        }
         if (!empty($this->options['extra_meetings'])) {
             $extras = "";
             foreach ((array)$this->options['extra_meetings'] as $value) {
@@ -193,13 +201,6 @@ public function bmlt_meeting_list($atts = null, $content = null)
             $result_meetings = $result['meetings'];
         }
 
-        if ($result_meetings == null) {
-            echo "<script type='text/javascript'>\n";
-            echo "document.body.innerHTML = ''";
-            echo "</script>";
-            echo '<div style="font-size: 20px;text-align:center;font-weight:normal;color:#F00;margin:0 auto;margin-top: 30px;"><p>No Meetings Found</p><p>Or</p><p>Internet or Server Problem</p><p>' . $this->options['root_server'] . '</p><p>Please try again or contact your BMLT Administrator</p></div>';
-            exit;
-        }
         if ($this->options['additional_list_language'] == '') {
             $this->options['additional_list_language'] = $this->options['weekday_language'];
         }