chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Messages: Remove legacy SMS additional parameters

Browse Source
pull/3927/head
Julio Montoya 4 years ago
parent efeebade6c
commit e9edbd50b9
12 changed files with 13 additions and 182 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      public/main/dropbox/dropbox_functions.inc.php
  2. 11
      public/main/inc/ajax/user_manager.ajax.php
  3. 5
      public/main/inc/lib/TicketManager.php
  4. 10
      public/main/inc/lib/add_course.lib.inc.php
  5. 8
      public/main/inc/lib/api.lib.php
  6. 11
      public/main/inc/lib/certificate.lib.php
  7. 12
      public/main/inc/lib/course.lib.php
  8. 62
      public/main/inc/lib/course_request.lib.php
  9. 3
      public/main/inc/lib/message.lib.php
  10. 32
      public/main/inc/lib/plugin.lib.php
  11. 14
      public/main/inc/lib/usermanager.lib.php
  12. 15
      public/main/work/work.lib.php

12
public/main/dropbox/dropbox_functions.inc.php
Unescape View File

@ -1066,12 +1066,6 @@ function store_add_dropbox($file = [], $work = null)
if ($b_send_mail && empty($work)) {
foreach ($new_work_recipients as $recipient_id) {
$recipent_temp = api_get_user_info($recipient_id);
$additionalParameters = [
'smsType' => SmsPlugin::NEW_FILE_SHARED_COURSE_BY,
'userId' => $recipient_id,
'courseTitle' => $_course['title'],
'userUsername' => $recipent_temp['username'],
];
api_mail_html(
api_get_person_name(
$recipent_temp['firstname'].' '.$recipent_temp['lastname'],
@ -1094,11 +1088,7 @@ function store_add_dropbox($file = [], $work = null)
null,
PERSON_NAME_EMAIL_ADDRESS
),
$_user['mail'],
null,
null,
null,
$additionalParameters
$_user['mail']
);
}
}

11
public/main/inc/ajax/user_manager.ajax.php
Unescape View File

@ -229,19 +229,10 @@ switch ($action) {
api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".
get_lang('e-mail')." : ".api_get_setting('emailAdministrator');
$additionalParameters = [
'smsType' => SmsPlugin::ACCOUNT_APPROVED_CONNECT,
'userId' => $user_id,
];
MessageManager::send_message_simple(
$user_id,
$subject,
$body,
null,
false,
false,
$additionalParameters
$body
);
Event::addEvent(LOG_USER_ENABLE, LOG_USER_ID, $user_id);
} else {

5
public/main/inc/lib/TicketManager.php
Unescape View File

@ -1396,8 +1396,7 @@ class TicketManager
0,
false,
false,
[],
false,
true,
$attachmentList
);
}
@ -1411,7 +1410,6 @@ class TicketManager
0,
false,
false,
[],
false,
$attachmentList
);
@ -1428,7 +1426,6 @@ class TicketManager
0,
false,
false,
[],
false,
$attachmentList
);

10
public/main/inc/lib/add_course.lib.inc.php
Unescape View File

@ -867,13 +867,6 @@ class AddCourse
$message .= get_lang('Coach').' '.$tutor_name."\n";
$message .= get_lang('Language').' '.$course_language;
$additionalParameters = [
'smsType' => SmsPlugin::NEW_COURSE_BEEN_CREATED,
'userId' => $userId,
'courseName' => $title,
'creatorUsername' => $user->getUsername(),
];
api_mail_html(
$recipient_name,
$recipient_email,
@ -883,8 +876,7 @@ class AddCourse
$recipient_email,
null,
null,
null,
$additionalParameters
null
);
}
}

8
public/main/inc/lib/api.lib.php
Unescape View File

@ -7125,14 +7125,6 @@ function api_mail_html(
error_log($e->getMessage());
}
if (!empty($additionalParameters)) {
$plugin = new AppPlugin();
$smsPlugin = $plugin->getSMSPluginLibrary();
if ($smsPlugin) {
$smsPlugin->send($additionalParameters);
}
}
return 1;
}

