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:
@@ -25,19 +25,19 @@ class Site
|
||||
$articleRepo = new \Domain\Article\ArticleRepository( $GLOBALS['mdb'] );
|
||||
$bannerRepo = new \Domain\Banner\BannerRepository( $GLOBALS['mdb'] );
|
||||
|
||||
if ( (int) \S::get( 'layout_id' ) )
|
||||
$layout = new \cms\Layout( (int) \S::get( 'layout_id' ) );
|
||||
if ( (int) \Shared\Helpers\Helpers::get( 'layout_id' ) )
|
||||
$layout = new \cms\Layout( (int) \Shared\Helpers\Helpers::get( 'layout_id' ) );
|
||||
|
||||
if ( \S::get( 'article' ) )
|
||||
$layout = \front\factory\Layouts::article_layout( \S::get( 'article' ) );
|
||||
if ( \Shared\Helpers\Helpers::get( 'article' ) )
|
||||
$layout = \front\factory\Layouts::article_layout( \Shared\Helpers\Helpers::get( 'article' ) );
|
||||
|
||||
if ( \S::get( 'product' ) )
|
||||
$layout = \front\factory\Layouts::product_layout( \S::get( 'product' ) );
|
||||
if ( \Shared\Helpers\Helpers::get( 'product' ) )
|
||||
$layout = \front\factory\Layouts::product_layout( \Shared\Helpers\Helpers::get( 'product' ) );
|
||||
|
||||
if ( \S::get( 'category' ) )
|
||||
$layout = \front\factory\Layouts::category_layout( \S::get( 'category' ) );
|
||||
if ( \Shared\Helpers\Helpers::get( 'category' ) )
|
||||
$layout = \front\factory\Layouts::category_layout( \Shared\Helpers\Helpers::get( 'category' ) );
|
||||
|
||||
if ( !$layout and \S::get( 'module' ) )
|
||||
if ( !$layout and \Shared\Helpers\Helpers::get( 'module' ) )
|
||||
$layout = \front\factory\Layouts::default_layout();
|
||||
|
||||
if ( !$layout )
|
||||
@@ -47,10 +47,7 @@ class Site
|
||||
$html = file_get_contents( 'devel.html' );
|
||||
else
|
||||
{
|
||||
if ( \S::is_mobile() and !empty( $layout['m_html'] ) )
|
||||
$html = $layout['m_html'];
|
||||
else
|
||||
$html = $layout['html'];
|
||||
$html = $layout['html'];
|
||||
}
|
||||
|
||||
if ( $settings['facebook_link'] )
|
||||
@@ -65,7 +62,7 @@ class Site
|
||||
|
||||
$html = str_replace( '[KATEGORIE]', \Tpl::view( 'shop-category/categories', [
|
||||
'level' => $level,
|
||||
'current_category' => \S::get( 'category' ),
|
||||
'current_category' => \Shared\Helpers\Helpers::get( 'category' ),
|
||||
'categories' => \front\factory\ShopCategory::categories_details()
|
||||
] ), $html );
|
||||
|
||||
@@ -103,9 +100,9 @@ class Site
|
||||
|
||||
$html = str_replace( '[KOSZYK]',
|
||||
\Tpl::view( 'shop-basket/basket-mini', [
|
||||
'basket' => \S::get_session( 'basket' ),
|
||||
'basket' => \Shared\Helpers\Helpers::get_session( 'basket' ),
|
||||
'lang_id' => $lang_id,
|
||||
'coupon' => \S::get_session( 'coupon' )
|
||||
'coupon' => \Shared\Helpers\Helpers::get_session( 'coupon' )
|
||||
] ),
|
||||
$html );
|
||||
$html = str_replace( '[NEWSLETTER]',
|
||||
@@ -115,15 +112,9 @@ class Site
|
||||
\front\view\ShopClient::mini_login(),
|
||||
$html );
|
||||
|
||||
if ( \S::is_mobile() and !empty( $layout['m_html'] ) )
|
||||
$html = str_replace( '[CSS]', $layout['m_css'], $html );
|
||||
else
|
||||
$html = str_replace( '[CSS]', $layout['css'], $html );
|
||||
$html = str_replace( '[CSS]', $layout['css'], $html );
|
||||
|
||||
if ( \S::is_mobile() and !empty( $layout['m_html'] ) )
|
||||
$html = str_replace( '[JAVA_SCRIPT]', $layout['m_js'], $html );
|
||||
else
|
||||
$html = str_replace( '[JAVA_SCRIPT]', $layout['js'], $html );
|
||||
$html = str_replace( '[JAVA_SCRIPT]', $layout['js'], $html );
|
||||
|
||||
preg_match_all( self::menu_pattern, $html, $menu );
|
||||
if ( is_array( $menu[0] ) ) foreach( $menu[0] as $menu_tmp )
|
||||
@@ -154,9 +145,9 @@ class Site
|
||||
//
|
||||
// KATEGORIA SKLEPU
|
||||
//
|
||||
if ( \S::get( 'category' ) )
|
||||
if ( \Shared\Helpers\Helpers::get( 'category' ) )
|
||||
{
|
||||
$category = \front\factory\ShopCategory::category_details( \S::get( 'category' ) );
|
||||
$category = \front\factory\ShopCategory::category_details( \Shared\Helpers\Helpers::get( 'category' ) );
|
||||
|
||||
if ( $category['language']['meta_title'] )
|
||||
$page['language']['title'] = $category['language']['meta_title'];
|
||||
@@ -176,9 +167,9 @@ class Site
|
||||
//
|
||||
// ARTYKUŁ
|
||||
//
|
||||
if ( \S::get( 'article' ) )
|
||||
if ( \Shared\Helpers\Helpers::get( 'article' ) )
|
||||
{
|
||||
$article = $articleRepo->articleDetailsFrontend( (int)\S::get( 'article' ), $lang_id );
|
||||
$article = $articleRepo->articleDetailsFrontend( (int)\Shared\Helpers\Helpers::get( 'article' ), $lang_id );
|
||||
|
||||
if ( $article['language']['meta_title'] )
|
||||
$page['language']['title'] = $article['language']['meta_title'];
|
||||
@@ -196,9 +187,9 @@ class Site
|
||||
//
|
||||
// PRODUKT
|
||||
//
|
||||
if ( \S::get( 'product' ) )
|
||||
if ( \Shared\Helpers\Helpers::get( 'product' ) )
|
||||
{
|
||||
$product = Product::getFromCache( \S::get( 'product' ), $lang_id, $_GET['permutation_hash'] );
|
||||
$product = Product::getFromCache( \Shared\Helpers\Helpers::get( 'product' ), $lang_id, $_GET['permutation_hash'] );
|
||||
|
||||
if ( $product['language']['meta_title'] )
|
||||
$page['language']['title'] = $product['language']['meta_title'];
|
||||
@@ -219,9 +210,9 @@ class Site
|
||||
//
|
||||
// PRODUCENT
|
||||
//
|
||||
if ( \S::get( 'producer_id' ) )
|
||||
if ( \Shared\Helpers\Helpers::get( 'producer_id' ) )
|
||||
{
|
||||
$producer = new \shop\Producer( \S::get( 'producer_id' ) );
|
||||
$producer = new \shop\Producer( \Shared\Helpers\Helpers::get( 'producer_id' ) );
|
||||
|
||||
if ( $producer['languages'][$lang_id]['meta_title'] )
|
||||
$page['language']['meta_title'] = $producer['languages'][$lang_id]['meta_title'];
|
||||
@@ -341,9 +332,9 @@ class Site
|
||||
$html = str_replace( '[WYSZUKIWARKA]', \shop\Search::simple_form(), $html );
|
||||
|
||||
/* atrybut noindex */
|
||||
if ( \S::get( 'article' ) )
|
||||
if ( \Shared\Helpers\Helpers::get( 'article' ) )
|
||||
{
|
||||
$articleRepo->articleNoindex( (int)\S::get( 'article' ), $lang_id ) ? $noindex = 'noindex' : $noindex = 'all';
|
||||
$articleRepo->articleNoindex( (int)\Shared\Helpers\Helpers::get( 'article' ), $lang_id ) ? $noindex = 'noindex' : $noindex = 'all';
|
||||
$html = str_replace( '[META_INDEX]', '<meta name="robots" content="' . $noindex . '">', $html );
|
||||
}
|
||||
else
|
||||
@@ -446,18 +437,18 @@ class Site
|
||||
|
||||
public static function alert()
|
||||
{
|
||||
if ( $alert = \S::get_session( 'alert' ) )
|
||||
if ( $alert = \Shared\Helpers\Helpers::get_session( 'alert' ) )
|
||||
{
|
||||
\S::delete_session( 'alert' );
|
||||
\Shared\Helpers\Helpers::delete_session( 'alert' );
|
||||
|
||||
return $tpl = \Tpl::view( 'site/alert', [
|
||||
'alert' => $alert
|
||||
] );
|
||||
}
|
||||
|
||||
if ( $error = \S::get_session( 'error' ) )
|
||||
if ( $error = \Shared\Helpers\Helpers::get_session( 'error' ) )
|
||||
{
|
||||
\S::delete_session( 'error' );
|
||||
\Shared\Helpers\Helpers::delete_session( 'error' );
|
||||
|
||||
$tpl = new \Tpl;
|
||||
$tpl -> error = $error;
|
||||
|
||||
Reference in New Issue
Block a user