From 1847f13471c26fdc19d4931f86e046e2655bd581 Mon Sep 17 00:00:00 2001
From: KF7EEL <kf7eel@qsl.net>
Date: Thu, 7 Oct 2021 11:57:43 -0700
Subject: [PATCH] fix server listing

---
 web/app.py | 57 +++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/web/app.py b/web/app.py
index 84f0313..ab63a00 100644
--- a/web/app.py
+++ b/web/app.py
@@ -919,34 +919,33 @@ def hbnet_web_service():
         script_links = ast.literal_eval(script_l.field_2)
         svr_content = ''
         for i in sl:
-            if i.ip == '':
-                break
-            elif i.ip != '':
-                try:
-                    if time.time() - ping_list[i.name] < 20:
-                        svr_status = '''<div class="alert alert-success">
-          <strong>Online</strong>
-           </div> '''
-                    elif time.time() - ping_list[i.name] <= 300:
-                        svr_status = '''<div class="alert alert-warning">
-          <strong>Unknown <br /> (No pings, less than 5 min.)</strong>
-           </div> '''
-                    elif time.time() - ping_list[i.name] > 300:
-                        svr_status = '''<div class="alert alert-danger">
-          <strong>Offline</strong>
-           </div> '''
-                    else:
-                        svr_status = '''<div class="alert alert-warning">
-          <strong>Unknown Condition</strong>
-           </div> '''
-                        print(ping_list)
-                        print(time.time())
-                except:
+            try:
+                if time.time() - ping_list[i.name] < 20:
+                    svr_status = '''<div class="alert alert-success">
+      <strong>Online</strong>
+       </div> '''
+                elif time.time() - ping_list[i.name] <= 300:
                     svr_status = '''<div class="alert alert-warning">
-          <strong>Unknown</strong>
-           </div> '''
-               
-            svr_content = svr_content + '''
+      <strong>Unknown <br /> (No pings, less than 5 min.)</strong>
+       </div> '''
+                elif time.time() - ping_list[i.name] > 300:
+                    svr_status = '''<div class="alert alert-danger">
+      <strong>Offline</strong>
+       </div> '''
+                else:
+                    svr_status = '''<div class="alert alert-warning">
+      <strong>Unknown Condition</strong>
+       </div> '''
+                    print(ping_list)
+                    print(time.time())
+            except:
+                svr_status = '''<div class="alert alert-warning">
+      <strong>Unknown</strong>
+       </div> '''
+            if i.ip == '':
+                pass
+            else:
+                svr_content = svr_content + '''
 <div class="card">
   <div class="card-header" style="text-align: center;"><h3>''' + i.name + '''</h3></div>
   <div class="card-body container-fluid center;">
@@ -3734,7 +3733,7 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
 <td style="width: 78.7895%;">&nbsp;<input name="dash_url" type="text" value="''' + str(s.dash_url) + '''"/></td>
 </tr>
 <tr>
-<td style="width: 16.0381%;"><strong>&nbsp;Host (IP/DNS, for listing on passphrase page, blank to not list):</strong></td>
+<td style="width: 16.0381%;"><strong>&nbsp;Host (IP/DNS, for listing on passphrase page):</strong></td>
 <td style="width: 78.7895%;">&nbsp;<input name="server_ip" type="text" value="''' + str(s.ip) + '''"/></td>
 </tr>
 
@@ -3941,7 +3940,7 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
 <td style="width: 70%;">&nbsp;<input name="dash_url" type="text" /></td>
 </tr>
 <tr>
-<td style="width: 16.0381%;"><strong>&nbsp;Host (IP/DNS, blank to not list):</strong></td>
+<td style="width: 16.0381%;"><strong>&nbsp;Host (IP/DNS):</strong></td>
 <td style="width: 78.7895%;">&nbsp;<input name="server_ip" type="text" /></td>
 </tr>