ver. 0.283: Legacy class cleanup — S, Html, Email, Image, Log, Mobile_Detect → Shared namespace

- Migrate class.S → Shared\Helpers\Helpers (140+ files), remove 12 unused methods
- Migrate class.Html → Shared\Html\Html
- Migrate class.Email → Shared\Email\Email
- Migrate class.Image → Shared\Image\ImageManipulator
- Delete class.Log (unused), class.Mobile_Detect (outdated UA detection)
- Remove grid library loading from admin (index.php, ajax.php)
- Replace gridEdit usage in 10 admin templates with grid-edit-replacement.php
- Fix grid-edit-replacement.php AJAX to send values as JSON (grid.js compat)
- Remove mobile layout conditionals (m_html/m_css/m_js) from Site + LayoutsRepository
- Remove \Log::save_log() calls from OrderAdminService, ShopOrder, Order

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-02-16 23:06:06 +01:00
parent 8e97413361
commit 431add234c
159 changed files with 1501 additions and 3043 deletions

View File

@@ -12,8 +12,8 @@ class App
public static function finalize_admin_login( array $user, string $domain, string $cookie_name, bool $remember = false )
{
\S::set_session( 'user', $user );
\S::delete_session( 'twofa_pending' );
\Shared\Helpers\Helpers::set_session( 'user', $user );
\Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
if ( $remember ) {
$payloadArr = [
@@ -40,7 +40,7 @@ class App
{
global $mdb;
$sa = \S::get( 's-action' );
$sa = \Shared\Helpers\Helpers::get( 's-action' );
if ( !$sa ) return;
$domain = preg_replace( '/^www\./', '', $_SERVER['SERVER_NAME'] );
@@ -50,8 +50,8 @@ class App
switch ( $sa )
{
case 'user-logon':
$login = \S::get( 'login' );
$pass = \S::get( 'password' );
$login = \Shared\Helpers\Helpers::get( 'login' );
$pass = \Shared\Helpers\Helpers::get( 'password' );
$result = $users->logon( $login, $pass );
if ( $result == 1 )
@@ -60,17 +60,17 @@ class App
if ( $user['twofa_enabled'] == 1 )
{
\S::set_session( 'twofa_pending', [
\Shared\Helpers\Helpers::set_session( 'twofa_pending', [
'uid' => (int) $user['id'],
'login' => $login,
'remember' => (bool) \S::get( 'remember' ),
'remember' => (bool) \Shared\Helpers\Helpers::get( 'remember' ),
'started' => time(),
] );
if ( !$users->sendTwofaCode( (int) $user['id'] ) )
{
\S::alert( 'Nie udało się wysłać kodu 2FA. Spróbuj ponownie.' );
\S::delete_session( 'twofa_pending' );
\Shared\Helpers\Helpers::alert( 'Nie udało się wysłać kodu 2FA. Spróbuj ponownie.' );
\Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
header( 'Location: /admin/' );
exit;
}
@@ -79,38 +79,38 @@ class App
exit;
}
self::finalize_admin_login( $user, $domain, $cookie_name, (bool) \S::get( 'remember' ) );
self::finalize_admin_login( $user, $domain, $cookie_name, (bool) \Shared\Helpers\Helpers::get( 'remember' ) );
header( 'Location: /admin/articles/list/' );
exit;
}
if ( $result == -1 )
\S::alert( 'Z powodu 5 nieudanych prób Twoje konto zostało zablokowane.' );
\Shared\Helpers\Helpers::alert( 'Z powodu 5 nieudanych prób Twoje konto zostało zablokowane.' );
else
\S::alert( 'Podane hasło jest nieprawidłowe lub użytkownik nie istnieje.' );
\Shared\Helpers\Helpers::alert( 'Podane hasło jest nieprawidłowe lub użytkownik nie istnieje.' );
header( 'Location: /admin/' );
exit;
case 'user-2fa-verify':
$pending = \S::get_session( 'twofa_pending' );
$pending = \Shared\Helpers\Helpers::get_session( 'twofa_pending' );
if ( !$pending || empty( $pending['uid'] ) ) {
\S::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
\Shared\Helpers\Helpers::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
header( 'Location: /admin/' );
exit;
}
$code = trim( (string) \S::get( 'twofa' ) );
$code = trim( (string) \Shared\Helpers\Helpers::get( 'twofa' ) );
if ( !preg_match( '/^\d{6}$/', $code ) )
{
\S::alert( 'Nieprawidłowy format kodu.' );
\Shared\Helpers\Helpers::alert( 'Nieprawidłowy format kodu.' );
header( 'Location: /admin/user/twofa/' );
exit;
}
if ( !$users->verifyTwofaCode( (int) $pending['uid'], $code ) )
{
\S::alert( 'Błędny lub wygasły kod.' );
\Shared\Helpers\Helpers::alert( 'Błędny lub wygasły kod.' );
header( 'Location: /admin/user/twofa/' );
exit;
}
@@ -121,18 +121,18 @@ class App
exit;
case 'user-2fa-resend':
$pending = \S::get_session( 'twofa_pending' );
$pending = \Shared\Helpers\Helpers::get_session( 'twofa_pending' );
if ( !$pending || empty( $pending['uid'] ) )
{
\S::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
\Shared\Helpers\Helpers::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
header( 'Location: /admin/' );
exit;
}
if ( !$users->sendTwofaCode( (int) $pending['uid'], true ) )
\S::alert( 'Kod można wysłać ponownie po krótkiej przerwie.' );
\Shared\Helpers\Helpers::alert( 'Kod można wysłać ponownie po krótkiej przerwie.' );
else
\S::alert( 'Nowy kod został wysłany.' );
\Shared\Helpers\Helpers::alert( 'Nowy kod został wysłany.' );
header( 'Location: /admin/user/twofa/' );
exit;
@@ -146,7 +146,7 @@ class App
'httponly' => true,
'samesite' => 'Lax',
] );
\S::delete_session( 'twofa_pending' );
\Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
session_destroy();
header( 'Location: /admin/' );
exit;
@@ -160,7 +160,7 @@ class App
{
global $user;
if ( \S::get( 'module' ) === 'user' && \S::get( 'action' ) === 'twofa' ) {
if ( \Shared\Helpers\Helpers::get( 'module' ) === 'user' && \Shared\Helpers\Helpers::get( 'action' ) === 'twofa' ) {
$controller = self::createController( 'Users' );
return $controller->twofa();
}
@@ -183,22 +183,22 @@ class App
{
$_SESSION['admin'] = true;
if ( \S::get( 'p' ) )
\S::set_session( 'p', \S::get( 'p' ) );
if ( \Shared\Helpers\Helpers::get( 'p' ) )
\Shared\Helpers\Helpers::set_session( 'p', \Shared\Helpers\Helpers::get( 'p' ) );
// Budowanie nazwy modułu: shop_product → ShopProduct
$moduleName = '';
$parts = explode( '_', (string) \S::get( 'module' ) );
$parts = explode( '_', (string) \Shared\Helpers\Helpers::get( 'module' ) );
foreach ( $parts as $part )
$moduleName .= ucfirst( $part );
$action = \S::get( 'action' );
$action = \Shared\Helpers\Helpers::get( 'action' );
$controller = self::createController( $moduleName );
if ( $controller && method_exists( $controller, $action ) )
return $controller->$action();
\S::alert( 'Nieprawidłowy adres url.' );
\Shared\Helpers\Helpers::alert( 'Nieprawidłowy adres url.' );
return false;
}

View File

@@ -117,8 +117,8 @@ class ArticlesArchiveController
public function restore(): void
{
if ($this->repository->restore((int)\S::get('id'))) {
\S::alert('Artykul zostal przywrocony.');
if ($this->repository->restore((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Artykul zostal przywrocony.');
}
header('Location: /admin/articles_archive/list/');
@@ -132,8 +132,8 @@ class ArticlesArchiveController
public function delete(): void
{
if ($this->repository->deletePermanently((int)\S::get('id'))) {
\S::alert('Artykul zostal trwale usuniety.');
if ($this->repository->deletePermanently((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Artykul zostal trwale usuniety.');
}
header('Location: /admin/articles_archive/list/');

View File

@@ -156,7 +156,7 @@ class ArticlesController
*/
public function galleryOrderSave(): void
{
if ($this->repository->saveGalleryOrder((int)\S::get('article_id'), (string)\S::get('order'))) {
if ($this->repository->saveGalleryOrder((int)\Shared\Helpers\Helpers::get('article_id'), (string)\Shared\Helpers\Helpers::get('order'))) {
echo json_encode(['status' => 'ok', 'msg' => 'Artykul zostal zapisany.']);
}
@@ -168,7 +168,7 @@ class ArticlesController
*/
public function filesOrderSave(): void
{
if ($this->repository->saveFilesOrder((int)\S::get('article_id'), (string)\S::get('order'))) {
if ($this->repository->saveFilesOrder((int)\Shared\Helpers\Helpers::get('article_id'), (string)\Shared\Helpers\Helpers::get('order'))) {
echo json_encode(['status' => 'ok', 'msg' => 'Artykul zostal zapisany.']);
}
@@ -183,7 +183,7 @@ class ArticlesController
global $user;
$values = $this->resolveSavePayload();
$articleId = (int)($values['id'] ?? \S::get('id') ?? 0);
$articleId = (int)($values['id'] ?? \Shared\Helpers\Helpers::get('id') ?? 0);
$id = $this->repository->save($articleId, $values, (int)$user['id']);
if ($id) {
@@ -210,7 +210,7 @@ class ArticlesController
{
$response = ['status' => 'error', 'msg' => 'Podczas zmiany atrybutu alt zdjecia wystapil blad. Prosze sprobowac ponownie.'];
if ($this->repository->updateImageAlt((int)\S::get('image_id'), (string)\S::get('image_alt'))) {
if ($this->repository->updateImageAlt((int)\Shared\Helpers\Helpers::get('image_id'), (string)\Shared\Helpers\Helpers::get('image_alt'))) {
$response = ['status' => 'ok'];
}
@@ -222,7 +222,7 @@ class ArticlesController
{
$response = ['status' => 'error', 'msg' => 'Podczas zmiany nazwy zalacznika wystapil blad. Prosze sprobowac ponownie.'];
if ($this->repository->updateFileName((int)\S::get('file_id'), (string)\S::get('file_name'))) {
if ($this->repository->updateFileName((int)\Shared\Helpers\Helpers::get('file_id'), (string)\Shared\Helpers\Helpers::get('file_name'))) {
$response = ['status' => 'ok'];
}
@@ -234,7 +234,7 @@ class ArticlesController
{
$response = ['status' => 'error', 'msg' => 'Podczas usuwania zdjecia wystapil blad. Prosze sprobowac ponownie.'];
if ($this->repository->markImageToDelete((int)\S::get('image_id'))) {
if ($this->repository->markImageToDelete((int)\Shared\Helpers\Helpers::get('image_id'))) {
$response = ['status' => 'ok'];
}
@@ -246,7 +246,7 @@ class ArticlesController
{
$response = ['status' => 'error', 'msg' => 'Podczas usuwania zalacznika wystapil blad. Prosze sprobowac ponownie.'];
if ($this->repository->markFileToDelete((int)\S::get('file_id'))) {
if ($this->repository->markFileToDelete((int)\Shared\Helpers\Helpers::get('file_id'))) {
$response = ['status' => 'ok'];
}
@@ -259,8 +259,8 @@ class ArticlesController
*/
public function delete(): void
{
if ($this->repository->archive((int)\S::get('id'))) {
\S::alert('Artykul zostal przeniesiony do archiwum.');
if ($this->repository->archive((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Artykul zostal przeniesiony do archiwum.');
}
header('Location: /admin/articles/list/');
@@ -282,7 +282,7 @@ class ArticlesController
$this->repository->deleteNonassignedImages();
$this->repository->deleteNonassignedFiles();
$article = $this->repository->find((int)\S::get('id')) ?: ['id' => 0, 'languages' => [], 'images' => [], 'files' => [], 'pages' => []];
$article = $this->repository->find((int)\Shared\Helpers\Helpers::get('id')) ?: ['id' => 0, 'languages' => [], 'images' => [], 'files' => [], 'pages' => []];
$languages = $this->languagesRepository->languagesList();
$menus = $this->pagesRepository->menusList();
$layouts = $this->layoutsRepository->listAll();
@@ -298,7 +298,7 @@ class ArticlesController
private function resolveSavePayload(): array
{
$legacyValuesRaw = \S::get('values');
$legacyValuesRaw = \Shared\Helpers\Helpers::get('values');
if ($legacyValuesRaw !== null && $legacyValuesRaw !== '') {
$legacyValues = json_decode((string)$legacyValuesRaw, true);
if (is_array($legacyValues)) {

View File

@@ -55,7 +55,7 @@ class BannerController
// Historycznie lista banerow domyslnie byla sortowana rosnaco po nazwie.
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -164,7 +164,7 @@ class BannerController
*/
public function edit(): string
{
$bannerId = (int)\S::get('id');
$bannerId = (int)\Shared\Helpers\Helpers::get('id');
$banner = $this->repository->find($bannerId);
$languages = $this->languagesRepository->languagesList();
@@ -186,7 +186,7 @@ class BannerController
{
$response = ['success' => false, 'errors' => []];
$bannerId = (int)\S::get('id');
$bannerId = (int)\Shared\Helpers\Helpers::get('id');
$banner = $this->repository->find($bannerId);
$languages = $this->languagesRepository->languagesList();
@@ -228,10 +228,10 @@ class BannerController
*/
public function delete(): void
{
$bannerId = (int)\S::get('id');
$bannerId = (int)\Shared\Helpers\Helpers::get('id');
if ($this->repository->delete($bannerId)) {
\S::delete_dir('../temp/');
\S::alert('Baner zostal usuniety.');
\Shared\Helpers\Helpers::delete_dir('../temp/');
\Shared\Helpers\Helpers::alert('Baner zostal usuniety.');
}
header('Location: /admin/banners/list/');

View File

@@ -41,7 +41,7 @@ class DictionariesController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -118,7 +118,7 @@ class DictionariesController
public function edit(): string
{
$unitId = (int)\S::get('id');
$unitId = (int)\Shared\Helpers\Helpers::get('id');
$unit = $this->repository->find($unitId) ?? ['id' => 0, 'languages' => []];
$languages = $this->languagesRepository->languagesList();
@@ -134,7 +134,7 @@ class DictionariesController
public function save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode($legacyValues, true);
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania jednostki miary wystapil blad.'];
@@ -153,7 +153,7 @@ class DictionariesController
exit;
}
$unitId = (int)\S::get('id');
$unitId = (int)\Shared\Helpers\Helpers::get('id');
$unit = $this->repository->find($unitId) ?? ['id' => 0, 'languages' => []];
$languages = $this->languagesRepository->languagesList();
$viewModel = $this->buildFormViewModel($unit, $languages);
@@ -187,9 +187,9 @@ class DictionariesController
public function delete(): void
{
$unitId = (int)\S::get('id');
$unitId = (int)\Shared\Helpers\Helpers::get('id');
if ($this->repository->delete($unitId)) {
\S::alert('Jednostka miary zostala usunieta.');
\Shared\Helpers\Helpers::alert('Jednostka miary zostala usunieta.');
}
header('Location: /admin/dictionaries/list/');

View File

@@ -23,8 +23,8 @@ class IntegrationsController
public function apilo_settings_save(): void
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawien wystapil blad. Prosze sprobowac ponownie.' ];
$fieldId = \S::get( 'field_id' );
$value = \S::get( 'value' );
$fieldId = \Shared\Helpers\Helpers::get( 'field_id' );
$value = \Shared\Helpers\Helpers::get( 'value' );
if ( $this->repository->saveSetting( 'apilo', $fieldId, $value ) ) {
$response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.', 'value' => $value ];
@@ -81,17 +81,17 @@ class IntegrationsController
public function apilo_create_product(): void
{
$productId = (int) \S::get( 'product_id' );
$productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
$result = $this->repository->apiloCreateProduct( $productId );
\S::alert( (string)($result['message'] ?? 'Wystapil blad podczas tworzenia produktu w Apilo.') );
\Shared\Helpers\Helpers::alert( (string)($result['message'] ?? 'Wystapil blad podczas tworzenia produktu w Apilo.') );
header( 'Location: /admin/shop_product/view_list/' );
exit;
}
public function apilo_product_search(): void
{
$productId = (int) \S::get( 'product_id' );
$productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
$sku = $this->repository->getProductSku( $productId );
if ( !$sku ) {
@@ -105,7 +105,7 @@ class IntegrationsController
public function apilo_product_select_save(): void
{
if ( $this->repository->linkProduct( (int) \S::get( 'product_id' ), \S::get( 'apilo_product_id' ), \S::get( 'apilo_product_name' ) ) ) {
if ( $this->repository->linkProduct( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'apilo_product_id' ), \Shared\Helpers\Helpers::get( 'apilo_product_name' ) ) ) {
echo json_encode( [ 'status' => 'ok' ] );
} else {
echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas zapisywania produktu wystapil blad. Prosze sprobowac ponownie.' ] );
@@ -116,7 +116,7 @@ class IntegrationsController
public function apilo_product_select_delete(): void
{
if ( $this->repository->unlinkProduct( (int) \S::get( 'product_id' ) ) ) {
if ( $this->repository->unlinkProduct( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
echo json_encode( [ 'status' => 'ok' ] );
} else {
echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas usuwania produktu wystapil blad. Prosze sprobowac ponownie.' ] );
@@ -135,8 +135,8 @@ class IntegrationsController
public function shoppro_settings_save(): void
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawien wystapil blad. Prosze sprobowac ponownie.' ];
$fieldId = \S::get( 'field_id' );
$value = \S::get( 'value' );
$fieldId = \Shared\Helpers\Helpers::get( 'field_id' );
$value = \Shared\Helpers\Helpers::get( 'value' );
if ( $this->repository->saveSetting( 'shoppro', $fieldId, $value ) ) {
$response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.', 'value' => $value ];
@@ -148,10 +148,10 @@ class IntegrationsController
public function shoppro_product_import(): void
{
$productId = (int) \S::get( 'product_id' );
$productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
$result = $this->repository->shopproImportProduct( $productId );
\S::alert( (string)($result['message'] ?? 'Wystapil blad podczas importu produktu.') );
\Shared\Helpers\Helpers::alert( (string)($result['message'] ?? 'Wystapil blad podczas importu produktu.') );
header( 'Location: /admin/shop_product/view_list/' );
exit;
}
@@ -162,10 +162,10 @@ class IntegrationsController
if ( !empty( $result['success'] ) ) {
$count = (int)($result['count'] ?? 0);
\S::alert( $label . ' zostala pobrana. Liczba rekordow: ' . $count . '.' );
\Shared\Helpers\Helpers::alert( $label . ' zostala pobrana. Liczba rekordow: ' . $count . '.' );
} else {
$details = trim( (string)($result['message'] ?? 'Nieznany blad.') );
\S::alert(
\Shared\Helpers\Helpers::alert(
'Nie udalo sie pobrac ' . strtolower( $label ) . '. '
. $details
. ' Co zrobic: sprawdz konfiguracje Apilo, wykonaj autoryzacje i ponow pobranie listy.'

View File

@@ -57,7 +57,7 @@ class LanguagesController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -143,7 +143,7 @@ class LanguagesController
public function language_edit(): string
{
$languageId = trim((string)\S::get('id'));
$languageId = trim((string)\Shared\Helpers\Helpers::get('id'));
$language = $this->repository->languageDetails($languageId) ?? [];
$validationErrors = $_SESSION['form_errors'][$this->getLanguageFormId()] ?? null;
if ($validationErrors) {
@@ -157,7 +157,7 @@ class LanguagesController
public function language_save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania jezyka wystapil blad.'];
@@ -179,7 +179,7 @@ class LanguagesController
exit;
}
$languageId = trim((string)\S::get('id'));
$languageId = trim((string)\Shared\Helpers\Helpers::get('id'));
$language = $this->repository->languageDetails($languageId) ?? [];
$viewModel = $this->buildLanguageFormViewModel($language, $this->repository->maxOrder());
@@ -191,7 +191,7 @@ class LanguagesController
}
$data = $result['data'];
$requestId = strtolower(trim((string)\S::get('id')));
$requestId = strtolower(trim((string)\Shared\Helpers\Helpers::get('id')));
$idFromData = strtolower(trim((string)($data['id'] ?? '')));
$id = $idFromData !== '' ? $idFromData : $requestId;
if (!preg_match('/^[a-z]{2}$/', $id)) {
@@ -228,8 +228,8 @@ class LanguagesController
public function language_delete(): void
{
if ($this->repository->deleteLanguage((string)\S::get('id'))) {
\S::alert('Jezyk zostal usuniety.');
if ($this->repository->deleteLanguage((string)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Jezyk zostal usuniety.');
}
header('Location: /admin/languages/view_list/');
@@ -254,7 +254,7 @@ class LanguagesController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -331,7 +331,7 @@ class LanguagesController
public function translation_edit(): string
{
$translationId = (int)\S::get('id');
$translationId = (int)\Shared\Helpers\Helpers::get('id');
$translation = $this->repository->translationDetails($translationId) ?? [];
$languages = $this->repository->languagesList();
$validationErrors = $_SESSION['form_errors'][$this->getTranslationFormId()] ?? null;
@@ -346,7 +346,7 @@ class LanguagesController
public function translation_save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania tlumaczenia wystapil blad.'];
@@ -368,7 +368,7 @@ class LanguagesController
exit;
}
$translationId = (int)\S::get('id');
$translationId = (int)\Shared\Helpers\Helpers::get('id');
$translation = $this->repository->translationDetails($translationId) ?? [];
$languages = $this->repository->languagesList();
$viewModel = $this->buildTranslationFormViewModel($translation, $languages);
@@ -413,8 +413,8 @@ class LanguagesController
public function translation_delete(): void
{
if ($this->repository->deleteTranslation((int)\S::get('id'))) {
\S::alert('Tlumaczenie zostalo usuniete.');
if ($this->repository->deleteTranslation((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Tlumaczenie zostalo usuniete.');
}
header('Location: /admin/languages/translation_list/');
@@ -544,7 +544,7 @@ class LanguagesController
if (!isset($language['id'])) {
continue;
}
\S::delete_session('lang-' . (string)$language['id']);
\Shared\Helpers\Helpers::delete_session('lang-' . (string)$language['id']);
}
}

View File

@@ -54,7 +54,7 @@ class LayoutsController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -136,7 +136,7 @@ class LayoutsController
public function edit(): string
{
return \Tpl::view('layouts/layout-edit', [
'layout' => $this->repository->find((int)\S::get('id')),
'layout' => $this->repository->find((int)\Shared\Helpers\Helpers::get('id')),
'menus' => $this->repository->menusWithPages(),
'categories' => $this->repository->categoriesTree(),
'dlang' => $this->languagesRepository->defaultLanguageId(),
@@ -146,7 +146,7 @@ class LayoutsController
public function save(): void
{
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania szablonu wystapil blad. Prosze sprobowac ponownie.'];
$values = json_decode((string)\S::get('values'), true);
$values = json_decode((string)\Shared\Helpers\Helpers::get('values'), true);
if (is_array($values)) {
$id = $this->repository->save($values);
@@ -161,8 +161,8 @@ class LayoutsController
public function delete(): void
{
if ($this->repository->delete((int)\S::get('id'))) {
\S::alert('Szablon zostal usuniety.');
if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Szablon zostal usuniety.');
}
header('Location: /admin/layouts/list/');

View File

@@ -60,7 +60,7 @@ class NewsletterController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -133,8 +133,8 @@ class NewsletterController
public function email_delete(): void
{
if ($this->repository->deleteSubscriber((int)\S::get('id'))) {
\S::alert('Adres email zostal usuniety.');
if ($this->repository->deleteSubscriber((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Adres email zostal usuniety.');
}
header('Location: /admin/newsletter/emails_list/');
@@ -148,7 +148,7 @@ class NewsletterController
public function prepare(): string
{
\S::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
\Shared\Helpers\Helpers::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
header('Location: /admin/newsletter/emails_list/');
exit;
}
@@ -160,7 +160,7 @@ class NewsletterController
public function send(): void
{
\S::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
\Shared\Helpers\Helpers::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
header('Location: /admin/newsletter/emails_list/');
exit;
}
@@ -180,7 +180,7 @@ class NewsletterController
public function settings_save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
if (!is_array($values)) {
@@ -189,7 +189,7 @@ class NewsletterController
}
$this->repository->saveSettings($values);
\S::alert('Ustawienia zostaly zapisane.');
\Shared\Helpers\Helpers::alert('Ustawienia zostaly zapisane.');
echo json_encode(['status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.']);
exit;
@@ -204,7 +204,7 @@ class NewsletterController
}
$this->repository->saveSettings($result['data']);
\S::alert('Ustawienia zostaly zapisane.');
\Shared\Helpers\Helpers::alert('Ustawienia zostaly zapisane.');
echo json_encode([
'success' => true,
@@ -215,7 +215,7 @@ class NewsletterController
public function email_templates_user(): string
{
\S::alert('Funkcjonalnosc "Szablony uzytkownika" jest tymczasowo wylaczona.');
\Shared\Helpers\Helpers::alert('Funkcjonalnosc "Szablony uzytkownika" jest tymczasowo wylaczona.');
header('Location: /admin/newsletter/email_templates_admin/');
exit;
}
@@ -230,9 +230,9 @@ class NewsletterController
public function email_template_edit(): string
{
$template = $this->repository->templateDetails((int)\S::get('id'));
$template = $this->repository->templateDetails((int)\Shared\Helpers\Helpers::get('id'));
if (!is_array($template) || (int)($template['is_admin'] ?? 0) !== 1) {
\S::alert('Dostepne sa tylko szablony administracyjne.');
\Shared\Helpers\Helpers::alert('Dostepne sa tylko szablony administracyjne.');
header('Location: /admin/newsletter/email_templates_admin/');
exit;
}
@@ -250,7 +250,7 @@ class NewsletterController
public function template_save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania wystapil blad.'];
@@ -275,7 +275,7 @@ class NewsletterController
exit;
}
$template = $this->repository->templateDetails((int)\S::get('id'));
$template = $this->repository->templateDetails((int)\Shared\Helpers\Helpers::get('id'));
if (!is_array($template) || (int)($template['is_admin'] ?? 0) !== 1) {
echo json_encode([
'success' => false,
@@ -317,7 +317,7 @@ class NewsletterController
public function email_template_delete(): void
{
\S::alert('Usuwanie szablonow uzytkownika jest tymczasowo wylaczone.');
\Shared\Helpers\Helpers::alert('Usuwanie szablonow uzytkownika jest tymczasowo wylaczone.');
header('Location: /admin/newsletter/email_templates_admin/');
exit;
}
@@ -436,7 +436,7 @@ class NewsletterController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}

View File

@@ -45,7 +45,7 @@ class PagesController
return \Tpl::view('pages/pages-browse-list', [
'menus' => $menus,
'modal' => \S::get('modal'),
'modal' => \Shared\Helpers\Helpers::get('modal'),
'cookie_pages' => $this->cookieState('cookie_pages'),
'cookie_menus' => $this->cookieState('cookie_menus'),
]);
@@ -58,7 +58,7 @@ class PagesController
public function menuEdit(): string
{
$menu = $this->repository->menuDetails((int)\S::get('id'));
$menu = $this->repository->menuDetails((int)\Shared\Helpers\Helpers::get('id'));
return \Tpl::view('pages/menu-edit', [
'form' => $this->buildMenuFormViewModel($menu),
@@ -67,7 +67,7 @@ class PagesController
public function menuSave(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania menu wystapil blad. Prosze sprobowac ponownie.'];
$values = json_decode((string)$legacyValues, true);
@@ -84,9 +84,9 @@ class PagesController
exit;
}
$menuId = (int)\S::get('id');
$name = trim((string)\S::get('name'));
$status = \S::get('status');
$menuId = (int)\Shared\Helpers\Helpers::get('id');
$name = trim((string)\Shared\Helpers\Helpers::get('name'));
$status = \Shared\Helpers\Helpers::get('status');
if ($name === '') {
echo json_encode([
@@ -155,10 +155,10 @@ class PagesController
public function menuDelete(): void
{
if ($this->repository->menuDelete((int)\S::get('id'))) {
\S::set_message('Menu zostało usunięte.');
if ($this->repository->menuDelete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::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.');
\Shared\Helpers\Helpers::alert('Podczas usuwania menu wystąpił błąd. Aby usunąć menu, nie może ono posiadać przypiętych stron.');
}
header('Location: /admin/pages/list/');
@@ -167,9 +167,9 @@ class PagesController
public function edit(): string
{
$page = $this->repository->pageDetails((int)\S::get('id'));
$parentId = (int)\S::get('pid');
$menuId = (int)\S::get('menu_id');
$page = $this->repository->pageDetails((int)\Shared\Helpers\Helpers::get('id'));
$parentId = (int)\Shared\Helpers\Helpers::get('pid');
$menuId = (int)\Shared\Helpers\Helpers::get('menu_id');
$menus = $this->repository->menusList();
$layouts = $this->layoutsRepository->listAll();
$languages = $this->languagesRepository->languagesList();
@@ -188,7 +188,7 @@ class PagesController
public function save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania strony wystapil blad. Prosze sprobowac ponownie.'];
$values = json_decode((string)$legacyValues, true);
@@ -210,13 +210,13 @@ class PagesController
$data = $_POST;
if (!isset($data['id']) || $data['id'] === '') {
$data['id'] = (int)\S::get('id');
$data['id'] = (int)\Shared\Helpers\Helpers::get('id');
}
if (!isset($data['parent_id']) || $data['parent_id'] === '') {
$data['parent_id'] = (int)\S::get('pid');
$data['parent_id'] = (int)\Shared\Helpers\Helpers::get('pid');
}
if ((!isset($data['menu_id']) || $data['menu_id'] === '') && (int)\S::get('menu_id') > 0) {
$data['menu_id'] = (int)\S::get('menu_id');
if ((!isset($data['menu_id']) || $data['menu_id'] === '') && (int)\Shared\Helpers\Helpers::get('menu_id') > 0) {
$data['menu_id'] = (int)\Shared\Helpers\Helpers::get('menu_id');
}
$savedId = $this->repository->pageSave($data);
@@ -524,10 +524,10 @@ class PagesController
public function delete(): void
{
if ($this->repository->pageDelete((int)\S::get('id'))) {
\S::set_message('Strona zostala usunieta.');
if ($this->repository->pageDelete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::set_message('Strona zostala usunieta.');
} else {
\S::alert('Podczas usuwania strony wystapil blad. Aby usunac strone nie moze ona posiadac przypietych podstron.');
\Shared\Helpers\Helpers::alert('Podczas usuwania strony wystapil blad. Aby usunac strone nie moze ona posiadac przypietych podstron.');
}
header('Location: /admin/pages/list/');
@@ -536,7 +536,7 @@ class PagesController
public function pageArticles(): string
{
$pageId = (int)\S::get('id');
$pageId = (int)\Shared\Helpers\Helpers::get('id');
return \Tpl::view('pages/page-articles', [
'page_id' => $pageId,
'articles' => $this->repository->pageArticles($pageId),
@@ -547,7 +547,7 @@ class PagesController
{
$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'))) {
if ($this->repository->savePagesOrder((int)\Shared\Helpers\Helpers::get('menu_id'), \Shared\Helpers\Helpers::get('pages'))) {
$response = ['status' => 'ok'];
}
@@ -559,7 +559,7 @@ class PagesController
{
$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'))) {
if ($this->repository->saveArticlesOrder((int)\Shared\Helpers\Helpers::get('page_id'), \Shared\Helpers\Helpers::get('articles'))) {
$response = ['status' => 'ok'];
}
@@ -572,10 +572,10 @@ class PagesController
$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')
(string)\Shared\Helpers\Helpers::get('title'),
(int)\Shared\Helpers\Helpers::get('page_id'),
(int)\Shared\Helpers\Helpers::get('article_id'),
(int)\Shared\Helpers\Helpers::get('category_id')
);
if ($seoLink !== '') {
@@ -591,13 +591,13 @@ class PagesController
public function cookieMenus(): void
{
$this->repository->toggleCookieValue('cookie_menus', (int)\S::get('menu_id'));
$this->repository->toggleCookieValue('cookie_menus', (int)\Shared\Helpers\Helpers::get('menu_id'));
exit;
}
public function cookiePages(): void
{
$this->repository->toggleCookieValue('cookie_pages', (int)\S::get('page_id'));
$this->repository->toggleCookieValue('cookie_pages', (int)\Shared\Helpers\Helpers::get('page_id'));
exit;
}

View File

@@ -154,10 +154,10 @@ class ProductArchiveController
public function unarchive(): void
{
if ( $this->productRepository->unarchive( (int) \S::get( 'product_id' ) ) )
\S::alert( 'Produkt został przywrócony z archiwum.' );
if ( $this->productRepository->unarchive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) )
\Shared\Helpers\Helpers::alert( 'Produkt został przywrócony z archiwum.' );
else
\S::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
\Shared\Helpers\Helpers::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
header( 'Location: /admin/product_archive/list/' );
exit;

View File

@@ -51,7 +51,7 @@ class ScontainersController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'DESC';
}
@@ -137,7 +137,7 @@ class ScontainersController
public function edit(): string
{
$container = $this->repository->find((int)\S::get('id'));
$container = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
$languages = $this->languagesRepository->languagesList();
$validationErrors = $_SESSION['form_errors'][$this->formId()] ?? null;
if ($validationErrors) {
@@ -156,7 +156,7 @@ class ScontainersController
public function save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
$response = ['status' => 'error', 'msg' => 'Podczas zapisywania kontenera wystapil blad.'];
@@ -172,7 +172,7 @@ class ScontainersController
exit;
}
$container = $this->repository->find((int)\S::get('id'));
$container = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
$languages = $this->languagesRepository->languagesList();
$form = $this->buildFormViewModel($container, $languages);
@@ -214,8 +214,8 @@ class ScontainersController
public function delete(): void
{
if ($this->repository->delete((int)\S::get('id'))) {
\S::alert('Kontener zostal usuniety.');
if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Kontener zostal usuniety.');
}
header('Location: /admin/scontainers/list/');

View File

@@ -30,16 +30,16 @@ class SettingsController
*/
public function clearCache(): void
{
\S::delete_dir('../temp/');
\S::delete_dir('../thumbs/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../thumbs/');
$redis = \Shared\Cache\RedisConnection::getInstance()->getConnection();
if ($redis) {
$redis->flushAll();
}
\S::alert('Cache został wyczyszczony.');
\S::htacces();
\Shared\Helpers\Helpers::alert('Cache został wyczyszczony.');
\Shared\Helpers\Helpers::htacces();
header('Location: /admin/dashboard/main_view/');
exit;
@@ -51,15 +51,15 @@ class SettingsController
public function clearCacheAjax(): void
{
try {
\S::delete_dir('../temp/');
\S::delete_dir('../thumbs/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../thumbs/');
$redis = \Shared\Cache\RedisConnection::getInstance()->getConnection();
if ($redis) {
$redis->flushAll();
}
\S::htacces();
\Shared\Helpers\Helpers::htacces();
echo json_encode(['status' => 'success', 'message' => 'Cache został wyczyszczony.']);
} catch (\Exception $e) {
@@ -75,7 +75,7 @@ class SettingsController
{
global $mdb;
$phrase = trim((string)\S::get('q'));
$phrase = trim((string)\Shared\Helpers\Helpers::get('q'));
if ($phrase === '' || mb_strlen($phrase) < 2) {
echo json_encode([
'status' => 'ok',
@@ -227,13 +227,13 @@ class SettingsController
public function save(): void
{
// Kompatybilnosc wsteczna dla legacy gridEdit (values jako JSON).
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode($legacyValues, true);
$result = $this->settingsRepository->saveSettings(is_array($values) ? $values : []);
\S::delete_dir('../temp/');
\S::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
echo json_encode($result);
exit;
@@ -253,8 +253,8 @@ class SettingsController
$values = $this->transformFormDataToSettings($result['data']);
$saveResult = $this->settingsRepository->saveSettings($values);
\S::delete_dir('../temp/');
\S::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
echo json_encode([
'success' => ($saveResult['status'] ?? '') === 'ok',

View File

@@ -50,7 +50,7 @@ class ShopAttributeController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -150,7 +150,7 @@ class ShopAttributeController
public function edit(): string
{
$attribute = $this->repository->findAttribute((int)\S::get('id'));
$attribute = $this->repository->findAttribute((int)\Shared\Helpers\Helpers::get('id'));
$languages = $this->languagesRepository->languagesList();
return \Tpl::view('shop-attribute/attribute-edit', [
@@ -165,7 +165,7 @@ class ShopAttributeController
'msg' => 'Podczas zapisywania atrybutu wystapil blad. Prosze sprobowac ponownie.',
];
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
if (is_array($values)) {
@@ -185,7 +185,7 @@ class ShopAttributeController
$payload = $_POST;
if (empty($payload['id'])) {
$routeId = (int)\S::get('id');
$routeId = (int)\Shared\Helpers\Helpers::get('id');
if ($routeId > 0) {
$payload['id'] = $routeId;
}
@@ -210,8 +210,8 @@ class ShopAttributeController
public function delete(): void
{
if ($this->repository->deleteAttribute((int)\S::get('id'))) {
\S::alert('Atrybut zostal usuniety.');
if ($this->repository->deleteAttribute((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Atrybut zostal usuniety.');
}
header('Location: /admin/shop_attribute/list/');
@@ -220,16 +220,16 @@ class ShopAttributeController
public function values(): string
{
$attributeId = (int)\S::get('id');
$attributeId = (int)\Shared\Helpers\Helpers::get('id');
if ($attributeId <= 0) {
\S::alert('Nieprawidlowy identyfikator cechy.');
\Shared\Helpers\Helpers::alert('Nieprawidlowy identyfikator cechy.');
header('Location: /admin/shop_attribute/list/');
exit;
}
$attribute = $this->repository->findAttribute($attributeId);
if ((int)($attribute['id'] ?? 0) <= 0) {
\S::alert('Wybrana cecha nie zostala znaleziona.');
\Shared\Helpers\Helpers::alert('Wybrana cecha nie zostala znaleziona.');
header('Location: /admin/shop_attribute/list/');
exit;
}
@@ -251,12 +251,12 @@ class ShopAttributeController
'msg' => 'Podczas zapisywania wartosci atrybutu wystapil blad. Prosze sprobowac ponownie.',
];
$attributeId = (int)\S::get('attribute_id');
$attributeId = (int)\Shared\Helpers\Helpers::get('attribute_id');
if ($attributeId <= 0) {
$attributeId = (int)\S::get('id');
$attributeId = (int)\Shared\Helpers\Helpers::get('id');
}
$payloadRaw = \S::get('payload');
$payloadRaw = \Shared\Helpers\Helpers::get('payload');
$payload = json_decode((string)$payloadRaw, true);
if (is_array($payload) && is_array($payload['rows'] ?? null) && $attributeId > 0) {
$validationErrors = $this->validateValuesRows(
@@ -286,7 +286,7 @@ class ShopAttributeController
exit;
}
$valuesRaw = \S::get('values');
$valuesRaw = \Shared\Helpers\Helpers::get('values');
$values = json_decode((string)$valuesRaw, true);
if (is_array($values) && $attributeId > 0) {
$savedId = $this->repository->saveLegacyValues(
@@ -313,7 +313,7 @@ class ShopAttributeController
public function value_row_tpl(): void
{
$rowKey = trim((string)\S::get('row_key'));
$rowKey = trim((string)\Shared\Helpers\Helpers::get('row_key'));
if ($rowKey === '') {
$rowKey = 'new-' . time();
}

View File

@@ -32,8 +32,8 @@ class ShopCategoryController
public function category_edit(): string
{
return \Tpl::view('shop-category/category-edit', [
'category' => $this->repository->categoryDetails(\S::get('id')),
'pid' => \S::get('pid'),
'category' => $this->repository->categoryDetails(\Shared\Helpers\Helpers::get('id')),
'pid' => \Shared\Helpers\Helpers::get('pid'),
'languages' => $this->languagesRepository->languagesList(),
'sort_types' => $this->repository->sortTypes(),
'dlang' => $this->languagesRepository->defaultLanguage(),
@@ -52,7 +52,7 @@ class ShopCategoryController
'msg' => 'Podczas zapisywania kategorii wystąpił błąd. Proszę spróbować ponownie.',
];
$values = json_decode((string)\S::get('values'), true);
$values = json_decode((string)\Shared\Helpers\Helpers::get('values'), true);
if (is_array($values)) {
$savedId = $this->repository->save($values);
if (!empty($savedId)) {
@@ -70,10 +70,10 @@ class ShopCategoryController
public function category_delete(): void
{
if ($this->repository->categoryDelete(\S::get('id'))) {
\S::set_message('Kategoria została usunięta.');
if ($this->repository->categoryDelete(\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::set_message('Kategoria została usunięta.');
} else {
\S::alert('Podczas usuwania kategorii wystąpił błąd. Aby usunąć kategorię nie może ona posiadać przypiętych podkategorii.');
\Shared\Helpers\Helpers::alert('Podczas usuwania kategorii wystąpił błąd. Aby usunąć kategorię nie może ona posiadać przypiętych podkategorii.');
}
header('Location: /admin/shop_category/view_list/');
@@ -88,8 +88,8 @@ class ShopCategoryController
public function category_products(): string
{
return \Tpl::view('shop-category/category-products', [
'category_id' => \S::get('id'),
'products' => $this->repository->categoryProducts((int)\S::get('id')),
'category_id' => \Shared\Helpers\Helpers::get('id'),
'products' => $this->repository->categoryProducts((int)\Shared\Helpers\Helpers::get('id')),
]);
}
@@ -115,7 +115,7 @@ class ShopCategoryController
'msg' => 'Podczas zapisywania kolejności kategorii wystąpił błąd. Proszę spróbować ponownie.',
];
if ( $this->repository->saveCategoriesOrder( \S::get( 'categories' ) ) ) {
if ( $this->repository->saveCategoriesOrder( \Shared\Helpers\Helpers::get( 'categories' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -130,7 +130,7 @@ class ShopCategoryController
'msg' => 'Podczas zapisywania kolejności wyświetlania produktów wystąpił błąd. Proszę spróbować ponownie.',
];
if ( $this->repository->saveProductOrder( \S::get( 'category_id' ), \S::get( 'products' ) ) ) {
if ( $this->repository->saveProductOrder( \Shared\Helpers\Helpers::get( 'category_id' ), \Shared\Helpers\Helpers::get( 'products' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -140,7 +140,7 @@ class ShopCategoryController
public function cookie_categories(): void
{
$categoryId = (string) \S::get( 'category_id' );
$categoryId = (string) \Shared\Helpers\Helpers::get( 'category_id' );
if ( $categoryId === '' ) {
echo json_encode( [ 'status' => 'error' ] );
exit;

View File

@@ -61,7 +61,7 @@ class ShopClientsController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -155,9 +155,9 @@ class ShopClientsController
public function details(): string
{
$name = (string)\S::get('name');
$surname = (string)\S::get('surname');
$email = (string)\S::get('email');
$name = (string)\Shared\Helpers\Helpers::get('name');
$surname = (string)\Shared\Helpers\Helpers::get('surname');
$email = (string)\Shared\Helpers\Helpers::get('email');
$ordersInfo = $this->repository->ordersForClient($name, $surname, $email);
$totals = $this->repository->totalsForClient($name, $surname, $email);

View File

@@ -65,7 +65,7 @@ class ShopCouponController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -172,7 +172,7 @@ class ShopCouponController
public function edit(): string
{
$coupon = $this->repository->find((int)\S::get('id'));
$coupon = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
$categories = $this->repository->categoriesTree(null);
return \Tpl::view('shop-coupon/coupon-edit-new', [
@@ -187,7 +187,7 @@ class ShopCouponController
public function save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
@@ -213,7 +213,7 @@ class ShopCouponController
$payload = $_POST;
if (empty($payload['id'])) {
$routeId = (int)\S::get('id');
$routeId = (int)\Shared\Helpers\Helpers::get('id');
if ($routeId > 0) {
$payload['id'] = $routeId;
}
@@ -243,8 +243,8 @@ class ShopCouponController
public function delete(): void
{
if ($this->repository->delete((int)\S::get('id'))) {
\S::alert('Kupon zostal usuniety.');
if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Kupon zostal usuniety.');
}
header('Location: /admin/shop_coupon/list/');

View File

@@ -162,7 +162,7 @@ class ShopOrderController
public function order_details(): string
{
$orderId = (int)\S::get('order_id');
$orderId = (int)\Shared\Helpers\Helpers::get('order_id');
$order = $this->service->details($orderId);
$coupon = null;
@@ -186,7 +186,7 @@ class ShopOrderController
public function order_edit(): string
{
$orderId = (int)\S::get('order_id');
$orderId = (int)\Shared\Helpers\Helpers::get('order_id');
return \Tpl::view('shop-order/order-edit', [
'order' => $this->service->details($orderId),
@@ -204,42 +204,42 @@ class ShopOrderController
public function order_save(): void
{
$saved = $this->service->saveOrderByAdmin([
'order_id' => (int)\S::get('order_id'),
'client_name' => (string)\S::get('client_name'),
'client_surname' => (string)\S::get('client_surname'),
'client_street' => (string)\S::get('client_street'),
'client_postal_code' => (string)\S::get('client_postal_code'),
'client_city' => (string)\S::get('client_city'),
'client_email' => (string)\S::get('client_email'),
'firm_name' => (string)\S::get('firm_name'),
'firm_street' => (string)\S::get('firm_street'),
'firm_postal_code' => (string)\S::get('firm_postal_code'),
'firm_city' => (string)\S::get('firm_city'),
'firm_nip' => (string)\S::get('firm_nip'),
'transport_id' => (int)\S::get('transport_id'),
'inpost_paczkomat' => (string)\S::get('inpost_paczkomat'),
'payment_method_id' => (int)\S::get('payment_method_id'),
'order_id' => (int)\Shared\Helpers\Helpers::get('order_id'),
'client_name' => (string)\Shared\Helpers\Helpers::get('client_name'),
'client_surname' => (string)\Shared\Helpers\Helpers::get('client_surname'),
'client_street' => (string)\Shared\Helpers\Helpers::get('client_street'),
'client_postal_code' => (string)\Shared\Helpers\Helpers::get('client_postal_code'),
'client_city' => (string)\Shared\Helpers\Helpers::get('client_city'),
'client_email' => (string)\Shared\Helpers\Helpers::get('client_email'),
'firm_name' => (string)\Shared\Helpers\Helpers::get('firm_name'),
'firm_street' => (string)\Shared\Helpers\Helpers::get('firm_street'),
'firm_postal_code' => (string)\Shared\Helpers\Helpers::get('firm_postal_code'),
'firm_city' => (string)\Shared\Helpers\Helpers::get('firm_city'),
'firm_nip' => (string)\Shared\Helpers\Helpers::get('firm_nip'),
'transport_id' => (int)\Shared\Helpers\Helpers::get('transport_id'),
'inpost_paczkomat' => (string)\Shared\Helpers\Helpers::get('inpost_paczkomat'),
'payment_method_id' => (int)\Shared\Helpers\Helpers::get('payment_method_id'),
]);
if ($saved) {
\S::alert('Zamówienie zostało zapisane.');
\Shared\Helpers\Helpers::alert('Zamówienie zostało zapisane.');
}
header('Location: /admin/shop_order/order_details/order_id=' . (int)\S::get('order_id'));
header('Location: /admin/shop_order/order_details/order_id=' . (int)\Shared\Helpers\Helpers::get('order_id'));
exit;
}
public function notes_save(): void
{
$this->service->saveNotes((int)\S::get('order_id'), (string)\S::get('notes'));
$this->service->saveNotes((int)\Shared\Helpers\Helpers::get('order_id'), (string)\Shared\Helpers\Helpers::get('notes'));
}
public function order_status_change(): void
{
$response = $this->service->changeStatus(
(int)\S::get('order_id'),
(int)\S::get('status'),
(string)\S::get('email') === 'true'
(int)\Shared\Helpers\Helpers::get('order_id'),
(int)\Shared\Helpers\Helpers::get('status'),
(string)\Shared\Helpers\Helpers::get('email') === 'true'
);
echo json_encode($response);
@@ -248,7 +248,7 @@ class ShopOrderController
public function order_resend_confirmation_email(): void
{
$response = $this->service->resendConfirmationEmail((int)\S::get('order_id'));
$response = $this->service->resendConfirmationEmail((int)\Shared\Helpers\Helpers::get('order_id'));
echo json_encode(['result' => $response]);
exit;
@@ -256,7 +256,7 @@ class ShopOrderController
public function set_order_as_unpaid(): void
{
$orderId = (int)\S::get('order_id');
$orderId = (int)\Shared\Helpers\Helpers::get('order_id');
$this->service->setOrderAsUnpaid($orderId);
header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
@@ -265,8 +265,8 @@ class ShopOrderController
public function set_order_as_paid(): void
{
$orderId = (int)\S::get('order_id');
$this->service->setOrderAsPaid($orderId, (int)\S::get('send_mail') === 1);
$orderId = (int)\Shared\Helpers\Helpers::get('order_id');
$this->service->setOrderAsPaid($orderId, (int)\Shared\Helpers\Helpers::get('send_mail') === 1);
header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
exit;
@@ -274,12 +274,12 @@ class ShopOrderController
public function send_order_to_apilo(): void
{
$orderId = (int)\S::get('order_id');
$orderId = (int)\Shared\Helpers\Helpers::get('order_id');
if ($this->service->sendOrderToApilo($orderId)) {
\S::alert('Zamówienie zostanie wysłane ponownie do apilo.com');
\Shared\Helpers\Helpers::alert('Zamówienie zostanie wysłane ponownie do apilo.com');
} else {
\S::alert('Wystąpił błąd podczas wysyłania zamówienia do apilo.com');
\Shared\Helpers\Helpers::alert('Wystąpił błąd podczas wysyłania zamówienia do apilo.com');
}
header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
@@ -288,7 +288,7 @@ class ShopOrderController
public function toggle_trustmate_send(): void
{
echo json_encode($this->service->toggleTrustmateSend((int)\S::get('order_id')));
echo json_encode($this->service->toggleTrustmateSend((int)\Shared\Helpers\Helpers::get('order_id')));
exit;
}
@@ -299,8 +299,8 @@ class ShopOrderController
public function order_delete(): void
{
if ($this->service->deleteOrder((int)\S::get('id'))) {
\S::alert('Zamówienie zostało usunięte');
if ($this->service->deleteOrder((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Zamówienie zostało usunięte');
}
header('Location: /admin/shop_order/list/');

View File

@@ -46,7 +46,7 @@ class ShopPaymentMethodController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -131,9 +131,9 @@ class ShopPaymentMethodController
public function edit(): string
{
$paymentMethod = $this->repository->find((int)\S::get('id'));
$paymentMethod = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
if ($paymentMethod === null) {
\S::alert('Metoda platnosci nie zostala znaleziona.');
\Shared\Helpers\Helpers::alert('Metoda platnosci nie zostala znaleziona.');
header('Location: /admin/shop_payment_method/list/');
exit;
}
@@ -148,7 +148,7 @@ class ShopPaymentMethodController
$payload = $_POST;
$paymentMethodId = isset($payload['id']) && $payload['id'] !== ''
? (int)$payload['id']
: (int)\S::get('id');
: (int)\Shared\Helpers\Helpers::get('id');
$id = $this->repository->save($paymentMethodId, $payload);
if ($id !== null) {
@@ -188,7 +188,7 @@ class ShopPaymentMethodController
FormField::hidden('id', $id),
FormField::custom(
'name_preview',
\Html::input([
\Shared\Html\Html::input([
'label' => 'Nazwa',
'name' => 'name_preview',
'id' => 'name_preview',

View File

@@ -51,7 +51,7 @@ class ShopProducerController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -146,7 +146,7 @@ class ShopProducerController
public function edit(): string
{
$producer = $this->repository->find((int)\S::get('id'));
$producer = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
$languages = $this->languagesRepository->languagesList();
$validationErrors = $_SESSION['form_errors'][$this->formId()] ?? null;
if ($validationErrors) {
@@ -166,7 +166,7 @@ class ShopProducerController
public function save(): void
{
// Legacy JSON (gridEdit)
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
$response = [
@@ -189,8 +189,8 @@ class ShopProducerController
);
if (!empty($id)) {
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
$response = [
'status' => 'ok',
'msg' => 'Producent zostal zapisany.',
@@ -204,7 +204,7 @@ class ShopProducerController
}
// Nowy flow (form-edit)
$producer = $this->repository->find((int)\S::get('id'));
$producer = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
$languages = $this->languagesRepository->languagesList();
$form = $this->buildFormViewModel($producer, $languages);
@@ -240,8 +240,8 @@ class ShopProducerController
);
if ($savedId) {
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
echo json_encode([
'success' => true,
'id' => $savedId,
@@ -264,10 +264,10 @@ class ShopProducerController
public function delete(): void
{
if ($this->repository->delete((int)\S::get('id'))) {
\S::htacces();
\S::delete_dir('../temp/');
\S::alert('Producent zostal usuniety.');
if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
\Shared\Helpers\Helpers::alert('Producent zostal usuniety.');
}
header('Location: /admin/shop_producer/list/');

View File

@@ -216,7 +216,7 @@ class ShopProductController
$db = $GLOBALS['mdb'];
$product = $this->repository->findForAdmin( (int) \S::get( 'id' ) );
$product = $this->repository->findForAdmin( (int) \Shared\Helpers\Helpers::get( 'id' ) );
$languages = ( new \Domain\Languages\LanguagesRepository( $db ) )->languagesList();
$categories = ( new CategoryRepository( $db ) )->subcategories( null );
$layouts = $this->layoutsForProductEdit( $db );
@@ -568,7 +568,7 @@ class ShopProductController
$productId = (int) ( $product['id'] ?? 0 );
$sku = $this->escapeHtml( (string) ( $product['sku'] ?? '' ) );
return \Html::input_icon( [
return \Shared\Html\Html::input_icon( [
'label' => 'Kod SKU',
'name' => 'sku',
'id' => 'sku',
@@ -731,7 +731,7 @@ class ShopProductController
private function resolveSavePayload(): array
{
$legacyRaw = \S::get( 'values' );
$legacyRaw = \Shared\Helpers\Helpers::get( 'values' );
if ( $legacyRaw !== null && $legacyRaw !== '' ) {
$legacy = json_decode( (string) $legacyRaw, true );
if ( is_array( $legacy ) ) {
@@ -771,10 +771,10 @@ class ShopProductController
*/
public function duplicate_product(): void
{
if ( $this->repository->duplicate( (int) \S::get( 'product-id' ), (bool) (int) \S::get( 'combination' ) ) ) {
\S::set_message( 'Produkt został zduplikowany.' );
if ( $this->repository->duplicate( (int) \Shared\Helpers\Helpers::get( 'product-id' ), (bool) (int) \Shared\Helpers\Helpers::get( 'combination' ) ) ) {
\Shared\Helpers\Helpers::set_message( 'Produkt został zduplikowany.' );
} else {
\S::alert( 'Podczas duplikowania produktu wystąpił błąd. Proszę spróbować ponownie' );
\Shared\Helpers\Helpers::alert( 'Podczas duplikowania produktu wystąpił błąd. Proszę spróbować ponownie' );
}
header( 'Location: /admin/shop_product/view_list/' );
@@ -786,10 +786,10 @@ class ShopProductController
*/
public function product_archive(): void
{
if ( $this->repository->archive( (int) \S::get( 'product_id' ) ) ) {
\S::alert( 'Produkt został przeniesiony do archiwum.' );
if ( $this->repository->archive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
\Shared\Helpers\Helpers::alert( 'Produkt został przeniesiony do archiwum.' );
} else {
\S::alert( 'Podczas przenoszenia produktu do archiwum wystąpił błąd. Proszę spróbować ponownie' );
\Shared\Helpers\Helpers::alert( 'Podczas przenoszenia produktu do archiwum wystąpił błąd. Proszę spróbować ponownie' );
}
header( 'Location: /admin/shop_product/view_list/' );
@@ -801,10 +801,10 @@ class ShopProductController
*/
public function product_unarchive(): void
{
if ( $this->repository->unarchive( (int) \S::get( 'product_id' ) ) ) {
\S::alert( 'Produkt został przywrócony z archiwum.' );
if ( $this->repository->unarchive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
\Shared\Helpers\Helpers::alert( 'Produkt został przywrócony z archiwum.' );
} else {
\S::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
\Shared\Helpers\Helpers::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
}
header( 'Location: /admin/product_archive/list/' );
@@ -816,10 +816,10 @@ class ShopProductController
*/
public function product_delete(): void
{
if ( $this->repository->delete( (int) \S::get( 'id' ) ) ) {
\S::set_message( 'Produkt został usunięty.' );
if ( $this->repository->delete( (int) \Shared\Helpers\Helpers::get( 'id' ) ) ) {
\Shared\Helpers\Helpers::set_message( 'Produkt został usunięty.' );
} else {
\S::alert( 'Podczas usuwania produktu wystąpił błąd. Proszę spróbować ponownie' );
\Shared\Helpers\Helpers::alert( 'Podczas usuwania produktu wystąpił błąd. Proszę spróbować ponownie' );
}
header( 'Location: /admin/shop_product/view_list/' );
@@ -831,8 +831,8 @@ class ShopProductController
*/
public function change_product_status(): void
{
if ( $this->repository->toggleStatus( (int) \S::get( 'product-id' ) ) ) {
\S::set_message( 'Status produktu został zmieniony' );
if ( $this->repository->toggleStatus( (int) \Shared\Helpers\Helpers::get( 'product-id' ) ) ) {
\Shared\Helpers\Helpers::set_message( 'Status produktu został zmieniony' );
}
header( 'Location: ' . $_SERVER['HTTP_REFERER'] );
@@ -846,7 +846,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zmiany ceny wystąpił błąd. Proszę spróbować ponownie.' ];
if ( $this->repository->updatePriceBrutto( (int) \S::get( 'product_id' ), \S::get( 'price' ) ) ) {
if ( $this->repository->updatePriceBrutto( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -861,7 +861,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zmiany ceny wystąpił błąd. Proszę spróbować ponownie.' ];
if ( $this->repository->updatePriceBruttoPromo( (int) \S::get( 'product_id' ), \S::get( 'price' ) ) ) {
if ( $this->repository->updatePriceBruttoPromo( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -876,7 +876,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zmiany google xml label wystąpił błąd. Proszę spróbować ponownie.' ];
if ( $this->repository->updateCustomLabel( (int) \S::get( 'product_id' ), \S::get( 'custom_label' ), \S::get( 'value' ) ) ) {
if ( $this->repository->updateCustomLabel( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'value' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -891,7 +891,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas pobierania sugestii dla custom label wystąpił błąd. Proszę spróbować ponownie.' ];
$suggestions = $this->repository->customLabelSuggestions( \S::get( 'custom_label' ), \S::get( 'label_type' ) );
$suggestions = $this->repository->customLabelSuggestions( \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'label_type' ) );
if ( $suggestions ) {
$response = [ 'status' => 'ok', 'suggestions' => $suggestions ];
}
@@ -907,7 +907,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania custom label wystąpił błąd. Proszę spróbować ponownie.' ];
if ( $this->repository->saveCustomLabel( (int) \S::get( 'product_id' ), \S::get( 'custom_label' ), \S::get( 'label_type' ) ) ) {
if ( $this->repository->saveCustomLabel( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'label_type' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -920,7 +920,7 @@ class ShopProductController
*/
public function ajax_product_url(): void
{
echo json_encode( [ 'url' => \shop\Product::getProductUrl( (int) \S::get( 'product_id' ) ) ] );
echo json_encode( [ 'url' => \shop\Product::getProductUrl( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ] );
exit;
}
@@ -931,7 +931,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas generowania kodu sku wystąpił błąd. Proszę spróbować ponownie.' ];
$sku = \shop\Product::generate_sku_code( (int) \S::get( 'product_id' ) );
$sku = \shop\Product::generate_sku_code( (int) \Shared\Helpers\Helpers::get( 'product_id' ) );
if ( $sku ) {
$response = [ 'status' => 'ok', 'sku' => $sku ];
}
@@ -950,10 +950,10 @@ class ShopProductController
$db = $GLOBALS['mdb'];
return \Tpl::view( 'shop-product/product-combination', [
'product' => $this->repository->findForAdmin( (int) \S::get( 'product_id' ) ),
'product' => $this->repository->findForAdmin( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ),
'attributes' => ( new \Domain\Attribute\AttributeRepository( $db ) )->getAttributesListForCombinations(),
'default_language' => $this->languagesRepository->defaultLanguage(),
'product_permutations' => $this->repository->getCombinationsForTable( (int) \S::get( 'product_id' ) ),
'product_permutations' => $this->repository->getCombinationsForTable( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ),
] );
}
@@ -970,11 +970,11 @@ class ShopProductController
}
}
if ( $this->repository->generateCombinations( (int) \S::get( 'product_id' ), $attributes ) ) {
\S::alert( 'Kombinacje produktu zostały wygenerowane.' );
if ( $this->repository->generateCombinations( (int) \Shared\Helpers\Helpers::get( 'product_id' ), $attributes ) ) {
\Shared\Helpers\Helpers::alert( 'Kombinacje produktu zostały wygenerowane.' );
}
header( 'Location: /admin/shop_product/product_combination/product_id=' . (int) \S::get( 'product_id' ) );
header( 'Location: /admin/shop_product/product_combination/product_id=' . (int) \Shared\Helpers\Helpers::get( 'product_id' ) );
exit;
}
@@ -983,13 +983,13 @@ class ShopProductController
*/
public function delete_combination(): void
{
if ( $this->repository->deleteCombination( (int) \S::get( 'combination_id' ) ) ) {
\S::alert( 'Kombinacja produktu została usunięta' );
if ( $this->repository->deleteCombination( (int) \Shared\Helpers\Helpers::get( 'combination_id' ) ) ) {
\Shared\Helpers\Helpers::alert( 'Kombinacja produktu została usunięta' );
} else {
\S::alert( 'Podczas usuwania kombinacji produktu wystąpił błąd. Proszę spróbować ponownie' );
\Shared\Helpers\Helpers::alert( 'Podczas usuwania kombinacji produktu wystąpił błąd. Proszę spróbować ponownie' );
}
header( 'Location: /admin/shop_product/product_combination/product_id=' . \S::get( 'product_id' ) );
header( 'Location: /admin/shop_product/product_combination/product_id=' . \Shared\Helpers\Helpers::get( 'product_id' ) );
exit;
}
@@ -998,7 +998,7 @@ class ShopProductController
*/
public function product_combination_stock_0_buy_save(): void
{
$this->repository->saveCombinationStock0Buy( (int) \S::get( 'product_id' ), \S::get( 'stock_0_buy' ) );
$this->repository->saveCombinationStock0Buy( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'stock_0_buy' ) );
echo json_encode( [ 'status' => 'ok' ] );
exit;
}
@@ -1008,7 +1008,7 @@ class ShopProductController
*/
public function product_combination_sku_save(): void
{
$this->repository->saveCombinationSku( (int) \S::get( 'product_id' ), \S::get( 'sku' ) );
$this->repository->saveCombinationSku( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'sku' ) );
echo json_encode( [ 'status' => 'ok' ] );
exit;
}
@@ -1018,7 +1018,7 @@ class ShopProductController
*/
public function product_combination_quantity_save(): void
{
$this->repository->saveCombinationQuantity( (int) \S::get( 'product_id' ), \S::get( 'quantity' ) );
$this->repository->saveCombinationQuantity( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'quantity' ) );
echo json_encode( [ 'status' => 'ok' ] );
exit;
}
@@ -1028,7 +1028,7 @@ class ShopProductController
*/
public function product_combination_price_save(): void
{
$this->repository->saveCombinationPrice( (int) \S::get( 'product_id' ), \S::get( 'price' ) );
$this->repository->saveCombinationPrice( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) );
echo json_encode( [ 'status' => 'ok' ] );
exit;
}
@@ -1040,7 +1040,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas usuwania kombinacji wystąpił błąd.' ];
if ( $this->repository->deleteCombination( (int) \S::get( 'combination_id' ) ) ) {
if ( $this->repository->deleteCombination( (int) \Shared\Helpers\Helpers::get( 'combination_id' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -1057,7 +1057,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas usuwania zdjecia wystąpił błąd. Proszę spróbować ponownie.' ];
if ( $this->repository->deleteImage( (int) \S::get( 'image_id' ) ) ) {
if ( $this->repository->deleteImage( (int) \Shared\Helpers\Helpers::get( 'image_id' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -1070,7 +1070,7 @@ class ShopProductController
*/
public function images_order_save(): void
{
if ( $this->repository->saveImagesOrder( (int) \S::get( 'product_id' ), \S::get( 'order' ) ) ) {
if ( $this->repository->saveImagesOrder( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'order' ) ) ) {
echo json_encode( [ 'status' => 'ok', 'msg' => 'Produkt został zapisany.' ] );
}
@@ -1084,7 +1084,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zmiany atrybutu alt zdjęcia wystąpił błąd. Proszę spróbować ponownie.' ];
if ( $this->repository->updateImageAlt( (int) \S::get( 'image_id' ), \S::get( 'image_alt' ) ) ) {
if ( $this->repository->updateImageAlt( (int) \Shared\Helpers\Helpers::get( 'image_id' ), \Shared\Helpers\Helpers::get( 'image_alt' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -1099,7 +1099,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas usuwania pliku wystąpił błąd.' ];
if ( $this->repository->deleteFile( (int) \S::get( 'file_id' ) ) ) {
if ( $this->repository->deleteFile( (int) \Shared\Helpers\Helpers::get( 'file_id' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -1114,7 +1114,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas zmiany nazwy pliku wystąpił błąd.' ];
if ( $this->repository->updateFileName( (int) \S::get( 'file_id' ), \S::get( 'file_name' ) ) ) {
if ( $this->repository->updateFileName( (int) \Shared\Helpers\Helpers::get( 'file_id' ), \Shared\Helpers\Helpers::get( 'file_name' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -1129,7 +1129,7 @@ class ShopProductController
{
$response = [ 'status' => 'error', 'msg' => 'Podczas usuwania zdjęcia wystąpił błąd.' ];
if ( $this->repository->deleteImage( (int) \S::get( 'image_id' ) ) ) {
if ( $this->repository->deleteImage( (int) \Shared\Helpers\Helpers::get( 'image_id' ) ) ) {
$response = [ 'status' => 'ok' ];
}
@@ -1158,8 +1158,8 @@ class ShopProductController
*/
public function mass_edit_save(): void
{
$discountPercent = \S::get( 'discount_percent' );
$products = \S::get( 'products' );
$discountPercent = \Shared\Helpers\Helpers::get( 'discount_percent' );
$products = \Shared\Helpers\Helpers::get( 'products' );
if ( $discountPercent != '' && $products && is_array( $products ) && count( $products ) > 0 ) {
$productId = (int) $products[0];
@@ -1184,7 +1184,7 @@ class ShopProductController
*/
public function get_products_by_category(): void
{
$categoryId = (int) \S::get( 'category_id' );
$categoryId = (int) \Shared\Helpers\Helpers::get( 'category_id' );
$products = $this->repository->getProductsByCategory( $categoryId );
echo json_encode( [ 'status' => 'ok', 'products' => $products ] );

View File

@@ -45,7 +45,7 @@ class ShopProductSetsController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -132,7 +132,7 @@ class ShopProductSetsController
public function edit(): string
{
$set = $this->repository->find((int)\S::get('id'));
$set = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
$products = $this->repository->allProductsMap();
return \Tpl::view('shop-product-sets/product-set-edit', [
@@ -147,7 +147,7 @@ class ShopProductSetsController
public function save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
@@ -184,7 +184,7 @@ class ShopProductSetsController
$payload = $_POST;
if (empty($payload['id'])) {
$routeId = (int)\S::get('id');
$routeId = (int)\Shared\Helpers\Helpers::get('id');
if ($routeId > 0) {
$payload['id'] = $routeId;
}
@@ -220,8 +220,8 @@ class ShopProductSetsController
public function delete(): void
{
if ($this->repository->delete((int)\S::get('id'))) {
\S::alert('Komplet produktow zostal usuniety.');
if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Komplet produktow zostal usuniety.');
}
header('Location: /admin/shop_product_sets/list/');

View File

@@ -45,7 +45,7 @@ class ShopPromotionController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'DESC';
}
@@ -136,7 +136,7 @@ class ShopPromotionController
public function edit(): string
{
$promotion = $this->repository->find((int)\S::get('id'));
$promotion = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
$categories = $this->repository->categoriesTree(null);
return \Tpl::view('shop-promotion/promotion-edit', [
@@ -146,7 +146,7 @@ class ShopPromotionController
public function save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
@@ -172,7 +172,7 @@ class ShopPromotionController
$payload = $_POST;
if (empty($payload['id'])) {
$routeId = (int)\S::get('id');
$routeId = (int)\Shared\Helpers\Helpers::get('id');
if ($routeId > 0) {
$payload['id'] = $routeId;
}
@@ -197,8 +197,8 @@ class ShopPromotionController
public function delete(): void
{
if ($this->repository->delete((int)\S::get('id'))) {
\S::alert('Promocja zostala usunieta.');
if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Promocja zostala usunieta.');
}
header('Location: /admin/shop_promotion/list/');

View File

@@ -36,7 +36,7 @@ class ShopStatusesController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -122,9 +122,9 @@ class ShopStatusesController
public function edit(): string
{
$status = $this->repository->find((int)\S::get('id'));
$status = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
if ($status === null) {
\S::alert('Status nie zostal znaleziony.');
\Shared\Helpers\Helpers::alert('Status nie zostal znaleziony.');
header('Location: /admin/shop_statuses/list/');
exit;
}
@@ -138,7 +138,7 @@ class ShopStatusesController
public function save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
@@ -166,7 +166,7 @@ class ShopStatusesController
$payload = $_POST;
$statusId = isset($payload['id']) && $payload['id'] !== '' ? (int)$payload['id'] : null;
if ($statusId === null) {
$statusId = (int)\S::get('id');
$statusId = (int)\Shared\Helpers\Helpers::get('id');
}
$id = $this->repository->save($statusId, $payload);

View File

@@ -51,7 +51,7 @@ class ShopTransportController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}
@@ -88,7 +88,7 @@ class ShopTransportController
'lp' => $lp++ . '.',
'default' => $default === 1 ? 'tak' : '<span style="color: #FF0000;">nie</span>',
'status' => $status === 1 ? 'tak' : '<span style="color: #FF0000;">nie</span>',
'cost' => \S::decimal($cost) . ' zł',
'cost' => \Shared\Helpers\Helpers::decimal($cost) . ' zł',
'max_wp' => $maxWp !== null ? (int)$maxWp : '-',
'name' => '<a href="/admin/shop_transport/edit/id=' . $id . '">' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '</a>',
'apilo_carrier' => htmlspecialchars((string)$apiloLabel, ENT_QUOTES, 'UTF-8'),
@@ -145,9 +145,9 @@ class ShopTransportController
public function edit(): string
{
$transport = $this->transportRepository->find((int)\S::get('id'));
$transport = $this->transportRepository->find((int)\Shared\Helpers\Helpers::get('id'));
if ($transport === null) {
\S::alert('Rodzaj transportu nie został znaleziony.');
\Shared\Helpers\Helpers::alert('Rodzaj transportu nie został znaleziony.');
header('Location: /admin/shop_transport/list/');
exit;
}
@@ -165,13 +165,13 @@ class ShopTransportController
$payload = $_POST;
$transportId = isset($payload['id']) && $payload['id'] !== ''
? (int)$payload['id']
: (int)\S::get('id');
: (int)\Shared\Helpers\Helpers::get('id');
$payload['id'] = $transportId;
$id = $this->transportRepository->save($payload);
if ($id !== null) {
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
echo json_encode([
'success' => true,
'id' => (int)$id,

View File

@@ -15,8 +15,8 @@ class UpdateController
public function main_view(): string
{
return \Tpl::view( 'update/main-view', [
'ver' => \S::get_version(),
'new_ver' => \S::get_new_version(),
'ver' => \Shared\Helpers\Helpers::get_version(),
'new_ver' => \Shared\Helpers\Helpers::get_new_version(),
] );
}
@@ -25,9 +25,9 @@ class UpdateController
$result = $this->repository->update();
if ( !$result['success'] ) {
\S::alert( 'W trakcie aktualizacji systemu wystąpił błąd. Proszę spróbować ponownie.' );
\Shared\Helpers\Helpers::alert( 'W trakcie aktualizacji systemu wystąpił błąd. Proszę spróbować ponownie.' );
} else {
\S::set_message( 'Aktualizacja przebiegła pomyślnie.' );
\Shared\Helpers\Helpers::set_message( 'Aktualizacja przebiegła pomyślnie.' );
}
header( 'Location: /admin/update/main_view/' );
@@ -40,7 +40,7 @@ class UpdateController
$response = [
'status' => !empty( $result['success'] ) && empty( $result['no_updates'] ),
'version' => number_format( (float) \S::get( 'version_current' ) + 0.001, 3, '.', '' ),
'version' => number_format( (float) \Shared\Helpers\Helpers::get( 'version_current' ) + 0.001, 3, '.', '' ),
];
echo json_encode( $response );

View File

@@ -20,8 +20,8 @@ class UsersController
public function user_delete(): void
{
if ($this->repository->delete((int)\S::get('id'))) {
\S::alert('Uzytkownik zostal usuniety.');
if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
\Shared\Helpers\Helpers::alert('Uzytkownik zostal usuniety.');
}
header('Location: /admin/users/view_list/');
@@ -30,7 +30,7 @@ class UsersController
public function user_save(): void
{
$legacyValues = \S::get('values');
$legacyValues = \Shared\Helpers\Helpers::get('values');
if ($legacyValues) {
$values = json_decode((string)$legacyValues, true);
if (!is_array($values)) {
@@ -61,7 +61,7 @@ class UsersController
exit;
}
$userId = (int)\S::get('id');
$userId = (int)\Shared\Helpers\Helpers::get('id');
$user = $this->normalizeUser($this->repository->find($userId));
$viewModel = $this->buildFormViewModel($user);
@@ -116,7 +116,7 @@ class UsersController
public function user_edit(): string
{
$user = $this->normalizeUser($this->repository->find((int)\S::get('id')));
$user = $this->normalizeUser($this->repository->find((int)\Shared\Helpers\Helpers::get('id')));
$validationErrors = $_SESSION['form_errors'][$this->getFormId()] ?? null;
if ($validationErrors) {
unset($_SESSION['form_errors'][$this->getFormId()]);
@@ -155,7 +155,7 @@ class UsersController
);
$sortDir = $listRequest['sortDir'];
if (trim((string)\S::get('sort')) === '') {
if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
$sortDir = 'ASC';
}

View File

@@ -57,7 +57,7 @@ class FormFieldRenderer
$params['class'] .= ' error';
}
return $this->wrapWithError(\Html::input($params), $error);
return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
}
/**
@@ -81,7 +81,7 @@ class FormFieldRenderer
$params['class'] .= ' error';
}
return $this->wrapWithError(\Html::input($params), $error);
return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
}
/**
@@ -105,7 +105,7 @@ class FormFieldRenderer
$params['class'] .= ' error';
}
return $this->wrapWithError(\Html::input($params), $error);
return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
}
/**
@@ -115,7 +115,7 @@ class FormFieldRenderer
{
$value = $this->form->getFieldValue($field);
return \Html::input([
return \Shared\Html\Html::input([
'label' => $field->label,
'name' => $field->name,
'id' => $field->id,
@@ -146,7 +146,7 @@ class FormFieldRenderer
$params['class'] .= ' error';
}
return $this->wrapWithError(\Html::input($params), $error);
return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
}
/**
@@ -156,7 +156,7 @@ class FormFieldRenderer
{
$value = $this->form->getFieldValue($field);
return \Html::input([
return \Shared\Html\Html::input([
'label' => $field->label,
'name' => $field->name,
'id' => $field->id,
@@ -180,7 +180,7 @@ class FormFieldRenderer
$checked = (bool) $value;
}
return \Html::input_switch([
return \Shared\Html\Html::input_switch([
'label' => $field->label,
'name' => $field->name,
'id' => $field->id,
@@ -209,7 +209,7 @@ class FormFieldRenderer
$params['class'] .= ' error';
}
return $this->wrapWithError(\Html::select($params), $error);
return $this->wrapWithError(\Shared\Html\Html::select($params), $error);
}
/**
@@ -219,7 +219,7 @@ class FormFieldRenderer
{
$value = $this->form->getFieldValue($field);
return \Html::textarea([
return \Shared\Html\Html::textarea([
'label' => $field->label,
'name' => $field->name,
'id' => $field->id,
@@ -236,7 +236,7 @@ class FormFieldRenderer
{
$value = $this->form->getFieldValue($field);
return \Html::textarea([
return \Shared\Html\Html::textarea([
'label' => $field->label,
'name' => $field->name,
'id' => $field->id,
@@ -255,7 +255,7 @@ class FormFieldRenderer
$filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($field->id);
return \Html::input_icon([
return \Shared\Html\Html::input_icon([
'label' => $field->label,
'name' => $field->name,
'id' => $field->id,
@@ -276,7 +276,7 @@ class FormFieldRenderer
if ($field->useFilemanager) {
$filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($field->id);
return \Html::input_icon([
return \Shared\Html\Html::input_icon([
'label' => $field->label,
'name' => $field->name,
'id' => $field->id,
@@ -287,7 +287,7 @@ class FormFieldRenderer
]);
}
return \Html::input([
return \Shared\Html\Html::input([
'label' => $field->label,
'name' => $field->name,
'id' => $field->id,
@@ -395,7 +395,7 @@ class FormFieldRenderer
switch ($field->type) {
case FormFieldType::IMAGE:
$filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($id);
return $this->wrapWithError(\Html::input_icon([
return $this->wrapWithError(\Shared\Html\Html::input_icon([
'label' => $field->label,
'name' => $name,
'id' => $id,
@@ -407,7 +407,7 @@ class FormFieldRenderer
case FormFieldType::TEXTAREA:
case FormFieldType::EDITOR:
return $this->wrapWithError(\Html::textarea([
return $this->wrapWithError(\Shared\Html\Html::textarea([
'label' => $field->label,
'name' => $name,
'id' => $id,
@@ -417,7 +417,7 @@ class FormFieldRenderer
]), $error);
case FormFieldType::SWITCH:
return \Html::input_switch([
return \Shared\Html\Html::input_switch([
'label' => $field->label,
'name' => $name,
'id' => $id,
@@ -425,7 +425,7 @@ class FormFieldRenderer
]);
case FormFieldType::SELECT:
return $this->wrapWithError(\Html::select([
return $this->wrapWithError(\Shared\Html\Html::select([
'label' => $field->label,
'name' => $name,
'id' => $id,
@@ -441,7 +441,7 @@ class FormFieldRenderer
$iconJs = str_replace('{lang}', (string)$languageId, $iconJs);
}
return $this->wrapWithError(\Html::input_icon([
return $this->wrapWithError(\Shared\Html\Html::input_icon([
'label' => $field->label,
'name' => $name,
'id' => $id,
@@ -454,7 +454,7 @@ class FormFieldRenderer
]), $error);
}
return $this->wrapWithError(\Html::input([
return $this->wrapWithError(\Shared\Html\Html::input([
'label' => $field->label,
'name' => $name,
'id' => $id,

View File

@@ -39,8 +39,8 @@ class TableListRequestFactory
$defaultPerPage = (int)$perPageOptions[0];
}
$page = max(1, (int)\S::get('page'));
$perPage = (int)\S::get('per_page');
$page = max(1, (int)\Shared\Helpers\Helpers::get('page'));
$perPage = (int)\Shared\Helpers\Helpers::get('per_page');
if (!in_array($perPage, $perPageOptions, true)) {
$perPage = $defaultPerPage;
}
@@ -56,7 +56,7 @@ class TableListRequestFactory
}
$type = (string)($definition['type'] ?? 'text');
$value = (string)\S::get($key);
$value = (string)\Shared\Helpers\Helpers::get($key);
$filters[$key] = $value;
$queryFilters[$key] = $value;
@@ -75,12 +75,12 @@ class TableListRequestFactory
$viewFilters[] = $filterConfig;
}
$sortColumn = trim((string)\S::get('sort'));
$sortColumn = trim((string)\Shared\Helpers\Helpers::get('sort'));
if (!in_array($sortColumn, $sortableColumns, true)) {
$sortColumn = $defaultSortColumn;
}
$sortDir = strtoupper(trim((string)\S::get('dir')));
$sortDir = strtoupper(trim((string)\Shared\Helpers\Helpers::get('dir')));
if (!in_array($sortDir, ['ASC', 'DESC'], true)) {
$sortDir = 'DESC';
}