Rename auth to auth_osm for Laravel compatibility

Dasc3er · Dasc3er · commit cbbe621f9ffc · 2025-11-01T09:05:23.000+01:00
diff --git a/index.php b/index.php
@@ -42,7 +42,7 @@
         $username = post('username');
         $password = $_POST['password'];
 
-        if ($dbo->isConnected() && $dbo->isInstalled() && auth()->attempt($username, $password)) {
+        if ($dbo->isConnected() && $dbo->isInstalled() && auth_osm()->attempt($username, $password)) {
             $_SESSION['keep_alive'] = true;
 
             if (intval(setting('Inizio periodo calendario'))) {
@@ -60,7 +60,7 @@
         // Rimozione log vecchi
         // $dbo->query('DELETE FROM `zz_operations` WHERE DATE_ADD(`created_at`, INTERVAL 30*24*60*60 SECOND) <= NOW()');
         } else {
-            $status = auth()->getCurrentStatus();
+            $status = auth_osm()->getCurrentStatus();
 
             flash()->error(Auth::getStatus()[$status]['message']);
 
diff --git a/lib/helpers.php b/lib/helpers.php
@@ -146,7 +146,7 @@ function flash()
  *
  * @return Auth
  */
-function auth()
+function auth_osm()
 {
     return Auth::getInstance();
 }
diff --git a/modules/checklists/modutil.php b/modules/checklists/modutil.php
@@ -23,7 +23,7 @@ function renderChecklist($check, $level = 1, $parent = 0, $has_images = false)
     {
         global $structure;
 
-        $user = auth()->getUser();
+        $user = auth_osm()->getUser();
         $enabled = $check->assignedUsers ? ($check->assignedUsers->pluck('id')->search($user->id) !== false || $user->idgruppo == 1) : true;
 
         $margin = ($level * 20);
@@ -205,7 +205,7 @@ function renderChecklistInserimento($check, $level = 1, $parent = 0)
 if (!function_exists('renderChecklistHtml')) {
     function renderChecklistHtml($check, $level = 0, $has_images = false)
     {
-        $user = auth()->getUser();
+        $user = auth_osm()->getUser();
         $enabled = $check->assignedUsers ? $check->assignedUsers->pluck('id')->search($user->id) !== false : true;
 
         $width = 10 + 20 * $level;
diff --git a/modules/emails/src/EmailHook.php b/modules/emails/src/EmailHook.php
@@ -57,7 +57,7 @@ public function execute()
     public function response()
     {
         $yesterday = date('Y-m-d', strtotime('-1 days'));
-        $user = auth()->getUser();
+        $user = auth_osm()->getUser();
 
         // Numero di email inviate
         $current = Mail::whereDate('sent_at', '>', $yesterday)
diff --git a/modules/interventi/actions.php b/modules/interventi/actions.php
@@ -118,7 +118,7 @@
                         $template = Template::where('name', 'Notifica rimozione intervento')->first();
 
                         if (!empty($template)) {
-                            $mail = Mail::build(auth()->getUser(), $template, $intervento->id);
+                            $mail = Mail::build(auth_osm()->getUser(), $template, $intervento->id);
                             $mail->addReceiver($tecnico['email']);
                             $mail->save();
                             flash()->info(tr('Notifica al tecnico aggiunta correttamente.'));
@@ -141,7 +141,7 @@
                         $template = Template::where('name', 'Notifica intervento')->first();
 
                         if (!empty($template)) {
-                            $mail = Mail::build(auth()->getUser(), $template, $intervento->id);
+                            $mail = Mail::build(auth_osm()->getUser(), $template, $intervento->id);
                             $mail->addReceiver($tecnico['email']);
                             $mail->save();
                             flash()->info(tr('Notifica al tecnico aggiunta correttamente.'));
@@ -164,14 +164,14 @@
             $template = Template::find($stato['id_email']);
 
             if (!empty($stato['destinatari'])) {
-                $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                 $mail->addReceiver($stato['destinatari']);
                 $mail->save();
             }
 
             if (!empty($stato['notifica_cliente'])) {
                 if (!empty($intervento->anagrafica->email)) {
-                    $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                    $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                     $mail->addReceiver($intervento->anagrafica->email);
                     $mail->save();
                 }
@@ -192,7 +192,7 @@
             foreach ($tecnici as $tecnico) {
                 $mail_tecnico = $dbo->selectOne('an_anagrafiche', '*', ['idanagrafica' => $tecnico]);
                 if (!empty($mail_tecnico['email'])) {
-                    $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                    $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                     $mail->addReceiver($mail_tecnico['email']);
                     $mail->save();
                 }
@@ -364,7 +364,7 @@
                     $template = Template::where('name', 'Notifica intervento')->first();
 
                     if (!empty($template)) {
-                        $mail = Mail::build(auth()->getUser(), $template, $intervento->id);
+                        $mail = Mail::build(auth_osm()->getUser(), $template, $intervento->id);
                         $mail->addReceiver($tecnico->email);
                         $mail->save();
                         flash()->info(tr('Notifica al tecnico aggiunta correttamente.'));
@@ -904,14 +904,14 @@
                         $template = Template::find($stato['id_email']);
 
                         if (!empty($stato['destinatari'])) {
-                            $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                            $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                             $mail->addReceiver($stato['destinatari']);
                             $mail->save();
                         }
 
                         if (!empty($stato['notifica_cliente'])) {
                             if (!empty($intervento->anagrafica->email)) {
-                                $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                                $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                                 $mail->addReceiver($intervento->anagrafica->email);
                                 $mail->save();
                             }
@@ -926,7 +926,7 @@
                                 $mail_tecnico = $dbo->selectOne('an_anagrafiche', '*', ['idanagrafica' => $tecnico]);
                                 if (!empty($mail_tecnico['email'])) {
                                     if (!empty($template)) {
-                                        $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                                        $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                                         $mail->addReceiver($mail_tecnico['email']);
                                         $mail->save();
                                         flash()->info(tr('Notifica al tecnico aggiunta correttamente.'));
@@ -987,14 +987,14 @@
                             $template = Template::find($stato['id_email']);
 
                             if (!empty($stato['destinatari'])) {
-                                $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                                $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                                 $mail->addReceiver($stato['destinatari']);
                                 $mail->save();
                             }
 
                             if (!empty($stato['notifica_cliente'])) {
                                 if (!empty($intervento->anagrafica->email)) {
-                                    $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                                    $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                                     $mail->addReceiver($intervento->anagrafica->email);
                                     $mail->save();
                                 }
@@ -1008,7 +1008,7 @@
                                 foreach ($tecnici as $tecnico) {
                                     $mail_tecnico = $dbo->selectOne('an_anagrafiche', '*', ['idanagrafica' => $tecnico]);
                                     if (!empty($mail_tecnico['email'])) {
-                                        $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                                        $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                                         $mail->addReceiver($mail_tecnico['email']);
                                         $mail->save();
                                     }
@@ -1094,7 +1094,7 @@
                 $template = Template::where('name', 'Notifica rimozione intervento')->first();
 
                 if (!empty($template)) {
-                    $mail = Mail::build(auth()->getUser(), $template, $id_record);
+                    $mail = Mail::build(auth_osm()->getUser(), $template, $id_record);
                     $mail->addReceiver($tecnico['email']);
                     $mail->save();
                     flash()->info(tr('Notifica al tecnico aggiunta correttamente.'));
diff --git a/modules/interventi/bulk.php b/modules/interventi/bulk.php
@@ -413,7 +413,7 @@
                 // Aggiungo email anagrafica
                 if (!empty($intervento->anagrafica->email)) {
                     $emails[] = $intervento->anagrafica->email;
-                    $mail = Mail::build(auth()->getUser(), $template, $id);
+                    $mail = Mail::build(auth_osm()->getUser(), $template, $id);
                     $mail->addReceiver($intervento->anagrafica->email);
                     $creata_mail = true;
                 }
@@ -423,7 +423,7 @@
                 foreach ($mansioni as $mansione) {
                     $referenti = $dbo->table('an_referenti')->where('idmansione', $mansione['idmansione'])->where('idanagrafica', $id_anagrafica)->where('email', '!=', '')->get();
                     if (!$referenti->isEmpty() && $creata_mail == false) {
-                        $mail = Mail::build(auth()->getUser(), $template, $id);
+                        $mail = Mail::build(auth_osm()->getUser(), $template, $id);
                         $creata_mail = true;
                     }
 
diff --git a/modules/interventi/modutil.php b/modules/interventi/modutil.php
@@ -111,7 +111,7 @@ function add_tecnico($id_intervento, $idtecnico, $inizio, $fine, $idcontratto =
                 $template = Template::where('name', 'Notifica intervento')->first();
 
                 if (!empty($template)) {
-                    $mail = Mail::build(auth()->getUser(), $template, $id_intervento);
+                    $mail = Mail::build(auth_osm()->getUser(), $template, $id_intervento);
                     $mail->addReceiver($anagrafica['email']);
                     $mail->save();
                     flash()->info(tr('Notifica al tecnico aggiunta correttamente.'));
diff --git a/modules/newsletter/src/Newsletter.php b/modules/newsletter/src/Newsletter.php
@@ -152,7 +152,7 @@ public function inviaDestinatario(Destinatario $destinatario, $test = false)
         }
 
         // Inizializzazione email
-        $mail = Mail::build(auth()->getUser(), $template, $anagrafica->id);
+        $mail = Mail::build(auth_osm()->getUser(), $template, $anagrafica->id);
 
         // Completamento informazioni
         $mail->addReceiver($email);
diff --git a/modules/scadenzario/bulk.php b/modules/scadenzario/bulk.php
@@ -123,7 +123,7 @@
                         // Aggiungo email anagrafica
                         if (!empty($documento->anagrafica->email)) {
                             $emails[] = $documento->anagrafica->email;
-                            $mail = Mail::build(auth()->getUser(), $template, $scadenza->id);
+                            $mail = Mail::build(auth_osm()->getUser(), $template, $scadenza->id);
                             $mail->addReceiver($documento->anagrafica->email);
                             $creata_mail = true;
                         }
@@ -133,7 +133,7 @@
                         foreach ($mansioni as $mansione) {
                             $referenti = $dbo->table('an_referenti')->where('idmansione', $mansione['idmansione'])->where('idanagrafica', $id_anagrafica)->where('email', '!=', '')->get();
                             if (!$referenti->isEmpty() && $creata_mail == false) {
-                                $mail = Mail::build(auth()->getUser(), $template, $id);
+                                $mail = Mail::build(auth_osm()->getUser(), $template, $id);
                                 $creata_mail = true;
                             }
 
diff --git a/modules/utenti/info.php b/modules/utenti/info.php
@@ -33,7 +33,7 @@
 }
 
 $user = Auth::user();
-$token = auth()->getToken();
+$token = auth_osm()->getToken();
 
 $rs = $dbo->fetchArray('SELECT * FROM an_anagrafiche WHERE idanagrafica = '.prepare($user['idanagrafica']));
 $anagrafica = [];
diff --git a/modules/utenti/src/API/v1/Login.php b/modules/utenti/src/API/v1/Login.php
@@ -31,9 +31,9 @@ public function create($request)
         $database = database();
 
         // Controllo sulle credenziali
-        if (auth()->attempt($request['username'], $request['password'])) {
+        if (auth_osm()->attempt($request['username'], $request['password'])) {
             $user = $this->getUser();
-            $token = auth()->getToken();
+            $token = auth_osm()->getToken();
 
             // Informazioni da restituire tramite l'API
             $response['user'] = $database->fetchOne('SELECT `an_anagrafiche`.`idanagrafica` AS idanagrafica, `ragione_sociale`, `codice`, `piva`, `codice_fiscale`, `indirizzo`, `citta`, `provincia`, (SELECT `an_nazioni_lang`.`title` FROM `an_nazioni` LEFT JOIN `an_nazioni_lang` ON (`an_nazioni`.`id` = `an_nazioni_lang`.`id_record` AND `an_nazioni_lang`.`id_lang` = '.prepare(\Models\Locale::getDefault()->id).') WHERE `an_nazioni`.`id` = `an_anagrafiche`.`id_nazione`) AS nazione, `telefono`, `fax`, `cellulare`, `an_anagrafiche`.`email` FROM `zz_users` LEFT JOIN `an_anagrafiche` ON `an_anagrafiche`.`idanagrafica` = `zz_users`.`idanagrafica` WHERE `id` = :id', [
diff --git a/oauth2_login.php b/oauth2_login.php
@@ -61,7 +61,7 @@
     if ($response['access_token']) {
         $username = $account->getProvider()->getUser($response['access_token']);
 
-        if (!auth()->attempt($username, null, true)) {
+        if (!auth_osm()->attempt($username, null, true)) {
             flash()->error(tr('Autenticazione fallita!'));
         }
         redirect_url(base_path_osm().'/');
diff --git a/src/API/App/v1/Login.php b/src/API/App/v1/Login.php
@@ -31,9 +31,9 @@ public function create($request)
         $database = database();
 
         // Controllo sulle credenziali
-        if (auth()->attempt($request['username'], $request['password'])) {
+        if (auth_osm()->attempt($request['username'], $request['password'])) {
             $user = $this->getUser();
-            $token = auth()->getToken();
+            $token = auth_osm()->getToken();
 
             if (setting("Permetti l'accesso agli amministratori")) {
                 $utente = $database->fetchOne('SELECT
diff --git a/src/API/Resource.php b/src/API/Resource.php
@@ -39,6 +39,6 @@ public function close($request, $response)
 
     public function getUser()
     {
-        return auth()->getUser();
+        return auth_osm()->getUser();
     }
 }
diff --git a/src/Extensions/MessageHandler.php b/src/Extensions/MessageHandler.php
@@ -38,7 +38,7 @@ protected function write(LogRecord $record): void
         }
 
         // Verifica se l'utente è un amministratore
-        $is_admin = auth()->check() && auth()->isAdmin();
+        $is_admin = auth_osm()->check() && auth_osm()->isAdmin();
 
         // Estrai i dati dal record
         $uid = $record->extra['uid'] ?? '';
diff --git a/src/Models/Upload.php b/src/Models/Upload.php
@@ -155,7 +155,7 @@ public static function build($source = null, $data = null, $name = null, $catego
         $model->id_adapter = $adapter_config->id;
         $model->filename = $file['filename'];
 
-        $model->user()->associate(auth()->getUser());
+        $model->user()->associate(auth_osm()->getUser());
 
         // Rimozione estensione dal nome visibile
         $extension = $file['extension'];
diff --git a/src/Translator.php b/src/Translator.php
@@ -378,6 +378,6 @@ protected static function setFormatter($locale, $options)
             ] : $options['number']
         );
 
-        self::$formatter->setPrecision(auth()->check() ? setting('Cifre decimali per importi') : 2);
+        self::$formatter->setPrecision(auth_osm()->check() ? setting('Cifre decimali per importi') : 2);
     }
 }
diff --git a/token_login.php b/token_login.php
@@ -50,7 +50,7 @@
         $otp_code = post('otp_code');
 
         // Utilizza il metodo della classe Auth per gestire il login OTP
-        $result = auth()->attemptOTPLogin($token_param, $otp_code);
+        $result = auth_osm()->attemptOTPLogin($token_param, $otp_code);
 
         if ($result['success']) {
             // Imposta variabili di sessione per il calendario
@@ -103,7 +103,7 @@
 
         if (!empty($token_param)) {
             // Utilizza il metodo della classe Auth per gestire il login tramite token
-            $result = auth()->attemptTokenLogin($token_param);
+            $result = auth_osm()->attemptTokenLogin($token_param);
 
             if ($result['success']) {
                 // Imposta variabili di sessione per il calendario
@@ -242,7 +242,7 @@
 
     if ($confirm_access == '1') {
         // L'utente ha confermato, procedi con il login
-        $result = auth()->attemptTokenLogin($token);
+        $result = auth_osm()->attemptTokenLogin($token);
 
         if ($result['success']) {
             // Imposta variabili di sessione per il calendario
@@ -295,7 +295,7 @@
     // Controlla se è stata richiesta la generazione dell'OTP
     if ($otp_requested) {
         // Genera nuovo codice OTP sicuro
-        $otp_code = auth()->getOTP();
+        $otp_code = auth_osm()->getOTP();
 
         // Salva l'OTP nel database
         $dbo->query('UPDATE `zz_otp_tokens` SET `last_otp` = '.prepare($otp_code).' WHERE `id` = '.prepare($token_record['id']));

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ function flash()`
`146`	`146`	`*`
`147`	`147`	`* @return Auth`
`148`	`148`	`*/`
`149`		`-function auth()`
	`149`	`+function auth_osm()`
`150`	`150`	`{`
`151`	`151`	`return Auth::getInstance();`
`152`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ function renderChecklist($check, $level = 1, $parent = 0, $has_images = false)`
`23`	`23`	`{`
`24`	`24`	`global $structure;`
`25`	`25`
`26`		`- $user = auth()->getUser();`
	`26`	`+ $user = auth_osm()->getUser();`
`27`	`27`	`$enabled = $check->assignedUsers ? ($check->assignedUsers->pluck('id')->search($user->id) !== false \|\| $user->idgruppo == 1) : true;`
`28`	`28`
`29`	`29`	`$margin = ($level * 20);`
`@@ -205,7 +205,7 @@ function renderChecklistInserimento($check, $level = 1, $parent = 0)`
`205`	`205`	`if (!function_exists('renderChecklistHtml')) {`
`206`	`206`	`function renderChecklistHtml($check, $level = 0, $has_images = false)`
`207`	`207`	`{`
`208`		`- $user = auth()->getUser();`
	`208`	`+ $user = auth_osm()->getUser();`
`209`	`209`	`$enabled = $check->assignedUsers ? $check->assignedUsers->pluck('id')->search($user->id) !== false : true;`
`210`	`210`
`211`	`211`	`$width = 10 + 20 * $level;`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function execute()`
`57`	`57`	`public function response()`
`58`	`58`	`{`
`59`	`59`	`$yesterday = date('Y-m-d', strtotime('-1 days'));`
`60`		`- $user = auth()->getUser();`
	`60`	`+ $user = auth_osm()->getUser();`
`61`	`61`
`62`	`62`	`// Numero di email inviate`
`63`	`63`	`$current = Mail::whereDate('sent_at', '>', $yesterday)`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function inviaDestinatario(Destinatario $destinatario, $test = false)`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`// Inizializzazione email`
`155`		`- $mail = Mail::build(auth()->getUser(), $template, $anagrafica->id);`
	`155`	`+ $mail = Mail::build(auth_osm()->getUser(), $template, $anagrafica->id);`
`156`	`156`
`157`	`157`	`// Completamento informazioni`
`158`	`158`	`$mail->addReceiver($email);`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`$user = Auth::user();`
`36`		`-$token = auth()->getToken();`
	`36`	`+$token = auth_osm()->getToken();`
`37`	`37`
`38`	`38`	`$rs = $dbo->fetchArray('SELECT * FROM an_anagrafiche WHERE idanagrafica = '.prepare($user['idanagrafica']));`
`39`	`39`	`$anagrafica = [];`