SendMailWhenLpIsPublish: Flintci Fix - refs BT#18214

pull/3743/head
Carlos Alvarado 5 years ago
parent f3c7f7001b
commit 3f6cb430c7
No known key found for this signature in database
GPG Key ID: B612DB1EE6658FBB
  1. 22
      main/cron/learning_path_reminder.php

@ -148,7 +148,8 @@ function getLpIdWithNotify()
return $return; return $return;
} }
function getTutorIdFromCourseRelUser($cId = 0, $lpId=0){ function getTutorIdFromCourseRelUser($cId = 0, $lpId = 0)
{
$lpTable = Database::get_course_table(TABLE_LP_MAIN); $lpTable = Database::get_course_table(TABLE_LP_MAIN);
$tblCourseRelUser = Database::get_main_table(TABLE_MAIN_COURSE_USER); $tblCourseRelUser = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$sql = " $sql = "
@ -164,21 +165,22 @@ function getTutorIdFromCourseRelUser($cId = 0, $lpId=0){
tblLp.c_id = $cId"; tblLp.c_id = $cId";
$result = Database::query($sql); $result = Database::query($sql);
$data = Database::fetch_assoc($result); $data = Database::fetch_assoc($result);
foreach ($data as $usersId){ foreach ($data as $usersId) {
return (int) $usersId; return (int) $usersId;
} }
return 0; return 0;
} }
function SendToArray(&$data, &$type, &$message, $lpId = 0){ function SendToArray(&$data, &$type, &$message, $lpId = 0)
{
foreach ($data as $user) { foreach ($data as $user) {
$userName = $user['userInfo']['complete_name']; $userName = $user['userInfo']['complete_name'];
$userId = $user['userInfo']['user_id']; $userId = $user['userInfo']['user_id'];
$fromUser = $user['fromUser']; $fromUser = $user['fromUser'];
$courseName = $user['courseName']; $courseName = $user['courseName'];
$lpName = $user['lpName']; $lpName = $user['lpName'];
$send =SendMessage( $send = SendMessage(
$user['userInfo'], $user['userInfo'],
$fromUser, $fromUser,
$courseName, $courseName,
@ -186,7 +188,7 @@ function SendToArray(&$data, &$type, &$message, $lpId = 0){
$user['link'] $user['link']
); );
$sendit[$type][$userId][$fromUser][$courseName][$lpName] = $send; $sendit[$type][$userId][$fromUser][$courseName][$lpName] = $send;
$message.= "\n$type - Lp Id '$lpId' User Id '$userId' Sent to '$userName' Message id '$send' Lp name '$lpName'"; $message .= "\n$type - Lp Id '$lpId' User Id '$userId' Sent to '$userName' Message id '$send' Lp name '$lpName'";
} }
} }
@ -347,7 +349,7 @@ function LearningPaths()
$lpData = $lpsData[$lpId]; $lpData = $lpsData[$lpId];
} }
if (!isset($tutors[$row['c_id']][$row['lp_id']])) { if (!isset($tutors[$row['c_id']][$row['lp_id']])) {
$tutors[$row['c_id']][$row['lp_id']] = getTutorIdFromCourseRelUser($row['c_id'],$row['lp_id']); $tutors[$row['c_id']][$row['lp_id']] = getTutorIdFromCourseRelUser($row['c_id'], $row['lp_id']);
} }
$courseName = isset($lpData['course_name']) ? $lpData['course_name'] : null; $courseName = isset($lpData['course_name']) ? $lpData['course_name'] : null;
$courseCode = isset($lpData['code']) ? $lpData['code'] : null; $courseCode = isset($lpData['code']) ? $lpData['code'] : null;
@ -404,9 +406,9 @@ function LearningPaths()
$lpName = isset($lpData['name']) ? $lpData['name'] : null; $lpName = isset($lpData['name']) ? $lpData['name'] : null;
$toUser = (int) $row['user_id']; $toUser = (int) $row['user_id'];
if (!isset($tutors[$row['c_id']][$row['lp_id']])) { if (!isset($tutors[$row['c_id']][$row['lp_id']])) {
$tutors[$row['c_id']][$row['lp_id']] = getTutorIdFromCourseRelUser($row['c_id'],$row['lp_id']); $tutors[$row['c_id']][$row['lp_id']] = getTutorIdFromCourseRelUser($row['c_id'], $row['lp_id']);
} }
$fromUser = $tutors[$row['c_id']][$row['lp_id']]; $fromUser = $tutors[$row['c_id']][$row['lp_id']];
$userInfo = api_get_user_info($toUser); $userInfo = api_get_user_info($toUser);
$href = api_get_path(WEB_CODE_PATH). $href = api_get_path(WEB_CODE_PATH).
'lp/lp_controller.php?cidReq='.htmlspecialchars($courseCode). 'lp/lp_controller.php?cidReq='.htmlspecialchars($courseCode).
@ -434,10 +436,10 @@ function LearningPaths()
foreach ($sessions as $sessionId => $types) { foreach ($sessions as $sessionId => $types) {
foreach ($types as $type => $users) { foreach ($types as $type => $users) {
if ('LearnpathSubscription' == $type) { if ('LearnpathSubscription' == $type) {
SendToArray($users,$type, $message, $lpId); SendToArray($users, $type, $message, $lpId);
} else { } else {
if (!isset($itemProcessed[$lpId][$sessionId]['LearnpathSubscription'])) { if (!isset($itemProcessed[$lpId][$sessionId]['LearnpathSubscription'])) {
SendToArray($users,$type, $message, $lpId); SendToArray($users, $type, $message, $lpId);
} }
} }
} }

Loading…
Cancel
Save