From 24590c7459a1c91d551a744e4baa3f4d67239f60 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 29 Feb 2024 14:52:03 +0600 Subject: [PATCH] Test fix for password statuses --- source/ubl-settings-usergroups.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 853d076..6b19b9e 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -79,7 +79,7 @@ void yon_interface_update(main_window *widgets){ char *pars = ""; if (parameters_size>5&&strcmp(parameters[5],"x")&&strcmp(parameters[5],"")){ - if (!check_is_password_hash(parameters[5])){ + if (!check_is_password_hash(parameters[5])&¶meters[5][0]!='%'&¶meters[5][1]!='%'){ pars = ENCRYPTED_LABEL; } else { pars = UNENCRYPTED_LABEL; @@ -125,7 +125,7 @@ void yon_interface_update(main_window *widgets){ char *pars=""; if (parameters_size>3&&strcmp(parameters[3],"x")&&strcmp(parameters[3],"")){ - if (!check_is_password_hash(parameters[3])){ + if (!check_is_password_hash(parameters[3])&¶meters[5][0]!='%'&¶meters[5][1]!='%'){ pars = ENCRYPTED_LABEL; } else { pars = UNENCRYPTED_LABEL; @@ -1227,7 +1227,7 @@ void on_group_save(GtkWidget *self, dictionary *dict){ if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->GroupsTree)),&model,&iter)) gtk_list_store_append(widgets->GroupsList,&iter); char *passwor = (char*)gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry)); - gtk_list_store_set(widgets->GroupsList,&iter,0,strcmp(gid,"x")?gid:"",1,group_name,2,group_users,3,yon_char_append(non_unique,gsystem),4,gtk_combo_box_get_active(GTK_COMBO_BOX(window->PasswordCombo))==0?PASSWORD_NO_SET_LABEL:check_is_password_hash(passwor)?UNENCRYPTED_LABEL:ENCRYPTED_LABEL,-1); + gtk_list_store_set(widgets->GroupsList,&iter,0,strcmp(gid,"x")?gid:"",1,group_name,2,group_users,3,yon_char_append(non_unique,gsystem),4,gtk_combo_box_get_active(GTK_COMBO_BOX(window->PasswordCombo))==0?PASSWORD_NO_SET_LABEL:check_is_password_hash(passwor)&&passwor[0]=='%'?UNENCRYPTED_LABEL:ENCRYPTED_LABEL,-1); on_subwindow_close(self); }