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

Edit sms plugin calls - refs BT#8939

Browse Source
1.9.x
Imanol Losada 11 years ago
parent 079a85271a
commit 06154d6d5c
9 changed files with 54 additions and 18 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. 36
      main/admin/user_add.php
  2. 3
      main/dropbox/dropbox_functions.inc.php
  3. 3
      main/inc/ajax/user_manager.ajax.php
  4. 3
      main/inc/lib/add_course.lib.inc.php
  5. 3
      main/inc/lib/course.lib.php
  6. 15
      main/inc/lib/course_request.lib.php
  7. 3
      main/inc/lib/usermanager.lib.php
  8. 3
      main/user/user_add.php
  9. 3
      main/work/work.lib.php

36
main/admin/user_add.php
Unescape View File

@ -314,7 +314,32 @@ if( $form->validate()) {
$username = $email; $username = $email;
} }
$user_id = UserManager::create_user($firstname, $lastname, $status, $email, $username, $password, $official_code, $language, $phone, null, $auth_source, $expiration_date, $active, $hr_dept_id, null, null, $send_mail); $extra = array();
foreach ($user as $key => $value) {
if (substr($key, 0, 6) == 'extra_') { //an extra field
$extra[substr($key, 6)] = $value;
}
}
$user_id = UserManager::create_user(
$firstname,
$lastname,
$status,
$email,
$username,
$password,
$official_code,
$language,
$phone,
null,
$auth_source,
$expiration_date,
$active,
$hr_dept_id,
$extra,
null,
$send_mail
);
Security::clear_token(); Security::clear_token();
$tok = Security::get_token(); $tok = Security::get_token();
@ -332,11 +357,10 @@ if( $form->validate()) {
UserManager::update_user($user_id, $firstname, $lastname, $username, $password, $auth_source, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active, null, $hr_dept_id, null, $language); UserManager::update_user($user_id, $firstname, $lastname, $username, $password, $auth_source, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active, null, $hr_dept_id, null, $language);
} }
foreach ($user as $key => $value) { foreach ($extra as $key => $value) {
if (substr($key, 0, 6) == 'extra_') { //an extra field UserManager::update_extra_field_value($user_id, $key, $value);
UserManager::update_extra_field_value($user_id, substr($key, 6), $value); }
}
}
if ($platform_admin) { if ($platform_admin) {
UserManager::add_user_as_admin($user_id); UserManager::add_user_as_admin($user_id);
} }

3
main/dropbox/dropbox_functions.inc.php
Unescape View File

@ -879,8 +879,9 @@ function store_add_dropbox()
if ($b_send_mail) { if ($b_send_mail) {
foreach ($new_work_recipients as $recipient_id) { foreach ($new_work_recipients as $recipient_id) {
$recipent_temp = UserManager :: get_user_info_by_id($recipient_id); $recipent_temp = UserManager :: get_user_info_by_id($recipient_id);
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::NEW_FILE_SHARED_COURSE_BY, 'smsType' => constant($plugin->getSMSPluginName().'::NEW_FILE_SHARED_COURSE_BY'),
'userId' => $recipient_id, 'userId' => $recipient_id,
'courseTitle' => $_course['title'], 'courseTitle' => $_course['title'],
'userUsername' => $recipent_temp['username'] 'userUsername' => $recipent_temp['username']

3
main/inc/ajax/user_manager.ajax.php
Unescape View File

@ -95,8 +95,9 @@ switch ($action) {
//$emailbody.=get_lang('Problem'). "\n\n". get_lang('SignatureFormula'); //$emailbody.=get_lang('Problem'). "\n\n". get_lang('SignatureFormula');
$emailbody.=api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator'); $emailbody.=api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::ACCOUNT_APPROVED_CONNECT, 'smsType' => constant($plugin->getSMSPluginName().'::ACCOUNT_APPROVED_CONNECT'),
'userId' => $user_id 'userId' => $user_id
); );

3
main/inc/lib/add_course.lib.inc.php
Unescape View File

@ -2915,8 +2915,9 @@ function register_course($params)
$message .= get_lang('Language').' '.$course_language; $message .= get_lang('Language').' '.$course_language;
$userInfo = api_get_user_info($user_id); $userInfo = api_get_user_info($user_id);
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::NEW_COURSE_BEEN_CREATED, 'smsType' => constant($plugin->getSMSPluginName().'::NEW_COURSE_BEEN_CREATED'),
'userId' => $user_id, 'userId' => $user_id,
'courseName' => $title, 'courseName' => $title,
'creatorUsername' => $userInfo['username'] 'creatorUsername' => $userInfo['username']

3
main/inc/lib/course.lib.php
Unescape View File

@ -2604,8 +2604,9 @@ class CourseManager
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS); $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$email_admin = api_get_setting('emailAdministrator'); $email_admin = api_get_setting('emailAdministrator');
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::NEW_USER_SUBSCRIBED_COURSE, 'smsType' => constant($plugin->getSMSPluginName().'::NEW_USER_SUBSCRIBED_COURSE'),
'userId' => $tutor['user_id'], 'userId' => $tutor['user_id'],
'userUsername' => $student['username'], 'userUsername' => $student['username'],
'courseCode' => $course_code 'courseCode' => $course_code

15
main/inc/lib/course_request.lib.php
Unescape View File

@ -148,8 +148,9 @@ class CourseRequestManager
$recipient_email_admin = get_setting('emailAdministrator'); $recipient_email_admin = get_setting('emailAdministrator');
$userInfo = api_get_user_info($user_id); $userInfo = api_get_user_info($user_id);
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::NEW_COURSE_SUGGESTED_TEACHER, 'smsType' => constant($plugin->getSMSPluginName().'::NEW_COURSE_SUGGESTED_TEACHER'),
'userId' => $user_id, 'userId' => $user_id,
'userUsername' => $userInfo['username'] 'userUsername' => $userInfo['username']
); );
@ -185,8 +186,9 @@ class CourseRequestManager
$recipient_name_teacher = $sender_name_teacher; $recipient_name_teacher = $sender_name_teacher;
$recipient_email_teacher = $sender_email_teacher; $recipient_email_teacher = $sender_email_teacher;
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::COURSE_OPENING_REQUEST_CODE_REGISTERED, 'smsType' => constant($plugin->getSMSPluginName().'::COURSE_OPENING_REQUEST_CODE_REGISTERED'),
'userId' => $user_info['user_id'], 'userId' => $user_info['user_id'],
'courseCode' => $wanted_code 'courseCode' => $wanted_code
); );
@ -466,8 +468,9 @@ class CourseRequestManager
$recipient_email = $user_info['mail']; $recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email; $extra_headers = 'Bcc: '.$sender_email;
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::COURSE_OPENING_REQUEST_CODE_APPROVED, 'smsType' => constant($plugin->getSMSPluginName().'::COURSE_OPENING_REQUEST_CODE_APPROVED'),
'userId' => $user_id, 'userId' => $user_id,
'courseCode' => $course_info['code'] 'courseCode' => $course_info['code']
); );
@ -544,8 +547,9 @@ class CourseRequestManager
$recipient_email = $user_info['mail']; $recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email; $extra_headers = 'Bcc: '.$sender_email;
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::COURSE_OPENING_REQUEST_CODE_REJECTED, 'smsType' => constant($plugin->getSMSPluginName().'::COURSE_OPENING_REQUEST_CODE_REJECTED'),
'userId' => $user_id, 'userId' => $user_id,
'courseCode' => $code 'courseCode' => $code
); );
@ -621,8 +625,9 @@ class CourseRequestManager
$recipient_email = $user_info['mail']; $recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email; $extra_headers = 'Bcc: '.$sender_email;
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::COURSE_OPENING_REQUEST_CODE, 'smsType' => constant($plugin->getSMSPluginName().'::COURSE_OPENING_REQUEST_CODE'),
'userId' => $user_id, 'userId' => $user_id,
'courseCode' => $code 'courseCode' => $code
); );

