Exercise: Fix to notify subscribed users by email #4641

main/exercise/exercise.class.php

@@ -9960,7 +9960,7 @@ class Exercise
                                     'href' => '#!',
                                     'onclick' => 'showUserToSendNotificacion(this)',
                                     'data-link' => 'exercise.php?'.api_get_cidreq()
-                                        .'&choice=send_reminder&sec_token='.$token.'&exerciseId='.$row['id'],
+                                        .'&choice=send_reminder&sec_token='.$token.'&exerciseId='.$row['iid'],
                                 ]
                             );
                         }
@@ -11387,7 +11387,7 @@ class Exercise
                 if (!isset($usersArray[$userId])) {
                     $usersArray[$userId] = api_get_user_info($userId);
                 }
-                $usersArray['user_id'] = $userId;
+                $usersArray[$userId]['user_id'] = $userId;
                 $userData = $usersArray[$userId];
                 $data[$index]['user_name'] = $userData['complete_name'];
                 $return[] = $data[$index];

main/exercise/exercise.php

@@ -19,38 +19,6 @@ $this_section = SECTION_COURSES;
 
 $htmlHeadXtra[] = api_get_asset('qtip2/jquery.qtip.min.js');
 $htmlHeadXtra[] = api_get_css_asset('qtip2/jquery.qtip.min.css');
-$htmlHeadXtra[] = '
-<div class="modal fade" id="NotificarUsuarios" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="'.get_lang('Close').'">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <form action="#" class="form-horizontal">
-                    <div class="row">
-                        <div class="col-md-6" id="myModalLabel">'.get_lang('EmailNotifySubscription').'</div>
-                        <div class="col-md-6">
-                            <select class="selectpicker form-control" multiple="multiple" id="toUsers" name="toUsers">
-                                <option value="">-</option>
-                            </select>
-                        </div>
-                    </div>
-                    <input class="hidden" id="urlTo" type="hidden">
-               </form>
-               <div class="clearfix clear-fix"></div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" onclick="sendNotificationToUsers()" data-dismiss="modal">'
-                    .get_lang('SendMailToUsers').'
-                </button>
-                <button type="button" class="btn btn-default" data-dismiss="modal">'.get_lang('Close').'</button>
-            </div>
-        </div>
-    </div>
-</div>';
 $htmlHeadXtra[] = '<script>
 function sendNotificationToUsers() {
    var sendTo = $("#toUsers").val().join(",");
@@ -501,12 +469,10 @@ if ($is_allowedToEdit) {
                                      [],
                                     false
                                 );
-                                $toUsers = [];
-                                foreach ($temo as $item) {
-                                    $toUsers[] = $item['user_id'];
-                                }
+                                $toUsers = array_column($temo, 'user_id');
+                            } else {
+                                $toUsers = explode(',', $toUsers);
                             }
-                            $toUsers = explode(',', $toUsers);
                             api_set_more_memory_and_time_limits();
                             Exercise::notifyUsersOfTheExercise(
                                 $exerciseId,
@@ -779,6 +745,38 @@ if (api_get_configuration_value('allow_exercise_categories') === false) {
     }
 }
 
+echo '<div class="modal fade" id="NotificarUsuarios" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="'.get_lang('Close').'">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form action="#" class="form-horizontal">
+                    <div class="row">
+                        <div class="col-md-6" id="myModalLabel">'.get_lang('EmailNotifySubscription').'</div>
+                        <div class="col-md-6">
+                            <select class="selectpicker form-control" multiple="multiple" id="toUsers" name="toUsers">
+                                <option value="">-</option>
+                            </select>
+                        </div>
+                    </div>
+                    <input class="hidden" id="urlTo" type="hidden">
+               </form>
+               <div class="clearfix clear-fix"></div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" onclick="sendNotificationToUsers()" data-dismiss="modal">'
+    .get_lang('SendMailToUsers').'
+                </button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">'.get_lang('Close').'</button>
+            </div>
+        </div>
+    </div>
+</div>';
+
 if ('learnpath' !== $origin) {
     // We are not in learnpath tool
     Display::display_footer();