From 67705f1f56f8753aae975976d76c1fc645f2acdc Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Fri, 13 Feb 2026 21:17:21 +0100 Subject: [PATCH] ver 0.262 - pages module refactor and admin UX fixes --- PROJECT_STRUCTURE.md | 8 + REFACTORING_PLAN.md | 18 + TESTING.md | 14 + admin/ajax.php | 1 - admin/ajax/pages.php | 63 -- .../articles/article-edit-custom-script.php | 24 +- admin/templates/banners/banner-edit.php | 4 +- admin/templates/layouts/layout-edit.php | 17 +- admin/templates/pages/menu-edit.php | 43 +- admin/templates/pages/page-articles.php | 132 ++-- admin/templates/pages/page-edit.php | 401 +---------- admin/templates/pages/pages-browse-list.php | 240 +++---- admin/templates/pages/pages-list.php | 371 +++++----- .../templates/pages/subpages-browse-list.php | 133 ++-- admin/templates/pages/subpages-list.php | 129 ++-- admin/templates/settings/settings.php | 4 +- .../templates/shop-category/category-edit.php | 22 +- admin/templates/shop-product/product-edit.php | 84 +-- admin/templates/site/main-layout.php | 72 +- autoload/Domain/Pages/PagesRepository.php | 626 +++++++++++++++++ .../Controllers/ArticlesArchiveController.php | 12 +- .../admin/Controllers/ArticlesController.php | 30 +- .../admin/Controllers/BannerController.php | 22 +- .../Controllers/DictionariesController.php | 20 +- .../admin/Controllers/LayoutsController.php | 12 +- .../admin/Controllers/PagesController.php | 660 ++++++++++++++++++ .../Controllers/ProductArchiveController.php | 4 +- .../Controllers/ScontainersController.php | 20 +- .../admin/Controllers/SettingsController.php | 4 +- .../admin/Support/Forms/FormFieldRenderer.php | 19 + autoload/admin/class.Site.php | 63 +- autoload/admin/controls/class.Pages.php | 117 ---- autoload/admin/controls/class.ShopProduct.php | 6 +- autoload/admin/factory/class.Articles.php | 3 +- autoload/admin/factory/class.Layouts.php | 19 +- autoload/admin/factory/class.Pages.php | 407 ----------- autoload/admin/view/class.Pages.php | 37 - .../Unit/Domain/Pages/PagesRepositoryTest.php | 66 ++ .../Controllers/ArticlesControllerTest.php | 12 +- .../admin/Controllers/PagesControllerTest.php | 82 +++ updates/0.20/ver_0.262.zip | Bin 0 -> 76773 bytes updates/0.20/ver_0.262_files.txt | 4 + updates/changelog.php | 10 +- updates/versions.php | 3 +- 44 files changed, 2235 insertions(+), 1803 deletions(-) delete mode 100644 admin/ajax/pages.php create mode 100644 autoload/Domain/Pages/PagesRepository.php create mode 100644 autoload/admin/Controllers/PagesController.php delete mode 100644 autoload/admin/controls/class.Pages.php delete mode 100644 autoload/admin/factory/class.Pages.php delete mode 100644 autoload/admin/view/class.Pages.php create mode 100644 tests/Unit/Domain/Pages/PagesRepositoryTest.php create mode 100644 tests/Unit/admin/Controllers/PagesControllerTest.php create mode 100644 updates/0.20/ver_0.262.zip create mode 100644 updates/0.20/ver_0.262_files.txt diff --git a/PROJECT_STRUCTURE.md b/PROJECT_STRUCTURE.md index 4d4640f..7b07d2c 100644 --- a/PROJECT_STRUCTURE.md +++ b/PROJECT_STRUCTURE.md @@ -471,3 +471,11 @@ Aktualnie w suite są też testy modułów `Dictionaries`, `Articles` i `Users` - **UPDATE:** potwierdzenia usuwania zdjec i zalacznikow w edycji artykulu ujednolicone wizualnie z dialogiem usuwania z listy (jquery-confirm, `table-list-confirm-dialog`). - **FIX:** dodane ladowanie biblioteki `jquery-impromptu` w widoku edycji artykulu (kompatybilnosc dla `$.prompt`). - Testy: 178 tests, 443 assertions. + +## Aktualizacja 2026-02-13 (Pages) +- NOWE: `Domain\\Pages\\PagesRepository` (menu/page CRUD, drzewo stron, sortowanie, SEO, endpointy pomocnicze). +- NOWE: `admin\\Controllers\\PagesController` (DI) dla modulu `/admin/pages/*`. +- UPDATE: widoki `admin/templates/pages/*` dzialaja bez `admin\\factory\\Pages` i `admin\\view\\Pages`. +- UPDATE: routing DI (`admin\\Site`) ma fabryke kontrolera `Pages`. +- UPDATE: zalezne endpointy `cookie_*` i `generate_seo_link` przepiete na `/admin/pages/*`. +- CLEANUP: usuniete legacy pliki `autoload/admin/controls/class.Pages.php`, `autoload/admin/view/class.Pages.php`, `autoload/admin/factory/class.Pages.php`, `admin/ajax/pages.php`. diff --git a/REFACTORING_PLAN.md b/REFACTORING_PLAN.md index 031b0c2..2addebf 100644 --- a/REFACTORING_PLAN.md +++ b/REFACTORING_PLAN.md @@ -682,3 +682,21 @@ Gdy `persist = true`: - UPDATE: potwierdzenia usuwania zdjec i zalacznikow przepiete na `jquery-confirm` ze stylem `table-list-confirm-dialog` (jak na liscie artykulow). - FIX: dolaczona biblioteka `jquery-impromptu` w widoku edycji artykulu dla kompatybilnosci. - Testy po zmianie: **178 tests, 443 assertions**. + +## Plan 2026-02-13 - Refaktoryzacja `/admin/pages/` +- [x] Dodac `Domain\Pages\PagesRepository` (CRUD menu/stron, drzewo stron, sortowanie, SEO, operacje AJAX). +- [x] Dodac `admin\Controllers\PagesController` (DI) i przepiac routing `/admin/pages/*` na nowy kontroler. +- [x] Przebudowac widoki `admin/templates/pages/*` tak, aby nie korzystaly z `admin\factory\Pages` i `admin\view\Pages`. +- [x] Przepiac endpointy AJAX z `/admin/ajax.php?a=*` na `/admin/pages/*` (`save_pages_order`, `save_articles_order`, `generate_seo_link`, `cookie_*`). +- [x] Przeszukac i zaktualizowac zaleznosci w innych modulach (`articles`, `layouts`, helpery) powiazane z Pages. +- [x] Usunac legacy klasy/pliki Pages (`autoload/admin/controls/class.Pages.php`, `autoload/admin/view/class.Pages.php`, `autoload/admin/factory/class.Pages.php`, `admin/ajax/pages.php`) po odpieciu zaleznosci. +- [x] Dodac/uzupelnic testy (`PagesRepository`, `PagesController`) i uruchomic testy. + +## Aktualizacja 2026-02-13 - Pages (/admin/pages) +- NOWE: `Domain\Pages\PagesRepository` (CRUD menu/stron, drzewo stron, porzadkowanie, SEO link, URL preview, cookies tree-state). +- NOWE: `admin\Controllers\PagesController` (DI) dla akcji: `view_list/list`, `browse_list`, `pages_url_browser`, `menu_*`, `page_*`, `save_*_order`, `generate_seo_link`, `cookie_*`. +- UPDATE: `/admin/pages/*` dziala bez legacy `admin\controls\Pages` i `admin\view\Pages`. +- UPDATE: widoki `admin/templates/pages/*` przepiete na dane z kontrolera/repozytorium (bez `admin\factory\Pages`). +- UPDATE: endpointy zalezne od Pages w innych modulach (`articles`, `layouts`, `shop-category`, `shop-product`) przepiete z `admin/ajax.php?a=*` na `/admin/pages/*`. +- CLEANUP: usuniete `autoload/admin/controls/class.Pages.php`, `autoload/admin/view/class.Pages.php`, `autoload/admin/factory/class.Pages.php`, `admin/ajax/pages.php`; `admin/ajax.php` nie includuje juz `ajax/pages.php`. +- Testy: **OK (186 tests, 478 assertions)**. diff --git a/TESTING.md b/TESTING.md index c971739..7978a3b 100644 --- a/TESTING.md +++ b/TESTING.md @@ -267,3 +267,17 @@ OK (178 tests, 443 assertions) Nowe testy/rozszerzenia 2026-02-13: - `tests/Unit/Domain/Article/ArticleRepositoryTest.php` (nowe przypadki dla `saveFilesOrder`) + +## Aktualizacja suite (Pages migration) +Ostatnio zweryfikowano: 2026-02-13 + +```text +OK (186 tests, 478 assertions) +``` + +Nowe testy dodane 2026-02-13: +- `tests/Unit/Domain/Pages/PagesRepositoryTest.php` +- `tests/Unit/admin/Controllers/PagesControllerTest.php` + +Zaktualizowane testy 2026-02-13: +- `tests/Unit/admin/Controllers/ArticlesControllerTest.php` (konstruktor z `Domain\\Pages\\PagesRepository`) diff --git a/admin/ajax.php b/admin/ajax.php index eeef67c..601c666 100644 --- a/admin/ajax.php +++ b/admin/ajax.php @@ -37,7 +37,6 @@ $mdb = new medoo( [ 'charset' => 'utf8' ] ); -require_once 'ajax/pages.php'; require_once 'ajax/shop-category.php'; require_once 'ajax/users.php'; require_once 'ajax/shop.php'; diff --git a/admin/ajax/pages.php b/admin/ajax/pages.php deleted file mode 100644 index c0d92d0..0000000 --- a/admin/ajax/pages.php +++ /dev/null @@ -1,63 +0,0 @@ - 'error', 'msg' => 'Podczas zapisywania kolejności wyświetlania artykułów wystąpił błąd. Proszę spróbować ponownie.' ]; - - if ( \admin\factory\Pages::save_articles_order( \S::get( 'page_id' ), \S::get( 'articles' ) ) ) - $response = [ 'status' => 'ok' ]; - - echo json_encode( $response ); - exit; -} - -if ( $a == 'save_pages_order' ) -{ - $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania kolejności stron wystąpił błąd. Proszę spróbować ponownie.' ]; - - if ( \admin\factory\Pages::save_pages_order( \S::get( 'menu_id' ), \S::get( 'pages' ) ) ) - $response = [ 'status' => 'ok' ]; - - echo json_encode( $response ); - exit; -} - -if ( $a == 'generate_seo_link' ) -{ - $response = [ 'status' => 'error', 'msg' => 'Podczas generowania pola "seo link" wystąpił błąd. Proszę spróbować ponownie.' ]; - - if ( $seo_link = \admin\factory\Pages::generate_seo_link( \S::get( 'title' ), \S::get( 'page_id' ), \S::get( 'article_id' ), \S::get( 'category_id' ) ) ) - $response = [ 'status' => 'ok', 'seo_link' => $seo_link ]; - - echo json_encode( $response ); - exit; -} - -if ( $a == 'cookie_menus' ) -{ - $array = unserialize( $_COOKIE[ 'cookie_menus' ] ); - - if ( $array[ \S::get( 'menu_id' ) ] == 0 ) - $array[ \S::get( 'menu_id' ) ] = 1; - else - $array[ \S::get( 'menu_id' ) ] = 0; - - $array = serialize( $array ); - - setcookie( 'cookie_menus', $array, time() + 3600 * 24 * 365 ); -} - -if ( $a == 'cookie_pages' ) -{ - $array = unserialize( $_COOKIE[ 'cookie_pages' ] ); - - if ( $array[ \S::get( 'page_id' ) ] == 0 ) - $array[ \S::get( 'page_id' ) ] = 1; - else - $array[ \S::get( 'page_id' ) ] = 0; - - $array = serialize( $array ); - - setcookie( 'cookie_pages', $array, time() + 3600 * 24 * 365 ); -} diff --git a/admin/templates/articles/article-edit-custom-script.php b/admin/templates/articles/article-edit-custom-script.php index 51a0b71..964f801 100644 --- a/admin/templates/articles/article-edit-custom-script.php +++ b/admin/templates/articles/article-edit-custom-script.php @@ -225,7 +225,7 @@ if (!empty($_COOKIE['cookie_menus'])) { $.ajax({ type: 'POST', cache: false, - url: '/admin/articles/gallery_order_save/', + url: '/admin/articles/galleryOrderSave/', data: { article_id: article_id, order: order @@ -256,7 +256,7 @@ if (!empty($_COOKIE['cookie_menus'])) { $.ajax({ type: 'POST', cache: false, - url: '/admin/articles/files_order_save/', + url: '/admin/articles/filesOrderSave/', data: { article_id: article_id, order: order @@ -404,20 +404,18 @@ if (!empty($_COOKIE['cookie_menus'])) { $.ajax({ type: 'POST', cache: false, - url: '/admin/ajax.php', + url: '/admin/pages/cookieMenus/', data: { - a: 'cookie_menus', menu_id: menu_id } }); } else { - var page_id = $(this).parent('div').parent('li').attr('id'); + var page_id = $(this).parent('div').parent('li').attr('id').replace('list_', ''); $.ajax({ type: 'POST', cache: false, - url: '/admin/ajax.php', + url: '/admin/pages/cookiePages/', data: { - a: 'cookie_pages', page_id: page_id } }); @@ -438,7 +436,7 @@ if (!empty($_COOKIE['cookie_menus'])) { $.ajax({ type: 'POST', cache: false, - url: '/admin/articles/article_image_alt_change/', + url: '/admin/articles/imageAltChange/', data: { image_id: image_id, image_alt: image_alt @@ -463,7 +461,7 @@ if (!empty($_COOKIE['cookie_menus'])) { $.ajax({ type: 'POST', cache: false, - url: '/admin/articles/article_file_name_change/', + url: '/admin/articles/fileNameChange/', data: { file_id: file_id, file_name: file_name @@ -489,7 +487,7 @@ if (!empty($_COOKIE['cookie_menus'])) { $.ajax({ type: 'POST', cache: false, - url: '/admin/articles/article_file_delete/', + url: '/admin/articles/fileDelete/', data: { file_id: file_id }, @@ -519,7 +517,7 @@ if (!empty($_COOKIE['cookie_menus'])) { $.ajax({ type: 'POST', cache: false, - url: '/admin/articles/article_image_delete/', + url: '/admin/articles/imageDelete/', data: { image_id: image_id }, @@ -555,9 +553,8 @@ if (!empty($_COOKIE['cookie_menus'])) { $.ajax({ type: 'POST', cache: false, - url: '/admin/ajax.php', + url: '/admin/pages/generateSeoLink/', data: { - a: 'generate_seo_link', title: title, article_id: article_id }, @@ -581,3 +578,4 @@ if (!empty($_COOKIE['cookie_menus'])) { }); } + diff --git a/admin/templates/banners/banner-edit.php b/admin/templates/banners/banner-edit.php index 469abb8..21fc5a3 100644 --- a/admin/templates/banners/banner-edit.php +++ b/admin/templates/banners/banner-edit.php @@ -150,8 +150,8 @@ $grid -> fields = [ ]; $grid -> external_code = $out; $grid -> actions = [ - 'save' => [ 'url' => '/admin/banners/banner_save/', 'back_url' => '/admin/banners/view_list/' ], - 'cancel' => [ 'url' => '/admin/banners/view_list/' ] + 'save' => [ 'url' => '/admin/banners/save/', 'back_url' => '/admin/banners/list/' ], + 'cancel' => [ 'url' => '/admin/banners/list/' ] ]; $grid -> persist_edit = true; $grid -> id_param = 'id'; diff --git a/admin/templates/layouts/layout-edit.php b/admin/templates/layouts/layout-edit.php index 0c3f5ed..2de458c 100644 --- a/admin/templates/layouts/layout-edit.php +++ b/admin/templates/layouts/layout-edit.php @@ -92,9 +92,8 @@ { type: 'POST', cache: false, - url: '/admin/ajax.php', + url: '/admin/pages/cookieMenus/', data: { - a: 'cookie_menus', menu_id: menu_id } }); @@ -107,10 +106,9 @@ { type: 'POST', cache: false, - url: '/admin/ajax.php', + url: '/admin/pages/cookiePages/', data: { - a: 'cookie_pages', - page_id: page_id + page_id: page_id.replace( 'list_', '' ) } }); } @@ -159,14 +157,14 @@ ob_start(); );?> 'Szablon domyślny', + 'label' => 'Szablon domyślny', 'name' => 'status', 'checked' => $this -> layout['status'] == 1 ? true : false ) );?> 'Szablon domyślny (kategorie)', + 'label' => 'Szablon domyślny (kategorie)', 'name' => 'categories_default', 'checked' => $this -> layout['categories_default'] == 1 ? true : false ) @@ -246,8 +244,8 @@ $grid -> fields = [ ] ]; $grid -> actions = [ - 'save' => [ 'url' => '/admin/layouts/layout_save/', 'back_url' => '/admin/layouts/view_list/' ], - 'cancel' => [ 'url' => '/admin/layouts/view_list/' ] + 'save' => [ 'url' => '/admin/layouts/save/', 'back_url' => '/admin/layouts/list/' ], + 'cancel' => [ 'url' => '/admin/layouts/list/' ] ]; $grid -> external_code = $out; $grid -> persist_edit = true; @@ -255,3 +253,4 @@ $grid -> id_param = 'id'; echo $grid -> draw(); ?> + diff --git a/admin/templates/pages/menu-edit.php b/admin/templates/pages/menu-edit.php index dc74f28..5fe1611 100644 --- a/admin/templates/pages/menu-edit.php +++ b/admin/templates/pages/menu-edit.php @@ -1,42 +1 @@ - gdb_opt = $gdb; -$grid -> include_plugins = true; -$grid -> title = 'Zapisz menu'; -$grid -> fields = [ - [ - 'db' => 'id', - 'type' => 'hidden', - 'value' => $this -> menu['id'] - ], - [ - 'name' => 'Nazwa', - 'db' => 'name', - 'type' => 'text', - 'value' => $this -> menu['name'], - 'params' => [ 'class' => 'require' ] - ], - [ - 'name' => 'Aktywne', - 'db' => 'status', - 'type' => 'input_switch', - 'checked' => $this -> menu['status'] ? true : false, - 'replace' => [ 'array' => [ 0 => 'nie', 1 => 'tak' ] ] - ] - ]; -$grid -> actions = [ - 'save' => [ 'url' => '/admin/pages/menu_save/', 'back_url' => '/admin/pages/view_list/' ], - 'cancel' => [ 'url' => '/admin/pages/view_list/' ] - ]; -$grid -> persist_edit = true; -$grid -> id_param = 'id'; -echo $grid -> draw(); -?> - \ No newline at end of file + $this->form]); ?> diff --git a/admin/templates/pages/page-articles.php b/admin/templates/pages/page-articles.php index 33d6ba2..8e32fab 100644 --- a/admin/templates/pages/page-articles.php +++ b/admin/templates/pages/page-articles.php @@ -1,89 +1,87 @@ -page_id ?? 0); +$articles = is_array($this->articles ?? null) ? $this->articles : []; + ob_start(); ?> -
    - articles ) ) foreach ( $this -> articles as $article ) - { - ?> -
  1. -
    -
    2. - + + -
-"> +
+ + + + gdb_opt = $gdb; -$grid -> include_plugins = true; -$grid -> default_buttons = false; -$grid -> external_code = $out; -$grid -> title = 'Lista artykułów'; -$grid -> buttons = [ - [ - 'label' => 'Wstecz', - 'url' => '/admin/pages/view_list/', - 'icon' => 'fa-reply', - 'class' => 'btn-dark' - ] - ]; -echo $grid -> draw(); +$grid->gdb_opt = $gdb; +$grid->include_plugins = true; +$grid->default_buttons = false; +$grid->external_code = $out; +$grid->title = 'Lista artykułów'; +$grid->buttons = [ + [ + 'label' => 'Wstecz', + 'url' => '/admin/pages/list/', + 'icon' => 'fa-reply', + 'class' => 'btn-dark', + ], +]; +echo $grid->draw(); ?> \ No newline at end of file + + + diff --git a/admin/templates/pages/page-edit.php b/admin/templates/pages/page-edit.php index f2857c8..5fe1611 100644 --- a/admin/templates/pages/page-edit.php +++ b/admin/templates/pages/page-edit.php @@ -1,400 +1 @@ - - -
- -
-
-
-
-
    - languages ) ): foreach ( $this -> languages as $lg ):?> - -
  • - ';?> -
    • - - -
