From 3c04dd4b3d4465659fefd1b60c8a0d009aa860f4 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 3 Jul 2020 10:28:24 +0200 Subject: [PATCH] Replace api_mail_html with send_message_simple --- main/cron/course_finished.php | 16 +++---- main/dropbox/dropbox_functions.inc.php | 42 ++++++++----------- main/inc/ajax/user_manager.ajax.php | 16 +------ main/inc/lib/add_course.lib.inc.php | 1 - main/inc/lib/myspace.lib.php | 8 +--- main/lp/lp_controller.php | 9 ++-- main/mySpace/user_edit.php | 7 +--- plugin/buycourses/src/process_confirm.php | 5 +-- .../src/service_process_confirm.php | 6 +-- 9 files changed, 38 insertions(+), 72 deletions(-) diff --git a/main/cron/course_finished.php b/main/cron/course_finished.php index b55e54f4bc..dc7bc3c593 100644 --- a/main/cron/course_finished.php +++ b/main/cron/course_finished.php @@ -1,16 +1,19 @@ * - * @package chamilo.cron */ + require_once __DIR__.'/../inc/global.inc.php'; -if (php_sapi_name() != 'cli') { +if (php_sapi_name() !== 'cli') { exit; //do not run from browser } @@ -27,6 +30,7 @@ $entityManager = Database::getManager(); $sessionRepo = $entityManager->getRepository('ChamiloCoreBundle:Session'); $accessUrlRepo = $entityManager->getRepository('ChamiloCoreBundle:AccessUrl'); +/** @var Session[] $sessions */ $sessions = $sessionRepo->createQueryBuilder('s') ->where('s.accessEndDate LIKE :date') ->setParameter('date', "$endDate%") @@ -62,17 +66,13 @@ foreach ($sessions as $session) { $subjectTemplate = new Template(null, false, false, false, false, false); $subjectTemplate->assign('session_name', $session->getName()); - $subjectLayout = $subjectTemplate->get_template( - 'mail/cron_course_finished_subject.tpl' - ); + $subjectLayout = $subjectTemplate->get_template('mail/cron_course_finished_subject.tpl'); $bodyTemplate = new Template(null, false, false, false, false, false); $bodyTemplate->assign('complete_user_name', UserManager::formatUserFullName($user)); $bodyTemplate->assign('session_name', $session->getName()); - $bodyLayout = $bodyTemplate->get_template( - 'mail/cron_course_finished_body.tpl' - ); + $bodyLayout = $bodyTemplate->get_template('mail/cron_course_finished_body.tpl'); api_mail_html( UserManager::formatUserFullName($user), diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php index 8195042aee..bb8c6d3aa4 100755 --- a/main/dropbox/dropbox_functions.inc.php +++ b/main/dropbox/dropbox_functions.inc.php @@ -1071,32 +1071,24 @@ function store_add_dropbox($file = [], $work = null) 'courseTitle' => $_course['title'], 'userUsername' => $recipent_temp['username'], ]; - api_mail_html( - api_get_person_name( - $recipent_temp['firstname'].' '.$recipent_temp['lastname'], - null, - PERSON_NAME_EMAIL_ADDRESS - ), - $recipent_temp['email'], - get_lang('NewDropboxFileUploaded'), - get_lang('NewDropboxFileUploadedContent').' '.get_lang('SeeFile').''. - "\n\n". - api_get_person_name( - $_user['firstName'], - $_user['lastName'], - null, - PERSON_NAME_EMAIL_ADDRESS - )."\n".get_lang('Email')." : ".$_user['mail'], - api_get_person_name( - $_user['firstName'], - $_user['lastName'], - null, - PERSON_NAME_EMAIL_ADDRESS - ), - $_user['mail'], - null, - null, + + $message = get_lang('NewDropboxFileUploadedContent'). + ' '.get_lang('SeeFile').''. + "\n\n". + api_get_person_name( + $_user['firstName'], + $_user['lastName'], null, + PERSON_NAME_EMAIL_ADDRESS + )."\n".get_lang('Email')." : ".$_user['mail']; + + MessageManager::send_message_simple( + $recipient_id, + get_lang('NewDropboxFileUploaded'), + $message, + $_user['user_id'], + false, + false, $additionalParameters ); } diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php index 84e85a4aa2..33249121b0 100755 --- a/main/inc/ajax/user_manager.ajax.php +++ b/main/inc/ajax/user_manager.ajax.php @@ -171,8 +171,8 @@ switch ($action) { if (!empty($user_id)) { $user_table = Database::get_main_table(TABLE_MAIN_USER); - $sql = "UPDATE $user_table - SET active = '".$status."' + $sql = "UPDATE $user_table + SET active = '".$status."' WHERE user_id = '".$user_id."'"; $result = Database::query($sql); @@ -227,18 +227,6 @@ switch ($action) { false, $additionalParameters ); - - /*$result = api_mail_html( - $recipientName, - $user_info['mail'], - $subject, - $body, - $sender_name, - $emailAdmin, - null, - null, - $additionalParameters - );*/ Event::addEvent(LOG_USER_ENABLE, LOG_USER_ID, $user_id); } else { Event::addEvent(LOG_USER_DISABLE, LOG_USER_ID, $user_id); diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index 117839057e..d553779dfc 100755 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -1410,7 +1410,6 @@ class AddCourse $message .= get_lang('Language').' '.$course_language; $userInfo = api_get_user_info($user_id); - $additionalParameters = [ 'smsType' => SmsPlugin::NEW_COURSE_BEEN_CREATED, 'userId' => $user_id, diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php index a68131226d..c1e906dbe3 100644 --- a/main/inc/lib/myspace.lib.php +++ b/main/inc/lib/myspace.lib.php @@ -2565,12 +2565,8 @@ class MySpace get_lang('Manager')." ".api_get_setting('siteName')."\nT. ". api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator'); - api_mail_html( - api_get_person_name($user['FirstName'], $user['LastName'], null, PERSON_NAME_EMAIL_ADDRESS), - $user['Email'], - $emailsubject, - $emailbody - ); + MessageManager::send_message_simple($user['id'], $emailsubject, $emailbody); + $userInfo = api_get_user_info($user['id']); if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { diff --git a/main/lp/lp_controller.php b/main/lp/lp_controller.php index 31680e1efb..883babf79e 100755 --- a/main/lp/lp_controller.php +++ b/main/lp/lp_controller.php @@ -536,14 +536,11 @@ switch ($action) { $layoutContent = $tplContent->get_template('mail/content_ending_learnpath.tpl'); $emailBody = $tplContent->fetch($layoutContent); - api_mail_html( - $recipientName, - $email, + MessageManager::send_message_simple( + $coachInfo['user_id'], sprintf(get_lang('StudentXFinishedLp'), $studentInfo['complete_name']), $emailBody, - $studentInfo['complete_name'], - $studentInfo['email'], - true + $studentInfo['user_id'] ); } Display::addFlash(Display::return_message(get_lang('MessageSent'))); diff --git a/main/mySpace/user_edit.php b/main/mySpace/user_edit.php index 45da2eade7..b70b8bbf7f 100644 --- a/main/mySpace/user_edit.php +++ b/main/mySpace/user_edit.php @@ -154,12 +154,7 @@ if ($form->validate()) { get_lang('Email')." : ".api_get_setting('emailAdministrator'); $emailbody = nl2br($emailbody); - api_mail_html( - api_get_person_name($userInfo['firstname'], $userInfo['lastname'], null, PERSON_NAME_EMAIL_ADDRESS), - $email, - $emailsubject, - $emailbody - ); + MessageManager::send_message_simple($userInfo['user_id'], $emailsubject, $emailbody); } Security::clear_token(); diff --git a/plugin/buycourses/src/process_confirm.php b/plugin/buycourses/src/process_confirm.php index 3ef17f5636..644539f0cc 100644 --- a/plugin/buycourses/src/process_confirm.php +++ b/plugin/buycourses/src/process_confirm.php @@ -140,9 +140,8 @@ switch ($sale['payment_type']) { ); $messageTemplate->assign('transfer_accounts', $transferAccounts); - api_mail_html( - $userInfo['complete_name'], - $userInfo['email'], + MessageManager::send_message_simple( + $userInfo['user_id'], $plugin->get_lang('bc_subject'), $messageTemplate->fetch('buycourses/view/message_transfer.tpl') ); diff --git a/plugin/buycourses/src/service_process_confirm.php b/plugin/buycourses/src/service_process_confirm.php index 867ba9bb66..27d5537e45 100644 --- a/plugin/buycourses/src/service_process_confirm.php +++ b/plugin/buycourses/src/service_process_confirm.php @@ -142,9 +142,9 @@ switch ($serviceSale['payment_type']) { ); $messageTemplate->assign('transfer_accounts', $transferAccounts); $buyer = api_get_user_info($serviceSale['buyer']['id']); - api_mail_html( - $buyer['complete_name'], - $buyer['email'], + + MessageManager::send_message_simple( + $buyer['user_id'], $plugin->get_lang('bc_subject'), $messageTemplate->fetch('buycourses/view/service_message_transfer.tpl') );