pull/106/head
parent b4b419435c
commit bd419ac8ff

@ -500,14 +500,16 @@ void yon_interface_update(main_window *widgets){
gtk_list_store_set(widgets->WebPublicationList,&iter,5,parsed[3],-1); gtk_list_store_set(widgets->WebPublicationList,&iter,5,parsed[3],-1);
} }
if (cur_size>4&&!yon_char_is_empty(parsed[4])){ if (cur_size>4&&!yon_char_is_empty(parsed[4])){
char *hash = yon_char_divide_search(parsed[4],"|",-1); if (!strcmp(parsed[5],"sha256")||!strcmp(parsed[5],"sha512")){
if (!strcmp(hash,"sha256")||!strcmp(hash,"sha512")){
gtk_list_store_set(widgets->WebPublicationList,&iter,7,"******",-1); gtk_list_store_set(widgets->WebPublicationList,&iter,7,"******",-1);
gtk_list_store_set(widgets->WebPublicationList,&iter,6,hash,-1); gtk_list_store_set(widgets->WebPublicationList,&iter,6,parsed[5],-1);
} else { } else {
gtk_list_store_set(widgets->WebPublicationList,&iter,6,"******",-1); if (strlen(parsed[4])==128||strlen(parsed[4])==64)
gtk_list_store_set(widgets->WebPublicationList,&iter,7,parsed[4],-1);
else
gtk_list_store_set(widgets->WebPublicationList,&iter,7,"******",-1);
if (cur_size>5&&!yon_char_is_empty(parsed[5])){ if (cur_size>5&&!yon_char_is_empty(parsed[5])){
gtk_list_store_set(widgets->WebPublicationList,&iter,7,parsed[5],-1); gtk_list_store_set(widgets->WebPublicationList,&iter,6,parsed[5],-1);
} }
} }
} }
@ -1260,8 +1262,8 @@ void on_web_publish_accept(GtkWidget *, dictionary *dict){
enable_browser?"listing":"",":", enable_browser?"listing":"",":",
port_enabled?port:"",":", port_enabled?port:"",":",
username_check?username:"",":", username_check?username:"",":",
username_check?yon_char_is_empty(encryption)? user_password:encryption:"",":", username_check?!yon_char_is_empty(user_password)?user_password:"":"",
username_check?!yon_char_is_empty(encryption)?user_password:"":"", username_check?yon_char_is_empty(encryption)?"":encryption:"",":",
NULL); NULL);
if (!yon_char_is_empty(window->name)&&strcmp(final_name,window->name)){ if (!yon_char_is_empty(window->name)&&strcmp(final_name,window->name)){
yon_config_remove_by_key(REPOPUBLIC_WEB_full(window->name)); yon_config_remove_by_key(REPOPUBLIC_WEB_full(window->name));

@ -106,7 +106,7 @@ mirrorlist - mirrors file, make sure server URL is NOT included in this file! Si
#define _LABEL _("Reviewer") #define _LABEL _("Reviewer")
#define _LABEL _("Port") #define _LABEL _("Port")
#define _LABEL _("Name") #define _LABEL _("Name")
#define _LABEL _("Password/Hash type") #define _LABEL _("Hash type")
#define _LABEL _("Password hash") #define _LABEL _("Password hash")
#define _LABEL _("Setting up publication of a lazy mirror of connected repositories as a local WEB resource") #define _LABEL _("Setting up publication of a lazy mirror of connected repositories as a local WEB resource")
#define _LABEL _("Publish lazy mirror") #define _LABEL _("Publish lazy mirror")

@ -1360,26 +1360,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="resizable">True</property> <property name="resizable">True</property>
<property name="sizing">fixed</property> <property name="sizing">fixed</property>
<property name="title" translatable="yes">Password/Hash type</property> <property name="title" translatable="yes">Password hash</property>
<child> <child>
<object class="GtkCellRendererText"> <object class="GtkCellRendererText">
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
</object> </object>
<attributes> <attributes>
<attribute name="text">6</attribute> <attribute name="text">7</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkTreeViewColumn"> <object class="GtkTreeViewColumn">
<property name="title" translatable="yes">Password hash</property> <property name="title" translatable="yes">Hash type</property>
<child> <child>
<object class="GtkCellRendererText"> <object class="GtkCellRendererText">
<property name="ellipsize">end</property> <property name="ellipsize">end</property>
</object> </object>
<attributes> <attributes>
<attribute name="text">7</attribute> <attribute name="text">6</attribute>
</attributes> </attributes>
</child> </child>
</object> </object>

@ -385,7 +385,7 @@ msgid "Name"
msgstr "" msgstr ""
#: source/ubl-strings.h:107 #: source/ubl-strings.h:107
msgid "Password/Hash type" msgid "Hash type"
msgstr "" msgstr ""
#: source/ubl-strings.h:108 #: source/ubl-strings.h:108

@ -408,8 +408,8 @@ msgid "Name"
msgstr "Имя пользователя" msgstr "Имя пользователя"
#: source/ubl-strings.h:107 #: source/ubl-strings.h:107
msgid "Password/Hash type" msgid "Hash type"
msgstr "Пароль/Тип хэша" msgstr "Тип хэша"
#: source/ubl-strings.h:108 #: source/ubl-strings.h:108
msgid "Password hash" msgid "Password hash"

Loading…
Cancel
Save