From 06154d6d5cf3670588f7345135ffec7c16e06540 Mon Sep 17 00:00:00 2001 From: Imanol Losada Date: Wed, 1 Apr 2015 10:04:00 -0500 Subject: [PATCH] Edit sms plugin calls - refs BT#8939 --- main/admin/user_add.php | 36 +++++++++++++++++++++----- main/dropbox/dropbox_functions.inc.php | 3 ++- main/inc/ajax/user_manager.ajax.php | 3 ++- main/inc/lib/add_course.lib.inc.php | 3 ++- main/inc/lib/course.lib.php | 3 ++- main/inc/lib/course_request.lib.php | 15 +++++++---- main/inc/lib/usermanager.lib.php | 3 ++- main/user/user_add.php | 3 ++- main/work/work.lib.php | 3 ++- 9 files changed, 54 insertions(+), 18 deletions(-) diff --git a/main/admin/user_add.php b/main/admin/user_add.php index 50a8f545ca..f1066b85a0 100755 --- a/main/admin/user_add.php +++ b/main/admin/user_add.php @@ -314,7 +314,32 @@ if( $form->validate()) { $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(); $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); } - foreach ($user as $key => $value) { - if (substr($key, 0, 6) == 'extra_') { //an extra field - UserManager::update_extra_field_value($user_id, substr($key, 6), $value); - } - } + foreach ($extra as $key => $value) { + UserManager::update_extra_field_value($user_id, $key, $value); + } + if ($platform_admin) { UserManager::add_user_as_admin($user_id); } diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php index 8122ed8b57..cd4170081e 100755 --- a/main/dropbox/dropbox_functions.inc.php +++ b/main/dropbox/dropbox_functions.inc.php @@ -879,8 +879,9 @@ function store_add_dropbox() if ($b_send_mail) { foreach ($new_work_recipients as $recipient_id) { $recipent_temp = UserManager :: get_user_info_by_id($recipient_id); + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::NEW_FILE_SHARED_COURSE_BY, + 'smsType' => constant($plugin->getSMSPluginName().'::NEW_FILE_SHARED_COURSE_BY'), 'userId' => $recipient_id, 'courseTitle' => $_course['title'], 'userUsername' => $recipent_temp['username'] diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php index ca5890ac23..f7f22a7e18 100755 --- a/main/inc/ajax/user_manager.ajax.php +++ b/main/inc/ajax/user_manager.ajax.php @@ -95,8 +95,9 @@ switch ($action) { //$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'); + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::ACCOUNT_APPROVED_CONNECT, + 'smsType' => constant($plugin->getSMSPluginName().'::ACCOUNT_APPROVED_CONNECT'), 'userId' => $user_id ); diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index 5dcdb9c420..0e4ff02b9b 100755 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -2915,8 +2915,9 @@ function register_course($params) $message .= get_lang('Language').' '.$course_language; $userInfo = api_get_user_info($user_id); + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::NEW_COURSE_BEEN_CREATED, + 'smsType' => constant($plugin->getSMSPluginName().'::NEW_COURSE_BEEN_CREATED'), 'userId' => $user_id, 'courseName' => $title, 'creatorUsername' => $userInfo['username'] diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index ea2de9f004..dbcce2442d 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -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); $email_admin = api_get_setting('emailAdministrator'); + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::NEW_USER_SUBSCRIBED_COURSE, + 'smsType' => constant($plugin->getSMSPluginName().'::NEW_USER_SUBSCRIBED_COURSE'), 'userId' => $tutor['user_id'], 'userUsername' => $student['username'], 'courseCode' => $course_code diff --git a/main/inc/lib/course_request.lib.php b/main/inc/lib/course_request.lib.php index 68bdd295ff..1839adfba4 100755 --- a/main/inc/lib/course_request.lib.php +++ b/main/inc/lib/course_request.lib.php @@ -148,8 +148,9 @@ class CourseRequestManager $recipient_email_admin = get_setting('emailAdministrator'); $userInfo = api_get_user_info($user_id); + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::NEW_COURSE_SUGGESTED_TEACHER, + 'smsType' => constant($plugin->getSMSPluginName().'::NEW_COURSE_SUGGESTED_TEACHER'), 'userId' => $user_id, 'userUsername' => $userInfo['username'] ); @@ -185,8 +186,9 @@ class CourseRequestManager $recipient_name_teacher = $sender_name_teacher; $recipient_email_teacher = $sender_email_teacher; + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::COURSE_OPENING_REQUEST_CODE_REGISTERED, + 'smsType' => constant($plugin->getSMSPluginName().'::COURSE_OPENING_REQUEST_CODE_REGISTERED'), 'userId' => $user_info['user_id'], 'courseCode' => $wanted_code ); @@ -466,8 +468,9 @@ class CourseRequestManager $recipient_email = $user_info['mail']; $extra_headers = 'Bcc: '.$sender_email; + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::COURSE_OPENING_REQUEST_CODE_APPROVED, + 'smsType' => constant($plugin->getSMSPluginName().'::COURSE_OPENING_REQUEST_CODE_APPROVED'), 'userId' => $user_id, 'courseCode' => $course_info['code'] ); @@ -544,8 +547,9 @@ class CourseRequestManager $recipient_email = $user_info['mail']; $extra_headers = 'Bcc: '.$sender_email; + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::COURSE_OPENING_REQUEST_CODE_REJECTED, + 'smsType' => constant($plugin->getSMSPluginName().'::COURSE_OPENING_REQUEST_CODE_REJECTED'), 'userId' => $user_id, 'courseCode' => $code ); @@ -621,8 +625,9 @@ class CourseRequestManager $recipient_email = $user_info['mail']; $extra_headers = 'Bcc: '.$sender_email; + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::COURSE_OPENING_REQUEST_CODE, + 'smsType' => constant($plugin->getSMSPluginName().'::COURSE_OPENING_REQUEST_CODE'), 'userId' => $user_id, 'courseCode' => $code ); diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index d5331a51f4..5b6a4cb1b4 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -208,8 +208,9 @@ class UserManager EventsDispatcher::events('user_registration', $values); } else { $phoneNumber = isset($extra['mobile_phone_number']) ? $extra['mobile_phone_number'] : null; + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::WELCOME_LOGIN_PASSWORD, + 'smsType' => constant($plugin->getSMSPluginName().'::WELCOME_LOGIN_PASSWORD'), 'userId' => $return, 'mobilePhoneNumber' => $phoneNumber, 'password' => $original_password diff --git a/main/user/user_add.php b/main/user/user_add.php index 4c9117042b..5be1f3933c 100755 --- a/main/user/user_add.php +++ b/main/user/user_add.php @@ -203,8 +203,9 @@ if($register) { $message = stripslashes(api_get_person_name($firstname_form, $lastname_form))." ".get_lang('AddedU'); } + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::BEEN_SUBSCRIBED_COURSE, + 'smsType' => constant($plugin->getSMSPluginName().'::BEEN_SUBSCRIBED_COURSE'), 'userId' => $user_id, 'courseTitle' => $currentCourseName ); diff --git a/main/work/work.lib.php b/main/work/work.lib.php index dbc3f08cbf..de9effa218 100755 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -2544,8 +2544,9 @@ function send_email_on_homework_creation($course_id) $emailbody .= get_lang('HomeworkHasBeenCreatedForTheCourse')." ".$course_id.". "."\n\n".get_lang('PleaseCheckHomeworkPage'); $emailbody .= "\n\n".api_get_person_name($currentUser["firstname"], $currentUser["lastname"]); + $plugin = new AppPlugin(); $additionalParameters = array( - 'smsType' => ClockworksmsPlugin::ASSIGNMENT_BEEN_CREATED_COURSE, + 'smsType' => constant($plugin->getSMSPluginName().'::ASSIGNMENT_BEEN_CREATED_COURSE'), 'userId' => $student["user_id"], 'courseTitle' => $course_id );