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>

admin/ajax.php

@@ -23,7 +23,6 @@ spl_autoload_register( '__autoload_my_classes' );
 
 require_once '../config.php';
 require_once '../libraries/medoo/medoo.php';
-require_once '../libraries/grid/config.php';
 date_default_timezone_set('Europe/Warsaw');
 
 session_start();

admin/ajax/shop-category.php

@@ -1,5 +1,5 @@
 <?php
-$a = \S::get( 'a' );
+$a = \Shared\Helpers\Helpers::get( 'a' );
 
 if ( $a == 'save_products_order' )
 {
@@ -7,7 +7,7 @@ if ( $a == 'save_products_order' )
 
   $categoryRepository = new \Domain\Category\CategoryRepository( $mdb );
 
-  if ( $categoryRepository->saveProductOrder( \S::get( 'category_id' ), \S::get( 'products' ) ) )
+  if ( $categoryRepository->saveProductOrder( \Shared\Helpers\Helpers::get( 'category_id' ), \Shared\Helpers\Helpers::get( 'products' ) ) )
     $response = [ 'status' => 'ok' ];
   
   echo json_encode( $response );

admin/ajax/users.php

@@ -1,11 +1,11 @@
 <?php
-$a = \S::get( 'a' );
+$a = \Shared\Helpers\Helpers::get( 'a' );
 
 if ( $a == 'check_login' )
 {
   global $mdb;
   $repository = new \Domain\User\UserRepository( $mdb );
-  $response = $repository->checkLogin( (string)\S::get( 'login' ), (int)\S::get( 'user_id' ) );
+  $response = $repository->checkLogin( (string)\Shared\Helpers\Helpers::get( 'login' ), (int)\Shared\Helpers\Helpers::get( 'user_id' ) );
   echo json_encode( $response );
   exit;
 }

admin/index.php

@@ -31,7 +31,6 @@ function __autoload_my_classes( $classname )
 spl_autoload_register( '__autoload_my_classes' );
 require_once '../config.php';
 require_once '../libraries/medoo/medoo.php';
-require_once '../libraries/grid/config.php';
 require_once '../libraries/rb.php';
 require_once '../libraries/phpmailer/class.phpmailer.php';
 require_once '../libraries/phpmailer/class.smtp.php';
@@ -68,16 +67,16 @@ if ( $_SESSION['ip'] !== $_SERVER['REMOTE_ADDR'] )
 
 $langRepo = new \Domain\Languages\LanguagesRepository( $mdb );
 
-if ( !$lang_id = \S::get_session( 'current-lang' ) )
+if ( !$lang_id = \Shared\Helpers\Helpers::get_session( 'current-lang' ) )
 {
   $lang_id = $langRepo->defaultLanguage();
-  \S::set_session( 'current-lang', $lang_id );
+  \Shared\Helpers\Helpers::set_session( 'current-lang', $lang_id );
 }
 
-if ( !$lang = \S::get_session( 'lang-' . $lang_id ) )
+if ( !$lang = \Shared\Helpers\Helpers::get_session( 'lang-' . $lang_id ) )
 {
   $lang = $langRepo->translations( $lang_id );
-  \S::set_session( 'lang-' . $lang_id, $lang );
+  \Shared\Helpers\Helpers::set_session( 'lang-' . $lang_id, $lang );
 }
 
 $mdb = new medoo( [
@@ -89,7 +88,7 @@ $mdb = new medoo( [
     'charset'       => 'utf8'
   ] );
 
-$user = \S::get_session( 'user', true );
+$user = \Shared\Helpers\Helpers::get_session( 'user', true );
 
 \admin\App::update();
 \admin\App::special_actions();
@@ -117,7 +116,7 @@ if ( isset( $_COOKIE[$cookie_name] ) && !isset( $_SESSION['user'] ) )
           $user_data = $mdb->get('pp_users', '*', ['AND' => ['login' => $data['login'], 'status' => 1]]);
           if ($user_data)
           {
-            \S::set_session('user', $users->details($data['login']));
+            \Shared\Helpers\Helpers::set_session('user', $users->details($data['login']));
             $redirect = $_SERVER['REQUEST_URI'] ?: '/admin/articles/view_list/';
             header('Location: ' . $redirect);
             exit;

admin/templates/banners/banner-edit.php

@@ -1,7 +1,7 @@
 <script type="text/javascript" src="/libraries/ckeditor/ckeditor.js"></script>
 <script type="text/javascript" src="/libraries/ckeditor/adapters/jquery.js"></script>
 <?
-\S::set_session( 'admin', true );
+\Shared\Helpers\Helpers::set_session( 'admin', true );
 global $db;
 
 $_SESSION['rfm_akey'] = bin2hex(random_bytes(16));
@@ -19,7 +19,7 @@ ob_start();
   </ul>
   <div class="resp-tabs-container settings-tabs">
     <div>
-      <?= \Html::input(
+      <?= \Shared\Html\Html::input(
               array(
                       'label' => 'Nazwa',
                       'name'  => 'name',
@@ -28,7 +28,7 @@ ob_start();
                       'class' => 'require'
       ) );
       ?>
-      <?= \Html::input_switch(
+      <?= \Shared\Html\Html::input_switch(
               array(
                       'label'   => 'Aktywny',
                       'name'    => 'status',
@@ -46,7 +46,7 @@ ob_start();
               )
       );
       ?>
-      <?= \Html::input(
+      <?= \Shared\Html\Html::input(
               array(
                       'label' => 'Data zakończenia',
                       'name'  => 'date_end',
@@ -55,7 +55,7 @@ ob_start();
                       'class' => 'date'
       ) );
       ?>
-      <?= \Html::input_switch(
+      <?= \Shared\Html\Html::input_switch(
                   array(
                           'label'   => 'Slajder / Strona główna',
                           'name'    => 'home_page',
@@ -78,7 +78,7 @@ ob_start();
           <? if ( is_array( $this -> languages ) ): foreach ( $this -> languages as $lg ):?>
             <? if ( $lg['status'] ):?>
               <div>
-                <?= \Html::input_icon(
+                <?= \Shared\Html\Html::input_icon(
                               array(
                                       'label'        => 'Obraz',
                                       'name'         => 'src[' . $lg['id'] . ']',
@@ -89,7 +89,7 @@ ob_start();
                               )
                 );
                 ?>
-                <?= \Html::input(
+                <?= \Shared\Html\Html::input(
                             array(
                                     'label' => 'Url',
                                     'name'  => 'url[' . $lg['id'] . ']',
@@ -98,7 +98,7 @@ ob_start();
                             )
                     );
                 ?>
-                <?= \Html::textarea(
+                <?= \Shared\Html\Html::textarea(
                             array(
                                     'label'  => 'Kod html',
                                     'name'   => 'html[' . $lg['id'] . ']',
@@ -107,7 +107,7 @@ ob_start();
                             )
                     );
                 ?>
-                <?= \Html::textarea(
+                <?= \Shared\Html\Html::textarea(
                             array(
                                     'label'  => 'Treść',
                                     'name'   => 'text[' . $lg['id'] . ']',
@@ -136,26 +136,14 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid                  = new \gridEdit;
+$gridId = 'banner-edit';
-$grid -> id              = 'banner-edit';
+$gridTitle = 'Edycja baneru';
-$grid -> gdb_opt         = $gdb;
+$gridSaveUrl = '/admin/banners/save/';
-$grid -> include_plugins = true;
+$gridBackUrl = '/admin/banners/list/';
-$grid -> title           = 'Edycja baneru';
+$gridHidden = [['name' => 'id', 'value' => $this -> banner['id']]];
-$grid -> fields          = [
+$gridContent = $out;
-        [
+$gridPersist = true;
-                'db'    => 'id',
+include __DIR__ . '/../components/grid-edit-replacement.php';
-                'type'  => 'hidden',
-                'value' => $this -> banner['id']
-        ]
-];
-$grid -> external_code   = $out;
-$grid -> actions         = [
-        'save'   => [ 'url' => '/admin/banners/save/', 'back_url' => '/admin/banners/list/' ],
-        'cancel' => [ 'url' => '/admin/banners/list/' ]
-];
-$grid -> persist_edit    = true;
-$grid -> id_param        = 'id';
-echo $grid -> draw();
 ?>
 <script type="text/javascript">
   $(function ()

admin/templates/components/form-edit.php

@@ -11,7 +11,7 @@ $form = $this->form;
 $renderer = new FormFieldRenderer($form);
 
 // Przygotuj filemanager key
-\S::set_session('admin', true);
+\Shared\Helpers\Helpers::set_session('admin', true);
 if (
   empty($_SESSION['rfm_akey']) ||
   (($_SESSION['rfm_akey_expires'] ?? 0) < time())

admin/templates/components/grid-edit-replacement.php

@@ -0,0 +1,171 @@
+<?php
+/**
+ * Zastepnik gridEdit — generuje panel z przyciskami zapisu/anulowania i formularzem.
+ *
+ * Wymagane zmienne:
+ *   $gridId        — identyfikator formularza (np. 'layout-edit')
+ *   $gridTitle     — tytuł panelu
+ *   $gridSaveUrl   — URL zapisu (AJAX POST)
+ *   $gridBackUrl   — URL powrotu po zapisie / anulowaniu
+ *   $gridHidden    — tablica ukrytych pól [['name' => ..., 'value' => ...], ...]
+ *   $gridContent   — HTML zawartość formularza (z ob_get_clean())
+ *   $gridPersist   — (bool) czy zostać na stronie po zapisie
+ */
+$gridPersist = !empty($gridPersist);
+?>
+<!-- iCheck -->
+<link rel="stylesheet" type="text/css" href="/libraries/grid/plugins/icheck/skins/minimal/minimal.css" />
+<link rel="stylesheet" type="text/css" href="/libraries/grid/plugins/icheck/skins/minimal/blue.css" />
+<script type="text/javascript" src="/libraries/grid/plugins/icheck/icheck.min.js"></script>
+<!-- impromptu -->
+<link rel="stylesheet" type="text/css" href="/libraries/grid/plugins/impromptu/jquery-impromptu.css" />
+<script type="text/javascript" src="/libraries/grid/plugins/impromptu/jquery-impromptu.js"></script>
+
+<div class="row">
+  <div class="col col-xs-12">
+    <div class="g-container" data="table:<?= htmlspecialchars($gridId) ?>">
+      <div class="panel panel-info panel-border top">
+        <div class="panel-heading">
+          <span class="panel-title"><?= htmlspecialchars($gridTitle) ?></span>
+        </div>
+        <?php if (!empty($gridSaveUrl)): ?>
+        <div class="panel-heading p10 pl15" id="g-menu" style="height: auto;">
+          <?php if ($gridPersist): ?>
+          <a href="#" id="g-edit-save-close" class="btn btn-system btn-sm"
+             persist_edit="0"
+             back_url="<?= htmlspecialchars($gridBackUrl) ?>"
+             url="<?= htmlspecialchars($gridSaveUrl) ?>">
+            <i class="fa fa-check-circle mr5"></i>Zatwierdź i zamknij
+          </a>
+          <?php endif; ?>
+          <a href="#" id="g-edit-save" class="btn btn-success btn-sm"
+             persist_edit="<?= $gridPersist ? '1' : '0' ?>"
+             id_param="id"
+             back_url="<?= htmlspecialchars($gridBackUrl) ?>"
+             url="<?= htmlspecialchars($gridSaveUrl) ?>">
+            <i class="fa fa-check-circle mr5"></i>Zatwierdź
+          </a>
+          <a href="<?= htmlspecialchars($gridBackUrl) ?>" class="btn btn-dark btn-sm" id="g-edit-cancel">
+            <i class="fa fa-reply mr5"></i>Wstecz
+          </a>
+        </div>
+        <?php endif; ?>
+        <div class="panel-body">
+          <form method="POST" id="fg-<?= htmlspecialchars($gridId) ?>" class="g-form form-horizontal" enctype="multipart/form-data">
+            <?php if (!empty($gridHidden) && is_array($gridHidden)): ?>
+              <?php foreach ($gridHidden as $h): ?>
+                <input type="hidden" name="<?= htmlspecialchars($h['name']) ?>" id="<?= htmlspecialchars($h['name']) ?>" value="<?= htmlspecialchars($h['value'] ?? '') ?>" />
+              <?php endforeach; ?>
+            <?php endif; ?>
+            <?= $gridContent ?>
+          </form>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+jQuery(function() {
+  jQuery('.g-checkbox, .g-radio, .icheck').iCheck({
+    checkboxClass: 'icheckbox_minimal-blue',
+    radioClass: 'iradio_minimal-blue'
+  });
+
+  function showGridMessage(type, text) {
+    var safeText = $('<div/>').text(text || '').html();
+    var alertClass = type === 'error' ? 'alert-danger' : 'alert-primary';
+    var html = '<div class="row js-form-message"><div class="col col-xs-12"><div class="alert ' + alertClass + ' alert-dismissable"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button><i class="fa fa-info pr10"></i>' + safeText + '</div></div></div>';
+    $('#content .js-form-message').remove();
+    $('#content').prepend(html);
+  }
+
+  $('#g-edit-save, #g-edit-save-close').on('click', function(e) {
+    e.preventDefault();
+    var $btn = $(this);
+    var url = $btn.attr('url');
+    var backUrl = $btn.attr('back_url');
+    var persist = $btn.attr('persist_edit');
+    var formId = 'fg-<?= $gridId ?>';
+
+    if (typeof CKEDITOR !== 'undefined' && CKEDITOR.instances) {
+      for (var i in CKEDITOR.instances) {
+        if (CKEDITOR.instances.hasOwnProperty(i)) CKEDITOR.instances[i].updateElement();
+      }
+    }
+
+    // Serializacja kompatybilna z grid.js — JSON w parametrze 'values'
+    var values = $('#' + formId).serializeArray();
+    var formattedValues = {};
+
+    $.each(values, function(i, field) {
+      var fieldName = field.name.replace(/\[\]$/, '');
+      var nestedMatch = fieldName.match(/^(.+?)\[(.+?)\]$/);
+
+      if (nestedMatch) {
+        var mainField = nestedMatch[1];
+        var subField = nestedMatch[2];
+        if (!formattedValues[mainField]) {
+          formattedValues[mainField] = {};
+        }
+        formattedValues[mainField][subField] = field.value;
+      } else if (field.name.indexOf('[]', field.name.length - 2) !== -1) {
+        if (!formattedValues[fieldName]) {
+          formattedValues[fieldName] = [];
+        }
+        formattedValues[fieldName].push(field.value);
+      } else {
+        formattedValues[fieldName] = field.value;
+      }
+    });
+
+    // Normalizacja checkboxów tablicowych (boolean-like)
+    (function() {
+      var $form = $('#' + formId);
+      var groups = {};
+      $form.find('input[type="checkbox"][name$="[]"]').each(function() {
+        var n = this.name;
+        (groups[n] = groups[n] || []).push(this);
+      });
+      $.each(groups, function(nameWithBrackets, inputs) {
+        var vals = {};
+        $.each(inputs, function(_, el) { vals[(el.getAttribute('value') || '').toLowerCase()] = true; });
+        var boolSet = {'': true, '1': true, 'on': true, 'true': true, 'yes': true};
+        var isBool = true;
+        $.each(vals, function(v) { if (!boolSet[v]) isBool = false; });
+        if (isBool) {
+          var baseKey = nameWithBrackets.replace(/\[\]$/, '');
+          formattedValues[baseKey] = $.map(inputs, function(el) { return el.checked ? '1' : '0'; });
+        }
+      });
+    })();
+
+    $.ajax({
+      url: url,
+      type: 'POST',
+      data: {
+        gtable: formId.replace('fg-', ''),
+        values: JSON.stringify(formattedValues),
+        a: 'gsave'
+      },
+      dataType: 'json',
+      success: function(r) {
+        if (r.status === 'ok' || r.success) {
+          if (backUrl && persist === '0') {
+            window.location.href = backUrl;
+          } else {
+            showGridMessage('success', r.msg || r.message || 'Zmiany zostały zapisane.');
+            if (r.id) {
+              $('#fg-' + formId.replace('fg-','') + ' input[name="id"]').val(r.id);
+            }
+          }
+        } else {
+          showGridMessage('error', r.msg || r.message || 'Wystąpił błąd.');
+        }
+      },
+      error: function() {
+        showGridMessage('error', 'Wystąpił błąd połączenia.');
+      }
+    });
+  });
+});
+</script>

admin/templates/dashboard/main-view.php

@@ -32,7 +32,7 @@
             </tr>
           </thead>
           <tbody>
-            <? if ( \S::is_array_fix( $this -> last_orders ) ): foreach ( $this -> last_orders as $order ):?>
+            <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> last_orders ) ): foreach ( $this -> last_orders as $order ):?>
               <tr class="status-<?= $order['status'];?>">
                 <td><?= date( "Y-m-d H:i", strtotime( $order['date_order'] ) );?></td>
                 <td>
@@ -122,7 +122,7 @@
             </tr>
           </thead>
           <tbody>
-            <? if ( \S::is_array_fix( $this -> best_sales_products ) ): foreach ( $this -> best_sales_products as $row ):?>
+            <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> best_sales_products ) ): foreach ( $this -> best_sales_products as $row ):?>
               <? $product = \shop\Product::getFromCache( (int)$row['parent_product_id'], ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() );?>
               <tr>
                 <td>
@@ -157,7 +157,7 @@
             </tr>
           </thead>
           <tbody>
-            <? if ( \S::is_array_fix( $this -> most_view_products ) ): foreach ( $this -> most_view_products as $row ):?>
+            <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> most_view_products ) ): foreach ( $this -> most_view_products as $row ):?>
               <? $product = new \shop\Product( $row['id'] );?>
               <tr>
                 <td>

admin/templates/layouts/layout-edit.php

@@ -241,7 +241,7 @@ ob_start();
     </ul>
     <div class="resp-tabs-container layout-tabs">
       <div>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Nazwa',
                       'name'    => 'name',
@@ -249,14 +249,14 @@ ob_start();
                       'value'   => $this -> layout['name']
                     )
                 );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Szablon domy&#347;lny',
                       'name'    => 'status',
                       'checked' => $this -> layout['status'] == 1 ? true : false
                     )
                 );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Szablon domy&#347;lny (kategorie)',
                       'name'    => 'categories_default',
@@ -329,26 +329,13 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'layout-edit';
-$grid -> id               = 'layout-edit';
+$gridTitle = 'Edycja szablonu';
-$grid -> gdb_opt          = $gdb;
+$gridSaveUrl = '/admin/layouts/save/';
-$grid -> include_plugins  = true;
+$gridBackUrl = '/admin/layouts/list/';
-$grid -> title            = 'Edycja szablonu';
+$gridHidden = [['name' => 'id', 'value' => $this->layout['id']]];
-$grid -> fields           = [
+$gridContent = $out;
-                              [
+$gridPersist = true;
-                                'db' => 'id',
+include __DIR__ . '/../components/grid-edit-replacement.php';
-                                'type' => 'hidden',
-                                'value' => $this -> layout['id']
-                              ]
-                            ];
-$grid -> actions          = [
-                              'save' => [ 'url' => '/admin/layouts/save/', 'back_url' => '/admin/layouts/list/' ],
-                              'cancel' => [ 'url' => '/admin/layouts/list/' ]
-                            ];
-$grid -> external_code    = $out;
-$grid -> persist_edit     = true;
-$grid -> id_param         = 'id';
-
-echo $grid -> draw();
 ?>
 

admin/templates/pages/page-articles.php

@@ -21,21 +21,14 @@ ob_start();
 <?php
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'page-articles';
-$grid->gdb_opt = $gdb;
+$gridTitle = 'Lista artyku&#322;&#243;w';
-$grid->include_plugins = true;
+$gridSaveUrl = '';
-$grid->default_buttons = false;
+$gridBackUrl = '';
-$grid->external_code = $out;
+$gridHidden = [];
-$grid->title = 'Lista artyku&#322;&#243;w';
+$gridContent = $out;
-$grid->buttons = [
+$gridPersist = false;
-    [
+include __DIR__ . '/../components/grid-edit-replacement.php';
-        'label' => 'Wstecz',
-        'url' => '/admin/pages/list/',
-        'icon' => 'fa-reply',
-        'class' => 'btn-dark',
-    ],
-];
-echo $grid->draw();
 ?>
 <script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
 <script type="text/javascript">

admin/templates/pages/pages-browse-list.php

@@ -31,15 +31,14 @@ foreach ($menus as $menu):
 endforeach;
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'pages-list';
-$grid->id = 'pages-list';
+$gridTitle = 'Lista stron';
-$grid->gdb_opt = $gdb;
+$gridSaveUrl = '';
-$grid->include_plugins = true;
+$gridBackUrl = '';
-$grid->title = 'Lista stron';
+$gridHidden = [];
-$grid->default_buttons = false;
+$gridContent = $out;
-$grid->external_code = $out;
+$gridPersist = false;
-
+include __DIR__ . '/../components/grid-edit-replacement.php';
-echo $grid->draw();
 ?>
 <style type="text/css">
   <?php if ($modal): ?>.mfp-container<?php endif; ?> body.sb-top.sb-top-sm .navbar.navbar-fixed-top + #sidebar_left + #content_wrapper {

admin/templates/pages/pages-list.php

@@ -43,23 +43,14 @@ foreach ($menus as $menu):
 endforeach;
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'pages-list';
-$grid->id = 'pages-list';
+$gridTitle = 'Lista stron';
-$grid->gdb_opt = $gdb;
+$gridSaveUrl = '';
-$grid->include_plugins = true;
+$gridBackUrl = '';
-$grid->title = 'Lista stron';
+$gridHidden = [];
-$grid->default_buttons = false;
+$gridContent = $out;
-$grid->buttons = [
+$gridPersist = false;
-    [
+include __DIR__ . '/../components/grid-edit-replacement.php';
-        'label' => 'Dodaj menu',
-        'url' => '/admin/pages/menuEdit/',
-        'icon' => 'fa-plus-circle',
-        'class' => 'btn-success',
-    ],
-];
-$grid->external_code = $out;
-
-echo $grid->draw();
 ?>
 <script type="text/javascript" src="/libraries/jquery-nested-sortable/jquery.mjs.nestedSortable.js"></script>
 <style type="text/css">

admin/templates/settings/settings.php

@@ -41,7 +41,7 @@ ob_start();
     </ul>
     <div class="resp-tabs-container settings-tabs">
       <div>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Nazwa firmy',
                       'name'    => 'firm_name',
@@ -49,7 +49,7 @@ ob_start();
                       'value'   => $this -> settings['firm_name']
                     )
                 );?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Dodatkowe informacje',
                       'name'    => 'additional_info',
@@ -57,14 +57,14 @@ ob_start();
                       'value'   => $this -> settings['additional_info']
                     )
                 );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Mapa',
                       'name'    => 'google_maps',
                       'checked' => $this -> settings['google_maps'] == 1 ? true : false
                     )
                 );?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Mapa - adres',
                       'name'    => 'firm_adress',
@@ -74,7 +74,7 @@ ob_start();
                 );?>
       </div>
       <div>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'     => 'Dane do przelewu',
                       'name'      => 'shop_bank_account_info',
@@ -84,54 +84,54 @@ ob_start();
                       'ckeditor'  => true
                     )
                 );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Klucz API HotPay',
                       'name'    => 'hotpay_api',
                       'id'      => 'hotpay_api',
                       'value'   => $this -> settings['hotpay_api']
                     ] );?>
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
                       'label'   => 'Tpay.com - tryb sandbox',
                       'name'    => 'tpay_sandbox',
                       'checked' => $this -> settings['tpay_sandbox'] == 1 ? true : false
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Tpay.com ID',
                       'name'    => 'tpay_id',
                       'id'      => 'tpay_id',
                       'value'   => $this -> settings['tpay_id']
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Tpay.com - kod bezpieczeństwa',
                       'name'    => 'tpay_security_code',
                       'id'      => 'tpay_security_code',
                       'value'   => $this -> settings['tpay_security_code']
                     ] );?>
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
                       'label'   => 'Przelewy24.pl - tryb sandbox',
                       'name'    => 'przelewy24_sandbox',
                       'checked' => $this -> settings['przelewy24_sandbox'] == 1 ? true : false
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Przelewy24.pl - merchant ID',
                       'name'    => 'przelewy24_merchant_id',
                       'id'      => 'przelewy24_merchant_id',
                       'value'   => $this -> settings['przelewy24_merchant_id']
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
                       'label'   => 'Przelewy24.pl - klucz CRC',
                       'name'    => 'przelewy24_crc_key',
                       'id'      => 'przelewy24_crc_key',
                       'value'   => $this -> settings['przelewy24_crc_key']
                     ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
               'label'   => 'Darmowa dostawa od',
               'class' => 'number-format',
               'name'    => 'free_delivery',
               'id'      => 'free_delivery',
               'value'   => $this -> settings['free_delivery']
             ] );?>
-        <?= \Html::input( [
+        <?= \Shared\Html\Html::input( [
               'label' => 'Orlen Paczka map token',
               'name' => 'orlen_paczka_map_token',
               'id' => 'orlen_paczka_map_token',
@@ -161,7 +161,7 @@ ob_start();
               ?>
               <? if ( $lg['status'] ):?>
                 <div>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label'   => 'Komunikat gdy stan magazynowy równy 0',
                                 'name'    => 'warehouse_message_zero[' . $lg['id'] . ']',
@@ -170,7 +170,7 @@ ob_start();
                                 'inline'  => true
                               )
                           );?>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label'   => 'Komunikat gdy stan magazynowy większy niż 0',
                                 'name'    => 'warehouse_message_nonzero[' . $lg['id'] . ']',
@@ -187,14 +187,14 @@ ob_start();
         </div>
       </div>
       <div>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Formularz kontaktowy',
                       'name'    => 'contact_form',
                       'checked' => $this -> settings['contact_form'] == 1 ? true : false
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email kontaktowy',
                       'name'    => 'contact_email',
@@ -202,7 +202,7 @@ ob_start();
                       'value'   => $this -> settings['contact_email']
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email - host',
                       'name'    => 'email_host',
@@ -210,7 +210,7 @@ ob_start();
                       'value'   => $this -> settings['email_host']
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email - port',
                       'name'    => 'email_port',
@@ -218,7 +218,7 @@ ob_start();
                       'value'   => $this -> settings['email_port']
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email - login',
                       'name'    => 'email_login',
@@ -226,7 +226,7 @@ ob_start();
                       'value'   => $this -> settings['email_login']
                     )
                 );?>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Email - hasło',
                       'name'    => 'email_password',
@@ -236,7 +236,7 @@ ob_start();
                 );?>
       </div>
       <div>
