Project-Pro/shopPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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:
Jacek Pyziak
2026-02-16 23:06:06 +01:00
parent 8e97413361
commit 431add234c
159 changed files with 1501 additions and 3043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
autoload/Domain/Article/ArticleRepository.php
View File

@@ -81,8 +81,8 @@ class ArticleRepository
$this->applyGalleryOrderIfProvided($id, $data);
$this->applyFilesOrderIfProvided($id, $data);
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
return (int)$id;
}
@@ -102,8 +102,8 @@ class ArticleRepository
$this->deleteMarkedImages($articleId);
$this->deleteMarkedFiles($articleId);
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
return $articleId;
}
@@ -142,7 +142,7 @@ class ArticleRepository
'meta_title' => ($data['meta_title'][$langId] ?? '') != '' ? $data['meta_title'][$langId] : null,
'meta_description' => ($data['meta_description'][$langId] ?? '') != '' ? $data['meta_description'][$langId] : null,
'meta_keywords' => ($data['meta_keywords'][$langId] ?? '') != '' ? $data['meta_keywords'][$langId] : null,
'seo_link' => \S::seo($data['seo_link'][$langId] ?? '') != '' ? \S::seo($data['seo_link'][$langId]) : null,
'seo_link' => \Shared\Helpers\Helpers::seo($data['seo_link'][$langId] ?? '') != '' ? \Shared\Helpers\Helpers::seo($data['seo_link'][$langId]) : null,
'noindex' => $this->isCheckedValue($data['noindex'][$langId] ?? null) ? 1 : 0,
'copy_from' => ($data['copy_from'][$langId] ?? '') != '' ? $data['copy_from'][$langId] : null,
'block_direct_access' => $this->isCheckedValue($data['block_direct_access'][$langId] ?? null) ? 1 : 0,
@@ -383,8 +383,8 @@ class ArticleRepository
$this->db->delete('pp_articles_files', ['article_id' => $articleId]);
$this->db->delete('pp_articles', ['id' => $articleId]);
\S::delete_dir('../upload/article_images/article_' . $articleId . '/');
\S::delete_dir('../upload/article_files/article_' . $articleId . '/');
\Shared\Helpers\Helpers::delete_dir('../upload/article_images/article_' . $articleId . '/');
\Shared\Helpers\Helpers::delete_dir('../upload/article_files/article_' . $articleId . '/');
return true;
}
@@ -602,7 +602,7 @@ class ArticleRepository
]);
}
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return true;
}
@@ -637,7 +637,7 @@ class ArticleRepository
}
}
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return true;
}
@@ -727,7 +727,7 @@ class ArticleRepository
'id' => $imageId,
]);
\S::delete_cache();
\Shared\Helpers\Helpers::delete_cache();
return (bool)$result;
}
@@ -1142,7 +1142,7 @@ class ArticleRepository
}
$articles = null;
if (\S::is_array_fix($articlesData)) {
if (\Shared\Helpers\Helpers::is_array_fix($articlesData)) {
foreach ($articlesData as $row) {
$articles[] = $this->articleDetailsFrontend((int)$row['id'], $langId);
}
@@ -1191,7 +1191,7 @@ class ArticleRepository
}
$articles = null;
if (\S::is_array_fix($articlesData)) {
if (\Shared\Helpers\Helpers::is_array_fix($articlesData)) {
foreach ($articlesData as $row) {
$articles[] = $this->articleDetailsFrontend((int)$row['id'], $langId);
}

4
autoload/Domain/Attribute/AttributeRepository.php
View File

@@ -838,10 +838,10 @@ class AttributeRepository
{
if (class_exists('\S')) {
if (method_exists('\S', 'delete_dir')) {
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
}
if (method_exists('\S', 'delete_cache')) {
\S::delete_cache();
\Shared\Helpers\Helpers::delete_cache();
}
}
}

2
autoload/Domain/Banner/BannerRepository.php
View File

@@ -102,7 +102,7 @@ class BannerRepository
$this->saveTranslations($bannerId, $data['src'], $data['url'], $data['html'], $data['text']);
}
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return (int)$bannerId;
}

4
autoload/Domain/Cache/CacheRepository.php
View File

@@ -32,8 +32,8 @@ class CacheRepository
*/
public function clearCache(): array
{
\S::delete_dir( $this->basePath . 'temp/' );
\S::delete_dir( $this->basePath . 'thumbs/' );
\Shared\Helpers\Helpers::delete_dir( $this->basePath . 'temp/' );
\Shared\Helpers\Helpers::delete_dir( $this->basePath . 'thumbs/' );
$redisCleared = false;
if ( $this->redisConnection ) {

6
autoload/Domain/Category/CategoryRepository.php
View File

@@ -325,8 +325,8 @@ class CategoryRepository
private function refreshCategoryArtifacts(): void
{
if (class_exists('\\S')) {
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
}
}
@@ -336,7 +336,7 @@ class CategoryRepository
return $this->toNullableString($value);
}
$seo = \S::seo((string)$value);
$seo = \Shared\Helpers\Helpers::seo((string)$value);
$seo = trim((string)$seo);
return $seo !== '' ? $seo : null;

4
autoload/Domain/Dictionaries/DictionariesRepository.php
View File

@@ -249,8 +249,8 @@ class DictionariesRepository
private function clearCache(): void
{
if (class_exists('\S') && method_exists('\S', 'delete_dir')) {
\S::delete_dir('../temp/');
\S::delete_dir('../temp/dictionaries');
\Shared\Helpers\Helpers::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/dictionaries');
}
}

4
autoload/Domain/Integrations/IntegrationsRepository.php
View File

@@ -51,7 +51,7 @@ class IntegrationsRepository
} else {
$this->db->insert( $table, [ 'name' => $name, 'value' => $value ] );
}
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return true;
}
@@ -61,7 +61,7 @@ class IntegrationsRepository
{
return (bool) $this->db->update( 'pp_shop_products', [
'apilo_product_id' => $externalId,
'apilo_product_name' => \S::remove_special_chars( $externalName ),
'apilo_product_name' => \Shared\Helpers\Helpers::remove_special_chars( $externalName ),
], [ 'id' => $productId ] );
}

