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

ver. 0.279: Newsletter frontend migration, Languages facade elimination, bug fix newsletter_unsubscribe

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Jacek Pyziak
2026-02-16 15:11:38 +01:00
parent 59b36f48b1
commit 3b32ea0b9b
54 changed files with 579 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
autoload/front/Controllers/NewsletterController.php Normal file
View File

@@ -0,0 +1,49 @@
<?php
namespace front\Controllers;
use Domain\Newsletter\NewsletterRepository;
class NewsletterController
{
private NewsletterRepository $repository;
public function __construct( NewsletterRepository $repository )
{
$this->repository = $repository;
}
public function signin()
{
global $settings;
$result = [ 'status' => 'bad' ];
if ( $this->repository->signup( \S::get( 'email' ), $_SERVER['SERVER_NAME'], !empty( $settings['ssl'] ), $settings ) )
$result = [ 'status' => 'ok' ];
echo json_encode( $result );
exit;
}
public function confirm()
{
global $lang;
if ( $this->repository->confirmSubscription( \S::get( 'hash' ) ) )
\S::alert( $lang['email-zostal-dodany-do-listy-newsletter'] );
header( 'Location: /' );
exit;
}
public function unsubscribe()
{
global $lang;
if ( $this->repository->unsubscribe( \S::get( 'hash' ) ) )
\S::alert( $lang['email-zostal-usuniety-z-listy-newsletter'] );
header( 'Location: /' );
exit;
}
}

12
autoload/front/Views/Languages.php Normal file
View File

@@ -0,0 +1,12 @@
<?php
namespace front\Views;
class Languages
{
public static function render( $languages )
{
$tpl = new \Tpl;
$tpl -> languages = $languages;
return $tpl -> render( 'site/languages' );
}
}

6
autoload/front/view/class.Newsletter.php → autoload/front/Views/Newsletter.php
View File

