Password loading fixes

source/ubl-settings-usergroups.c

@@ -72,11 +72,11 @@ void yon_interface_update(main_window *widgets){
 					login = yon_char_divide_search(parameters[0],"=",-1);
 					login[strlen(login)-1]='\0';
 				}
-				if (parameters_size>1&&!strcmp(parameters[1],"x")) parameters[1]=AUTOMATICALLY_LABEL;
-				if (parameters_size>2&&!strcmp(parameters[2],"x")) parameters[2]=login;
+				if (parameters_size>1+1&&!strcmp(parameters[1],"x")) parameters[1]=AUTOMATICALLY_LABEL;
+				if (parameters_size>2+1&&!strcmp(parameters[2],"x")) parameters[2]=login;
 				char *pars = "";
-				if (parameters_size>5&&strcmp(parameters[5],"x")&&strcmp(parameters[5],"")){
-					if (!check_is_password_hash(parameters[5])){
+				if (strcmp(parameters[parameters_size-1],"x")&&strcmp(parameters[parameters_size-1],"")){
+					if (!check_is_password_hash(parameters[parameters_size-1])){
 						pars = ENCRYPTED_LABEL;
 					} else {
 						pars = UNENCRYPTED_LABEL;
@@ -88,11 +88,11 @@ void yon_interface_update(main_window *widgets){
 				}
 				gtk_list_store_set(widgets->UsersList,&iter,
 				2,login,
-				3,parameters_size>0?parameters[0]:"",
-				1,parameters_size>1&&!yon_char_is_empty(parameters[1])?parameters[1]:AUTOMATICALLY_LABEL,
-				4,parameters_size>2&&!yon_char_is_empty(parameters[2])?parameters[2]:login,
-				5,parameters_size>3?!strcmp(parameters[3],"x")||!strcmp(parameters[3],"")?def_groups:parameters[3]:def_groups,
-				6,parameters_size>4?parameters[4]:"",
+				3,parameters_size>0+1?parameters[0]:"",
+				1,parameters_size>1+1&&!yon_char_is_empty(parameters[1])?parameters[1]:AUTOMATICALLY_LABEL,
+				4,parameters_size>2+1&&!yon_char_is_empty(parameters[2])?parameters[2]:login,
+				5,parameters_size>3+1?!strcmp(parameters[3],"x")||!strcmp(parameters[3],"")?def_groups:parameters[3]:def_groups,
+				6,parameters_size>4+1?parameters[4]:"",
 				7,pars,
 				-1);
 				if(parameters)
@@ -643,8 +643,8 @@ void on_password_change(GtkWidget *self, dictionary *entry_dict){//
 	dictionary *dict = NULL;
 	char *password = (char*)gtk_entry_get_text(output_target);
 	if (!yon_char_is_empty(password)){
-		password = yon_char_new(password);
 		if (main_config.load_mode==0){
+			password = yon_char_new(password);
 			if (!check_is_password_hash(password)){
 				gtk_entry_set_text(GTK_ENTRY(window->PasswordHashEntry),password);
 			} else {
@@ -1891,19 +1891,19 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 				gtk_entry_set_text(GTK_ENTRY(window->userGroupsEntry), name);
 				gtk_entry_set_text(GTK_ENTRY(window->userUserNameEntry), parsed_size>0?parameters[0]:"");
 				window->old_username=name;
-				if (parsed_size>1){
+				if (parsed_size>1+1){
 					if (strcmp(parameters[1],"x")){
 						gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userUIDAutoCheck),0);
 						gtk_entry_set_text(GTK_ENTRY(window->userUIDEntry), parsed_size>1?parameters[1]:"");
 					}
 				}
-				if (parsed_size>2){
+				if (parsed_size>2+1){
 					if (!strcmp(parameters[2],"x"))
 						gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userGroupsCheck),1);
 					else
 						gtk_entry_set_text(GTK_ENTRY(window->userGroupsEntry), parsed_size>2?parameters[2]:"");
 				}
-				if (parsed_size>3){
+				if (parsed_size>3+1){
 					if (strcmp(parameters[3],"x")){
 						gtk_entry_set_text(GTK_ENTRY(window->userAdditionalGroupsEntry), parameters[3]);
 					} else {
@@ -1912,7 +1912,7 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 					}
 					
 				}
-				if (parsed_size>4&&!yon_char_is_empty(parameters[4])){
+				if (parsed_size>4+1&&!yon_char_is_empty(parameters[4])){
 					int params_size;
 					config_str parameters_substring = yon_char_parse(parameters[4],&params_size," ");
 					for (int i=0;i<params_size;i++){
@@ -1944,14 +1944,12 @@ void on_main_edit(GtkWidget *self, main_window *widgets){
 					}
 					// gtk_entry_set_text(GTK_ENTRY(window->), parsed_size>4?parameters[4]:"");
 				}
-				window->old_password=parameters[5];
-				if(parsed_size>5){
-					if (strcmp(parameters[5],"x")){
-						gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry), parsed_size>5?parameters[5]:"");
+				window->old_password=parameters[parsed_size-1];
+					if (strcmp(parameters[parsed_size-1],"x")){
+						gtk_entry_set_text(GTK_ENTRY(window->userPasswordEntry),parameters[parsed_size-1]);
 						gtk_combo_box_set_active(GTK_COMBO_BOX(window->userPasswordCombo),2);
 					}
 				
-				}
 				int samba_sync = yon_samba_sync_get(name);
 				if (samba_sync==1){
 					gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->userSyncSAMBACheck),1);
@@ -2099,7 +2097,6 @@ void on_config_update(GtkWidget *self, main_window *widgets){
 	} else {
 		on_config_local_load(NULL,widgets);
 	}
-	// yon_interface_update(widgets);
 }