浏览代码

Firewall display style

Bob Mottram 7 年前
父节点
当前提交
704932c1a0
共有 2 个文件被更改,包括 6 次插入7 次删除
  1. 1
    1
      doc/EN/socialinstance.org
  2. 5
    6
      src/freedombone-controlpanel

+ 1
- 1
doc/EN/socialinstance.org 查看文件

10
 [[file:images/logo.png]]
10
 [[file:images/logo.png]]
11
 #+END_CENTER
11
 #+END_CENTER
12
 
12
 
13
-#+BEGIN_EXPORT html
13
+#+BEGIN_EXPORT HTML
14
 <center>
14
 <center>
15
 <h1>Social Instance</h1>
15
 <h1>Social Instance</h1>
16
 </center>
16
 </center>

+ 5
- 6
src/freedombone-controlpanel 查看文件

1776
 }
1776
 }
1777
 
1777
 
1778
 function show_firewall {
1778
 function show_firewall {
1779
-    clear
1780
-    echo $"Firewall Settings"
1781
-    echo ''
1779
+    W=()
1782
     while read -r line; do
1780
     while read -r line; do
1783
         firewall_name=$(echo "$line" | awk -F '=' '{print $1}')
1781
         firewall_name=$(echo "$line" | awk -F '=' '{print $1}')
1784
         firewall_port=$(echo "$line" | awk -F '=' '{print $2}')
1782
         firewall_port=$(echo "$line" | awk -F '=' '{print $2}')
1785
-        echo -n -e "$(pad_string "${firewall_name}")"
1786
-        echo "${firewall_port}"
1783
+        W+=("$(pad_string "${firewall_name}")" "${firewall_port}")
1787
     done < "$FIREWALL_CONFIG"
1784
     done < "$FIREWALL_CONFIG"
1788
-    any_key
1785
+
1786
+    # shellcheck disable=SC2068
1787
+    dialog --backtitle $"Freedombone Administrator Control Panel" --title $"Firewall" --menu $"Press ESC to return to main menu" 28 60 28 "${W[@]}" 3>&2 2>&1 1>&3
1789
 }
1788
 }
1790
 
1789
 
1791
 function email_extra_domains {
1790
 function email_extra_domains {