@@ -1,9 +1,9 @@
<?php
namespace front\view;
namespace front\Views;
class Newsletter
{
public static function newsletter()
{
public static function render()
{
$tpl = new \Tpl;
return $tpl -> render( 'newsletter/newsletter' );

38
autoload/front/controls/class.Newsletter.php
View File

@@ -1,38 +0,0 @@
<?php
namespace front\controls;
class Newsletter
{
public static function signin()
{
$result = [ 'status' => 'bad' ];
if ( \front\factory\Newsletter::newsletter_signin( \S::get( 'email' ) ) )
$result = [ 'status' => 'ok' ];
echo json_encode( $result );
exit;
}
public static function confirm()
{
global $lang;
if ( \front\factory\Newsletter::newsletter_confirm( \S::get( 'hash' ) ) )
\S::alert( $lang['email-zostal-dodany-do-listy-newsletter'] );
header( 'Location: /' );
exit;
}
public static function unsubscribe()
{
global $lang;
if ( \front\factory\Newsletter::newsletter_unsubscribe( \S::get( 'hash' ) ) )
\S::alert( $lang['email-zostal-usuniety-z-listy-newsletter'] );
header( 'Location: /' );
exit;
}
}

33
autoload/front/controls/class.Site.php
View File

@@ -53,14 +53,21 @@ class Site
if ( $category )
return \front\view\ShopCategory::category_view( $category, $lang_id, \S::get( 'bs' ) );
// stare klasy
$class = '\front\controls\\';
$results = explode( '_', \S::get( 'module' ) );
if ( is_array( $results ) ) foreach ( $results as $row )
$class .= ucfirst( $row );
// nowe kontrolery z DI
$module = \S::get( 'module' );
$action = \S::get( 'action' );
$controllerFactories = self::getControllerFactories();
$moduleName = implode( '', array_map( 'ucfirst', explode( '_', $module ) ) );
if ( isset( $controllerFactories[$moduleName] ) and $action )
{
$controller = $controllerFactories[$moduleName]();
if ( method_exists( $controller, $action ) )
return $controller->$action();
}
// stare klasy
$class = '\front\controls\\' . $moduleName;
if ( class_exists( $class ) and method_exists( new $class, $action ) )
return call_user_func_array( array( $class, $action ), array() );
@@ -132,5 +139,17 @@ class Site
if ( file_exists( 'modules/actions.php' ) )
include 'modules/actions.php';
}
public static function getControllerFactories()
{
return [
'Newsletter' => function() {
global $mdb;
return new \front\Controllers\NewsletterController(
new \Domain\Newsletter\NewsletterRepository( $mdb )
);
},
];
}
}
?>

29
autoload/front/factory/class.Languages.php
View File

@@ -1,29 +0,0 @@
<?php
namespace front\factory;
/**
* Fasada delegujaca do Domain\Languages\LanguagesRepository.
*/
class Languages
{
public static function default_language()
{
global $mdb;
$repo = new \Domain\Languages\LanguagesRepository($mdb);
return $repo->defaultLanguage();
}
public static function active_languages()
{
global $mdb;
$repo = new \Domain\Languages\LanguagesRepository($mdb);
return $repo->activeLanguages();
}
public static function lang_translations($language = 'pl')
{
global $mdb;
$repo = new \Domain\Languages\LanguagesRepository($mdb);
return $repo->translations($language);
}
}

133
autoload/front/factory/class.Newsletter.php
View File

@@ -1,133 +0,0 @@
<?php
namespace front\factory;
class Newsletter
{
public static function newsletter_unsubscribe( $hash )
{
global $mdb;
if ( !$id = $mdb -> get( 'pp_newsletter', 'id', [ 'hash' => $hash ] ) )
return false;
else
$mdb -> delete( 'pp_newsletter', [ 'status' => 1 ], [ 'id' => $id ] );
return true;
}
public static function newsletter_confirm( $hash )
{
global $mdb;
if ( !$id = $mdb -> get( 'pp_newsletter', 'id', [ 'AND' => [ 'hash' => $hash, 'status' => 0 ] ] ) )
return false;
else
$mdb -> update( 'pp_newsletter', [ 'status' => 1 ], [ 'id' => $id ] );
return true;
}
public static function newsletter_send( $limit = 5 )
{
global $mdb, $settings, $lang;
$settingsRepository = new \Domain\Settings\SettingsRepository( $mdb );
$newsletterRepository = new \Domain\Newsletter\NewsletterRepository( $mdb, $settingsRepository );
$previewRenderer = new \Domain\Newsletter\NewsletterPreviewRenderer();
$settingsDetails = $settingsRepository -> getSettings();
$results = $mdb -> query( 'SELECT * FROM pp_newsletter_send ORDER BY id ASC LIMIT ' . $limit ) -> fetchAll();
if ( is_array( $results ) and !empty( $results ) )
{
foreach ( $results as $row )
{
$dates = explode( ' - ', $row['dates'] );
$articles = [];
$articleRepository = new \Domain\Article\ArticleRepository( $mdb );
if ( isset( $dates[0], $dates[1] ) )
$articles = $articleRepository->articlesByDateAdd( $dates[0], $dates[1] );
$text = $previewRenderer -> render(
is_array( $articles ) ? $articles : [],
$settingsDetails,
$newsletterRepository -> templateDetails( (int)$row['id_template'] ),
(string)$row['dates']
);
if ( $settings['ssl'] ) $base = 'https'; else $base = 'http';
$regex = "-(<img[^>]+src\s*=\s*['\"])(((?!'|\"|http://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$regex = "-(<a[^>]+href\s*=\s*['\"])(((?!'|\"|http://).)*)(['\"][^>]*>)-i";
$text = preg_replace( $regex, "$1" . $base . "://" . $_SERVER['SERVER_NAME'] . "$2$4", $text );
$link = $base . "://" . $_SERVER['SERVER_NAME'] . '/newsletter/unsubscribe/hash=' . \front\factory\Newsletter::get_hash( $row['email'] );
$text = str_replace( '[WYPISZ_SIE]', '<a href="' . $link . '">' . $lang['wypisz-sie'] . '</a>', $text );
\S::send_email( $row['email'], 'Newsletter ze strony: ' . $_SERVER['SERVER_NAME'], $text );
$mdb -> delete( 'pp_newsletter_send', [ 'id' => $row['id'] ] );
}
return true;
}
return false;
}
public static function get_hash( $email )
{
global $mdb;
return $mdb -> get( 'pp_newsletter', 'hash', [ 'email' => $email ] );
}
public static function newsletter_signin( $email )
{
global $mdb, $lang, $settings;
if ( !\S::email_check( $email ) )
return false;
if ( !$mdb -> get( 'pp_newsletter', 'id', [ 'email' => $email ] ) )
{
$hash = md5( time() . $email );
$text = $settings['newsletter_header'];
$text .= \front\factory\Newsletter::get_template( '#potwierdzenie-zapisu-do-newslettera' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';
$link = '/newsletter/confirm/hash=' . $hash;
$text = str_replace( '[LINK]', $link, $text );
$text = str_replace( '[WYPISZ_SIE]', '', $text );
$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 = \S::send_email( $email, $lang['potwierdz-zapisanie-sie-do-newslettera'], $text );
$mdb -> insert( 'pp_newsletter', [ 'email' => $email, 'hash' => $hash, 'status' => 0 ] );
return true;
}
return false;
}
public static function get_template( $template_name )
{
global $mdb;
$repository = new \Domain\Newsletter\NewsletterRepository( $mdb );
return $repository -> templateByName( (string)$template_name );
}
public static function newsletter_signout( $email )
{
global $mdb;
if ( $mdb -> get( 'pp_newsletter', 'id', [ 'email' => $email ] ) )
return $mdb -> delete( 'pp_newsletter', [ 'email' => $email ] );
return false;
}
}

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

@@ -32,7 +32,7 @@ class Pages
$page['language']['seo_link'] ? $url = '/' . $page['language']['seo_link'] : $url = '/s-' . $page['id'] . '-' . \S::seo( $page['language']['title'] );
if ( $lang_id != \front\factory\Languages::default_language() and $url != '#' )
if ( $lang_id != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
$url = '/' . $lang_id . $url;
return $url;

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

@@ -35,7 +35,7 @@ class ShopCategory
$category['language']['seo_link'] ? $url = '/' . $category['language']['seo_link'] : $url = '/k-' . $category['id'] . '-' . \S::seo( $category['language']['title'] );
if ( \S::get_session( 'current-lang' ) != \front\factory\Languages::default_language() and $url != '#' )
if ( \S::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
$url = '/' . \S::get_session( 'current-lang' ) . $url;
return $url;

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

@@ -93,7 +93,7 @@ class ShopClient
if ( $data = $mdb -> get( 'pp_shop_clients', [ 'id', 'email', 'register_date' ], [ 'AND' => [ 'hash' => $hash, 'status' => 1, 'password_recovery' => 1 ] ] ) )
{
$text = $settings['newsletter_header'];
$text .= \front\factory\Newsletter::get_template( '#nowe-haslo' );
$text .= ( new \Domain\Newsletter\NewsletterRepository( $mdb ) )->templateByName( '#nowe-haslo' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';
@@ -129,7 +129,7 @@ class ShopClient
if ( $hash = $mdb -> get( 'pp_shop_clients', 'hash', [ 'AND' => [ 'email' => $email, 'status' => 1 ] ] ) )
{
$text = $settings['newsletter_header'];
$text .= \front\factory\Newsletter::get_template( '#odzyskiwanie-hasla-link' );
$text .= ( new \Domain\Newsletter\NewsletterRepository( $mdb ) )->templateByName( '#odzyskiwanie-hasla-link' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';
@@ -164,7 +164,7 @@ class ShopClient
$email = $mdb -> get( 'pp_shop_clients', 'email', [ 'id' => $id ] );
$text = $settings['newsletter_header'];
$text .= \front\factory\Newsletter::get_template( '#potwierdzenie-aktywacji-konta' );
$text .= ( new \Domain\Newsletter\NewsletterRepository( $mdb ) )->templateByName( '#potwierdzenie-aktywacji-konta' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';
@@ -201,7 +201,7 @@ class ShopClient
] ) )
{
$text = $settings['newsletter_header'];
$text .= \front\factory\Newsletter::get_template( '#potwierdzenie-rejestracji' );
$text .= ( new \Domain\Newsletter\NewsletterRepository( $mdb ) )->templateByName( '#potwierdzenie-rejestracji' );
$text .= $settings['newsletter_footer'];
$settings['ssl'] ? $base = 'https' : $base = 'http';

12
autoload/front/view/class.Languages.php
View File

@@ -1,12 +0,0 @@
<?php
namespace front\view;
class Languages
{
public static function languages()
{
$tpl = new \Tpl;
$tpl -> languages = \front\factory\Languages::active_languages();
return $tpl -> render( 'site/languages' );
}
}

4
autoload/front/view/class.Site.php
View File

@@ -106,7 +106,7 @@ class Site
] ),
$html );
$html = str_replace( '[NEWSLETTER]',
\front\view\Newsletter::newsletter(),
\front\Views\Newsletter::render(),
$html );
$html = str_replace( '[UZYTKOWNIK_MINI_LOGOWANIE]',
\front\view\ShopClient::mini_login(),
@@ -333,7 +333,7 @@ class Site
$html = str_replace( '[TITLE]', $page['language']['meta_title'] ? $page['language']['meta_title'] . ' | ' . $settings['firm_name'] : $page['language']['title'] . ' | ' . $settings['firm_name'], $html );
$html = str_replace( '[META_KEYWORDS]', $page['language']['meta_keywords'], $html );
$html = str_replace( '[META_DESCRIPTION]', $page['language']['meta_description'], $html );
$html = str_replace( '[JEZYKI]', \front\view\Languages::languages(), $html );
$html = str_replace( '[JEZYKI]', \front\Views\Languages::render( ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->activeLanguages() ), $html );
$html = str_replace( '[TYTUL_STRONY]', self::title( $page['language']['title'], $page['show_title'], $page['language']['page_title'] ), $html );
$html = str_replace( '[WYSZUKIWARKA]', \shop\Search::simple_form(), $html );