ver. 0.283: Legacy class cleanup — S, Html, Email, Image, Log, Mobile_Detect → Shared namespace
- Migrate class.S → Shared\Helpers\Helpers (140+ files), remove 12 unused methods - Migrate class.Html → Shared\Html\Html - Migrate class.Email → Shared\Email\Email - Migrate class.Image → Shared\Image\ImageManipulator - Delete class.Log (unused), class.Mobile_Detect (outdated UA detection) - Remove grid library loading from admin (index.php, ajax.php) - Replace gridEdit usage in 10 admin templates with grid-edit-replacement.php - Fix grid-edit-replacement.php AJAX to send values as JSON (grid.js compat) - Remove mobile layout conditionals (m_html/m_css/m_js) from Site + LayoutsRepository - Remove \Log::save_log() calls from OrderAdminService, ShopOrder, Order Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -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 );
|
||||
\S::delete_session( 'twofa_pending' );
|
||||
\Shared\Helpers\Helpers::set_session( 'user', $user );
|
||||
\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' );
|
||||
$pass = \S::get( 'password' );
|
||||
$login = \Shared\Helpers\Helpers::get( 'login' );
|
||||
$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.' );
|
||||
\S::delete_session( 'twofa_pending' );
|
||||
\Shared\Helpers\Helpers::alert( 'Nie udało się wysłać kodu 2FA. Spróbuj ponownie.' );
|
||||
\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' ) )
|
||||
\S::set_session( 'p', \S::get( 'p' ) );
|
||||
if ( \Shared\Helpers\Helpers::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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user