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

Minor - Code convention

Browse Source
1.9.x
Imanol Losada 11 years ago
parent 5528500519
commit f265ae1d8e
13 changed files with 212 additions and 62 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. 2
      main/auth/inscription.php
  2. 29
      main/dropbox/dropbox_functions.inc.php
  3. 15
      main/inc/ajax/user_manager.ajax.php
  4. 17
      main/inc/lib/add_course.lib.inc.php
  5. 17
      main/inc/lib/course.lib.php
  6. 80
      main/inc/lib/course_request.lib.php
  7. 2
      main/inc/lib/database.lib.php
  8. 32
      main/inc/lib/mail.lib.inc.php
  9. 8
      main/inc/lib/main_api.lib.php
  10. 16
      main/inc/lib/usermanager.lib.php
  11. 12
      main/mySpace/myspace.lib.php
  12. 18
      main/user/user_add.php
  13. 26
      main/work/work.lib.php

2
main/auth/inscription.php
Unescape View File

@ -521,7 +521,7 @@ if ($form->validate()) {
$user_id
);
}
// 3. exit the page
unset($user_id);

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

@ -879,15 +879,36 @@ 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);
$additional_parameters = array(
$additionalParameters = array(
'smsType' => 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'], null, PERSON_NAME_EMAIL_ADDRESS),
$recipent_temp['email'], get_lang('NewDropboxFileUploaded'), get_lang('NewDropboxFileUploadedContent').' '.api_get_path(WEB_CODE_PATH).'dropbox/index.php?cidReq='.$_course['sysCode']."\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, null, $additional_parameters);
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').' '.api_get_path(WEB_CODE_PATH).
'dropbox/index.php?cidReq='.$_course['sysCode']."\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_ADDRES
),
$_user['mail'],
null,
null,
null,
$additionalParameters
);
}
}

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