12
autoload/Domain/Languages/LanguagesRepository.php
View File

@@ -232,8 +232,8 @@ class LanguagesRepository
return false;
}
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
return true;
}
@@ -287,8 +287,8 @@ class LanguagesRepository
}
}
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
return $languageId;
}
@@ -327,8 +327,8 @@ class LanguagesRepository
]);
}
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir('../temp/');
return $translationId;
}

10
autoload/Domain/Layouts/LayoutsRepository.php
View File

@@ -20,7 +20,7 @@ class LayoutsRepository
$deleted = (bool)$this->db->delete('pp_layouts', ['id' => $layoutId]);
if ($deleted) {
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
$this->clearFrontLayoutsCache();
}
@@ -51,9 +51,6 @@ class LayoutsRepository
'html' => (string)($data['html'] ?? ''),
'css' => (string)($data['css'] ?? ''),
'js' => (string)($data['js'] ?? ''),
'm_html' => (string)($data['m_html'] ?? ''),
'm_css' => (string)($data['m_css'] ?? ''),
'm_js' => (string)($data['m_js'] ?? ''),
'status' => $status,
'categories_default' => $categoriesDefault,
];
@@ -82,7 +79,7 @@ class LayoutsRepository
$this->db->delete('pp_layouts_categories', ['layout_id' => $layoutId]);
$this->syncCategories($layoutId, $data['categories'] ?? []);
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
$this->clearFrontLayoutsCache();
return $layoutId;
@@ -287,9 +284,6 @@ class LayoutsRepository
'html' => '',
'css' => '',
'js' => '',
'm_html' => '',
'm_css' => '',
'm_js' => '',
'pages' => [],
'categories' => [],
];

2
autoload/Domain/Newsletter/NewsletterPreviewRenderer.php
View File

@@ -24,7 +24,7 @@ class NewsletterPreviewRenderer
$articleId = (int)($article['id'] ?? 0);
$title = (string)($article['language']['title'] ?? '');
$seoLink = trim((string)($article['language']['seo_link'] ?? ''));
$url = $seoLink !== '' ? $seoLink : ('a-' . $articleId . '-' . \S::seo($title));
$url = $seoLink !== '' ? $seoLink : ('a-' . $articleId . '-' . \Shared\Helpers\Helpers::seo($title));
$entry = !empty($article['language']['entry'])
? (string)$article['language']['entry']
: (string)($article['language']['text'] ?? '');

