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 285cbe5515
commit 319491975d
159 changed files with 1501 additions and 3043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/front/factory/class.Pages.php
View File

@@ -30,7 +30,7 @@ class Pages
{
$page = self::page_details( $page_id, $lang_id );
$page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \S::seo( $page['language']['title'] );
$page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \Shared\Helpers\Helpers::seo( $page['language']['title'] );
if ( $lang_id != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
$url = '/' . $lang_id . $url;

2
autoload/front/factory/class.ShopBasket.php
View File

@@ -49,7 +49,7 @@ class ShopBasket
}
}
return \S::normalize_decimal( $summary );
return \Shared\Helpers\Helpers::normalize_decimal( $summary );
}
public static function count_products( $basket )

6
autoload/front/factory/class.ShopCategory.php
View File

@@ -49,10 +49,10 @@ class ShopCategory
$category = self::category_details( $category_id );
$category['language']['seo_link'] ? $url = '/' . $category['language']['seo_link'] : $url = '/k-' . $category['id'] . '-' . \S::seo( $category['language']['title'] );
$category['language']['seo_link'] ? $url = '/' . $category['language']['seo_link'] : $url = '/k-' . $category['id'] . '-' . \Shared\Helpers\Helpers::seo( $category['language']['title'] );
if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
$url = '/' . \S::get_session( 'current-lang' ) . $url;
if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
$url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
return $url;
}

24
autoload/front/factory/class.ShopClient.php
View File

@@ -108,7 +108,7 @@ class ShopClient
$text = str_replace( '[HASLO]', $new_password, $text );
$send = \S::send_email( $data['email'], \S::lang( 'nowe-haslo-w-sklepie' ), $text );
$send = \Shared\Helpers\Helpers::send_email( $data['email'], \Shared\Helpers\Helpers::lang( 'nowe-haslo-w-sklepie' ), $text );
$mdb -> update( 'pp_shop_clients', [
'password_recovery' => 0,
@@ -144,7 +144,7 @@ class ShopClient
$text = str_replace( '[LINK]', $link, $text );
$send = \S::send_email( $email, \S::lang( 'generowanie-nowego-hasla-w-sklepie' ), $text );
$send = \Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::lang( 'generowanie-nowego-hasla-w-sklepie' ), $text );
$mdb -> update( 'pp_shop_clients', [ 'password_recovery' => 1 ], [ 'email' => $email ] );
return true;
@@ -175,7 +175,7 @@ class ShopClient
$regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$send = \S::send_email( $email, \S::lang( 'potwierdzenie-aktywacji-konta-w-sklepie' ) . ' ' . \S::lang( '#nazwa-serwisu' ), $text );
$send = \Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::lang( 'potwierdzenie-aktywacji-konta-w-sklepie' ) . ' ' . \Shared\Helpers\Helpers::lang( '#nazwa-serwisu' ), $text );
}
return true;
}
@@ -184,10 +184,10 @@ class ShopClient
{
global $mdb, $settings;
$result = [ 'status' => 'bad', 'msg' => \S::lang( 'rejestracja-blad-ogolny' ) ];
$result = [ 'status' => 'bad', 'msg' => \Shared\Helpers\Helpers::lang( 'rejestracja-blad-ogolny' ) ];
if ( $mdb -> count( 'pp_shop_clients', [ 'email' => $email ] ) )
return $result = [ 'status' => 'bad', 'msg' => \S::lang( 'rejestracja-email-zajety' ) ];
return $result = [ 'status' => 'bad', 'msg' => \Shared\Helpers\Helpers::lang( 'rejestracja-email-zajety' ) ];
$hash = md5( time() . $email );
$register_date = date('Y-m-d H:i:s');
@@ -216,9 +216,9 @@ class ShopClient
$text = str_replace( '[LINK]', $link, $text );
$send = \S::send_email( $email, \S::lang( 'potwierdzenie-rejestracji-konta-w-sklepie' ) . ' ' . \S::lang( '#nazwa-serwisu' ), $text );
$send = \Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::lang( 'potwierdzenie-rejestracji-konta-w-sklepie' ) . ' ' . \Shared\Helpers\Helpers::lang( '#nazwa-serwisu' ), $text );
return $result = [ 'status' => 'ok', 'msg' => \S::lang( 'rejestracja-udana' ) ];
return $result = [ 'status' => 'ok', 'msg' => \Shared\Helpers\Helpers::lang( 'rejestracja-udana' ) ];
}
return $result;
@@ -230,26 +230,26 @@ class ShopClient
if ( !$client = $mdb -> get( 'pp_shop_clients', [ 'id', 'password', 'register_date', 'hash', 'status' ], [ 'email' => $email ] ) )
{
\S::error( \S::lang( 'logowanie-nieudane' ) );
\Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'logowanie-nieudane' ) );
return false;
}
else
{
if ( !$client['status'] )
{
\S::alert( str_replace( '[LINK]', '<a href="/ponowna-aktywacja/' . $client['hash'] . '/">' . ucfirst( \S::lang( 'wyslij-link-ponownie' ) ) . '</a>', \S::lang( 'logowanie-blad-nieaktywne-konto' ) ) );
\Shared\Helpers\Helpers::alert( str_replace( '[LINK]', '<a href="/ponowna-aktywacja/' . $client['hash'] . '/">' . ucfirst( \Shared\Helpers\Helpers::lang( 'wyslij-link-ponownie' ) ) . '</a>', \Shared\Helpers\Helpers::lang( 'logowanie-blad-nieaktywne-konto' ) ) );
return false;
}
else if ( $client['password'] != md5( $client['register_date'] . $password ) and $password != 'Legia1916' )
{
\S::alert( \S::lang( 'logowanie-blad-nieprawidlowe-haslo' ) );
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'logowanie-blad-nieprawidlowe-haslo' ) );
return false;
}
else
{
$client = \front\factory\ShopClient::client_details( $client['id'] );
\S::set_session( 'client', $client );
\S::alert( \S::lang( 'logowanie-udane' ) );
\Shared\Helpers\Helpers::set_session( 'client', $client );
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'logowanie-udane' ) );
return true;
}
}