11
public/main/inc/lib/certificate.lib.php
Unescape View File

@ -411,17 +411,6 @@ class Certificate extends Model
0,
$currentUserInfo['id']
);
$plugin = new AppPlugin();
$smsPlugin = $plugin->getSMSPluginLibrary();
if ($smsPlugin) {
$additionalParameters = [
'smsType' => SmsPlugin::CERTIFICATE_NOTIFICATION,
'userId' => $userInfo['id'],
'direct_message' => $message,
];
$smsPlugin->send($additionalParameters);
}
}
/**

12
public/main/inc/lib/course.lib.php
Unescape View File

@ -2672,23 +2672,13 @@ class CourseManager
);
$email_admin = api_get_setting('emailAdministrator');
$additionalParameters = [
'smsType' => SmsPlugin::NEW_USER_SUBSCRIBED_COURSE,
'userId' => $tutor['user_id'],
'userUsername' => $student['username'],
'courseCode' => $course_code,
];
api_mail_html(
$recipient_name,
$emailto,
$emailsubject,
$emailbody,
$sender_name,
$email_admin,
null,
null,
null,
$additionalParameters
$email_admin
);
}
}

62
public/main/inc/lib/course_request.lib.php
Unescape View File

@ -171,29 +171,16 @@ class CourseRequestManager
);
$recipient_email_admin = api_get_setting('emailAdministrator');
$userInfo = api_get_user_info($user_id);
$additionalParameters = [
'smsType' => SmsPlugin::NEW_COURSE_SUGGESTED_TEACHER,
'userId' => $user_id,
'userUsername' => $userInfo['username'],
];
api_mail_html(
$recipient_name_admin,
$recipient_email_admin,
$email_subject,
$email_body_admin,
$sender_name_teacher,
$sender_email_teacher,
null,
null,
null,
$additionalParameters
$sender_email_teacher
);
// Sending an e-mail to the requestor.
// Sending an e-mail to the request.
$email_body_teacher = get_lang('Dear', null, $email_language).' ';
$email_body_teacher .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
$email_body_teacher .= $email_body;
@ -216,12 +203,6 @@ class CourseRequestManager
$recipient_name_teacher = $sender_name_teacher;
$recipient_email_teacher = $sender_email_teacher;
$additionalParameters = [
'smsType' => SmsPlugin::COURSE_OPENING_REQUEST_CODE_REGISTERED,
'userId' => $user_info['user_id'],
'courseCode' => $wanted_code,
];
api_mail_html(
$recipient_name_teacher,
$recipient_email_teacher,
@ -231,8 +212,7 @@ class CourseRequestManager
$sender_email_admin,
null,
null,
null,
$additionalParameters
null
);
return $last_insert_id;
@ -560,23 +540,13 @@ class CourseRequestManager
);
$recipient_email = $user_info['mail'];
$additionalParameters = [
'smsType' => SmsPlugin::COURSE_OPENING_REQUEST_CODE_APPROVED,
'userId' => $user_id,
'courseCode' => $course->getCode(),
];
api_mail_html(
$recipient_name,
$recipient_email,
$email_subject,
$email_body,
$sender_name,
$sender_email,
null,
null,
null,
$additionalParameters
$sender_email
);
return $course->getCode();
@ -652,23 +622,13 @@ class CourseRequestManager
);
$recipient_email = $user_info['mail'];
$additionalParameters = [
'smsType' => SmsPlugin::COURSE_OPENING_REQUEST_CODE_REJECTED,
'userId' => $user_id,
'courseCode' => $code,
];
api_mail_html(
$recipient_name,
$recipient_email,
$email_subject,
$email_body,
$sender_name,
$sender_email,
null,
null,
null,
$additionalParameters
$sender_email
);
return true;
@ -740,23 +700,13 @@ class CourseRequestManager
);
$recipient_email = $user_info['mail'];
$additionalParameters = [
'smsType' => SmsPlugin::COURSE_OPENING_REQUEST_CODE,
'userId' => $user_id,
'courseCode' => $code,
];
$result = api_mail_html(
$recipient_name,
$recipient_email,
$email_subject,
$email_body,
$sender_name,
$sender_email,
null,
null,
null,
$additionalParameters
$sender_email
);
if (!$result) {

3
public/main/inc/lib/message.lib.php
Unescape View File

@ -450,7 +450,6 @@ class MessageManager
* @param int $sender_id
* @param bool $sendCopyToDrhUsers send copy to related DRH users
* @param bool $directMessage
* @param array $smsParameters
* @param bool $uploadFiles Do not upload files using the MessageManager class
* @param array $attachmentList
*
@ -463,7 +462,6 @@ class MessageManager
$sender_id = 0,
$sendCopyToDrhUsers = false,
$directMessage = false,
$smsParameters = [],
$uploadFiles = true,
$attachmentList = []
) {
@ -1666,7 +1664,6 @@ class MessageManager
$senderId,
false,
false,
[],
false
);
}

32
public/main/inc/lib/plugin.lib.php
Unescape View File

@ -837,38 +837,6 @@ class AppPlugin
}
}
/**
* Get first SMS plugin name.
*
* @return string|bool
*/
public function getSMSPluginName()
{
$installedPluginsList = $this->getInstalledPluginListObject();
foreach ($installedPluginsList as $installedPlugin) {
if ($installedPlugin->isMailPlugin) {
return get_class($installedPlugin);
}
}
return false;
}
/**
* @return SmsPluginLibraryInterface
*/
public function getSMSPluginLibrary()
{
$className = $this->getSMSPluginName();
$className = str_replace('Plugin', '', $className);
if (class_exists($className)) {
return new $className();
}
return false;
}
/**
* @param array $pluginRegionList
* @param string $pluginRegion

14
public/main/inc/lib/usermanager.lib.php
Unescape View File

@ -411,13 +411,6 @@ class UserManager
$mailTemplateManager = new MailTemplateManager();
$phoneNumber = $extra['mobile_phone_number'] ?? null;
$additionalParameters = [
'smsType' => SmsPlugin::WELCOME_LOGIN_PASSWORD,
'userId' => $userId,
'mobilePhoneNumber' => $phoneNumber,
'password' => $original_password,
];
$emailBodyTemplate = '';
if (!empty($emailTemplate)) {
if (isset($emailTemplate['content_registration_platform.tpl']) &&
@ -452,12 +445,7 @@ class UserManager
$emailSubject,
$emailBody,
$sender_name,
$email_admin,
null,
null,
null,
$additionalParameters,
$creatorEmail
$email_admin
);
$emailBody = $tpl->render('@ChamiloCore/Mailer/Legacy/new_user_second_email_confirmation.html.twig');

15
public/main/work/work.lib.php
Unescape View File

@ -3155,22 +3155,10 @@ function sendEmailToStudentsOnHomeworkCreation($workId, $courseId, $sessionId =
'<a href="'.$link.'">'.get_lang('Please check the assignments page.').'</a>';
$emailbody .= "\n\n".$currentUser['complete_name'];
$additionalParameters = [
'smsType' => SmsPlugin::ASSIGNMENT_BEEN_CREATED_COURSE,
'userId' => $student['user_id'],
'courseTitle' => $courseCode,
'link' => $link,
];
MessageManager::send_message_simple(
$student['user_id'],
$emailsubject,
$emailbody,
null,
false,
false,
$additionalParameters,
false
$emailbody
);
}
}
@ -4652,7 +4640,6 @@ function sendAlertToUsers($workInfo, $workId, $courseInfo, $sessionId = 0)
0,
false,
false,
[],
false
);
}

Write Preview
Loading…
Cancel
Save