Browse Source

Failure message for short passwords

Bob Mottram 7 years ago
parent
commit
50fb913747
2 changed files with 4 additions and 2 deletions
  1. 1
    2
      src/freedombone-app-searx
  2. 3
    0
      src/freedombone-controlpanel

+ 1
- 2
src/freedombone-app-searx View File

201
     new_username="$1"
201
     new_username="$1"
202
     new_user_password="$2"
202
     new_user_password="$2"
203
 
203
 
204
-    ${PROJECT_NAME}-pass -u $new_username -a searx -p "$new_user_password"
205
-
206
     if grep -q "$new_username:" /etc/nginx/.htpasswd; then
204
     if grep -q "$new_username:" /etc/nginx/.htpasswd; then
207
         sed -i "/$new_username:/d" /etc/nginx/.htpasswd
205
         sed -i "/$new_username:/d" /etc/nginx/.htpasswd
208
         echo "$new_user_password" | htpasswd -i -s -c /etc/nginx/.htpasswd $new_username
206
         echo "$new_user_password" | htpasswd -i -s -c /etc/nginx/.htpasswd $new_username
207
+        ${PROJECT_NAME}-pass -u $curr_username -a searx -p "$new_user_password"
209
         echo '0'
208
         echo '0'
210
     fi
209
     fi
211
     echo '1'
210
     echo '1'

+ 3
- 0
src/freedombone-controlpanel View File

229
                 change_password_${SELECTED_APP} ${SELECTED_USERNAME} "${CURR_PASSWORD}"
229
                 change_password_${SELECTED_APP} ${SELECTED_USERNAME} "${CURR_PASSWORD}"
230
                 dialog --title $"Change password" \
230
                 dialog --title $"Change password" \
231
                        --msgbox $"The password was changed" 6 40
231
                        --msgbox $"The password was changed" 6 40
232
+            else
233
+                dialog --title $"Change password" \
234
+                       --msgbox $"The password given must be at least 8 characters" 6 40
232
             fi
235
             fi
233
             ;;
236
             ;;
234
     esac
237
     esac