Pārlūkot izejas kodu

Users menu style

Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
d9689e22e8
1 mainītis faili ar 14 papildinājumiem un 21 dzēšanām
  1. 14
    21
      src/freedombone-controlpanel

+ 14
- 21
src/freedombone-controlpanel Parādīt failu

@@ -2106,33 +2106,26 @@ function domain_blocking {
2106 2106
 function menu_users {
2107 2107
     while true
2108 2108
     do
2109
-        data=$(mktemp 2>/dev/null)
2110
-        dialog --backtitle $"Freedombone Control Panel" \
2111
-               --title $"Manage Users" \
2112
-               --radiolist $"Choose an operation:" 13 70 6 \
2113
-               1 $"Add a user" off \
2114
-               2 $"Delete a user" off \
2115
-               3 $"Change user password" off \
2116
-               4 $"Change user ssh public key" off \
2117
-               5 $"Reset password tries" off \
2118
-               6 $"Back to main menu" on 2> "$data"
2119
-        sel=$?
2120
-        case $sel in
2121
-            1) rm -f "$data"
2122
-               break;;
2123
-            255) rm -f "$data"
2124
-                 break;;
2125
-        esac
2126
-        case $(cat "$data") in
2109
+        W=(1 $"Add a user"
2110
+           2 $"Delete a user"
2111
+           3 $"Change user password"
2112
+           4 $"Change user ssh public key"
2113
+           5 $"Reset password tries")
2114
+
2115
+        # shellcheck disable=SC2068
2116
+        selection=$(dialog --backtitle $"Freedombone Administrator Control Panel" --title $"Manage Users" --menu $"Choose an operation, or ESC for main menu:" 13 70 6 "${W[@]}" 3>&2 2>&1 1>&3)
2117
+
2118
+        if [ ! "$selection" ]; then
2119
+            break
2120
+        fi
2121
+
2122
+        case $selection in
2127 2123
             1) add_user;;
2128 2124
             2) delete_user;;
2129 2125
             3) change_password;;
2130 2126
             4) change_ssh_public_key;;
2131 2127
             5) reset_password_tries;;
2132
-            6) rm -f "$data"
2133
-               break;;
2134 2128
         esac
2135
-        rm -f "$data"
2136 2129
     done
2137 2130
 }
2138 2131