Rename Auth to AuthOSM for Laravel compatibility

Author: Dasc3er

ajax.php

@@ -88,7 +88,7 @@
             $posizione .= ', '.get('id_record');
         }
 
-        $user = Auth::user();
+        $user = auth_osm()->getUser();
         $interval = setting('Timeout notifica di presenza (minuti)') * 60;
 
         $dbo->query('UPDATE zz_semaphores SET updated = NOW() WHERE id_utente = :user_id AND posizione = :position', [

api/index.php

@@ -118,4 +118,4 @@ function serverError()
 // Stampa dei risultati
 echo $response;
 
-Auth::logout();
+AuthOSM::logout();

core.php

@@ -172,23 +172,23 @@
 
 /* ACCESSO E INSTALLAZIONE */
 // Controllo sulla presenza dei permessi di accesso basilari
-$continue = $dbo->isInstalled() && !Update::isUpdateAvailable() && (Auth::check() || API\Response::isAPIRequest()) && (empty($config['maintenance_ip']) || $config['maintenance_ip'] == $_SERVER['REMOTE_ADDR']);
+$continue = $dbo->isInstalled() && !Update::isUpdateAvailable() && (AuthOSM::check() || API\Response::isAPIRequest()) && (empty($config['maintenance_ip']) || $config['maintenance_ip'] == $_SERVER['REMOTE_ADDR']);
 
 if (!empty($skip_permissions)) {
     Permissions::skip();
 }
 
 if (!$continue && getURLPath() != slashes(base_path_osm().'/index.php') && !Permissions::getSkip()) {
-    if (Auth::check()) {
-        Auth::logout();
+    if (AuthOSM::check()) {
+        AuthOSM::logout();
     }
 
     // Memorizza l'URL corrente per il redirect post-login
-    if (!Auth::check() && !API\Response::isAPIRequest()) {
+    if (!AuthOSM::check() && !API\Response::isAPIRequest()) {
         $current_url = $_SERVER['REQUEST_URI'] ?? '';
         // Evita di memorizzare URL di logout o login per prevenire loop
         if (!empty($current_url) && strpos($current_url, 'op=logout') === false && strpos($current_url, 'op=login') === false) {
-            Auth::setIntended($current_url);
+            AuthOSM::setIntended($current_url);
         }
     }
 
@@ -261,7 +261,7 @@
         $id_module = $module ? $module->id : null;
         $id_plugin = $plugin ? $plugin->id : null;
 
-        $user = Auth::user();
+        $user = auth_osm()->getUser();
 
         if (!empty($id_module)) {
             // Segmenti

editor.php

@@ -89,9 +89,9 @@
 
     $advanced_sessions = setting('Attiva notifica di presenza utenti sul record');
     if (!empty($advanced_sessions)) {
-        $dbo->query('DELETE FROM zz_semaphores WHERE id_utente='.prepare(Auth::user()['id']).' AND posizione='.prepare($id_module.', '.$id_record));
+        $dbo->query('DELETE FROM zz_semaphores WHERE id_utente='.prepare(auth_osm()->getUser()['id']).' AND posizione='.prepare($id_module.', '.$id_record));
 
-        $dbo->query('INSERT INTO zz_semaphores (id_utente, posizione, updated) VALUES ('.prepare(Auth::user()['id']).', '.prepare($id_module.', '.$id_record).', NOW())');
+        $dbo->query('INSERT INTO zz_semaphores (id_utente, posizione, updated) VALUES ('.prepare(auth_osm()->getUser()['id']).', '.prepare($id_module.', '.$id_record).', NOW())');
 
         echo '
 		<div class="card card-warning card-solid text-center info-active hide">
@@ -370,7 +370,7 @@
     }
 
     // Informazioni sulle operazioni
-    if (Auth::admin()) {
+    if (AuthOSM::admin()) {
         echo '
             <div id="tab_info" class="tab-pane">';
 

include/bottom.php

@@ -20,7 +20,7 @@
 
 include_once __DIR__.'/../core.php';
 
-if (Auth::check()) {
+if (AuthOSM::check()) {
     echo '
                 </section><!-- /.content -->
             </div><!-- /.content-wrapper -->
@@ -39,7 +39,7 @@
 echo '
         </div><!-- ./wrapper -->';
 
-if (Auth::check()) {
+if (AuthOSM::check()) {
     if (!empty($_SESSION['keep_alive'])) {
         echo '
 		<script> setInterval("session_keep_alive()", 5*60*1000); </script>';

include/init/init.php

@@ -97,7 +97,7 @@
         // Creazione utente Amministratore
         $dbo->insert('zz_users', [
             'username' => post('admin_username'),
-            'password' => Auth::hashPassword(post('admin_password')),
+            'password' => AuthOSM::hashPassword(post('admin_password')),
             'email' => post('admin_email'),
             'idgruppo' => $admin['id'],
             'idanagrafica' => $id_record ?? 0,

include/top.php

@@ -25,7 +25,7 @@
 include_once __DIR__.'/../core.php';
 
 $paths = App::getPaths();
-$user = Auth::user();
+$user = auth_osm()->getUser();
 
 if (empty($pageTitle)) {
     if ($structure instanceof Module) {
@@ -76,7 +76,7 @@
         <link rel="stylesheet" type="text/css" media="print" href="'.$style.'"/>';
 }
 
-if (Auth::check()) {
+if (AuthOSM::check()) {
     if ($id_record) {
         $position = 'tab';
     } else {
@@ -88,7 +88,7 @@
     // Determina se mostrare la barra dei plugin
     // Include il tab Info per gli admin quando siamo in editor.php
     $in_editor = string_contains($_SERVER['SCRIPT_FILENAME'], 'editor.php');
-    $has_info_tab = $in_editor && Auth::admin();
+    $has_info_tab = $in_editor && AuthOSM::admin();
     $show_plugin_bar = $has_plugins > 0 || $has_info_tab;
 
     echo '
@@ -344,7 +344,7 @@
             });
         </script>';
 
-if (Auth::check()) {
+if (AuthOSM::check()) {
     if (setting('Abilita esportazione Excel e PDF')) {
         echo '
         <script type="text/javascript" charset="utf-8" src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
@@ -397,16 +397,16 @@
 }
 
 $settings_collapse = session_get('settings.sidebar-collapse') ? 1 : 0;
-$hide_sidebar = Auth::check() && (setting('Nascondere la barra sinistra di default') || $settings_collapse);
+$hide_sidebar = AuthOSM::check() && (setting('Nascondere la barra sinistra di default') || $settings_collapse);
 echo '
     </head>
 
-	<body class="sidebar-mini layout-fixed '.(!empty($hide_sidebar) ? ' sidebar-collapse' : '').(!Auth::check() ? ' hold-transition login-page' : '').'">
-		<div class="'.(!Auth::check() ? '' : 'wrapper').'">';
+	<body class="sidebar-mini layout-fixed '.(!empty($hide_sidebar) ? ' sidebar-collapse' : '').(!AuthOSM::check() ? ' hold-transition login-page' : '').'">
+		<div class="'.(!AuthOSM::check() ? '' : 'wrapper').'">';
 
 $isInstallation = (!$dbo->isInstalled() || !$dbo->isConnected() || Update::isUpdateAvailable());
 
-if (Auth::check()) {
+if (AuthOSM::check()) {
     $calendar_color_label = ($_SESSION['period_start'] != date('Y').'-01-01' || $_SESSION['period_end'] != date('Y').'-12-31') ? 'danger' : 'secondary';
 
     echo '
@@ -630,7 +630,7 @@
             }
 
             // Tab per le informazioni sulle operazioni
-            if (Auth::admin()) {
+            if (AuthOSM::admin()) {
                 echo '
                             <li data-toggle="control-sidebar" class="btn-default nav-item plugin-tab-item">
                                 <a class="bg-info nav-link plugin-tab-link" data-toggle="tab" href="#tab_info" id="link-tab_info">
@@ -746,9 +746,9 @@ function checkActiveTab() {
 }
 
 // Errori - non mostrare nella pagina di login
-if (!empty($messages['error']) && (Auth::check() || $pageTitle != tr('Login'))) {
+if (!empty($messages['error']) && (AuthOSM::check() || $pageTitle != tr('Login'))) {
     // Verifica se l'utente è un amministratore
-    $is_admin = Auth::check() && Auth::admin();
+    $is_admin = AuthOSM::check() && AuthOSM::admin();
 
     foreach ($messages['error'] as $value) {
         // Rimuovi il codice errore dal messaggio
@@ -799,7 +799,7 @@ function checkActiveTab() {
 }
 
 // Chiusura della card informazioni - non mostrare nella pagina di login quando ci sono solo errori
-if (!Auth::check()
+if (!AuthOSM::check()
     && (!empty($messages['info']) || !empty($messages['warning'])
      || (!empty($messages['error']) && $pageTitle != tr('Login')))) {
     echo '

index.php

@@ -62,7 +62,7 @@
         } else {
             $status = auth_osm()->getCurrentStatus();
 
-            flash()->error(Auth::getStatus()[$status]['message']);
+            flash()->error(AuthOSM::getStatus()[$status]['message']);
 
             redirect_url(base_path_osm().'/index.php');
             exit;
@@ -71,15 +71,15 @@
         break;
 
     case 'logout':
-        Auth::logout();
+        AuthOSM::logout();
         // Pulisce anche l'intended URL al logout
-        Auth::clearIntended();
+        AuthOSM::clearIntended();
 
         redirect_url(base_path_osm().'/index.php');
         exit;
 }
 
-if (Auth::check() && isset($dbo) && $dbo->isConnected() && $dbo->isInstalled()) {
+if (AuthOSM::check() && isset($dbo) && $dbo->isConnected() && $dbo->isInstalled()) {
     // Priorità 1: Token access (sistema esistente)
     if (Permissions::isTokenAccess()) {
         if (!empty($_SESSION['token_access']['id_module_target']) && !empty($_SESSION['token_access']['id_record_target'])) {
@@ -89,23 +89,23 @@
     }
 
     // Priorità 2: Intended URL (nuovo sistema di redirect post-login)
-    if (Auth::hasIntended()) {
-        $intended_url = Auth::getIntended();
+    if (AuthOSM::hasIntended()) {
+        $intended_url = AuthOSM::getIntended();
 
         // Verifica i permessi per l'URL intended
-        if (Auth::canAccessIntended()) {
-            Auth::clearIntended();
+        if (AuthOSM::canAccessIntended()) {
+            AuthOSM::clearIntended();
             redirect_url($intended_url);
             exit;
         } else {
             // L'utente non ha i permessi per accedere alla pagina richiesta
-            Auth::clearIntended();
+            AuthOSM::clearIntended();
             flash()->warning(tr('Non hai i permessi necessari per accedere alla pagina richiesta.'));
         }
     }
 
     // Priorità 3: Primo modulo (sistema esistente come fallback)
-    $module = Auth::firstModule();
+    $module = AuthOSM::firstModule();
 
     if (!empty($module)) {
         redirect_url(base_path_osm().'/controller.php?id_module='.$module);
@@ -150,7 +150,7 @@
 }
 
 // Controllo se è una beta e in caso mostro un warning
-if (Auth::isBrute()) {
+if (AuthOSM::isBrute()) {
     echo '
     <div class="card card-danger shadow-lg col-md-6 offset-md-3 mt-5" id="brute">
         <div class="card-header text-center">
@@ -160,7 +160,7 @@
             <p class="lead">'.tr('Sono stati effettuati troppi tentativi di accesso consecutivi!').'</p>
             <div class="alert alert-warning">
                 <p>'.tr('Tempo rimanente').':</p>
-                <h3><span id="brute-timeout" class="badge badge-danger">'.(Auth::getBruteTimeout() + 1).'</span> '.tr('secondi').'</h3>
+                <h3><span id="brute-timeout" class="badge badge-danger">'.(AuthOSM::getBruteTimeout() + 1).'</span> '.tr('secondi').'</h3>
             </div>
         </div>
     </div>

lib/helpers.php

@@ -109,7 +109,7 @@ function setting($name)
     /** @var Models\Setting $setting */
     $setting = Settings::get($name);
 
-    $user = Auth::user();
+    $user = auth_osm()->getUser();
     $user_options = [];
 
     if ($user) {
@@ -148,7 +148,7 @@ function flash()
  */
 function auth_osm()
 {
-    return Auth::getInstance();
+    return AuthOSM::getInstance();
 }
 
 /**

log.php

@@ -48,17 +48,17 @@
 /*
     LEGGO DALLA TABELLA ZZ_LOG
 */
-if (Auth::admin()) {
+if (AuthOSM::admin()) {
     $q = 'SELECT * FROM `zz_logs` ORDER BY `created_at` DESC LIMIT 0, 100';
 } else {
-    $q = 'SELECT * FROM `zz_logs` WHERE `id_utente`='.prepare(Auth::user()['id']).' ORDER BY `created_at` DESC LIMIT 0, 100';
+    $q = 'SELECT * FROM `zz_logs` WHERE `id_utente`='.prepare(auth_osm()->getUser()['id']).' ORDER BY `created_at` DESC LIMIT 0, 100';
 }
 $logs = $dbo->fetchArray($q);
 
 foreach ($logs as $log) {
     $timestamp = Translator::timestampToLocale($log['created_at']);
 
-    $status = Auth::getStatus();
+    $status = AuthOSM::getStatus();
     if ($log['stato'] == $status['success']['code']) {
         $type = 'success';
         $stato = $status['success']['message'];