ver. 0.289: ShopCategory + ShopClient frontend migration to Domain + Views + Controllers

ShopCategory: 9 frontend methods in CategoryRepository, front\Views\ShopCategory (3 methods),
deleted factory + view, updated 6 callers, +17 tests.

ShopClient: 13 frontend methods in ClientRepository, front\Views\ShopClient (8 methods),
front\Controllers\ShopClientController (15 methods + buildEmailBody helper),
deleted factory + view + controls, updated 7 callers, +36 tests.

Security fix: removed hardcoded password bypass 'Legia1916'.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-02-17 10:41:40 +01:00
parent 25348797da
commit e671142cee
34 changed files with 2049 additions and 961 deletions

View File

@@ -1,313 +0,0 @@
<?php
namespace front\factory;
class ShopCategory
{
static public function get_category_sort( int $category_id )
{
global $mdb;
$cacheHandler = new \Shared\Cache\CacheHandler();
$cacheKey = "get_category_sort:$category_id";
$objectData = $cacheHandler->get( $cacheKey );
if ( !$objectData )
{
$category_sort = $mdb -> get( 'pp_shop_categories', 'sort_type', [ 'id' => $category_id ] );
$cacheHandler->set( $cacheKey, $category_sort );
}
else
{
return unserialize( $objectData );
}
return $category_sort;
}
public static function category_name( $category_id )
{
global $mdb, $lang_id;
$cacheHandler = new \Shared\Cache\CacheHandler();
$cacheKey = 'category_name' . $lang_id . '_' . $category_id;
$objectData = $cacheHandler->get( $cacheKey );
if ( !$objectData )
{
$category_name = $mdb -> get( 'pp_shop_categories_langs', 'title', [ 'AND' => [ 'category_id' => (int)$category_id, 'lang_id' => $lang_id ] ] );
$cacheHandler->set( $cacheKey, $category_name );
}
else
{
return unserialize( $objectData );
}
return $category_name;
}
public static function category_url( $category_id ) {
$category = self::category_details( $category_id );
$category['language']['seo_link'] ? $url = '/' . $category['language']['seo_link'] : $url = '/k-' . $category['id'] . '-' . \Shared\Helpers\Helpers::seo( $category['language']['title'] );
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;
}
public static function blog_category_products( $category_id, $lang_id, $limit )
{
global $mdb;
$cacheHandler = new \Shared\Cache\CacheHandler();
$cacheKey = "\front\factory\ShopCategory::blog_category_products:$category_id:$lang_id:$limit";
$objectData = $cacheHandler -> get( $cacheKey );
if ( !$objectData )
{
$results = $mdb -> query( 'SELECT * FROM ( '
. 'SELECT '
. 'psp.id, date_modify, date_add, o, '
. '( CASE '
. 'WHEN copy_from IS NULL THEN name '
. 'WHEN copy_from IS NOT NULL THEN ( '
. 'SELECT '
. 'name '
. 'FROM '
. 'pp_shop_products_langs '
. 'WHERE '
. 'lang_id = pspl.copy_from AND product_id = psp.id '
. ') '
. 'END ) AS name '
. 'FROM '
. 'pp_shop_products_categories AS pspc '
. 'INNER JOIN pp_shop_products AS psp ON psp.id = pspc.product_id '
. 'INNER JOIN pp_shop_products_langs AS pspl ON pspl.product_id = pspc.product_id '
. 'WHERE '
. 'status = 1 AND category_id = ' . (int)$category_id . ' AND lang_id = \'' . $lang_id . '\' '
. ') AS q1 '
. 'WHERE '
. 'q1.name IS NOT NULL '
. 'ORDER BY '
. 'RAND() '
. 'LIMIT ' . (int)$limit ) -> fetchAll();
if ( is_array( $results ) and !empty( $results ) ) foreach ( $results as $row )
$output[] = $row['id'];
$cacheHandler -> set( $cacheKey, $output );
}
else
{
return unserialize( $objectData );
}
return $output;
}
public static function category_products_count( $category_id, $lang_id )
{
global $mdb;
$cacheHandler = new \Shared\Cache\CacheHandler();
$cacheKey = "\front\factory\ShopCategory::category_products_count:$category_id:$lang_id";
$objectData = $cacheHandler -> get( $cacheKey );
if ( !$objectData )
{
$results = $mdb -> query( 'SELECT COUNT(0) FROM ( '
. 'SELECT '
. 'psp.id, '
. '( CASE '
. 'WHEN copy_from IS NULL THEN name '
. 'WHEN copy_from IS NOT NULL THEN ( '
. 'SELECT '
. 'name '
. 'FROM '
. 'pp_shop_products_langs '
. 'WHERE '
. 'lang_id = pspl.copy_from AND product_id = psp.id '
. ') '
. 'END ) AS name '
. 'FROM '
. 'pp_shop_products_categories AS pspc '
. 'INNER JOIN pp_shop_products AS psp ON psp.id = pspc.product_id '
. 'INNER JOIN pp_shop_products_langs AS pspl ON pspl.product_id = pspc.product_id '
. 'WHERE '
. 'status = 1 AND category_id = ' . (int)$category_id . ' AND lang_id = \'' . $lang_id . '\' '
. ') AS q1 '
. 'WHERE '
. 'q1.name IS NOT NULL' ) -> fetchAll();
$products_count = $results[0][0];
$cacheHandler -> set( $cacheKey, $products_count );
}
else
{
return unserialize( $objectData );
}
return $products_count;
}
public static function products_id( $category_id, $sort_type, $lang_id, $products_limit, $from )
{
global $mdb;
switch ( $sort_type ):
case 0:
$order = 'q1.date_add ASC ';
break;
case 1:
$order = 'q1.date_add DESC ';
break;
case 2:
$order = 'q1.date_modify ASC ';
break;
case 3:
$order = 'q1.date_modify DESC ';
break;
case 4:
$order = 'q1.o ASC ';
break;
case 5:
$order = 'q1.name ASC ';
break;
case 6:
$order = 'q1.name DESC ';
break;
endswitch;
$cacheHandler = new \Shared\Cache\CacheHandler();
$cacheKey = "\front\factory\ShopCategory::products_id:$category_id:$sort_type:$lang_id:$products_limit:$from:$order";
$objectData = $cacheHandler -> get( $cacheKey );
if ( !$objectData )
{
$results = $mdb -> query( 'SELECT * FROM ( '
. 'SELECT '
. 'psp.id, date_modify, date_add, o, '
. '( CASE '
. 'WHEN copy_from IS NULL THEN name '
. 'WHEN copy_from IS NOT NULL THEN ( '
. 'SELECT '
. 'name '
. 'FROM '
. 'pp_shop_products_langs '
. 'WHERE '
. 'lang_id = pspl.copy_from AND product_id = psp.id '
. ') '
. 'END ) AS name, '
. '( CASE '
. 'WHEN new_to_date >= \'' . date( 'Y-m-d' ) . '\' THEN new_to_date '
. 'WHEN new_to_date < \'' . date( 'Y-m-d' ) . '\' THEN null '
. 'END ) '
. 'AS new_to_date, '
. '( CASE WHEN ( quantity + ( SELECT IFNULL(SUM(quantity),0) FROM pp_shop_products WHERE parent_id = psp.id ) ) > 0 THEN 1 ELSE 0 END ) AS total_quantity '
. 'FROM '
. 'pp_shop_products_categories AS pspc '
. 'INNER JOIN pp_shop_products AS psp ON psp.id = pspc.product_id '
. 'INNER JOIN pp_shop_products_langs AS pspl ON pspl.product_id = pspc.product_id '
. 'WHERE '
. 'status = 1 AND category_id = ' . (int)$category_id . ' AND lang_id = \'' . $lang_id . '\' '
. ') AS q1 '
. 'WHERE '
. 'q1.name IS NOT NULL '
. 'ORDER BY '
. $order
. 'LIMIT '
. (int)$from . ',' . (int)$products_limit ) -> fetchAll();
if ( is_array( $results ) and !empty( $results ) ) foreach ( $results as $row )
$output[] = $row['id'];
$cacheHandler -> set( $cacheKey, $output );
}
else
{
return unserialize( $objectData );
}
return $output;
}
public static function category_products( $category, $lang_id, $bs )
{
$count = \front\factory\ShopCategory::category_products_count( $category['id'], $lang_id );
$ls = ceil( $count / 12 );
if ( $bs < 1 )
$bs = 1;
else if ( $bs > $ls )
$bs = $ls;
$from = 12 * ( $bs - 1 );
if ( $from < 0 )
$from = 0;
$results['products'] = \front\factory\ShopCategory::products_id( (int)$category['id'], $category['sort_type'], $lang_id, 12, $from );
$results['ls'] = $ls;
return $results;
}
public static function categories_details( $parent_id = null )
{
global $mdb;
$cacheHandler = new \Shared\Cache\CacheHandler();
$cacheKey = "\front\factory\ShopCategory::categories_details:$parent_id";
$objectData = $cacheHandler->get($cacheKey);
if ( !$objectData )
{
$results = $mdb -> select( 'pp_shop_categories', 'id', [ 'parent_id' => $parent_id, 'ORDER' => [ 'o' => 'ASC' ] ] );
if ( is_array( $results ) ) foreach ( $results as $row )
{
$category = \front\factory\ShopCategory::category_details( $row );
$category['categories'] = \front\factory\ShopCategory::categories_details( $row );
$categories[]= $category;
}
$cacheHandler -> set( $cacheKey, $categories );
}
else
{
return unserialize( $objectData );
}
return $categories;
}
public static function category_details( $category_id )
{
global $mdb, $lang_id;
$cacheHandler = new \Shared\Cache\CacheHandler();
$cacheKey = "\front\factory\ShopCategory::category_details:$category_id";
$objectData = $cacheHandler->get($cacheKey);
if ( !$objectData )
{
$category = $mdb -> get( 'pp_shop_categories', '*', [ 'id' => (int)$category_id ] );
$category['language'] = $mdb -> get( 'pp_shop_categories_langs', '*', [ 'AND' => [ 'category_id' => (int)$category_id, 'lang_id' => $lang_id ] ] );
$cacheHandler -> set( $cacheKey, $category );
}
else
{
return unserialize( $objectData );
}
return $category;
}
}