3
main/inc/lib/usermanager.lib.php
Unescape View File

@ -208,8 +208,9 @@ class UserManager
EventsDispatcher::events('user_registration', $values); EventsDispatcher::events('user_registration', $values);
} else { } else {
$phoneNumber = isset($extra['mobile_phone_number']) ? $extra['mobile_phone_number'] : null; $phoneNumber = isset($extra['mobile_phone_number']) ? $extra['mobile_phone_number'] : null;
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::WELCOME_LOGIN_PASSWORD, 'smsType' => constant($plugin->getSMSPluginName().'::WELCOME_LOGIN_PASSWORD'),
'userId' => $return, 'userId' => $return,
'mobilePhoneNumber' => $phoneNumber, 'mobilePhoneNumber' => $phoneNumber,
'password' => $original_password 'password' => $original_password

3
main/user/user_add.php
Unescape View File

@ -203,8 +203,9 @@ if($register) {
$message = stripslashes(api_get_person_name($firstname_form, $lastname_form))." ".get_lang('AddedU'); $message = stripslashes(api_get_person_name($firstname_form, $lastname_form))." ".get_lang('AddedU');
} }
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::BEEN_SUBSCRIBED_COURSE, 'smsType' => constant($plugin->getSMSPluginName().'::BEEN_SUBSCRIBED_COURSE'),
'userId' => $user_id, 'userId' => $user_id,
'courseTitle' => $currentCourseName 'courseTitle' => $currentCourseName
); );

3
main/work/work.lib.php
Unescape View File

@ -2544,8 +2544,9 @@ function send_email_on_homework_creation($course_id)
$emailbody .= get_lang('HomeworkHasBeenCreatedForTheCourse')." ".$course_id.". "."\n\n".get_lang('PleaseCheckHomeworkPage'); $emailbody .= get_lang('HomeworkHasBeenCreatedForTheCourse')." ".$course_id.". "."\n\n".get_lang('PleaseCheckHomeworkPage');
$emailbody .= "\n\n".api_get_person_name($currentUser["firstname"], $currentUser["lastname"]); $emailbody .= "\n\n".api_get_person_name($currentUser["firstname"], $currentUser["lastname"]);
$plugin = new AppPlugin();
$additionalParameters = array( $additionalParameters = array(
'smsType' => ClockworksmsPlugin::ASSIGNMENT_BEEN_CREATED_COURSE, 'smsType' => constant($plugin->getSMSPluginName().'::ASSIGNMENT_BEEN_CREATED_COURSE'),
'userId' => $student["user_id"], 'userId' => $student["user_id"],
'courseTitle' => $course_id 'courseTitle' => $course_id
); );

Write Preview
Loading…
Cancel
Save