-        <?= \Html::input(
+        <?= \Shared\Html\Html::input(
                     array(
                       'label'   => 'Facebook link',
                       'name'    => 'facebook_link',
@@ -252,7 +252,7 @@ ob_start();
                         ]
           );
         ?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Kod statystyk',
                       'name'    => 'statistic_code',
@@ -261,7 +261,7 @@ ob_start();
                       'rows'    => 10
                     )
                 );?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Własne reguły htacess',
                       'name'    => 'htaccess',
@@ -270,7 +270,7 @@ ob_start();
                       'rows'    => 10
                     )
                 );?>
-        <?= \Html::textarea(
+        <?= \Shared\Html\Html::textarea(
                     array(
                       'label'   => 'Własne reguły robots.txt',
                       'name'    => 'robots',
@@ -281,7 +281,7 @@ ob_start();
                 );?>
       </div>
       <div>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Aktualizacja',
                       'name'    => 'update',
@@ -296,31 +296,31 @@ ob_start();
                         ]
           );
         ?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Strona konstrukcyjna',
                       'name'    => 'devel',
                       'checked' => $this -> settings['devel'] == 1 ? true : false
                     )
                 );?>
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
           'label' => 'Lazy loading obrazów',
           'name' => 'lazy_loading',
           'checked' => $this -> settings['lazy_loading'] == 1 ? true : false
         ] );?>
 
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
           'label' => 'Generowanie obrazków WEBP',
           'name' => 'generate_webp',
           'checked' => $this -> settings['generate_webp'] == 1 ? true : false
         ] );?>
 
