Tooltip fixes

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"

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]!='%'&&parameters[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]!='%'&&parameters[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])&&parameters[4][0]!='%'&&parameters[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])&&parameters[4][0]!='%'&&parameters[4][1]!='%'){
+						pars = ENCRYPTED_LABEL;
 					} else {
 						pars = UNENCRYPTED_LABEL;
-
 					}
 				} else {
 					pars = DEFAULT_USER_LABEL;

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)")," <b>\"",depends,"\"</b> ",_("is included into main group of users")," <b>\"",target,"\"</b>, ",_("which will be deleted"),".\n",_("After reboot users")," <b>",depends,"</b> ",_("main group will be set to default group"),".",NULL)
+#define CONFIRMATION_GROUP_DEPENDS_SINGLE_LABEL(target,depends) yon_char_unite(_("User(-s)")," <b>\"",target,"\"</b> ",_("is included into main group of users")," <b>\"",depends,"\"</b>, ",_("which will be deleted"),".\n",_("After reboot users")," <b>",depends,"</b> ",_("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")