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

Removing require_once for "mail.lib.inc.php"

Browse Source
skala
Julio Montoya 13 years ago
parent dca6d44591
commit f4f0ea6397
14 changed files with 69 additions and 101 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. 1
      certificates/index.php
  2. 2
      custompages/registration.php
  3. 11
      main/admin/user_import.php
  4. 39
      main/auth/courses.php
  5. 1
      main/auth/inscription.php
  6. 19
      main/auth/lostPassword.php
  7. 43
      main/chat/chat_functions.lib.php
  8. 2
      main/create_course/add_course.php
  9. 1
      main/dropbox/dropbox_init.inc.php
  10. 1
      main/exercice/exercice.php
  11. 5
      main/exercice/hotpotatoes_exercise_report.php
  12. 1
      main/forum/forumfunction.inc.php
  13. 15
      main/inc/email_editor.php
  14. 29
      main/inc/lib/course_request.lib.php

1
certificates/index.php
Unescape View File

@ -12,7 +12,6 @@
$language_file= array('admin', 'gradebook', 'document');
require_once '../main/inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'certificate.lib.php';
$certificate = new Certificate($_GET['id']);

2
custompages/registration.php
Unescape View File

@ -13,9 +13,7 @@
require_once('language.php');
require_once('../inc/global.inc.php');
require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
require_once api_get_path(CONFIGURATION_PATH).'profile.conf.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
/**
* Removes some unwanted elementend of the form object
*/

11
main/admin/user_import.php
Unescape View File

