Skip to content

Commit

Permalink
Merge pull request #88 from burnacid/development
Browse files Browse the repository at this point in the history
Merge for version 2.4.2
  • Loading branch information
burnacid authored Apr 28, 2018
2 parents fcdd535 + 93a7824 commit 4a352bc
Show file tree
Hide file tree
Showing 10 changed files with 142 additions and 4 deletions.
6 changes: 6 additions & 0 deletions form.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@
// Post in Thread
if ($formcreator->settings) {
if ($thread = get_thread($formcreator->tid)) {

$mybb->input['action'] = "do_newreply";

$posthandler = new PostDataHandler();
$posthandler->action = "post";
$posthandler->admin_override = true;
Expand Down Expand Up @@ -268,6 +271,9 @@
// Thread in Forum
if ($formcreator->fid) {
if ($forum = get_forum($formcreator->fid)) {

$mybb->input['action'] = "do_newthread";

$posthandler = new PostDataHandler();
$posthandler->action = "thread";
$posthandler->admin_override = true;
Expand Down
5 changes: 3 additions & 2 deletions inc/class_formcreator.php
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ public function parse_subject()
global $templates, $mybb, $ref;
if (empty($this->subjecttemplate))
{
return "Form submission: " . $this->name;
$output = "Form submission: " . $this->name;
}
else
{
Expand All @@ -602,8 +602,9 @@ public function parse_subject()
$fieldname = $this->get_field_names();
$fieldvalue = $this->get_field_values();
eval("\$output = \"" . $this->subjecttemplate . "\";");
return $output;
}

return substr($output,0,80);
}

public function parse_output()
Expand Down
2 changes: 2 additions & 0 deletions inc/languages/dutch/admin/config_formcreator.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,5 @@
$l['fc_process_posticon_desc'] = "Selecteer welk bericht icon gebruikt wordt voor het bericht of discussie.";
$l['fc_resize'] = "Vergroten/verkleinen toestaan";
$l['fc_field_resize_desc'] = "Stel in of the gebruiker het veld kan vergroten / verkleinen";

?>
3 changes: 3 additions & 0 deletions inc/languages/dutch/formcreator.lang.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

$l['formcreator'] = "Formulier Maker";
$l['fc_is_empty'] = "is leeg!";
$l['fc_no_attachment'] = "Er is geen bijlage geupload";
Expand All @@ -15,3 +16,5 @@
$l['fc_test'] = "Test";
$l['fc_select_option'] = "Selecteer optie";
$l['fc_no_option_selected'] = "Geen opties geselecteerd";

?>
2 changes: 2 additions & 0 deletions inc/languages/english/admin/config_formcreator.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,5 @@
$l['admin_log_config_formcreator_addfield'] = 'Added field #{2} ({3}) in form #{1}';
$l['admin_log_config_formcreator_editfield'] = 'Edited field #{2} ({3}) in form #{1}';
$l['admin_log_config_formcreator_deletefield'] = 'Deleted field #{2} ({3}) in form #{1}';

?>
119 changes: 118 additions & 1 deletion inc/languages/polish/admin/config_formcreator.lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
$l['formcreator'] = "Kreator formularzy";
$l['fc_view_forms'] = "Przeglądaj formularze";
$l['fc_view_forms_desc'] = "Pokaż wszystkie formularze utworzone dla tej strony";
$l['fc_create_form'] = "Utwórz formularz";
$l['fc_create_form_desc'] = "Utwórz nowy formularz dla tej strony";
$l['fc_export'] = "Eksportuj";
$l['fc_export_desc'] = "Eksportuj formularz dla kopii zapasowej lub w celu udostępnienia";
Expand All @@ -19,7 +20,9 @@
$l['fc_no'] = "Nie";
$l['fc_view_form_fields'] = "Pokaż pola formularza";
$l['fc_view_form_fields_desc'] = "Zmień pola formularza. Dodaj/Edytuj lub Usuń";
$l['fc_add_field'] = "Dodaj pole";
$l['fc_add_field_desc'] = "Dodaj pole";
$l['fc_edit_field'] = "Edytuj pole";
$l['fc_edit_field_desc'] = "Edytuj pole";
$l['fc_form_edit_not_found'] = "Pole, które próbujesz edytować nie istnieje!";
$l['fc_empty_formname'] = "Nazwa formularza jest pusta!";
Expand Down Expand Up @@ -47,7 +50,7 @@
$l['fc_allow_unselected_groups'] = "Zezwól wszystkim poza wybranymi grupami";
$l['fc_allowed_groups'] = "Dozwolone grupy";
$l['fc_allowed_groups_desc'] = "Które grupy mogą używać tego formularza";
$l['fc_limitusage'] = "Limit wykorzytsania";
$l['fc_limitusage'] = "Limit wykorzystania";
$l['fc_limitusage_desc'] = "Podaj maksymalną liczbę razy z jaką użytkownik może wypełniać formularz (0 = nielimitowany).";
$l['fc_status'] = "Status";
$l['fc_status_desc'] = "Czy ten formularz jest aktywny? Tak, czy nie?";
Expand All @@ -69,9 +72,123 @@
$l['fc_process_post_as_desc'] = "Użytkownik, który zostanie użyty do opublikowania wątku, postu lub odpowiedzi. (zostaw puste, aby użyć użytkownika, który wypełnił formularz, ustaw -1, by użyć bota kreatora formularzy)";
$l['fc_override_button'] = "Zastąp przycisk odpowiedzi";
$l['fc_override_button_desc'] = "Zmień link przycisku nowego tematu lub odpowiedzi w wątku na link do formularza. Ma zastosowanie tylko gdy ustawiono publikowanie w nowym wątku lub odpowiedzi.";
$l['fc_process_signature'] = "Wstaw sygnaturę";
$l['fc_process_signature_desc'] = "Czy sygnatura użytkownika ma być wstawiana?";
$l['fc_process_posticon'] = "Wstaw ikonę";
$l['fc_process_posticon_desc'] = "Wybierz ikonę, która ma być używana przy formularzu.";
$l['fc_custom_success_page'] = "Niestandardowa strona po pomyślnym przesłaniu formularza";
$l['fc_custom_success_page_desc'] = "Ustaw URL, na który użytkownik zostanie przekierowany po wypełnieniu i wysłaniu formularza.";
$l['fc_form_layout'] = "Układ formularza";
$l['fc_form_talbe_width'] = "Szerokość tabeli formularza";
$l['fc_form_table_width_desc'] = "Ustaw szerokość tabeli zawierającej formularz (w pikselach lub procentach, np. 100px lub 75%)";
$l['fc_label_width'] = "Szerokość etykiety kolumny";
$l['fc_label_width_desc'] = "Ustaw szerokość kolumny zawierającej pole (w pikselach lub procentach, np. 100px lub 75%)";
$l['fc_class'] = "Klasa";
$l['fc_class_desc'] = "Set the class of the table containing the form";
$l['fc_update_form'] = "Aktualizuj formularz";
$l['fc_create_form'] = "Stwórz formularz";
$l['fc_user_info'] = "Informacja o użykowniku";
$l['fc_username'] = "Nick";
$l['fc_other'] = "Inne";
$l['fc_reference_number'] = "Numer referencyjny";
$l['fc_id'] = "ID";
$l['fc_fieldname'] = "Pole Nazwa";
$l['fc_fieldvalue'] = "Pole Wartość";
$l['fc_edit_output_template'] = "Edytuj wzór wyjściowy";
$l['fc_subject_template'] = "Wzór nazwy tematu";
$l['fc_subject_template_desc'] = "Please enter in the template string for the subject. Copy any variables from the template.";
$l['fc_message_template'] = "Wzór wiadomości";
$l['fc_message_template_desc'] = "Please enter in the template for the message. You can use MyCode and the variables by clicking the legend.";
$l['fc_add_variables'] = "Dodaj zmienne";
$l['fc_delete_field'] = "Usuń pole";
$l['fc_edit_field'] = "Edytuj pole";
$l['fc_form_has_no_fields'] = "Ten formularz nie ma żadnych pól!";
$l['fc_field_name_empty'] = "Nazwa pola jest pusta";
$l['fc_options_empty'] = "Nie wprowadzono żadnych opcji";
$l['fc_html_empty'] = "Blok HTML nie może być pusty";
$l['fc_success_field_add'] = "Pole zostało pomyślnie dodane.";
$l['fc_success_field_edit'] = "Pole zostało pomyślnie zaktualizowane.";
$l['fc_form_fields'] = "Pola formularza";
$l['fc_add_field'] = "Dodaj pole";
$l['fc_edit_field'] = "Edytuj pole";
$l['fc_add'] = "Dodaj";
$l['fc_name'] = "Nazwa";
$l['fc_field_name_desc'] = "Podaj nazwę pola";
$l['fc_description'] = "Opis";
$l['fc_field_description_desc'] = "Wpisz opis pola";
$l['fc_placeholder'] = "Wartość przykładowa";
$l['fc_field_placeholder_desc'] = "Napisz przykad, który ma się wyświetlać w polu, które ma edytować użytkownik.";
$l['fc_maxlength'] = "Maksymalna długość";
$l['fc_field_maxlength_desc'] = "Wprowadź maksymalną liczbę znaków (0 = bez limitu)";
$l['fc_options'] = "Opcje";
$l['fc_field_options_desc'] = "Podaj opcje pola. Każda opcja w następnej linii.";
$l['fc_format'] = "Format";
$l['fc_field_format_desc'] = "Podaj format pola(np. dla dat użyj jQuery <a href='http://api.jqueryui.com/datepicker/#utility-formatDate'>dateformat</a>)";
$l['fc_default'] = "Domyślnie";
$l['fc_field_default_desc'] = "Podaj domyślną wartość pola";
$l['fc_required'] = "Wymagane";
$l['fc_field_required_desc'] = "Zaznacz jeśli to pole jest wymagane.";
$l['fc_regex'] = "Wyrażenie regularne";
$l['fc_field_regex_desc'] = "Podaj wyrażenia regularne";
$l['fc_regex_error'] = "Zły format danych";
$l['fc_field_regex_error_desc'] = "Podaj wiadomość jaka ma się wyświetlić, gdy podano niewłaściwy format danych";
$l['fc_size'] = "Wielkość";
$l['fc_field_size_desc'] = "Podaj wielkość pola";
$l['fc_cols'] = "Kolumny";
$l['fc_field_cols_desc'] = "Podaj wielkość w kolumnach dla tego pola";
$l['fc_rows'] = "Wiersze";
$l['fc_field_rows_desc'] = "Podaj wielkość w wierszach dla tego pola";
$l['fc_resize'] = "Pozwalaj zmieniać wielkość";
$l['fc_field_resize_desc'] = "Czy użytkownik może zmienić rozmiar pola?";
$l['fc_class'] = "Klasa";
$l['fc_field_class_desc'] = "Enter a class for the field container";
$l['fc_html_block'] = "Blok HTML";
$l['fc_field_html_block_desc'] = "Wpisz kod HTML, które chcesz wyświetlić";
$l['fc_field_type'] = "Typ pola";
$l['fc_field_example'] = "Przykład pola";
$l['fc_field_type_desc'] = "Wybierz typ pola, które chcesz dodać.";
$l['fc_button_update_field'] = "Aktualizuj pole";
$l['fc_button_create_field'] = "Stwórz pole";
$l['fc_add_field_unknown_form'] = "Próbujesz dodać pole do formularza, który nie istnieje!";
$l['fc_delete_field_unknown'] = "Pole, które chcesz usunąć nie istnieje.";
$l['fc_delete_field_form_unknown'] = "Pole formularza, które chcesz usunąć nie istnieje.";
$l['fc_delete_field_success'] = "Pole pomyślnie usunięte.";
$l['fc_confirmation_delete_field'] = "Czy jesteś pewien, że chcesz to usunąć?";
$l['fc_save_order'] = "Zapisz";
$l['fc_order_saved'] = "Zapisano";
$l['fc_order'] = "Order";
$l['fc_type'] = "Typ";
$l['fc_form_info'] = "Informacja o formularzu";
$l['fc_send_mail_to'] = "Wyślij maila do";
$l['fc_no_mail_selected'] = "Nie wybrano maili.";
$l['fc_export_form'] = "Eksportuj formularze";
$l['fc_export_description'] = "Kopiuj i zapisz do pliku lub użyj, aby importować w innym miejscu";
$l['fc_no_forms_to_export'] = "Nie masz żadnych formularzy, które można eksportować";
$l['fc_forms'] = "Formularze";
$l['fc_no_forms'] = "Brak formularzy";
$l['fc_field_forms_desc'] = "Które formularze chcesz eksportować ?";
$l['fc_export_perms'] = "Eksportuj uprawnieniaExport Permissions";
$l['fc_export_perms_desc'] = "Czy chcesz eksportować uprawnienia ? Ustaw NIE jeśli będziesz importował na inne forum.";
$l['fc_export_process_options'] = "Export Process Options";
$l['fc_export_process_options_desc'] = "Do you like to export the process options? Set this to 'OFF' if you are going to import this on other forums.";
$l['fc_export_usagelog'] = "Export Usage Log";
$l['fc_export_usagelog_desc'] = "Do you like to export the usage history? Set this to 'OFF' if you are going to import this on other forums.";
$l['fc_create_thread_in_forum'] = "Stwórz temat na forum";
$l['fc_forum_doesnt_exist'] = "Forum nie istnieje";
$l['fc_no_forum_selected'] = "(Nie wybrano żadnego forum)";
$l['fc_send_pm_to_usergroups'] = "Wyślij PW do grupy";
$l['fc_no_groups_selected'] = "(Nie wybrano żadnej grupy)";
$l['fc_send_pm_to_users'] = "Wyślij PW do użytkowników";
$l['fc_no_users_selected'] = "(Nie wybrano żadnych użytkowników)";
$l['fc_import_form'] = "Importuj formularz";
$l['fc_import_code'] = "Importuj kod";
$l['fc_import_code_desc'] = "Podaj kod do importowania";
$l['fc_no_forms_imported'] = "Nie znaleziono formularzy do zaimportowania.";
$l['fc_forms_imported'] = "Zaimportowano formularz ({1} forms i {2} pola)";
$l['fc_url'] = "Link / URL";
$l['admin_log_config_formcreator_add'] = 'Stworzono formularz #{1} ({2})';
$l['admin_log_config_formcreator_edit'] = 'Edytowano formularz #{1} ({2})';
$l['admin_log_config_formcreator_delete'] = 'Usunięto formularz #{1} ({2})';
$l['admin_log_config_formcreator_addfield'] = 'Dodano pole #{2} ({3}) w formularzu #{1}';
$l['admin_log_config_formcreator_editfield'] = 'Edytowano pole #{2} ({3}) w formularzu #{1}';
$l['admin_log_config_formcreator_deletefield'] = 'Usunięto pole #{2} ({3}) w formularzu #{1}';
3 changes: 3 additions & 0 deletions inc/languages/polish/formcreator.lang.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

$l['formcreator'] = "Kreator formularzy";
$l['fc_is_empty'] = "jest pusty!";
$l['fc_no_attachment'] = "Żaden załącznik nie został wgrany";
Expand All @@ -15,3 +16,5 @@
$l['fc_test'] = "Test";
$l['fc_select_option'] = "Wybierz opcję";
$l['fc_no_option_selected'] = "żadna opcja nie została wybrana";

?>
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,4 @@
$l['fc_process_posticon_desc'] = "Selecione qual ícone de postagem será usado para a postagem / tópico.";
$l['fc_resize'] = "Permitir redimensionar";
$l['fc_field_resize_desc'] = "Defina se o usuário pode ou não redimensionar o campo";
?>
3 changes: 3 additions & 0 deletions inc/languages/portugues_brasil/formcreator.lang.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

$l['formcreator'] = "Criador de Formulário";
$l['fc_is_empty'] = "está vazio!";
$l['fc_no_attachment'] = "Nenhum anexo foi enviado";
Expand All @@ -15,3 +16,5 @@
$l['fc_test'] = "Teste";
$l['fc_select_option'] = "Selecione uma opção";
$l['fc_no_option_selected'] = "nenhuma opção foi selecionada";

?>
2 changes: 1 addition & 1 deletion inc/plugins/formcreator.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function formcreator_info()
'website' => 'https://community.mybb.com/mods.php?action=view&pid=975',
'author' => 'S. Lenders (burnacid)',
'authorsite' => 'http://lenders-it.nl',
'version' => '2.4.1',
'version' => '2.4.2',
'compatibility' => '18*',
'codename' => 'formcreator');
}
Expand Down

0 comments on commit 4a352bc

Please sign in to comment.