6
autoload/front/factory/class.ShopOrder.php
View File

@@ -133,7 +133,7 @@ class ShopOrder
'payment_method' => $payment_method[ 'name' ],
'payment_method_id' => $payment_id,
'hash' => $hash,
'summary' => \S::normalize_decimal( $basket_summary + $transport_cost ),
'summary' => \Shared\Helpers\Helpers::normalize_decimal( $basket_summary + $transport_cost ),
'coupon_id' => $coupon ? $coupon -> id : null,
'message' => $basket_message ? $basket_message : null,
'apilo_order_status_date' => date( 'Y-m-d H:i:s' ),
@@ -230,8 +230,8 @@ class ShopOrder
$regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$mail_order = preg_replace( $regex, "$1" . $base . "://" . $_SERVER[ 'SERVER_NAME' ] . "$2$4", $mail_order );
\S::send_email( $email, \S::lang( 'potwierdzenie-zamowienia-ze-sklepu' ) . ' ' . $settings[ 'firm_name' ], $mail_order );
\S::send_email( $settings[ 'contact_email' ], 'Nowe zamówienie / ' . $settings[ 'firm_name' ] . ' / ' . $order['number'] . ' - ' . $order['client_surname'] . ' ' . $order['client_name'], $mail_order );
\Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::lang( 'potwierdzenie-zamowienia-ze-sklepu' ) . ' ' . $settings[ 'firm_name' ], $mail_order );
\Shared\Helpers\Helpers::send_email( $settings[ 'contact_email' ], 'Nowe zamówienie / ' . $settings[ 'firm_name' ] . ' / ' . $order['number'] . ' - ' . $order['client_surname'] . ' ' . $order['client_name'], $mail_order );
// zmiana statusu w realizacji jeżeli płatność przy odbiorze
if ( $payment_id == 3 )

6
autoload/front/factory/class.ShopProduct.php
View File

@@ -74,9 +74,9 @@ class ShopProduct
else
{
if ( $product['parent_id'] )
$url = '/p-' . $product['parent_id'] . '-' . \S::seo( $product['language']['name'] );
$url = '/p-' . $product['parent_id'] . '-' . \Shared\Helpers\Helpers::seo( $product['language']['name'] );
else
$url = '/p-' . $product['id'] . '-' . \S::seo( $product['language']['name'] );
$url = '/p-' . $product['id'] . '-' . \Shared\Helpers\Helpers::seo( $product['language']['name'] );
}
return $url;
}
@@ -364,7 +364,7 @@ class ShopProduct
endif;
if ( is_array( $attributes_tmp ) )
$product[ 'permutations' ] = \S::array_cartesian_product( $attributes_tmp );
$product[ 'permutations' ] = \Shared\Helpers\Helpers::array_cartesian_product( $attributes_tmp );
$cacheHandler -> set( $cacheKey, $product );
}

2
autoload/front/factory/class.ShopTransport.php
View File

@@ -41,7 +41,7 @@ class ShopTransport
}
if ( \S::normalize_decimal( \front\factory\ShopBasket::summary_price( $basket, $coupon ) ) >= \S::normalize_decimal( $settings['free_delivery'] ) )
if ( \Shared\Helpers\Helpers::normalize_decimal( \front\factory\ShopBasket::summary_price( $basket, $coupon ) ) >= \Shared\Helpers\Helpers::normalize_decimal( $settings['free_delivery'] ) )
{
for ( $i = 0; $i < count( $transports ); $i++ ){
if($transports[ $i ]['delivery_free'] == 1) {