-
-
-
- languages ) ): foreach ( $this -> languages as $lg ):?> - -
- 'Nazwa strony', - 'name' => 'title[' . $lg['id'] . ']', - 'id' => 'title_' . $lg['id'], - 'value' => $this -> page[ 'languages' ][ $lg['id'] ]['title'], - ) - );?> -
- - -
-
-
-
-
- menus ) ): foreach ( $this -> menus as $menu ): - $menus[ $menu['id'] ] = $menu['name']; - endforeach; endif; - ?> - 'Menu', - 'name' => 'menu_id', - 'values' => $menus, - 'value' => $this -> page['id'] ? $this -> page['menu_id'] : $this -> menu_id - ) - );?> - 'Typ strony', - 'name' => 'page_type', - 'id' => 'page_type', - 'values' => \admin\factory\Pages::$_page_types, - 'value' => $this -> page['page_type'] - ) - );?> -
-
-
-
    - languages ) ): foreach ( $this -> languages as $lg ):?> - -
  • - ';?> -
    • - - -
-
-
-
- languages ) ): foreach ( $this -> languages as $lg ):?> - - - - -
-
-
-
-
-
- 'hidden', - 'name' => 'category_id', - 'id' => 'category_id', - 'value' => $this -> page['category_id'] - ) - ); - ?> - 'Kategoria', - 'name' => 'category_title', - 'id' => 'category_title', - 'value' => $this -> page['category_id'] ? \admin\factory\ShopCategory::category_title( $this -> page['category_id'] ) : '', - 'icon_class' => 'fa fa-link', - 'icon_js' => 'category_url_browser();' - ) - ); - ?> -
-
- 'Sortowanie artykułów', - 'name' => 'sort_type', - 'id' => 'sort_type', - 'values' => \admin\factory\Pages::$_sort_types, - 'value' => $this -> page['sort_type'] - ) - );?> - layouts ) ): foreach ( $this -> layouts as $layout ): - $layouts[ $layout['id'] ] = $layout['name']; - endforeach; endif; - ?> - 'Szablon', - 'name' => 'layout_id', - 'id' => 'layout_id', - 'values' => $layouts, - 'value' => $this -> page['layout_id'] - ) - );?> - 'Liczba artykułów na stronę', - 'name' => 'articles_limit', - 'id' => 'articles_limit', - 'value' => $this -> page['articles_limit'] ? $this -> page['articles_limit'] : 2 - ) - );?> - 'Pokaż tytuł', - 'name' => 'show_title', - 'checked' => $this -> page['show_title'] == 1 or !$this -> page['id'] ? true : false - ) - );?> - 'Aktywna', - 'name' => 'status', - 'checked' => $this -> page['status'] == 1 or !$this -> page['id'] ? true : false - ) - );?> - 'Strona startowa', - 'name' => 'start', - 'checked' => $this -> page['start'] == 1 ? true : false - ) - );?> -
-
-
-
-
    - languages ) ): foreach ( $this -> languages as $lg ):?> - -
  • - ';?> -
    • - - -
-
-
-
- languages ) ): foreach ( $this -> languages as $lg ):?> - -
- 'Link SEO', - 'name' => 'seo_link[' . $lg['id'] . ']', - 'id' => 'seo_link_' . $lg['id'], - 'value' => $this -> page['languages' ][ $lg['id'] ]['seo_link'], - 'icon_content' => 'generuj', - 'icon_js' => 'generate_seo_links( "' . $lg['id'] . '", $( "#title_' . $lg['id'] . '" ).val(), ' . (int)$this -> page['id'] . ' );' - ] );?> - 'Tytuł strony (h1)', - 'name' => 'page_title[' . $lg['id'] . ']', - 'id' => 'page_title_' . $lg['id'], - 'value' => $this -> page['languages' ][ $lg['id'] ]['page_title'] - ] );?> - 'Meta title', - 'name' => 'meta_title[' . $lg['id'] . ']', - 'id' => 'meta_title_' . $lg['id'], - 'value' => $this -> page['languages'][ $lg['id'] ]['meta_title'] - ] );?> - 'Meta description', - 'name' => 'meta_description[' . $lg['id'] . ']', - 'id' => 'meta_description_' . $lg['id'], - 'value' => $this -> page['languages'][ $lg['id'] ]['meta_description'] - ] );?> - 'Meta keywords', - 'name' => 'meta_keywords[' . $lg['id'] . ']', - 'id' => 'meta_keywords_' . $lg['id'], - 'value' => $this -> page['languages'][ $lg['id'] ]['meta_keywords'] - ] );?> - 'Blokuj indeksację', - 'name' => 'noindex[' . $lg['id'] . ']', - 'id' => 'noindex_' . $lg['id'], - 'values' => [ 0 => 'nie', 1 => 'tak' ], - 'value' => $this -> page['languages'][ $lg['id'] ]['noindex'] == 1 ? 1 : 0 - ] );?> - 'Rel canonical', - 'name' => 'canonical[' . $lg['id'] . ']', - 'id' => 'canonical_' . $lg['id'], - 'value' => $this -> page['languages'][ $lg['id'] ]['canonical'] - ] );?> -
- - -
-
-
-
-
-
- id = 'page-edit'; -$grid -> gdb_opt = $gdb; -$grid -> include_plugins = true; -$grid -> title = 'Edycja strony'; -$grid -> fields = [ - [ - 'db' => 'id', - 'type' => 'hidden', - 'value' => $this -> page['id'] - ], - [ - 'db' => 'parent_id', - 'type' => 'hidden', - 'value' => $this -> page['id'] ? $this -> page['parent_id'] : $this -> parent_id - ] - ]; -$grid -> actions = [ - 'save' => [ 'url' => '/admin/pages/page_save/', 'back_url' => '/admin/pages/view_list/' ], - 'cancel' => [ 'url' => '/admin/pages/view_list/' ] - ]; -$grid -> external_code = $out; -$grid -> persist_edit = true; -$grid -> id_param = 'id'; - -echo $grid -> draw(); -?> \ No newline at end of file + $this->form]); ?> diff --git a/admin/templates/pages/pages-browse-list.php b/admin/templates/pages/pages-browse-list.php index d7077fb..2cbe209 100644 --- a/admin/templates/pages/pages-browse-list.php +++ b/admin/templates/pages/pages-browse-list.php @@ -1,48 +1,57 @@ - menus ) ) foreach ( $this -> menus as $menu ) - { - ?> -
-
    - -
-
- menus ?? null) ? $this->menus : []; +$modal = !empty($this->modal); +$cookiePages = is_array($this->cookie_pages ?? null) ? $this->cookie_pages : []; +$cookieMenus = is_array($this->cookie_menus ?? null) ? $this->cookie_menus : []; +ob_start(); +foreach ($menus as $menu): + $menuId = (int)($menu['id'] ?? 0); + $menuName = (string)($menu['name'] ?? ''); + $menuStatus = (int)($menu['status'] ?? 0); +?> +
+
    + +
+
+ id = 'pages-list'; -$grid -> gdb_opt = $gdb; -$grid -> include_plugins = true; -$grid -> title = 'Lista stron'; -$grid -> default_buttons = false; -$grid -> external_code = $out; +$grid->id = 'pages-list'; +$grid->gdb_opt = $gdb; +$grid->include_plugins = true; +$grid->title = 'Lista stron'; +$grid->default_buttons = false; +$grid->external_code = $out; -echo $grid -> draw(); +echo $grid->draw(); ?> \ No newline at end of file + + diff --git a/admin/templates/pages/pages-list.php b/admin/templates/pages/pages-list.php index 0219d50..12549f8 100644 --- a/admin/templates/pages/pages-list.php +++ b/admin/templates/pages/pages-list.php @@ -1,208 +1,249 @@ - menus ) ) foreach ( $this -> menus as $menu ) - { - ?> -
-
    - -
-
- menus ?? null) ? $this->menus : []; +$cookiePages = is_array($this->cookie_pages ?? null) ? $this->cookie_pages : []; +$cookieMenus = is_array($this->cookie_menus ?? null) ? $this->cookie_menus : []; +ob_start(); +foreach ($menus as $menu): + $menuId = (int)($menu['id'] ?? 0); + $menuName = (string)($menu['name'] ?? ''); + $menuStatus = (int)($menu['status'] ?? 0); +?> +
+
    + +
+
+ id = 'pages-list'; -$grid -> gdb_opt = $gdb; -$grid -> include_plugins = true; -$grid -> title = 'Lista stron'; -$grid -> default_buttons = false; -$grid -> buttons = [ - [ - 'label' => 'Dodaj menu', - 'url' => '/admin/pages/menu_edit/', - 'icon' => 'fa-plus-circle', - 'class' => 'btn-success' - ] - ]; -$grid -> external_code = $out; +$grid->id = 'pages-list'; +$grid->gdb_opt = $gdb; +$grid->include_plugins = true; +$grid->title = 'Lista stron'; +$grid->default_buttons = false; +$grid->buttons = [ + [ + 'label' => 'Dodaj menu', + 'url' => '/admin/pages/menuEdit/', + 'icon' => 'fa-plus-circle', + 'class' => 'btn-success', + ], +]; +$grid->external_code = $out; -echo $grid -> draw(); +echo $grid->draw(); ?> + \ No newline at end of file + + + diff --git a/admin/templates/pages/subpages-browse-list.php b/admin/templates/pages/subpages-browse-list.php index 0602642..8c14390 100644 --- a/admin/templates/pages/subpages-browse-list.php +++ b/admin/templates/pages/subpages-browse-list.php @@ -1,77 +1,60 @@ - pages ) ):?> - -
    - pages as $page ):?> -
  1. -
    - - '; +pages ?? null) ? $this->pages : []; +$step = (int)($this->step ?? 1); - if ( $page['start'] ) - echo ''; - - echo $page['title']; - - if ( is_array( $page['languages'] ) ): - echo '
    '; - foreach ( $page['languages'] as $lg ) - echo ''; - echo '
    '; - endif; - - $default_language = \front\factory\Languages::default_language(); - if ( is_array( $page['languages'] ) ): - foreach ( $page['languages'] as $lg ): - echo '
    '; - echo ''; - echo ' '; - echo ''; - echo '
    '; - endforeach; - endif; - ?> -
    - step + 1 ); +if (empty($pages)) { + return; +} +?> +
      + + - - -
    - \ No newline at end of file +
  2. +
    + + + + + + +
    + + + + + + +
    + + + + +
    + + + +
    + +
    + + $page['subpages'] ?? [], + 'step' => $step + 1, + ]); ?> +
    3. + +
diff --git a/admin/templates/pages/subpages-list.php b/admin/templates/pages/subpages-list.php index 1c9c0e8..fd85e11 100644 --- a/admin/templates/pages/subpages-list.php +++ b/admin/templates/pages/subpages-list.php @@ -1,60 +1,75 @@ - pages ) ):?> -
    - pages as $page ):?> -
  1. -
    -
    +pages ?? null) ? $this->pages : []; +$step = (int)($this->step ?? 1); + +if (empty($pages)) { + return; +} +?> +
      + + +
    1. +
      +
      - ';?> - ';?> - - '; - foreach ( $page['languages'] as $lg ) - echo ''; - echo '
      '; - endif; - ?> + + + + + +
      + + + + + + +
      +
      - step < 3 ):?> -
      - - - - - - - - - - - - -
      - -
      - - - - - - - - - -
      - -
    - \admin\factory\Pages::menu_pages( $this -> menu_id, $page['id'] ), - 'menu_id' => $this -> menu_id, - 'parent_id' => $page['id'], - 'step' => $this -> step + 1 - ] ); - ?> -
    2. - -
