'
+ . ' . ')
'
+ . '
';
+ }
$rows[] = [
'lp' => $lp++ . '.',
+ 'thumbnail' => $thumbnail,
'name' => '' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '',
'status' => $isActive ? 'tak' : 'nie',
'home_page' => $homePage === 1 ? 'tak' : 'nie',
@@ -95,6 +117,7 @@ class BannerController
$viewModel = new \admin\ViewModels\Common\PaginatedTableViewModel(
[
['key' => 'lp', 'label' => 'Lp.', 'class' => 'text-center', 'sortable' => false],
+ ['key' => 'thumbnail', 'label' => 'Miniatura', 'class' => 'text-center', 'sortable' => false, 'raw' => true],
['key' => 'name', 'sort_key' => 'name', 'label' => 'Nazwa', 'sortable' => true, 'raw' => true],
['key' => 'status', 'sort_key' => 'status', 'label' => 'Aktywny', 'class' => 'text-center', 'sortable' => true, 'raw' => true],
['key' => 'home_page', 'sort_key' => 'home_page', 'label' => 'Strona glowna', 'class' => 'text-center', 'sortable' => true, 'raw' => true],
@@ -141,7 +164,15 @@ class BannerController
$banner = $this->repository->find($bannerId);
$languages = \admin\factory\Languages::languages_list();
- return \admin\view\Banners::banner_edit($banner, $languages);
+ // Sprawdź czy są błędy walidacji z poprzedniego requestu
+ $validationErrors = $_SESSION['form_errors'][$this->getFormId()] ?? null;
+ if ($validationErrors) {
+ unset($_SESSION['form_errors'][$this->getFormId()]);
+ }
+
+ $viewModel = $this->buildFormViewModel($banner, $languages, $validationErrors);
+
+ return \Tpl::view('components/form-edit', ['form' => $viewModel]);
}
/**
@@ -149,13 +180,40 @@ class BannerController
*/
public function save(): void
{
- $response = ['status' => 'error', 'msg' => 'Podczas zapisywania baneru wystapil blad. Prosze sprobowac ponownie.'];
+ $response = ['success' => false, 'errors' => []];
- $values = json_decode(\S::get('values'), true);
- $bannerId = $this->repository->save($values);
- if ($bannerId) {
+ $bannerId = (int)\S::get('id');
+ $banner = $this->repository->find($bannerId);
+ $languages = \admin\factory\Languages::languages_list();
+
+ $viewModel = $this->buildFormViewModel($banner, $languages);
+
+ // Przetwórz dane z POST
+ $result = $this->formHandler->handleSubmit($viewModel, $_POST);
+
+ if (!$result['success']) {
+ // Zapisz błędy w sesji i zwróć jako JSON
+ $_SESSION['form_errors'][$this->getFormId()] = $result['errors'];
+ $response['errors'] = $result['errors'];
+ echo json_encode($response);
+ exit;
+ }
+
+ // Zapisz dane
+ $data = $result['data'];
+ $data['id'] = $bannerId ?: null;
+
+ $savedId = $this->repository->save($data);
+
+ if ($savedId) {
\S::delete_dir('../temp/');
- $response = ['status' => 'ok', 'msg' => 'Baner zostal zapisany.', 'id' => $bannerId];
+ $response = [
+ 'success' => true,
+ 'id' => $savedId,
+ 'message' => 'Baner został zapisany.'
+ ];
+ } else {
+ $response['errors'] = ['general' => 'Błąd podczas zapisywania do bazy.'];
}
echo json_encode($response);
@@ -176,4 +234,103 @@ class BannerController
header('Location: /admin/banners/view_list/');
exit;
}
+
+ /**
+ * Buduje model widoku formularza
+ */
+ private function buildFormViewModel(array $banner, array $languages, ?array $errors = null): FormEditViewModel
+ {
+ $bannerId = $banner['id'] ?? 0;
+ $isNew = empty($bannerId);
+
+ // Domyślne wartości dla nowego banera
+ if ($isNew) {
+ $banner['status'] = 1;
+ $banner['home_page'] = 0;
+ }
+
+ $tabs = [
+ new FormTab('settings', 'Ustawienia', 'fa-wrench'),
+ new FormTab('content', 'Zawartość', 'fa-file'),
+ ];
+
+ $fields = [
+ // Zakładka Ustawienia
+ FormField::text('name', [
+ 'label' => 'Nazwa',
+ 'tab' => 'settings',
+ 'required' => true,
+ ]),
+ FormField::switch('status', [
+ 'label' => 'Aktywny',
+ 'tab' => 'settings',
+ 'value' => ($banner['status'] ?? 1) == 1,
+ ]),
+ FormField::date('date_start', [
+ 'label' => 'Data rozpoczęcia',
+ 'tab' => 'settings',
+ ]),
+ FormField::date('date_end', [
+ 'label' => 'Data zakończenia',
+ 'tab' => 'settings',
+ ]),
+ FormField::switch('home_page', [
+ 'label' => 'Slajder / Strona główna',
+ 'tab' => 'settings',
+ 'value' => ($banner['home_page'] ?? 0) == 1,
+ ]),
+
+ // Sekcja językowa w zakładce Zawartość
+ FormField::langSection('translations', 'content', [
+ FormField::image('src', [
+ 'label' => 'Obraz',
+ 'filemanager' => true,
+ ]),
+ FormField::text('url', [
+ 'label' => 'Url',
+ ]),
+ FormField::textarea('html', [
+ 'label' => 'Kod HTML',
+ 'rows' => 6,
+ ]),
+ FormField::editor('text', [
+ 'label' => 'Treść',
+ 'toolbar' => 'MyTool',
+ 'height' => 300,
+ ]),
+ ]),
+ ];
+
+ $actions = [
+ FormAction::save(
+ '/admin/banners/banner_save/' . ($isNew ? '' : 'id=' . $bannerId),
+ '/admin/banners/view_list/'
+ ),
+ FormAction::cancel('/admin/banners/view_list/'),
+ ];
+
+ return new FormEditViewModel(
+ $this->getFormId(),
+ $isNew ? 'Nowy baner' : 'Edycja banera',
+ $banner,
+ $fields,
+ $tabs,
+ $actions,
+ 'POST',
+ '/admin/banners/banner_save/' . ($isNew ? '' : 'id=' . $bannerId),
+ '/admin/banners/view_list/',
+ true,
+ ['id' => $bannerId],
+ $languages,
+ $errors
+ );
+ }
+
+ /**
+ * Zwraca identyfikator formularza
+ */
+ private function getFormId(): string
+ {
+ return 'banner-edit';
+ }
}
diff --git a/autoload/admin/Support/Forms/FormFieldRenderer.php b/autoload/admin/Support/Forms/FormFieldRenderer.php
new file mode 100644
index 0000000..5a35c10
--- /dev/null
+++ b/autoload/admin/Support/Forms/FormFieldRenderer.php
@@ -0,0 +1,430 @@
+form = $form;
+ }
+
+ /**
+ * Renderuje pojedyncze pole
+ */
+ public function renderField(FormField $field): string
+ {
+ $method = 'render' . ucfirst($field->type);
+
+ if (method_exists($this, $method)) {
+ return $this->$method($field);
+ }
+
+ // Fallback dla nieznanych typów - renderuj jako text
+ return $this->renderText($field);
+ }
+
+ /**
+ * Renderuje pole tekstowe
+ */
+ public function renderText(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+ $error = $this->form->getError($field->name);
+
+ $params = [
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'type' => 'text',
+ 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ];
+
+ if ($field->placeholder) {
+ $params['placeholder'] = $field->placeholder;
+ }
+
+ if ($error) {
+ $params['class'] .= ' error';
+ }
+
+ return $this->wrapWithError(\Html::input($params), $error);
+ }
+
+ /**
+ * Renderuje pole number
+ */
+ public function renderNumber(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+ $error = $this->form->getError($field->name);
+
+ $params = [
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'type' => 'number',
+ 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ];
+
+ if ($error) {
+ $params['class'] .= ' error';
+ }
+
+ return $this->wrapWithError(\Html::input($params), $error);
+ }
+
+ /**
+ * Renderuje pole email
+ */
+ public function renderEmail(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+ $error = $this->form->getError($field->name);
+
+ $params = [
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'type' => 'email',
+ 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ];
+
+ if ($error) {
+ $params['class'] .= ' error';
+ }
+
+ return $this->wrapWithError(\Html::input($params), $error);
+ }
+
+ /**
+ * Renderuje pole password
+ */
+ public function renderPassword(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+
+ return \Html::input([
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'type' => 'password',
+ 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ]);
+ }
+
+ /**
+ * Renderuje pole daty
+ */
+ public function renderDate(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+ $error = $this->form->getError($field->name);
+
+ $params = [
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'type' => 'text',
+ 'class' => 'date ' . ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ];
+
+ if ($error) {
+ $params['class'] .= ' error';
+ }
+
+ return $this->wrapWithError(\Html::input($params), $error);
+ }
+
+ /**
+ * Renderuje pole daty i czasu
+ */
+ public function renderDatetime(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+
+ return \Html::input([
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'type' => 'text',
+ 'class' => 'datetime ' . ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ]);
+ }
+
+ /**
+ * Renderuje przełącznik (switch)
+ */
+ public function renderSwitch(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+
+ // Domyślna wartość dla nowego rekordu
+ if ($value === null && $field->value === true) {
+ $checked = true;
+ } else {
+ $checked = (bool) $value;
+ }
+
+ return \Html::input_switch([
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'checked' => $checked,
+ ]);
+ }
+
+ /**
+ * Renderuje select
+ */
+ public function renderSelect(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+ $error = $this->form->getError($field->name);
+
+ $params = [
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'options' => $field->options,
+ 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ];
+
+ if ($error) {
+ $params['class'] .= ' error';
+ }
+
+ return $this->wrapWithError(\Html::select($params), $error);
+ }
+
+ /**
+ * Renderuje textarea
+ */
+ public function renderTextarea(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+
+ return \Html::textarea([
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'rows' => $field->attributes['rows'] ?? 4,
+ 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ]);
+ }
+
+ /**
+ * Renderuje edytor (CKEditor)
+ */
+ public function renderEditor(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+
+ return \Html::textarea([
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'rows' => max(10, ($field->attributes['rows'] ?? 10)),
+ 'class' => 'editor ' . ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ]);
+ }
+
+ /**
+ * Renderuje pole obrazu z filemanagerem
+ */
+ public function renderImage(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+
+ $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($field->id);
+
+ return \Html::input_icon([
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'type' => 'text',
+ 'icon_content' => 'przeglądaj',
+ 'icon_js' => "window.open('{$filemanagerUrl}', 'filemanager', 'location=1,status=1,scrollbars=1,width=1100,height=700')",
+ ]);
+ }
+
+ /**
+ * Renderuje pole pliku
+ */
+ public function renderFile(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+
+ if ($field->useFilemanager) {
+ $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($field->id);
+
+ return \Html::input_icon([
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'value' => $value ?? '',
+ 'type' => 'text',
+ 'icon_content' => 'przeglądaj',
+ 'icon_js' => "window.open('{$filemanagerUrl}', 'filemanager', 'location=1,status=1,scrollbars=1,width=1100,height=700')",
+ ]);
+ }
+
+ return \Html::input([
+ 'label' => $field->label,
+ 'name' => $field->name,
+ 'id' => $field->id,
+ 'type' => 'file',
+ 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ]);
+ }
+
+ /**
+ * Renderuje ukryte pole
+ */
+ public function renderHidden(FormField $field): string
+ {
+ $value = $this->form->getFieldValue($field);
+
+ return '';
+ }
+
+ /**
+ * Renderuje sekcję językową
+ */
+ public function renderLangSection(FormField $section): string
+ {
+ if ($section->langFields === null || $this->form->languages === null) {
+ return '';
+ }
+
+ $out = '';
+
+ // Zakładki języków
+ $out .= '
';
+
+ return $out;
+ }
+
+ /**
+ * Renderuje pole w sekcji językowej
+ */
+ private function renderLangField(FormField $field, $languageId, string $sectionName): string
+ {
+ $value = $this->form->getFieldValue($field, $languageId, $field->name);
+ $error = $this->form->getError($sectionName . '_' . $field->name, $languageId);
+
+ $name = $field->getLocalizedName($languageId);
+ $id = $field->getLocalizedId($languageId);
+
+ switch ($field->type) {
+ case FormFieldType::IMAGE:
+ $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($id);
+ return $this->wrapWithError(\Html::input_icon([
+ 'label' => $field->label,
+ 'name' => $name,
+ 'id' => $id,
+ 'value' => $value ?? '',
+ 'type' => 'text',
+ 'icon_content' => 'przeglądaj',
+ 'icon_js' => "window.open('{$filemanagerUrl}', 'filemanager', 'location=1,status=1,scrollbars=1,width=1100,height=700')",
+ ]), $error);
+
+ case FormFieldType::TEXTAREA:
+ case FormFieldType::EDITOR:
+ return $this->wrapWithError(\Html::textarea([
+ 'label' => $field->label,
+ 'name' => $name,
+ 'id' => $id,
+ 'value' => $value ?? '',
+ 'rows' => $field->type === FormFieldType::EDITOR ? 10 : ($field->attributes['rows'] ?? 4),
+ 'class' => $field->type === FormFieldType::EDITOR ? 'editor' : '',
+ ]), $error);
+
+ case FormFieldType::SWITCH:
+ return \Html::input_switch([
+ 'label' => $field->label,
+ 'name' => $name,
+ 'id' => $id,
+ 'checked' => (bool) $value,
+ ]);
+
+ default: // TEXT, URL, etc.
+ return $this->wrapWithError(\Html::input([
+ 'label' => $field->label,
+ 'name' => $name,
+ 'id' => $id,
+ 'value' => $value ?? '',
+ 'type' => $field->type === FormFieldType::EMAIL ? 'email' : 'text',
+ 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''),
+ ]), $error);
+ }
+ }
+
+ /**
+ * Generuje URL do filemanagera
+ */
+ private function generateFilemanagerUrl(string $fieldId): string
+ {
+ $rfmAkey = $_SESSION['rfm_akey'] ?? bin2hex(random_bytes(16));
+ $_SESSION['rfm_akey'] = $rfmAkey;
+ $_SESSION['rfm_akey_expires'] = time() + 20 * 60;
+ $_SESSION['can_use_rfm'] = true;
+
+ $fieldIdParam = rawurlencode($fieldId);
+ $akeyParam = rawurlencode($rfmAkey);
+ return "/libraries/filemanager-9.14.2/dialog.php?type=1&popup=1&field_id={$fieldIdParam}&akey={$akeyParam}";
+ }
+
+ /**
+ * Opakowuje pole w kontener błędu
+ */
+ private function wrapWithError(string $html, ?string $error): string
+ {
+ if ($error) {
+ return '- ';
+ foreach ($this->form->languages as $lang) {
+ if ($lang['status']) {
+ $out .= '
- ' . htmlspecialchars($lang['name']) . ' '; + } + } + $out .= '
';
+ foreach ($this->form->languages as $lang) {
+ if ($lang['status']) {
+ $out .= '
';
+
+ $out .= '';
+ foreach ($section->langFields as $field) {
+ $out .= $this->renderLangField($field, $lang['id'], $section->name);
+ }
+ $out .= '
';
+ }
+ }
+ $out .= '' . $html .
+ '
';
+ }
+ return $html;
+ }
+}
diff --git a/autoload/admin/Support/Forms/FormRequestHandler.php b/autoload/admin/Support/Forms/FormRequestHandler.php
new file mode 100644
index 0000000..2bf5105
--- /dev/null
+++ b/autoload/admin/Support/Forms/FormRequestHandler.php
@@ -0,0 +1,152 @@
+validator = new FormValidator();
+ }
+
+ /**
+ * Przetwarza żądanie POST formularza
+ *
+ * @param FormEditViewModel $formViewModel
+ * @param array $postData Dane z $_POST
+ * @return array Wynik przetwarzania ['success' => bool, 'errors' => array, 'data' => array]
+ */
+ public function handleSubmit(FormEditViewModel $formViewModel, array $postData): array
+ {
+ $result = [
+ 'success' => false,
+ 'errors' => [],
+ 'data' => []
+ ];
+
+ // Walidacja
+ $errors = $this->validator->validate($postData, $formViewModel->fields, $formViewModel->languages);
+
+ if (!empty($errors)) {
+ $result['errors'] = $errors;
+ // Zapisz dane do persist przy błędzie walidacji
+ if ($formViewModel->persist) {
+ $formViewModel->saveToPersist($postData);
+ }
+ return $result;
+ }
+
+ // Przetwórz dane (np. konwersja typów)
+ $processedData = $this->processData($postData, $formViewModel->fields);
+
+ $result['success'] = true;
+ $result['data'] = $processedData;
+
+ // Wyczyść persist po sukcesie
+ if ($formViewModel->persist) {
+ $formViewModel->clearPersist();
+ }
+
+ return $result;
+ }
+
+ /**
+ * Przetwarza dane z formularza (konwersja typów)
+ */
+ private function processData(array $postData, array $fields): array
+ {
+ $processed = [];
+
+ foreach ($fields as $field) {
+ $value = $postData[$field->name] ?? null;
+
+ // Konwersja typów
+ switch ($field->type) {
+ case FormFieldType::SWITCH:
+ $processed[$field->name] = $value ? 1 : 0;
+ break;
+
+ case FormFieldType::NUMBER:
+ $processed[$field->name] = $value !== null && $value !== '' ? (float)$value : null;
+ break;
+
+ case FormFieldType::LANG_SECTION:
+ if ($field->langFields !== null) {
+ $processed[$field->name] = $this->processLangSection($postData, $field);
+ }
+ break;
+
+ default:
+ $processed[$field->name] = $value;
+ }
+ }
+
+ return $processed;
+ }
+
+ /**
+ * Przetwarza sekcję językową
+ */
+ private function processLangSection(array $postData, $section): array
+ {
+ $result = [];
+
+ if ($section->langFields === null) {
+ return $result;
+ }
+
+ foreach ($section->langFields as $field) {
+ $fieldName = $field->name;
+ $langData = $postData[$fieldName] ?? [];
+
+ foreach ($langData as $langId => $value) {
+ if (!isset($result[$langId])) {
+ $result[$langId] = [];
+ }
+
+ // Konwersja typów dla pól językowych
+ switch ($field->type) {
+ case FormFieldType::SWITCH:
+ $result[$langId][$fieldName] = $value ? 1 : 0;
+ break;
+ case FormFieldType::NUMBER:
+ $result[$langId][$fieldName] = $value !== null && $value !== '' ? (float)$value : null;
+ break;
+ default:
+ $result[$langId][$fieldName] = $value;
+ }
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Przywraca dane z persist do POST (przy błędzie walidacji)
+ */
+ public function restoreFromPersist(FormEditViewModel $formViewModel): ?array
+ {
+ if (!$formViewModel->persist) {
+ return null;
+ }
+
+ return $_SESSION['form_persist'][$formViewModel->formId] ?? null;
+ }
+
+ /**
+ * Sprawdza czy żądanie jest submitowaniem formularza
+ */
+ public function isFormSubmit(string $formId): bool
+ {
+ return $_SERVER['REQUEST_METHOD'] === 'POST' &&
+ (isset($_POST['_form_id']) && $_POST['_form_id'] === $formId);
+ }
+}
diff --git a/autoload/admin/Validation/FormValidator.php b/autoload/admin/Validation/FormValidator.php
new file mode 100644
index 0000000..73e7b05
--- /dev/null
+++ b/autoload/admin/Validation/FormValidator.php
@@ -0,0 +1,196 @@
+errors = [];
+
+ foreach ($fields as $field) {
+ if ($field->type === FormFieldType::LANG_SECTION) {
+ $this->validateLangSection($data, $field, $languages ?? []);
+ } else {
+ $this->validateField($data, $field);
+ }
+ }
+
+ return $this->errors;
+ }
+
+ /**
+ * Waliduje pojedyncze pole
+ */
+ private function validateField(array $data, FormField $field): void
+ {
+ $value = $data[$field->name] ?? null;
+
+ // Walidacja wymagalności
+ if ($field->required && $this->isEmpty($value)) {
+ $this->errors[$field->name] = "Pole \"{$field->label}\" jest wymagane.";
+ return;
+ }
+
+ // Jeśli pole puste i nie jest wymagane - pomijamy dalszą walidację
+ if ($this->isEmpty($value)) {
+ return;
+ }
+
+ // Walidacja typu
+ switch ($field->type) {
+ case FormFieldType::EMAIL:
+ if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
+ $this->errors[$field->name] = "Pole \"{$field->label}\" musi być poprawnym adresem e-mail.";
+ }
+ break;
+
+ case FormFieldType::NUMBER:
+ if (!is_numeric($value)) {
+ $this->errors[$field->name] = "Pole \"{$field->label}\" musi być liczbą.";
+ }
+ break;
+
+ case FormFieldType::DATE:
+ if (!$this->isValidDate($value)) {
+ $this->errors[$field->name] = "Pole \"{$field->label}\" musi być poprawną datą (YYYY-MM-DD).";
+ }
+ break;
+
+ case FormFieldType::DATETIME:
+ if (!$this->isValidDateTime($value)) {
+ $this->errors[$field->name] = "Pole \"{$field->label}\" musi być poprawną datą i czasem.";
+ }
+ break;
+ }
+
+ // Walidacja customowa (callback)
+ if (isset($field->attributes['validate_callback']) && is_callable($field->attributes['validate_callback'])) {
+ $result = call_user_func($field->attributes['validate_callback'], $value, $data);
+ if ($result !== true) {
+ $this->errors[$field->name] = is_string($result) ? $result : "Pole \"{$field->label}\" zawiera nieprawidłową wartość.";
+ }
+ }
+ }
+
+ /**
+ * Waliduje sekcję językową
+ */
+ private function validateLangSection(array $data, FormField $section, array $languages): void
+ {
+ if ($section->langFields === null) {
+ return;
+ }
+
+ foreach ($languages as $language) {
+ if (!($language['status'] ?? false)) {
+ continue;
+ }
+
+ $langId = $language['id'];
+
+ foreach ($section->langFields as $field) {
+ $fieldName = $field->name;
+ $value = $data[$fieldName][$langId] ?? null;
+
+ // Walidacja wymagalności
+ if ($field->required && $this->isEmpty($value)) {
+ $errorKey = "{$section->name}_{$fieldName}";
+ $this->errors[$errorKey][$langId] = "Pole \"{$field->label}\" ({$language['name']}) jest wymagane.";
+ continue;
+ }
+
+ // Walidacja typu dla pól językowych
+ if (!$this->isEmpty($value)) {
+ switch ($field->type) {
+ case FormFieldType::EMAIL:
+ if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
+ $errorKey = "{$section->name}_{$fieldName}";
+ $this->errors[$errorKey][$langId] = "Pole \"{$field->label}\" ({$language['name']}) musi być poprawnym e-mailem.";
+ }
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Sprawdza czy wartość jest pusta
+ */
+ private function isEmpty($value): bool
+ {
+ return $value === null || $value === '' || (is_array($value) && empty($value));
+ }
+
+ /**
+ * Sprawdza czy data jest poprawna (YYYY-MM-DD)
+ */
+ private function isValidDate(string $date): bool
+ {
+ $d = \DateTime::createFromFormat('Y-m-d', $date);
+ return $d && $d->format('Y-m-d') === $date;
+ }
+
+ /**
+ * Sprawdza czy data i czas są poprawne
+ */
+ private function isValidDateTime(string $datetime): bool
+ {
+ $d = \DateTime::createFromFormat('Y-m-d H:i:s', $datetime);
+ if ($d && $d->format('Y-m-d H:i:s') === $datetime) {
+ return true;
+ }
+
+ // Spróbuj bez sekund
+ $d = \DateTime::createFromFormat('Y-m-d H:i', $datetime);
+ return $d && $d->format('Y-m-d H:i') === $datetime;
+ }
+
+ /**
+ * Sprawdza czy walidacja zakończyła się sukcesem
+ */
+ public function isValid(): bool
+ {
+ return empty($this->errors);
+ }
+
+ /**
+ * Zwraca wszystkie błędy
+ */
+ public function getErrors(): array
+ {
+ return $this->errors;
+ }
+
+ /**
+ * Zwraca pierwszy błąd
+ */
+ public function getFirstError(): ?string
+ {
+ if (empty($this->errors)) {
+ return null;
+ }
+
+ $first = reset($this->errors);
+ if (is_array($first)) {
+ return reset($first);
+ }
+ return $first;
+ }
+}
diff --git a/autoload/admin/ViewModels/Forms/FormAction.php b/autoload/admin/ViewModels/Forms/FormAction.php
new file mode 100644
index 0000000..98d6529
--- /dev/null
+++ b/autoload/admin/ViewModels/Forms/FormAction.php
@@ -0,0 +1,73 @@
+name = $name;
+ $this->label = $label;
+ $this->url = $url;
+ $this->backUrl = $backUrl;
+ $this->cssClass = $cssClass;
+ $this->type = $type;
+ $this->attributes = $attributes;
+ }
+
+ /**
+ * Predefiniowana akcja Zapisz
+ */
+ public static function save(string $url, string $backUrl = '', string $label = 'Zapisz'): self
+ {
+ return new self(
+ 'save',
+ $label,
+ $url,
+ $backUrl,
+ 'btn btn-primary',
+ 'submit'
+ );
+ }
+
+ /**
+ * Predefiniowana akcja Anuluj
+ */
+ public static function cancel(string $backUrl, string $label = 'Anuluj'): self
+ {
+ return new self(
+ 'cancel',
+ $label,
+ $backUrl,
+ null,
+ 'btn btn-default',
+ 'link'
+ );
+ }
+}
diff --git a/autoload/admin/ViewModels/Forms/FormEditViewModel.php b/autoload/admin/ViewModels/Forms/FormEditViewModel.php
new file mode 100644
index 0000000..663d08f
--- /dev/null
+++ b/autoload/admin/ViewModels/Forms/FormEditViewModel.php
@@ -0,0 +1,178 @@
+formId = $formId;
+ $this->title = $title;
+ $this->data = $data;
+ $this->fields = $fields;
+ $this->tabs = $tabs;
+ $this->actions = $actions;
+ $this->method = $method;
+ $this->action = $action;
+ $this->backUrl = $backUrl;
+ $this->persist = $persist;
+ $this->hiddenFields = $hiddenFields;
+ $this->languages = $languages;
+ $this->validationErrors = $validationErrors;
+ }
+
+ /**
+ * Sprawdza czy formularz ma zakładki
+ */
+ public function hasTabs(): bool
+ {
+ return count($this->tabs) > 0;
+ }
+
+ /**
+ * Sprawdza czy formularz ma sekcje językowe
+ */
+ public function hasLangSections(): bool
+ {
+ foreach ($this->fields as $field) {
+ if ($field->type === FormFieldType::LANG_SECTION) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Zwraca pola dla konkretnej zakładki
+ */
+ public function getFieldsForTab(string $tabId): array
+ {
+ return array_filter($this->fields, function (FormField $field) use ($tabId) {
+ return $field->tabId === $tabId && $field->type !== FormFieldType::LANG_SECTION;
+ });
+ }
+
+ /**
+ * Zwraca sekcje językowe dla konkretnej zakładki
+ */
+ public function getLangSectionsForTab(string $tabId): array
+ {
+ return array_filter($this->fields, function (FormField $field) use ($tabId) {
+ return $field->type === FormFieldType::LANG_SECTION &&
+ $field->langSectionParentTab === $tabId;
+ });
+ }
+
+ /**
+ * Pobiera wartość pola z danych lub sesji (persist)
+ */
+ public function getFieldValue(FormField $field, $languageId = null, ?string $langFieldName = null)
+ {
+ $fieldName = $field->name;
+
+ // Dla sekcji językowych - pobierz wartość z data[lang_id][field_name]
+ if ($languageId !== null && $langFieldName !== null) {
+ $fieldName = $langFieldName;
+ return $this->data['languages'][$languageId][$fieldName] ?? null;
+ }
+
+ // Zwykłe pole - najpierw sprawdź sesję (persist), potem dane
+ if ($this->persist && isset($_SESSION['form_persist'][$this->formId][$fieldName])) {
+ return $_SESSION['form_persist'][$this->formId][$fieldName];
+ }
+
+ return $this->data[$fieldName] ?? $field->value;
+ }
+
+ /**
+ * Sprawdza czy pole ma błąd walidacji
+ */
+ public function hasError(string $fieldName, $languageId = null): bool
+ {
+ if ($this->validationErrors === null) {
+ return false;
+ }
+
+ if ($languageId !== null) {
+ return isset($this->validationErrors[$fieldName][$languageId]);
+ }
+
+ return isset($this->validationErrors[$fieldName]);
+ }
+
+ /**
+ * Pobiera komunikat błędu dla pola
+ */
+ public function getError(string $fieldName, $languageId = null): ?string
+ {
+ if ($languageId !== null) {
+ return $this->validationErrors[$fieldName][$languageId] ?? null;
+ }
+ return $this->validationErrors[$fieldName] ?? null;
+ }
+
+ /**
+ * Czyści dane persist z sesji
+ */
+ public function clearPersist(): void
+ {
+ if (isset($_SESSION['form_persist'][$this->formId])) {
+ unset($_SESSION['form_persist'][$this->formId]);
+ }
+ }
+
+ /**
+ * Zapisuje dane do sesji (persist)
+ */
+ public function saveToPersist(array $data): void
+ {
+ if (!isset($_SESSION['form_persist'])) {
+ $_SESSION['form_persist'] = [];
+ }
+ $_SESSION['form_persist'][$this->formId] = $data;
+ }
+}
diff --git a/autoload/admin/ViewModels/Forms/FormField.php b/autoload/admin/ViewModels/Forms/FormField.php
new file mode 100644
index 0000000..faaf46d
--- /dev/null
+++ b/autoload/admin/ViewModels/Forms/FormField.php
@@ -0,0 +1,323 @@
+name = $name;
+ $this->type = $type;
+ $this->label = $label;
+ $this->value = $value;
+ $this->tabId = $tabId;
+ $this->required = $required;
+ $this->attributes = $attributes;
+ $this->options = $options;
+ $this->helpText = $helpText;
+ $this->placeholder = $placeholder;
+ $this->useFilemanager = $useFilemanager;
+ $this->filemanagerUrl = $filemanagerUrl;
+ $this->editorToolbar = $editorToolbar;
+ $this->editorHeight = $editorHeight;
+ $this->langFields = $langFields;
+ $this->langSectionParentTab = $langSectionParentTab;
+ $this->id = $attributes['id'] ?? $name;
+ }
+
+ // Factory methods dla różnych typów pól
+
+ public static function text(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::TEXT,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ $config['attributes'] ?? [],
+ [],
+ $config['help'] ?? null,
+ $config['placeholder'] ?? null
+ );
+ }
+
+ public static function number(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::NUMBER,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ $config['attributes'] ?? [],
+ [],
+ $config['help'] ?? null
+ );
+ }
+
+ public static function email(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::EMAIL,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ $config['attributes'] ?? []
+ );
+ }
+
+ public static function password(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::PASSWORD,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ $config['attributes'] ?? []
+ );
+ }
+
+ public static function date(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::DATE,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ array_merge(['class' => 'date'], $config['attributes'] ?? [])
+ );
+ }
+
+ public static function datetime(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::DATETIME,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ array_merge(['class' => 'datetime'], $config['attributes'] ?? [])
+ );
+ }
+
+ public static function switch(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::SWITCH,
+ $config['label'] ?? '',
+ $config['value'] ?? false,
+ $config['tab'] ?? 'default',
+ false,
+ $config['attributes'] ?? []
+ );
+ }
+
+ public static function select(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::SELECT,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ $config['attributes'] ?? [],
+ $config['options'] ?? []
+ );
+ }
+
+ public static function textarea(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::TEXTAREA,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ array_merge(['rows' => $config['rows'] ?? 4], $config['attributes'] ?? [])
+ );
+ }
+
+ public static function editor(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::EDITOR,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ $config['attributes'] ?? [],
+ [],
+ null,
+ null,
+ false,
+ null,
+ $config['toolbar'] ?? 'MyTool',
+ $config['height'] ?? 300
+ );
+ }
+
+ public static function image(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::IMAGE,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ $config['attributes'] ?? [],
+ [],
+ null,
+ null,
+ $config['filemanager'] ?? true,
+ $config['filemanager_url'] ?? null
+ );
+ }
+
+ public static function file(string $name, array $config = []): self
+ {
+ return new self(
+ $name,
+ FormFieldType::FILE,
+ $config['label'] ?? '',
+ $config['value'] ?? null,
+ $config['tab'] ?? 'default',
+ $config['required'] ?? false,
+ $config['attributes'] ?? [],
+ [],
+ null,
+ null,
+ $config['filemanager'] ?? true
+ );
+ }
+
+ public static function hidden(string $name, $value = null): self
+ {
+ return new self(
+ $name,
+ FormFieldType::HIDDEN,
+ '',
+ $value,
+ 'default'
+ );
+ }
+
+ /**
+ * Sekcja językowa - grupa pól powtarzana dla każdego języka
+ *
+ * @param string $name Nazwa sekcji (prefiks dla pól)
+ * @param string $parentTab Identyfikator zakładki nadrzędnej
+ * @param array $fields Pola w sekcji językowej (tablica FormField)
+ */
+ public static function langSection(string $name, string $parentTab, array $fields): self
+ {
+ return new self(
+ $name,
+ FormFieldType::LANG_SECTION,
+ '',
+ null,
+ $parentTab,
+ false,
+ [],
+ [],
+ null,
+ null,
+ false,
+ null,
+ 'MyTool',
+ 300,
+ $fields,
+ $parentTab
+ );
+ }
+
+ /**
+ * Zwraca nazwę pola z sufiksem dla konkretnego języka
+ */
+ public function getLocalizedName($languageId): string
+ {
+ return "{$this->name}[{$languageId}]";
+ }
+
+ /**
+ * Zwraca ID pola z sufiksem dla konkretnego języka
+ */
+ public function getLocalizedId($languageId): string
+ {
+ return "{$this->id}_{$languageId}";
+ }
+}
diff --git a/autoload/admin/ViewModels/Forms/FormFieldType.php b/autoload/admin/ViewModels/Forms/FormFieldType.php
new file mode 100644
index 0000000..66e68dc
--- /dev/null
+++ b/autoload/admin/ViewModels/Forms/FormFieldType.php
@@ -0,0 +1,23 @@
+id = $id;
+ $this->label = $label;
+ $this->icon = $icon;
+ $this->parentTabId = $parentTabId;
+ }
+}
diff --git a/libraries/.htaccess b/libraries/.htaccess
index eb2244f..6485d3f 100644
--- a/libraries/.htaccess
+++ b/libraries/.htaccess
@@ -1,6 +1,9 @@
# Wyłącz listowanie
Options -Indexes
+# Zezwol na wykonywanie PHP tylko dla legacy filemanagera
+SetEnvIf Request_URI "^/libraries/filemanager-9\.14\.[12]/.*\.(php|phtml|php[0-9]?|phar|pht)$" allow_legacy_filemanager_php=1
+
# Domyślnie blokujemy wszystko…
Require all denied
@@ -11,7 +14,10 @@ Require all denied
# Twardo blokuj cokolwiek, co mogłoby się wykonać
+ver. 0.249
+- FIX - banner edit: poprawiono zapisywanie danych jezykowych i synchronizacje CKEditor przed zapisem +- FIX - banner edit: naprawiono hash zakladek (usunieto `undefined` w URL) +- FIX - filemanager: przywrocono dzialanie popupa wyboru obrazka z banera +- UPDATE - komunikaty zapisu w nowym formularzu sa wyswietlane w stylu panelu (bez natywnego alertu JS) +- UPDATE - lista banerow: dodano kolumne miniatury oraz podglad duzego obrazka w popup po najechaniu +
ver. 0.248
- UPDATE - filtry w nowych tabelach dzialaja automatycznie na `onchange` - UPDATE - `components/table-list`: auto-submit formularza filtrow po zmianie pola (select, date, text)
ver. 0.247
diff --git a/updates/versions.php b/updates/versions.php index 56ebd7b..290433d 100644 --- a/updates/versions.php +++ b/updates/versions.php @@ -1,5 +1,5 @@