14
autoload/Domain/Newsletter/NewsletterRepository.php
View File

@@ -44,7 +44,7 @@ class NewsletterRepository
{
$this->settingsRepository->updateSetting('newsletter_footer', (string)($values['newsletter_footer'] ?? ''));
$this->settingsRepository->updateSetting('newsletter_header', (string)($values['newsletter_header'] ?? ''));
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return true;
}
@@ -128,7 +128,7 @@ class NewsletterRepository
return null;
}
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return (int)$this->db->id();
}
@@ -148,7 +148,7 @@ class NewsletterRepository
'id' => $templateId,
]);
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return $templateId;
}
@@ -350,7 +350,7 @@ class NewsletterRepository
public function signup(string $email, string $serverName, bool $ssl, array $settings): bool
{
if (!\S::email_check($email)) {
if (!\Shared\Helpers\Helpers::email_check($email)) {
return false;
}
@@ -380,9 +380,9 @@ class NewsletterRepository
$text
);
$lang = \S::get_session('lang-' . \S::get_session('current-lang'));
$lang = \Shared\Helpers\Helpers::get_session('lang-' . \Shared\Helpers\Helpers::get_session('current-lang'));
$subject = $lang['potwierdz-zapisanie-sie-do-newslettera'] ?? 'Newsletter';
\S::send_email($email, $subject, $text);
\Shared\Helpers\Helpers::send_email($email, $subject, $text);
$this->db->insert('pp_newsletter', ['email' => $email, 'hash' => $hash, 'status' => 0]);
@@ -435,7 +435,7 @@ class NewsletterRepository
$link = $base . "://" . $serverName . '/newsletter/unsubscribe/hash=' . $hash;
$text = str_replace('[WYPISZ_SIE]', '<a href="' . $link . '">' . $unsubscribeLabel . '</a>', $text);
\S::send_email($row['email'], 'Newsletter ze strony: ' . $serverName, $text);
\Shared\Helpers\Helpers::send_email($row['email'], 'Newsletter ze strony: ' . $serverName, $text);
$this->db->delete('pp_newsletter_send', ['id' => $row['id']]);
}

11
autoload/Domain/Order/OrderAdminService.php
View File

@@ -68,10 +68,6 @@ class OrderAdminService
(int)($input['payment_method_id'] ?? 0)
);
if ($saved && isset($GLOBALS['user']['id'])) {
\Log::save_log('Zamówienie zmienione przez administratora | ID: ' . (int)($input['order_id'] ?? 0), (int)$GLOBALS['user']['id']);
}
return $saved;
}
@@ -197,11 +193,6 @@ class OrderAdminService
public function deleteOrder(int $orderId): bool
{
$deleted = $this->orders->deleteOrder($orderId);
if ($deleted && isset($GLOBALS['user']['id'])) {
\Log::save_log('Usunięcie zamówienia | ID: ' . $orderId, (int)$GLOBALS['user']['id']);
}
return $deleted;
return $this->orders->deleteOrder($orderId);
}
}

18
autoload/Domain/Pages/PagesRepository.php
View File

