diff --git a/controllers/internals/Event.php b/controllers/internals/Event.php index 29f76cb..003fc8d 100644 --- a/controllers/internals/Event.php +++ b/controllers/internals/Event.php @@ -73,21 +73,6 @@ namespace controllers\internals; return $this->get_model()->insert($event); } - /** - * Gets events for a type, since a date and eventually until a date (both included). - * - * @param int $id_user : User id - * @param string $type : Event type we want - * @param \DateTime $since : Date to get events since - * @param ?\DateTime $until (optional) : Date until wich we want events, if not specified no limit - * - * @return array - */ - public function get_events_by_type_and_date_for_user(int $id_user, string $type, \DateTime $since, ?\DateTime $until = null) - { - $this->get_model()->get_events_by_type_and_date_for_user($id_user, $type, $since, $until); - } - /** * Get the model for the Controller. */ diff --git a/controllers/internals/ExpressionProvider.php b/controllers/internals/ExpressionProvider.php index 9d056ab..b26ff41 100644 --- a/controllers/internals/ExpressionProvider.php +++ b/controllers/internals/ExpressionProvider.php @@ -44,11 +44,6 @@ class ExpressionProvider implements ExpressionFunctionProviderInterface return sprintf('isset(%1$s) && is_a(%1$s, \'DateTime\') && %1$s->format(\'m-d\') == (new \\DateTime())->format(\'m-d\')', $birthdate); }, function ($arguments, DateTime $birthdate) { - if (!($birthdate ?? false)) - { - return false; - } - return $birthdate->format('m-d') == (new DateTime())->format('m-d'); }); diff --git a/controllers/internals/Scheduled.php b/controllers/internals/Scheduled.php index 52a14c2..b31e7bd 100644 --- a/controllers/internals/Scheduled.php +++ b/controllers/internals/Scheduled.php @@ -479,6 +479,8 @@ use Monolog\Logger; $mms_phones = $internal_phone->gets_phone_supporting_mms_for_user($id_user, $internal_phone::MMS_SENDING); foreach ($mms_phones as &$mms_phone) { + $limits = $internal_phone->get_limits($mms_phone['id']); + $remaining_volume = PHP_INT_MAX; foreach ($limits as $limit) { diff --git a/controllers/internals/Webhook.php b/controllers/internals/Webhook.php index bb2c3bd..6a2e8cf 100644 --- a/controllers/internals/Webhook.php +++ b/controllers/internals/Webhook.php @@ -137,10 +137,10 @@ class Webhook extends StandardController $error_code = null; $queue = msg_get_queue(QUEUE_ID_WEBHOOK); - $success = msg_send($queue, QUEUE_TYPE_WEBHOOK, $message, true, true, $error_code); - - return (bool) $success; + msg_send($queue, QUEUE_TYPE_WEBHOOK, $message, true, true, $error_code); } + + return true; } /** diff --git a/controllers/publics/Contact.php b/controllers/publics/Contact.php index 78da100..69b0cc8 100644 --- a/controllers/publics/Contact.php +++ b/controllers/publics/Contact.php @@ -372,6 +372,7 @@ namespace controllers\publics; else { $invalid_type = true; + $result = false; } } diff --git a/controllers/publics/Phone.php b/controllers/publics/Phone.php index 6610939..7451288 100644 --- a/controllers/publics/Phone.php +++ b/controllers/publics/Phone.php @@ -315,25 +315,14 @@ class Phone extends \descartes\Controller return $this->redirect(\descartes\Router::url('Phone', 'list')); } + $adapters = $this->internal_adapter->list_adapters(); + foreach ($phones as &$phone) { $limits = $this->internal_phone->get_limits($phone['id']); $phone['limits'] = $limits; } - $phone_data = json_decode($phone['adapter_data'], true); - $adapters = $this->internal_adapter->list_adapters(); - foreach ($adapters as &$adapter) - { - foreach ($adapter['meta_data_fields'] as &$data_field) - { - if (key_exists($data_field['name'], $phone_data)) - { - $data_field['value'] = $phone_data[$data_field['name']]; - } - } - } - $this->render('phone/edit', [ 'phones' => $phones, 'adapters' => $adapters, diff --git a/models/Event.php b/models/Event.php index 843f442..166d46e 100644 --- a/models/Event.php +++ b/models/Event.php @@ -84,32 +84,6 @@ namespace models; return $this->_select('event', ['id_user' => $id_user], 'at', true, $nb_entry); } - /** - * Gets events for a type, since a date and eventually until a date (both included). - * - * @param int $id_user : User id - * @param string $type : Event type we want - * @param \DateTime $since : Date to get events since - * @param ?\DateTime $until (optional) : Date until wich we want events, if not specified no limit - * - * @return array - */ - public function get_events_by_type_and_date_for_user(int $id_user, string $type, \DateTime $since, ?\DateTime $until = null) - { - $where = [ - 'id_user' => $id_user, - 'type' => $type, - '>=at' => $since->format('Y-m-d H:i:s'), - ]; - - if (null !== $until) - { - $where['<=at'] = $until->format('Y-m-d H:i:s'); - } - - return $this->_select('event', $where, 'at'); - } - /** * Return table name. */ diff --git a/templates/phone/edit.php b/templates/phone/edit.php index ff9b456..a1b2446 100644 --- a/templates/phone/edit.php +++ b/templates/phone/edit.php @@ -70,7 +70,10 @@ value="" data-description="s($adapter['meta_description']); ?>" data-data-fields="s(json_encode($adapter['meta_data_fields'])); ?>" - + + data-phone-adapter-data="s($phone['adapter_data']); ?>" + selected + > s($adapter['meta_name']); ?> @@ -153,12 +156,33 @@ var data_fields = option.attr('data-data-fields'); data_fields = JSON.parse(data_fields); + if (option.attr('data-phone-adapter-data')) + { + var phone_adapter_data = option.attr('data-phone-adapter-data'); + phone_adapter_data = JSON.parse(phone_adapter_data); + } + var numbers = []; var html = ''; jQuery.each(data_fields, function (index, field) { - value = field.value ? field.value : (field.default_value ? field.default_value : null); + if (phone_adapter_data) + { + if (field.name in phone_adapter_data) + { + value = phone_adapter_data[field.name]; + } + else + { + value = field.default_value ? field.default_value : null; + } + } + else + { + value = field.default_value ? field.default_value : null; + } + if (field.type == 'phone_number') { diff --git a/tests/phpstan/phpstan.phar b/tests/phpstan/phpstan.phar index 19bead9..aee0930 100644 Binary files a/tests/phpstan/phpstan.phar and b/tests/phpstan/phpstan.phar differ