From a1393aeab1364947216a1f76b1b39eb47b4859c9 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 6 Jun 2025 11:56:54 +0000 Subject: [PATCH 1/7] Added horizontal scrolls --- ubl-settings-usergroups.glade | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ubl-settings-usergroups.glade b/ubl-settings-usergroups.glade index 8283043..1f99a13 100644 --- a/ubl-settings-usergroups.glade +++ b/ubl-settings-usergroups.glade @@ -1,5 +1,5 @@ - + + @@ -69,6 +71,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + @@ -422,7 +426,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ConfigUsersSort 2 both - 5 + 8 @@ -449,6 +453,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 10 10 UID + True 1 @@ -648,6 +653,7 @@ status ConfigGroupsSort 1 both + 5 @@ -657,6 +663,7 @@ status fixed 10 GID + True 0 @@ -843,6 +850,7 @@ status 50 UID True + True 1 @@ -1131,6 +1139,7 @@ without activity 50 GID True + True 0 -- 2.35.1 From 25470d666ca773d2dfc43d69fe39fe178b9739b2 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 9 Jun 2025 07:59:10 +0000 Subject: [PATCH 3/7] Fixed empty UID/GID users/groups show without check --- source/ubl-settings-usergroups.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 082f5e5..7b5f41b 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -1919,12 +1919,12 @@ gboolean on_filter(GtkTreeModel* model, GtkTreeIter *iter, main_window *widgets) search_found = 1; } if (systemed){ - if (((iuid>=main_config.MINUID&&iuid<=main_config.MAXUID))||show_system){ + if (!iuid||((iuid>=main_config.MINUID&&iuid<=main_config.MAXUID))||show_system){ system_id_found = 1; } } else { - if (((atoi(uid)>=main_config.MINUID&&atoi(uid)<=main_config.MAXUID))||show_system){ + if (yon_char_is_empty(uid)||((atoi(uid)>=main_config.MINUID&&atoi(uid)<=main_config.MAXUID))||show_system){ system_id_found = 1; } -- 2.35.1 From 18cba96691aecbe78da7c20159a4a49446b1682a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 9 Jun 2025 08:39:46 +0000 Subject: [PATCH 4/7] Startup sort added --- source/ubl-settings-usergroups-user.c | 4 ++-- source/ubl-settings-usergroups.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-usergroups-user.c b/source/ubl-settings-usergroups-user.c index e7b576e..6039b74 100644 --- a/source/ubl-settings-usergroups-user.c +++ b/source/ubl-settings-usergroups-user.c @@ -629,8 +629,8 @@ void on_user_sync_with_config(GtkWidget *,main_window *widgets){ return; } - char *user = yon_char_parsed_check_exist_begins_with(main_config.groups,main_config.groups_size,target); - char *shadow = yon_char_parsed_check_exist_begins_with(main_config.group_shadow,main_config.group_shadow_size,target); + char *user = yon_char_parsed_check_exist_begins_with(main_config.users,main_config.users_size,target); + char *shadow = yon_char_parsed_check_exist_begins_with(main_config.shadow,main_config.shadow_size,target); yon_char_remove_last_symbol(user,'\n'); yon_char_remove_last_symbol(shadow,'\n'); int user_size=0; diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 7b5f41b..7299892 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -1919,7 +1919,7 @@ gboolean on_filter(GtkTreeModel* model, GtkTreeIter *iter, main_window *widgets) search_found = 1; } if (systemed){ - if (!iuid||((iuid>=main_config.MINUID&&iuid<=main_config.MAXUID))||show_system){ + if (((iuid>=main_config.MINUID&&iuid<=main_config.MAXUID))||show_system){ system_id_found = 1; } @@ -2271,6 +2271,10 @@ main_window *yon_main_window_complete(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->SystemTree),"button-press-event",G_CALLBACK(on_system_menu_open),widgets->UsersMenu); g_signal_connect(G_OBJECT(widgets->SystemGroupsTree),"button-press-event",G_CALLBACK(on_system_menu_open),widgets->GroupsMenu); + gtk_tree_view_column_clicked(gtk_tree_view_get_column(GTK_TREE_VIEW(widgets->UsersTree),1)); + gtk_tree_view_column_clicked(gtk_tree_view_get_column(GTK_TREE_VIEW(widgets->GroupsTree),0)); + gtk_tree_view_column_clicked(gtk_tree_view_get_column(GTK_TREE_VIEW(widgets->SystemTree),1)); + gtk_tree_view_column_clicked(gtk_tree_view_get_column(GTK_TREE_VIEW(widgets->SystemGroupsTree),0)); yon_system_load(widgets); gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(widgets->ConfigUsersFilter),(GtkTreeModelFilterVisibleFunc)on_filter,widgets,NULL); -- 2.35.1 From 44887a2293b862170f1b227160e16d1bf8d949e9 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 9 Jun 2025 09:18:17 +0000 Subject: [PATCH 5/7] Tooltip fixes --- locale/ubl-settings-usergroups_ru.po | 2 +- source/ubl-settings-usergroups.c | 17 ++++++++--------- source/ubl-strings.h | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/locale/ubl-settings-usergroups_ru.po b/locale/ubl-settings-usergroups_ru.po index 34945a9..a5c6a57 100644 --- a/locale/ubl-settings-usergroups_ru.po +++ b/locale/ubl-settings-usergroups_ru.po @@ -1041,7 +1041,7 @@ msgstr "" #: source/ubl-strings.h:282 msgid "User auth with password is blocked for user.\nOther access methods are allowed (key auth, user switching etc)." -msgstr "Аутентификация с помощью пароля заблокирована для пользователя.\nОсталные методы входа разрешены (аутентификаци яна основе ключей, переключение на пользователя и т.д.)" +msgstr "Аутентификация с помощью пароля заблокирована для пользователя.\nОстальные методы входа разрешены (аутентификаци яна основе ключей, переключение на пользователя и т.д.)" #: source/ubl-strings.h:282 msgid "User auth is forbidden" diff --git a/source/ubl-settings-usergroups.c b/source/ubl-settings-usergroups.c index 7299892..c72dbda 100644 --- a/source/ubl-settings-usergroups.c +++ b/source/ubl-settings-usergroups.c @@ -109,18 +109,18 @@ void yon_interface_update(main_window *widgets){ char *tooltip = AUTH_ALLOWED_LABEL; if (parameters_size>5&&strcmp(parameters[5],"x")&&strcmp(parameters[5],"")){ - if (!check_is_password_hash(parameters[5])||(parameters[5][0]!='%'&¶meters[5][1]!='%')){ - pars = ENCRYPTED_LABEL; - } else if (!strcmp(parameters[5]," ")){ + if (!strcmp(parameters[5]," ")){ pars = NO_PASSWORD_LABEL; } else if (!strcmp(parameters[5],"!*")){ pars = DENY_LOGIN_LABEL; + tooltip = AUTH_FORBIDDEN_LABEL; } else if (parameters[5][0]=='!'){ pars = BLOCK_LOGIN_LABEL; - tooltip = AUTH_FORBIDDEN_LABEL; + tooltip = AUTH_PASSWORD_LOCKED_LABEL; + } else if (!check_is_password_hash(parameters[5])||(parameters[5][0]!='%'&¶meters[5][1]!='%')){ + pars = ENCRYPTED_LABEL; } else { pars = UNENCRYPTED_LABEL; - tooltip = AUTH_PASSWORD_LOCKED_LABEL; } } else { pars = DEFAULT_USER_LABEL; @@ -164,9 +164,7 @@ void yon_interface_update(main_window *widgets){ char *pars=""; char *tooltip=AUTH_ALLOWED_LABEL; if (parameters_size>4&&strcmp(parameters[4],"x")&&strcmp(parameters[4],"")){ - if (!check_is_password_hash(parameters[4])&¶meters[4][0]!='%'&¶meters[4][1]!='%'){ - pars = ENCRYPTED_LABEL; - } else if (!strcmp(parameters[4]," ")){ + if (!strcmp(parameters[4]," ")){ pars = NO_PASSWORD_LABEL; } else if (!strcmp(parameters[4],"!*")){ pars = DENY_LOGIN_LABEL; @@ -174,9 +172,10 @@ void yon_interface_update(main_window *widgets){ } else if (parameters[4][0]=='!'){ pars = BLOCK_LOGIN_LABEL; tooltip = AUTH_PASSWORD_LOCKED_LABEL; + } else if (!check_is_password_hash(parameters[4])&¶meters[4][0]!='%'&¶meters[4][1]!='%'){ + pars = ENCRYPTED_LABEL; } else { pars = UNENCRYPTED_LABEL; - } } else { pars = DEFAULT_USER_LABEL; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 0dcbb88..7b863e7 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -279,7 +279,7 @@ #define BLOCK_LOGIN_LABEL _("Block login with password") #define UNBOCK_LOGIN_LABEL _("Unblock login with password") -#define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends) yon_char_unite(_("User(-s)")," \"",depends,"\" ",_("is included into main group of users")," \"",target,"\", ",_("which will be deleted"),".\n",_("After reboot users")," ",depends," ",_("main group will be set to default group"),".",NULL) +#define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends) yon_char_unite(_("User(-s)")," \"",target,"\" ",_("is included into main group of users")," \"",depends,"\", ",_("which will be deleted"),".\n",_("After reboot users")," ",depends," ",_("main group will be set to default group"),".",NULL) #define CONFIRMATION_GROUP_DEPENDS_MULTIPLE_LABEL _("Some of users, chosen for deletion, are included as main group for other users. This users will get default main group after reboot") #define AUTH_ALLOWED_LABEL _("User auth with password is allowed") -- 2.35.1 From 33783cf546a3c130b5e8ed81aadec461a55136fd Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 9 Jun 2025 09:57:52 +0000 Subject: [PATCH 6/7] Localisation fix --- locale/ubl-settings-usergroups_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/ubl-settings-usergroups_ru.po b/locale/ubl-settings-usergroups_ru.po index a5c6a57..7ad3a72 100644 --- a/locale/ubl-settings-usergroups_ru.po +++ b/locale/ubl-settings-usergroups_ru.po @@ -1041,7 +1041,7 @@ msgstr "" #: source/ubl-strings.h:282 msgid "User auth with password is blocked for user.\nOther access methods are allowed (key auth, user switching etc)." -msgstr "Аутентификация с помощью пароля заблокирована для пользователя.\nОстальные методы входа разрешены (аутентификаци яна основе ключей, переключение на пользователя и т.д.)" +msgstr "Аутентификация с помощью пароля заблокирована для пользователя.\nОстальные методы входа разрешены (аутентификаци на основе ключей, переключение на пользователя и т.д.)" #: source/ubl-strings.h:282 msgid "User auth is forbidden" -- 2.35.1 From e697726dfea84d21212833dca0b63e87c77f465c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 9 Jun 2025 11:31:42 +0000 Subject: [PATCH 7/7] Localisation fix --- locale/ubl-settings-usergroups_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/ubl-settings-usergroups_ru.po b/locale/ubl-settings-usergroups_ru.po index 7ad3a72..7b0f1c6 100644 --- a/locale/ubl-settings-usergroups_ru.po +++ b/locale/ubl-settings-usergroups_ru.po @@ -1041,7 +1041,7 @@ msgstr "" #: source/ubl-strings.h:282 msgid "User auth with password is blocked for user.\nOther access methods are allowed (key auth, user switching etc)." -msgstr "Аутентификация с помощью пароля заблокирована для пользователя.\nОстальные методы входа разрешены (аутентификаци на основе ключей, переключение на пользователя и т.д.)" +msgstr "Аутентификация с помощью пароля заблокирована для пользователя.\nОстальные методы входа разрешены (аутентификация на основе ключей, переключение на пользователя и т.д.)" #: source/ubl-strings.h:282 msgid "User auth is forbidden" -- 2.35.1