-        <?= \Html::input_switch( [
+        <?= \Shared\Html\Html::input_switch( [
           'label' => 'Infinitescroll',
           'name' => 'infinitescroll',
           'checked' => $this -> settings['infinitescroll'] == 1 ? true : false
         ] );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
                     array(
                       'label'   => 'Htaccess cache',
                       'name'    => 'htaccess_cache',
@@ -335,14 +335,14 @@ ob_start();
           'id' => 'google_tag_manager_id',
           'value' => $this -> settings['google_tag_manager_id']
         ] ); ?>
-      <?= \Html::textarea( [
+      <?= \Shared\Html\Html::textarea( [
         'label' => 'Własny kod GTM JS (bez tagu script)',
         'name' => 'own_gtm_js',
         'id' => 'own_gtm_js',
         'value' => $this -> settings['own_gtm_js'],
         'rows' => 10
       ] );?>
-      <?= \Html::textarea( [
+      <?= \Shared\Html\Html::textarea( [
         'label' => 'Własny kod GTM HTML',
         'name' => 'own_gtm_html',
         'id' => 'own_gtm_html',
@@ -355,17 +355,14 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'settings-edit';
-$grid -> id               = 'settings-edit';
+$gridTitle = 'Edycja ustawień';
-$grid -> gdb_opt          = $gdb;
+$gridSaveUrl = '/admin/settings/save/';
-$grid -> include_plugins  = true;
+$gridBackUrl = '';
-$grid -> title            = 'Edycja ustawień';
+$gridHidden = [];
-$grid -> actions          = [
+$gridContent = $out;
-                              'save' => [ 'url' => '/admin/settings/save/', 'back_url' => '' ],
+$gridPersist = true;
-                            ];
+include __DIR__ . '/../components/grid-edit-replacement.php';
-$grid -> persist_edit     = true;
-$grid -> external_code    = $out;
-echo $grid -> draw();
 ?>
 <script>CKEDITOR.dtd.$removeEmpty['span'] = false;</script>
 <style type="text/css">#g-edit-cancel, #g-edit-save.btn-system { display: none; }</style>

admin/templates/shop-category/categories-list.php

@@ -40,22 +40,13 @@ ob_start();
   <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'pages-list';
-$grid -> id               = 'pages-list';
+$gridTitle = 'Lista kategorii';
-$grid -> gdb_opt          = $gdb;
+$gridSaveUrl = '';
-$grid -> include_plugins  = true;
+$gridBackUrl = '';
-$grid -> title            = 'Lista kategorii';
+$gridHidden = [];
-$grid -> default_buttons  = false;
+$gridContent = $out;
-$grid -> buttons          = [
+$gridPersist = false;
-                              [ 
+include __DIR__ . '/../components/grid-edit-replacement.php';
-                                'label' => 'Dodaj kategorię', 
-                                'url'   => '/admin/shop_category/category_edit/',
-                                'icon'  => 'fa-plus-circle',
-                                'class' => 'btn-success'
-                              ]
-                            ];
-$grid -> external_code    = $out;
-
-echo $grid -> draw();
 ?>
 <?= \Tpl::view( 'shop-category/categories-list-custom-script' ); ?>

admin/templates/shop-category/category-browse-list.php

@@ -30,15 +30,14 @@ ob_start();
   <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'pages-list';
-$grid -> id               = 'pages-list';
+$gridTitle = 'Lista kategorii';
-$grid -> gdb_opt          = $gdb;
+$gridSaveUrl = '';
-$grid -> include_plugins  = false;
+$gridBackUrl = '';
-$grid -> title            = 'Lista kategorii';
+$gridHidden = [];
-$grid -> default_buttons  = false;
+$gridContent = $out;
-$grid -> external_code    = $out;
+$gridPersist = false;
-
+include __DIR__ . '/../components/grid-edit-replacement.php';
-echo $grid -> draw();
 ?>
 <style type="text/css">
   .mfp-container body.sb-top.sb-top-sm .navbar.navbar-fixed-top + #sidebar_left + #content_wrapper {

admin/templates/shop-category/category-edit.php

@@ -25,7 +25,7 @@ ob_start();
             <? if ( is_array( $this -> languages ) ): foreach ( $this -> languages as $lg ):?>
               <? if ( $lg['status'] ):?>
                 <div>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label'   => 'Nazwa kategorii',
                                 'name'    => 'title[' . $lg['id'] . ']',
@@ -34,7 +34,7 @@ ob_start();
                                 'inline'  => true
                               )
                           );?>
-                  <?= \Html::textarea(
+                  <?= \Shared\Html\Html::textarea(
                               array(
                                 'label'   => 'Opis kategorii',
                                 'name'    => 'text[' . $lg['id'] . ']',
@@ -43,7 +43,7 @@ ob_start();
                                 'inline'  => true
                               )
                           );?>
-                  <?= \Html::textarea(
+                  <?= \Shared\Html\Html::textarea(
                               array(
                                 'label'   => 'Opis kategorii (rozwinięcie)',
                                 'name'    => 'text_hidden[' . $lg['id'] . ']',
@@ -52,7 +52,7 @@ ob_start();
                                 'inline'  => true
                               )
                           );?>
-                  <?= \Html::textarea( [
+                  <?= \Shared\Html\Html::textarea( [
                                 'label' => 'Dodatkowy tekst (nad produktami)',
                                 'name' => 'additional_text[' . $lg['id'] . ']',
                                 'id' => 'additional_text_' . $lg['id'],
@@ -75,14 +75,14 @@ ob_start();
         </div>
       </div>
       <div style="padding: 15px;">
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
             array(
               'label'   => 'Aktywna',
               'name'    => 'status',
               'checked' => $this -> category['status'] == 1 or !$this -> category['id'] ? true : false
             )
         );?>
-        <?= \Html::select(
+        <?= \Shared\Html\Html::select(
           [
             'label'   => 'Sortowanie produktĂłw',
             'name'    => 'sort_type',
@@ -91,7 +91,7 @@ ob_start();
             'value'   => $this -> category['sort_type']
           ]
         );?>
-        <?= \Html::input_switch(
+        <?= \Shared\Html\Html::input_switch(
             array(
               'label'   => 'Wyświetlić podkategorie',
               'name'    => 'view_subcategories',
@@ -112,7 +112,7 @@ ob_start();
             <? if ( is_array( $this -> languages ) ): foreach ( $this -> languages as $lg ):?>
               <? if ( $lg['status'] ):?>
                 <div>
-                  <?= \Html::input_icon(
+                  <?= \Shared\Html\Html::input_icon(
                               array(
                                 'label'         => 'Link SEO',
                                 'name'          => 'seo_link[' . $lg['id'] . ']',
@@ -122,7 +122,7 @@ ob_start();
                                 'icon_js'       => 'generate_seo_links( "' . $lg['id'] . '", $( "#title_' . $lg['id'] . '" ).val(), ' . (int)$this -> category['id'] . ' );'
                               )
                           );?>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label' => 'Tytuł kategorii (h1)',
                                 'name'  => 'category_title[' . $lg['id'] . ']',
@@ -130,7 +130,7 @@ ob_start();
                                 'value' => $this -> category['languages' ][ $lg['id'] ]['category_title']
                               )
                           );?>
-                  <?= \Html::input(
+                  <?= \Shared\Html\Html::input(
                               array(
                                 'label'   => 'Meta title',
                                 'name'    => 'meta_title[' . $lg['id'] . ']',
@@ -138,7 +138,7 @@ ob_start();
                                 'value'   => $this -> category['languages'][ $lg['id'] ]['meta_title']
                               )
                           );?>
-                  <?= \Html::textarea(
+                  <?= \Shared\Html\Html::textarea(
                               array(
                                 'label'   => 'Meta description',
                                 'name'    => 'meta_description[' . $lg['id'] . ']',
@@ -146,7 +146,7 @@ ob_start();
                                 'value'   => $this -> category['languages'][ $lg['id'] ]['meta_description']
                               )
                           );?>
-                  <?= \Html::textarea(
+                  <?= \Shared\Html\Html::textarea(
                               array(
                                 'label'   => 'Meta keywords',
                                 'name'    => 'meta_keywords[' . $lg['id'] . ']',
@@ -154,7 +154,7 @@ ob_start();
                                 'value'   => $this -> category['languages'][ $lg['id'] ]['meta_keywords']
                               )
                           );?>
-                  <?= \Html::select(
+                  <?= \Shared\Html\Html::select(
                               array(
                                 'label'   => 'Blokuj indeksacjÄ™',
                                 'name'    => 'noindex[' . $lg['id'] . ']',
@@ -177,32 +177,17 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'category-edit';
-$grid -> id               = 'category-edit';
+$gridTitle = 'Edycja kategorii';
-$grid -> gdb_opt          = $gdb;
+$gridSaveUrl = '/admin/shop_category/save/';
-$grid -> include_plugins  = true;
+$gridBackUrl = '/admin/shop_category/view_list/';
-$grid -> title            = 'Edycja kategorii';
+$gridHidden = [
-$grid -> fields           = [
+  ['name' => 'id', 'value' => $this -> category['id']],
-                              [
+  ['name' => 'parent_id', 'value' => $this -> category['id'] ? $this -> category['parent_id'] : $this -> pid]
-                                'db' => 'id',
+];
-                                'type' => 'hidden',
+$gridContent = $out;
-                                'value' => $this -> category['id']
+$gridPersist = true;
-                              ],
+include __DIR__ . '/../components/grid-edit-replacement.php';
-                              [
-                                'db' => 'parent_id',
-                                'type' => 'hidden',
-                                'value' => $this -> category['id'] ? $this -> category['parent_id'] : $this -> pid
-                              ]
-                            ];
-$grid -> actions          = [
-                              'save' => [ 'url' => '/admin/shop_category/save/', 'back_url' => '/admin/shop_category/view_list/' ],
-                              'cancel' => [ 'url' => '/admin/shop_category/view_list/' ]
-                            ];
-$grid -> external_code    = $out;
-$grid -> persist_edit     = true;
-$grid -> id_param         = 'id';
-
-echo $grid -> draw();
 ?>
 
 <?= \Tpl::view( 'shop-category/category-edit-custom-script' ); ?>

admin/templates/shop-category/category-products.php

@@ -18,20 +18,13 @@ ob_start();
 <?
 $out = ob_get_clean();
 
-$grid = new \gridEdit;
+$gridId = 'category-products';
-$grid -> gdb_opt          = $gdb;
+$gridTitle = 'Lista produktów';
-$grid -> include_plugins  = true;
+$gridSaveUrl = '';
-$grid -> default_buttons  = false;
+$gridBackUrl = '';
-$grid -> external_code    = $out;
+$gridHidden = [];
-$grid -> title            = 'Lista produktów';
+$gridContent = $out;
-$grid -> buttons          = [ 
+$gridPersist = false;
-                              [ 
+include __DIR__ . '/../components/grid-edit-replacement.php';
-                                'label' => 'Wstecz', 
-                                'url'   => '/admin/shop_category/view_list/', 
-                                'icon'  => 'fa-reply',
-                                'class' => 'btn-dark'
-                              ]
-                            ];
-echo $grid -> draw();
 ?>
 <?= \Tpl::view( 'shop-category/category-products-custom-script', [ 'category_id' => $this -> category_id ] ); ?>

admin/templates/shop-order/order-details.php

@@ -128,7 +128,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
         <button class="btn btn-success order_status_change">zmień status</button>
       </div>
       <div class="col-12 order-history">
-        <? if ( \S::is_array_fix( $this -> order['statuses'] ) ): foreach ( $this -> order['statuses'] as $status ):?>
+        <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> order['statuses'] ) ): foreach ( $this -> order['statuses'] as $status ):?>
           <div><b><?= date( 'Y-m-d H:i', strtotime( $status['date'] ) );?></b>: <?= $this -> order_statuses[$status['status_id']];?> <? if ( $status['mail'] ):?><i class="fa fa-envelope-o"></i><? endif;?></div>
         <? endforeach; endif;?>
       </div>
@@ -185,9 +185,9 @@ $orderId = (int)($this -> order['id'] ?? 0);
               </div>
             </td>
             <td class="tab-center"><?= $product[ 'quantity' ];?></td>
-            <td class="tab-right"><?= \S::decimal( $product[ 'price_brutto' ] );?> zł</td>
+            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto' ] );?> zł</td>
-            <td class="tab-right"><?= \S::decimal( $product[ 'price_brutto_promo' ] );?> zł</td>
+            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto_promo' ] );?> zł</td>
-            <td class="tab-right"><?= \S::decimal( $product[ 'price_brutto_promo' ] * $product[ 'quantity' ] );?> zł</td>
+            <td class="tab-right"><?= \Shared\Helpers\Helpers::decimal( $product[ 'price_brutto_promo' ] * $product[ 'quantity' ] );?> zł</td>
           </tr>
           <? endforeach; endif;?>
         </tbody>

admin/templates/shop-order/order-edit.php

@@ -90,7 +90,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
           <div class="col-12">
             <select name="transport_id" class="form-control" id="transport_id">
               <option value="0">--- wybierz formę transportu ---</option>
-              <? if ( \S::is_array_fix( $this -> transport ) ): foreach ( $this -> transport as $transport_tmp ):?>
+              <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> transport ) ): foreach ( $this -> transport as $transport_tmp ):?>
                 <option value="<?= $transport_tmp['id'];?>" <? if ( $this -> order['transport_id'] == $transport_tmp['id'] ):?>selected="selected"<? endif;?>>
                   <?= $transport_tmp['name'];?> - <?= $transport_tmp['cost'];?> zł
                 </option>
@@ -113,7 +113,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
           <div class="col-12">
             <select name="payment_method_id" class="form-control" id="payment_method_id">
               <option value="0">--- wybierz formę płatności ---</option>
-              <? if ( \S::is_array_fix( $this -> payment_methods ) ): foreach ( $this -> payment_methods as $payment_method ):?>
+              <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> payment_methods ) ): foreach ( $this -> payment_methods as $payment_method ):?>
                 <option value="<?= $payment_method['id'];?>" <? if ( $this -> order['payment_method_id'] == $payment_method['id'] ):?>selected="selected"<? endif;?>>
                   <?= $payment_method['name'];?>
                 </option>
@@ -143,7 +143,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
         <button class="btn btn-success order_status_change">zmień status</button>
       </div>
       <div class="col-12 order-history">
-        <? if ( \S::is_array_fix( $this -> order['statuses'] ) ): foreach ( $this -> order['statuses'] as $status ):?>
+        <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> order['statuses'] ) ): foreach ( $this -> order['statuses'] as $status ):?>
           <div><b><?= date( 'Y-m-d H:i', strtotime( $status['date'] ) );?></b>: <?= $this -> order_statuses[$status['status_id']];?></div>
         <? endforeach; endif;?>
       </div>
@@ -217,7 +217,7 @@ $orderId = (int)($this -> order['id'] ?? 0);
 </form>
 
 <div class="inpost-map-container">
-  <a href="#" onclick="$( '.inpost-map-container' ).hide(); return false;" class="inpost-hide"><?= \S::lang( 'zamknij' );?></a>
+  <a href="#" onclick="$( '.inpost-map-container' ).hide(); return false;" class="inpost-hide"><?= \Shared\Helpers\Helpers::lang( 'zamknij' );?></a>
   <div id="inpost-map"></div>
 </div>
 <link class="footer" rel="stylesheet" type="text/css" href="https://geowidget.easypack24.net/css/easypack.css">

admin/templates/shop-product/product-combination.php

@@ -22,7 +22,7 @@
                 </tr>
               </thead>
               <tbody>
-                <? if ( \S::is_array_fix( $this -> product_permutations ) ): foreach ( $this -> product_permutations as $product ):?>
+                <? if ( \Shared\Helpers\Helpers::is_array_fix( $this -> product_permutations ) ): foreach ( $this -> product_permutations as $product ):?>
                   <tr data-combination-id="<?= $product['id'];?>">
                     <td>
                       <?

admin/templates/site/main-layout.php

@@ -41,8 +41,8 @@
       <div class="menu">
         <div class="logo sticky-top">
           shop<b>Pro</b>
-          <span>ver. <?= \S::get_version();?></span><br>
+          <span>ver. <?= \Shared\Helpers\Helpers::get_version();?></span><br>
-          <? if ( $settings[ 'update' ] and \S::get_new_version() > \S::get_version() ):?>
+          <? if ( $settings[ 'update' ] and \Shared\Helpers\Helpers::get_new_version() > \Shared\Helpers\Helpers::get_version() ):?>
             <a href="/admin/update/main_view/" class="label label-danger">aktualizacja</a>
           <? endif;?>
         </div>
@@ -187,8 +187,8 @@
             </div>
           </div>
           <?
-          if ( $alert = \S::get_session( 'alert' ) ):
+          if ( $alert = \Shared\Helpers\Helpers::get_session( 'alert' ) ):
-            \S::alert( false );
+            \Shared\Helpers\Helpers::alert( false );
             ?>
             <div class="row">
               <div class=" col-12">

admin/templates/site/unlogged-layout.php

@@ -32,8 +32,8 @@
                   Zaloguj się do panelu administratora <b>shopPro</b>.
                 </div>
                 <?
-                if ( $alert = \S::get_session( 'alert' ) ):
+                if ( $alert = \Shared\Helpers\Helpers::get_session( 'alert' ) ):
-                  \S::alert( false );
+                  \Shared\Helpers\Helpers::alert( false );
                   ?>
                   <div class="alert alert-danger alert-dismissable">
                     <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>

admin/templates/site/unlogged.php

@@ -32,8 +32,8 @@
                   Zaloguj się do panelu administratora <b>shopPro</b>.
                 </div>
                 <?
-                if ( $alert = \S::get_session( 'alert' ) ):
+                if ( $alert = \Shared\Helpers\Helpers::get_session( 'alert' ) ):
-                  \S::alert( false );
+                  \Shared\Helpers\Helpers::alert( false );
                   ?>
                   <div class="alert alert-danger alert-dismissable">
                     <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>

ajax.php

@@ -36,55 +36,55 @@ $mdb = new medoo( [
 
 $langRepo = new \Domain\Languages\LanguagesRepository( $mdb );
 
-if ( !$lang_id = \S::get_session( 'current-lang' ) )
+if ( !$lang_id = \Shared\Helpers\Helpers::get_session( 'current-lang' ) )
 {
   $lang_id = $langRepo->defaultLanguage();
-  \S::set_session( 'current-lang', $lang_id );
+  \Shared\Helpers\Helpers::set_session( 'current-lang', $lang_id );
 }
 
-if ( !$lang = \S::get_session( 'lang' ) )
+if ( !$lang = \Shared\Helpers\Helpers::get_session( 'lang' ) )
 {
   $lang = $langRepo->translations();
-  \S::set_session( 'lang', $lang );
+  \Shared\Helpers\Helpers::set_session( 'lang', $lang );
 }
 
 \front\controls\Site::check_url_params();
 
-if ( !$settings = \S::get_session( 'settings' ) )
+if ( !$settings = \Shared\Helpers\Helpers::get_session( 'settings' ) )
 {
   $settings = ( new \Domain\Settings\SettingsRepository( $mdb ) )->allSettings();
-  \S::set_session( 'settings', $settings );
+  \Shared\Helpers\Helpers::set_session( 'settings', $settings );
 }
 
-$a = \S::get( 'a' );
+$a = \Shared\Helpers\Helpers::get( 'a' );
 
 if ( $a == 'basket_change_transport' )
 {
-    \S::set_session( 'transport_id', \S::get( 'transport_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'transport_id', \Shared\Helpers\Helpers::get( 'transport_id' ) );
 
-    $basket         = \S::get_session( 'basket' );
+    $basket         = \Shared\Helpers\Helpers::get_session( 'basket' );
     $basket_summary = \front\factory\ShopBasket::summary_price( $basket, null );
-    $transport_cost = \front\factory\ShopTransport::transport_cost( \S::get( 'transport_id' ) );
+    $transport_cost = \front\factory\ShopTransport::transport_cost( \Shared\Helpers\Helpers::get( 'transport_id' ) );
 
-    echo json_encode( [ 'summary' => \S::decimal( $basket_summary + $transport_cost ) . ' zł' ] );
+    echo json_encode( [ 'summary' => \Shared\Helpers\Helpers::decimal( $basket_summary + $transport_cost ) . ' zł' ] );
     exit;
 }
 
 if ( $a == 'change_payment' )
 {
-    \S::set_session( 'payment_method_id', \S::get( 'payment_method_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'payment_method_id', \Shared\Helpers\Helpers::get( 'payment_method_id' ) );
-    $transports = \front\factory\ShopTransport::transports_list( \S::get( 'payment_method_id' ) );
+    $transports = \front\factory\ShopTransport::transports_list( \Shared\Helpers\Helpers::get( 'payment_method_id' ) );
     echo json_encode( [ 'transports' => $transports ] );
     exit;
 }
 
 if ( $a == 'contact_form' )
 {
-  if ( ( !\S::get( 'email' ) and \S::get( 'phone' ) ) )
+  if ( ( !\Shared\Helpers\Helpers::get( 'email' ) and \Shared\Helpers\Helpers::get( 'phone' ) ) )
     $response = [ 'status' => 'error' ];
   else
   {
-    if ( \S::send_email( $settings['contact_email'],  \S::get( 'subject' ), \S::get( 'text' ) . '<p>Nr telefonu: ' . \S::get( 'phone' ) . '</p><p>Email: ' . \S::get( 'email' ) . '</p>', \S::get( 'email' ) ) )
+    if ( \Shared\Helpers\Helpers::send_email( $settings['contact_email'],  \Shared\Helpers\Helpers::get( 'subject' ), \Shared\Helpers\Helpers::get( 'text' ) . '<p>Nr telefonu: ' . \Shared\Helpers\Helpers::get( 'phone' ) . '</p><p>Email: ' . \Shared\Helpers\Helpers::get( 'email' ) . '</p>', \Shared\Helpers\Helpers::get( 'email' ) ) )
       $response = [ 'status' => 'ok' ];
   }
 
@@ -100,6 +100,6 @@ if ( $a == 'cookie_close' )
 
 if ( $a == 'banner_close' )
 {
-  \S::set_session( 'banner_close', true );
+  \Shared\Helpers\Helpers::set_session( 'banner_close', true );
 }
 ?>

api.php

@@ -52,14 +52,14 @@ $mdb = new medoo( [
 
 $settings = ( new \Domain\Settings\SettingsRepository( $mdb ) )->allSettings();
 
-if ( \S::get( 'ekomi_csv' ) )
+if ( \Shared\Helpers\Helpers::get( 'ekomi_csv' ) )
 {
   $csv_array = [ [ 'ORDER_ID', 'MAIL', 'FIRST_NAME', 'LAST_NAME', 'PRODUCT_ID', 'PRODUCT_NAME' ] ];
 
   $orders_id = $mdb -> select( 'pp_shop_order_statuses', 'order_id', [ 'AND' => [ 'status_id' => 6, 'date[~]' => date( 'Y-m-d', strtotime( '-1 day', time() ) ) ] ] );
   $orders_id = array_unique( $orders_id );
 
-  if ( \S::is_array_fix( $orders_id ) )
+  if ( \Shared\Helpers\Helpers::is_array_fix( $orders_id ) )
   {
     foreach ( $orders_id as $order_id )
     {
@@ -67,7 +67,7 @@ if ( \S::get( 'ekomi_csv' ) )
       if ( $order )
       {
         $products = $mdb -> select( 'pp_shop_order_products', '*', [ 'order_id' => $order['id'] ] );
-        if ( \S::is_array_fix( $products ) ) foreach ( $products as $product )
+        if ( \Shared\Helpers\Helpers::is_array_fix( $products ) ) foreach ( $products as $product )
         {
           $csv_array[] = [ $order['id'], $order['client_email'], $order['client_name'], $order['client_surname'], $product['product_id'], $product['name'] ];
         }

autoload/Domain/Article/ArticleRepository.php

@@ -81,8 +81,8 @@ class ArticleRepository
         $this->applyGalleryOrderIfProvided($id, $data);
         $this->applyFilesOrderIfProvided($id, $data);
 
-        \S::htacces();
+        \Shared\Helpers\Helpers::htacces();
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
 
         return (int)$id;
     }
@@ -102,8 +102,8 @@ class ArticleRepository
         $this->deleteMarkedImages($articleId);
         $this->deleteMarkedFiles($articleId);
 
-        \S::htacces();
+        \Shared\Helpers\Helpers::htacces();
-        \S::delete_dir('../temp/');
+        \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 . '/');
+        \Shared\Helpers\Helpers::delete_dir('../upload/article_images/article_' . $articleId . '/');
-        \S::delete_dir('../upload/article_files/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);
             }

autoload/Domain/Attribute/AttributeRepository.php

@@ -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();
             }
         }
     }

autoload/Domain/Banner/BannerRepository.php

@@ -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;
     }

autoload/Domain/Cache/CacheRepository.php

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

autoload/Domain/Category/CategoryRepository.php

@@ -325,8 +325,8 @@ class CategoryRepository
     private function refreshCategoryArtifacts(): void
     {
         if (class_exists('\\S')) {
-            \S::htacces();
+            \Shared\Helpers\Helpers::htacces();
-            \S::delete_dir('../temp/');
+            \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;

autoload/Domain/Dictionaries/DictionariesRepository.php

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

autoload/Domain/Integrations/IntegrationsRepository.php

@@ -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 ] );
     }
 

autoload/Domain/Languages/LanguagesRepository.php

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

autoload/Domain/Layouts/LayoutsRepository.php

@@ -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' => [],
         ];

autoload/Domain/Newsletter/NewsletterPreviewRenderer.php

@@ -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'] ?? '');

autoload/Domain/Newsletter/NewsletterRepository.php

@@ -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']]);
         }

autoload/Domain/Order/OrderAdminService.php

@@ -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);
+        return $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;
     }
 }

autoload/Domain/Pages/PagesRepository.php

@@ -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();
+        \Shared\Helpers\Helpers::htacces();
-        \S::delete_dir('../temp/');
+        \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,

autoload/Domain/Product/ProductRepository.php

@@ -634,9 +634,9 @@ class ProductRepository
             $this->cleanupDeletedImages( $productId );
         }
 
-        \S::htacces();
+        \Shared\Helpers\Helpers::htacces();
-        \S::delete_dir( '../temp/' );
+        \Shared\Helpers\Helpers::delete_dir( '../temp/' );
-        \S::delete_dir( '../thumbs/' );
+        \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 . '/' );
+        \Shared\Helpers\Helpers::delete_dir( '../upload/product_images/product_' . $productId . '/' );
-        \S::delete_dir( '../upload/product_files/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', [

autoload/Domain/ProductSet/ProductSetRepository.php

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

autoload/Domain/Promotion/PromotionRepository.php

@@ -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;
     }

autoload/Domain/Scontainers/ScontainersRepository.php

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

autoload/Domain/Settings/SettingsRepository.php

@@ -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.'];
     }

autoload/Domain/Update/UpdateRepository.php

@@ -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++;
                 }
             }

autoload/Domain/User/UserRepository.php

@@ -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.'];
     }
 

autoload/Shared/Email/Email.php

@@ -1,5 +1,7 @@
 <?php
-class Email extends DbModel
+namespace Shared\Email;
+
+class Email
 {
   public $table = 'pp_newsletter_templates';
 

autoload/Shared/Helpers/Helpers.php

@@ -1,54 +1,7 @@
 <?php
-class S
+namespace Shared\Helpers;
+class Helpers
 {
-  public static function set_array_value(&$array, $keys, $value)
-  {
-    $key = array_shift($keys);
-    if (count($keys) == 0)
-    {
-      if ($key === '')
-      {
-        $array[] = $value;
-      }
-      else
-      {
-        // Jeśli klucz już istnieje i jest tablicą, zamieniamy go na tablicę wartości
-        if (isset($array[$key]) && !is_array($array[$key]))
-        {
-          $array[$key] = [$array[$key]];
-        }
-        if (isset($array[$key]) && is_array($array[$key]))
-        {
-          $array[$key][] = $value;
-        }
-        else
-        {
-          $array[$key] = $value;
-        }
-      }
-    }
-    else
-    {
-      if ($key === '')
-      {
-        $array[] = [];
-        $key = count($array) - 1;
-      }
-      if (!isset($array[$key]) || !is_array($array[$key]))
-      {
-        $array[$key] = [];
-      }
-      self::set_array_value($array[$key], $keys, $value);
-    }
-  }
-
-  static public function parse_name($name)
-  {
-    $name = rtrim($name, ']');
-    $parts = explode('[', $name);
-    return $parts;
-  }
-
   static function canAddRedirect( $from, $to, $lang_id = null )
   {
     global $mdb;
@@ -103,12 +56,6 @@ class S
     return true;
   }
 
-  static public function clear_redis_cache()
-  {
-    $redis = \Shared\Cache\RedisConnection::getInstance() -> getConnection();
-    $redis -> flushAll();
-  }
-
   static public function clear_product_cache( int $product_id )
   {
     if ( class_exists('Redis') )
@@ -248,40 +195,12 @@ class S
     return false;
   }
 
-  public static function get_domain( $url )
-  {
-    $parseUrl = parse_url( trim( $url ) );
-    return trim( $parseUrl['host'] ? str_replace( 'www.', '', $parseUrl['host'] ) : str_replace( 'www.', '', array_shift( explode( '/', $parseUrl['path'], 2 ) ) ) );
-  }
-
-  static public function pre_dump( $value )
-  {
-    echo '<pre>';
-      var_dump( $value );
-    echo '</pre>';
-  }
-
-  public static function escape( $value )
-  {
-    $return = '';
-    for ( $i = 0; $i < strlen( $value ); ++$i )
-    {
-      $char   = $value[$i];
-      $ord    = ord( $char );
-      if ( $char !== "'" && $char !== "\"" && $char !== '\\' && $ord >= 32 && $ord <= 126 )
-        $return .= $char;
-      else
-        $return .= '\\x' . dechex( $ord );
-    }
-    return $return;
-  }
-
   public static function delete_cache()
   {
-    \S::delete_dir( '../cache/' );
+    self::delete_dir( '../cache/' );
-    \S::delete_dir( '../temp/' );
+    self::delete_dir( '../temp/' );
-    \S::delete_dir( '../cron/temp/' );
+    self::delete_dir( '../cron/temp/' );
-    \S::delete_dir( 'temp/' );
+    self::delete_dir( 'temp/' );
   }
 
   public static function pretty_date( $format, $timestamp = null )
@@ -318,7 +237,7 @@ class S
   {
     $result = array();
 
-    foreach ($array as $key => $value)
+    foreach ($input as $key => $values)
     {
       if ( empty( $values ) )
         continue;
@@ -398,58 +317,11 @@ class S
     return number_format( $val, $precision, $dec_point, $thousands_sep );
   }
 
-  public static function chmod_r( $path, $chmod = 0755 )
-  {
-    $dir = new DirectoryIterator( $path );
-    foreach ( $dir as $item )
-    {
-      chmod( $item -> getPathname(), $chmod );
-      if ( $item -> isDir() && !$item -> isDot() )
-        self::chmod_r( $item -> getPathname() );
-    }
-  }
-
-  public static function rrmdir( $dir )
-  {
-    if ( is_dir( $dir ) )
-    {
-      $files = scandir( $dir );
-      foreach ( $files as $file )
-        if ( $file != "." && $file != ".." )
-          \S::rrmdir( "$dir/$file" );
-      rmdir( $dir );
-    }
-    else if ( file_exists( $dir ) )
-      unlink( $dir );
-  }
-
-  public static function rcopy( $src, $dst )
-  {
-    if ( is_dir( $src ) )
-    {
-      mkdir( $dst, 0755 );
-      $files = scandir( $src );
-      foreach ( $files as $file )
-        if ( $file != "." && $file != ".." )
-          \S::rcopy( "$src/$file", "$dst/$file" );
-    }
-    else if ( file_exists( $src ) )
-      copy( $src, $dst );
-
-    \S::rrmdir( $src );
-  }
-
-  public static function is_mobile()
-  {
-    $detect = new \Mobile_Detect;
-    return $detect -> isMobile();
-  }
-
   public static function get_new_version()
   {
     global $settings;
 
-    if ( $version = \S::get_session( 'new-version' ) )
+    if ( $version = self::get_session( 'new-version' ) )
       return $version;
 
     $version = 0;
@@ -462,7 +334,7 @@ class S
         $version = $version_tmp;
     }
 
-    \S::set_session( 'new-version', $version );
+    self::set_session( 'new-version', $version );
 
     return $version;
   }
@@ -472,42 +344,6 @@ class S
     return (float) @file_get_contents( '../libraries/version.ini' );
   }
 
-  public static function pre( $data, $type = '' )
-  {
-    $data = str_replace( 'Array
-      (', '', $data );
-    $data = str_replace( ')', '', $data );
-
-    echo '<pre';
-    if ( $type == 'error' )
-      echo ' style="color: #cc0000;" ';
-    else if ( $type == 'info' )
-      echo ' style="color: #2c539e;" ';
-    else
-      echo ' style="color: #8fc400;" ';
-    echo '>' . print_r( $data, true ) . '</pre>';
-  }
-
-  public static function json_to_array( $json )
-  {
-    $values_tmp = json_decode( $json, true );
-
-    if ( is_array( $values_tmp ) )
-      foreach ( $values_tmp as $val )
-      {
-        if ( isset( $values[$val['name']] ) )
-        {
-          if ( is_array( $values[$val['name']] ) )
-            $values[$val['name']][] = $val['value'];
-          else
-            $values[$val['name']]   = array( $values[$val['name']], $val['value'] );
-        }
-        else
-          $values[$val['name']] = $val['value'];
-      }
-    return $values;
-  }
-
   public static function set_session( $var, $val )
   {
     $_SESSION[$var] = $val;
@@ -612,10 +448,10 @@ class S
     $htaccess_data .= 'RewriteRule ^producenci$ index.php?module=shop_producer&action=list&layout_id=' . \front\factory\Layouts::category_default_layout() . '&%{QUERY_STRING}  [L]' . PHP_EOL;
 
     $rows = $mdb -> select( 'pp_shop_producer', '*', [ 'status' => 1 ] );
-    if ( \S::is_array_fix( $rows ) ) foreach ( $rows as $row )
+    if ( self::is_array_fix( $rows ) ) foreach ( $rows as $row )
     {
-      $htaccess_data .= 'RewriteRule ^producent/' . \S::seo( $row['name'] ) . '$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . \front\factory\Layouts::category_default_layout() . '&%{QUERY_STRING} [L]' . PHP_EOL;
+      $htaccess_data .= 'RewriteRule ^producent/' . self::seo( $row['name'] ) . '$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . \front\factory\Layouts::category_default_layout() . '&%{QUERY_STRING} [L]' . PHP_EOL;
-      $htaccess_data .= 'RewriteRule ^producent/' . \S::seo( $row['name'] ) . '/([0-9]+)$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . \front\factory\Layouts::category_default_layout() . '&bs=$1&%{QUERY_STRING} [L]' . PHP_EOL;
+      $htaccess_data .= 'RewriteRule ^producent/' . self::seo( $row['name'] ) . '/([0-9]+)$ index.php?module=shop_producer&action=products&producer_id=' . $row['id'] . '&layout_id=' . \front\factory\Layouts::category_default_layout() . '&bs=$1&%{QUERY_STRING} [L]' . PHP_EOL;
     }
 
     $results = $mdb -> select( 'pp_langs', [ 'id', 'start' ], [ 'status' => 1, 'ORDER' => [ 'o' => 'ASC' ] ] );
@@ -630,9 +466,9 @@ class S
         {
           $site_map .= '<url>' . PHP_EOL;
           if ( $row2['seo_link'] )
-            $site_map .= '<loc>https://' . $url . '/' . $language_link . \S::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
+            $site_map .= '<loc>https://' . $url . '/' . $language_link . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
           else
-            $site_map .= '<loc>https://' . $url . '/' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
+            $site_map .= '<loc>https://' . $url . '/' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
           $site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
           $site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
           $site_map .= '<priority>1</priority>' . PHP_EOL;
@@ -640,15 +476,15 @@ class S
 
           if ( $row2['seo_link'] )
           {
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . \S::seo( $row2['seo_link'] ) . ' [R=301,L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . self::seo( $row2['seo_link'] ) . ' [R=301,L]';
           }
           else
           {
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '/([0-9]+)$ index.php?category=' . $row2['category_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
-            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . '/1$ ' . $language_link . 'k-' . $row2['category_id'] . '-' . \S::seo( $row2['title'] ) . ' [R=301,L]';
+            $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . '/1$ ' . $language_link . 'k-' . $row2['category_id'] . '-' . self::seo( $row2['title'] ) . ' [R=301,L]';
           }
         }
       }
@@ -672,9 +508,9 @@ class S
             {
               $site_map .= '<url>' . PHP_EOL;
               if ( $row2['seo_link'] )
-                $site_map .= '<loc>https://' . $url . '/' . $language_link . \S::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
+                $site_map .= '<loc>https://' . $url . '/' . $language_link . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
               else
-                $site_map .= '<loc>https://' . $url . '/' . $language_link . 'p-' . $row2['product_id'] . '-' . \S::seo( $row2['name'] ) . '</loc>' . PHP_EOL;
+                $site_map .= '<loc>https://' . $url . '/' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '</loc>' . PHP_EOL;
               $site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
               $site_map .= '<changefreq>daily</changefreq>' . PHP_EOL;
               $site_map .= '<priority>1</priority>' . PHP_EOL;
@@ -682,24 +518,24 @@ class S
 
               if ( $row2['seo_link'] )
               {
-                $pattern = '^' . $language_link . \S::seo( $row2['seo_link'] ) . '$';
+                $pattern = '^' . $language_link . self::seo( $row2['seo_link'] ) . '$';
                 $destination = 'index.php?product=' . $row2['product_id'];
 
                 $mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
 
-                $pattern = '^' . $language_link . \S::seo( $row2['seo_link'] ) . '/([0-9-]+)$';
+                $pattern = '^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9-]+)$';
                 $destination = 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1';
 
                 $mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
               }
               else
               {
-                $pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . \S::seo( $row2['name'] ) . '$';
+                $pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '$';
                 $destination = 'index.php?product=' . $row2['product_id'];
 
                 $mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
 
-                $pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . \S::seo( $row2['name'] ) . '/([0-9-]+)$';
+                $pattern = '^' . $language_link . 'p-' . $row2['product_id'] . '-' . self::seo( $row2['name'] ) . '/([0-9-]+)$';
                 $destination = 'index.php?product=' . $row2['product_id'] . '&permutation_hash=$1';
 
                 $mdb -> insert( 'pp_routes', [ 'product_id' => $row2['product_id'], 'lang_id' => $row['id'], 'pattern' => $pattern, 'destination' => $destination ] );
@@ -726,7 +562,7 @@ class S
               {
                 $site_map .= '<url>' . PHP_EOL;
                 if ( $row2['seo_link'] )
-                  $site_map .= '<loc>https://' . $url . '/' . \S::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
+                  $site_map .= '<loc>https://' . $url . '/' . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
                 else
                   $site_map .= '<loc>https://' . $url . '/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
                 $site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
@@ -744,17 +580,17 @@ class S
               {
                 if ( $row2['seo_link'] )
                 {
-                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . \S::seo( $row2['seo_link'] ) . '$';
+                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . self::seo( $row2['seo_link'] ) . '$';
                   $htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
-                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . \S::seo( $row2['seo_link'] ) . '-1$';
+                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/' . self::seo( $row2['seo_link'] ) . '-1$';
                   $htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
                 }
                 else
                 {
-                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '$';
+                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '$';
                   $htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
 
-                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '-1$';
+                  $htaccess_data .= PHP_EOL . 'RewriteCond %{REQUEST_URI} ^/s-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '-1$';
                   $htaccess_data .= PHP_EOL . 'RewriteRule ^(.*)$ http://www.' . $url . '/' . $language_link . ' [R=permanent,L]';
                 }
 
@@ -763,15 +599,15 @@ class S
 
               if ( $row2['seo_link'] )
               {
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . \S::seo( $row2['seo_link'] ) . ' [R=301,L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '/1$ ' . $language_link . self::seo( $row2['seo_link'] ) . ' [R=301,L]';
               }
               else
               {
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '/([0-9]+)$ index.php?a=page&id=' . $row2['page_id'] . '&lang=' . $row['id'] . '&bs=$1&%{QUERY_STRING} [L]';
-                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . '/1$ ' . $language_link . 's-' . $row2['page_id'] . '-' . \S::seo( $row2['title'] ) . ' [R=301,L]';
+                $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . '/1$ ' . $language_link . 's-' . $row2['page_id'] . '-' . self::seo( $row2['title'] ) . ' [R=301,L]';
               }
             }
           }
@@ -799,7 +635,7 @@ class S
             {
               $site_map .= '<url>' . PHP_EOL;
               if ( $row2['seo_link'] )
-                $site_map .= '<loc>https://' . $url . '/' . \S::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
+                $site_map .= '<loc>https://' . $url . '/' . self::seo( $row2['seo_link'] ) . '</loc>' . PHP_EOL;
               else
                 $site_map .= '<loc>https://' . $url . '/a-' . $row2['article_id'] . '-' . self::seo( $row2['title'] ) . '</loc>' . PHP_EOL;
               $site_map .= '<lastmod>' . date( 'Y-m-d' ) . '</lastmod>' . PHP_EOL;
@@ -814,9 +650,9 @@ class S
             }
 
             if ( $row2['seo_link'] )
-              $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . \S::seo( $row2['seo_link'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+              $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . self::seo( $row2['seo_link'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
             else if ( $row2['title'] != null )
-              $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'a-' . $row2['article_id'] . '-' . \S::seo( $row2['title'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
+              $htaccess_data .= PHP_EOL . 'RewriteRule ^' . $language_link . 'a-' . $row2['article_id'] . '-' . self::seo( $row2['title'] ) . '$ index.php?article=' . $row2['article_id'] . '&lang=' . $row['id'] . '&%{QUERY_STRING} [L]';
           }
       }
 
@@ -1056,16 +892,11 @@ class S
         foreach ( $scan as $index => $path )
           self::delete_dir( $path );
 
-      if ( is_dir( $dir ) && self::is_empty_dir( $dir ) )
+      if ( is_dir( $dir ) && ( ( $files = @scandir( $dir ) ) && count( $files ) <= 2 ) )
         return @rmdir( $dir );
     }
   }
 
-  public static function is_empty_dir( $dir )
-  {
-    return ( ( $files = @scandir( $dir ) ) && count( $files ) <= 2 );
-  }
-
   public static function email_check( $email )
   {
     return filter_var( $email, FILTER_VALIDATE_EMAIL );
@@ -1077,7 +908,7 @@ class S
 
     if ( self::email_check( $email ) and $subject )
     {
-      $mail              = new PHPMailer();
+      $mail              = new \PHPMailer();
       $mail -> IsSMTP();
       $mail -> SMTPAuth    = true;
       $mail -> Host        = $settings['email_host'];

autoload/Shared/Html/Html.php

@@ -1,4 +1,6 @@
 <?php
+namespace Shared\Html;
+
 class Html
 {
   public static function form_text( array $params = array() )

autoload/Shared/Image/ImageManipulator.php

@@ -1,4 +1,6 @@
 <?php
+namespace Shared\Image;
+
 class ImageManipulator
 {
     protected int $width;
@@ -30,12 +32,12 @@ class ImageManipulator
      *
      * @param string $file Path to image file
      * @return self
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     public function setImageFile(string $file): self
     {
         if (!(is_readable($file) && is_file($file))) {
-            throw new InvalidArgumentException("Image file $file is not readable");
+            throw new \InvalidArgumentException("Image file $file is not readable");
         }
 
         if (isset($this->image) && $this->isValidImageResource($this->image)) {
@@ -45,7 +47,7 @@ class ImageManipulator
         [$width, $height, $type] = getimagesize($file);
 
         if ($width === false || $height === false) {
-            throw new InvalidArgumentException("Unable to get image size for $file");
+            throw new \InvalidArgumentException("Unable to get image size for $file");
         }
 
         error_log("Loaded image size from file: width: $width, height: $height, type: $type");
@@ -64,11 +66,11 @@ class ImageManipulator
                 $this->image = imagecreatefromwebp($file);
                 break;
             default:
-                throw new InvalidArgumentException("Image type $type not supported");
+                throw new \InvalidArgumentException("Image type $type not supported");
         }
 
         if (!$this->isValidImageResource($this->image)) {
-            throw new InvalidArgumentException("Failed to create image from $file");
+            throw new \InvalidArgumentException("Failed to create image from $file");
         }
 
         $this->width = imagesx($this->image);
@@ -77,7 +79,7 @@ class ImageManipulator
         error_log("Set image dimensions: width: {$this->width}, height: {$this->height}");
 
         if ($this->width === 0 || $this->height === 0) {
-            throw new InvalidArgumentException("Image dimensions are invalid (width: $this->width, height: $this->height)");
+            throw new \InvalidArgumentException("Image dimensions are invalid (width: $this->width, height: $this->height)");
         }
 
         return $this;
@@ -88,7 +90,7 @@ class ImageManipulator
      *
      * @param string $data Image data as string
      * @return self
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function setImageString(string $data): self
     {
@@ -98,7 +100,7 @@ class ImageManipulator
 
         $image = imagecreatefromstring($data);
         if (!$this->isValidImageResource($image)) {
-            throw new RuntimeException('Cannot create image from data string');
+            throw new \RuntimeException('Cannot create image from data string');
         }
 
         $this->image = $image;
@@ -108,7 +110,7 @@ class ImageManipulator
         error_log("Set image dimensions from string: width: {$this->width}, height: {$this->height}");
 
         if ($this->width === 0 || $this->height === 0) {
-            throw new RuntimeException("Image dimensions are invalid (width: $this->width, height: $this->height)");
+            throw new \RuntimeException("Image dimensions are invalid (width: $this->width, height: $this->height)");
         }
 
         return $this;
@@ -121,17 +123,17 @@ class ImageManipulator
      * @param int  $height               New height
      * @param bool $constrainProportions Constrain current image proportions when resizing
      * @return self
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function resample(int $width, int $height, bool $constrainProportions = true): self
     {
         if (!isset($this->image) || !$this->isValidImageResource($this->image)) {
-            throw new RuntimeException('No image set');
+            throw new \RuntimeException('No image set');
         }
 
         if ($constrainProportions) {
             if ($this->height === 0) {
-                throw new RuntimeException('Image height is zero, cannot calculate aspect ratio');
+                throw new \RuntimeException('Image height is zero, cannot calculate aspect ratio');
             }
 
             $aspectRatio = $this->width / $this->height;
@@ -148,7 +150,7 @@ class ImageManipulator
             }
 
             if ($width <= 0 || $height <= 0) {
-                throw new RuntimeException('Calculated dimensions are invalid (width: ' . $width . ', height: ' . $height . ')');
+                throw new \RuntimeException('Calculated dimensions are invalid (width: ' . $width . ', height: ' . $height . ')');
             }
         }
 
@@ -166,12 +168,12 @@ class ImageManipulator
      * @param int|null   $xpos   X-Position of image in new canvas, null for centre
      * @param int|null   $ypos   Y-Position of image in new canvas, null for centre
      * @return self
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function enlargeCanvas(int $width, int $height, array $rgb = [], ?int $xpos = null, ?int $ypos = null): self
     {
         if (!isset($this->image) || !$this->isValidImageResource($this->image)) {
-            throw new RuntimeException('No image set');
+            throw new \RuntimeException('No image set');
         }
 
         $width = max($width, $this->width);
@@ -179,7 +181,7 @@ class ImageManipulator
 
         $temp = imagecreatetruecolor($width, $height);
         if (!$this->isValidImageResource($temp)) {
-            throw new RuntimeException('Failed to create a new image for enlarging canvas');
+            throw new \RuntimeException('Failed to create a new image for enlarging canvas');
         }
 
         // Fill background if RGB provided
@@ -216,7 +218,7 @@ class ImageManipulator
             $this->width,
             $this->height
         )) {
-            throw new RuntimeException('Failed to copy image onto enlarged canvas');
+            throw new \RuntimeException('Failed to copy image onto enlarged canvas');
         }
 
         return $this->_replace($temp);
@@ -230,12 +232,12 @@ class ImageManipulator
      * @param int       $x2 Bottom right x-coordinate of crop box
      * @param int       $y2 Bottom right y-coordinate of crop box
      * @return self
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function crop($x1, int $y1 = 0, int $x2 = 0, int $y2 = 0): self
     {
         if (!isset($this->image) || !$this->isValidImageResource($this->image)) {
-            throw new RuntimeException('No image set');
+            throw new \RuntimeException('No image set');
         }
 
         if (is_array($x1) && count($x1) === 4) {
@@ -254,12 +256,12 @@ class ImageManipulator
         error_log("Cropping image: x1: $x1, y1: $y1, x2: $x2, y2: $y2, cropWidth: $cropWidth, cropHeight: $cropHeight");
 
         if ($cropWidth <= 0 || $cropHeight <= 0) {
-            throw new RuntimeException('Invalid crop dimensions');
+            throw new \RuntimeException('Invalid crop dimensions');
         }
 
         $temp = imagecreatetruecolor($cropWidth, $cropHeight);
         if (!$this->isValidImageResource($temp)) {
-            throw new RuntimeException('Failed to create a new image for cropping');
+            throw new \RuntimeException('Failed to create a new image for cropping');
         }
 
         // Preserve transparency
@@ -278,7 +280,7 @@ class ImageManipulator
             $cropWidth,
             $cropHeight
         )) {
-            throw new RuntimeException('Failed to crop image');
+            throw new \RuntimeException('Failed to crop image');
         }
 
         return $this->_replace($temp);
@@ -289,12 +291,12 @@ class ImageManipulator
      *
      * @param resource|\GdImage $res New image resource
      * @return self
-     * @throws UnexpectedValueException
+     * @throws \UnexpectedValueException
      */
     protected function _replace($res): self
     {
         if (!$this->isValidImageResource($res)) {
-            throw new UnexpectedValueException('Invalid image resource');
+            throw new \UnexpectedValueException('Invalid image resource');
         }
 
         if (isset($this->image) && $this->isValidImageResource($this->image)) {
@@ -308,7 +310,7 @@ class ImageManipulator
         error_log("Replaced image dimensions: width: {$this->width}, height: {$this->height}");
 
         if ($this->width === 0 || $this->height === 0) {
-            throw new UnexpectedValueException("Replaced image has invalid dimensions (width: $this->width, height: $this->height)");
+            throw new \UnexpectedValueException("Replaced image has invalid dimensions (width: $this->width, height: $this->height)");
         }
 
         return $this;
@@ -320,14 +322,14 @@ class ImageManipulator
      * @param string   $fileName Path to save the image
      * @param int|null $type     Image type (IMAGETYPE_*) or null to auto-detect from file extension
      * @return void
-     * @throws RuntimeException
+     * @throws \RuntimeException
      */
     public function save(string $fileName, ?int $type = null): void
     {
         $dir = dirname($fileName);
         if (!is_dir($dir)) {
             if (!mkdir($dir, 0755, true) && !is_dir($dir)) {
-                throw new RuntimeException('Error creating directory ' . $dir);
+                throw new \RuntimeException('Error creating directory ' . $dir);
             }
         }
 
@@ -359,28 +361,28 @@ class ImageManipulator
             switch ($type) {
                 case IMAGETYPE_WEBP:
                     if (!imagewebp($this->image, $fileName)) {
-                        throw new RuntimeException('Failed to save image as WEBP');
+                        throw new \RuntimeException('Failed to save image as WEBP');
                     }
                     break;
                 case IMAGETYPE_GIF:
                     if (!imagegif($this->image, $fileName)) {
-                        throw new RuntimeException('Failed to save image as GIF');
+                        throw new \RuntimeException('Failed to save image as GIF');
                     }
                     break;
                 case IMAGETYPE_PNG:
                     if (!imagepng($this->image, $fileName)) {
-                        throw new RuntimeException('Failed to save image as PNG');
+                        throw new \RuntimeException('Failed to save image as PNG');
                     }
                     break;
                 case IMAGETYPE_JPEG:
                 default:
                     if (!imagejpeg($this->image, $fileName, 95)) {
-                        throw new RuntimeException('Failed to save image as JPEG');
+                        throw new \RuntimeException('Failed to save image as JPEG');
                     }
             }
             error_log("Image saved successfully to $fileName");
         } catch (\Exception $ex) {
-            throw new RuntimeException('Error saving image file to ' . $fileName . ': ' . $ex->getMessage());
+            throw new \RuntimeException('Error saving image file to ' . $fileName . ': ' . $ex->getMessage());
         }
     }
 

autoload/admin/App.php

@@ -12,8 +12,8 @@ class App
 
   public static function finalize_admin_login( array $user, string $domain, string $cookie_name, bool $remember = false )
   {
-    \S::set_session( 'user', $user );
+    \Shared\Helpers\Helpers::set_session( 'user', $user );
-    \S::delete_session( 'twofa_pending' );
+    \Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
 
     if ( $remember ) {
       $payloadArr = [
@@ -40,7 +40,7 @@ class App
   {
     global $mdb;
 
-    $sa = \S::get( 's-action' );
+    $sa = \Shared\Helpers\Helpers::get( 's-action' );
     if ( !$sa ) return;
 
     $domain      = preg_replace( '/^www\./', '', $_SERVER['SERVER_NAME'] );
@@ -50,8 +50,8 @@ class App
     switch ( $sa )
     {
       case 'user-logon':
-        $login = \S::get( 'login' );
+        $login = \Shared\Helpers\Helpers::get( 'login' );
-        $pass  = \S::get( 'password' );
+        $pass  = \Shared\Helpers\Helpers::get( 'password' );
         $result = $users->logon( $login, $pass );
 
         if ( $result == 1 )
@@ -60,17 +60,17 @@ class App
 
           if ( $user['twofa_enabled'] == 1 )
           {
-            \S::set_session( 'twofa_pending', [
+            \Shared\Helpers\Helpers::set_session( 'twofa_pending', [
               'uid'      => (int) $user['id'],
               'login'    => $login,
-              'remember' => (bool) \S::get( 'remember' ),
+              'remember' => (bool) \Shared\Helpers\Helpers::get( 'remember' ),
               'started'  => time(),
             ] );
 
             if ( !$users->sendTwofaCode( (int) $user['id'] ) )
             {
-              \S::alert( 'Nie udało się wysłać kodu 2FA. Spróbuj ponownie.' );
+              \Shared\Helpers\Helpers::alert( 'Nie udało się wysłać kodu 2FA. Spróbuj ponownie.' );
-              \S::delete_session( 'twofa_pending' );
+              \Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
               header( 'Location: /admin/' );
               exit;
             }
@@ -79,38 +79,38 @@ class App
             exit;
           }
 
-          self::finalize_admin_login( $user, $domain, $cookie_name, (bool) \S::get( 'remember' ) );
+          self::finalize_admin_login( $user, $domain, $cookie_name, (bool) \Shared\Helpers\Helpers::get( 'remember' ) );
           header( 'Location: /admin/articles/list/' );
           exit;
         }
 
         if ( $result == -1 )
-          \S::alert( 'Z powodu 5 nieudanych prób Twoje konto zostało zablokowane.' );
+          \Shared\Helpers\Helpers::alert( 'Z powodu 5 nieudanych prób Twoje konto zostało zablokowane.' );
         else
-          \S::alert( 'Podane hasło jest nieprawidłowe lub użytkownik nie istnieje.' );
+          \Shared\Helpers\Helpers::alert( 'Podane hasło jest nieprawidłowe lub użytkownik nie istnieje.' );
 
         header( 'Location: /admin/' );
         exit;
 
       case 'user-2fa-verify':
-        $pending = \S::get_session( 'twofa_pending' );
+        $pending = \Shared\Helpers\Helpers::get_session( 'twofa_pending' );
         if ( !$pending || empty( $pending['uid'] ) ) {
-          \S::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
+          \Shared\Helpers\Helpers::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
           header( 'Location: /admin/' );
           exit;
         }
 
-        $code = trim( (string) \S::get( 'twofa' ) );
+        $code = trim( (string) \Shared\Helpers\Helpers::get( 'twofa' ) );
         if ( !preg_match( '/^\d{6}$/', $code ) )
         {
-          \S::alert( 'Nieprawidłowy format kodu.' );
+          \Shared\Helpers\Helpers::alert( 'Nieprawidłowy format kodu.' );
           header( 'Location: /admin/user/twofa/' );
           exit;
         }
 
         if ( !$users->verifyTwofaCode( (int) $pending['uid'], $code ) )
         {
-          \S::alert( 'Błędny lub wygasły kod.' );
+          \Shared\Helpers\Helpers::alert( 'Błędny lub wygasły kod.' );
           header( 'Location: /admin/user/twofa/' );
           exit;
         }
@@ -121,18 +121,18 @@ class App
         exit;
 
       case 'user-2fa-resend':
-        $pending = \S::get_session( 'twofa_pending' );
+        $pending = \Shared\Helpers\Helpers::get_session( 'twofa_pending' );
         if ( !$pending || empty( $pending['uid'] ) )
         {
-          \S::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
+          \Shared\Helpers\Helpers::alert( 'Sesja 2FA wygasła. Zaloguj się ponownie.' );
           header( 'Location: /admin/' );
           exit;
         }
 
         if ( !$users->sendTwofaCode( (int) $pending['uid'], true ) )
-          \S::alert( 'Kod można wysłać ponownie po krótkiej przerwie.' );
+          \Shared\Helpers\Helpers::alert( 'Kod można wysłać ponownie po krótkiej przerwie.' );
         else
-          \S::alert( 'Nowy kod został wysłany.' );
+          \Shared\Helpers\Helpers::alert( 'Nowy kod został wysłany.' );
 
         header( 'Location: /admin/user/twofa/' );
         exit;
@@ -146,7 +146,7 @@ class App
           'httponly' => true,
           'samesite' => 'Lax',
         ] );
-        \S::delete_session( 'twofa_pending' );
+        \Shared\Helpers\Helpers::delete_session( 'twofa_pending' );
         session_destroy();
         header( 'Location: /admin/' );
         exit;
@@ -160,7 +160,7 @@ class App
   {
     global $user;
 
-    if ( \S::get( 'module' ) === 'user' && \S::get( 'action' ) === 'twofa' ) {
+    if ( \Shared\Helpers\Helpers::get( 'module' ) === 'user' && \Shared\Helpers\Helpers::get( 'action' ) === 'twofa' ) {
       $controller = self::createController( 'Users' );
       return $controller->twofa();
     }
@@ -183,22 +183,22 @@ class App
   {
     $_SESSION['admin'] = true;
 
-    if ( \S::get( 'p' ) )
+    if ( \Shared\Helpers\Helpers::get( 'p' ) )
-      \S::set_session( 'p', \S::get( 'p' ) );
+      \Shared\Helpers\Helpers::set_session( 'p', \Shared\Helpers\Helpers::get( 'p' ) );
 
     // Budowanie nazwy modułu: shop_product → ShopProduct
     $moduleName = '';
-    $parts = explode( '_', (string) \S::get( 'module' ) );
+    $parts = explode( '_', (string) \Shared\Helpers\Helpers::get( 'module' ) );
     foreach ( $parts as $part )
       $moduleName .= ucfirst( $part );
 
-    $action = \S::get( 'action' );
+    $action = \Shared\Helpers\Helpers::get( 'action' );
 
     $controller = self::createController( $moduleName );
     if ( $controller && method_exists( $controller, $action ) )
       return $controller->$action();
 
-    \S::alert( 'Nieprawidłowy adres url.' );
+    \Shared\Helpers\Helpers::alert( 'Nieprawidłowy adres url.' );
     return false;
   }
 

autoload/admin/Controllers/ArticlesArchiveController.php

@@ -117,8 +117,8 @@ class ArticlesArchiveController
 
     public function restore(): void
     {
-        if ($this->repository->restore((int)\S::get('id'))) {
+        if ($this->repository->restore((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Artykul zostal przywrocony.');
+            \Shared\Helpers\Helpers::alert('Artykul zostal przywrocony.');
         }
 
         header('Location: /admin/articles_archive/list/');
@@ -132,8 +132,8 @@ class ArticlesArchiveController
 
     public function delete(): void
     {
-        if ($this->repository->deletePermanently((int)\S::get('id'))) {
+        if ($this->repository->deletePermanently((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Artykul zostal trwale usuniety.');
+            \Shared\Helpers\Helpers::alert('Artykul zostal trwale usuniety.');
         }
 
         header('Location: /admin/articles_archive/list/');

autoload/admin/Controllers/ArticlesController.php

@@ -156,7 +156,7 @@ class ArticlesController
      */
     public function galleryOrderSave(): void
     {
-        if ($this->repository->saveGalleryOrder((int)\S::get('article_id'), (string)\S::get('order'))) {
+        if ($this->repository->saveGalleryOrder((int)\Shared\Helpers\Helpers::get('article_id'), (string)\Shared\Helpers\Helpers::get('order'))) {
             echo json_encode(['status' => 'ok', 'msg' => 'Artykul zostal zapisany.']);
         }
 
@@ -168,7 +168,7 @@ class ArticlesController
      */
     public function filesOrderSave(): void
     {
-        if ($this->repository->saveFilesOrder((int)\S::get('article_id'), (string)\S::get('order'))) {
+        if ($this->repository->saveFilesOrder((int)\Shared\Helpers\Helpers::get('article_id'), (string)\Shared\Helpers\Helpers::get('order'))) {
             echo json_encode(['status' => 'ok', 'msg' => 'Artykul zostal zapisany.']);
         }
 
@@ -183,7 +183,7 @@ class ArticlesController
         global $user;
 
         $values = $this->resolveSavePayload();
-        $articleId = (int)($values['id'] ?? \S::get('id') ?? 0);
+        $articleId = (int)($values['id'] ?? \Shared\Helpers\Helpers::get('id') ?? 0);
         $id = $this->repository->save($articleId, $values, (int)$user['id']);
 
         if ($id) {
@@ -210,7 +210,7 @@ class ArticlesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zmiany atrybutu alt zdjecia wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->updateImageAlt((int)\S::get('image_id'), (string)\S::get('image_alt'))) {
+        if ($this->repository->updateImageAlt((int)\Shared\Helpers\Helpers::get('image_id'), (string)\Shared\Helpers\Helpers::get('image_alt'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -222,7 +222,7 @@ class ArticlesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zmiany nazwy zalacznika wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->updateFileName((int)\S::get('file_id'), (string)\S::get('file_name'))) {
+        if ($this->repository->updateFileName((int)\Shared\Helpers\Helpers::get('file_id'), (string)\Shared\Helpers\Helpers::get('file_name'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -234,7 +234,7 @@ class ArticlesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas usuwania zdjecia wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->markImageToDelete((int)\S::get('image_id'))) {
+        if ($this->repository->markImageToDelete((int)\Shared\Helpers\Helpers::get('image_id'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -246,7 +246,7 @@ class ArticlesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas usuwania zalacznika wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->markFileToDelete((int)\S::get('file_id'))) {
+        if ($this->repository->markFileToDelete((int)\Shared\Helpers\Helpers::get('file_id'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -259,8 +259,8 @@ class ArticlesController
      */
     public function delete(): void
     {
-        if ($this->repository->archive((int)\S::get('id'))) {
+        if ($this->repository->archive((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Artykul zostal przeniesiony do archiwum.');
+            \Shared\Helpers\Helpers::alert('Artykul zostal przeniesiony do archiwum.');
         }
 
         header('Location: /admin/articles/list/');
@@ -282,7 +282,7 @@ class ArticlesController
         $this->repository->deleteNonassignedImages();
         $this->repository->deleteNonassignedFiles();
 
-        $article = $this->repository->find((int)\S::get('id')) ?: ['id' => 0, 'languages' => [], 'images' => [], 'files' => [], 'pages' => []];
+        $article = $this->repository->find((int)\Shared\Helpers\Helpers::get('id')) ?: ['id' => 0, 'languages' => [], 'images' => [], 'files' => [], 'pages' => []];
         $languages = $this->languagesRepository->languagesList();
         $menus = $this->pagesRepository->menusList();
         $layouts = $this->layoutsRepository->listAll();
@@ -298,7 +298,7 @@ class ArticlesController
 
     private function resolveSavePayload(): array
     {
-        $legacyValuesRaw = \S::get('values');
+        $legacyValuesRaw = \Shared\Helpers\Helpers::get('values');
         if ($legacyValuesRaw !== null && $legacyValuesRaw !== '') {
             $legacyValues = json_decode((string)$legacyValuesRaw, true);
             if (is_array($legacyValues)) {

autoload/admin/Controllers/BannerController.php

@@ -55,7 +55,7 @@ class BannerController
 
         // Historycznie lista banerow domyslnie byla sortowana rosnaco po nazwie.
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -164,7 +164,7 @@ class BannerController
      */
     public function edit(): string
     {
-        $bannerId = (int)\S::get('id');
+        $bannerId = (int)\Shared\Helpers\Helpers::get('id');
         $banner = $this->repository->find($bannerId);
         $languages = $this->languagesRepository->languagesList();
 
@@ -186,7 +186,7 @@ class BannerController
     {
         $response = ['success' => false, 'errors' => []];
 
-        $bannerId = (int)\S::get('id');
+        $bannerId = (int)\Shared\Helpers\Helpers::get('id');
         $banner = $this->repository->find($bannerId);
         $languages = $this->languagesRepository->languagesList();
         
@@ -228,10 +228,10 @@ class BannerController
      */
     public function delete(): void
     {
-        $bannerId = (int)\S::get('id');
+        $bannerId = (int)\Shared\Helpers\Helpers::get('id');
         if ($this->repository->delete($bannerId)) {
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
-            \S::alert('Baner zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Baner zostal usuniety.');
         }
 
         header('Location: /admin/banners/list/');

autoload/admin/Controllers/DictionariesController.php

@@ -41,7 +41,7 @@ class DictionariesController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -118,7 +118,7 @@ class DictionariesController
 
     public function edit(): string
     {
-        $unitId = (int)\S::get('id');
+        $unitId = (int)\Shared\Helpers\Helpers::get('id');
         $unit = $this->repository->find($unitId) ?? ['id' => 0, 'languages' => []];
         $languages = $this->languagesRepository->languagesList();
 
@@ -134,7 +134,7 @@ class DictionariesController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode($legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania jednostki miary wystapil blad.'];
@@ -153,7 +153,7 @@ class DictionariesController
             exit;
         }
 
-        $unitId = (int)\S::get('id');
+        $unitId = (int)\Shared\Helpers\Helpers::get('id');
         $unit = $this->repository->find($unitId) ?? ['id' => 0, 'languages' => []];
         $languages = $this->languagesRepository->languagesList();
         $viewModel = $this->buildFormViewModel($unit, $languages);
@@ -187,9 +187,9 @@ class DictionariesController
 
     public function delete(): void
     {
-        $unitId = (int)\S::get('id');
+        $unitId = (int)\Shared\Helpers\Helpers::get('id');
         if ($this->repository->delete($unitId)) {
-            \S::alert('Jednostka miary zostala usunieta.');
+            \Shared\Helpers\Helpers::alert('Jednostka miary zostala usunieta.');
         }
 
         header('Location: /admin/dictionaries/list/');

autoload/admin/Controllers/IntegrationsController.php

@@ -23,8 +23,8 @@ class IntegrationsController
     public function apilo_settings_save(): void
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawien wystapil blad. Prosze sprobowac ponownie.' ];
-        $fieldId = \S::get( 'field_id' );
+        $fieldId = \Shared\Helpers\Helpers::get( 'field_id' );
-        $value = \S::get( 'value' );
+        $value = \Shared\Helpers\Helpers::get( 'value' );
 
         if ( $this->repository->saveSetting( 'apilo', $fieldId, $value ) ) {
             $response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.', 'value' => $value ];
@@ -81,17 +81,17 @@ class IntegrationsController
 
     public function apilo_create_product(): void
     {
-        $productId = (int) \S::get( 'product_id' );
+        $productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
         $result = $this->repository->apiloCreateProduct( $productId );
 
-        \S::alert( (string)($result['message'] ?? 'Wystapil blad podczas tworzenia produktu w Apilo.') );
+        \Shared\Helpers\Helpers::alert( (string)($result['message'] ?? 'Wystapil blad podczas tworzenia produktu w Apilo.') );
         header( 'Location: /admin/shop_product/view_list/' );
         exit;
     }
 
     public function apilo_product_search(): void
     {
-        $productId = (int) \S::get( 'product_id' );
+        $productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
         $sku = $this->repository->getProductSku( $productId );
 
         if ( !$sku ) {
@@ -105,7 +105,7 @@ class IntegrationsController
 
     public function apilo_product_select_save(): void
     {
-        if ( $this->repository->linkProduct( (int) \S::get( 'product_id' ), \S::get( 'apilo_product_id' ), \S::get( 'apilo_product_name' ) ) ) {
+        if ( $this->repository->linkProduct( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'apilo_product_id' ), \Shared\Helpers\Helpers::get( 'apilo_product_name' ) ) ) {
             echo json_encode( [ 'status' => 'ok' ] );
         } else {
             echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas zapisywania produktu wystapil blad. Prosze sprobowac ponownie.' ] );
@@ -116,7 +116,7 @@ class IntegrationsController
 
     public function apilo_product_select_delete(): void
     {
-        if ( $this->repository->unlinkProduct( (int) \S::get( 'product_id' ) ) ) {
+        if ( $this->repository->unlinkProduct( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
             echo json_encode( [ 'status' => 'ok' ] );
         } else {
             echo json_encode( [ 'status' => 'error', 'msg' => 'Podczas usuwania produktu wystapil blad. Prosze sprobowac ponownie.' ] );
@@ -135,8 +135,8 @@ class IntegrationsController
     public function shoppro_settings_save(): void
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania ustawien wystapil blad. Prosze sprobowac ponownie.' ];
-        $fieldId = \S::get( 'field_id' );
+        $fieldId = \Shared\Helpers\Helpers::get( 'field_id' );
-        $value = \S::get( 'value' );
+        $value = \Shared\Helpers\Helpers::get( 'value' );
 
         if ( $this->repository->saveSetting( 'shoppro', $fieldId, $value ) ) {
             $response = [ 'status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.', 'value' => $value ];
@@ -148,10 +148,10 @@ class IntegrationsController
 
     public function shoppro_product_import(): void
     {
-        $productId = (int) \S::get( 'product_id' );
+        $productId = (int) \Shared\Helpers\Helpers::get( 'product_id' );
         $result = $this->repository->shopproImportProduct( $productId );
 
-        \S::alert( (string)($result['message'] ?? 'Wystapil blad podczas importu produktu.') );
+        \Shared\Helpers\Helpers::alert( (string)($result['message'] ?? 'Wystapil blad podczas importu produktu.') );
         header( 'Location: /admin/shop_product/view_list/' );
         exit;
     }
@@ -162,10 +162,10 @@ class IntegrationsController
 
         if ( !empty( $result['success'] ) ) {
             $count = (int)($result['count'] ?? 0);
-            \S::alert( $label . ' zostala pobrana. Liczba rekordow: ' . $count . '.' );
+            \Shared\Helpers\Helpers::alert( $label . ' zostala pobrana. Liczba rekordow: ' . $count . '.' );
         } else {
             $details = trim( (string)($result['message'] ?? 'Nieznany blad.') );
-            \S::alert(
+            \Shared\Helpers\Helpers::alert(
                 'Nie udalo sie pobrac ' . strtolower( $label ) . '. '
                 . $details
                 . ' Co zrobic: sprawdz konfiguracje Apilo, wykonaj autoryzacje i ponow pobranie listy.'

autoload/admin/Controllers/LanguagesController.php

@@ -57,7 +57,7 @@ class LanguagesController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -143,7 +143,7 @@ class LanguagesController
 
     public function language_edit(): string
     {
-        $languageId = trim((string)\S::get('id'));
+        $languageId = trim((string)\Shared\Helpers\Helpers::get('id'));
         $language = $this->repository->languageDetails($languageId) ?? [];
         $validationErrors = $_SESSION['form_errors'][$this->getLanguageFormId()] ?? null;
         if ($validationErrors) {
@@ -157,7 +157,7 @@ class LanguagesController
 
     public function language_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania jezyka wystapil blad.'];
@@ -179,7 +179,7 @@ class LanguagesController
             exit;
         }
 
-        $languageId = trim((string)\S::get('id'));
+        $languageId = trim((string)\Shared\Helpers\Helpers::get('id'));
         $language = $this->repository->languageDetails($languageId) ?? [];
         $viewModel = $this->buildLanguageFormViewModel($language, $this->repository->maxOrder());
 
@@ -191,7 +191,7 @@ class LanguagesController
         }
 
         $data = $result['data'];
-        $requestId = strtolower(trim((string)\S::get('id')));
+        $requestId = strtolower(trim((string)\Shared\Helpers\Helpers::get('id')));
         $idFromData = strtolower(trim((string)($data['id'] ?? '')));
         $id = $idFromData !== '' ? $idFromData : $requestId;
         if (!preg_match('/^[a-z]{2}$/', $id)) {
@@ -228,8 +228,8 @@ class LanguagesController
 
     public function language_delete(): void
     {
-        if ($this->repository->deleteLanguage((string)\S::get('id'))) {
+        if ($this->repository->deleteLanguage((string)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Jezyk zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Jezyk zostal usuniety.');
         }
 
         header('Location: /admin/languages/view_list/');
@@ -254,7 +254,7 @@ class LanguagesController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -331,7 +331,7 @@ class LanguagesController
 
     public function translation_edit(): string
     {
-        $translationId = (int)\S::get('id');
+        $translationId = (int)\Shared\Helpers\Helpers::get('id');
         $translation = $this->repository->translationDetails($translationId) ?? [];
         $languages = $this->repository->languagesList();
         $validationErrors = $_SESSION['form_errors'][$this->getTranslationFormId()] ?? null;
@@ -346,7 +346,7 @@ class LanguagesController
 
     public function translation_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania tlumaczenia wystapil blad.'];
@@ -368,7 +368,7 @@ class LanguagesController
             exit;
         }
 
-        $translationId = (int)\S::get('id');
+        $translationId = (int)\Shared\Helpers\Helpers::get('id');
         $translation = $this->repository->translationDetails($translationId) ?? [];
         $languages = $this->repository->languagesList();
         $viewModel = $this->buildTranslationFormViewModel($translation, $languages);
@@ -413,8 +413,8 @@ class LanguagesController
 
     public function translation_delete(): void
     {
-        if ($this->repository->deleteTranslation((int)\S::get('id'))) {
+        if ($this->repository->deleteTranslation((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Tlumaczenie zostalo usuniete.');
+            \Shared\Helpers\Helpers::alert('Tlumaczenie zostalo usuniete.');
         }
 
         header('Location: /admin/languages/translation_list/');
@@ -544,7 +544,7 @@ class LanguagesController
             if (!isset($language['id'])) {
                 continue;
             }
-            \S::delete_session('lang-' . (string)$language['id']);
+            \Shared\Helpers\Helpers::delete_session('lang-' . (string)$language['id']);
         }
     }
 

autoload/admin/Controllers/LayoutsController.php

@@ -54,7 +54,7 @@ class LayoutsController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -136,7 +136,7 @@ class LayoutsController
     public function edit(): string
     {
         return \Tpl::view('layouts/layout-edit', [
-            'layout' => $this->repository->find((int)\S::get('id')),
+            'layout' => $this->repository->find((int)\Shared\Helpers\Helpers::get('id')),
             'menus' => $this->repository->menusWithPages(),
             'categories' => $this->repository->categoriesTree(),
             'dlang' => $this->languagesRepository->defaultLanguageId(),
@@ -146,7 +146,7 @@ class LayoutsController
     public function save(): void
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zapisywania szablonu wystapil blad. Prosze sprobowac ponownie.'];
-        $values = json_decode((string)\S::get('values'), true);
+        $values = json_decode((string)\Shared\Helpers\Helpers::get('values'), true);
 
         if (is_array($values)) {
             $id = $this->repository->save($values);
@@ -161,8 +161,8 @@ class LayoutsController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Szablon zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Szablon zostal usuniety.');
         }
 
         header('Location: /admin/layouts/list/');

autoload/admin/Controllers/NewsletterController.php

@@ -60,7 +60,7 @@ class NewsletterController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -133,8 +133,8 @@ class NewsletterController
 
     public function email_delete(): void
     {
-        if ($this->repository->deleteSubscriber((int)\S::get('id'))) {
+        if ($this->repository->deleteSubscriber((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Adres email zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Adres email zostal usuniety.');
         }
 
         header('Location: /admin/newsletter/emails_list/');
@@ -148,7 +148,7 @@ class NewsletterController
 
     public function prepare(): string
     {
-        \S::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
+        \Shared\Helpers\Helpers::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
         header('Location: /admin/newsletter/emails_list/');
         exit;
     }
@@ -160,7 +160,7 @@ class NewsletterController
 
     public function send(): void
     {
-        \S::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
+        \Shared\Helpers\Helpers::alert('Funkcjonalnosc "Wysylka - przygotowanie" jest tymczasowo wylaczona.');
         header('Location: /admin/newsletter/emails_list/');
         exit;
     }
@@ -180,7 +180,7 @@ class NewsletterController
 
     public function settings_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             if (!is_array($values)) {
@@ -189,7 +189,7 @@ class NewsletterController
             }
 
             $this->repository->saveSettings($values);
-            \S::alert('Ustawienia zostaly zapisane.');
+            \Shared\Helpers\Helpers::alert('Ustawienia zostaly zapisane.');
 
             echo json_encode(['status' => 'ok', 'msg' => 'Ustawienia zostaly zapisane.']);
             exit;
@@ -204,7 +204,7 @@ class NewsletterController
         }
 
         $this->repository->saveSettings($result['data']);
-        \S::alert('Ustawienia zostaly zapisane.');
+        \Shared\Helpers\Helpers::alert('Ustawienia zostaly zapisane.');
 
         echo json_encode([
             'success' => true,
@@ -215,7 +215,7 @@ class NewsletterController
 
     public function email_templates_user(): string
     {
-        \S::alert('Funkcjonalnosc "Szablony uzytkownika" jest tymczasowo wylaczona.');
+        \Shared\Helpers\Helpers::alert('Funkcjonalnosc "Szablony uzytkownika" jest tymczasowo wylaczona.');
         header('Location: /admin/newsletter/email_templates_admin/');
         exit;
     }
@@ -230,9 +230,9 @@ class NewsletterController
 
     public function email_template_edit(): string
     {
-        $template = $this->repository->templateDetails((int)\S::get('id'));
+        $template = $this->repository->templateDetails((int)\Shared\Helpers\Helpers::get('id'));
         if (!is_array($template) || (int)($template['is_admin'] ?? 0) !== 1) {
-            \S::alert('Dostepne sa tylko szablony administracyjne.');
+            \Shared\Helpers\Helpers::alert('Dostepne sa tylko szablony administracyjne.');
             header('Location: /admin/newsletter/email_templates_admin/');
             exit;
         }
@@ -250,7 +250,7 @@ class NewsletterController
 
     public function template_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania wystapil blad.'];
@@ -275,7 +275,7 @@ class NewsletterController
             exit;
         }
 
-        $template = $this->repository->templateDetails((int)\S::get('id'));
+        $template = $this->repository->templateDetails((int)\Shared\Helpers\Helpers::get('id'));
         if (!is_array($template) || (int)($template['is_admin'] ?? 0) !== 1) {
             echo json_encode([
                 'success' => false,
@@ -317,7 +317,7 @@ class NewsletterController
 
     public function email_template_delete(): void
     {
-        \S::alert('Usuwanie szablonow uzytkownika jest tymczasowo wylaczone.');
+        \Shared\Helpers\Helpers::alert('Usuwanie szablonow uzytkownika jest tymczasowo wylaczone.');
         header('Location: /admin/newsletter/email_templates_admin/');
         exit;
     }
@@ -436,7 +436,7 @@ class NewsletterController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 

autoload/admin/Controllers/PagesController.php

@@ -45,7 +45,7 @@ class PagesController
 
         return \Tpl::view('pages/pages-browse-list', [
             'menus' => $menus,
-            'modal' => \S::get('modal'),
+            'modal' => \Shared\Helpers\Helpers::get('modal'),
             'cookie_pages' => $this->cookieState('cookie_pages'),
             'cookie_menus' => $this->cookieState('cookie_menus'),
         ]);
@@ -58,7 +58,7 @@ class PagesController
 
     public function menuEdit(): string
     {
-        $menu = $this->repository->menuDetails((int)\S::get('id'));
+        $menu = $this->repository->menuDetails((int)\Shared\Helpers\Helpers::get('id'));
 
         return \Tpl::view('pages/menu-edit', [
             'form' => $this->buildMenuFormViewModel($menu),
@@ -67,7 +67,7 @@ class PagesController
 
     public function menuSave(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania menu wystapil blad. Prosze sprobowac ponownie.'];
             $values = json_decode((string)$legacyValues, true);
@@ -84,9 +84,9 @@ class PagesController
             exit;
         }
 
-        $menuId = (int)\S::get('id');
+        $menuId = (int)\Shared\Helpers\Helpers::get('id');
-        $name = trim((string)\S::get('name'));
+        $name = trim((string)\Shared\Helpers\Helpers::get('name'));
-        $status = \S::get('status');
+        $status = \Shared\Helpers\Helpers::get('status');
 
         if ($name === '') {
             echo json_encode([
@@ -155,10 +155,10 @@ class PagesController
 
     public function menuDelete(): void
     {
-        if ($this->repository->menuDelete((int)\S::get('id'))) {
+        if ($this->repository->menuDelete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::set_message('Menu zostało usunięte.');
+            \Shared\Helpers\Helpers::set_message('Menu zostało usunięte.');
         } else {
-            \S::alert('Podczas usuwania menu wystąpił błąd. Aby usunąć menu, nie może ono posiadać przypiętych stron.');
+            \Shared\Helpers\Helpers::alert('Podczas usuwania menu wystąpił błąd. Aby usunąć menu, nie może ono posiadać przypiętych stron.');
         }
 
         header('Location: /admin/pages/list/');
@@ -167,9 +167,9 @@ class PagesController
 
     public function edit(): string
     {
-        $page = $this->repository->pageDetails((int)\S::get('id'));
+        $page = $this->repository->pageDetails((int)\Shared\Helpers\Helpers::get('id'));
-        $parentId = (int)\S::get('pid');
+        $parentId = (int)\Shared\Helpers\Helpers::get('pid');
-        $menuId = (int)\S::get('menu_id');
+        $menuId = (int)\Shared\Helpers\Helpers::get('menu_id');
         $menus = $this->repository->menusList();
         $layouts = $this->layoutsRepository->listAll();
         $languages = $this->languagesRepository->languagesList();
@@ -188,7 +188,7 @@ class PagesController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania strony wystapil blad. Prosze sprobowac ponownie.'];
             $values = json_decode((string)$legacyValues, true);
@@ -210,13 +210,13 @@ class PagesController
 
         $data = $_POST;
         if (!isset($data['id']) || $data['id'] === '') {
-            $data['id'] = (int)\S::get('id');
+            $data['id'] = (int)\Shared\Helpers\Helpers::get('id');
         }
         if (!isset($data['parent_id']) || $data['parent_id'] === '') {
-            $data['parent_id'] = (int)\S::get('pid');
+            $data['parent_id'] = (int)\Shared\Helpers\Helpers::get('pid');
         }
-        if ((!isset($data['menu_id']) || $data['menu_id'] === '') && (int)\S::get('menu_id') > 0) {
+        if ((!isset($data['menu_id']) || $data['menu_id'] === '') && (int)\Shared\Helpers\Helpers::get('menu_id') > 0) {
-            $data['menu_id'] = (int)\S::get('menu_id');
+            $data['menu_id'] = (int)\Shared\Helpers\Helpers::get('menu_id');
         }
 
         $savedId = $this->repository->pageSave($data);
@@ -524,10 +524,10 @@ class PagesController
 
     public function delete(): void
     {
-        if ($this->repository->pageDelete((int)\S::get('id'))) {
+        if ($this->repository->pageDelete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::set_message('Strona zostala usunieta.');
+            \Shared\Helpers\Helpers::set_message('Strona zostala usunieta.');
         } else {
-            \S::alert('Podczas usuwania strony wystapil blad. Aby usunac strone nie moze ona posiadac przypietych podstron.');
+            \Shared\Helpers\Helpers::alert('Podczas usuwania strony wystapil blad. Aby usunac strone nie moze ona posiadac przypietych podstron.');
         }
 
         header('Location: /admin/pages/list/');
@@ -536,7 +536,7 @@ class PagesController
 
     public function pageArticles(): string
     {
-        $pageId = (int)\S::get('id');
+        $pageId = (int)\Shared\Helpers\Helpers::get('id');
         return \Tpl::view('pages/page-articles', [
             'page_id' => $pageId,
             'articles' => $this->repository->pageArticles($pageId),
@@ -547,7 +547,7 @@ class PagesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kolejnosci stron wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->savePagesOrder((int)\S::get('menu_id'), \S::get('pages'))) {
+        if ($this->repository->savePagesOrder((int)\Shared\Helpers\Helpers::get('menu_id'), \Shared\Helpers\Helpers::get('pages'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -559,7 +559,7 @@ class PagesController
     {
         $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kolejnosci wyswietlania artykulow wystapil blad. Prosze sprobowac ponownie.'];
 
-        if ($this->repository->saveArticlesOrder((int)\S::get('page_id'), \S::get('articles'))) {
+        if ($this->repository->saveArticlesOrder((int)\Shared\Helpers\Helpers::get('page_id'), \Shared\Helpers\Helpers::get('articles'))) {
             $response = ['status' => 'ok'];
         }
 
@@ -572,10 +572,10 @@ class PagesController
         $response = ['status' => 'error', 'msg' => 'Podczas generowania pola "seo link" wystapil blad. Prosze sprobowac ponownie.'];
 
         $seoLink = $this->repository->generateSeoLink(
-            (string)\S::get('title'),
+            (string)\Shared\Helpers\Helpers::get('title'),
-            (int)\S::get('page_id'),
+            (int)\Shared\Helpers\Helpers::get('page_id'),
-            (int)\S::get('article_id'),
+            (int)\Shared\Helpers\Helpers::get('article_id'),
-            (int)\S::get('category_id')
+            (int)\Shared\Helpers\Helpers::get('category_id')
         );
 
         if ($seoLink !== '') {
@@ -591,13 +591,13 @@ class PagesController
 
     public function cookieMenus(): void
     {
-        $this->repository->toggleCookieValue('cookie_menus', (int)\S::get('menu_id'));
+        $this->repository->toggleCookieValue('cookie_menus', (int)\Shared\Helpers\Helpers::get('menu_id'));
         exit;
     }
 
     public function cookiePages(): void
     {
-        $this->repository->toggleCookieValue('cookie_pages', (int)\S::get('page_id'));
+        $this->repository->toggleCookieValue('cookie_pages', (int)\Shared\Helpers\Helpers::get('page_id'));
         exit;
     }
 

autoload/admin/Controllers/ProductArchiveController.php

@@ -154,10 +154,10 @@ class ProductArchiveController
 
     public function unarchive(): void
     {
-        if ( $this->productRepository->unarchive( (int) \S::get( 'product_id' ) ) )
+        if ( $this->productRepository->unarchive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) )
-            \S::alert( 'Produkt został przywrócony z archiwum.' );
+            \Shared\Helpers\Helpers::alert( 'Produkt został przywrócony z archiwum.' );
         else
-            \S::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
 
         header( 'Location: /admin/product_archive/list/' );
         exit;

autoload/admin/Controllers/ScontainersController.php

@@ -51,7 +51,7 @@ class ScontainersController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'DESC';
         }
 
@@ -137,7 +137,7 @@ class ScontainersController
 
     public function edit(): string
     {
-        $container = $this->repository->find((int)\S::get('id'));
+        $container = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
         $validationErrors = $_SESSION['form_errors'][$this->formId()] ?? null;
         if ($validationErrors) {
@@ -156,7 +156,7 @@ class ScontainersController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kontenera wystapil blad.'];
@@ -172,7 +172,7 @@ class ScontainersController
             exit;
         }
 
-        $container = $this->repository->find((int)\S::get('id'));
+        $container = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
         $form = $this->buildFormViewModel($container, $languages);
 
@@ -214,8 +214,8 @@ class ScontainersController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Kontener zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Kontener zostal usuniety.');
         }
 
         header('Location: /admin/scontainers/list/');

autoload/admin/Controllers/SettingsController.php

@@ -30,16 +30,16 @@ class SettingsController
      */
     public function clearCache(): void
     {
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
-        \S::delete_dir('../thumbs/');
+        \Shared\Helpers\Helpers::delete_dir('../thumbs/');
 
         $redis = \Shared\Cache\RedisConnection::getInstance()->getConnection();
         if ($redis) {
             $redis->flushAll();
         }
 
-        \S::alert('Cache został wyczyszczony.');
+        \Shared\Helpers\Helpers::alert('Cache został wyczyszczony.');
-        \S::htacces();
+        \Shared\Helpers\Helpers::htacces();
 
         header('Location: /admin/dashboard/main_view/');
         exit;
@@ -51,15 +51,15 @@ class SettingsController
     public function clearCacheAjax(): void
     {
         try {
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
-            \S::delete_dir('../thumbs/');
+            \Shared\Helpers\Helpers::delete_dir('../thumbs/');
 
             $redis = \Shared\Cache\RedisConnection::getInstance()->getConnection();
             if ($redis) {
                 $redis->flushAll();
             }
 
-            \S::htacces();
+            \Shared\Helpers\Helpers::htacces();
 
             echo json_encode(['status' => 'success', 'message' => 'Cache został wyczyszczony.']);
         } catch (\Exception $e) {
@@ -75,7 +75,7 @@ class SettingsController
     {
         global $mdb;
 
-        $phrase = trim((string)\S::get('q'));
+        $phrase = trim((string)\Shared\Helpers\Helpers::get('q'));
         if ($phrase === '' || mb_strlen($phrase) < 2) {
             echo json_encode([
                 'status' => 'ok',
@@ -227,13 +227,13 @@ class SettingsController
     public function save(): void
     {
         // Kompatybilnosc wsteczna dla legacy gridEdit (values jako JSON).
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode($legacyValues, true);
             $result = $this->settingsRepository->saveSettings(is_array($values) ? $values : []);
 
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
-            \S::htacces();
+            \Shared\Helpers\Helpers::htacces();
 
             echo json_encode($result);
             exit;
@@ -253,8 +253,8 @@ class SettingsController
         $values = $this->transformFormDataToSettings($result['data']);
         $saveResult = $this->settingsRepository->saveSettings($values);
 
-        \S::delete_dir('../temp/');
+        \Shared\Helpers\Helpers::delete_dir('../temp/');
-        \S::htacces();
+        \Shared\Helpers\Helpers::htacces();
 
         echo json_encode([
             'success' => ($saveResult['status'] ?? '') === 'ok',

autoload/admin/Controllers/ShopAttributeController.php

@@ -50,7 +50,7 @@ class ShopAttributeController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -150,7 +150,7 @@ class ShopAttributeController
 
     public function edit(): string
     {
-        $attribute = $this->repository->findAttribute((int)\S::get('id'));
+        $attribute = $this->repository->findAttribute((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
 
         return \Tpl::view('shop-attribute/attribute-edit', [
@@ -165,7 +165,7 @@ class ShopAttributeController
             'msg' => 'Podczas zapisywania atrybutu wystapil blad. Prosze sprobowac ponownie.',
         ];
 
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             if (is_array($values)) {
@@ -185,7 +185,7 @@ class ShopAttributeController
 
         $payload = $_POST;
         if (empty($payload['id'])) {
-            $routeId = (int)\S::get('id');
+            $routeId = (int)\Shared\Helpers\Helpers::get('id');
             if ($routeId > 0) {
                 $payload['id'] = $routeId;
             }
@@ -210,8 +210,8 @@ class ShopAttributeController
 
     public function delete(): void
     {
-        if ($this->repository->deleteAttribute((int)\S::get('id'))) {
+        if ($this->repository->deleteAttribute((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Atrybut zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Atrybut zostal usuniety.');
         }
 
         header('Location: /admin/shop_attribute/list/');
@@ -220,16 +220,16 @@ class ShopAttributeController
 
     public function values(): string
     {
-        $attributeId = (int)\S::get('id');
+        $attributeId = (int)\Shared\Helpers\Helpers::get('id');
         if ($attributeId <= 0) {
-            \S::alert('Nieprawidlowy identyfikator cechy.');
+            \Shared\Helpers\Helpers::alert('Nieprawidlowy identyfikator cechy.');
             header('Location: /admin/shop_attribute/list/');
             exit;
         }
 
         $attribute = $this->repository->findAttribute($attributeId);
         if ((int)($attribute['id'] ?? 0) <= 0) {
-            \S::alert('Wybrana cecha nie zostala znaleziona.');
+            \Shared\Helpers\Helpers::alert('Wybrana cecha nie zostala znaleziona.');
             header('Location: /admin/shop_attribute/list/');
             exit;
         }
@@ -251,12 +251,12 @@ class ShopAttributeController
             'msg' => 'Podczas zapisywania wartosci atrybutu wystapil blad. Prosze sprobowac ponownie.',
         ];
 
-        $attributeId = (int)\S::get('attribute_id');
+        $attributeId = (int)\Shared\Helpers\Helpers::get('attribute_id');
         if ($attributeId <= 0) {
-            $attributeId = (int)\S::get('id');
+            $attributeId = (int)\Shared\Helpers\Helpers::get('id');
         }
 
-        $payloadRaw = \S::get('payload');
+        $payloadRaw = \Shared\Helpers\Helpers::get('payload');
         $payload = json_decode((string)$payloadRaw, true);
         if (is_array($payload) && is_array($payload['rows'] ?? null) && $attributeId > 0) {
             $validationErrors = $this->validateValuesRows(
@@ -286,7 +286,7 @@ class ShopAttributeController
             exit;
         }
 
-        $valuesRaw = \S::get('values');
+        $valuesRaw = \Shared\Helpers\Helpers::get('values');
         $values = json_decode((string)$valuesRaw, true);
         if (is_array($values) && $attributeId > 0) {
             $savedId = $this->repository->saveLegacyValues(
@@ -313,7 +313,7 @@ class ShopAttributeController
 
     public function value_row_tpl(): void
     {
-        $rowKey = trim((string)\S::get('row_key'));
+        $rowKey = trim((string)\Shared\Helpers\Helpers::get('row_key'));
         if ($rowKey === '') {
             $rowKey = 'new-' . time();
         }

autoload/admin/Controllers/ShopCategoryController.php

@@ -32,8 +32,8 @@ class ShopCategoryController
     public function category_edit(): string
     {
         return \Tpl::view('shop-category/category-edit', [
-            'category' => $this->repository->categoryDetails(\S::get('id')),
+            'category' => $this->repository->categoryDetails(\Shared\Helpers\Helpers::get('id')),
-            'pid' => \S::get('pid'),
+            'pid' => \Shared\Helpers\Helpers::get('pid'),
             'languages' => $this->languagesRepository->languagesList(),
             'sort_types' => $this->repository->sortTypes(),
             'dlang' => $this->languagesRepository->defaultLanguage(),
@@ -52,7 +52,7 @@ class ShopCategoryController
             'msg' => 'Podczas zapisywania kategorii wystąpił błąd. Proszę spróbować ponownie.',
         ];
 
-        $values = json_decode((string)\S::get('values'), true);
+        $values = json_decode((string)\Shared\Helpers\Helpers::get('values'), true);
         if (is_array($values)) {
             $savedId = $this->repository->save($values);
             if (!empty($savedId)) {
@@ -70,10 +70,10 @@ class ShopCategoryController
 
     public function category_delete(): void
     {
-        if ($this->repository->categoryDelete(\S::get('id'))) {
+        if ($this->repository->categoryDelete(\Shared\Helpers\Helpers::get('id'))) {
-            \S::set_message('Kategoria została usunięta.');
+            \Shared\Helpers\Helpers::set_message('Kategoria została usunięta.');
         } else {
-            \S::alert('Podczas usuwania kategorii wystąpił błąd. Aby usunąć kategorię nie może ona posiadać przypiętych podkategorii.');
+            \Shared\Helpers\Helpers::alert('Podczas usuwania kategorii wystąpił błąd. Aby usunąć kategorię nie może ona posiadać przypiętych podkategorii.');
         }
 
         header('Location: /admin/shop_category/view_list/');
@@ -88,8 +88,8 @@ class ShopCategoryController
     public function category_products(): string
     {
         return \Tpl::view('shop-category/category-products', [
-            'category_id' => \S::get('id'),
+            'category_id' => \Shared\Helpers\Helpers::get('id'),
-            'products' => $this->repository->categoryProducts((int)\S::get('id')),
+            'products' => $this->repository->categoryProducts((int)\Shared\Helpers\Helpers::get('id')),
         ]);
     }
 
@@ -115,7 +115,7 @@ class ShopCategoryController
             'msg' => 'Podczas zapisywania kolejności kategorii wystąpił błąd. Proszę spróbować ponownie.',
         ];
 
-        if ( $this->repository->saveCategoriesOrder( \S::get( 'categories' ) ) ) {
+        if ( $this->repository->saveCategoriesOrder( \Shared\Helpers\Helpers::get( 'categories' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -130,7 +130,7 @@ class ShopCategoryController
             'msg' => 'Podczas zapisywania kolejności wyświetlania produktów wystąpił błąd. Proszę spróbować ponownie.',
         ];
 
-        if ( $this->repository->saveProductOrder( \S::get( 'category_id' ), \S::get( 'products' ) ) ) {
+        if ( $this->repository->saveProductOrder( \Shared\Helpers\Helpers::get( 'category_id' ), \Shared\Helpers\Helpers::get( 'products' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -140,7 +140,7 @@ class ShopCategoryController
 
     public function cookie_categories(): void
     {
-        $categoryId = (string) \S::get( 'category_id' );
+        $categoryId = (string) \Shared\Helpers\Helpers::get( 'category_id' );
         if ( $categoryId === '' ) {
             echo json_encode( [ 'status' => 'error' ] );
             exit;

autoload/admin/Controllers/ShopClientsController.php

@@ -61,7 +61,7 @@ class ShopClientsController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -155,9 +155,9 @@ class ShopClientsController
 
     public function details(): string
     {
-        $name = (string)\S::get('name');
+        $name = (string)\Shared\Helpers\Helpers::get('name');
-        $surname = (string)\S::get('surname');
+        $surname = (string)\Shared\Helpers\Helpers::get('surname');
-        $email = (string)\S::get('email');
+        $email = (string)\Shared\Helpers\Helpers::get('email');
 
         $ordersInfo = $this->repository->ordersForClient($name, $surname, $email);
         $totals = $this->repository->totalsForClient($name, $surname, $email);

autoload/admin/Controllers/ShopCouponController.php

@@ -65,7 +65,7 @@ class ShopCouponController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -172,7 +172,7 @@ class ShopCouponController
 
     public function edit(): string
     {
-        $coupon = $this->repository->find((int)\S::get('id'));
+        $coupon = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $categories = $this->repository->categoriesTree(null);
 
         return \Tpl::view('shop-coupon/coupon-edit-new', [
@@ -187,7 +187,7 @@ class ShopCouponController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
 
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
@@ -213,7 +213,7 @@ class ShopCouponController
 
         $payload = $_POST;
         if (empty($payload['id'])) {
-            $routeId = (int)\S::get('id');
+            $routeId = (int)\Shared\Helpers\Helpers::get('id');
             if ($routeId > 0) {
                 $payload['id'] = $routeId;
             }
@@ -243,8 +243,8 @@ class ShopCouponController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Kupon zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Kupon zostal usuniety.');
         }
 
         header('Location: /admin/shop_coupon/list/');

autoload/admin/Controllers/ShopOrderController.php

@@ -162,7 +162,7 @@ class ShopOrderController
 
     public function order_details(): string
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
         $order = $this->service->details($orderId);
 
         $coupon = null;
@@ -186,7 +186,7 @@ class ShopOrderController
 
     public function order_edit(): string
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
 
         return \Tpl::view('shop-order/order-edit', [
             'order' => $this->service->details($orderId),
@@ -204,42 +204,42 @@ class ShopOrderController
     public function order_save(): void
     {
         $saved = $this->service->saveOrderByAdmin([
-            'order_id' => (int)\S::get('order_id'),
+            'order_id' => (int)\Shared\Helpers\Helpers::get('order_id'),
-            'client_name' => (string)\S::get('client_name'),
+            'client_name' => (string)\Shared\Helpers\Helpers::get('client_name'),
-            'client_surname' => (string)\S::get('client_surname'),
+            'client_surname' => (string)\Shared\Helpers\Helpers::get('client_surname'),
-            'client_street' => (string)\S::get('client_street'),
+            'client_street' => (string)\Shared\Helpers\Helpers::get('client_street'),
-            'client_postal_code' => (string)\S::get('client_postal_code'),
+            'client_postal_code' => (string)\Shared\Helpers\Helpers::get('client_postal_code'),
-            'client_city' => (string)\S::get('client_city'),
+            'client_city' => (string)\Shared\Helpers\Helpers::get('client_city'),
-            'client_email' => (string)\S::get('client_email'),
+            'client_email' => (string)\Shared\Helpers\Helpers::get('client_email'),
-            'firm_name' => (string)\S::get('firm_name'),
+            'firm_name' => (string)\Shared\Helpers\Helpers::get('firm_name'),
-            'firm_street' => (string)\S::get('firm_street'),
+            'firm_street' => (string)\Shared\Helpers\Helpers::get('firm_street'),
-            'firm_postal_code' => (string)\S::get('firm_postal_code'),
+            'firm_postal_code' => (string)\Shared\Helpers\Helpers::get('firm_postal_code'),
-            'firm_city' => (string)\S::get('firm_city'),
+            'firm_city' => (string)\Shared\Helpers\Helpers::get('firm_city'),
-            'firm_nip' => (string)\S::get('firm_nip'),
+            'firm_nip' => (string)\Shared\Helpers\Helpers::get('firm_nip'),
-            'transport_id' => (int)\S::get('transport_id'),
+            'transport_id' => (int)\Shared\Helpers\Helpers::get('transport_id'),
-            'inpost_paczkomat' => (string)\S::get('inpost_paczkomat'),
+            'inpost_paczkomat' => (string)\Shared\Helpers\Helpers::get('inpost_paczkomat'),
-            'payment_method_id' => (int)\S::get('payment_method_id'),
+            'payment_method_id' => (int)\Shared\Helpers\Helpers::get('payment_method_id'),
         ]);
 
         if ($saved) {
-            \S::alert('Zamówienie zostało zapisane.');
+            \Shared\Helpers\Helpers::alert('Zamówienie zostało zapisane.');
         }
 
-        header('Location: /admin/shop_order/order_details/order_id=' . (int)\S::get('order_id'));
+        header('Location: /admin/shop_order/order_details/order_id=' . (int)\Shared\Helpers\Helpers::get('order_id'));
         exit;
     }
 
     public function notes_save(): void
     {
-        $this->service->saveNotes((int)\S::get('order_id'), (string)\S::get('notes'));
+        $this->service->saveNotes((int)\Shared\Helpers\Helpers::get('order_id'), (string)\Shared\Helpers\Helpers::get('notes'));
     }
 
     public function order_status_change(): void
     {
         $response = $this->service->changeStatus(
-            (int)\S::get('order_id'),
+            (int)\Shared\Helpers\Helpers::get('order_id'),
-            (int)\S::get('status'),
+            (int)\Shared\Helpers\Helpers::get('status'),
-            (string)\S::get('email') === 'true'
+            (string)\Shared\Helpers\Helpers::get('email') === 'true'
         );
 
         echo json_encode($response);
@@ -248,7 +248,7 @@ class ShopOrderController
 
     public function order_resend_confirmation_email(): void
     {
-        $response = $this->service->resendConfirmationEmail((int)\S::get('order_id'));
+        $response = $this->service->resendConfirmationEmail((int)\Shared\Helpers\Helpers::get('order_id'));
 
         echo json_encode(['result' => $response]);
         exit;
@@ -256,7 +256,7 @@ class ShopOrderController
 
     public function set_order_as_unpaid(): void
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
         $this->service->setOrderAsUnpaid($orderId);
 
         header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
@@ -265,8 +265,8 @@ class ShopOrderController
 
     public function set_order_as_paid(): void
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
-        $this->service->setOrderAsPaid($orderId, (int)\S::get('send_mail') === 1);
+        $this->service->setOrderAsPaid($orderId, (int)\Shared\Helpers\Helpers::get('send_mail') === 1);
 
         header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
         exit;
@@ -274,12 +274,12 @@ class ShopOrderController
 
     public function send_order_to_apilo(): void
     {
-        $orderId = (int)\S::get('order_id');
+        $orderId = (int)\Shared\Helpers\Helpers::get('order_id');
 
         if ($this->service->sendOrderToApilo($orderId)) {
-            \S::alert('Zamówienie zostanie wysłane ponownie do apilo.com');
+            \Shared\Helpers\Helpers::alert('Zamówienie zostanie wysłane ponownie do apilo.com');
         } else {
-            \S::alert('Wystąpił błąd podczas wysyłania zamówienia do apilo.com');
+            \Shared\Helpers\Helpers::alert('Wystąpił błąd podczas wysyłania zamówienia do apilo.com');
         }
 
         header('Location: /admin/shop_order/order_details/order_id=' . $orderId);
@@ -288,7 +288,7 @@ class ShopOrderController
 
     public function toggle_trustmate_send(): void
     {
-        echo json_encode($this->service->toggleTrustmateSend((int)\S::get('order_id')));
+        echo json_encode($this->service->toggleTrustmateSend((int)\Shared\Helpers\Helpers::get('order_id')));
         exit;
     }
 
@@ -299,8 +299,8 @@ class ShopOrderController
 
     public function order_delete(): void
     {
-        if ($this->service->deleteOrder((int)\S::get('id'))) {
+        if ($this->service->deleteOrder((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Zamówienie zostało usunięte');
+            \Shared\Helpers\Helpers::alert('Zamówienie zostało usunięte');
         }
 
         header('Location: /admin/shop_order/list/');

autoload/admin/Controllers/ShopPaymentMethodController.php

@@ -46,7 +46,7 @@ class ShopPaymentMethodController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -131,9 +131,9 @@ class ShopPaymentMethodController
 
     public function edit(): string
     {
-        $paymentMethod = $this->repository->find((int)\S::get('id'));
+        $paymentMethod = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         if ($paymentMethod === null) {
-            \S::alert('Metoda platnosci nie zostala znaleziona.');
+            \Shared\Helpers\Helpers::alert('Metoda platnosci nie zostala znaleziona.');
             header('Location: /admin/shop_payment_method/list/');
             exit;
         }
@@ -148,7 +148,7 @@ class ShopPaymentMethodController
         $payload = $_POST;
         $paymentMethodId = isset($payload['id']) && $payload['id'] !== ''
             ? (int)$payload['id']
-            : (int)\S::get('id');
+            : (int)\Shared\Helpers\Helpers::get('id');
 
         $id = $this->repository->save($paymentMethodId, $payload);
         if ($id !== null) {
@@ -188,7 +188,7 @@ class ShopPaymentMethodController
             FormField::hidden('id', $id),
             FormField::custom(
                 'name_preview',
-                \Html::input([
+                \Shared\Html\Html::input([
                     'label' => 'Nazwa',
                     'name' => 'name_preview',
                     'id' => 'name_preview',

autoload/admin/Controllers/ShopProducerController.php

@@ -51,7 +51,7 @@ class ShopProducerController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -146,7 +146,7 @@ class ShopProducerController
 
     public function edit(): string
     {
-        $producer = $this->repository->find((int)\S::get('id'));
+        $producer = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
         $validationErrors = $_SESSION['form_errors'][$this->formId()] ?? null;
         if ($validationErrors) {
@@ -166,7 +166,7 @@ class ShopProducerController
     public function save(): void
     {
         // Legacy JSON (gridEdit)
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             $response = [
@@ -189,8 +189,8 @@ class ShopProducerController
                 );
 
                 if (!empty($id)) {
-                    \S::htacces();
+                    \Shared\Helpers\Helpers::htacces();
-                    \S::delete_dir('../temp/');
+                    \Shared\Helpers\Helpers::delete_dir('../temp/');
                     $response = [
                         'status' => 'ok',
                         'msg' => 'Producent zostal zapisany.',
@@ -204,7 +204,7 @@ class ShopProducerController
         }
 
         // Nowy flow (form-edit)
-        $producer = $this->repository->find((int)\S::get('id'));
+        $producer = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $languages = $this->languagesRepository->languagesList();
         $form = $this->buildFormViewModel($producer, $languages);
 
@@ -240,8 +240,8 @@ class ShopProducerController
         );
 
         if ($savedId) {
-            \S::htacces();
+            \Shared\Helpers\Helpers::htacces();
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
             echo json_encode([
                 'success' => true,
                 'id' => $savedId,
@@ -264,10 +264,10 @@ class ShopProducerController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::htacces();
+            \Shared\Helpers\Helpers::htacces();
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
-            \S::alert('Producent zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Producent zostal usuniety.');
         }
 
         header('Location: /admin/shop_producer/list/');

autoload/admin/Controllers/ShopProductController.php

@@ -216,7 +216,7 @@ class ShopProductController
 
         $db = $GLOBALS['mdb'];
 
-        $product    = $this->repository->findForAdmin( (int) \S::get( 'id' ) );
+        $product    = $this->repository->findForAdmin( (int) \Shared\Helpers\Helpers::get( 'id' ) );
         $languages  = ( new \Domain\Languages\LanguagesRepository( $db ) )->languagesList();
         $categories = ( new CategoryRepository( $db ) )->subcategories( null );
         $layouts    = $this->layoutsForProductEdit( $db );
@@ -568,7 +568,7 @@ class ShopProductController
         $productId = (int) ( $product['id'] ?? 0 );
         $sku = $this->escapeHtml( (string) ( $product['sku'] ?? '' ) );
 
-        return \Html::input_icon( [
+        return \Shared\Html\Html::input_icon( [
             'label'        => 'Kod SKU',
             'name'         => 'sku',
             'id'           => 'sku',
@@ -731,7 +731,7 @@ class ShopProductController
 
     private function resolveSavePayload(): array
     {
-        $legacyRaw = \S::get( 'values' );
+        $legacyRaw = \Shared\Helpers\Helpers::get( 'values' );
         if ( $legacyRaw !== null && $legacyRaw !== '' ) {
             $legacy = json_decode( (string) $legacyRaw, true );
             if ( is_array( $legacy ) ) {
@@ -771,10 +771,10 @@ class ShopProductController
      */
     public function duplicate_product(): void
     {
-        if ( $this->repository->duplicate( (int) \S::get( 'product-id' ), (bool) (int) \S::get( 'combination' ) ) ) {
+        if ( $this->repository->duplicate( (int) \Shared\Helpers\Helpers::get( 'product-id' ), (bool) (int) \Shared\Helpers\Helpers::get( 'combination' ) ) ) {
-            \S::set_message( 'Produkt został zduplikowany.' );
+            \Shared\Helpers\Helpers::set_message( 'Produkt został zduplikowany.' );
         } else {
-            \S::alert( 'Podczas duplikowania produktu wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas duplikowania produktu wystąpił błąd. Proszę spróbować ponownie' );
         }
 
         header( 'Location: /admin/shop_product/view_list/' );
@@ -786,10 +786,10 @@ class ShopProductController
      */
     public function product_archive(): void
     {
-        if ( $this->repository->archive( (int) \S::get( 'product_id' ) ) ) {
+        if ( $this->repository->archive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
-            \S::alert( 'Produkt został przeniesiony do archiwum.' );
+            \Shared\Helpers\Helpers::alert( 'Produkt został przeniesiony do archiwum.' );
         } else {
-            \S::alert( 'Podczas przenoszenia produktu do archiwum wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas przenoszenia produktu do archiwum wystąpił błąd. Proszę spróbować ponownie' );
         }
 
         header( 'Location: /admin/shop_product/view_list/' );
@@ -801,10 +801,10 @@ class ShopProductController
      */
     public function product_unarchive(): void
     {
-        if ( $this->repository->unarchive( (int) \S::get( 'product_id' ) ) ) {
+        if ( $this->repository->unarchive( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ) {
-            \S::alert( 'Produkt został przywrócony z archiwum.' );
+            \Shared\Helpers\Helpers::alert( 'Produkt został przywrócony z archiwum.' );
         } else {
-            \S::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas przywracania produktu z archiwum wystąpił błąd. Proszę spróbować ponownie' );
         }
 
         header( 'Location: /admin/product_archive/list/' );
@@ -816,10 +816,10 @@ class ShopProductController
      */
     public function product_delete(): void
     {
-        if ( $this->repository->delete( (int) \S::get( 'id' ) ) ) {
+        if ( $this->repository->delete( (int) \Shared\Helpers\Helpers::get( 'id' ) ) ) {
-            \S::set_message( 'Produkt został usunięty.' );
+            \Shared\Helpers\Helpers::set_message( 'Produkt został usunięty.' );
         } else {
-            \S::alert( 'Podczas usuwania produktu wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas usuwania produktu wystąpił błąd. Proszę spróbować ponownie' );
         }
 
         header( 'Location: /admin/shop_product/view_list/' );
@@ -831,8 +831,8 @@ class ShopProductController
      */
     public function change_product_status(): void
     {
-        if ( $this->repository->toggleStatus( (int) \S::get( 'product-id' ) ) ) {
+        if ( $this->repository->toggleStatus( (int) \Shared\Helpers\Helpers::get( 'product-id' ) ) ) {
-            \S::set_message( 'Status produktu został zmieniony' );
+            \Shared\Helpers\Helpers::set_message( 'Status produktu został zmieniony' );
         }
 
         header( 'Location: ' . $_SERVER['HTTP_REFERER'] );
@@ -846,7 +846,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany ceny wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->updatePriceBrutto( (int) \S::get( 'product_id' ), \S::get( 'price' ) ) ) {
+        if ( $this->repository->updatePriceBrutto( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -861,7 +861,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany ceny wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->updatePriceBruttoPromo( (int) \S::get( 'product_id' ), \S::get( 'price' ) ) ) {
+        if ( $this->repository->updatePriceBruttoPromo( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -876,7 +876,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany google xml label wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->updateCustomLabel( (int) \S::get( 'product_id' ), \S::get( 'custom_label' ), \S::get( 'value' ) ) ) {
+        if ( $this->repository->updateCustomLabel( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'value' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -891,7 +891,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas pobierania sugestii dla custom label wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        $suggestions = $this->repository->customLabelSuggestions( \S::get( 'custom_label' ), \S::get( 'label_type' ) );
+        $suggestions = $this->repository->customLabelSuggestions( \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'label_type' ) );
         if ( $suggestions ) {
             $response = [ 'status' => 'ok', 'suggestions' => $suggestions ];
         }
@@ -907,7 +907,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania custom label wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->saveCustomLabel( (int) \S::get( 'product_id' ), \S::get( 'custom_label' ), \S::get( 'label_type' ) ) ) {
+        if ( $this->repository->saveCustomLabel( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'custom_label' ), \Shared\Helpers\Helpers::get( 'label_type' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -920,7 +920,7 @@ class ShopProductController
      */
     public function ajax_product_url(): void
     {
-        echo json_encode( [ 'url' => \shop\Product::getProductUrl( (int) \S::get( 'product_id' ) ) ] );
+        echo json_encode( [ 'url' => \shop\Product::getProductUrl( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ) ] );
         exit;
     }
 
@@ -931,7 +931,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas generowania kodu sku wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        $sku = \shop\Product::generate_sku_code( (int) \S::get( 'product_id' ) );
+        $sku = \shop\Product::generate_sku_code( (int) \Shared\Helpers\Helpers::get( 'product_id' ) );
         if ( $sku ) {
             $response = [ 'status' => 'ok', 'sku' => $sku ];
         }
@@ -950,10 +950,10 @@ class ShopProductController
         $db = $GLOBALS['mdb'];
 
         return \Tpl::view( 'shop-product/product-combination', [
-            'product'              => $this->repository->findForAdmin( (int) \S::get( 'product_id' ) ),
+            'product'              => $this->repository->findForAdmin( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ),
             'attributes'           => ( new \Domain\Attribute\AttributeRepository( $db ) )->getAttributesListForCombinations(),
             'default_language'     => $this->languagesRepository->defaultLanguage(),
-            'product_permutations' => $this->repository->getCombinationsForTable( (int) \S::get( 'product_id' ) ),
+            'product_permutations' => $this->repository->getCombinationsForTable( (int) \Shared\Helpers\Helpers::get( 'product_id' ) ),
         ] );
     }
 
@@ -970,11 +970,11 @@ class ShopProductController
             }
         }
 
-        if ( $this->repository->generateCombinations( (int) \S::get( 'product_id' ), $attributes ) ) {
+        if ( $this->repository->generateCombinations( (int) \Shared\Helpers\Helpers::get( 'product_id' ), $attributes ) ) {
-            \S::alert( 'Kombinacje produktu zostały wygenerowane.' );
+            \Shared\Helpers\Helpers::alert( 'Kombinacje produktu zostały wygenerowane.' );
         }
 
-        header( 'Location: /admin/shop_product/product_combination/product_id=' . (int) \S::get( 'product_id' ) );
+        header( 'Location: /admin/shop_product/product_combination/product_id=' . (int) \Shared\Helpers\Helpers::get( 'product_id' ) );
         exit;
     }
 
@@ -983,13 +983,13 @@ class ShopProductController
      */
     public function delete_combination(): void
     {
-        if ( $this->repository->deleteCombination( (int) \S::get( 'combination_id' ) ) ) {
+        if ( $this->repository->deleteCombination( (int) \Shared\Helpers\Helpers::get( 'combination_id' ) ) ) {
-            \S::alert( 'Kombinacja produktu została usunięta' );
+            \Shared\Helpers\Helpers::alert( 'Kombinacja produktu została usunięta' );
         } else {
-            \S::alert( 'Podczas usuwania kombinacji produktu wystąpił błąd. Proszę spróbować ponownie' );
+            \Shared\Helpers\Helpers::alert( 'Podczas usuwania kombinacji produktu wystąpił błąd. Proszę spróbować ponownie' );
         }
 
-        header( 'Location: /admin/shop_product/product_combination/product_id=' . \S::get( 'product_id' ) );
+        header( 'Location: /admin/shop_product/product_combination/product_id=' . \Shared\Helpers\Helpers::get( 'product_id' ) );
         exit;
     }
 
@@ -998,7 +998,7 @@ class ShopProductController
      */
     public function product_combination_stock_0_buy_save(): void
     {
-        $this->repository->saveCombinationStock0Buy( (int) \S::get( 'product_id' ), \S::get( 'stock_0_buy' ) );
+        $this->repository->saveCombinationStock0Buy( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'stock_0_buy' ) );
         echo json_encode( [ 'status' => 'ok' ] );
         exit;
     }
@@ -1008,7 +1008,7 @@ class ShopProductController
      */
     public function product_combination_sku_save(): void
     {
-        $this->repository->saveCombinationSku( (int) \S::get( 'product_id' ), \S::get( 'sku' ) );
+        $this->repository->saveCombinationSku( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'sku' ) );
         echo json_encode( [ 'status' => 'ok' ] );
         exit;
     }
@@ -1018,7 +1018,7 @@ class ShopProductController
      */
     public function product_combination_quantity_save(): void
     {
-        $this->repository->saveCombinationQuantity( (int) \S::get( 'product_id' ), \S::get( 'quantity' ) );
+        $this->repository->saveCombinationQuantity( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'quantity' ) );
         echo json_encode( [ 'status' => 'ok' ] );
         exit;
     }
@@ -1028,7 +1028,7 @@ class ShopProductController
      */
     public function product_combination_price_save(): void
     {
-        $this->repository->saveCombinationPrice( (int) \S::get( 'product_id' ), \S::get( 'price' ) );
+        $this->repository->saveCombinationPrice( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'price' ) );
         echo json_encode( [ 'status' => 'ok' ] );
         exit;
     }
@@ -1040,7 +1040,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas usuwania kombinacji wystąpił błąd.' ];
 
-        if ( $this->repository->deleteCombination( (int) \S::get( 'combination_id' ) ) ) {
+        if ( $this->repository->deleteCombination( (int) \Shared\Helpers\Helpers::get( 'combination_id' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1057,7 +1057,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas usuwania zdjecia wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->deleteImage( (int) \S::get( 'image_id' ) ) ) {
+        if ( $this->repository->deleteImage( (int) \Shared\Helpers\Helpers::get( 'image_id' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1070,7 +1070,7 @@ class ShopProductController
      */
     public function images_order_save(): void
     {
-        if ( $this->repository->saveImagesOrder( (int) \S::get( 'product_id' ), \S::get( 'order' ) ) ) {
+        if ( $this->repository->saveImagesOrder( (int) \Shared\Helpers\Helpers::get( 'product_id' ), \Shared\Helpers\Helpers::get( 'order' ) ) ) {
             echo json_encode( [ 'status' => 'ok', 'msg' => 'Produkt został zapisany.' ] );
         }
 
@@ -1084,7 +1084,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany atrybutu alt zdjęcia wystąpił błąd. Proszę spróbować ponownie.' ];
 
-        if ( $this->repository->updateImageAlt( (int) \S::get( 'image_id' ), \S::get( 'image_alt' ) ) ) {
+        if ( $this->repository->updateImageAlt( (int) \Shared\Helpers\Helpers::get( 'image_id' ), \Shared\Helpers\Helpers::get( 'image_alt' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1099,7 +1099,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas usuwania pliku wystąpił błąd.' ];
 
-        if ( $this->repository->deleteFile( (int) \S::get( 'file_id' ) ) ) {
+        if ( $this->repository->deleteFile( (int) \Shared\Helpers\Helpers::get( 'file_id' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1114,7 +1114,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas zmiany nazwy pliku wystąpił błąd.' ];
 
-        if ( $this->repository->updateFileName( (int) \S::get( 'file_id' ), \S::get( 'file_name' ) ) ) {
+        if ( $this->repository->updateFileName( (int) \Shared\Helpers\Helpers::get( 'file_id' ), \Shared\Helpers\Helpers::get( 'file_name' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1129,7 +1129,7 @@ class ShopProductController
     {
         $response = [ 'status' => 'error', 'msg' => 'Podczas usuwania zdjęcia wystąpił błąd.' ];
 
-        if ( $this->repository->deleteImage( (int) \S::get( 'image_id' ) ) ) {
+        if ( $this->repository->deleteImage( (int) \Shared\Helpers\Helpers::get( 'image_id' ) ) ) {
             $response = [ 'status' => 'ok' ];
         }
 
@@ -1158,8 +1158,8 @@ class ShopProductController
      */
     public function mass_edit_save(): void
     {
-        $discountPercent = \S::get( 'discount_percent' );
+        $discountPercent = \Shared\Helpers\Helpers::get( 'discount_percent' );
-        $products = \S::get( 'products' );
+        $products = \Shared\Helpers\Helpers::get( 'products' );
 
         if ( $discountPercent != '' && $products && is_array( $products ) && count( $products ) > 0 ) {
             $productId = (int) $products[0];
@@ -1184,7 +1184,7 @@ class ShopProductController
      */
     public function get_products_by_category(): void
     {
-        $categoryId = (int) \S::get( 'category_id' );
+        $categoryId = (int) \Shared\Helpers\Helpers::get( 'category_id' );
         $products = $this->repository->getProductsByCategory( $categoryId );
 
         echo json_encode( [ 'status' => 'ok', 'products' => $products ] );

autoload/admin/Controllers/ShopProductSetsController.php

@@ -45,7 +45,7 @@ class ShopProductSetsController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -132,7 +132,7 @@ class ShopProductSetsController
 
     public function edit(): string
     {
-        $set = $this->repository->find((int)\S::get('id'));
+        $set = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $products = $this->repository->allProductsMap();
 
         return \Tpl::view('shop-product-sets/product-set-edit', [
@@ -147,7 +147,7 @@ class ShopProductSetsController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
 
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
@@ -184,7 +184,7 @@ class ShopProductSetsController
 
         $payload = $_POST;
         if (empty($payload['id'])) {
-            $routeId = (int)\S::get('id');
+            $routeId = (int)\Shared\Helpers\Helpers::get('id');
             if ($routeId > 0) {
                 $payload['id'] = $routeId;
             }
@@ -220,8 +220,8 @@ class ShopProductSetsController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Komplet produktow zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Komplet produktow zostal usuniety.');
         }
 
         header('Location: /admin/shop_product_sets/list/');

autoload/admin/Controllers/ShopPromotionController.php

@@ -45,7 +45,7 @@ class ShopPromotionController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'DESC';
         }
 
@@ -136,7 +136,7 @@ class ShopPromotionController
 
     public function edit(): string
     {
-        $promotion = $this->repository->find((int)\S::get('id'));
+        $promotion = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         $categories = $this->repository->categoriesTree(null);
 
         return \Tpl::view('shop-promotion/promotion-edit', [
@@ -146,7 +146,7 @@ class ShopPromotionController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
 
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
@@ -172,7 +172,7 @@ class ShopPromotionController
 
         $payload = $_POST;
         if (empty($payload['id'])) {
-            $routeId = (int)\S::get('id');
+            $routeId = (int)\Shared\Helpers\Helpers::get('id');
             if ($routeId > 0) {
                 $payload['id'] = $routeId;
             }
@@ -197,8 +197,8 @@ class ShopPromotionController
 
     public function delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Promocja zostala usunieta.');
+            \Shared\Helpers\Helpers::alert('Promocja zostala usunieta.');
         }
 
         header('Location: /admin/shop_promotion/list/');

autoload/admin/Controllers/ShopStatusesController.php

@@ -36,7 +36,7 @@ class ShopStatusesController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -122,9 +122,9 @@ class ShopStatusesController
 
     public function edit(): string
     {
-        $status = $this->repository->find((int)\S::get('id'));
+        $status = $this->repository->find((int)\Shared\Helpers\Helpers::get('id'));
         if ($status === null) {
-            \S::alert('Status nie zostal znaleziony.');
+            \Shared\Helpers\Helpers::alert('Status nie zostal znaleziony.');
             header('Location: /admin/shop_statuses/list/');
             exit;
         }
@@ -138,7 +138,7 @@ class ShopStatusesController
 
     public function save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
 
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
@@ -166,7 +166,7 @@ class ShopStatusesController
         $payload = $_POST;
         $statusId = isset($payload['id']) && $payload['id'] !== '' ? (int)$payload['id'] : null;
         if ($statusId === null) {
-            $statusId = (int)\S::get('id');
+            $statusId = (int)\Shared\Helpers\Helpers::get('id');
         }
 
         $id = $this->repository->save($statusId, $payload);

autoload/admin/Controllers/ShopTransportController.php

@@ -51,7 +51,7 @@ class ShopTransportController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 
@@ -88,7 +88,7 @@ class ShopTransportController
                 'lp' => $lp++ . '.',
                 'default' => $default === 1 ? 'tak' : '<span style="color: #FF0000;">nie</span>',
                 'status' => $status === 1 ? 'tak' : '<span style="color: #FF0000;">nie</span>',
-                'cost' => \S::decimal($cost) . ' zł',
+                'cost' => \Shared\Helpers\Helpers::decimal($cost) . ' zł',
                 'max_wp' => $maxWp !== null ? (int)$maxWp : '-',
                 'name' => '<a href="/admin/shop_transport/edit/id=' . $id . '">' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '</a>',
                 'apilo_carrier' => htmlspecialchars((string)$apiloLabel, ENT_QUOTES, 'UTF-8'),
@@ -145,9 +145,9 @@ class ShopTransportController
 
     public function edit(): string
     {
-        $transport = $this->transportRepository->find((int)\S::get('id'));
+        $transport = $this->transportRepository->find((int)\Shared\Helpers\Helpers::get('id'));
         if ($transport === null) {
-            \S::alert('Rodzaj transportu nie został znaleziony.');
+            \Shared\Helpers\Helpers::alert('Rodzaj transportu nie został znaleziony.');
             header('Location: /admin/shop_transport/list/');
             exit;
         }
@@ -165,13 +165,13 @@ class ShopTransportController
         $payload = $_POST;
         $transportId = isset($payload['id']) && $payload['id'] !== ''
             ? (int)$payload['id']
-            : (int)\S::get('id');
+            : (int)\Shared\Helpers\Helpers::get('id');
 
         $payload['id'] = $transportId;
 
         $id = $this->transportRepository->save($payload);
         if ($id !== null) {
-            \S::delete_dir('../temp/');
+            \Shared\Helpers\Helpers::delete_dir('../temp/');
             echo json_encode([
                 'success' => true,
                 'id' => (int)$id,

autoload/admin/Controllers/UpdateController.php

@@ -15,8 +15,8 @@ class UpdateController
     public function main_view(): string
     {
         return \Tpl::view( 'update/main-view', [
-            'ver'     => \S::get_version(),
+            'ver'     => \Shared\Helpers\Helpers::get_version(),
-            'new_ver' => \S::get_new_version(),
+            'new_ver' => \Shared\Helpers\Helpers::get_new_version(),
         ] );
     }
 
@@ -25,9 +25,9 @@ class UpdateController
         $result = $this->repository->update();
 
         if ( !$result['success'] ) {
-            \S::alert( 'W trakcie aktualizacji systemu wystąpił błąd. Proszę spróbować ponownie.' );
+            \Shared\Helpers\Helpers::alert( 'W trakcie aktualizacji systemu wystąpił błąd. Proszę spróbować ponownie.' );
         } else {
-            \S::set_message( 'Aktualizacja przebiegła pomyślnie.' );
+            \Shared\Helpers\Helpers::set_message( 'Aktualizacja przebiegła pomyślnie.' );
         }
 
         header( 'Location: /admin/update/main_view/' );
@@ -40,7 +40,7 @@ class UpdateController
 
         $response = [
             'status'  => !empty( $result['success'] ) && empty( $result['no_updates'] ),
-            'version' => number_format( (float) \S::get( 'version_current' ) + 0.001, 3, '.', '' ),
+            'version' => number_format( (float) \Shared\Helpers\Helpers::get( 'version_current' ) + 0.001, 3, '.', '' ),
         ];
 
         echo json_encode( $response );

autoload/admin/Controllers/UsersController.php

@@ -20,8 +20,8 @@ class UsersController
 
     public function user_delete(): void
     {
-        if ($this->repository->delete((int)\S::get('id'))) {
+        if ($this->repository->delete((int)\Shared\Helpers\Helpers::get('id'))) {
-            \S::alert('Uzytkownik zostal usuniety.');
+            \Shared\Helpers\Helpers::alert('Uzytkownik zostal usuniety.');
         }
 
         header('Location: /admin/users/view_list/');
@@ -30,7 +30,7 @@ class UsersController
 
     public function user_save(): void
     {
-        $legacyValues = \S::get('values');
+        $legacyValues = \Shared\Helpers\Helpers::get('values');
         if ($legacyValues) {
             $values = json_decode((string)$legacyValues, true);
             if (!is_array($values)) {
@@ -61,7 +61,7 @@ class UsersController
             exit;
         }
 
-        $userId = (int)\S::get('id');
+        $userId = (int)\Shared\Helpers\Helpers::get('id');
         $user = $this->normalizeUser($this->repository->find($userId));
         $viewModel = $this->buildFormViewModel($user);
 
@@ -116,7 +116,7 @@ class UsersController
 
     public function user_edit(): string
     {
-        $user = $this->normalizeUser($this->repository->find((int)\S::get('id')));
+        $user = $this->normalizeUser($this->repository->find((int)\Shared\Helpers\Helpers::get('id')));
         $validationErrors = $_SESSION['form_errors'][$this->getFormId()] ?? null;
         if ($validationErrors) {
             unset($_SESSION['form_errors'][$this->getFormId()]);
@@ -155,7 +155,7 @@ class UsersController
         );
 
         $sortDir = $listRequest['sortDir'];
-        if (trim((string)\S::get('sort')) === '') {
+        if (trim((string)\Shared\Helpers\Helpers::get('sort')) === '') {
             $sortDir = 'ASC';
         }
 

autoload/admin/Support/Forms/FormFieldRenderer.php

@@ -57,7 +57,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::input($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
     }
 
     /**
@@ -81,7 +81,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::input($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
     }
 
     /**
@@ -105,7 +105,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::input($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
     }
 
     /**
@@ -115,7 +115,7 @@ class FormFieldRenderer
     {
         $value = $this->form->getFieldValue($field);
         
-        return \Html::input([
+        return \Shared\Html\Html::input([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -146,7 +146,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::input($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::input($params), $error);
     }
 
     /**
@@ -156,7 +156,7 @@ class FormFieldRenderer
     {
         $value = $this->form->getFieldValue($field);
         
-        return \Html::input([
+        return \Shared\Html\Html::input([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -180,7 +180,7 @@ class FormFieldRenderer
             $checked = (bool) $value;
         }
         
-        return \Html::input_switch([
+        return \Shared\Html\Html::input_switch([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -209,7 +209,7 @@ class FormFieldRenderer
             $params['class'] .= ' error';
         }
 
-        return $this->wrapWithError(\Html::select($params), $error);
+        return $this->wrapWithError(\Shared\Html\Html::select($params), $error);
     }
 
     /**
@@ -219,7 +219,7 @@ class FormFieldRenderer
     {
         $value = $this->form->getFieldValue($field);
         
-        return \Html::textarea([
+        return \Shared\Html\Html::textarea([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -236,7 +236,7 @@ class FormFieldRenderer
     {
         $value = $this->form->getFieldValue($field);
         
-        return \Html::textarea([
+        return \Shared\Html\Html::textarea([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -255,7 +255,7 @@ class FormFieldRenderer
         
         $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($field->id);
         
-        return \Html::input_icon([
+        return \Shared\Html\Html::input_icon([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -276,7 +276,7 @@ class FormFieldRenderer
         if ($field->useFilemanager) {
             $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($field->id);
             
-            return \Html::input_icon([
+            return \Shared\Html\Html::input_icon([
                 'label' => $field->label,
                 'name' => $field->name,
                 'id' => $field->id,
@@ -287,7 +287,7 @@ class FormFieldRenderer
             ]);
         }
         
-        return \Html::input([
+        return \Shared\Html\Html::input([
             'label' => $field->label,
             'name' => $field->name,
             'id' => $field->id,
@@ -395,7 +395,7 @@ class FormFieldRenderer
         switch ($field->type) {
             case FormFieldType::IMAGE:
                 $filemanagerUrl = $field->filemanagerUrl ?? $this->generateFilemanagerUrl($id);
-                return $this->wrapWithError(\Html::input_icon([
+                return $this->wrapWithError(\Shared\Html\Html::input_icon([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
@@ -407,7 +407,7 @@ class FormFieldRenderer
                 
             case FormFieldType::TEXTAREA:
             case FormFieldType::EDITOR:
-                return $this->wrapWithError(\Html::textarea([
+                return $this->wrapWithError(\Shared\Html\Html::textarea([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
@@ -417,7 +417,7 @@ class FormFieldRenderer
                 ]), $error);
                 
             case FormFieldType::SWITCH:
-                return \Html::input_switch([
+                return \Shared\Html\Html::input_switch([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
@@ -425,7 +425,7 @@ class FormFieldRenderer
                 ]);
 
             case FormFieldType::SELECT:
-                return $this->wrapWithError(\Html::select([
+                return $this->wrapWithError(\Shared\Html\Html::select([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,
@@ -441,7 +441,7 @@ class FormFieldRenderer
                         $iconJs = str_replace('{lang}', (string)$languageId, $iconJs);
                     }
 
-                    return $this->wrapWithError(\Html::input_icon([
+                    return $this->wrapWithError(\Shared\Html\Html::input_icon([
                         'label' => $field->label,
                         'name' => $name,
                         'id' => $id,
@@ -454,7 +454,7 @@ class FormFieldRenderer
                     ]), $error);
                 }
 
-                return $this->wrapWithError(\Html::input([
+                return $this->wrapWithError(\Shared\Html\Html::input([
                     'label' => $field->label,
                     'name' => $name,
                     'id' => $id,

autoload/admin/Support/class.TableListRequestFactory.php

@@ -39,8 +39,8 @@ class TableListRequestFactory
             $defaultPerPage = (int)$perPageOptions[0];
         }
 
-        $page = max(1, (int)\S::get('page'));
+        $page = max(1, (int)\Shared\Helpers\Helpers::get('page'));
-        $perPage = (int)\S::get('per_page');
+        $perPage = (int)\Shared\Helpers\Helpers::get('per_page');
         if (!in_array($perPage, $perPageOptions, true)) {
             $perPage = $defaultPerPage;
         }
@@ -56,7 +56,7 @@ class TableListRequestFactory
             }
 
             $type = (string)($definition['type'] ?? 'text');
-            $value = (string)\S::get($key);
+            $value = (string)\Shared\Helpers\Helpers::get($key);
 
             $filters[$key] = $value;
             $queryFilters[$key] = $value;
@@ -75,12 +75,12 @@ class TableListRequestFactory
             $viewFilters[] = $filterConfig;
         }
 
-        $sortColumn = trim((string)\S::get('sort'));
+        $sortColumn = trim((string)\Shared\Helpers\Helpers::get('sort'));
         if (!in_array($sortColumn, $sortableColumns, true)) {
             $sortColumn = $defaultSortColumn;
         }
 
-        $sortDir = strtoupper(trim((string)\S::get('dir')));
+        $sortDir = strtoupper(trim((string)\Shared\Helpers\Helpers::get('dir')));
         if (!in_array($sortDir, ['ASC', 'DESC'], true)) {
             $sortDir = 'DESC';
         }

autoload/class.Log.php

@@ -1,14 +0,0 @@
-<?
-class Log
-{
-  static public function save_log( $message, $user_id = null )
-  {
-    global $mdb;
-
-    $mdb -> insert( 'pp_log', [
-      'message' => $message,
-      'user_id' => $user_id ? $user_id : null,
-      'date' => date( 'Y-m-d H:i:s' )
-    ] );
-  }
-}

autoload/cms/class.Layout.php

@@ -7,7 +7,7 @@ class Layout implements \ArrayAccess
     global $mdb;
 
     $result = $mdb -> get( 'pp_layouts', '*', [ 'id' => $layout_id ] );
-    if ( \S::is_array_fix( $result ) ) foreach ( $result as $key => $val )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $result ) ) foreach ( $result as $key => $val )
       $this -> $key = $val;
   }
 

autoload/front/Controllers/NewsletterController.php

@@ -18,7 +18,7 @@ class NewsletterController
 
     $result = [ 'status' => 'bad' ];
 
-    if ( $this->repository->signup( \S::get( 'email' ), $_SERVER['SERVER_NAME'], !empty( $settings['ssl'] ), $settings ) )
+    if ( $this->repository->signup( \Shared\Helpers\Helpers::get( 'email' ), $_SERVER['SERVER_NAME'], !empty( $settings['ssl'] ), $settings ) )
       $result = [ 'status' => 'ok' ];
 
     echo json_encode( $result );
@@ -29,8 +29,8 @@ class NewsletterController
   {
     global $lang;
 
-    if ( $this->repository->confirmSubscription( \S::get( 'hash' ) ) )
+    if ( $this->repository->confirmSubscription( \Shared\Helpers\Helpers::get( 'hash' ) ) )
-      \S::alert( $lang['email-zostal-dodany-do-listy-newsletter'] );
+      \Shared\Helpers\Helpers::alert( $lang['email-zostal-dodany-do-listy-newsletter'] );
 
     header( 'Location: /' );
     exit;
@@ -40,8 +40,8 @@ class NewsletterController
   {
     global $lang;
 
-    if ( $this->repository->unsubscribe( \S::get( 'hash' ) ) )
+    if ( $this->repository->unsubscribe( \Shared\Helpers\Helpers::get( 'hash' ) ) )
-      \S::alert( $lang['email-zostal-usuniety-z-listy-newsletter'] );
+      \Shared\Helpers\Helpers::alert( $lang['email-zostal-usuniety-z-listy-newsletter'] );
 
     header( 'Location: /' );
     exit;

autoload/front/Views/Articles.php

@@ -188,7 +188,7 @@ class Articles
     $id_attr_pos = strpos( $attrs, $id_attr );
     if ( $id_attr_pos === false )
     {
-      $id = \S::seo( $content );
+      $id = \Shared\Helpers\Helpers::seo( $content );
       $attrs .= sprintf( ' id="%s"', $id );
     }
 

autoload/front/Views/Banners.php

@@ -12,7 +12,7 @@ class Banners
 
     public static function mainBanner($banner)
     {
-        if (!\S::get_session('banner_close') && is_array($banner)) {
+        if (!\Shared\Helpers\Helpers::get_session('banner_close') && is_array($banner)) {
             $tpl = new \Tpl;
             $tpl->banner = $banner;
             return $tpl->render('banner/main-banner');

autoload/front/controls/class.ShopBasket.php

@@ -9,7 +9,7 @@ class ShopBasket
 
   public static function basket_message_save()
   {
-    \S::set_session( 'basket_message', \S::get( 'basket_message' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket_message', \Shared\Helpers\Helpers::get( 'basket_message' ) );
     echo json_encode( [
         'result' => 'ok'
     ] );
@@ -20,16 +20,16 @@ class ShopBasket
   {
     global $lang_id;
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
-    $product_hash = \S::get( 'product_hash' );
+    $product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
 
     unset( $basket[ $product_hash ] );
 
     $basket = \shop\Promotion::find_promotion( $basket );
 
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
     echo json_encode( [
         'basket'            => \Tpl::view( 'shop-basket/basket-details', [
@@ -52,19 +52,19 @@ class ShopBasket
   {
     global $lang_id;
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
-    $product_hash = \S::get( 'product_hash' );
+    $product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
     $basket[ $product_hash ][ 'quantity' ]++;
 
     \shop\Basket::check_product_quantity_in_stock( $basket, false );
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
 
     $basket = \shop\Promotion::find_promotion( $basket );
 
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
     echo json_encode( [
         'basket'            => \Tpl::view( 'shop-basket/basket-details', [
@@ -88,10 +88,10 @@ class ShopBasket
   {
     global $lang_id;
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
-    $product_hash = \S::get( 'product_hash' );
+    $product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
 
     $basket[ $product_hash ][ 'quantity' ]--;
 
@@ -100,7 +100,7 @@ class ShopBasket
 
     $basket = \shop\Promotion::find_promotion( $basket );
 
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
     echo json_encode( [
         'basket'            => \Tpl::view( 'shop-basket/basket-details', [
@@ -123,12 +123,12 @@ class ShopBasket
   {
     global $lang_id;
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
-    $product_hash = \S::get( 'product_hash' );
+    $product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
 
-    $basket[ $product_hash ][ 'quantity' ] = (int)\S::get( 'quantity' );
+    $basket[ $product_hash ][ 'quantity' ] = (int)\Shared\Helpers\Helpers::get( 'quantity' );
 
     if ( $basket[ $product_hash ][ 'quantity' ] < 1 )
       unset( $basket[ $product_hash ] );
@@ -137,7 +137,7 @@ class ShopBasket
 
     \shop\Basket::check_product_quantity_in_stock( $basket, false );
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
 
     echo json_encode( [
         'basket'            => \Tpl::view( 'shop-basket/basket-details', [
@@ -158,16 +158,16 @@ class ShopBasket
 
   static public function product_message_change()
   {
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
-    $basket[ \S::get( 'position_code' ) ]['message'] = \S::get( 'product_message' );
+    $basket[ \Shared\Helpers\Helpers::get( 'position_code' ) ]['message'] = \Shared\Helpers\Helpers::get( 'product_message' );
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
     exit;
   }
 
   public static function basket_add_product()
   {
-    $basket = \shop\Basket::validate_basket( \S::get_session( 'basket' ) );
+    $basket = \shop\Basket::validate_basket( \Shared\Helpers\Helpers::get_session( 'basket' ) );
-    $values_tmp = json_decode( \S::get( 'values' ), true );
+    $values_tmp = json_decode( \Shared\Helpers\Helpers::get( 'values' ), true );
 
     foreach( $values_tmp as $key => $val )
       $values[ $val['name'] ] = $val['value'];
@@ -192,7 +192,7 @@ class ShopBasket
       }
     }
 
-    if ( \S::is_array_fix( $attributes ) )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $attributes ) )
     {
       $values['parent_id'] = $values[ 'product-id' ];
       $values['product-id'] = \shop\Product::get_product_id_by_attributes( $values[ 'product-id' ], $attributes );
@@ -219,9 +219,9 @@ class ShopBasket
 
     $basket = \shop\Promotion::find_promotion( $basket );
 
-    \S::set_session( 'basket', $basket );
+    \Shared\Helpers\Helpers::set_session( 'basket', $basket );
 
-    $coupon = \S::get_session( 'coupon' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
 
     echo json_encode( [
         'result' => 'ok',
@@ -235,9 +235,9 @@ class ShopBasket
   // sprawdzam czy została wybrana forma wysylki inpost i czy został wybrany paczkomat
   static public function transport_method_inpost_check()
   {
-    if ( \S::get_session( 'basket-transport-method-id' ) === '2' or \S::get_session( 'basket-transport-method-id' ) === '1' )
+    if ( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '2' or \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '1' )
     {
-      if ( !\S::get_session( 'basket-inpost-info' ) )
+      if ( !\Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ) )
       {
         echo json_encode( [
           'result' => 'bad'
@@ -246,9 +246,9 @@ class ShopBasket
       }
     }
 
-    if ( \S::get_session( 'basket-transport-method-id' ) === '9' )
+    if ( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '9' )
     {
-      if ( !\S::get_session( 'basket_orlen_point_id' ) )
+      if ( !\Shared\Helpers\Helpers::get_session( 'basket_orlen_point_id' ) )
       {
         echo json_encode( [
           'result' => 'bad'
@@ -265,7 +265,7 @@ class ShopBasket
 
   // sprawdzam czy został wybrany paczkomat
   static public function inpost_check() {
-    if ( !\S::get_session( 'basket-inpost-info' ) )
+    if ( !\Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ) )
       echo json_encode( [
           'result' => 'bad'
       ] );
@@ -278,8 +278,8 @@ class ShopBasket
 
   static public function orlen_save()
   {
-    \S::set_session( 'basket_orlen_point_id', \S::get( 'orlen_point_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket_orlen_point_id', \Shared\Helpers\Helpers::get( 'orlen_point_id' ) );
-    \S::set_session( 'basket_orlen_point_info', \S::get( 'orlen_point_name' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket_orlen_point_info', \Shared\Helpers\Helpers::get( 'orlen_point_name' ) );
     echo json_encode( [
       'result' => 'ok'
     ] );
@@ -288,7 +288,7 @@ class ShopBasket
 
   public static function inpost_save()
   {
-    \S::set_session( 'basket-inpost-info', \S::get( 'paczkomat' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket-inpost-info', \Shared\Helpers\Helpers::get( 'paczkomat' ) );
     echo json_encode( [
         'result' => 'ok'
     ] );
@@ -297,7 +297,7 @@ class ShopBasket
 
   public static function basket_payment_method_set()
   {
-    \S::set_session( 'basket-payment-method-id', \S::get( 'payment_method_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket-payment-method-id', \Shared\Helpers\Helpers::get( 'payment_method_id' ) );
     echo json_encode( [
         'result' => 'ok'
     ] );
@@ -306,7 +306,7 @@ class ShopBasket
 
   public static function basket_transport_method_set()
   {
-    \S::set_session( 'basket-transport-method-id', \S::get( 'transport_method_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket-transport-method-id', \Shared\Helpers\Helpers::get( 'transport_method_id' ) );
     echo json_encode( [
         'result' => 'ok'
     ] );
@@ -315,13 +315,13 @@ class ShopBasket
 
   public static function basket_payments_methods()
   {
-    \S::set_session( 'basket-transport-method-id', \S::get( 'transport_method_id' ) );
+    \Shared\Helpers\Helpers::set_session( 'basket-transport-method-id', \Shared\Helpers\Helpers::get( 'transport_method_id' ) );
 
     echo json_encode( [
         'result'          => 'ok',
         'payment_methods' => \front\view\ShopPaymentMethod::basket_payment_methods(
-          \front\factory\ShopPaymentMethod::payment_methods_by_transport( \S::get( 'transport_method_id' ) ),
+          \front\factory\ShopPaymentMethod::payment_methods_by_transport( \Shared\Helpers\Helpers::get( 'transport_method_id' ) ),
-          \S::get( 'payment_method_id' )
+          \Shared\Helpers\Helpers::get( 'payment_method_id' )
         )
     ] );
     exit;
@@ -331,34 +331,34 @@ class ShopBasket
   {
     global $lang_id, $settings;
 
-    if ( \shop\Basket::check_product_quantity_in_stock( \S::get_session( 'basket' ) ) )
+    if ( \shop\Basket::check_product_quantity_in_stock( \Shared\Helpers\Helpers::get_session( 'basket' ) ) )
     {
       header( 'Location: /koszyk' );
       exit;
     }
 
-    $client = \S::get_session( 'client' );
+    $client = \Shared\Helpers\Helpers::get_session( 'client' );
 
     return \Tpl::view( 'shop-basket/summary-view', [
           'lang_id'        => $lang_id,
-          'client'         => \S::get_session( 'client' ),
+          'client'         => \Shared\Helpers\Helpers::get_session( 'client' ),
-          'basket'         => \S::get_session( 'basket' ),
+          'basket'         => \Shared\Helpers\Helpers::get_session( 'basket' ),
-          'transport'      => \front\factory\ShopTransport::transport( \S::get_session( 'basket-transport-method-id' ) ),
+          'transport'      => \front\factory\ShopTransport::transport( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) ),
-          'payment_method' => \front\factory\ShopPaymentMethod::payment_method( \S::get_session( 'basket-payment-method-id' ) ),
+          'payment_method' => \front\factory\ShopPaymentMethod::payment_method( \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ) ),
           'addresses'      => \front\factory\ShopClient::client_addresses( $client[ 'id' ] ),
           'settings'       => $settings,
-          'coupon'         => \S::get_session( 'coupon' ),
+          'coupon'         => \Shared\Helpers\Helpers::get_session( 'coupon' ),
-          'basket_message' => \S::get_session( 'basket_message' )
+          'basket_message' => \Shared\Helpers\Helpers::get_session( 'basket_message' )
       ] );
   }
 
   // zapisanie koszyka jako zamówienie
   static public function basket_save()
   {
-    $client = \S::get_session( 'client' );
+    $client = \Shared\Helpers\Helpers::get_session( 'client' );
-    $payment_method = \S::get_session( 'basket-payment-method-id' );
+    $payment_method = \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' );
 
-    if ( \shop\Basket::check_product_quantity_in_stock( \S::get_session( 'basket' ) ) )
+    if ( \shop\Basket::check_product_quantity_in_stock( \Shared\Helpers\Helpers::get_session( 'basket' ) ) )
     {
       header( 'Location: /koszyk' );
       exit;
@@ -366,42 +366,42 @@ class ShopBasket
 
     if ( $order_id = \front\factory\ShopOrder::basket_save(
         $client[ 'id' ],
-        \S::get_session( 'basket' ),
+        \Shared\Helpers\Helpers::get_session( 'basket' ),
-        \S::get_session( 'basket-transport-method-id' ),
+        \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ),
-        \S::get_session( 'basket-payment-method-id' ),
+        \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ),
-        \S::get( 'email', true ),
+        \Shared\Helpers\Helpers::get( 'email', true ),
-        \S::get( 'phone', true ),
+        \Shared\Helpers\Helpers::get( 'phone', true ),
-        \S::get( 'name', true ),
+        \Shared\Helpers\Helpers::get( 'name', true ),
-        \S::get( 'surname', true ),
+        \Shared\Helpers\Helpers::get( 'surname', true ),
-        \S::get( 'street' ),
+        \Shared\Helpers\Helpers::get( 'street' ),
-        \S::get( 'postal_code', true ),
+        \Shared\Helpers\Helpers::get( 'postal_code', true ),
-        \S::get( 'city', true ),
+        \Shared\Helpers\Helpers::get( 'city', true ),
-        \S::get( 'firm_name', true ),
+        \Shared\Helpers\Helpers::get( 'firm_name', true ),
-        \S::get( 'firm_street', true ),
+        \Shared\Helpers\Helpers::get( 'firm_street', true ),
-        \S::get( 'firm_postal_code', true ),
+        \Shared\Helpers\Helpers::get( 'firm_postal_code', true ),
-        \S::get( 'firm_city', true ),
+        \Shared\Helpers\Helpers::get( 'firm_city', true ),
-        \S::get( 'firm_nip', true ),
+        \Shared\Helpers\Helpers::get( 'firm_nip', true ),
-        \S::get_session( 'basket-inpost-info' ),
+        \Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ),
-        \S::get_session( 'basket_orlen_point_id' ),
+        \Shared\Helpers\Helpers::get_session( 'basket_orlen_point_id' ),
-        \S::get_session( 'basket_orlen_point_info' ),
+        \Shared\Helpers\Helpers::get_session( 'basket_orlen_point_info' ),
-        \S::get_session( 'coupon' ),
+        \Shared\Helpers\Helpers::get_session( 'coupon' ),
-        \S::get_session( 'basket_message' )
+        \Shared\Helpers\Helpers::get_session( 'basket_message' )
       ) )
     {
-      \S::alert( \S::lang( 'zamowienie-zostalo-zlozone-komunikat' ) );
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-zlozone-komunikat' ) );
-      \S::delete_session( 'basket' );
+      \Shared\Helpers\Helpers::delete_session( 'basket' );
-      \S::delete_session( 'basket-transport-method-id' );
+      \Shared\Helpers\Helpers::delete_session( 'basket-transport-method-id' );
-      \S::delete_session( 'basket-payment-method-id' );
+      \Shared\Helpers\Helpers::delete_session( 'basket-payment-method-id' );
-      \S::delete_session( 'basket-inpost-info' );
+      \Shared\Helpers\Helpers::delete_session( 'basket-inpost-info' );
-      \S::delete_session( 'basket_orlen_point_id' );
+      \Shared\Helpers\Helpers::delete_session( 'basket_orlen_point_id' );
-      \S::delete_session( 'basket_orlen_point_info' );
+      \Shared\Helpers\Helpers::delete_session( 'basket_orlen_point_info' );
-      \S::delete_session( 'coupon' );
+      \Shared\Helpers\Helpers::delete_session( 'coupon' );
-      \S::delete_session( 'basket_message' );
+      \Shared\Helpers\Helpers::delete_session( 'basket_message' );
 
-      \S::set_session( 'piksel_purchase', true );
+      \Shared\Helpers\Helpers::set_session( 'piksel_purchase', true );
-      \S::set_session( 'google-adwords-purchase', true );
+      \Shared\Helpers\Helpers::set_session( 'google-adwords-purchase', true );
-      \S::set_session( 'google-analytics-purchase', true );
+      \Shared\Helpers\Helpers::set_session( 'google-analytics-purchase', true );
-      \S::set_session( 'ekomi-purchase', true );
+      \Shared\Helpers\Helpers::set_session( 'ekomi-purchase', true );
 
       $redis = \Shared\Cache\RedisConnection::getInstance() -> getConnection();
       if ( $redis )
@@ -412,7 +412,7 @@ class ShopBasket
     }
     else
     {
-      \S::error( \S::lang( 'zamowienie-zostalo-zlozone-komunikat-blad' ) );
+      \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-zlozone-komunikat-blad' ) );
       header( 'Location: /koszyk' );
       exit;
     }
@@ -424,10 +424,10 @@ class ShopBasket
 
     $page[ 'language' ][ 'meta_title' ] = 'Koszyk';
 
-    $basket = \S::get_session( 'basket' );
+    $basket = \Shared\Helpers\Helpers::get_session( 'basket' );
-    $coupon = \S::get_session( 'coupon' );
+    $coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
-    $payment_method_id = \S::get_session( 'payment_method_id' );
+    $payment_method_id = \Shared\Helpers\Helpers::get_session( 'payment_method_id' );
-    $basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
+    $basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
 
     if ( \shop\Basket::check_product_quantity_in_stock( $basket ) )
     {
@@ -440,7 +440,7 @@ class ShopBasket
     return \Tpl::view( 'shop-basket/basket', [
           'basket'            => $basket,
           'coupon'            => $coupon,
-          'transport_id'      => \S::get_session( 'basket-transport-method-id' ),
+          'transport_id'      => \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ),
           'transport_methods' => \Tpl::view( 'shop-basket/basket-transport-methods', [
               'transports_methods' => \front\factory\ShopTransport::transport_methods( $basket, $coupon ),
               'transport_id'       => $basket_transport_method_id
@@ -450,7 +450,7 @@ class ShopBasket
               'basket'         => $basket,
               'lang_id'        => $lang_id,
               'coupon'         => $coupon,
-              'basket_message' => \S::get_session( 'basket_message' ),
+              'basket_message' => \Shared\Helpers\Helpers::get_session( 'basket_message' ),
               'settings' => $settings
           ] )
       ] );

autoload/front/controls/class.ShopClient.php

@@ -4,32 +4,32 @@ class ShopClient
 {
   public static function mark_address_as_current()
   {
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
       return false;
 
-    \front\factory\ShopClient::mark_address_as_current( $client['id'], \S::get( 'address_id' ) );
+    \front\factory\ShopClient::mark_address_as_current( $client['id'], \Shared\Helpers\Helpers::get( 'address_id' ) );
     exit;
   }
 
   public static function address_delete()
   {
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
     }
 
-    $address = \front\factory\ShopClient::address_details( \S::get( 'id' ) );
+    $address = \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) );
     if ( $address['client_id'] != $client['id'] )
     {
       header( 'Location: /panel-klienta/adresy' );
       exit;
     }
 
-    if ( \front\factory\ShopClient::address_delete( \S::get( 'id' ) ) )
+    if ( \front\factory\ShopClient::address_delete( \Shared\Helpers\Helpers::get( 'id' ) ) )
-      \S::alert( \S::lang( 'adres-usuniety-komunikat' ) );
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'adres-usuniety-komunikat' ) );
     else
-      \S::error( \S::lang( 'adres-usuniety-blad' ) );
+      \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'adres-usuniety-blad' ) );
     header( 'Location: /panel-klienta/adresy' );
     exit;
   }
@@ -38,38 +38,38 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-edycja-adresu' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-edycja-adresu' ) . ' | ' . $settings['firm_name'];
 
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
     }
 
-    $address = \front\factory\ShopClient::address_details( \S::get( 'id' ) );
+    $address = \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) );
     if ( $address['client_id'] != $client['id'] )
       unset( $address );
 
     return \front\view\ShopClient::address_edit( [
-              'address' => \front\factory\ShopClient::address_details( \S::get( 'id' ) )
+              'address' => \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) )
             ] );
   }
 
   public static function address_save()
   {
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
     }
 
-    if ( \front\factory\ShopClient::address_save( $client['id'], \S::get( 'address_id' ), \S::get( 'name', true ), \S::get( 'surname', true ), \S::get( 'street' ), \S::get( 'postal_code', true ), \S::get( 'city', true ), \S::get( 'phone', true ) ) )
+    if ( \front\factory\ShopClient::address_save( $client['id'], \Shared\Helpers\Helpers::get( 'address_id' ), \Shared\Helpers\Helpers::get( 'name', true ), \Shared\Helpers\Helpers::get( 'surname', true ), \Shared\Helpers\Helpers::get( 'street' ), \Shared\Helpers\Helpers::get( 'postal_code', true ), \Shared\Helpers\Helpers::get( 'city', true ), \Shared\Helpers\Helpers::get( 'phone', true ) ) )
     {
-      \S::get( 'address_id' ) ? \S::alert( \S::lang( 'zmiana-adresu-sukces' ) ) : \S::alert( \S::lang( 'dodawanie-nowego-adresu-sukces' ) );
+      \Shared\Helpers\Helpers::get( 'address_id' ) ? \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'zmiana-adresu-sukces' ) ) : \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'dodawanie-nowego-adresu-sukces' ) );
     }
     else
     {
-      \S::get( 'address_id' ) ? \S::error( \S::lang( 'zmiana-adresu-blad' ) ) : \S::error( \S::lang( 'dodawanie-nowego-adresu-blad' ) );
+      \Shared\Helpers\Helpers::get( 'address_id' ) ? \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'zmiana-adresu-blad' ) ) : \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'dodawanie-nowego-adresu-blad' ) );
     }
 
     header( 'Location: /panel-klienta/adresy' );
@@ -80,9 +80,9 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-lista-adresow' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-lista-adresow' ) . ' | ' . $settings['firm_name'];
 
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
@@ -98,9 +98,9 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-historia-zamowien' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-historia-zamowien' ) . ' | ' . $settings['firm_name'];
 
-    if ( !$client = \S::get_session( 'client' ) )
+    if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /logowanie' );
       exit;
@@ -115,8 +115,8 @@ class ShopClient
 
   public static function new_password()
   {
-    if ( \front\factory\ShopClient::new_password( \S::get( 'hash' ) ) )
+    if ( \front\factory\ShopClient::new_password( \Shared\Helpers\Helpers::get( 'hash' ) ) )
-      \S::alert( \S::lang( 'nowe-haslo-zostalo-wyslane-na-twoj-adres-email' ) );
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'nowe-haslo-zostalo-wyslane-na-twoj-adres-email' ) );
 
     header( 'Location: /logowanie' );
     exit;
@@ -124,10 +124,10 @@ class ShopClient
 
   public static function send_email_password_recovery()
   {
-    if ( \front\factory\ShopClient::send_email_password_recovery( \S::get( 'email' ) ) )
+    if ( \front\factory\ShopClient::send_email_password_recovery( \Shared\Helpers\Helpers::get( 'email' ) ) )
-      \S::alert( \S::lang( 'odzyskiwanie-hasla-link-komunikat' ) );
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'odzyskiwanie-hasla-link-komunikat' ) );
     else
-      \S::alert( \S::lang( 'odzyskiwanie-hasla-blad' ) );
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'odzyskiwanie-hasla-blad' ) );
     header( 'Location: /logowanie' );
     exit;
   }
@@ -136,26 +136,26 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-odzyskiwanie-hasla' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-odzyskiwanie-hasla' ) . ' | ' . $settings['firm_name'];
 
     return \front\view\ShopClient::recover_password();
   }
 
   public static function logout()
   {
-    \S::delete_session( 'client' );
+    \Shared\Helpers\Helpers::delete_session( 'client' );
     header( 'Location: /' );
     exit;
   }
 
   public static function login()
   {
-    if ( !\front\factory\ShopClient::login( \S::get( 'email' ), \S::get( 'password' ) ) )
+    if ( !\front\factory\ShopClient::login( \Shared\Helpers\Helpers::get( 'email' ), \Shared\Helpers\Helpers::get( 'password' ) ) )
       header( 'Location: /logowanie' );
     else
     {
-      $client = \S::get_session( 'client' );
+      $client = \Shared\Helpers\Helpers::get_session( 'client' );
-      if ( $redirect = \S::get( 'redirect' ) )
+      if ( $redirect = \Shared\Helpers\Helpers::get( 'redirect' ) )
         header( 'Location: ' . $redirect );
       else
         header( 'Location: /panel-klienta' );
@@ -165,8 +165,8 @@ class ShopClient
 
   public static function confirm()
   {
-    if ( \front\factory\ShopClient::register_confirm( \S::get( 'hash' ) ) )
+    if ( \front\factory\ShopClient::register_confirm( \Shared\Helpers\Helpers::get( 'hash' ) ) )
-      \S::alert( \S::lang( 'rejestracja-potwierdzenie' ) );
+      \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'rejestracja-potwierdzenie' ) );
 
     header( 'Location: /logowanie' );
     exit;
@@ -174,7 +174,7 @@ class ShopClient
 
   public static function signup()
   {
-    $result = \front\factory\ShopClient::signup( \S::get( 'email' ), \S::get( 'password' ), \S::get( 'agremment_marketing' ) );
+    $result = \front\factory\ShopClient::signup( \Shared\Helpers\Helpers::get( 'email' ), \Shared\Helpers\Helpers::get( 'password' ), \Shared\Helpers\Helpers::get( 'agremment_marketing' ) );
     echo json_encode( $result );
     exit;
   }
@@ -183,10 +183,10 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-logowanie' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-logowanie' ) . ' | ' . $settings['firm_name'];
     $page['class'] = 'page-login-form';
 
-    if ( $client = \S::get_session( 'client' ) )
+    if ( $client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /panel-klienta/zamowienia' );
       exit;
@@ -199,9 +199,9 @@ class ShopClient
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-rejestracja' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-rejestracja' ) . ' | ' . $settings['firm_name'];
 
-    if ( $client = \S::get_session( 'client' ) )
+    if ( $client = \Shared\Helpers\Helpers::get_session( 'client' ) )
     {
       header( 'Location: /panel-klienta/zamowienia' );
       exit;

autoload/front/controls/class.ShopCoupon.php

@@ -4,7 +4,7 @@ class ShopCoupon
 {
   public static function delete_coupon()
   {
-    \S::delete_session( 'coupon' );
+    \Shared\Helpers\Helpers::delete_session( 'coupon' );
     header( 'Location: /koszyk' );
     exit;
   }
@@ -12,12 +12,12 @@ class ShopCoupon
   public static function use_coupon()
   {
     $coupon = new \shop\Coupon( 0 );
-    $coupon -> load_from_db_by_name( (string)\S::get( 'coupon' ) );
+    $coupon -> load_from_db_by_name( (string)\Shared\Helpers\Helpers::get( 'coupon' ) );
 
     if ( $coupon -> is_available() )
-      \S::set_session( 'coupon', $coupon );
+      \Shared\Helpers\Helpers::set_session( 'coupon', $coupon );
     else
-      \S::alert( 'Podany kod rabatowy jest nieprawidłowy.' );
+      \Shared\Helpers\Helpers::alert( 'Podany kod rabatowy jest nieprawidłowy.' );
 
     header( 'Location: /koszyk' );
     exit;

autoload/front/controls/class.ShopOrder.php

@@ -6,7 +6,7 @@ class ShopOrder
   {
     global $settings;
 
-    $order = \front\factory\ShopOrder::order_details( null, \S::get( 'order_hash' ) );
+    $order = \front\factory\ShopOrder::order_details( null, \Shared\Helpers\Helpers::get( 'order_hash' ) );
 
     return \Tpl::view( 'shop-order/payment-confirmation', [
               'order' => $order,
@@ -20,9 +20,9 @@ class ShopOrder
 
     file_put_contents( 'tpay.txt', print_r( $_POST, true ) . print_r( $_GET, true ), FILE_APPEND );
 
-    if ( \S::get( 'tr_status' ) == 'TRUE' and \S::get( 'tr_crc' ) )
+    if ( \Shared\Helpers\Helpers::get( 'tr_status' ) == 'TRUE' and \Shared\Helpers\Helpers::get( 'tr_crc' ) )
     {
-      $order = new \shop\Order( 0, \S::get( 'tr_crc' ) );
+      $order = new \shop\Order( 0, \Shared\Helpers\Helpers::get( 'tr_crc' ) );
 
       if ( $order -> id )
       {
@@ -42,13 +42,13 @@ class ShopOrder
     global $mdb, $settings;
 
     $post = [
-      'p24_merchant_id' => \S::get( 'p24_merchant_id' ),
+      'p24_merchant_id' => \Shared\Helpers\Helpers::get( 'p24_merchant_id' ),
-      'p24_pos_id' => \S::get( 'p24_pos_id' ),
+      'p24_pos_id' => \Shared\Helpers\Helpers::get( 'p24_pos_id' ),
-      'p24_session_id' => \S::get( 'p24_session_id' ),
+      'p24_session_id' => \Shared\Helpers\Helpers::get( 'p24_session_id' ),
-      'p24_amount' => \S::get( 'p24_amount' ),
+      'p24_amount' => \Shared\Helpers\Helpers::get( 'p24_amount' ),
-      'p24_currency' => \S::get( 'p24_currency' ),
+      'p24_currency' => \Shared\Helpers\Helpers::get( 'p24_currency' ),
-      'p24_order_id' => \S::get( 'p24_order_id' ),
+      'p24_order_id' => \Shared\Helpers\Helpers::get( 'p24_order_id' ),
-      'p24_sign' => md5( \S::get( 'p24_session_id' ) . '|' . \S::get( 'p24_order_id' ) . '|' . \S::get( 'p24_amount' ) . '|' . \S::get( 'p24_currency' ) . '|' . $settings['przelewy24_crc_key'] )
+      'p24_sign' => md5( \Shared\Helpers\Helpers::get( 'p24_session_id' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_order_id' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_amount' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_currency' ) . '|' . $settings['przelewy24_crc_key'] )
     ];
 
     $ch = curl_init();
@@ -60,9 +60,9 @@ class ShopOrder
     curl_setopt( $ch, CURLOPT_POSTFIELDS, http_build_query( $post ) );
     $response = curl_exec( $ch );
 
-    $order = new \shop\Order( 0, '', \S::get( 'p24_session_id' ) );
+    $order = new \shop\Order( 0, '', \Shared\Helpers\Helpers::get( 'p24_session_id' ) );
 
-    if ( $order['status'] == 0 and $order['summary'] * 100 == \S::get( 'p24_amount' ) )
+    if ( $order['status'] == 0 and $order['summary'] * 100 == \Shared\Helpers\Helpers::get( 'p24_amount' ) )
     {
       if ( $order['id'] )
       {
@@ -71,7 +71,6 @@ class ShopOrder
 
         $order -> status = 4;
         $order -> send_status_change_email();
-        \Log::save_log( 'Zamówienie opłacone przez przelewy24 | ID: ' . $order['id'] );
       }
     }
 
@@ -91,7 +90,7 @@ class ShopOrder
         if ( is_array( $order['products'] ) and count( $order['products'] ) ):
           foreach ( $order['products'] as $product ):
             $product_tmp = \front\factory\ShopProduct::product_details( $product['product_id'], $lang['id'] );
-            $summary_tmp += \S::normalize_decimal( $product['price_netto'] + $product['price_netto'] * $product['vat'] / 100 ) * $product['quantity'];
+            $summary_tmp += \Shared\Helpers\Helpers::normalize_decimal( $product['price_netto'] + $product['price_netto'] * $product['vat'] / 100 ) * $product['quantity'];
           endforeach;
           $summary_tmp += $order['transport_cost'];
         endif;
@@ -105,9 +104,8 @@ class ShopOrder
 
             $order -> status = 4;
             $order -> send_status_change_email();
-            \Log::save_log( 'Zamówienie opłacone przez hotpay | ID: ' . $order['id'] );
 
-            echo \S::lang( 'zamowienie-zostalo-oplacone' );
+            echo \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-oplacone' );
           }
           else if ( $_POST["STATUS"] == "FAILURE" )
           {
@@ -116,9 +114,8 @@ class ShopOrder
 
             $order -> status = 2;
             $order -> send_status_change_email();
-            \Log::save_log( 'Płatność odrzucona hotpay | ID: ' . $order['id'] );
 
-            echo \S::lang( 'platnosc-zostala-odrzucona' );
+            echo \Shared\Helpers\Helpers::lang( 'platnosc-zostala-odrzucona' );
           }
         }
         else
@@ -128,9 +125,8 @@ class ShopOrder
 
           $order -> status = 3;
           $order -> send_status_change_email();
-          \Log::save_log( 'Płatność sprawdzana ręcznie hotpay | ID: ' . $order['id'] );
 
-          echo \S::lang( 'zamowienie-zostalo-oplacone-reczne' );
+          echo \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-oplacone-reczne' );
         }
       }
     }
@@ -141,16 +137,16 @@ class ShopOrder
   {
     global $page, $settings;
 
-    $page['language']['meta_title'] = \S::lang( 'meta-title-szczegoly-zamowienia' ) . ' | ' . $settings['firm_name'];
+    $page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-szczegoly-zamowienia' ) . ' | ' . $settings['firm_name'];
     $order = \front\factory\ShopOrder::order_details(
-      \front\factory\ShopOrder::order_id( \S::get( 'order_hash' ) )
+      \front\factory\ShopOrder::order_id( \Shared\Helpers\Helpers::get( 'order_hash' ) )
     );
     $coupon = (int)$order['coupon_id'] ? new \shop\Coupon( (int)$order['coupon_id'] ) : null;
 
     return \Tpl::view( 'shop-order/order-details', [
       'order' => $order,
       'coupon' => $coupon,
-      'client' => \S::get_session( 'client' ),
+      'client' => \Shared\Helpers\Helpers::get_session( 'client' ),
       'settings' => $settings
     ] );
   }

autoload/front/controls/class.ShopProducer.php

@@ -6,20 +6,20 @@ class ShopProducer
   {
     global $page, $lang_id;
 
-    $producer = new \shop\Producer( \S::get( 'producer_id' ) );
+    $producer = new \shop\Producer( \Shared\Helpers\Helpers::get( 'producer_id' ) );
 
     $page['show_title'] = true;
     $page['language']['title'] = $producer['name'];
 
-    $results = \shop\Producer::producer_products( $producer['id'], $lang_id, (int) \S::get( 'bs' ) );
+    $results = \shop\Producer::producer_products( $producer['id'], $lang_id, (int) \Shared\Helpers\Helpers::get( 'bs' ) );
 
     if ( $results['ls'] > 1 )
     {
       $pager = \Tpl::view( 'site/pager', [
         'ls' => $results['ls'],
-        'bs' => (int) \S::get( 'bs' ) ? (int) \S::get( 'bs' ) : 1,
+        'bs' => (int) \Shared\Helpers\Helpers::get( 'bs' ) ? (int) \Shared\Helpers\Helpers::get( 'bs' ) : 1,
         'page' => $page,
-        'link' => 'producent/' . \S::seo( $producer['name'] )
+        'link' => 'producent/' . \Shared\Helpers\Helpers::seo( $producer['name'] )
       ] );
     }
 
@@ -38,7 +38,7 @@ class ShopProducer
     $page['language']['title'] = 'Producenci';
 
     $rows = $mdb -> select( 'pp_shop_producer', 'id', [ 'status' => 1, 'ORDER' => [ 'name' => 'ASC' ] ] );
-    if ( \S::is_array_fix( $rows ) ) foreach ( $rows as $row )
+    if ( \Shared\Helpers\Helpers::is_array_fix( $rows ) ) foreach ( $rows as $row )
       $producers[] = new \shop\Producer( $row );
 
     return \Tpl::view( 'shop-producer/list', [

autoload/front/controls/class.ShopProduct.php

@@ -9,7 +9,7 @@ class ShopProduct
     global $lang_id;
 
     $output = '';
-    $products_ids = \front\factory\ShopCategory::products_id( \S::get( 'category_id' ), \front\factory\ShopCategory::get_category_sort( (int)\S::get( 'category_id' ) ), $lang_id, 8, \S::get( 'offset' ) );
+    $products_ids = \front\factory\ShopCategory::products_id( \Shared\Helpers\Helpers::get( 'category_id' ), \front\factory\ShopCategory::get_category_sort( (int)\Shared\Helpers\Helpers::get( 'category_id' ) ), $lang_id, 8, \Shared\Helpers\Helpers::get( 'offset' ) );
 
     if ( is_array( $products_ids ) ): foreach ( $products_ids as $product_id ):
       $output .= \Tpl::view('shop-product/product-mini', [
@@ -26,7 +26,7 @@ class ShopProduct
   {
     global $lang_id;
 
-    $values = json_decode( \S::get( 'values' ), true );
+    $values = json_decode( \Shared\Helpers\Helpers::get( 'values' ), true );
 
     foreach( $values as $key => $val )
     {
@@ -46,14 +46,14 @@ class ShopProduct
 
     $combination = '';
 
-    $selected_values = \S::get( 'selected_values' );
+    $selected_values = \Shared\Helpers\Helpers::get( 'selected_values' );
     foreach ( $selected_values as $value ) {
       $combination .= $value;
       if ( $value != end( $selected_values ) )
         $combination .= '|';
     }
 
-    $product_id = \S::get( 'product_id' );
+    $product_id = \Shared\Helpers\Helpers::get( 'product_id' );
     $product = Product::getFromCache( $product_id, $lang_id );
     $product_data = $product -> getProductDataBySelectedAttributes( $combination );
 

autoload/front/controls/class.Site.php

@@ -7,11 +7,11 @@ class Site
   {
     $class = '\front\controls\\';
 
-    $results = explode( '_', \S::get( 'module' ) );
+    $results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
     if ( is_array( $results ) ) foreach ( $results as $row )
       $class .= ucfirst( $row );
 
-    $property = \S::get( 'action' );
+    $property = \Shared\Helpers\Helpers::get( 'action' );
     if ( class_exists( $class ) and property_exists( new $class, 'page_title' ) )
       return $class::$title[$property];
   }
@@ -22,11 +22,11 @@ class Site
 
     $class = '\front\controls\\';
 
-    $results = explode( '_', \S::get( 'module' ) );
+    $results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
     if ( is_array( $results ) ) foreach ( $results as $row )
       $class .= ucfirst( $row );
 
-    $property = \S::get( 'action' );
+    $property = \Shared\Helpers\Helpers::get( 'action' );
     if ( class_exists( $class ) and property_exists( new $class, 'title' ) )
       return $class::$title[$property] . ' | ' . $settings['firm_name'];
   }
@@ -37,8 +37,8 @@ class Site
 
     $articleRepo = new \Domain\Article\ArticleRepository( $GLOBALS['mdb'] );
 
-    if ( \S::get( 'article' ) )
+    if ( \Shared\Helpers\Helpers::get( 'article' ) )
-      return \front\Views\Articles::fullArticle( $articleRepo->articleDetailsFrontend( (int)\S::get( 'article' ), $lang_id ) );
+      return \front\Views\Articles::fullArticle( $articleRepo->articleDetailsFrontend( (int)\Shared\Helpers\Helpers::get( 'article' ), $lang_id ) );
 
     // wyświetlenie pojedynczego produktu
     if ( $product )
@@ -53,11 +53,11 @@ class Site
     }
 
     if ( $category )
-      return \front\view\ShopCategory::category_view( $category, $lang_id, \S::get( 'bs' ) );
+      return \front\view\ShopCategory::category_view( $category, $lang_id, \Shared\Helpers\Helpers::get( 'bs' ) );
 
     // nowe kontrolery z DI
-    $module = \S::get( 'module' );
+    $module = \Shared\Helpers\Helpers::get( 'module' );
-    $action = \S::get( 'action' );
+    $action = \Shared\Helpers\Helpers::get( 'action' );
     $controllerFactories = self::getControllerFactories();
 
     $moduleName = implode( '', array_map( 'ucfirst', explode( '_', $module ) ) );
@@ -77,18 +77,18 @@ class Site
     // klasy sklepowe
     $class = '\shop\\';
 
-    $results = explode( '_', \S::get( 'module' ) );
+    $results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
     if ( is_array( $results ) ) foreach ( $results as $row )
       $class .= ucfirst( $row );
 
-    $action = \S::get( 'action' );
+    $action = \Shared\Helpers\Helpers::get( 'action' );
 
     if ( class_exists( $class ) and method_exists( new $class, $action ) )
       return call_user_func_array( array( $class, $action ), array() );
 
     if ( $page['id'] )
     {
-      $bs = (int)\S::get( 'bs' );
+      $bs = (int)\Shared\Helpers\Helpers::get( 'bs' );
       $pageArticlesResult = $articleRepo->pageArticles( $page, $lang_id, $bs ?: 1 );
       $articlesForPage = [];
       if ( is_array( $pageArticlesResult['articles'] ) ) {
@@ -128,24 +128,24 @@ class Site
   {
     global $lang, $config;
 
-    $a = \S::get( 'a' );
+    $a = \Shared\Helpers\Helpers::get( 'a' );
 
     switch ( $a )
     {
       case 'page':
-        $page = \front\factory\Pages::page_details( \S::get( 'id' ) );
+        $page = \front\factory\Pages::page_details( \Shared\Helpers\Helpers::get( 'id' ) );
-        \S::set_session( 'page', $page );
+        \Shared\Helpers\Helpers::set_session( 'page', $page );
       break;
 
       case 'change_language':
-        \S::set_session( 'current-lang', \S::get( 'id' ) );
+        \Shared\Helpers\Helpers::set_session( 'current-lang', \Shared\Helpers\Helpers::get( 'id' ) );
         header( 'Location: /' );
         exit;
       break;
     }
 
-    if ( \S::get( 'lang' ) )
+    if ( \Shared\Helpers\Helpers::get( 'lang' ) )
-      \S::set_session( 'current-lang', \S::get( 'lang' ) );
+      \Shared\Helpers\Helpers::set_session( 'current-lang', \Shared\Helpers\Helpers::get( 'lang' ) );
 
     if ( file_exists( 'modules/actions.php' ) )
       include 'modules/actions.php';

autoload/front/factory/class.Pages.php

@@ -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;

autoload/front/factory/class.ShopBasket.php

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

autoload/front/factory/class.ShopCategory.php

@@ -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 != '#' )
+    if ( \Shared\Helpers\Helpers::get_session( 'current-lang' ) != ( new \Domain\Languages\LanguagesRepository( $GLOBALS['mdb'] ) )->defaultLanguage() and $url != '#' )
-      $url = '/' . \S::get_session( 'current-lang' ) . $url;
+      $url = '/' . \Shared\Helpers\Helpers::get_session( 'current-lang' ) . $url;
 
     return $url;
   }

autoload/front/factory/class.ShopClient.php

@@ -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 );
+        \Shared\Helpers\Helpers::set_session( 'client', $client );
-        \S::alert( \S::lang( 'logowanie-udane' ) );
+        \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'logowanie-udane' ) );
         return true;
       }
     }

autoload/front/factory/class.ShopOrder.php

@@ -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 );
+    \Shared\Helpers\Helpers::send_email( $email, \Shared\Helpers\Helpers::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( $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 )

autoload/front/factory/class.ShopProduct.php

@@ -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 );
     }

autoload/front/factory/class.ShopTransport.php

@@ -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) {

autoload/front/view/class.ShopCategory.php

@@ -23,7 +23,7 @@ class ShopCategory
         $tpl -> ls    = $results['ls'];
         $tpl -> bs    = $bs ? $bs : 1;
         $tpl -> page  = $page;
-        $tpl -> link  = $category['language']['seo_link'] ? $url = $category['language']['seo_link'] : $url = 'k-' . $category['id'] . '-' . \S::seo( $category['language']['title'] );
+        $tpl -> link  = $category['language']['seo_link'] ? $url = $category['language']['seo_link'] : $url = 'k-' . $category['id'] . '-' . \Shared\Helpers\Helpers::seo( $category['language']['title'] );
         $pager = $tpl -> render( 'site/pager' );
       }
 

autoload/front/view/class.Site.php

@@ -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' ) )
+    if ( (int) \Shared\Helpers\Helpers::get( 'layout_id' ) )
-      $layout = new \cms\Layout( (int) \S::get( 'layout_id' ) );
+      $layout = new \cms\Layout( (int) \Shared\Helpers\Helpers::get( 'layout_id' ) );
 
-    if ( \S::get( 'article' ) )
+    if ( \Shared\Helpers\Helpers::get( 'article' ) )
-      $layout = \front\factory\Layouts::article_layout( \S::get( 'article' ) );
+      $layout = \front\factory\Layouts::article_layout( \Shared\Helpers\Helpers::get( 'article' ) );
 
-    if ( \S::get( 'product' ) )
+    if ( \Shared\Helpers\Helpers::get( 'product' ) )
-      $layout = \front\factory\Layouts::product_layout( \S::get( 'product' ) );
+      $layout = \front\factory\Layouts::product_layout( \Shared\Helpers\Helpers::get( 'product' ) );
 
-    if ( \S::get( 'category' ) )
+    if ( \Shared\Helpers\Helpers::get( 'category' ) )
-      $layout = \front\factory\Layouts::category_layout( \S::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['html'];
-        $html = $layout['m_html'];
-      else
-        $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['css'],                   $html );
-      $html = str_replace( '[CSS]',           $layout['m_css'],                 $html );
-    else
-      $html = str_replace( '[CSS]',           $layout['css'],                   $html );
 
-    if ( \S::is_mobile() and !empty( $layout['m_html'] ) )
+    $html = str_replace( '[JAVA_SCRIPT]',   $layout['js'],                    $html );
-      $html = str_replace( '[JAVA_SCRIPT]',   $layout['m_js'],                  $html );
-    else
-      $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;