@ -116,7 +116,6 @@ function save_data($users) {
if (!isset($inserted_in_course)) {
$inserted_in_course = array();
}
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
$send_mail = $_POST['sendMail'] ? 1 : 0;
if (is_array($users)) {
foreach ($users as $index => $user) {
@ -300,7 +299,7 @@ if ($_POST['formSent'] AND $_FILES['import_file']['size'] !== 0) {
$user_id_error[] = $my_errors['UserName'];
}
}
if (is_array($users)) {
foreach ($users as $my_user) {
if (!in_array($my_user['UserName'], $user_id_error)) {
@ -309,10 +308,10 @@ if ($_POST['formSent'] AND $_FILES['import_file']['size'] !== 0) {
}
}
$inserted_in_course = array();
if (strcmp($file_type, 'csv') === 0) {
$inserted_in_course = array();
if (strcmp($file_type, 'csv') === 0) {
save_data($users_to_insert);
} elseif (strcmp($file_type, 'xml') === 0) {
} elseif (strcmp($file_type, 'xml') === 0) {
save_data($users_to_insert);
} else {
$error_message = get_lang('YouMustImportAFileAccordingToSelectedOption');
@ -374,7 +373,7 @@ $group[] = $form->createElement('radio', 'file_type', '', 'CSV (<a href="example
$group[] = $form->createElement('radio', 'file_type', null, 'XML (<a href="example.xml" target="_blank">'.get_lang('ExampleXMLFile').'</a>)', 'xml');
$form->addGroup($group, '', get_lang('FileType'), '<br/>');
$group = array();
$group = array();
$group[] = $form->createElement('radio', 'sendMail', '', get_lang('Yes'), 1);
$group[] = $form->createElement('radio', 'sendMail', null, get_lang('No'), 0);
$form->addGroup($group, '', get_lang('SendMailToUsers'), '<br/>');

39
main/auth/courses.php
Unescape View File

@ -16,10 +16,9 @@ $cidReset = true; // Flag forcing the 'current course' reset
// including files
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'auth.lib.php';
require_once api_get_path(LIBRARY_PATH).'auth.lib.php';
require_once api_get_path(LIBRARY_PATH).'app_view.php';
require_once 'courses_controller.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
$htmlHeadXtra[] = '
@ -31,23 +30,23 @@ if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
if ($("#dialog").length == 0) {
dialog = $(\'<div id="dialog" style="display:hidden"></div>\').appendTo(\'body\');
}
// load remote content
dialog.load(
url,
url,
{},
function(responseText, textStatus, XMLHttpRequest) {
dialog.dialog({
modal : true,
width : 540,
height : 400,
});
modal : true,
width : 540,
height : 400,
});
});
//prevent the browser to follow the link
return false;
});
});
</script>';
}
@ -81,7 +80,7 @@ if (isset($_GET['action']) && in_array($_GET['action'],$actions)) {
$action = $_GET['action'];
}
if ($action == 'createcoursecategory') {
if ($action == 'createcoursecategory') {
$nameTools = get_lang('CreateCourseCategory');
}
if ($action == 'subscribe') {
@ -102,13 +101,13 @@ $interbreadcrumb[] = array('url' => api_get_path(WEB_PATH).'user_portal.php', 'n
if (empty($nameTools)) {
$nameTools = get_lang('CourseManagement');
} else {
if (!in_array($action, array('sortmycourses', 'createcoursecategory', 'display_random_courses', 'display_courses', 'subscribe'))) {
$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'auth/courses.php', 'name' => get_lang('CourseManagement'));
}
if ($action == 'createcoursecategory') {
$interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses', 'name' => get_lang('SortMyCourses'));
}
}
$interbreadcrumb[] = array('url' => '#', 'name' => $nameTools);
}
@ -156,7 +155,7 @@ if ($action == 'deletecoursecategory' && isset($_GET['id'])) {
// We are creating a new user defined course category (= Create Course Category).
if (isset($_POST['create_course_category']) && isset($_POST['title_course_category']) && strlen(trim($_POST['title_course_category'])) > 0) {
if ($ctok == $_POST['sec_token']) {
$courses_controller->add_course_category($_POST['title_course_category']);
$courses_controller->add_course_category($_POST['title_course_category']);
}
}
@ -169,9 +168,9 @@ if (isset($_REQUEST['search_course'])) {
}
// Subscribe user to course
if (isset($_REQUEST['subscribe_course'])) {
if (isset($_REQUEST['subscribe_course'])) {
if ($ctok == $_GET['sec_token']) {
$courses_controller->subscribe_user($_GET['subscribe_course'], $_GET['search_term'], $_GET['category_code']);
$courses_controller->subscribe_user($_GET['subscribe_course'], $_GET['search_term'], $_GET['category_code']);
}
}
// We are unsubscribing from a course (=Unsubscribe from course).
@ -189,8 +188,8 @@ if (isset($_POST['unsubscribe'])) {
}
}
switch ($action) {
case 'subscribe_user_with_password':
$courses_controller->subscribe_user($_POST['subscribe_user_with_password'], $_POST['search_term'], $_POST['category_code']);
case 'subscribe_user_with_password':
$courses_controller->subscribe_user($_POST['subscribe_user_with_password'], $_POST['search_term'], $_POST['category_code']);
exit;
break;
case 'createcoursecategory':
@ -199,16 +198,16 @@ switch ($action) {
case 'deletecoursecategory':
$courses_controller->courses_list($action);
break;
case 'sortmycourses':
case 'sortmycourses':
$courses_controller->courses_list($action);
break;
case 'subscribe':
case 'subscribe':
case 'display_random_courses':
if ($user_can_view_page) {
$courses_controller->courses_categories($action);
} else {
api_not_allowed();
}
}
break;
case 'display_courses':
$courses_controller->courses_categories($action, $_GET['category_code']);

1
main/auth/inscription.php
Unescape View File

@ -15,7 +15,6 @@ if (!empty($_POST['language'])) { //quick hack to adapt the registration form re
}
require_once '../inc/global.inc.php';
require_once api_get_path(CONFIGURATION_PATH).'profile.conf.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
if (!empty($_SESSION['user_language_choice'])) {
$user_selected_language = $_SESSION['user_language_choice'];

19
main/auth/lostPassword.php
Unescape View File

@ -21,10 +21,9 @@
$language_file = array('registration', 'index');
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
// Custom pages
// Had to move the form handling in here, because otherwise there would
// Had to move the form handling in here, because otherwise there would
// already be some display output.
global $_configuration;
@ -91,9 +90,9 @@ if (api_get_setting('allow_lostpassword') == 'false') {
api_not_allowed();
}
if (isset($_GET['reset']) && isset($_GET['id'])) {
$message = Display::return_message(Login::reset_password($_GET["reset"], $_GET["id"], true), 'normal', false);
$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'auth/lostPassword.php" class="btn" >'.get_lang('Back').'</a>';
if (isset($_GET['reset']) && isset($_GET['id'])) {
$message = Display::return_message(Login::reset_password($_GET["reset"], $_GET["id"], true), 'normal', false);
$message .= '<a href="'.api_get_path(WEB_CODE_PATH).'auth/lostPassword.php" class="btn" >'.get_lang('Back').'</a>';
echo $message;
} else {
$form = new FormValidator('lost_password');
@ -107,11 +106,11 @@ if (isset($_GET['reset']) && isset($_GET['id'])) {
if ($form->validate()) {
$values = $form->exportValues();
$users_related_to_username = Login::get_user_accounts_by_username($values['user']);
if ($users_related_to_username) {
$by_username = true;
$by_username = true;
foreach ($users_related_to_username as $user) {
if ($_configuration['password_encryption'] != 'none') {
Login::handle_encrypted_password($user, $by_username);
@ -120,9 +119,9 @@ if (isset($_GET['reset']) && isset($_GET['id'])) {
}
}
} else {
Display::display_warning_message(get_lang('NoUserAccountWithThisEmailAddress'));
Display::display_warning_message(get_lang('NoUserAccountWithThisEmailAddress'));
}
} else {
} else {
$form->display();
}
}

43
main/chat/chat_functions.lib.php
Unescape View File

@ -3,7 +3,7 @@
/**
* @package chamilo.chat
*/
/**
* @author isaac flores paz
@ -17,10 +17,10 @@ function user_connected_in_chat ($user_id) {
$tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);
$user_id = intval($user_id);
$session_id = api_get_session_id();
$group_id = api_get_group_id();
$course_id = api_get_course_int_id();
$group_id = api_get_group_id();
$course_id = api_get_course_int_id();
$extra_condition = '';
if (!empty($group_id)) {
$extra_condition = " AND to_group_id = '$group_id'";
} else {
@ -38,28 +38,15 @@ function user_connected_in_chat ($user_id) {
* @return void
*/
function exit_of_chat($user_id) {
$user_id = intval($user_id);
$list_course = CourseManager::get_courses_list_by_user_id($user_id);
/*$session_id = api_get_session_id();
$group_id = api_get_group_id();
$extra_condition = '';
if (!empty($group_id)) {
$extra_condition = " AND to_group_id = '$group_id'";
} else {
$extra_condition = api_get_session_condition($session_id);
}
$extra_condition.= " AND course_id = $course_id";*/
$user_id = intval($user_id);
$list_course = CourseManager::get_courses_list_by_user_id($user_id);
$tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);
foreach ($list_course as $course) {
$response = user_connected_in_chat($user_id);
//if ($response === true) {
$sql = 'DELETE FROM '.$tbl_chat_connected.' WHERE c_id = '.$course['real_id'].' AND user_id = '.$user_id;
Database::query($sql);
//}
$sql = 'DELETE FROM '.$tbl_chat_connected.' WHERE c_id = '.$course['real_id'].' AND user_id = '.$user_id;
Database::query($sql);
}
}
@ -72,7 +59,7 @@ function disconnect_user_of_chat() {
$course_id = api_get_course_int_id();
$list_info_user_in_chat = users_list_in_chat();
$course_id = api_get_course_int_id();
$cd_date = date('Y-m-d',time());
$cdate_h = date('H',time());
$cdate_m = date('i',time());
@ -87,8 +74,8 @@ function disconnect_user_of_chat() {
$date_db_s = date('s', strtotime($list_info_user['last_connection']));
$date_count_time_seconds=$date_db_h*3600 + $date_db_m*60 + $date_db_s;
if ($cd_date == $date_db_date) {
if (($cd_count_time_seconds - $date_count_time_seconds) > 5) {
$tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);
if (($cd_count_time_seconds - $date_count_time_seconds) > 5) {
$tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);
$sql = 'DELETE FROM '.$tbl_chat_connected.' WHERE c_id = '.$course_id.' AND user_id ='.$list_info_user['user_id'];
Database::query($sql);
}
@ -105,10 +92,10 @@ function users_list_in_chat() {
$list_users_in_chat = array();
$tbl_chat_connected = Database::get_course_table(TABLE_CHAT_CONNECTED);
$course_id = api_get_course_int_id();
$session_id = api_get_session_id();
$group_id = api_get_group_id();
$extra_condition = '';
if (!empty($group_id)) {
$extra_condition = " WHERE to_group_id = '$group_id'";

2
main/create_course/add_course.php
Unescape View File

@ -34,11 +34,9 @@ $course_validation_feature = api_get_setting('course_validation') == 'true';
// Require additional libraries.
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
//require_once api_get_path(CONFIGURATION_PATH).'course_info.conf.php';
if ($course_validation_feature) {
require_once api_get_path(LIBRARY_PATH).'course_request.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
}
$htmlHeadXtra[] = '<script type="text/javascript">

1
main/dropbox/dropbox_init.inc.php
Unescape View File

@ -48,7 +48,6 @@ require_once 'dropbox_config.inc.php';
// the dropbox file that contains additional functions
require_once 'dropbox_functions.inc.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
// protecting the script

1
main/exercice/exercice.php
Unescape View File

@ -42,7 +42,6 @@ require_once 'testcategory.class.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once 'hotpotatoes.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
/* Constants and variables */
$is_allowedToEdit = api_is_allowed_to_edit(null,true);

5
main/exercice/hotpotatoes_exercise_report.php
Unescape View File

@ -3,7 +3,7 @@
/**
* Exercise list: This script shows the list of exercises for administrators and students.
* @package chamilo.exercise
* @author hubert.borderiou
* @author hubert.borderiou
*
*/
/**
@ -33,7 +33,6 @@ require_once 'answer.class.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once 'hotpotatoes.lib.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
// need functions of statsutils lib to display previous exercices scores
require_once api_get_path(LIBRARY_PATH) . 'statsUtils.lib.inc.php';
@ -78,7 +77,7 @@ if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') {
if (isset($_REQUEST['extra_data']) && $_REQUEST['extra_data'] == 1) {
$load_extra_data = true;
}
require_once 'hotpotatoes_exercise_result.class.php';
// @todo make xls export work
// switch ($_GET['export_format']) {

1
main/forum/forumfunction.inc.php
Unescape View File

@ -27,7 +27,6 @@
use \ChamiloSession as Session;
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
get_notifications_of_user();

15
main/inc/email_editor.php
Unescape View File

@ -16,7 +16,6 @@ use \ChamiloSession as Session;
$language_file = array('index', 'admin', 'registration');
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php';
if (empty($_user['user_id'])) {
api_not_allowed(true);
@ -40,12 +39,12 @@ $form->addRule('email_text', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('email_address', get_lang('EmailWrong'), 'email');
$form->addElement('button', 'submit', get_lang('SendMail'));
$defaults = array( 'dest' => Security::remove_XSS($_REQUEST['dest']),
'email_address' => Security::remove_XSS($_REQUEST['dest']),
'email_title' => Security::remove_XSS($_POST['email_title']),
'email_text' => Security::remove_XSS($_POST['email_text'])
$defaults = array(
'dest' => Security::remove_XSS($_REQUEST['dest']),
'email_address' => Security::remove_XSS($_REQUEST['dest']),
'email_title' => Security::remove_XSS($_POST['email_title']),
'email_text' => Security::remove_XSS($_POST['email_text'])
);
$form->setDefaults($defaults);
@ -55,7 +54,7 @@ if ($form->validate()) {
$user_id=api_get_user_id();
$title=Security::remove_XSS($_POST['email_title']);
$content=Security::remove_XSS($_POST['email_text']);
if (!empty($_user['mail'])) {
if (!empty($_user['mail'])) {
api_mail_html('',$email_administrator,$title,$text,api_get_person_name($_user['firstname'],$_user['lastname']), $_user['mail']);
UserManager::send_message_in_outbox ($email_administrator,$user_id,$title, $content);
} else {

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

@ -53,7 +53,6 @@ class CourseRequestManager {
* @return int/bool The database id of the newly created course request or FALSE on failure.
*/
public static function create_course_request($wanted_code, $title, $description, $category_code, $course_language, $objetives, $target_audience, $user_id, $exemplary_content) {
global $_configuration;
$wanted_code = trim($wanted_code);
$user_id = (int)$user_id;
$exemplary_content = (bool)$exemplary_content ? 1 : 0;
@ -74,7 +73,7 @@ class CourseRequestManager {
if (!is_array($user_info)) {
return false;
}
$tutor_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $course_language);
$request_date = api_get_utc_datetime();
@ -182,7 +181,6 @@ class CourseRequestManager {
* @return bool Returns TRUE on success or FALSE on failure.
*/
public static function update_course_request($id, $wanted_code, $title, $description, $category_code, $course_language, $objetives, $target_audience, $user_id, $exemplary_content) {
global $_configuration;
$id = (int)$id;
$wanted_code = trim($wanted_code);
$user_id = (int)$user_id;
@ -324,7 +322,6 @@ class CourseRequestManager {
* @return string/bool Returns the code of the newly created course or FALSE on failure.
*/
public static function accept_course_request($id) {
global $_configuration;
$id = (int)$id;
// Retrieve request's data
@ -341,15 +338,15 @@ class CourseRequestManager {
if ($user_id <= 0) {
return false;
}
$user_info = api_get_user_info($user_id);
if (!is_array($user_info)) {
return false;
}
// Create the requested course
$params = array();
$params['title'] = $course_request_info['title'];
$params['category_code'] = $course_request_info['category_code'];
$params['course_language'] = $course_request_info['course_language'];
@ -357,21 +354,21 @@ class CourseRequestManager {
$params['wanted_code'] = $course_request_info['code'];
$params['user_id'] = $course_request_info['user_id'];
$params['tutor_name'] = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $course_language);
$course_info = CourseManager::create_course($params);
if (!empty($course_info)) {
// Mark the request as accepted.
$sql = "UPDATE ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)." SET status = ".COURSE_REQUEST_ACCEPTED." WHERE id = ".$id;
Database::query($sql);
// E-mail notification.
// E-mail language: The platform language seems to be the best choice
$email_language = api_get_setting('platformLanguage');
$email_subject = sprintf(get_lang('CourseRequestAcceptedEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $course_info['code']);
$email_body = get_lang('Dear', null, $email_language).' ';
$email_body .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
$email_body .= sprintf(get_lang('CourseRequestAcceptedEmailText', null, $email_language), $wanted_code, $course_info['code'], api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/')."\n";
@ -381,13 +378,13 @@ class CourseRequestManager {
$email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
$email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n";
$email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
$sender_email = get_setting('emailAdministrator');
$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
$recipient_email = $user_info['mail'];
$extra_headers = 'Bcc: '.$sender_email;
@api_mail($recipient_name, $recipient_email, $email_subject, $email_body, $sender_name, $sender_email);
return $course_info['code'];
}
@ -522,7 +519,6 @@ class CourseRequestManager {
// Marking the fact that additional information about the request has been asked.
$sql = "UPDATE ".Database :: get_main_table(TABLE_MAIN_COURSE_REQUEST)." SET info = 1 WHERE id = ".$id;
$result = Database::query($sql) !== false;
return $result;
}
@ -537,5 +533,4 @@ class CourseRequestManager {
$result = Database::num_rows(Database::query($sql));
return !empty($result);
}
}

Write Preview
Loading…
Cancel
Save