Pausetraining: Update send mail conditions BT#16298

Author: jmontoyaa

main/inc/lib/message.lib.php

@@ -501,7 +501,7 @@ public static function send_message(
             if ($allowPauseFormation) {
                 $extraFieldValue = new ExtraFieldValue('user');
                 $allowEmailNotifications = $extraFieldValue->get_values_by_handler_and_field_variable(
-                    $receiverUserInfo['user_id'],
+                    $receiverUserId,
                     'allow_notifications'
                 );
 
@@ -518,25 +518,29 @@ public static function send_message(
                 }
 
                 if ($sendEmail) {
-                    $startDate = $extraFieldValue->get_values_by_handler_and_field_variable(
-                        $receiverUserInfo['user_id'],
-                        'start_pause_date'
-                    );
-                    $endDate = $extraFieldValue->get_values_by_handler_and_field_variable(
-                        $receiverUserInfo['user_id'],
-                        'end_pause_date'
-                    );
-
-                    if (
-                        !empty($startDate) && isset($startDate['value']) && !empty($startDate['value']) &&
-                        !empty($endDate) && isset($endDate['value']) && !empty($endDate['value'])
-                    ) {
-                        $now = time();
-                        $start = api_strtotime($startDate['value']);
-                        $end = api_strtotime($startDate['value']);
+                    // Check if user pause his formation.
+                    $pause = $extraFieldValue->get_values_by_handler_and_field_variable($receiverUserId, 'pause_formation');
+                    if (!empty($pause) && isset($pause['value']) && 1 === (int) $pause['value']) {
+                        $startDate = $extraFieldValue->get_values_by_handler_and_field_variable(
+                            $receiverUserInfo['user_id'],
+                            'start_pause_date'
+                        );
+                        $endDate = $extraFieldValue->get_values_by_handler_and_field_variable(
+                            $receiverUserInfo['user_id'],
+                            'end_pause_date'
+                        );
 
-                        if ($now > $start && $now < $end) {
-                            $sendEmail = false;
+                        if (
+                            !empty($startDate) && isset($startDate['value']) && !empty($startDate['value']) &&
+                            !empty($endDate) && isset($endDate['value']) && !empty($endDate['value'])
+                        ) {
+                            $now = time();
+                            $start = api_strtotime($startDate['value']);
+                            $end = api_strtotime($startDate['value']);
+
+                            if ($now > $start && $now < $end) {
+                                $sendEmail = false;
+                            }
                         }
                     }
                 }

plugin/pausetraining/PauseTraining.php

@@ -160,12 +160,6 @@ public function runCron()
 
                 foreach ($userList as $userId) {
                     $userInfo = api_get_user_info($userId);
-                    $pause = $extraFieldValue->get_values_by_handler_and_field_variable($userId, 'pause_formation');
-                    if (!empty($pause) && isset($pause['value']) && 1 == $pause['value']) {
-                        // Skip user because he paused his formation.
-                        continue;
-                    }
-
                     $template->assign('days', $day);
                     $template->assign('user', $userInfo);
                     $content = $template->fetch('pausetraining/view/notification_content.tpl');