@ -82,7 +82,6 @@ switch ($action) {
//Send and email if account is active
if ($status == 1) {
$user_info = api_get_user_info($user_id);
$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
@ -96,13 +95,21 @@ switch ($action) {
//$emailbody.=get_lang('Problem'). "\n\n". get_lang('Formula');
$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');
$additional_parameters = array(
$additionalParameters = array(
'smsType' => ACCOUNT_APPROVED_CONNECT,
'userId' => $user_id
);
//$result = api_mail($recipient_name, $user_info['mail'], $emailsubject, $emailbody, $sender_name, $email_admin);
$result = api_mail($recipient_name, $user_info['mail'], $emailsubject, $emailbody, $sender_name, $email_admin, '', $additional_parameters);
$result = api_mail(
$recipient_name,
$user_info['mail'],
$emailsubject,
$emailbody,
$sender_name,
$email_admin,
'',
$additionalParameters
);
event_system(LOG_USER_ENABLE, LOG_USER_ID, $user_id);
} else {
event_system(LOG_USER_DISABLE, LOG_USER_ID, $user_id);

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

@ -2910,16 +2910,25 @@ function register_course($params)
$message .= get_lang('Language').' '.$course_language;
$userInfo = api_get_user_info($user_id);
$additional_parameters = array(
$additionalParameters = array(
'smsType' => NEW_COURSE_BEEN_CREATED,
'userId' => $user_id,
'courseName' => $title,
'creatorUsername' => $userInfo['username']
);
//@api_mail($recipient_name, $recipient_email, $subject, $message, $siteName, $recipient_email);
api_mail_html($recipient_name, $recipient_email, $subject, $message,
$siteName, $recipient_email, null, null, null, $additional_parameters);
api_mail_html(
$recipient_name,
$recipient_email,
$subject,
$message,
$siteName,
$recipient_email,
null,
null,
null,
$additionalParameters
);
}
}
}

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

@ -2443,16 +2443,25 @@ 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');
$additional_parameters = array(
$additionalParameters = array(
'smsType' => NEW_USER_SUBSCRIBED_COURSE,
'userId' => $tutor['user_id'],
'userUsername' => $student['username'],
'courseCode' => $course_code
);
//@api_mail($recipient_name, $emailto, $emailsubject, $emailbody, $sender_name,$email_admin);
api_mail_html($recipient_name, $emailto, $emailsubject, $emailbody,
$sender_name, $email_admin, null, null, null, $additional_parameters);
api_mail_html(
$recipient_name,
$emailto,
$emailsubject,
$emailbody,
$sender_name,
$email_admin,
null,
null,
null,
$additionalParameters
);
}
}

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

@ -146,14 +146,24 @@ class CourseRequestManager {
$recipient_email_admin = get_setting('emailAdministrator');
$userInfo = api_get_user_info($user_id);
$additional_parameters = array(
$additionalParameters = array(
'smsType' => 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, $additional_parameters);
api_mail_html(
$recipient_name_admin,
$recipient_email_admin,
$email_subject,
$email_body_admin,
$sender_name_teacher,
$sender_email_teacher,
null,
null,
null,
$additionalParameters
);
// Sending an e-mail to the requestor.
@ -173,14 +183,24 @@ class CourseRequestManager {
$recipient_name_teacher = $sender_name_teacher;
$recipient_email_teacher = $sender_email_teacher;
$additional_parameters = array(
$additionalParameters = array(
'smsType' => COURSE_OPENING_REQUEST_CODE_REGISTERED,
'userId' => $user_info['user_id'],
'courseCode' => $wanted_code
);
api_mail_html($recipient_name_teacher, $recipient_email_teacher, $email_subject, $email_body_teacher,
$sender_name_admin, $sender_email_admin, null, null, null, $additional_parameters);
api_mail_html(
$recipient_name_teacher,
$recipient_email_teacher,
$email_subject,
$email_body_teacher,
$sender_name_admin,
$sender_email_admin,
null,
null,
null,
$additionalParameters
);
return $last_insert_id;
@ -431,14 +451,24 @@ class CourseRequestManager {
$recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email;
$additional_parameters = array(
$additionalParameters = array(
'smsType' => COURSE_OPENING_REQUEST_CODE_APPROVED,
'userId' => $user_id,
'courseCode' => $course_info['code']
);
api_mail_html($recipient_name, $recipient_email, $email_subject, $email_body,
$sender_name, $sender_email, null, null, null, $additional_parameters);
api_mail_html(
$recipient_name,
$recipient_email,
$email_subject,
$email_body,
$sender_name,
$sender_email,
null,
null,
null,
$additionalParameters
);
return $course_info['code'];
}
@ -503,14 +533,24 @@ class CourseRequestManager {
$recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email;
$additional_parameters = array(
$additionalParameters = array(
'smsType' => 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, $additional_parameters);
api_mail_html(
$recipient_name,
$recipient_email,
$email_subject,
$email_body,
$sender_name,
$sender_email,
null,
null,
null,
$additionalParameters
);
return true;
}
@ -573,14 +613,24 @@ class CourseRequestManager {
$recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email;
$additional_parameters = array(
$additionalParameters = array(
'smsType' => 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, $additional_parameters);
$result = api_mail_html(
$recipient_name,
$recipient_email,
$email_subject,
$email_body,
$sender_name,
$sender_email,
null,
null,
null,
$additionalParameters
);
if (!$result) {
return false;

2
main/inc/lib/database.lib.php
Unescape View File

@ -1150,7 +1150,7 @@ class Database {
var_dump($sql);
}
return self::insert_id();
}
}
return false;
}

32
main/inc/lib/mail.lib.inc.php
Unescape View File

@ -30,10 +30,28 @@ require_once api_get_path(LIBRARY_PATH).'phpmailer/class.phpmailer.php';
* @see class.phpmailer.php
* @deprecated use api_mail_html()
*/
function api_mail($recipient_name, $recipient_email, $subject, $message, $sender_name = '',
$sender_email = '', $extra_headers = '', $additional_parameters = array()) {
api_mail_html($recipient_name, $recipient_email, $subject, $message, $sender_name,
$sender_email, $extra_headers, null, null, $additional_parameters);
function api_mail(
$recipient_name,
$recipient_email,
$subject,
$message,
$sender_name = '',
$sender_email = '',
$extra_headers = '',
$additionalParameters = array()
) {
api_mail_html(
$recipient_name,
$recipient_email,
$subject,
$message,
$sender_name,
$sender_email,
$extra_headers,
null,
null,
$additionalParameters
);
}
/**
@ -58,7 +76,7 @@ function api_mail($recipient_name, $recipient_email, $subject, $message, $sender
* @see class.phpmailer.php
*/
function api_mail_html($recipient_name, $recipient_email, $subject, $message, $sender_name = '', $sender_email = '',
$extra_headers = array(), $data_file = array(), $embedded_image = false, $additional_parameters = array())
$extra_headers = array(), $data_file = array(), $embedded_image = false, $additionalParameters = array())
{
global $platform_email;
@ -208,9 +226,9 @@ function api_mail_html($recipient_name, $recipient_email, $subject, $message, $s
$plugin = new AppPlugin();
$installedPluginsList = $plugin->getInstalledPluginListObject();
foreach ($installedPluginsList as $installedPlugin) {
if ($installedPlugin->isMailPlugin and array_key_exists("smsType", $additional_parameters)) {
if ($installedPlugin->isMailPlugin and array_key_exists("smsType", $additionalParameters)) {
$clockworksmsObject = new Clockworksms();
$clockworksmsObject->send($additional_parameters);
$clockworksmsObject->send($additionalParameters);
}
}

8
main/inc/lib/main_api.lib.php
Unescape View File

@ -5806,11 +5806,11 @@ function api_sql_query($query, $file = '', $line = 0) {
* @param string $subject
* @param string $message
* @param string $additional_headers
* @param string $additional_parameters
* @param string $additionalParameters
* @author Ivan Tcholakov, 04-OCT-2009, a reworked version of this function.
* @link http://www.dokeos.com/forum/viewtopic.php?t=15557
*/
function api_send_mail($to, $subject, $message, $additional_headers = null, $additional_parameters = array()) {
function api_send_mail($to, $subject, $message, $additional_headers = null, $additionalParameters = array()) {
require_once api_get_path(LIBRARY_PATH).'phpmailer/class.phpmailer.php';
@ -5901,9 +5901,9 @@ function api_send_mail($to, $subject, $message, $additional_headers = null, $add
$plugin = new AppPlugin();
$installedPluginsList = $plugin->getInstalledPluginListObject();
foreach ($installedPluginsList as $installedPlugin) {
if ($installedPlugin->isMailPlugin and array_key_exists("smsType", $additional_parameters)) {
if ($installedPlugin->isMailPlugin and array_key_exists("smsType", $additionalParameters)) {
$clockworksmsObject = new Clockworksms();
$clockworksmsObject->send($additional_parameters);
$clockworksmsObject->send($additionalParameters);
}
}

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

@ -210,14 +210,24 @@ class UserManager
$values["prior_lang"] = null;
EventsDispatcher::events('user_registration', $values);
} else {
$additional_parameters = array(
$additionalParameters = array(
'smsType' => WELCOME_LOGIN_PASSWORD,
'userId' => $return,
'mobilePhoneNumber' => $extra['mobile_phone_number'],
'password' => $original_password
);
api_mail_html($recipient_name, $email, $emailsubject, $emailbody,
$sender_name, $email_admin, null, null, null, $additional_parameters);
api_mail_html(
$recipient_name,
$email,
$emailsubject,
$emailbody,
$sender_name,
$email_admin,
null,
null,
null,
$additionalParameters
);
}
/* ENDS MANAGE EVENT WITH MAIL */
}

12
main/mySpace/myspace.lib.php
Unescape View File

@ -2249,7 +2249,7 @@ class MySpace
// Sending emails.
$addedto = '';
if ($sendMail) {
$i = 0;
$i = 0;
foreach ($users as $index => $user) {
$emailto = api_get_person_name($user['FirstName'], $user['LastName'], null, PERSON_NAME_EMAIL_ADDRESS).' <'.$user['Email'].'>';
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
@ -2258,14 +2258,20 @@ class MySpace
$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
/*$extra = get_user_overview_export_extra_fields($user['user_id']);
$additional_parameters = array(
$additionalParameters = array(
'smsType' => WELCOME_LOGIN_PASSWORD,
'userId' => $user['user_id'],
'mobilePhoneNumber' => $extra['mobile_phone_number'],
'password' => "$user[Password]"
);*/
@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders/*, $additional_parameters*/);
@api_send_mail(
$emailto,
$emailsubject,
$emailbody,
$emailheaders/*,
$additionalParameters*/
);
if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
if ($user['added_at_platform'] == 1) {

18
main/user/user_add.php
Unescape View File

@ -203,16 +203,24 @@ if($register) {
$message = stripslashes(api_get_person_name($firstname_form, $lastname_form))." ".get_lang('AddedU');
}
$additional_parameters = array(
$additionalParameters = array(
'smsType' => BEEN_SUBSCRIBED_COURSE,
'userId' => $user_id,
'courseTitle' => $currentCourseName
);
api_mail_html($recipient_name, $email_form, $emailsubject, $emailbody,
$sender_name,$email_admin, null, null, null, $additional_parameters);
//@api_mail($recipient_name, $email_form, $emailsubject, $emailbody, $sender_name,$email_admin);
api_mail_html(
$recipient_name,
$email_form,
$emailsubject,
$emailbody,
$sender_name,
$email_admin,
null,
null,
null,
$additionalParameters
);
/*
* remove <form> variables to prevent any pre-filled fields

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

@ -2347,18 +2347,30 @@ 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"]);
$additional_parameters = array(
$additionalParameters = array(
'smsType' => ASSIGNMENT_BEEN_CREATED_COURSE,
'userId' => $student["user_id"],
'courseTitle' => $course_id
);
api_mail_html($name_user, $user_info["mail"], $emailsubject, $emailbody, api_get_person_name(
$currentUser["firstname"], $currentUser["lastname"], null, PERSON_NAME_EMAIL_ADDRESS),
$currentUser["mail"], null, null, null, $additional_parameters);
//@api_mail($name_user, $user_info["mail"], $emailsubject, $emailbody, api_get_person_name($currentUser["firstname"], $currentUser["lastname"], null, PERSON_NAME_EMAIL_ADDRESS), $currentUser["mail"]);
}
api_mail_html(
$name_user,
$user_info["mail"],
$emailsubject,
$emailbody,
api_get_person_name(
$currentUser["firstname"],
$currentUser["lastname"],
null,
PERSON_NAME_EMAIL_ADDRESS
),
$currentUser["mail"],
null,
null,
null,
$additionalParameters
);
}
}
}
}

Write Preview
Loading…
Cancel
Save