View File

@@ -1,264 +0,0 @@
<?php
namespace front\factory;
class ShopClient
{
public static function client_orders( $client_id )
{
global $mdb;
$results = $mdb -> select( 'pp_shop_orders', 'id', [ 'client_id' => $client_id, 'ORDER' => [ 'date_order' => 'DESC' ] ] );
if ( is_array( $results ) and count( $results ) ) foreach ( $results as $row )
{
$orders[] = \front\factory\ShopOrder::order_details( $row );
}
return $orders;
}
public static function mark_address_as_current( $client_id, $address_id )
{
global $mdb;
$mdb -> update( 'pp_shop_clients_addresses', [ 'current' => 0 ], [ 'client_id' => $client_id ] );
$mdb -> update( 'pp_shop_clients_addresses', [ 'current' => 1 ], [ 'AND' => [ 'client_id' => $client_id, 'id' => $address_id ] ] );
return true;
}
public static function client_email( $client_id )
{
global $mdb;
return $mdb -> get( 'pp_shop_clients', 'email', [ 'id' => $client_id ] );
}
public static function address_delete( $address_id )
{
global $mdb;
return $mdb -> delete( 'pp_shop_clients_addresses', [ 'id' => $address_id ] );
}
public static function address_details( $address_id )
{
global $mdb;
return $mdb -> get( 'pp_shop_clients_addresses', '*', [ 'id' => $address_id ] );
}
public static function client_addresses( $client_id )
{
global $mdb;
return $mdb -> select( 'pp_shop_clients_addresses', '*', [ 'client_id' => (int)$client_id ] );
}
public static function address_save( $client_id, $address_id, $name, $surname, $street, $postal_code, $city, $phone )
{
global $mdb;
if ( !$address_id )
{
if ( $mdb -> insert( 'pp_shop_clients_addresses', [
'client_id' => $client_id,
'name' => $name,
'surname' => $surname,
'street' => $street,
'postal_code' => $postal_code,
'city' => $city,
'phone' => $phone
] ) )
return true;
}
else
{
if ( $mdb -> update( 'pp_shop_clients_addresses', [
'name' => $name,
'surname' => $surname,
'street' => $street,
'postal_code' => $postal_code,
'city' => $city,
'phone' => $phone
], [
'AND' => [
'client_id' => $client_id,
'id' => $address_id
]
] ) )
return true;
}
return false;
}
public static function new_password( $hash )
{
global $mdb, $settings;
if ( $data = $mdb -> get( 'pp_shop_clients', [ 'id', 'email', 'register_date' ], [ 'AND' => [ 'hash' => $hash, 'status' => 1, 'password_recovery' => 1 ] ] ) )
{
$text = $settings['newsletter_header'];
$text .= ( new \Domain\Newsletter\NewsletterRepository( $mdb ) )->templateByName( '#nowe-haslo' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';
$regex = "-(<img[^>]+src\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$new_password = substr( md5( time() ), 0, 10 );
$text = str_replace( '[HASLO]', $new_password, $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,
'password' => md5( $data['register_date'] . $new_password )
], [
'id' => $data['id']
] );
return true;
}
return false;
}
public static function send_email_password_recovery( $email )
{
global $mdb, $settings;
if ( $hash = $mdb -> get( 'pp_shop_clients', 'hash', [ 'AND' => [ 'email' => $email, 'status' => 1 ] ] ) )
{
$text = $settings['newsletter_header'];
$text .= ( new \Domain\Newsletter\NewsletterRepository( $mdb ) )->templateByName( '#odzyskiwanie-hasla-link' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';
$regex = "-(<img[^>]+src\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$link = '/shopClient/new_password/hash=' . $hash;
$text = str_replace( '[LINK]', $link, $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;
}
return false;
}
public static function register_confirm( $hash )
{
global $mdb, $settings;
if ( !$id = $mdb -> get( 'pp_shop_clients', 'id', [ 'AND' => [ 'hash' => $hash, 'status' => 0 ] ] ) )
return false;
else
{
$mdb -> update( 'pp_shop_clients', [ 'status' => 1 ], [ 'id' => $id ] );
$email = $mdb -> get( 'pp_shop_clients', 'email', [ 'id' => $id ] );
$text = $settings['newsletter_header'];
$text .= ( new \Domain\Newsletter\NewsletterRepository( $mdb ) )->templateByName( '#potwierdzenie-aktywacji-konta' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';
$regex = "-(<img[^>]+src\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $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;
}
public static function signup( $email, $password, $agremment_marketing )
{
global $mdb, $settings;
$result = [ 'status' => 'bad', 'msg' => \Shared\Helpers\Helpers::lang( 'rejestracja-blad-ogolny' ) ];
if ( $mdb -> count( 'pp_shop_clients', [ 'email' => $email ] ) )
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');
if ( $mdb -> insert( 'pp_shop_clients', [
'email' => $email,
'password' => md5( $register_date . $password ),
'hash' => $hash,
'agremment_marketing' => $agremment_marketing ? 1 : 0,
'register_date' => $register_date
] ) )
{
$text = $settings['newsletter_header'];
$text .= ( new \Domain\Newsletter\NewsletterRepository( $mdb ) )->templateByName( '#potwierdzenie-rejestracji' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';
$regex = "-(<img[^>]+src\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|https?://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$link = '/shopClient/confirm/hash=' . $hash;
$text = str_replace( '[LINK]', $link, $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' => \Shared\Helpers\Helpers::lang( 'rejestracja-udana' ) ];
}
return $result;
}
public static function login( $email, $password )
{
global $lang, $mdb;
if ( !$client = $mdb -> get( 'pp_shop_clients', [ 'id', 'password', 'register_date', 'hash', 'status' ], [ 'email' => $email ] ) )
{
\Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'logowanie-nieudane' ) );
return false;
}
else
{
if ( !$client['status'] )
{
\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' )
{
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'logowanie-blad-nieprawidlowe-haslo' ) );
return false;
}
else
{
$client = \front\factory\ShopClient::client_details( $client['id'] );
\Shared\Helpers\Helpers::set_session( 'client', $client );
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'logowanie-udane' ) );
return true;
}
}
return false;
}
public static function client_details( $client_id )
{
global $mdb;
return $mdb -> get( 'pp_shop_clients', '*', [ 'id' => $client_id ] );
}
}

View File

@@ -90,7 +90,7 @@ class ShopOrder
global $mdb, $lang_id, $settings;
if ( $client_id )
$email = \front\factory\ShopClient::client_email( $client_id );
$email = ( new \Domain\Client\ClientRepository( $mdb ) )->clientEmail( (int)$client_id );
if ( !is_array( $basket ) or !$transport_id or !$payment_id or !$email or !$phone or !$name or !$surname )
return false;