diff --git a/VERSION b/VERSION index ccedee9..c0c4025 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.5.2 +v3.5.0 diff --git a/controllers/internals/Quota.php b/controllers/internals/Quota.php index 30d74f4..2ada9c6 100644 --- a/controllers/internals/Quota.php +++ b/controllers/internals/Quota.php @@ -252,7 +252,7 @@ class Quota extends StandardController $renew_interval = $quota['renew_interval'] ?? 'P0D'; $new_start_date = new \DateTime($quota['expiration_date']); $new_expiration_date = clone $new_start_date; - $new_expiration_date->add(new \DateInterval($renew_interval)); + $new_expiration_date->add(new \DateInterval($quota['renew_interval'])); $report = 0; if ($quota['report_unused'] && $unused_credit > 0) diff --git a/controllers/publics/Api.php b/controllers/publics/Api.php index 92fb2ea..ab870b6 100644 --- a/controllers/publics/Api.php +++ b/controllers/publics/Api.php @@ -309,16 +309,6 @@ namespace controllers\publics; return $this->json($return); } - if (mb_strlen($text) > \models\Scheduled::SMS_LENGTH_LIMIT) - { - $return = self::DEFAULT_RETURN; - $return['error'] = self::ERROR_CODES['INVALID_PARAMETER']; - $return['message'] = self::ERROR_MESSAGES['INVALID_PARAMETER'] . ' : text must be less than ' . \models\Scheduled::SMS_LENGTH_LIMIT . ' char.'; - $this->auto_http_code(false); - - return $this->json($return); - } - if (!\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i:s')) { $return = self::DEFAULT_RETURN; diff --git a/controllers/publics/Callback.php b/controllers/publics/Callback.php index aceed2d..a9c8fa0 100644 --- a/controllers/publics/Callback.php +++ b/controllers/publics/Callback.php @@ -155,14 +155,6 @@ use Monolog\Logger; { $this->logger->info('Callback reception call with adapter uid : ' . $adapter_uid); - $phone = $this->internal_phone->get_for_user($this->user['id'], $id_phone); - if (!$phone) - { - $this->logger->error('Callback reception use non existing phone : ' . $id_phone); - - return false; - } - //Search for an adapter $find_adapter = false; $adapters = $this->internal_adapter->list_adapters(); diff --git a/controllers/publics/Scheduled.php b/controllers/publics/Scheduled.php index 2c6e0e3..0c1da65 100644 --- a/controllers/publics/Scheduled.php +++ b/controllers/publics/Scheduled.php @@ -328,13 +328,6 @@ namespace controllers\publics; return $this->redirect(\descartes\Router::url('Scheduled', 'add')); } - if (mb_strlen($text) > \models\Scheduled::SMS_LENGTH_LIMIT) - { - \FlashMessage\FlashMessage::push('danger', 'Votre message doit faire moins de ' . \models\Scheduled::SMS_LENGTH_LIMIT . ' caractères.'); - - return $this->redirect(\descartes\Router::url('Scheduled', 'add')); - } - if (!\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i:s') && !\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i')) { \FlashMessage\FlashMessage::push('danger', 'Vous devez fournir une date valide.'); @@ -547,13 +540,6 @@ namespace controllers\publics; return $this->redirect(\descartes\Router::url('Scheduled', 'add')); } - if (mb_strlen($text) > \models\Scheduled::SMS_LENGTH_LIMIT) - { - \FlashMessage\FlashMessage::push('danger', 'Votre message doit faire moins de ' . \models\Scheduled::SMS_LENGTH_LIMIT . ' caractères.'); - - return $this->redirect(\descartes\Router::url('Scheduled', 'add')); - } - if (!\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i:s') && !\controllers\internals\Tool::validate_date($at, 'Y-m-d H:i')) { continue; diff --git a/models/Scheduled.php b/models/Scheduled.php index 75e7a15..33e317b 100644 --- a/models/Scheduled.php +++ b/models/Scheduled.php @@ -13,8 +13,6 @@ namespace models; class Scheduled extends StandardModel { - const SMS_LENGTH_LIMIT = 1000; - /** * Return numbers for a scheduled message. * diff --git a/templates/scheduled/add.php b/templates/scheduled/add.php index bd744de..81ed599 100644 --- a/templates/scheduled/add.php +++ b/templates/scheduled/add.php @@ -49,7 +49,7 @@ Vous pouvez obtenir une prévisualisation du résultat pour un contact, ainsi qu'une estimation du nombre de crédits qui seront utilisés par SMS, en cliquant sur le boutton "Prévisualiser".
- +