- \ No newline at end of file + +
+ + + + + + + + + + + + +
+ +
+ + + + + + + + + +
+ +
+ $page['subpages'] ?? [], + 'step' => $step + 1, + ]); ?> + + + + diff --git a/admin/templates/settings/settings.php b/admin/templates/settings/settings.php index 1f2337a..37274e3 100644 --- a/admin/templates/settings/settings.php +++ b/admin/templates/settings/settings.php @@ -361,7 +361,7 @@ $grid -> gdb_opt = $gdb; $grid -> include_plugins = true; $grid -> title = 'Edycja ustawień'; $grid -> actions = [ - 'save' => [ 'url' => '/admin/settings/settings_save/', 'back_url' => '' ], + 'save' => [ 'url' => '/admin/settings/save/', 'back_url' => '' ], ]; $grid -> persist_edit = true; $grid -> external_code = $out; @@ -378,4 +378,4 @@ echo $grid -> draw(); html: true }); }); - \ No newline at end of file + diff --git a/admin/templates/shop-category/category-edit.php b/admin/templates/shop-category/category-edit.php index 0b0cb95..9ef6831 100644 --- a/admin/templates/shop-category/category-edit.php +++ b/admin/templates/shop-category/category-edit.php @@ -36,9 +36,8 @@ { type: 'POST', cache: false, - url: '/admin/ajax.php', + url: '/admin/pages/generateSeoLink/', data: { - a: 'generate_seo_link', title: title, category_id: category_id }, @@ -67,7 +66,7 @@ ob_start(); ?>
@@ -77,7 +76,7 @@ ob_start(); @@ -105,7 +104,7 @@ ob_start(); );?> 'Opis kategorii (rozwinięcie)', + 'label' => 'Opis kategorii (rozwiniÄ™cie)', 'name' => 'text_hidden[' . $lg['id'] . ']', 'id' => 'text_hidden_' . $lg['id'], 'value' => $this -> category['languages'][ $lg['id'] ]['text_hidden'], @@ -144,7 +143,7 @@ ob_start(); );?> 'Sortowanie produktów', + 'label' => 'Sortowanie produktĂłw', 'name' => 'sort_type', 'id' => 'sort_type', 'values' => \admin\factory\ShopCategory::$_sort_types, @@ -153,7 +152,7 @@ ob_start(); );?> 'Wyświetlić podkategorie', + 'label' => 'WyĹ›wietlić podkategorie', 'name' => 'view_subcategories', 'checked' => $this -> category['view_subcategories'] == 1 ? true : false ) @@ -164,7 +163,7 @@ ob_start(); @@ -184,7 +183,7 @@ ob_start(); );?> 'Tytuł kategorii (h1)', + 'label' => 'TytuĹ‚ kategorii (h1)', 'name' => 'category_title[' . $lg['id'] . ']', 'id' => 'category_title_' . $lg['id'], 'value' => $this -> category['languages' ][ $lg['id'] ]['category_title'] @@ -216,7 +215,7 @@ ob_start(); );?> 'Blokuj indeksację', + 'label' => 'Blokuj indeksacjÄ™', 'name' => 'noindex[' . $lg['id'] . ']', 'id' => 'noindex_' . $lg['id'], 'values' => array( @@ -263,4 +262,5 @@ $grid -> persist_edit = true; $grid -> id_param = 'id'; echo $grid -> draw(); -?> \ No newline at end of file +?> + diff --git a/admin/templates/shop-product/product-edit.php b/admin/templates/shop-product/product-edit.php index e4a216a..e5a07a3 100644 --- a/admin/templates/shop-product/product-edit.php +++ b/admin/templates/shop-product/product-edit.php @@ -21,15 +21,15 @@ ob_start();
  • Opis
    • -
  • Zakładki
    • +
  • ZakĹ‚adki
  • Cena
  • Magazyn
  • Ustawienia
  • SEO
    • -
  • Wyświetlanie
    • +
  • WyĹ›wietlanie
  • Galeria
    • -
  • Załączniki
    • -
  • Produkty powiązane
    • +
  • ZaĹ‚Ä…czniki
    • +
  • Produkty powiÄ…zane
  • XML
  • Dodatkowe pola
  • GPSR
    • @@ -40,7 +40,7 @@ ob_start();
      languages)) : foreach ($this->languages as $lg) : ?> -
    • '; ?>
      • +
    • '; ?>
      • languages)) foreach ($this->languages as $lg_tmp) { @@ -65,7 +65,7 @@ ob_start(); 'Wyświetlaj treść z wersji', + 'label' => 'WyĹ›wietlaj treść z wersji', 'name' => 'copy_from[' . $lg['id'] . ']', 'values' => $languages, 'value' => $this->product['languages'][$lg['id']]['copy_from'], @@ -86,7 +86,7 @@ ob_start(); 'Komunikat gdy stan magazynowy równy 0', + 'label' => 'Komunikat gdy stan magazynowy rĂłwny 0', 'name' => 'warehouse_message_zero[' . $lg['id'] . ']', 'id' => 'warehouse_message_zero_' . $lg['id'], 'value' => $this->product['languages'][$lg['id']]['warehouse_message_zero'], @@ -97,7 +97,7 @@ ob_start(); 'Komunikat gdy stan magazynowy większy niż 0', + 'label' => 'Komunikat gdy stan magazynowy wiÄ™kszy niĹĽ 0', 'name' => 'warehouse_message_nonzero[' . $lg['id'] . ']', 'id' => 'warehouse_message_nonzero_' . $lg['id'], 'value' => $this->product['languages'][$lg['id']]['warehouse_message_nonzero'], @@ -108,7 +108,7 @@ ob_start(); 'Krótki opis', + 'label' => 'KrĂłtki opis', 'name' => 'short_description[' . $lg['id'] . ']', 'id' => 'short_description_' . $lg['id'], 'value' => $this->product['languages'][$lg['id']]['short_description'], @@ -154,7 +154,7 @@ ob_start();
        languages)) : foreach ($this->languages as $lg) : ?> -
      • '; ?>
        • +
      • '; ?>
        • languages)) foreach ($this->languages as $lg_tmp) { @@ -179,7 +179,7 @@ ob_start(); 'Nazwa zakładki (1)', + 'label' => 'Nazwa zakĹ‚adki (1)', 'name' => 'tab_name_1[' . $lg['id'] . ']', 'id' => 'tab_name_1_' . $lg['id'], 'value' => $this->product['languages'][$lg['id']]['tab_name_1'], @@ -190,7 +190,7 @@ ob_start(); 'Zawartość zakładki (1)', + 'label' => 'Zawartość zakĹ‚adki (1)', 'name' => 'tab_description_1[' . $lg['id'] . ']', 'id' => 'tab_description_1_' . $lg['id'], 'value' => $this->product['languages'][$lg['id']]['tab_description_1'], @@ -201,7 +201,7 @@ ob_start(); 'Nazwa zakładki (2)', + 'label' => 'Nazwa zakĹ‚adki (2)', 'name' => 'tab_name_2[' . $lg['id'] . ']', 'id' => 'tab_name_2_' . $lg['id'], 'value' => $this->product['languages'][$lg['id']]['tab_name_2'], @@ -212,7 +212,7 @@ ob_start(); 'Zawartość zakładki (2)', + 'label' => 'Zawartość zakĹ‚adki (2)', 'name' => 'tab_description_2[' . $lg['id'] . ']', 'id' => 'tab_description_2_' . $lg['id'], 'value' => $this->product['languages'][$lg['id']]['tab_description_2'], @@ -305,7 +305,7 @@ ob_start(); ?> units as $unit) $units[$unit['id']] = $unit['text']; ?> @@ -317,7 +317,7 @@ ob_start(); 'value' => $this->product['product_unit_id'] ]); ?> 'Waga/pojemność', + 'label' => 'Waga/pojemność', 'name' => 'weight', 'id' => 'weight', 'class' => 'number-format', @@ -336,14 +336,14 @@ ob_start(); ?> 'Pozwól zamawiać gdy stan 0', + 'label' => 'PozwĂłl zamawiać gdy stan 0', 'name' => 'stock_0_buy', 'checked' => $this->product['stock_0_buy'] == 1 ? true : false ]); ?> 'Współczynnik WP', + 'label' => 'Współczynnik WP', 'name' => 'wp', 'id' => 'wp', 'class' => 'number-format', @@ -382,7 +382,7 @@ ob_start(); ?> 'Nowość do dnia', + 'label' => 'Nowość do dnia', 'name' => 'new_to_date', 'id' => 'new_to_date', 'class' => 'date', @@ -390,19 +390,19 @@ ob_start(); ]); ?> 'Wyświetlaj pole na dodatkową wiadomość', + 'label' => 'WyĹ›wietlaj pole na dodatkowÄ… wiadomość', 'name' => 'additional_message', 'checked' => $this->product['additional_message'] == 1 ? true : false ]); ?> 'Dodatkowa wiadomość jest wymagana', + 'label' => 'Dodatkowa wiadomość jest wymagana', 'name' => 'additional_message_required', 'checked' => $this->product['additional_message_required'] == 1 ? true : false ]); ?> 'Dodatkowa wiadomość (treść komunikatu)', + 'label' => 'Dodatkowa wiadomość (treść komunikatu)', 'name' => 'additional_message_text', 'id' => 'additional_message_text', 'value' => $this->product['additional_message_text'] @@ -414,7 +414,7 @@ ob_start();
          languages)) : foreach ($this->languages as $lg) : ?> -
        • '; ?>
          • +
        • '; ?>
          • layouts)) : foreach ($this->layouts as $layout) : $layouts[$layout['id']] = $layout['name']; endforeach; @@ -497,7 +497,7 @@ ob_start(); ]); ?>
          - +
            @@ -580,7 +580,7 @@ ob_start();
          - +
          +
          @@ -700,7 +700,7 @@ ob_start();
          - usuń + usuĹ„
          @@ -724,7 +724,7 @@ ob_start();
            languages ) ): foreach ( $this -> languages as $lg ):?> -
          • '; ?>
            • +
          • '; ?>
          @@ -733,7 +733,7 @@ ob_start();
          'Informacje o bezpieczeństwie ('.$lg['name'].')', + 'label' => 'Informacje o bezpieczeĹ„stwie ('.$lg['name'].')', 'name' => 'security_information[' . $lg['id'] . ']', 'id' => 'security_information_' . $lg['id'], 'value' => $this->product['languages'][$lg['id']]['security_information'] @@ -776,7 +776,7 @@ $grid->actions = [ ]; $grid->buttons = [ [ - 'label' => 'Podgląd', + 'label' => 'PodglÄ…d', 'id' => 'product-preview', 'url' => '#', 'icon' => 'fa-search', @@ -845,7 +845,7 @@ echo $grid->draw(); html += '
          '; html += '
          '; html += '
          '; - html += 'usuń'; + html += 'usuĹ„'; html += '
          '; html += '
          '; html += '
          '; @@ -1138,8 +1138,8 @@ echo $grid->draw(); $(this).blur(); var file_id = $(this).attr('file_id'); - $.prompt('Na pewno chcesz usunąć wybrany plik?', { - title: 'Potwierdź?', + $.prompt('Na pewno chcesz usunąć wybrany plik?', { + title: 'PotwierdĹş?', submit: function(e, v, m, f) { if (v === true) { $.ajax({ @@ -1178,8 +1178,8 @@ echo $grid->draw(); $(this).blur(); var image_id = $(this).attr('image-id'); - $.prompt('Na pewno chcesz usunąć wybrane zdjęcie?', { - title: 'Potwierdź?', + $.prompt('Na pewno chcesz usunąć wybrane zdjÄ™cie?', { + title: 'PotwierdĹş?', submit: function(e, v, m, f) { if (v === true) { $.ajax({ @@ -1316,9 +1316,8 @@ echo $grid->draw(); $.ajax({ type: 'POST', cache: false, - url: '/admin/ajax.php', + url: '/admin/pages/generateSeoLink/', data: { - a: 'generate_seo_link', title: title, article_id: article_id }, @@ -1346,3 +1345,4 @@ echo $grid->draw(); + diff --git a/admin/templates/site/main-layout.php b/admin/templates/site/main-layout.php index 0d5baf7..167e055 100644 --- a/admin/templates/site/main-layout.php +++ b/admin/templates/site/main-layout.php @@ -6,7 +6,7 @@ - + @@ -54,7 +54,7 @@ Sklep
          -
          Zawartość
          +
          Zawartość
          Newsletter @@ -94,28 +94,28 @@
        • Ustawienia
        - Pozostałe + Pozostałe
        Konfiguracja
        - Słowniki + Słowniki
- Podgląd + Podgląd
@@ -167,7 +167,7 @@
- +
@@ -179,7 +179,7 @@ ?> avatar
- Wyloguj się + Wyloguj się
@@ -191,7 +191,7 @@
- +
@@ -228,41 +228,41 @@ } }); - // Obsługa przycisku czyszczenia cache + // Cache clear button handler $('#clear-cache-btn').on('click', function(e) { e.preventDefault(); var $btn = $(this); var originalText = $btn.text(); - // Wyświetl komunikat o czyszczeniu - $btn.prop('disabled', true).html(' Czyszczę cache...'); + // Show pending state + $btn.prop('disabled', true).html(' Czyszcz\u0119 cache...'); - // Wyślij żądanie AJAX + // Send AJAX request $.ajax({ - url: '/admin/settings/clear_cache_ajax/', + url: '/admin/settings/clearCacheAjax/', type: 'POST', dataType: 'json', success: function(response) { if (response.status === 'success') { - // Zmień komunikat na "wyczyszczono" + // Show success state $btn.html(' Cache wyczyszczony!').removeClass('btn-danger').addClass('btn-success'); - // Po 2 sekundach przywróć pierwotny stan + // Restore original state after delay setTimeout(function() { $btn.prop('disabled', false).html(originalText).removeClass('btn-success').addClass('btn-danger'); }, 2000); } else { - // Obsługa błędu - $btn.html(' Błąd!').removeClass('btn-danger').addClass('btn-warning'); + // Request failed on server + $btn.html(' B\u0142\u0105d!').removeClass('btn-danger').addClass('btn-warning'); setTimeout(function() { $btn.prop('disabled', false).html(originalText).removeClass('btn-warning').addClass('btn-danger'); }, 2000); } }, error: function() { - // Obsługa błędu połączenia - $btn.html(' Błąd połączenia!').removeClass('btn-danger').addClass('btn-warning'); + // Network or transport error + $btn.html(' B\u0142\u0105d po\u0142\u0105czenia!').removeClass('btn-danger').addClass('btn-warning'); setTimeout(function() { $btn.prop('disabled', false).html(originalText).removeClass('btn-warning').addClass('btn-danger'); }, 2000); diff --git a/autoload/Domain/Pages/PagesRepository.php b/autoload/Domain/Pages/PagesRepository.php new file mode 100644 index 0000000..7c9a941 --- /dev/null +++ b/autoload/Domain/Pages/PagesRepository.php @@ -0,0 +1,626 @@ + + */ + private const PAGE_TYPES = [ + 0 => 'pelne artykuly', + 1 => 'wprowadzenia', + 2 => 'miniaturki', + 3 => 'link', + 4 => 'kontakt', + 5 => 'kategoria sklepu', + ]; + + /** + * @var array + */ + private const SORT_TYPES = [ + 0 => 'data dodania - najstarsze na poczatku', + 1 => 'data dodania - najnowsze na poczatku', + 2 => 'data modyfikacji - rosnaco', + 3 => 'data modyfikacji - malejaco', + 4 => 'reczne', + 5 => 'alfabetycznie - A - Z', + 6 => 'alfabetycznie - Z - A', + ]; + + private $db; + + public function __construct($db) + { + $this->db = $db; + } + + /** + * @return array + */ + public function pageTypes(): array + { + return self::PAGE_TYPES; + } + + /** + * @return array + */ + public function sortTypes(): array + { + return self::SORT_TYPES; + } + + /** + * @return array> + */ + public function menusList(): array + { + $rows = $this->db->select('pp_menus', '*', ['ORDER' => ['id' => 'ASC']]); + return is_array($rows) ? $rows : []; + } + + /** + * @return array> + */ + public function menusWithPages(): array + { + $menus = $this->menusList(); + foreach ($menus as $index => $menu) { + $menuId = (int)($menu['id'] ?? 0); + $menus[$index]['pages'] = $this->menuPages($menuId); + } + + return $menus; + } + + /** + * @return array> + */ + public function menuPages(int $menuId, ?int $parentId = null): array + { + if ($menuId <= 0) { + return []; + } + + $rows = $this->db->select('pp_pages', ['id', 'menu_id', 'status', 'parent_id', 'start'], [ + 'AND' => [ + 'menu_id' => $menuId, + 'parent_id' => $parentId, + ], + 'ORDER' => ['o' => 'ASC'], + ]); + + if (!is_array($rows)) { + return []; + } + + $pages = []; + foreach ($rows as $row) { + $pageId = (int)($row['id'] ?? 0); + if ($pageId <= 0) { + continue; + } + + $row['title'] = $this->pageTitle($pageId); + $row['languages'] = $this->pageLanguages($pageId); + $row['subpages'] = $this->menuPages($menuId, $pageId); + $pages[] = $row; + } + + return $pages; + } + + public function menuDelete(int $menuId): bool + { + if ($menuId <= 0) { + return false; + } + + if ((int)$this->db->count('pp_pages', ['menu_id' => $menuId]) > 0) { + return false; + } + + return (bool)$this->db->delete('pp_menus', ['id' => $menuId]); + } + + public function pageDelete(int $pageId): bool + { + if ($pageId <= 0) { + return false; + } + + if ((int)$this->db->count('pp_pages', ['parent_id' => $pageId]) > 0) { + return false; + } + + return (bool)$this->db->delete('pp_pages', ['id' => $pageId]); + } + + /** + * @return array + */ + public function menuDetails(int $menuId): array + { + if ($menuId <= 0) { + return [ + 'id' => 0, + 'name' => '', + 'status' => 1, + ]; + } + + $menu = $this->db->get('pp_menus', '*', ['id' => $menuId]); + if (!is_array($menu)) { + return [ + 'id' => 0, + 'name' => '', + 'status' => 1, + ]; + } + + return $menu; + } + + public function menuSave(int $menuId, string $name, $status): bool + { + $statusValue = $this->toSwitchValue($status); + + if ($menuId <= 0) { + $result = $this->db->insert('pp_menus', [ + 'name' => $name, + 'status' => $statusValue, + ]); + + return (bool)$result; + } + + $this->db->update('pp_menus', [ + 'name' => $name, + 'status' => $statusValue, + ], [ + 'id' => $menuId, + ]); + + return true; + } + + /** + * @return array + */ + public function pageDetails(int $pageId): array + { + if ($pageId <= 0) { + return $this->defaultPage(); + } + + $page = $this->db->get('pp_pages', '*', ['id' => $pageId]); + if (!is_array($page)) { + return $this->defaultPage(); + } + + $translations = $this->db->select('pp_pages_langs', '*', ['page_id' => $pageId]); + if (is_array($translations)) { + foreach ($translations as $row) { + $langId = (string)($row['lang_id'] ?? ''); + if ($langId !== '') { + $page['languages'][$langId] = $row; + } + } + } + + $page['layout_id'] = (int)$this->db->get('pp_layouts_pages', 'layout_id', ['page_id' => $pageId]); + + return $page; + } + + /** + * @return array> + */ + public function pageArticles(int $pageId): array + { + if ($pageId <= 0) { + return []; + } + + $sql = ' + SELECT + ap.article_id, + ap.o, + a.status, + ( + SELECT title + FROM pp_articles_langs AS pal + JOIN pp_langs AS pl ON pal.lang_id = pl.id + WHERE pal.article_id = ap.article_id + AND pal.title != "" + ORDER BY pl.o ASC + LIMIT 1 + ) AS title + FROM pp_articles_pages AS ap + JOIN pp_articles AS a ON a.id = ap.article_id + WHERE ap.page_id = :page_id + AND a.status != -1 + ORDER BY ap.o ASC + '; + + $stmt = $this->db->query($sql, [':page_id' => $pageId]); + $rows = $stmt ? $stmt->fetchAll() : []; + + return is_array($rows) ? $rows : []; + } + + public function saveArticlesOrder(int $pageId, $articles): bool + { + if ($pageId <= 0) { + return false; + } + + if (!is_array($articles)) { + return true; + } + + $this->db->update('pp_articles_pages', ['o' => 0], ['page_id' => $pageId]); + + $position = 0; + foreach ($articles as $item) { + $articleId = (int)($item['item_id'] ?? 0); + if ($articleId <= 0) { + continue; + } + + $position++; + $this->db->update('pp_articles_pages', ['o' => $position], [ + 'AND' => [ + 'page_id' => $pageId, + 'article_id' => $articleId, + ], + ]); + } + + return true; + } + + public function savePagesOrder(int $menuId, $pages): bool + { + if ($menuId <= 0) { + return false; + } + + if (!is_array($pages)) { + return true; + } + + $this->db->update('pp_pages', ['o' => 0], ['menu_id' => $menuId]); + + $position = 0; + foreach ($pages as $item) { + $itemId = (int)($item['item_id'] ?? 0); + $depth = (int)($item['depth'] ?? 0); + if ($itemId <= 0 || $depth <= 1) { + continue; + } + + $parentId = (int)($item['parent_id'] ?? 0); + if ($depth === 2) { + $parentId = null; + } + + $position++; + $this->db->update('pp_pages', [ + 'o' => $position, + 'parent_id' => $parentId, + ], [ + 'id' => $itemId, + ]); + } + + \S::delete_dir('../temp/'); + + return true; + } + + public function pageSave(array $data): ?int + { + $pageId = (int)($data['id'] ?? 0); + $menuId = (int)($data['menu_id'] ?? 0); + $parentId = $this->normalizeNullableInt($data['parent_id'] ?? null); + $pageType = (int)($data['page_type'] ?? 0); + $sortType = (int)($data['sort_type'] ?? 0); + $layoutId = (int)($data['layout_id'] ?? 0); + $articlesLimit = (int)($data['articles_limit'] ?? 0); + $showTitle = $this->toSwitchValue($data['show_title'] ?? 0); + $status = $this->toSwitchValue($data['status'] ?? 0); + $start = $this->toSwitchValue($data['start'] ?? 0); + $categoryId = $this->normalizeNullableInt($data['category_id'] ?? null); + if ($pageType !== 5) { + $categoryId = null; + } + + if ($pageId <= 0) { + $order = $this->maxPageOrder() + 1; + $result = $this->db->insert('pp_pages', [ + 'menu_id' => $menuId, + 'page_type' => $pageType, + 'sort_type' => $sortType, + 'articles_limit' => $articlesLimit, + 'show_title' => $showTitle, + 'status' => $status, + 'o' => $order, + 'parent_id' => $parentId, + 'start' => $start, + 'category_id' => $categoryId, + ]); + + if (!$result) { + return null; + } + + $pageId = (int)$this->db->id(); + if ($pageId <= 0) { + return null; + } + } else { + $this->db->update('pp_pages', [ + 'menu_id' => $menuId, + 'page_type' => $pageType, + 'sort_type' => $sortType, + 'articles_limit' => $articlesLimit, + 'show_title' => $showTitle, + 'status' => $status, + 'parent_id' => $parentId, + 'start' => $start, + 'category_id' => $categoryId, + ], [ + 'id' => $pageId, + ]); + } + + if ($start === 1) { + $this->db->update('pp_pages', ['start' => 0], ['id[!]' => $pageId]); + $this->db->update('pp_pages', ['start' => 1], ['id' => $pageId]); + } + + $this->db->delete('pp_layouts_pages', ['page_id' => $pageId]); + if ($layoutId > 0) { + $this->db->insert('pp_layouts_pages', [ + 'layout_id' => $layoutId, + 'page_id' => $pageId, + ]); + } + + $this->saveTranslations($pageId, $pageType, $data); + $this->updateSubpagesMenuId($pageId, $menuId); + + \S::htacces(); + \S::delete_dir('../temp/'); + + return $pageId; + } + + public function generateSeoLink(string $title, int $pageId = 0, int $articleId = 0, int $categoryId = 0): string + { + $base = trim((string)\S::seo($title)); + if ($base === '') { + return ''; + } + + $candidate = $base; + $suffix = 0; + + while ($this->isSeoLinkUsed('pp_pages_langs', 'page_id', $candidate, $pageId) + || $this->isSeoLinkUsed('pp_articles_langs', 'article_id', $candidate, $articleId) + || $this->isSeoLinkUsed('pp_shop_categories_langs', 'category_id', $candidate, $categoryId)) { + $suffix++; + $candidate = $base . '-' . $suffix; + } + + return $candidate; + } + + public function pageUrlPreview(int $pageId, string $langId, string $title, string $seoLink, string $defaultLanguageId): string + { + $url = trim($seoLink) !== '' + ? '/' . ltrim($seoLink, '/') + : '/s-' . $pageId . '-' . \S::seo($title); + + if ($langId !== '' && $langId !== $defaultLanguageId && $url !== '#') { + $url = '/' . $langId . $url; + } + + return $url; + } + + public function toggleCookieValue(string $cookieName, int $itemId): void + { + if ($cookieName === '' || $itemId <= 0) { + return; + } + + $state = []; + if (!empty($_COOKIE[$cookieName])) { + $decoded = @unserialize((string)$_COOKIE[$cookieName], ['allowed_classes' => false]); + if (is_array($decoded)) { + $state = $decoded; + } + } + + $state[$itemId] = empty($state[$itemId]) ? 1 : 0; + setcookie($cookieName, serialize($state), time() + 3600 * 24 * 365); + } + + public function pageTitle(int $pageId): string + { + if ($pageId <= 0) { + return ''; + } + + $rows = $this->db->select('pp_pages_langs', [ + '[><]pp_langs' => ['lang_id' => 'id'], + ], 'title', [ + 'AND' => [ + 'page_id' => $pageId, + 'title[!]' => '', + ], + 'ORDER' => ['o' => 'ASC'], + 'LIMIT' => 1, + ]); + + if (!is_array($rows) || !isset($rows[0])) { + return ''; + } + + return (string)$rows[0]; + } + + /** + * @return array> + */ + public function pageLanguages(int $pageId): array + { + if ($pageId <= 0) { + return []; + } + + $rows = $this->db->select('pp_pages_langs', '*', [ + 'AND' => [ + 'page_id' => $pageId, + 'title[!]' => null, + ], + ]); + + return is_array($rows) ? $rows : []; + } + + /** + * @return array + */ + private function defaultPage(): array + { + return [ + 'id' => 0, + 'menu_id' => 0, + 'page_type' => 0, + 'sort_type' => 0, + 'articles_limit' => 2, + 'show_title' => 1, + 'status' => 1, + 'start' => 0, + 'parent_id' => null, + 'category_id' => null, + 'layout_id' => 0, + 'languages' => [], + ]; + } + + private function saveTranslations(int $pageId, int $pageType, array $data): void + { + $titles = is_array($data['title'] ?? null) ? $data['title'] : []; + $seoLinks = is_array($data['seo_link'] ?? null) ? $data['seo_link'] : []; + $metaTitles = is_array($data['meta_title'] ?? null) ? $data['meta_title'] : []; + $metaDescriptions = is_array($data['meta_description'] ?? null) ? $data['meta_description'] : []; + $metaKeywords = is_array($data['meta_keywords'] ?? null) ? $data['meta_keywords'] : []; + $noindexValues = is_array($data['noindex'] ?? null) ? $data['noindex'] : []; + $pageTitles = is_array($data['page_title'] ?? null) ? $data['page_title'] : []; + $links = is_array($data['link'] ?? null) ? $data['link'] : []; + $canonicals = is_array($data['canonical'] ?? null) ? $data['canonical'] : []; + + foreach ($titles as $langId => $title) { + $langId = (string)$langId; + if ($langId === '') { + continue; + } + + $row = [ + 'lang_id' => $langId, + 'title' => $this->nullIfEmpty($title), + 'meta_description' => $this->nullIfEmpty($metaDescriptions[$langId] ?? null), + 'meta_keywords' => $this->nullIfEmpty($metaKeywords[$langId] ?? null), + 'meta_title' => $this->nullIfEmpty($metaTitles[$langId] ?? null), + 'seo_link' => $this->nullIfEmpty(\S::seo((string)($seoLinks[$langId] ?? ''))), + 'noindex' => (int)($noindexValues[$langId] ?? 0), + 'page_title' => $this->nullIfEmpty($pageTitles[$langId] ?? null), + 'link' => $pageType === 3 ? $this->nullIfEmpty($links[$langId] ?? null) : null, + 'canonical' => $this->nullIfEmpty($canonicals[$langId] ?? null), + ]; + + $translationId = (int)$this->db->get('pp_pages_langs', 'id', [ + 'AND' => [ + 'page_id' => $pageId, + 'lang_id' => $langId, + ], + ]); + + if ($translationId > 0) { + $this->db->update('pp_pages_langs', $row, ['id' => $translationId]); + } else { + $row['page_id'] = $pageId; + $this->db->insert('pp_pages_langs', $row); + } + } + } + + private function updateSubpagesMenuId(int $parentId, int $menuId): void + { + if ($parentId <= 0 || $menuId <= 0) { + return; + } + + $this->db->update('pp_pages', ['menu_id' => $menuId], ['parent_id' => $parentId]); + + $children = $this->db->select('pp_pages', ['id'], ['parent_id' => $parentId]); + if (!is_array($children)) { + return; + } + + foreach ($children as $row) { + $childId = (int)($row['id'] ?? 0); + if ($childId > 0) { + $this->updateSubpagesMenuId($childId, $menuId); + } + } + } + + private function isSeoLinkUsed(string $table, string $idColumn, string $seoLink, int $exceptId): bool + { + $where = [ + 'seo_link' => $seoLink, + ]; + + if ($exceptId > 0) { + $where[$idColumn . '[!]'] = $exceptId; + } + + return (int)$this->db->count($table, ['AND' => $where]) > 0; + } + + private function maxPageOrder(): int + { + $max = $this->db->max('pp_pages', 'o'); + return $max ? (int)$max : 0; + } + + private function toSwitchValue($value): int + { + if ($value === 'on' || $value === '1' || $value === 1 || $value === true) { + return 1; + } + + return 0; + } + + private function normalizeNullableInt($value): ?int + { + if ($value === null || $value === '' || (int)$value === 0) { + return null; + } + + return (int)$value; + } + + private function nullIfEmpty($value): ?string + { + $value = trim((string)$value); + return $value === '' ? null : $value; + } +} diff --git a/autoload/admin/Controllers/ArticlesArchiveController.php b/autoload/admin/Controllers/ArticlesArchiveController.php index cfd0a12..9205d00 100644 --- a/autoload/admin/Controllers/ArticlesArchiveController.php +++ b/autoload/admin/Controllers/ArticlesArchiveController.php @@ -48,13 +48,13 @@ class ArticlesArchiveController $rows[] = [ 'lp' => $lp++ . '.', - 'title' => '' . htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '', + 'title' => '' . htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '', 'date_add' => !empty($item['date_add']) ? date('Y-m-d H:i', strtotime((string)$item['date_add'])) : '-', 'date_modify' => !empty($item['date_modify']) ? date('Y-m-d H:i', strtotime((string)$item['date_modify'])) : '-', '_actions' => [ [ 'label' => 'Przywroc', - 'url' => '/admin/articles_archive/article_restore/id=' . $id, + 'url' => '/admin/articles_archive/restore/id=' . $id, 'class' => 'btn btn-xs btn-success', 'confirm' => 'Na pewno chcesz przywrocic wybrany artykul?', 'confirm_ok' => 'Przywroc', @@ -62,7 +62,7 @@ class ArticlesArchiveController ], [ 'label' => 'Usun', - 'url' => '/admin/articles_archive/article_delete/id=' . $id, + 'url' => '/admin/articles_archive/delete/id=' . $id, 'class' => 'btn btn-xs btn-danger', 'confirm' => 'Na pewno chcesz trwale usunac wybrany artykul?', 'confirm_ok' => 'Usun', @@ -101,7 +101,7 @@ class ArticlesArchiveController ]), $listRequest['perPageOptions'], $sortableColumns, - '/admin/articles_archive/view_list/', + '/admin/articles_archive/list/', 'Brak danych w tabeli.' ); @@ -121,7 +121,7 @@ class ArticlesArchiveController \S::alert('Artykul zostal przywrocony.'); } - header('Location: /admin/articles_archive/view_list/'); + header('Location: /admin/articles_archive/list/'); exit; } @@ -136,7 +136,7 @@ class ArticlesArchiveController \S::alert('Artykul zostal trwale usuniety.'); } - header('Location: /admin/articles_archive/view_list/'); + header('Location: /admin/articles_archive/list/'); exit; } diff --git a/autoload/admin/Controllers/ArticlesController.php b/autoload/admin/Controllers/ArticlesController.php index d8ecf6e..b9bccf2 100644 --- a/autoload/admin/Controllers/ArticlesController.php +++ b/autoload/admin/Controllers/ArticlesController.php @@ -4,6 +4,7 @@ namespace admin\Controllers; use Domain\Article\ArticleRepository; use Domain\Languages\LanguagesRepository; use Domain\Layouts\LayoutsRepository; +use Domain\Pages\PagesRepository; use admin\ViewModels\Forms\FormAction; use admin\ViewModels\Forms\FormEditViewModel; use admin\ViewModels\Forms\FormField; @@ -14,16 +15,19 @@ class ArticlesController private ArticleRepository $repository; private LanguagesRepository $languagesRepository; private LayoutsRepository $layoutsRepository; + private PagesRepository $pagesRepository; public function __construct( ArticleRepository $repository, LanguagesRepository $languagesRepository, - LayoutsRepository $layoutsRepository + LayoutsRepository $layoutsRepository, + PagesRepository $pagesRepository ) { $this->repository = $repository; $this->languagesRepository = $languagesRepository; $this->layoutsRepository = $layoutsRepository; + $this->pagesRepository = $pagesRepository; } /** @@ -83,7 +87,7 @@ class ArticlesController $rows[] = [ 'lp' => $lp++ . '.', - 'title' => '' . htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '' + 'title' => '' . htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '' . '' . htmlspecialchars($pages, ENT_QUOTES, 'UTF-8') . '', 'status' => ((int)$item['status'] === 1) ? 'tak' : 'nie', 'date_add' => !empty($item['date_add']) ? date('Y-m-d H:i', strtotime((string)$item['date_add'])) : '-', @@ -92,12 +96,12 @@ class ArticlesController '_actions' => [ [ 'label' => 'Edytuj', - 'url' => '/admin/articles/article_edit/id=' . $id, + 'url' => '/admin/articles/edit/id=' . $id, 'class' => 'btn btn-xs btn-primary', ], [ 'label' => 'Usun', - 'url' => '/admin/articles/article_delete/id=' . $id, + 'url' => '/admin/articles/delete/id=' . $id, 'class' => 'btn btn-xs btn-danger', 'confirm' => 'Na pewno chcesz usunac wybrany element?', ], @@ -136,9 +140,9 @@ class ArticlesController ]), $listRequest['perPageOptions'], $sortableColumns, - '/admin/articles/view_list/', + '/admin/articles/list/', 'Brak danych w tabeli.', - '/admin/articles/article_edit/', + '/admin/articles/edit/', 'Dodaj artykul' ); @@ -259,7 +263,7 @@ class ArticlesController \S::alert('Artykul zostal przeniesiony do archiwum.'); } - header('Location: /admin/articles/view_list/'); + header('Location: /admin/articles/list/'); exit; } @@ -280,7 +284,7 @@ class ArticlesController $article = $this->repository->find((int)\S::get('id')) ?: ['id' => 0, 'languages' => [], 'images' => [], 'files' => [], 'pages' => []]; $languages = $this->languagesRepository->languagesList(); - $menus = \admin\factory\Pages::menus_list(); + $menus = $this->pagesRepository->menusList(); $layouts = $this->layoutsRepository->listAll(); $viewModel = $this->buildFormViewModel($article, $languages, $menus, $layouts); @@ -400,8 +404,8 @@ class ArticlesController ]; $actions = [ - FormAction::save('/admin/articles/article_save/' . ($articleId > 0 ? 'id=' . $articleId : ''), '/admin/articles/view_list/'), - FormAction::cancel('/admin/articles/view_list/'), + FormAction::save('/admin/articles/save/' . ($articleId > 0 ? 'id=' . $articleId : ''), '/admin/articles/list/'), + FormAction::cancel('/admin/articles/list/'), ]; return new FormEditViewModel( @@ -412,8 +416,8 @@ class ArticlesController $tabs, $actions, 'POST', - '/admin/articles/article_save/' . ($articleId > 0 ? 'id=' . $articleId : ''), - '/admin/articles/view_list/', + '/admin/articles/save/' . ($articleId > 0 ? 'id=' . $articleId : ''), + '/admin/articles/list/', true, ['id' => $articleId], $languages @@ -430,7 +434,7 @@ class ArticlesController $menuId = (int)($menu['id'] ?? 0); $menuName = $this->escapeHtml((string)($menu['name'] ?? '')); $menuStatus = (int)($menu['status'] ?? 0); - $menuPages = \admin\factory\Pages::menu_pages($menuId); + $menuPages = $this->pagesRepository->menuPages($menuId); $html .= '
'; $html .= '
    '; diff --git a/autoload/admin/Controllers/BannerController.php b/autoload/admin/Controllers/BannerController.php index 846a068..8828e58 100644 --- a/autoload/admin/Controllers/BannerController.php +++ b/autoload/admin/Controllers/BannerController.php @@ -92,7 +92,7 @@ class BannerController $rows[] = [ 'lp' => $lp++ . '.', 'thumbnail' => $thumbnail, - 'name' => '' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '', + 'name' => '' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '', 'status' => $isActive ? 'tak' : 'nie', 'home_page' => $homePage === 1 ? 'tak' : 'nie', 'slider' => $homePage === 1 ? 'nie' : 'tak', @@ -101,12 +101,12 @@ class BannerController '_actions' => [ [ 'label' => 'Edytuj', - 'url' => '/admin/banners/banner_edit/id=' . $id, + 'url' => '/admin/banners/edit/id=' . $id, 'class' => 'btn btn-xs btn-primary', ], [ 'label' => 'Usun', - 'url' => '/admin/banners/banner_delete/id=' . $id, + 'url' => '/admin/banners/delete/id=' . $id, 'class' => 'btn btn-xs btn-danger', 'confirm' => 'Na pewno chcesz usunac wybrany element?', ], @@ -147,9 +147,9 @@ class BannerController ]), $listRequest['perPageOptions'], $sortableColumns, - '/admin/banners/view_list/', + '/admin/banners/list/', 'Brak danych w tabeli.', - '/admin/banners/banner_edit/', + '/admin/banners/edit/', 'Dodaj baner', 'banners/banners-list-custom-script' ); @@ -235,7 +235,7 @@ class BannerController \S::alert('Baner zostal usuniety.'); } - header('Location: /admin/banners/view_list/'); + header('Location: /admin/banners/list/'); exit; } @@ -307,10 +307,10 @@ class BannerController $actions = [ FormAction::save( - '/admin/banners/banner_save/' . ($isNew ? '' : 'id=' . $bannerId), - '/admin/banners/view_list/' + '/admin/banners/save/' . ($isNew ? '' : 'id=' . $bannerId), + '/admin/banners/list/' ), - FormAction::cancel('/admin/banners/view_list/'), + FormAction::cancel('/admin/banners/list/'), ]; return new FormEditViewModel( @@ -321,8 +321,8 @@ class BannerController $tabs, $actions, 'POST', - '/admin/banners/banner_save/' . ($isNew ? '' : 'id=' . $bannerId), - '/admin/banners/view_list/', + '/admin/banners/save/' . ($isNew ? '' : 'id=' . $bannerId), + '/admin/banners/list/', true, ['id' => $bannerId], $languages, diff --git a/autoload/admin/Controllers/DictionariesController.php b/autoload/admin/Controllers/DictionariesController.php index 259d61c..2aa716a 100644 --- a/autoload/admin/Controllers/DictionariesController.php +++ b/autoload/admin/Controllers/DictionariesController.php @@ -61,16 +61,16 @@ class DictionariesController $rows[] = [ 'lp' => $lp++ . '.', - 'text' => '' . htmlspecialchars($text, ENT_QUOTES, 'UTF-8') . '', + 'text' => '' . htmlspecialchars($text, ENT_QUOTES, 'UTF-8') . '', '_actions' => [ [ 'label' => 'Edytuj', - 'url' => '/admin/dictionaries/unit_edit/id=' . $id, + 'url' => '/admin/dictionaries/edit/id=' . $id, 'class' => 'btn btn-xs btn-primary', ], [ 'label' => 'Usun', - 'url' => '/admin/dictionaries/unit_delete/id=' . $id, + 'url' => '/admin/dictionaries/delete/id=' . $id, 'class' => 'btn btn-xs btn-danger', 'confirm' => 'Na pewno chcesz usunac wybrana jednostke miary?', ], @@ -105,9 +105,9 @@ class DictionariesController ]), $listRequest['perPageOptions'], $sortableColumns, - '/admin/dictionaries/view_list/', + '/admin/dictionaries/list/', 'Brak danych w tabeli.', - '/admin/dictionaries/unit_edit/', + '/admin/dictionaries/edit/', 'Dodaj jednostke miary' ); @@ -192,7 +192,7 @@ class DictionariesController \S::alert('Jednostka miary zostala usunieta.'); } - header('Location: /admin/dictionaries/view_list/'); + header('Location: /admin/dictionaries/list/'); exit; } @@ -226,10 +226,10 @@ class DictionariesController ]), ]; - $actionUrl = '/admin/dictionaries/unit_save/' . ($isNew ? '' : ('id=' . $unitId)); + $actionUrl = '/admin/dictionaries/save/' . ($isNew ? '' : ('id=' . $unitId)); $actions = [ - FormAction::save($actionUrl, '/admin/dictionaries/view_list/'), - FormAction::cancel('/admin/dictionaries/view_list/'), + FormAction::save($actionUrl, '/admin/dictionaries/list/'), + FormAction::cancel('/admin/dictionaries/list/'), ]; return new FormEditViewModel( @@ -241,7 +241,7 @@ class DictionariesController $actions, 'POST', $actionUrl, - '/admin/dictionaries/view_list/', + '/admin/dictionaries/list/', true, ['id' => $unitId], $languages, diff --git a/autoload/admin/Controllers/LayoutsController.php b/autoload/admin/Controllers/LayoutsController.php index f02c6ac..27c6bd9 100644 --- a/autoload/admin/Controllers/LayoutsController.php +++ b/autoload/admin/Controllers/LayoutsController.php @@ -74,18 +74,18 @@ class LayoutsController $rows[] = [ 'lp' => $lp++ . '.', - 'name' => '' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '', + 'name' => '' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '', 'status' => ((int)($item['status'] ?? 0) === 1) ? 'tak' : 'nie', 'categories_default' => ((int)($item['categories_default'] ?? 0) === 1) ? 'tak' : 'nie', '_actions' => [ [ 'label' => 'Edytuj', - 'url' => '/admin/layouts/layout_edit/id=' . $id, + 'url' => '/admin/layouts/edit/id=' . $id, 'class' => 'btn btn-xs btn-primary', ], [ 'label' => 'Usun', - 'url' => '/admin/layouts/layout_delete/id=' . $id, + 'url' => '/admin/layouts/delete/id=' . $id, 'class' => 'btn btn-xs btn-danger', 'confirm' => 'Na pewno chcesz usunac wybrany szablon?', ], @@ -122,9 +122,9 @@ class LayoutsController ]), $listRequest['perPageOptions'], $sortableColumns, - '/admin/layouts/view_list/', + '/admin/layouts/list/', 'Brak danych w tabeli.', - '/admin/layouts/layout_edit/', + '/admin/layouts/edit/', 'Dodaj szablon' ); @@ -165,7 +165,7 @@ class LayoutsController \S::alert('Szablon zostal usuniety.'); } - header('Location: /admin/layouts/view_list/'); + header('Location: /admin/layouts/list/'); exit; } diff --git a/autoload/admin/Controllers/PagesController.php b/autoload/admin/Controllers/PagesController.php new file mode 100644 index 0000000..904d022 --- /dev/null +++ b/autoload/admin/Controllers/PagesController.php @@ -0,0 +1,660 @@ +repository = $repository; + $this->languagesRepository = $languagesRepository; + $this->layoutsRepository = $layoutsRepository; + } + + public function list(): string + { + return \Tpl::view('pages/pages-list', [ + 'menus' => $this->repository->menusWithPages(), + 'cookie_pages' => $this->cookieState('cookie_pages'), + 'cookie_menus' => $this->cookieState('cookie_menus'), + ]); + } + + public function browseList(): string + { + $menus = $this->repository->menusWithPages(); + $defaultLanguage = $this->languagesRepository->defaultLanguageId(); + + foreach ($menus as $index => $menu) { + $menus[$index]['pages'] = $this->withPreviewUrls($menu['pages'] ?? [], $defaultLanguage); + } + + return \Tpl::view('pages/pages-browse-list', [ + 'menus' => $menus, + 'modal' => \S::get('modal'), + 'cookie_pages' => $this->cookieState('cookie_pages'), + 'cookie_menus' => $this->cookieState('cookie_menus'), + ]); + } + + public function pagesUrlBrowser(): string + { + return $this->browseList(); + } + + public function menuEdit(): string + { + $menu = $this->repository->menuDetails((int)\S::get('id')); + + return \Tpl::view('pages/menu-edit', [ + 'form' => $this->buildMenuFormViewModel($menu), + ]); + } + + public function menuSave(): void + { + $legacyValues = \S::get('values'); + if ($legacyValues) { + $response = ['status' => 'error', 'msg' => 'Podczas zapisywania menu wystapil blad. Prosze sprobowac ponownie.']; + $values = json_decode((string)$legacyValues, true); + + if (is_array($values) && $this->repository->menuSave( + (int)($values['id'] ?? 0), + (string)($values['name'] ?? ''), + $values['status'] ?? 0 + )) { + $response = ['status' => 'ok', 'msg' => 'Menu zostalo zapisane.']; + } + + echo json_encode($response); + exit; + } + + $menuId = (int)\S::get('id'); + $name = trim((string)\S::get('name')); + $status = \S::get('status'); + + if ($name === '') { + echo json_encode([ + 'success' => false, + 'errors' => ['name' => 'Pole "Nazwa" jest wymagane.'], + ]); + exit; + } + + if ($this->repository->menuSave($menuId, $name, $status)) { + echo json_encode([ + 'success' => true, + 'message' => 'Menu zostalo zapisane.', + ]); + exit; + } + + echo json_encode([ + 'success' => false, + 'errors' => ['general' => 'Podczas zapisywania menu wystapil blad. Prosze sprobowac ponownie.'], + ]); + exit; + } + + /** + * @param array $menu + */ + private function buildMenuFormViewModel(array $menu): FormEditViewModel + { + $menuId = (int)($menu['id'] ?? 0); + $actionUrl = '/admin/pages/menuSave/' . ($menuId > 0 ? ('id=' . $menuId) : ''); + + $fields = [ + FormField::hidden('id', $menuId), + FormField::text('name', [ + 'label' => 'Nazwa', + 'required' => true, + 'attributes' => ['class' => 'require'], + 'value' => (string)($menu['name'] ?? ''), + ]), + FormField::switch('status', [ + 'label' => 'Aktywne', + 'value' => (int)($menu['status'] ?? 0) === 1, + ]), + ]; + + $actions = [ + FormAction::save($actionUrl, '/admin/pages/list/'), + FormAction::cancel('/admin/pages/list/'), + ]; + + return new FormEditViewModel( + 'pages-menu-edit', + 'Zapisz menu', + $menu, + $fields, + [], + $actions, + 'POST', + $actionUrl, + '/admin/pages/list/', + true, + ['id' => $menuId] + ); + } + + public function menuDelete(): void + { + if ($this->repository->menuDelete((int)\S::get('id'))) { + \S::set_message('Menu zostało usunięte.'); + } else { + \S::alert('Podczas usuwania menu wystąpił błąd. Aby usunąć menu, nie może ono posiadać przypiętych stron.'); + } + + header('Location: /admin/pages/list/'); + exit; + } + + public function edit(): string + { + $page = $this->repository->pageDetails((int)\S::get('id')); + $parentId = (int)\S::get('pid'); + $menuId = (int)\S::get('menu_id'); + $menus = $this->repository->menusList(); + $layouts = $this->layoutsRepository->listAll(); + $languages = $this->languagesRepository->languagesList(); + + return \Tpl::view('pages/page-edit', [ + 'form' => $this->buildPageFormViewModel( + $page, + $parentId, + $menuId, + $menus, + $layouts, + $languages + ), + ]); + } + + public function save(): void + { + $legacyValues = \S::get('values'); + if ($legacyValues) { + $response = ['status' => 'error', 'msg' => 'Podczas zapisywania strony wystapil blad. Prosze sprobowac ponownie.']; + $values = json_decode((string)$legacyValues, true); + + if (is_array($values)) { + $id = $this->repository->pageSave($values); + if (!empty($id)) { + $response = [ + 'status' => 'ok', + 'msg' => 'Strona zostala zapisana.', + 'id' => (int)$id, + ]; + } + } + + echo json_encode($response); + exit; + } + + $data = $_POST; + if (!isset($data['id']) || $data['id'] === '') { + $data['id'] = (int)\S::get('id'); + } + if (!isset($data['parent_id']) || $data['parent_id'] === '') { + $data['parent_id'] = (int)\S::get('pid'); + } + if ((!isset($data['menu_id']) || $data['menu_id'] === '') && (int)\S::get('menu_id') > 0) { + $data['menu_id'] = (int)\S::get('menu_id'); + } + + $savedId = $this->repository->pageSave($data); + if (!empty($savedId)) { + echo json_encode([ + 'success' => true, + 'message' => 'Strona zostala zapisana.', + 'id' => (int)$savedId, + ]); + exit; + } + + echo json_encode([ + 'success' => false, + 'errors' => ['general' => 'Podczas zapisywania strony wystapil blad. Prosze sprobowac ponownie.'], + ]); + exit; + } + + /** + * @param array $page + * @param array> $menus + * @param array> $layouts + * @param array> $languages + */ + private function buildPageFormViewModel( + array $page, + int $parentId, + int $menuId, + array $menus, + array $layouts, + array $languages + ): FormEditViewModel { + $pageId = (int)($page['id'] ?? 0); + $isNew = $pageId <= 0; + + $resolvedParentId = $pageId > 0 ? (int)($page['parent_id'] ?? 0) : $parentId; + $resolvedMenuId = $pageId > 0 ? (int)($page['menu_id'] ?? 0) : $menuId; + + $menuOptions = []; + foreach ($menus as $menu) { + $id = (int)($menu['id'] ?? 0); + if ($id <= 0) { + continue; + } + $menuOptions[$id] = (string)($menu['name'] ?? ''); + } + + $layoutOptions = ['' => '---- szablon ----']; + foreach ($layouts as $layout) { + $id = (int)($layout['id'] ?? 0); + if ($id <= 0) { + continue; + } + $layoutOptions[$id] = (string)($layout['name'] ?? ''); + } + + $data = [ + 'id' => $pageId, + 'parent_id' => $resolvedParentId > 0 ? $resolvedParentId : '', + 'menu_id' => $resolvedMenuId > 0 ? $resolvedMenuId : '', + 'page_type' => (int)($page['page_type'] ?? 0), + 'sort_type' => (int)($page['sort_type'] ?? 0), + 'layout_id' => (int)($page['layout_id'] ?? 0), + 'articles_limit' => (int)($page['articles_limit'] ?? 2), + 'show_title' => (int)($page['show_title'] ?? 1), + 'status' => (int)($page['status'] ?? 1), + 'start' => (int)($page['start'] ?? 0), + 'category_id' => (int)($page['category_id'] ?? 0), + 'languages' => [], + ]; + + foreach ($languages as $language) { + $langId = (string)($language['id'] ?? ''); + if ($langId === '') { + continue; + } + + $translation = is_array($page['languages'][$langId] ?? null) ? $page['languages'][$langId] : []; + $data['languages'][$langId] = [ + 'title' => (string)($translation['title'] ?? ''), + 'link' => (string)($translation['link'] ?? ''), + 'seo_link' => (string)($translation['seo_link'] ?? ''), + 'page_title' => (string)($translation['page_title'] ?? ''), + 'meta_title' => (string)($translation['meta_title'] ?? ''), + 'meta_description' => (string)($translation['meta_description'] ?? ''), + 'meta_keywords' => (string)($translation['meta_keywords'] ?? ''), + 'noindex' => (int)($translation['noindex'] ?? 0), + 'canonical' => (string)($translation['canonical'] ?? ''), + ]; + } + + $tabs = [ + new FormTab('content', 'Tresc', 'fa-file'), + new FormTab('settings', 'Ustawienia', 'fa-wrench'), + new FormTab('seo', 'SEO', 'fa-globe'), + ]; + + $fields = [ + FormField::hidden('id', $pageId), + FormField::hidden('parent_id', $resolvedParentId > 0 ? $resolvedParentId : ''), + FormField::langSection('page_content', 'content', [ + FormField::text('title', [ + 'label' => 'Nazwa strony', + 'required' => true, + ]), + ]), + FormField::select('menu_id', [ + 'label' => 'Menu', + 'tab' => 'settings', + 'options' => $menuOptions, + 'value' => $resolvedMenuId > 0 ? $resolvedMenuId : '', + ]), + FormField::select('page_type', [ + 'label' => 'Typ strony', + 'tab' => 'settings', + 'options' => $this->repository->pageTypes(), + 'attributes' => ['id' => 'page_type'], + 'value' => (int)($page['page_type'] ?? 0), + ]), + FormField::langSection('page_links', 'settings', [ + FormField::text('link', [ + 'label' => 'Link', + ]), + ]), + FormField::text('category_id', [ + 'label' => 'ID kategorii', + 'tab' => 'settings', + 'attributes' => ['id' => 'category_id'], + 'value' => (int)($page['category_id'] ?? 0), + ]), + FormField::select('sort_type', [ + 'label' => 'Sortowanie artykulow', + 'tab' => 'settings', + 'attributes' => ['id' => 'sort_type'], + 'options' => $this->repository->sortTypes(), + 'value' => (int)($page['sort_type'] ?? 0), + ]), + FormField::select('layout_id', [ + 'label' => 'Szablon', + 'tab' => 'settings', + 'attributes' => ['id' => 'layout_id'], + 'options' => $layoutOptions, + 'value' => (int)($page['layout_id'] ?? 0), + ]), + FormField::text('articles_limit', [ + 'label' => 'Liczba artykulow na stronie', + 'tab' => 'settings', + 'attributes' => ['id' => 'articles_limit'], + 'value' => (int)($page['articles_limit'] ?? 2), + ]), + FormField::switch('show_title', [ + 'label' => 'Pokaz tytul', + 'tab' => 'settings', + 'value' => (int)($page['show_title'] ?? 0) === 1 || $isNew, + ]), + FormField::switch('status', [ + 'label' => 'Aktywna', + 'tab' => 'settings', + 'value' => (int)($page['status'] ?? 0) === 1 || $isNew, + ]), + FormField::switch('start', [ + 'label' => 'Strona startowa', + 'tab' => 'settings', + 'value' => (int)($page['start'] ?? 0) === 1, + ]), + FormField::langSection('page_seo', 'seo', [ + FormField::text('seo_link', [ + 'label' => 'Link SEO', + 'attributes' => [ + 'icon_content' => 'generuj', + 'icon_js' => 'generateSeoLinkForButton(\'{lang}\')', + ], + ]), + FormField::text('page_title', [ + 'label' => 'Tytul strony (h1)', + ]), + FormField::text('meta_title', [ + 'label' => 'Meta title', + ]), + FormField::textarea('meta_description', [ + 'label' => 'Meta description', + ]), + FormField::textarea('meta_keywords', [ + 'label' => 'Meta keywords', + ]), + FormField::select('noindex', [ + 'label' => 'Blokuj indeksacje', + 'options' => [0 => 'nie', 1 => 'tak'], + ]), + FormField::text('canonical', [ + 'label' => 'Rel canonical', + ]), + ]), + FormField::custom('page_edit_script', ' +', [ + 'tab' => 'settings', + ]), + ]; + + $actionUrl = '/admin/pages/save/' . ($pageId > 0 ? ('id=' . $pageId) : ''); + $actions = [ + FormAction::save($actionUrl, '/admin/pages/list/'), + FormAction::cancel('/admin/pages/list/'), + ]; + + return new FormEditViewModel( + 'pages-page-edit', + 'Edycja strony', + $data, + $fields, + $tabs, + $actions, + 'POST', + $actionUrl, + '/admin/pages/list/', + true, + [ + 'id' => $pageId, + 'parent_id' => $resolvedParentId > 0 ? $resolvedParentId : '', + ], + $languages + ); + } + + public function delete(): void + { + if ($this->repository->pageDelete((int)\S::get('id'))) { + \S::set_message('Strona zostala usunieta.'); + } else { + \S::alert('Podczas usuwania strony wystapil blad. Aby usunac strone nie moze ona posiadac przypietych podstron.'); + } + + header('Location: /admin/pages/list/'); + exit; + } + + public function pageArticles(): string + { + $pageId = (int)\S::get('id'); + return \Tpl::view('pages/page-articles', [ + 'page_id' => $pageId, + 'articles' => $this->repository->pageArticles($pageId), + ]); + } + + public function savePagesOrder(): void + { + $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kolejnosci stron wystapil blad. Prosze sprobowac ponownie.']; + + if ($this->repository->savePagesOrder((int)\S::get('menu_id'), \S::get('pages'))) { + $response = ['status' => 'ok']; + } + + echo json_encode($response); + exit; + } + + public function saveArticlesOrder(): void + { + $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kolejnosci wyswietlania artykulow wystapil blad. Prosze sprobowac ponownie.']; + + if ($this->repository->saveArticlesOrder((int)\S::get('page_id'), \S::get('articles'))) { + $response = ['status' => 'ok']; + } + + echo json_encode($response); + exit; + } + + public function generateSeoLink(): void + { + $response = ['status' => 'error', 'msg' => 'Podczas generowania pola "seo link" wystapil blad. Prosze sprobowac ponownie.']; + + $seoLink = $this->repository->generateSeoLink( + (string)\S::get('title'), + (int)\S::get('page_id'), + (int)\S::get('article_id'), + (int)\S::get('category_id') + ); + + if ($seoLink !== '') { + $response = [ + 'status' => 'ok', + 'seo_link' => $seoLink, + ]; + } + + echo json_encode($response); + exit; + } + + public function cookieMenus(): void + { + $this->repository->toggleCookieValue('cookie_menus', (int)\S::get('menu_id')); + exit; + } + + public function cookiePages(): void + { + $this->repository->toggleCookieValue('cookie_pages', (int)\S::get('page_id')); + exit; + } + + /** + * @param array> $pages + * @return array> + */ + private function withPreviewUrls(array $pages, string $defaultLanguage): array + { + foreach ($pages as $index => $page) { + $pageId = (int)($page['id'] ?? 0); + $languages = is_array($page['languages'] ?? null) ? $page['languages'] : []; + + $previewUrls = []; + foreach ($languages as $languageRow) { + $langId = (string)($languageRow['lang_id'] ?? ''); + if ($langId === '') { + continue; + } + + $previewUrls[$langId] = $this->repository->pageUrlPreview( + $pageId, + $langId, + (string)($languageRow['title'] ?? ''), + (string)($languageRow['seo_link'] ?? ''), + $defaultLanguage + ); + } + + $page['preview_urls'] = $previewUrls; + $page['subpages'] = $this->withPreviewUrls($page['subpages'] ?? [], $defaultLanguage); + $pages[$index] = $page; + } + + return $pages; + } + + /** + * @return array + */ + private function cookieState(string $cookieName): array + { + if (empty($_COOKIE[$cookieName])) { + return []; + } + + $decoded = @unserialize((string)$_COOKIE[$cookieName], ['allowed_classes' => false]); + if (!is_array($decoded)) { + return []; + } + + $state = []; + foreach ($decoded as $key => $value) { + $state[(int)$key] = (int)$value; + } + + return $state; + } +} + diff --git a/autoload/admin/Controllers/ProductArchiveController.php b/autoload/admin/Controllers/ProductArchiveController.php index 5883b59..b5525f4 100644 --- a/autoload/admin/Controllers/ProductArchiveController.php +++ b/autoload/admin/Controllers/ProductArchiveController.php @@ -140,7 +140,7 @@ class ProductArchiveController ]), $listRequest['perPageOptions'], $sortableColumns, - '/admin/product_archive/products_list/', + '/admin/product_archive/list/', 'Brak danych w tabeli.', null, null, @@ -159,7 +159,7 @@ class ProductArchiveController else \S::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' ); - header( 'Location: /admin/product_archive/products_list/' ); + header( 'Location: /admin/product_archive/list/' ); exit; } } diff --git a/autoload/admin/Controllers/ScontainersController.php b/autoload/admin/Controllers/ScontainersController.php index 083dfbf..6c61cee 100644 --- a/autoload/admin/Controllers/ScontainersController.php +++ b/autoload/admin/Controllers/ScontainersController.php @@ -71,18 +71,18 @@ class ScontainersController $rows[] = [ 'lp' => $lp++ . '.', - 'title' => '' . htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '', + 'title' => '' . htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . '', 'code' => '[KONTENER:' . $id . ']', 'status' => ((int)($item['status'] ?? 0) === 1) ? 'tak' : 'nie', '_actions' => [ [ 'label' => 'Edytuj', - 'url' => '/admin/scontainers/container_edit/id=' . $id, + 'url' => '/admin/scontainers/edit/id=' . $id, 'class' => 'btn btn-xs btn-primary', ], [ 'label' => 'Usun', - 'url' => '/admin/scontainers/container_delete/id=' . $id, + 'url' => '/admin/scontainers/delete/id=' . $id, 'class' => 'btn btn-xs btn-danger', 'confirm' => 'Na pewno chcesz usunac wybrany kontener?', ], @@ -119,9 +119,9 @@ class ScontainersController ]), $listRequest['perPageOptions'], $sortableColumns, - '/admin/scontainers/view_list/', + '/admin/scontainers/list/', 'Brak danych w tabeli.', - '/admin/scontainers/container_edit/', + '/admin/scontainers/edit/', 'Dodaj kontener' ); @@ -218,7 +218,7 @@ class ScontainersController \S::alert('Kontener zostal usuniety.'); } - header('Location: /admin/scontainers/view_list/'); + header('Location: /admin/scontainers/list/'); exit; } @@ -266,10 +266,10 @@ class ScontainersController new FormTab('settings', 'Ustawienia', 'fa-wrench'), ]; - $actionUrl = '/admin/scontainers/container_save/' . ($isNew ? '' : ('id=' . $id)); + $actionUrl = '/admin/scontainers/save/' . ($isNew ? '' : ('id=' . $id)); $actions = [ - FormAction::save($actionUrl, '/admin/scontainers/view_list/'), - FormAction::cancel('/admin/scontainers/view_list/'), + FormAction::save($actionUrl, '/admin/scontainers/list/'), + FormAction::cancel('/admin/scontainers/list/'), ]; return new FormEditViewModel( @@ -281,7 +281,7 @@ class ScontainersController $actions, 'POST', $actionUrl, - '/admin/scontainers/view_list/', + '/admin/scontainers/list/', true, [], $languages, diff --git a/autoload/admin/Controllers/SettingsController.php b/autoload/admin/Controllers/SettingsController.php index b0318fa..35b65c0 100644 --- a/autoload/admin/Controllers/SettingsController.php +++ b/autoload/admin/Controllers/SettingsController.php @@ -309,7 +309,7 @@ class SettingsController ]; $actions = [ - FormAction::save('/admin/settings/settings_save/', ''), + FormAction::save('/admin/settings/save/', ''), ]; return new FormEditViewModel( @@ -320,7 +320,7 @@ class SettingsController $tabs, $actions, 'POST', - '/admin/settings/settings_save/', + '/admin/settings/save/', null, false, [], diff --git a/autoload/admin/Support/Forms/FormFieldRenderer.php b/autoload/admin/Support/Forms/FormFieldRenderer.php index 9d256bf..9e99461 100644 --- a/autoload/admin/Support/Forms/FormFieldRenderer.php +++ b/autoload/admin/Support/Forms/FormFieldRenderer.php @@ -405,6 +405,25 @@ class FormFieldRenderer ]), $error); default: // TEXT, URL, etc. + if (!empty($field->attributes['icon_content'])) { + $iconJs = (string)($field->attributes['icon_js'] ?? ''); + if ($iconJs !== '') { + $iconJs = str_replace('{lang}', (string)$languageId, $iconJs); + } + + return $this->wrapWithError(\Html::input_icon([ + 'label' => $field->label, + 'name' => $name, + 'id' => $id, + 'value' => $value ?? '', + 'type' => $field->type === FormFieldType::EMAIL ? 'email' : 'text', + 'class' => ($field->required ? 'require ' : '') . ($field->attributes['class'] ?? ''), + 'icon_content' => (string)$field->attributes['icon_content'], + 'icon_class' => (string)($field->attributes['icon_class'] ?? ''), + 'icon_js' => $iconJs, + ]), $error); + } + return $this->wrapWithError(\Html::input([ 'label' => $field->label, 'name' => $name, diff --git a/autoload/admin/class.Site.php b/autoload/admin/class.Site.php index 8777cd9..18a4c11 100644 --- a/autoload/admin/class.Site.php +++ b/autoload/admin/class.Site.php @@ -85,7 +85,7 @@ class Site (bool)\S::get('remember') ); - header('Location: /admin/articles/view_list/'); + header('Location: /admin/articles/list/'); exit; } } @@ -130,7 +130,7 @@ class Site exit; } - // 2FA OK — finalna sesja + // 2FA OK - finalna sesja $user = $users->details($pending['login']); self::finalize_admin_login( @@ -140,7 +140,7 @@ class Site $pending['remember'] ? true : false ); - header('Location: /admin/articles/view_list/'); + header('Location: /admin/articles/list/'); exit; } break; @@ -208,7 +208,8 @@ class Site return new \admin\Controllers\ArticlesController( new \Domain\Article\ArticleRepository( $mdb ), new \Domain\Languages\LanguagesRepository( $mdb ), - new \Domain\Layouts\LayoutsRepository( $mdb ) + new \Domain\Layouts\LayoutsRepository( $mdb ), + new \Domain\Pages\PagesRepository( $mdb ) ); }, 'ArticlesArchive' => function() { @@ -241,7 +242,7 @@ class Site new \Domain\Product\ProductRepository( $mdb ) ); }, - // Alias dla starego modułu /admin/archive/products_list/ + // Alias dla starego modułu /admin/archive/list/ 'Archive' => function() { global $mdb; @@ -301,6 +302,15 @@ class Site new \Domain\Languages\LanguagesRepository( $mdb ) ); }, + 'Pages' => function() { + global $mdb; + + return new \admin\Controllers\PagesController( + new \Domain\Pages\PagesRepository( $mdb ), + new \Domain\Languages\LanguagesRepository( $mdb ), + new \Domain\Layouts\LayoutsRepository( $mdb ) + ); + }, ]; return self::$newControllers; @@ -324,40 +334,7 @@ class Site return $factory(); } - /** - * Mapowanie nazw akcji: stara_nazwa => nowa_nazwa - * Potrzebne gdy stary routing używa innej konwencji nazw - */ - private static $actionMap = [ - 'gallery_order_save' => 'galleryOrderSave', - 'files_order_save' => 'filesOrderSave', - 'view_list' => 'list', - 'article_edit' => 'edit', - 'article_save' => 'save', - 'article_delete' => 'delete', - 'article_restore' => 'restore', - 'article_image_alt_change' => 'imageAltChange', - 'article_file_name_change' => 'fileNameChange', - 'article_image_delete' => 'imageDelete', - 'article_file_delete' => 'fileDelete', - 'banner_edit' => 'edit', - 'banner_save' => 'save', - 'banner_delete' => 'delete', - 'clear_cache' => 'clearCache', - 'clear_cache_ajax' => 'clearCacheAjax', - 'settings_save' => 'save', - 'products_list' => 'list', - 'unit_edit' => 'edit', - 'unit_save' => 'save', - 'unit_delete' => 'delete', - 'layout_edit' => 'edit', - 'layout_save' => 'save', - 'layout_delete' => 'delete', - 'container_edit' => 'edit', - 'container_save' => 'save', - 'container_delete' => 'delete', - ]; - + public static function route() { $_SESSION['admin'] = true; @@ -382,12 +359,9 @@ class Site $controller = self::createController( $moduleName ); if ( $controller ) { - // Mapuj nazwę akcji (stara → nowa) lub użyj oryginalnej - $newAction = self::$actionMap[$action] ?? $action; - - if ( method_exists( $controller, $newAction ) ) + if ( method_exists( $controller, $action ) ) { - return $controller->$newAction(); + return $controller->$action(); } } @@ -422,3 +396,4 @@ class Site } } } + diff --git a/autoload/admin/controls/class.Pages.php b/autoload/admin/controls/class.Pages.php deleted file mode 100644 index 80ae118..0000000 --- a/autoload/admin/controls/class.Pages.php +++ /dev/null @@ -1,117 +0,0 @@ - \admin\factory\Pages::menus_list(), - 'modal' => \S::get( 'modal' ) - ] ); - exit; - } - - public static function browse_list() - { - return \admin\view\Pages::browse_list( - \admin\factory\Pages::menus_list() - ); - } - - public static function menu_delete() - { - if ( \admin\factory\Pages::menu_delete( \S::get( 'id' ) ) ) - \S::set_message( 'Menu zostało usunięte.' ); - else - \S::alert( 'Podczas usuwania menu wystąpił błąd. Aby usunąć menu nie może ono posiadać przypiętych stron.' ); - header( 'Location: /admin/pages/view_list/' ); - exit; - } - - public static function page_delete() - { - if ( \admin\factory\Pages::page_delete( \S::get( 'id' ) ) ) - \S::set_message( 'Strona została usunięta.' ); - else - \S::alert( 'Podczas usuwania strony wystąpił błąd. Aby usunąć stronę nie może ona posiadać przypiętych podstron.' ); - header( 'Location: /admin/pages/view_list/' ); - exit; - } - - public static function page_articles() - { - return \admin\view\Pages::page_articles( \S::get( 'id' ), \admin\factory\Pages::page_articles( \S::get( 'id' ) ) ); - } - - public static function page_save() - { - $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania strony wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); - - if ( $id = \admin\factory\Pages::page_save( - $values['id'], $values['title'], $values['seo_link'], $values['meta_title'], $values['meta_description'], $values['meta_keywords'], $values['menu_id'], $values['parent_id'], $values['page_type'], - $values['sort_type'], $values['layout_id'], $values['articles_limit'], $values['show_title'], $values['status'], $values['link'], $values['noindex'], $values['start'], $values['page_title'], - $values['canonical'], $values['category_id'] - ) ) - $response = [ 'status' => 'ok', 'msg' => 'Strona została zapisana.', 'id' => $id ]; - - echo json_encode( $response ); - exit; - } - - public static function page_edit() - { - return \Tpl::view( 'pages/page-edit', [ - 'page' => \admin\factory\Pages::page_details( \S::get( 'id' ) ), - 'parent_id' => \S::get( 'pid' ), - 'menu_id' => \S::get( 'menu_id' ), - 'menus' => \admin\factory\Pages::menu_lists(), - 'layouts' => self::layouts_for_page_edit( $GLOBALS['mdb'] ), - 'languages' => ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->languagesList() - ] ); - } - - private static function layouts_for_page_edit( $db ) - { - if ( class_exists( '\Domain\Layouts\LayoutsRepository' ) ) - { - $rows = ( new \Domain\Layouts\LayoutsRepository( $db ) ) -> listAll(); - return is_array( $rows ) ? $rows : []; - } - - if ( class_exists( '\admin\factory\Layouts' ) ) - { - $rows = \admin\factory\Layouts::layouts_list(); - return is_array( $rows ) ? $rows : []; - } - - return []; - } - - public static function menu_save() - { - $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania menu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); - - if ( \admin\factory\Pages::menu_save( $values['id'], $values['name'], $values['status'] ) ) - $response = [ 'status' => 'ok', 'msg' => 'Menu zostało zapisane.' ]; - - echo json_encode( $response ); - exit; - } - - public static function menu_edit() - { - return \admin\view\Pages::menu_edit( - \admin\factory\Pages::menu_details( \S::get( 'id' ) ) - ); - } - - public static function view_list() - { - return \Tpl::view( 'pages/pages-list', [ - 'menus' => \admin\factory\Pages::menus_list() - ] ); - } -} -?> diff --git a/autoload/admin/controls/class.ShopProduct.php b/autoload/admin/controls/class.ShopProduct.php index 6e1cb97..da297a4 100644 --- a/autoload/admin/controls/class.ShopProduct.php +++ b/autoload/admin/controls/class.ShopProduct.php @@ -203,7 +203,7 @@ class ShopProduct else \S::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' ); - header( 'Location: /admin/product_archive/products_list/' ); + header( 'Location: /admin/product_archive/list/' ); exit; } @@ -276,8 +276,8 @@ class ShopProduct { echo json_encode( [ 'status' => 'deprecated', - 'msg' => 'Endpoint nie jest juz wspierany. Uzyj /admin/product_archive/products_list/.', - 'redirect_url' => '/admin/product_archive/products_list/' + 'msg' => 'Endpoint nie jest juz wspierany. Uzyj /admin/product_archive/list/.', + 'redirect_url' => '/admin/product_archive/list/' ] ); exit; } diff --git a/autoload/admin/factory/class.Articles.php b/autoload/admin/factory/class.Articles.php index f02b5c2..cd9e890 100644 --- a/autoload/admin/factory/class.Articles.php +++ b/autoload/admin/factory/class.Articles.php @@ -61,6 +61,7 @@ class Articles public static function article_pages( $article_id ) { global $mdb; + $pagesRepository = new \Domain\Pages\PagesRepository( $mdb ); $results = $mdb -> query( "SELECT page_id FROM pp_articles_pages WHERE article_id = " . (int)$article_id ) -> fetchAll(); if ( is_array( $results ) and !empty( $results ) ) foreach ( $results as $row ) @@ -68,7 +69,7 @@ class Articles if ( $out == '' ) $out .= ' - '; - $out .= \admin\factory\Pages::page_title( $row['page_id'] ); + $out .= $pagesRepository->pageTitle( (int)$row['page_id'] ); if ( end( $results ) != $row ) $out .= ' / '; diff --git a/autoload/admin/factory/class.Layouts.php b/autoload/admin/factory/class.Layouts.php index 4031bb3..51e52bf 100644 --- a/autoload/admin/factory/class.Layouts.php +++ b/autoload/admin/factory/class.Layouts.php @@ -2,6 +2,7 @@ namespace admin\factory; use Domain\Layouts\LayoutsRepository; +use Domain\Pages\PagesRepository; class Layouts { @@ -47,21 +48,8 @@ class Layouts public static function menus_list() { - $menus = \admin\factory\Pages::menus_list(); - if (!is_array($menus)) { - return []; - } - - foreach ($menus as $key => $menu) { - $menuId = (int)($menu['id'] ?? 0); - if ($menuId <= 0) { - continue; - } - - $menus[$key]['pages'] = \admin\factory\Pages::menu_pages($menuId); - } - - return $menus; + global $mdb; + return (new PagesRepository($mdb))->menusWithPages(); } public static function layouts_list() @@ -75,4 +63,3 @@ class Layouts return new LayoutsRepository($mdb); } } - diff --git a/autoload/admin/factory/class.Pages.php b/autoload/admin/factory/class.Pages.php deleted file mode 100644 index a1bfdef..0000000 --- a/autoload/admin/factory/class.Pages.php +++ /dev/null @@ -1,407 +0,0 @@ - 'pełne artykuły', 1 => 'wprowadzenia', 2 => 'miniaturki', 3 => 'link', 4 => 'kontakt', 5 => 'kategoria sklepu' ]; - public static $_sort_types = [ - 0 => 'data dodania - najstarsze na początku', - 1 => 'data dodania - najnowsze na początku', - 2 => 'data modyfikacji - rosnąco', - 3 => 'data mofyfikacji - malejąco', - 4 => 'ręczne', - 5 => 'alfabetycznie - A - Z', - 6 => 'alfabetycznie - Z - A' - ]; - - public static function save_articles_order( $page_id, $articles ) - { - global $mdb; - - if ( is_array( $articles ) ) - { - $mdb -> update( 'pp_articles_pages', [ 'o' => 0 ], [ 'page_id' => (int)$page_id ] ); - - for ( $i = 0; $i < count( $articles ); $i++ ) - { - if ( $articles[$i]['item_id'] ) - { - $x++; - $mdb -> update( 'pp_articles_pages', [ 'o' => $x ], [ 'AND' => [ 'page_id' => (int)$page_id, 'article_id' => $articles[ $i ]['item_id'] ] ] ); - } - } - } - return true; - } - - public static function page_articles( $page_id ) - { - global $mdb; - - $results = $mdb -> query( 'SELECT ' - . 'article_id, o, status ' - . 'FROM ' - . 'pp_articles_pages AS ap ' - . 'INNER JOIN pp_articles AS a ON a.id = ap.article_id ' - . 'WHERE ' - . 'page_id = ' . (int)$page_id . ' AND status != -1 ' - . 'ORDER BY ' - . 'o ASC' ) -> fetchAll(); - if ( is_array( $results ) ) foreach ( $results as $row ) - { - $row['title'] = \admin\factory\Articles::article_title( $row['article_id'] ); - $articles[] = $row; - } - return $articles; - } - - public static function menus_list() - { - global $mdb; - return $mdb -> select( 'pp_menus', '*', [ 'ORDER' => [ 'id' => 'ASC' ] ] ); - } - - public static function save_pages_order( $menu_id, $pages ) - { - global $mdb; - - if ( is_array( $pages ) ) - { - $mdb -> update( 'pp_pages', [ 'o' => 0 ], [ 'menu_id' => (int)$menu_id ] ); - - for ( $i = 0; $i < count( $pages ); $i++ ) - { - if ( $pages[$i]['item_id'] ) - { - $pages[$i]['parent_id'] ? $parent_id = $pages[$i]['parent_id'] : $parent_id = 0; - - if ( $pages[$i]['item_id'] && $pages[$i]['depth'] > 1 ) - { - if ( $pages[$i]['depth'] == 2 ) - $parent_id = null; - - $x++; - - $mdb -> update( 'pp_pages', [ 'o' => $x, 'parent_id' => $parent_id ], [ 'id' => (int)$pages[ $i ]['item_id'] ] ); - } - } - } - } - - \S::delete_dir( '../temp/' ); - - return true; - } - - public static function page_delete( $page_id ) - { - global $mdb; - - if ( $mdb -> count( 'pp_pages', [ 'parent_id' => (int)$page_id ] ) ) - return false; - - return $mdb -> delete( 'pp_pages', [ 'id' => (int)$page_id ] ); - } - - public static function max_order() - { - global $mdb; - return $mdb -> max( 'pp_pages', 'o' ); - } - - public static function page_save( - $page_id, $title, $seo_link, $meta_title, $meta_description, $meta_keywords, $menu_id, $parent_id, $page_type, $sort_type, $layout_id, $articles_limit, $show_title, $status, - $link, $noindex, $start, $page_title, $canonical, $category_id - ) - { - global $mdb; - - if ( !$parent_id ) - $parent_id = null; - - if ( !$page_id ) - { - $order = self::max_order() + 1; - - $mdb -> insert( 'pp_pages', [ - 'menu_id' => (int)$menu_id, - 'page_type' => $page_type, - 'sort_type' => $sort_type, - 'articles_limit' => $articles_limit, - 'show_title' => $show_title == 'on' ? 1 : 0, - 'status' => $status == 'on' ? 1 : 0, - 'o' => (int)$order, - 'parent_id' => $parent_id, - 'start' => $start == 'on' ? 1 : 0, - 'category_id' => ( $category_id and $page_type == 5 ) ? $category_id : null - ] ); - - $id = $mdb -> id(); - - if ( $id ) - { - if ( $start ) - $mdb -> update( 'pp_pages', [ 'start' => 0 ], [ 'id[!]' => (int)$id ] ); - - if ( $layout_id ) - $mdb -> insert( 'pp_layouts_pages', [ 'page_id' => (int)$id, 'layout_id' => (int)$layout_id ] ); - - foreach ( $title as $key => $val ) - { - $mdb -> insert( 'pp_pages_langs', [ - 'page_id' => (int)$id, - 'lang_id' => $key, - 'title' => $title[$key] != '' ? $title[$key] : null, - 'meta_description' => $meta_description[$key] != '' ? $meta_description[$key] : null, - 'meta_keywords' => $meta_keywords[$key] != '' ? $meta_keywords[$key] : null, - 'meta_title' => $meta_title[$key] != '' ? $meta_title[$key] : null, - 'seo_link' => \S::seo( $seo_link[$key] ) != '' ? \S::seo( $seo_link[$key] ) : null, - 'noindex' => $noindex[$key], - 'page_title' => $page_title[$key] != '' ? $page_title[$key] : null, - 'link' => ( $link[$key] and $page_type == 3 ) ? $link[$key] : null, - 'canonical' => $canonical[$key] != '' ? $canonical[$key] : null - ] ); - } - - \S::htacces(); - \S::delete_dir( '../temp/' ); - return $id; - } - } - else - { - $mdb -> update( 'pp_pages', [ - 'menu_id' => (int)$menu_id, - 'page_type' => $page_type, - 'sort_type' => $sort_type, - 'articles_limit' => $articles_limit, - 'show_title' => $show_title == 'on' ? 1 : 0, - 'status' => $status == 'on' ? 1 : 0, - 'parent_id' => $parent_id, - 'start' => $start == 'on' ? 1 : 0, - 'category_id' => ( $category_id and $page_type == 5 ) ? $category_id : null - ], [ - 'id' => (int)$page_id - ] ); - - if ( $layout_id ) - { - $mdb -> delete( 'pp_layouts_pages', [ 'page_id' => (int)$page_id ] ); - $mdb -> insert( 'pp_layouts_pages', [ 'layout_id' => (int)$layout_id, 'page_id' => (int)$page_id ] ); - } - - if ( $start ) - $mdb -> update( 'pp_pages', [ 'start' => 0 ], [ 'id[!]' => (int)$page_id ] ); - - foreach ( $title as $key => $val ) - { - if ( $translation_id = $mdb -> get( 'pp_pages_langs', 'id', [ 'AND' => [ 'page_id' => $page_id, 'lang_id' => $key ] ] ) ) - $mdb -> update( 'pp_pages_langs', [ - 'lang_id' => $key, - 'title' => $title[$key] != '' ? $title[$key] : null, - 'meta_description' => $meta_description[$key] != '' ? $meta_description[$key] : null, - 'meta_keywords' => $meta_keywords[$key] != '' ? $meta_keywords[$key] : null, - 'meta_title' => $meta_title[$key] != '' ? $meta_title[$key] : null, - 'seo_link' => \S::seo( $seo_link[$key] ) != '' ? \S::seo( $seo_link[$key] ) : null, - 'noindex' => $noindex[$key], - 'page_title' => $page_title[$key] != '' ? $page_title[$key] : null, - 'link' => ( $link[$key] and $page_type == 3 ) ? $link[$key] : null, - 'canonical' => $canonical[$key] != '' ? $canonical[$key] : null - ], [ - 'id' => $translation_id - ] ); - else - $mdb -> insert( 'pp_pages_langs', [ - 'page_id' => (int)$page_id, - 'lang_id' => $key, - 'title' => $title[$key] != '' ? $title[$key] : null, - 'meta_description' => $meta_description[$key] != '' ? $meta_description[$key] : null, - 'meta_keywords' => $meta_keywords[$key] != '' ? $meta_keywords[$key] : null, - 'meta_title' => $meta_title[$key] != '' ? $meta_title[$key] : null, - 'seo_link' => \S::seo( $seo_link[$key] ) != '' ? \S::seo( $seo_link[$key] ) : null, - 'noindex' => $noindex[$key], - 'page_title' => $page_title[$key] != '' ? $page_title[$key] : null, - 'link' => ( $link[$key] and $page_type == 3 ) ? $link[$key] : null, - 'canonical' => $canonical[$key] != '' ? $canonical[$key] : null - ] ); - } - - self::update_supages_menu_id( $page_id, $menu_id ); - - \S::htacces(); - \S::delete_dir( '../temp/' ); - - return $page_id; - } - return false; - } - - public static function update_supages_menu_id( $parent_id, $menu_id ) - { - global $mdb; - - $mdb -> update( 'pp_pages', [ 'menu_id' => (int)$menu_id ], [ 'parent_id' => $parent_id ] ); - - $results = $mdb -> select( 'pp_pages', [ 'id' ], [ 'parent_id' => $parent_id ] ); - if ( is_array( $results ) ) foreach ( $results as $row ) - self::update_supages_menu_id( $row['id'], $menu_id ); - } - - public static function generate_seo_link( $title, $page_id, $article_id, $category_id ) - { - global $mdb; - - $seo_link = \S::seo( $title ); - - while ( !$seo_link_check ) - { - if ( $mdb -> count( 'pp_pages_langs', [ 'AND' => [ 'seo_link' => $seo_link, 'page_id[!]' => (int)$page_id ] ] ) ) - $seo_link = \S::seo( $title ) . '-' . ( ++$i ); - else - $seo_link_check = true; - } - - $seo_link_check = false; - - while ( !$seo_link_check ) - { - if ( $mdb -> count( 'pp_articles_langs', [ 'AND' => [ 'seo_link' => $seo_link, 'article_id[!]' => (int)$article_id ] ] ) ) - $seo_link = \S::seo( $title ) . '-' . ( ++$i ); - else - $seo_link_check = true; - } - - $seo_link_check = false; - - while ( !$seo_link_check ) - { - if ( $mdb -> count( 'pp_shop_categories_langs', [ 'AND' => [ 'seo_link' => $seo_link, 'category_id[!]' => (int)$category_id ] ] ) ) - $seo_link = \S::seo( $title ) . '-' . ( ++$i ); - else - $seo_link_check = true; - } - - return $seo_link; - } - - public static function menu_delete( $menu_id ) - { - global $mdb; - - if ( $mdb -> count( 'pp_pages', [ 'menu_id' => (int)$menu_id ] ) ) - return false; - - return $mdb -> delete( 'pp_menus', [ 'id' => (int)$menu_id ] ); - } - - public static function menu_details( $menu_id ) - { - global $mdb; - return $mdb -> get( 'pp_menus', '*', [ 'id' => (int)$menu_id ] ); - } - - public static function menu_save( $menu_id, $name, $status ) - { - global $mdb; - - $status == 'on' ? $status = 1 : $status = 0; - - if ( !$menu_id ) - { - return $mdb -> insert( 'pp_menus', [ - 'name' => $name, - 'status' => $status - ] ); - } - else - { - $mdb -> update( 'pp_menus', [ - 'name' => $name, - 'status' => $status - ], [ - 'id' => (int)$menu_id - ] ); - - return true; - } - return false; - } - - public static function menu_lists() - { - global $mdb; - return $mdb -> select( 'pp_menus', '*', [ 'ORDER' => [ 'id' => 'ASC' ] ] ); - } - - public static function page_details( $page_id ) - { - global $mdb; - - $page = $mdb -> get( 'pp_pages', '*', [ 'id' => (int)$page_id ] ); - - $results = $mdb -> select( 'pp_pages_langs', '*', [ 'page_id' => (int)$page_id ] ); - if ( is_array( $results ) ) foreach ( $results as $row ) - $page['languages'][ $row['lang_id'] ] = $row; - - $page['layout_id'] = $mdb -> get( 'pp_layouts_pages', 'layout_id', [ 'page_id' => (int)$page_id ] ); - - return $page; - } - - public static function page_url( $page_id ) - { - global $mdb; - - $results = $mdb -> query( "SELECT seo_link FROM pp_pages_langs AS ppl, pp_langs AS pl WHERE lang_id = pl.id AND page_id = " . (int)$page_id . " AND seo_link != '' ORDER BY o ASC LIMIT 1" ) -> fetchAll(); - if ( !$results[0]['seo_link'] ) - { - $title = self::page_title( $article_id ); - return 's-' . $page_id . '-' . \S::seo( $title ); - } - else - return $results[0]['seo_link']; - } - - public static function page_title( $page_id ) - { - global $mdb; - - $result = $mdb -> select( 'pp_pages_langs', [ - '[><]pp_langs' => [ 'lang_id' => 'id' ] - ], 'title', [ - 'AND' => [ - 'page_id' => (int)$page_id, 'title[!]' => '' - ], - 'ORDER' => [ 'o' => 'ASC' ], - 'LIMIT' => 1 - ] ); - return $result[0]; - } - - public static function page_languages( $page_id ) - { - global $mdb; - return $mdb -> select( 'pp_pages_langs', '*', - [ 'AND' => [ 'page_id' => (int) $page_id, 'title[!]' => null ] ] ); - } - - public static function menu_pages( $menu_id, $parent_id = null ) - { - global $mdb; - - $results = $mdb -> select( 'pp_pages', - [ 'id', 'menu_id', 'status', 'parent_id', 'start' ], - [ 'AND' => [ 'menu_id' => $menu_id, 'parent_id' => $parent_id ], 'ORDER' => [ 'o' => 'ASC' ] ] ); - if ( is_array( $results ) ) foreach ( $results as $row ) - { - $row['title'] = self::page_title( $row['id'] ); - $row['languages'] = self::page_languages( $row['id'] ); - $row['subpages'] = self::menu_pages( $menu_id, $row['id'] ); - - $pages[] = $row; - } - - return $pages; - } -} -?> \ No newline at end of file diff --git a/autoload/admin/view/class.Pages.php b/autoload/admin/view/class.Pages.php deleted file mode 100644 index 256f64e..0000000 --- a/autoload/admin/view/class.Pages.php +++ /dev/null @@ -1,37 +0,0 @@ - pages = $pages; - $tpl -> parent_id = $parent_id; - $tpl -> step = $step; - return $tpl -> render( 'pages/subpages-browse-list' ); - } - - public static function browse_list( $menus ) - { - $tpl = new \Tpl; - $tpl -> menus = $menus; - return $tpl -> render( 'pages/pages-browse-list' ); - } - - public static function page_articles( $page_id, $articles ) - { - $tpl = new \Tpl; - $tpl -> page_id = $page_id; - $tpl -> articles = $articles; - return $tpl -> render( 'pages/page-articles' ); - } - - public static function menu_edit( $menu ) - { - $tpl = new \Tpl; - $tpl -> menu = $menu; - return $tpl -> render( 'pages/menu-edit' ); - } -} -?> \ No newline at end of file diff --git a/tests/Unit/Domain/Pages/PagesRepositoryTest.php b/tests/Unit/Domain/Pages/PagesRepositoryTest.php new file mode 100644 index 0000000..9733c92 --- /dev/null +++ b/tests/Unit/Domain/Pages/PagesRepositoryTest.php @@ -0,0 +1,66 @@ +createMock(\medoo::class); + + $mockDb->expects($this->once()) + ->method('select') + ->with('pp_menus', '*', ['ORDER' => ['id' => 'ASC']]) + ->willReturn([ + ['id' => 1, 'name' => 'Main'], + ]); + + $repository = new PagesRepository($mockDb); + $menus = $repository->menusList(); + + $this->assertCount(1, $menus); + $this->assertSame(1, (int)$menus[0]['id']); + $this->assertSame('Main', (string)$menus[0]['name']); + } + + public function testMenuDeleteReturnsFalseWhenMenuHasPages(): void + { + $mockDb = $this->createMock(\medoo::class); + + $mockDb->expects($this->once()) + ->method('count') + ->with('pp_pages', ['menu_id' => 3]) + ->willReturn(2); + + $mockDb->expects($this->never())->method('delete'); + + $repository = new PagesRepository($mockDb); + $this->assertFalse($repository->menuDelete(3)); + } + + public function testGenerateSeoLinkAddsSuffixWhenBaseSlugExists(): void + { + $mockDb = $this->createMock(\medoo::class); + + $mockDb->expects($this->exactly(4)) + ->method('count') + ->willReturnOnConsecutiveCalls(1, 0, 0, 0); + + $repository = new PagesRepository($mockDb); + $seoLink = $repository->generateSeoLink('test title', 0, 0, 0); + + $this->assertSame('test title-1', $seoLink); + } + + public function testPageUrlPreviewBuildsLanguagePrefixedUrlForNonDefaultLanguage(): void + { + $mockDb = $this->createMock(\medoo::class); + $repository = new PagesRepository($mockDb); + + $url = $repository->pageUrlPreview(5, 'en', 'About us', 'about-us', 'pl'); + + $this->assertSame('/en/about-us', $url); + } +} diff --git a/tests/Unit/admin/Controllers/ArticlesControllerTest.php b/tests/Unit/admin/Controllers/ArticlesControllerTest.php index 4051585..503f474 100644 --- a/tests/Unit/admin/Controllers/ArticlesControllerTest.php +++ b/tests/Unit/admin/Controllers/ArticlesControllerTest.php @@ -6,12 +6,14 @@ use admin\Controllers\ArticlesController; use Domain\Article\ArticleRepository; use Domain\Languages\LanguagesRepository; use Domain\Layouts\LayoutsRepository; +use Domain\Pages\PagesRepository; class ArticlesControllerTest extends TestCase { private $mockRepository; private $mockLanguagesRepository; private $mockLayoutsRepository; + private $mockPagesRepository; private $controller; protected function setUp(): void @@ -19,10 +21,12 @@ class ArticlesControllerTest extends TestCase $this->mockRepository = $this->createMock(ArticleRepository::class); $this->mockLanguagesRepository = $this->createMock(LanguagesRepository::class); $this->mockLayoutsRepository = $this->createMock(LayoutsRepository::class); + $this->mockPagesRepository = $this->createMock(PagesRepository::class); $this->controller = new ArticlesController( $this->mockRepository, $this->mockLanguagesRepository, - $this->mockLayoutsRepository + $this->mockLayoutsRepository, + $this->mockPagesRepository ); } @@ -36,7 +40,8 @@ class ArticlesControllerTest extends TestCase $controller = new ArticlesController( $this->mockRepository, $this->mockLanguagesRepository, - $this->mockLayoutsRepository + $this->mockLayoutsRepository, + $this->mockPagesRepository ); $this->assertInstanceOf(ArticlesController::class, $controller); } @@ -124,9 +129,10 @@ class ArticlesControllerTest extends TestCase $constructor = $reflection->getConstructor(); $params = $constructor->getParameters(); - $this->assertCount(3, $params); + $this->assertCount(4, $params); $this->assertEquals('Domain\Article\ArticleRepository', $params[0]->getType()->getName()); $this->assertEquals('Domain\Languages\LanguagesRepository', $params[1]->getType()->getName()); $this->assertEquals('Domain\Layouts\LayoutsRepository', $params[2]->getType()->getName()); + $this->assertEquals('Domain\Pages\PagesRepository', $params[3]->getType()->getName()); } } diff --git a/tests/Unit/admin/Controllers/PagesControllerTest.php b/tests/Unit/admin/Controllers/PagesControllerTest.php new file mode 100644 index 0000000..bcfdfee --- /dev/null +++ b/tests/Unit/admin/Controllers/PagesControllerTest.php @@ -0,0 +1,82 @@ +mockRepository = $this->createMock(PagesRepository::class); + $this->mockLanguagesRepository = $this->createMock(LanguagesRepository::class); + $this->mockLayoutsRepository = $this->createMock(LayoutsRepository::class); + + $this->controller = new PagesController( + $this->mockRepository, + $this->mockLanguagesRepository, + $this->mockLayoutsRepository + ); + } + + public function testConstructorAcceptsRepositories(): void + { + $controller = new PagesController( + $this->mockRepository, + $this->mockLanguagesRepository, + $this->mockLayoutsRepository + ); + + $this->assertInstanceOf(PagesController::class, $controller); + } + + public function testHasMainActionMethods(): void + { + $this->assertTrue(method_exists($this->controller, 'list')); + $this->assertTrue(method_exists($this->controller, 'edit')); + $this->assertTrue(method_exists($this->controller, 'save')); + $this->assertTrue(method_exists($this->controller, 'delete')); + $this->assertTrue(method_exists($this->controller, 'menuEdit')); + $this->assertTrue(method_exists($this->controller, 'menuSave')); + $this->assertTrue(method_exists($this->controller, 'menuDelete')); + $this->assertTrue(method_exists($this->controller, 'savePagesOrder')); + $this->assertTrue(method_exists($this->controller, 'saveArticlesOrder')); + $this->assertTrue(method_exists($this->controller, 'generateSeoLink')); + } + + public function testActionMethodReturnTypes(): void + { + $reflection = new \ReflectionClass($this->controller); + + $this->assertEquals('string', (string)$reflection->getMethod('list')->getReturnType()); + $this->assertEquals('string', (string)$reflection->getMethod('edit')->getReturnType()); + $this->assertEquals('void', (string)$reflection->getMethod('save')->getReturnType()); + $this->assertEquals('void', (string)$reflection->getMethod('delete')->getReturnType()); + $this->assertEquals('string', (string)$reflection->getMethod('menuEdit')->getReturnType()); + $this->assertEquals('void', (string)$reflection->getMethod('menuSave')->getReturnType()); + $this->assertEquals('void', (string)$reflection->getMethod('menuDelete')->getReturnType()); + $this->assertEquals('void', (string)$reflection->getMethod('savePagesOrder')->getReturnType()); + $this->assertEquals('void', (string)$reflection->getMethod('saveArticlesOrder')->getReturnType()); + $this->assertEquals('void', (string)$reflection->getMethod('generateSeoLink')->getReturnType()); + } + + public function testConstructorRequiresPagesLanguagesAndLayoutsRepositories(): void + { + $reflection = new \ReflectionClass(PagesController::class); + $constructor = $reflection->getConstructor(); + $params = $constructor->getParameters(); + + $this->assertCount(3, $params); + $this->assertEquals('Domain\Pages\PagesRepository', $params[0]->getType()->getName()); + $this->assertEquals('Domain\Languages\LanguagesRepository', $params[1]->getType()->getName()); + $this->assertEquals('Domain\Layouts\LayoutsRepository', $params[2]->getType()->getName()); + } +} diff --git a/updates/0.20/ver_0.262.zip b/updates/0.20/ver_0.262.zip new file mode 100644 index 0000000000000000000000000000000000000000..125fc6e80d4e882a00f0d5ca408cf9c0ea840139 GIT binary patch literal 76773 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
    covV^EHtNj1A&qeL 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 literal 0 HcmV?d00001 diff --git a/updates/0.20/ver_0.262_files.txt b/updates/0.20/ver_0.262_files.txt new file mode 100644 index 0000000..d2b4e2f --- /dev/null +++ b/updates/0.20/ver_0.262_files.txt @@ -0,0 +1,4 @@ +F: ../admin/ajax/pages.php +F: ../autoload/admin/controls/class.Pages.php +F: ../autoload/admin/factory/class.Pages.php +F: ../autoload/admin/view/class.Pages.php diff --git a/updates/changelog.php b/updates/changelog.php index fd44740..b0795e6 100644 --- a/updates/changelog.php +++ b/updates/changelog.php @@ -1,4 +1,11 @@ -ver. 0.261 - 13.02.2026
    +ver. 0.262 - 13.02.2026
    +- NEW - migracja modulu `Pages` do architektury Domain + DI (`Domain\\Pages\\PagesRepository`, `admin\\Controllers\\PagesController`) +- UPDATE - widoki `/admin/pages/*` przepiete na nowy routing i komponent `components/form-edit` (menu/page edit) +- FIX - przywrocony przycisk generowania linku SEO w edycji strony (zakladka SEO, pola jezykowe) +- FIX - popup potwierdzenia usuwania menu/strony ujednolicony z `table-list-confirm-dialog` + poprawione polskie znaki +- CLEANUP - usuniete legacy pliki Pages: `admin/ajax/pages.php`, `autoload/admin/controls/class.Pages.php`, `autoload/admin/factory/class.Pages.php`, `autoload/admin/view/class.Pages.php` +- UPDATE - pliki aktualizacji: `updates/0.20/ver_0.262.zip`, `ver_0.262_files.txt` +
    ver. 0.261 - 13.02.2026
    - UPDATE - finalizacja refaktoryzacji modulu `Articles` (`/admin/articles`) w warstwie Domain + DI - UPDATE - nowe akcje AJAX w `admin\Controllers\ArticlesController` (m.in. `files_order_save`) - UPDATE - sortowanie zalacznikow i zdjec w edycji artykulu (drag&drop + zapis kolejnosci przy pierwszym zapisie) @@ -430,3 +437,4 @@ + diff --git a/updates/versions.php b/updates/versions.php index 1febe04..342bc96 100644 --- a/updates/versions.php +++ b/updates/versions.php @@ -1,5 +1,5 @@