@@ -173,7 +173,7 @@ class PagesRepository
]);
if ($result) {
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
}
return (bool)$result;
}
@@ -185,7 +185,7 @@ class PagesRepository
'id' => $menuId,
]);
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return true;
}
@@ -282,7 +282,7 @@ class PagesRepository
]);
}
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return true;
}
@@ -320,7 +320,7 @@ class PagesRepository
]);
}
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return true;
}
@@ -397,15 +397,15 @@ class PagesRepository
$this->saveTranslations($pageId, $pageType, $data);
$this->updateSubpagesMenuId($pageId, $menuId);
\S::htacces();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::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));
$base = trim((string)\Shared\Helpers\Helpers::seo($title));
if ($base === '') {
return '';
}
@@ -427,7 +427,7 @@ class PagesRepository
{
$url = trim($seoLink) !== ''
? '/' . ltrim($seoLink, '/')
: '/s-' . $pageId . '-' . \S::seo($title);
: '/s-' . $pageId . '-' . \Shared\Helpers\Helpers::seo($title);
if ($langId !== '' && $langId !== $defaultLanguageId && $url !== '#') {
$url = '/' . $langId . $url;
@@ -542,7 +542,7 @@ class PagesRepository
'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] ?? ''))),
'seo_link' => $this->nullIfEmpty(\Shared\Helpers\Helpers::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,

62
autoload/Domain/Product/ProductRepository.php
View File

@@ -634,9 +634,9 @@ class ProductRepository
$this->cleanupDeletedImages( $productId );
}
\S::htacces();
\S::delete_dir( '../temp/' );
\S::delete_dir( '../thumbs/' );
\Shared\Helpers\Helpers::htacces();
\Shared\Helpers\Helpers::delete_dir( '../temp/' );
\Shared\Helpers\Helpers::delete_dir( '../thumbs/' );
if ( !$isNew ) {
$redis = \Shared\Cache\RedisConnection::getInstance()->getConnection();
@@ -660,7 +660,7 @@ class ProductRepository
'description' => $this->nullIfEmpty( $d['description'][$lid] ?? null ),
'meta_description' => $this->nullIfEmpty( $d['meta_description'][$lid] ?? null ),
'meta_keywords' => $this->nullIfEmpty( $d['meta_keywords'][$lid] ?? null ),
'seo_link' => !empty( $d['seo_link'][$lid] ) ? \S::seo( $d['seo_link'][$lid] ) : null,
'seo_link' => !empty( $d['seo_link'][$lid] ) ? \Shared\Helpers\Helpers::seo( $d['seo_link'][$lid] ) : null,
'copy_from' => $this->nullIfEmpty( $d['copy_from'][$lid] ?? null ),
'warehouse_message_zero' => $this->nullIfEmpty( $d['warehouse_message_zero'][$lid] ?? null ),
'warehouse_message_nonzero' => $this->nullIfEmpty( $d['warehouse_message_nonzero'][$lid] ?? null ),
@@ -684,7 +684,7 @@ class ProductRepository
if ( $translationId ) {
$currentSeoLink = $this->db->get( 'pp_shop_products_langs', 'seo_link', [ 'id' => $translationId ] );
$newSeoLink = $langData['seo_link'] ?: \S::seo( 'p-' . $productId . '-' . ( $d['name'][$lid] ?? '' ) );
$newSeoLink = $langData['seo_link'] ?: \Shared\Helpers\Helpers::seo( 'p-' . $productId . '-' . ( $d['name'][$lid] ?? '' ) );
if ( $newSeoLink !== $currentSeoLink && $currentSeoLink != '' ) {
$this->handleSeoRedirects( $productId, $lid, $newSeoLink, $currentSeoLink );
@@ -733,7 +733,7 @@ class ProductRepository
] );
if ( !$this->db->count( 'pp_redirects', [ 'from' => $currentSeoLink, 'to' => $newSeoLink, 'lang_id' => $langId, 'product_id' => $productId ] ) ) {
if ( \S::canAddRedirect( $currentSeoLink, $newSeoLink, $langId ) ) {
if ( \Shared\Helpers\Helpers::canAddRedirect( $currentSeoLink, $newSeoLink, $langId ) ) {
$this->db->insert( 'pp_redirects', [ 'from' => $currentSeoLink, 'to' => $newSeoLink, 'lang_id' => $langId, 'product_id' => $productId ] );
}
}
@@ -947,8 +947,8 @@ class ProductRepository
$this->db->delete( 'pp_routes', [ 'product_id' => $productId ] );
$this->db->delete( 'pp_redirects', [ 'product_id' => $productId ] );
\S::delete_dir( '../upload/product_images/product_' . $productId . '/' );
\S::delete_dir( '../upload/product_files/product_' . $productId . '/' );
\Shared\Helpers\Helpers::delete_dir( '../upload/product_images/product_' . $productId . '/' );
\Shared\Helpers\Helpers::delete_dir( '../upload/product_files/product_' . $productId . '/' );
return true;
}
@@ -993,7 +993,7 @@ class ProductRepository
// Atrybuty
$attributes = $this->db->select( 'pp_shop_products_attributes', '*', [ 'product_id' => $productId ] );
if ( \S::is_array_fix( $attributes ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $attributes ) ) {
foreach ( $attributes as $row ) {
$this->db->insert( 'pp_shop_products_attributes', [
'product_id' => $newProductId,
@@ -1005,7 +1005,7 @@ class ProductRepository
// Kategorie
$categories = $this->db->select( 'pp_shop_products_categories', '*', [ 'product_id' => $productId ] );
if ( \S::is_array_fix( $categories ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $categories ) ) {
foreach ( $categories as $row ) {
$this->db->insert( 'pp_shop_products_categories', [
'product_id' => $newProductId,
@@ -1017,7 +1017,7 @@ class ProductRepository
// Języki
$langs = $this->db->select( 'pp_shop_products_langs', '*', [ 'product_id' => $productId ] );
if ( \S::is_array_fix( $langs ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $langs ) ) {
foreach ( $langs as $row ) {
$this->db->insert( 'pp_shop_products_langs', [
'product_id' => $newProductId,
@@ -1040,7 +1040,7 @@ class ProductRepository
// Custom fields
$customFields = $this->db->select( 'pp_shop_products_custom_fields', '*', [ 'id_product' => $productId ] );
if ( \S::is_array_fix( $customFields ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $customFields ) ) {
foreach ( $customFields as $row ) {
$this->db->insert( 'pp_shop_products_custom_fields', [
'id_product' => $newProductId,
@@ -1052,7 +1052,7 @@ class ProductRepository
// Duplikowanie kombinacji
if ( $withCombinations ) {
$productCombinations = $this->db->select( 'pp_shop_products', '*', [ 'parent_id' => $productId ] );
if ( \S::is_array_fix( $productCombinations ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $productCombinations ) ) {
foreach ( $productCombinations as $comb ) {
$this->db->insert( 'pp_shop_products', [
'parent_id' => $newProductId,
@@ -1073,7 +1073,7 @@ class ProductRepository
$combNewId = $this->db->id();
if ( $combNewId ) {
$combAttrs = $this->db->select( 'pp_shop_products_attributes', '*', [ 'product_id' => $comb['id'] ] );
if ( \S::is_array_fix( $combAttrs ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $combAttrs ) ) {
foreach ( $combAttrs as $attr ) {
$this->db->insert( 'pp_shop_products_attributes', [
'product_id' => $combNewId,
@@ -1114,7 +1114,7 @@ class ProductRepository
public function updatePriceBrutto(int $productId, $price): bool
{
$vat = (float) $this->db->get( 'pp_shop_products', 'vat', [ 'id' => $productId ] );
$priceNetto = \S::normalize_decimal( (float) $price / ( 100 + $vat ) * 100, 2 );
$priceNetto = \Shared\Helpers\Helpers::normalize_decimal( (float) $price / ( 100 + $vat ) * 100, 2 );
$this->db->update( 'pp_shop_products', [
'price_brutto' => $price != 0.00 ? $price : null,
@@ -1134,7 +1134,7 @@ class ProductRepository
public function updatePriceBruttoPromo(int $productId, $price): bool
{
$vat = (float) $this->db->get( 'pp_shop_products', 'vat', [ 'id' => $productId ] );
$priceNetto = \S::normalize_decimal( (float) $price / ( 100 + $vat ) * 100, 2 );
$priceNetto = \Shared\Helpers\Helpers::normalize_decimal( (float) $price / ( 100 + $vat ) * 100, 2 );
$this->db->update( 'pp_shop_products', [
'price_brutto_promo' => $price != 0.00 ? $price : null,
@@ -1195,7 +1195,7 @@ class ProductRepository
{
$products = [];
$results = $this->db->select( 'pp_shop_products', 'id', [ 'parent_id' => $productId ] );
if ( \S::is_array_fix( $results ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $results ) ) {
foreach ( $results as $row ) {
$detail = $this->findForAdmin( (int) $row );
if ( $detail ) {
@@ -1219,7 +1219,7 @@ class ProductRepository
$attributeRepository = new \Domain\Attribute\AttributeRepository( $this->db );
$permutations = \shop\Product::array_cartesian( $attributes );
if ( !\S::is_array_fix( $permutations ) ) {
if ( !\Shared\Helpers\Helpers::is_array_fix( $permutations ) ) {
return true;
}
@@ -1229,7 +1229,7 @@ class ProductRepository
$permutationHash = '';
if ( \S::is_array_fix( $permutation ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $permutation ) ) {
foreach ( $permutation as $key => $val ) {
if ( $permutationHash ) {
$permutationHash .= '|';
@@ -1374,7 +1374,7 @@ class ProductRepository
public function updateImageAlt(int $imageId, string $alt): bool
{
$result = $this->db->update( 'pp_shop_products_images', [ 'alt' => $alt ], [ 'id' => $imageId ] );
\S::delete_cache();
\Shared\Helpers\Helpers::delete_cache();
return (bool) $result;
}
@@ -1542,7 +1542,7 @@ class ProductRepository
'AND' => [ 'status' => '1', 'archive' => 0, 'parent_id' => null ],
] );
if ( \S::is_array_fix( $rows ) ) {
if ( \Shared\Helpers\Helpers::is_array_fix( $rows ) ) {
foreach ( $rows as $productId ) {
$product = \shop\Product::getFromCache( $productId, $lang_id );
@@ -1587,9 +1587,9 @@ class ProductRepository
$itemNode->appendChild( $doc->createElement( 'g:description', html_entity_decode( strip_tags( $desc ) ) ) );
if ( $product->language['seo_link'] ) {
$link = $domainPrefix . '://' . $url . '/' . \S::seo( $product->language['seo_link'] ) . '/' . str_replace( '|', '/', $combination->permutation_hash );
$link = $domainPrefix . '://' . $url . '/' . \Shared\Helpers\Helpers::seo( $product->language['seo_link'] ) . '/' . str_replace( '|', '/', $combination->permutation_hash );
} else {
$link = $domainPrefix . '://' . $url . '/p-' . $product->id . '-' . \S::seo( $product->language['name'] ) . '/' . str_replace( '|', '/', $combination->permutation_hash );
$link = $domainPrefix . '://' . $url . '/p-' . $product->id . '-' . \Shared\Helpers\Helpers::seo( $product->language['name'] ) . '/' . str_replace( '|', '/', $combination->permutation_hash );
}
$itemNode->appendChild( $doc->createElement( 'link', $link ) );
@@ -1652,9 +1652,9 @@ class ProductRepository
$itemNode->appendChild( $doc->createElement( 'g:description', html_entity_decode( strip_tags( $desc ) ) ) );
if ( $product->language['seo_link'] ) {
$link = $domainPrefix . '://' . $url . '/' . \S::seo( $product->language['seo_link'] );
$link = $domainPrefix . '://' . $url . '/' . \Shared\Helpers\Helpers::seo( $product->language['seo_link'] );
} else {
$link = $domainPrefix . '://' . $url . '/p-' . $product->id . '-' . \S::seo( $product->language['name'] );
$link = $domainPrefix . '://' . $url . '/p-' . $product->id . '-' . \Shared\Helpers\Helpers::seo( $product->language['name'] );
}
$itemNode->appendChild( $doc->createElement( 'link', $link ) );
@@ -1771,9 +1771,9 @@ class ProductRepository
}
}
$combNetto = \S::normalize_decimal( $combBrutto / ( 100 + $vat ) * 100, 2 );
$combNetto = \Shared\Helpers\Helpers::normalize_decimal( $combBrutto / ( 100 + $vat ) * 100, 2 );
$combNettoPromo = $combBruttoPromo !== null
? \S::normalize_decimal( $combBruttoPromo / ( 100 + $vat ) * 100, 2 )
? \Shared\Helpers\Helpers::normalize_decimal( $combBruttoPromo / ( 100 + $vat ) * 100, 2 )
: null;
$this->db->update( 'pp_shop_products', [
@@ -1796,9 +1796,9 @@ class ProductRepository
*/
private function updateCombinationPrices(int $productId, float $priceNetto, float $vat, ?float $priceNettoPromo): void
{
$priceBrutto = \S::normalize_decimal( $priceNetto * ( 100 + $vat ) / 100, 2 );
$priceBrutto = \Shared\Helpers\Helpers::normalize_decimal( $priceNetto * ( 100 + $vat ) / 100, 2 );
$priceBruttoPromo = $priceNettoPromo !== null
? \S::normalize_decimal( $priceNettoPromo * ( 100 + $vat ) / 100, 2 )
? \Shared\Helpers\Helpers::normalize_decimal( $priceNettoPromo * ( 100 + $vat ) / 100, 2 )
: null;
$combinations = $this->db->query(
@@ -1835,9 +1835,9 @@ class ProductRepository
}
}
$combNetto = \S::normalize_decimal( $combBrutto / ( 100 + $vat ) * 100, 2 );
$combNetto = \Shared\Helpers\Helpers::normalize_decimal( $combBrutto / ( 100 + $vat ) * 100, 2 );
$combNettoPromo = $combBruttoPromo !== null
? \S::normalize_decimal( $combBruttoPromo / ( 100 + $vat ) * 100, 2 )
? \Shared\Helpers\Helpers::normalize_decimal( $combBruttoPromo / ( 100 + $vat ) * 100, 2 )
: null;
$this->db->update( 'pp_shop_products', [

4
autoload/Domain/ProductSet/ProductSetRepository.php
View File

@@ -244,7 +244,7 @@ class ProductSetRepository
private function clearTempAndCache(): void
{
\S::delete_dir('../temp/');
\S::delete_dir('../thumbs/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../thumbs/');
}
}

4
autoload/Domain/Promotion/PromotionRepository.php
View File

@@ -148,13 +148,13 @@ class PromotionRepository
}
$this->invalidateActivePromotionsCache();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return $id;
}
$this->db->update('pp_shop_promotion', $row, ['id' => $promotionId]);
$this->invalidateActivePromotionsCache();
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return $promotionId;
}

2
autoload/Domain/Scontainers/ScontainersRepository.php
View File

@@ -174,7 +174,7 @@ class ScontainersRepository
}
}
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
$this->clearFrontCache($containerId);
return $containerId;

4
autoload/Domain/Settings/SettingsRepository.php
View File

@@ -90,9 +90,9 @@ class SettingsRepository
// Zachowanie zgodne z dotychczasowym flow: pelna podmiana zestawu ustawien.
$this->db->query('TRUNCATE pp_settings');
$this->updateSettings($settingsToSave);
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
\S::set_message('Ustawienia zostaly zapisane');
\Shared\Helpers\Helpers::set_message('Ustawienia zostaly zapisane');
return ['status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.'];
}

8
autoload/Domain/Update/UpdateRepository.php
View File

@@ -23,9 +23,9 @@ class UpdateRepository
$log = [];
$log[] = '[START] Rozpoczęcie aktualizacji - ' . date( 'Y-m-d H:i:s' );
$log[] = '[INFO] Aktualna wersja: ' . \S::get_version();
$log[] = '[INFO] Aktualna wersja: ' . \Shared\Helpers\Helpers::get_version();
\S::delete_session( 'new-version' );
\Shared\Helpers\Helpers::delete_session( 'new-version' );
$versionsUrl = 'https://shoppro.project-dc.pl/updates/versions.php?key=' . $settings['update_key'];
$versions = @file_get_contents( $versionsUrl );
@@ -42,7 +42,7 @@ class UpdateRepository
foreach ( $versions as $ver ) {
$ver = trim( $ver );
if ( floatval( $ver ) <= (float) \S::get_version() ) {
if ( floatval( $ver ) <= (float) \Shared\Helpers\Helpers::get_version() ) {
continue;
}
@@ -197,7 +197,7 @@ class UpdateRepository
if ( strpos( $entry, 'D: ' ) !== false ) {
$path = substr( $entry, 3 );
if ( is_dir( $path ) ) {
\S::delete_dir( $path );
\Shared\Helpers\Helpers::delete_dir( $path );
$deletedDirs++;
}
}

6
autoload/Domain/User/UserRepository.php
View File

@@ -101,7 +101,7 @@ class UserRepository
$subject = 'Twoj kod logowania 2FA';
$body = 'Twoj kod logowania do panelu administratora: ' . $code . '. Kod jest wazny przez 10 minut.';
$sent = \S::send_email($to, $subject, $body);
$sent = \Shared\Helpers\Helpers::send_email($to, $subject, $body);
if ($sent) {
return true;
}
@@ -154,7 +154,7 @@ class UserRepository
]);
if ($inserted) {
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return ['status' => 'ok', 'msg' => 'Uzytkownik zostal zapisany.'];
}
@@ -187,7 +187,7 @@ class UserRepository
'id' => $userId,
]);
\S::delete_dir('../temp/');
\Shared\Helpers\Helpers::delete_dir('../temp/');
return ['status' => 'ok', 'msg' => 'Uzytkownik zostal zapisany.'];
}