fix style + undefined var api instead of api_key

controllers/internals/Scheduled.php

@@ -40,7 +40,7 @@ namespace controllers\internals;
                 'flash' => $flash,
             ];
 
-            if ($id_phone !== null)
+            if (null !== $id_phone)
             {
                 $internal_phone = new Phone($this->bdd);
                 $find_phone = $internal_phone->get_for_user($id_user, $id_phone);
@@ -131,7 +131,7 @@ namespace controllers\internals;
                 'flash' => $flash,
             ];
 
-            if ($id_phone !== null)
+            if (null !== $id_phone)
             {
                 $internal_phone = new Phone($this->bdd);
                 $find_phone = $internal_phone->get_for_user($id_user, $id_phone);

controllers/publics/Callback.php

@@ -14,9 +14,9 @@ namespace controllers\publics;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
-    /**
-     * Controller of callback pages, like sms status update notification.
-     */
+/**
+ * Controller of callback pages, like sms status update notification.
+ */
     class Callback extends \descartes\Controller
     {
         private $logger;
@@ -37,7 +37,6 @@ use Monolog\Logger;
             $this->logger = new Logger('Callback ' . uniqid());
             $this->logger->pushHandler(new StreamHandler(PWD_LOGS . '/callback.log', Logger::DEBUG));
 
-
             //If invalid api key, quit with error
             $this->user = false;
             $api_key = $_GET['api_key'] ?? false;
@@ -50,18 +49,19 @@ use Monolog\Logger;
             {
                 http_response_code(401);
                 echo json_encode(['error' => 'Invalid API key. You must provide a valid GET or POST api_key param.']);
-                $this->logger->error('Callback call failed with invalid api key : ' . $api);
+                $this->logger->error('Callback call failed with invalid api key : ' . $api_key);
                 exit(1);
             }
-            
+
             $this->logger->info('Callback call succed for user id : ' . $this->user['id']);
         }
 
         /**
          * Function call on a sended sms status change notification reception.
-         * We return nothing, and we let the adapter do his things
+         * We return nothing, and we let the adapter do his things.
          *
          * @param string $adapter_name : Name of the adapter to use
+         *
          * @return bool : true on success, false on error
          */
         public function update_sended_status(string $adapter_name)
@@ -82,6 +82,7 @@ use Monolog\Logger;
             if (false === $find_adapter)
             {
                 $this->logger->error('Callback status use non existing adapter : ' . $adapter_name);
+
                 return false;
             }
 
@@ -90,6 +91,7 @@ use Monolog\Logger;
             if (!$find_adapter['meta_support_status_change'])
             {
                 $this->logger->error('Callback status use adapter ' . $adapter_name . ' which does not support status change.');
+
                 return false;
             }
 
@@ -97,6 +99,7 @@ use Monolog\Logger;
             if (!$callback_return)
             {
                 $this->logger->error('Callback status with adapter ' . $adapter_name . ' failed on adapter compute.');
+
                 return false;
             }
 
@@ -104,9 +107,10 @@ use Monolog\Logger;
             if (!$sended)
             {
                 $this->logger->error('Callback status try update inexisting message with uid = ' . $callback_return['uid'] . '.');
+
                 return false;
             }
-            
+
             $this->logger->info('Callback status update message with uid ' . $callback_return['uid'] . '.');
             $this->internal_sended->update_status($sended['id'], $callback_return['status']);
 

controllers/publics/Discussion.php

@@ -162,7 +162,7 @@ namespace controllers\publics;
          * @param string $csrf                 : Le jeton csrf
          * @param string $_POST['text']        : Le contenu du Sms
          * @param string $_POST['destination'] : Number to send sms to
-         * @param string $_POST['id_phone']      : If of phone to send sms with
+         * @param string $_POST['id_phone']    : If of phone to send sms with
          *
          * @return string : json string Le statut de l'envoi
          */

controllers/publics/Phone.php

@@ -132,7 +132,7 @@ class Phone extends \descartes\Controller
             \FlashMessage\FlashMessage::push('danger', 'Numéro de téléphone incorrect.');
 
             return $this->redirect(\descartes\Router::url('Phone', 'add'));
-        } 
+        }
 
         $number_exist = $this->internal_phone->get_by_number($number);
         if ($number_exist)
@@ -185,7 +185,7 @@ class Phone extends \descartes\Controller
         $adapter_classname = $find_adapter['meta_classname'];
         $adapter_instance = new $adapter_classname($number, $adapter_datas);
         $adapter_working = $adapter_instance->test();
-        
+
         if (!$adapter_working)
         {
             \FlashMessage\FlashMessage::push('danger', 'Impossible d\'utiliser l\'adaptateur choisis avec les données fournies. Vérifiez le numéro de téléphone et les réglages.');

controllers/publics/Scheduled.php

@@ -402,7 +402,7 @@ namespace controllers\publics;
                 }
                  */
 
-                $nb_update++;
+                ++$nb_update;
             }
 
             if ($nb_update !== \count($scheduleds))

daemons/Phone.php

@@ -19,7 +19,7 @@ use Monolog\Logger;
  */
 class Phone extends AbstractDaemon
 {
-    private $max_inactivity = 5*60;
+    private $max_inactivity = 5 * 60;
     private $msg_queue;
     private $msg_queue_id;
     private $webhook_queue;