diff --git a/VERSION b/VERSION index 8bcc8b3..34bbc96 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.5.5 +v3.5.4 diff --git a/composer.json b/composer.json index 935f689..7522544 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "twilio/sdk": "^6.1", "symfony/yaml": "^5.0", "phpmailer/phpmailer": "^6.1", - "xantios/mimey": ">=2.1", + "ralouphie/mimey": "^2.1", "kreait/firebase-php": "^5.14" }, "require-dev": { diff --git a/controllers/internals/Phone.php b/controllers/internals/Phone.php index 0cf8354..8cef65e 100644 --- a/controllers/internals/Phone.php +++ b/controllers/internals/Phone.php @@ -19,18 +19,6 @@ namespace controllers\internals; protected $model; - /** - * Return all phones for active users. - * - * @param int $id_user : user id - * - * @return array - */ - public function get_all_for_active_users() - { - return $this->get_model()->get_all_for_active_users(); - } - /** * Return all phones of a user. * diff --git a/daemons/Launcher.php b/daemons/Launcher.php index cf3bb69..63b29c2 100644 --- a/daemons/Launcher.php +++ b/daemons/Launcher.php @@ -53,7 +53,7 @@ class Launcher extends AbstractDaemon $this->start_mailer_daemon(); - $phones = $this->internal_phone->get_all_for_active_users(); + $phones = $this->internal_phone->get_all(); $this->start_phones_daemons($phones); sleep(1); diff --git a/models/Phone.php b/models/Phone.php index 14447f4..a75a03c 100644 --- a/models/Phone.php +++ b/models/Phone.php @@ -13,31 +13,6 @@ namespace models; class Phone extends StandardModel { - - /** - * Return all hones that belongs to active users - * - * @return array - */ - public function get_all_for_active_users() - { - $query = ' - SELECT phone.* - FROM phone - LEFT JOIN user - ON phone.id_user = user.id - WHERE user.status = :status - '; - - $params = [ - 'status' => \models\User::STATUS_ACTIVE, - ]; - - $result = $this->_run_query($query, $params); - - return $result; - } - /** * Return a phone by his name and user. *