Browse Source

Show only valid users

Bob Mottram 8 years ago
parent
commit
161875525d
2 changed files with 10 additions and 6 deletions
  1. 5
    3
      src/freedombone-config
  2. 5
    3
      src/freedombone-controlpanel

+ 5
- 3
src/freedombone-config View File

1302
     name=()
1302
     name=()
1303
     for u in ${users_array[@]}
1303
     for u in ${users_array[@]}
1304
     do
1304
     do
1305
-        i=$((i+1))
1306
-        W+=($i "$u")
1307
-        name+=("$u")
1305
+        if [[ $(is_valid_user "$u") == "1" ]]; then
1306
+            i=$((i+1))
1307
+            W+=($i "$u")
1308
+            name+=("$u")
1309
+        fi
1308
     done
1310
     done
1309
 
1311
 
1310
     user_index=$(dialog --backtitle $"Freedombone Configuration" --title $"Select User" --menu $"Select one of the following:" 24 40 17 "${W[@]}" 3>&2 2>&1 1>&3)
1312
     user_index=$(dialog --backtitle $"Freedombone Configuration" --title $"Select User" --menu $"Select one of the following:" 24 40 17 "${W[@]}" 3>&2 2>&1 1>&3)

+ 5
- 3
src/freedombone-controlpanel View File

396
     name=()
396
     name=()
397
     for u in ${users_array[@]}
397
     for u in ${users_array[@]}
398
     do
398
     do
399
-        i=$((i+1))
400
-        W+=($i "$u")
401
-        name+=("$u")
399
+        if [[ $(is_valid_user "$u") == "1" ]]; then
400
+            i=$((i+1))
401
+            W+=($i "$u")
402
+            name+=("$u")
403
+        fi
402
     done
404
     done
403
 
405
 
404
     user_index=$(dialog --backtitle $"Freedombone Control Panel" --title $"Select User" --menu $"Select one of the following:" 24 40 17 "${W[@]}" 3>&2 2>&1 1>&3)
406
     user_index=$(dialog --backtitle $"Freedombone Control Panel" --title $"Select User" --menu $"Select one of the following:" 24 40 17 "${W[@]}" 3>&2 2>&1 1>&3)