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

Format code + replace UserManager::get_user_info_by_id with api function

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 38212ceb1d
commit 8e273286e5
7 changed files with 175 additions and 104 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. 26
      main/auth/courses.php
  2. 11
      main/inc/lib/banner.lib.php
  3. 89
      main/survey/survey.lib.php
  4. 2
      plugin/advanced_subscription/src/terms_and_conditions.php
  5. 2
      plugin/advanced_subscription/test/terms_to_pdf.php
  6. 2
      plugin/createdrupaluser/src/HookCreateDrupalUser.php
  7. 15
      plugin/ticket/src/ticket.class.php

26
main/auth/courses.php
Unescape View File

@ -83,10 +83,10 @@ $actions = array(
$action = CoursesAndSessionsCatalog::is(CATALOG_SESSIONS) ? 'display_sessions' : 'display_random_courses'; $action = CoursesAndSessionsCatalog::is(CATALOG_SESSIONS) ? 'display_sessions' : 'display_random_courses';
if (isset($_GET['action']) && in_array($_GET['action'], $actions)) { if (isset($_GET['action']) && in_array($_GET['action'], $actions)) {
$action = Security::remove_XSS($_GET['action']); $action = Security::remove_XSS($_GET['action']);
} else {
// Nothing to do
} }
$categoryCode = isset($_GET['category_code']) ? $_GET['category_code'] : '';
$nameTools = getCourseCatalogNameTools($action); $nameTools = getCourseCatalogNameTools($action);
if (empty($nameTools)) { if (empty($nameTools)) {
$nameTools = get_lang('CourseManagement'); $nameTools = get_lang('CourseManagement');
@ -156,13 +156,13 @@ if (isset($_REQUEST['search_course'])) {
// Subscribe user to course // Subscribe user to course
if (isset($_REQUEST['subscribe_course'])) { if (isset($_REQUEST['subscribe_course'])) {
if ($ctok == $_GET['sec_token']) { 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'], $categoryCode);
} }
} }
// We are unsubscribing from a course (=Unsubscribe from course). // We are unsubscribing from a course (=Unsubscribe from course).
if (isset($_GET['unsubscribe'])) { if (isset($_GET['unsubscribe'])) {
if ($ctok == $_GET['sec_token']) { if ($ctok == $_GET['sec_token']) {
$courses_controller->unsubscribe_user_from_course($_GET['unsubscribe'], $_GET['search_term'], $_GET['category_code']); $courses_controller->unsubscribe_user_from_course($_GET['unsubscribe'], $_GET['search_term'], $categoryCode);
//$message = remove_user_from_course($_user['user_id'], $_POST['unsubscribe']); //$message = remove_user_from_course($_user['user_id'], $_POST['unsubscribe']);
} }
} }
@ -189,7 +189,14 @@ switch ($action) {
$courses_controller->courses_list($action); $courses_controller->courses_list($action);
break; break;
case 'subscribe': case 'subscribe':
$courses_controller->courses_categories($action, $_GET['category_code'], null, null, null, $limit); $courses_controller->courses_categories(
$action,
$categoryCode,
null,
null,
null,
$limit
);
break; break;
case 'display_random_courses': case 'display_random_courses':
if ($user_can_view_page) { if ($user_can_view_page) {
@ -199,7 +206,14 @@ switch ($action) {
} }
break; break;
case 'display_courses': case 'display_courses':
$courses_controller->courses_categories($action, $_GET['category_code'], null, null, null, $limit); $courses_controller->courses_categories(
$action,
$categoryCode,
null,
null,
null,
$limit
);
break; break;
case 'display_sessions': case 'display_sessions':
$courses_controller->sessionsList($action, $nameTools, $limit); $courses_controller->sessionsList($action, $nameTools, $limit);

11
main/inc/lib/banner.lib.php
Unescape View File

@ -201,7 +201,11 @@ function return_logo($theme) {
function return_notification_menu() function return_notification_menu()
{ {
$_course = api_get_course_info(); $_course = api_get_course_info();
$course_id = 0;
if (!empty($_course)) {
$course_id = $_course['code']; $course_id = $_course['code'];
}
$user_id = api_get_user_id(); $user_id = api_get_user_id();
$html = ''; $html = '';
@ -407,14 +411,14 @@ function return_menu()
$clean_url = api_replace_dangerous_char($url); $clean_url = api_replace_dangerous_char($url);
$clean_url = str_replace('/', '-', $clean_url); $clean_url = str_replace('/', '-', $clean_url);
$clean_url .= '/'; $clean_url .= '/';
$homep = api_get_path(SYS_PATH).'home/'.$clean_url; //homep for Home Path $homep = api_get_path(SYS_APP_PATH).'home/'.$clean_url; //homep for Home Path
//we create the new dir for the new sites //we create the new dir for the new sites
if (!is_dir($homep)) { if (!is_dir($homep)) {
mkdir($homep, api_get_permissions_for_new_directories()); mkdir($homep, api_get_permissions_for_new_directories());
} }
} }
} else { } else {
$homep = api_get_path(SYS_PATH).'home/'; $homep = api_get_path(SYS_APP_PATH).'home/';
} }
$ext = '.html'; $ext = '.html';
@ -497,7 +501,10 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
$session_name = api_get_session_name($session_id); $session_name = api_get_session_name($session_id);
$_course = api_get_course_info(); $_course = api_get_course_info();
$user_id = api_get_user_id(); $user_id = api_get_user_id();
$course_id = 0;
if (!empty($_course)) {
$course_id = $_course['real_id']; $course_id = $_course['real_id'];
}
/* Plugins for banner section */ /* Plugins for banner section */
$web_course_path = api_get_path(WEB_COURSE_PATH); $web_course_path = api_get_path(WEB_COURSE_PATH);

89
main/survey/survey.lib.php
Unescape View File

@ -199,6 +199,7 @@ class SurveyManager
$return['message'] = 'ThisSurveyCodeSoonExistsInThisLanguage'; $return['message'] = 'ThisSurveyCodeSoonExistsInThisLanguage';
$return['type'] = 'error'; $return['type'] = 'error';
$return['id'] = isset($values['survey_id']) ? $values['survey_id'] : 0; $return['id'] = isset($values['survey_id']) ? $values['survey_id'] : 0;
return $return; return $return;
} }
@ -320,7 +321,7 @@ class SurveyManager
visible_results visible_results
) VALUES ( ) VALUES (
$course_id, $course_id,
'".Database::escape_string(strtolower(CourseManager::generate_course_code(api_substr($values['survey_code'],0))))."', '".Database::escape_string(strtolower(CourseManager::generate_course_code($values['survey_code'])))."',
'".Database::escape_string($values['survey_title'])."', '".Database::escape_string($values['survey_title'])."',
'".Database::escape_string($values['survey_subtitle'])."', '".Database::escape_string($values['survey_subtitle'])."',
'".intval($_user['user_id'])."', '".intval($_user['user_id'])."',
@ -399,7 +400,9 @@ class SurveyManager
$field_values = ''; $field_values = '';
foreach ($fields as & $field) { foreach ($fields as & $field) {
if ($field != '') { if ($field != '') {
if ($values[$field] == '') { if (!isset($values[$field]) ||
(isset($values[$field]) && $values[$field] == '')
) {
$values[$field] = 0; $values[$field] = 0;
} }
$field_values.= $field.':'.$values[$field].'@'; $field_values.= $field.':'.$values[$field].'@';
@ -431,7 +434,13 @@ class SurveyManager
Database::query($sql); Database::query($sql);
// Update into item_property (update) // Update into item_property (update)
api_item_property_update(api_get_course_info(), TOOL_SURVEY, $values['survey_id'], 'SurveyUpdated', api_get_user_id()); api_item_property_update(
api_get_course_info(),
TOOL_SURVEY,
$values['survey_id'],
'SurveyUpdated',
api_get_user_id()
);
$return['message'] = 'SurveyUpdatedSuccesfully'; $return['message'] = 'SurveyUpdatedSuccesfully';
$return['type'] = 'confirmation'; $return['type'] = 'confirmation';
@ -492,6 +501,7 @@ class SurveyManager
Database::query($sql); Database::query($sql);
$return = $values['survey_share']['survey_share']; $return = $values['survey_share']['survey_share'];
} }
return $return; return $return;
} }
@ -526,22 +536,31 @@ class SurveyManager
if ($shared) { if ($shared) {
$table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY); $table_survey = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY);
// Deleting the survey // Deleting the survey
$sql = "DELETE FROM $table_survey WHERE survey_id='".$survey_id."'"; $sql = "DELETE FROM $table_survey
WHERE survey_id='".$survey_id."'";
Database::query($sql); Database::query($sql);
} else { } else {
$sql = "DELETE FROM $table_survey WHERE c_id = $course_id AND survey_id='".$survey_id."'"; $sql = "DELETE FROM $table_survey
WHERE c_id = $course_id AND survey_id='".$survey_id."'";
Database::query($sql); Database::query($sql);
} }
// Deleting groups of this survey // Deleting groups of this survey
$sql = "DELETE FROM $table_survey_question_group WHERE c_id = $course_id AND survey_id='".$survey_id."'"; $sql = "DELETE FROM $table_survey_question_group
WHERE c_id = $course_id AND survey_id='".$survey_id."'";
Database::query($sql); Database::query($sql);
// Deleting the questions of the survey // Deleting the questions of the survey
SurveyManager::delete_all_survey_questions($survey_id, $shared); SurveyManager::delete_all_survey_questions($survey_id, $shared);
// Update into item_property (delete) // Update into item_property (delete)
api_item_property_update($course_info, TOOL_SURVEY, $survey_id, 'SurveyDeleted', api_get_user_id()); api_item_property_update(
$course_info,
TOOL_SURVEY,
$survey_id,
'SurveyDeleted',
api_get_user_id()
);
return true; return true;
} }
@ -582,7 +601,8 @@ class SurveyManager
Database::insert($table_survey, $params); Database::insert($table_survey, $params);
$new_survey_id = Database::insert_id(); $new_survey_id = Database::insert_id();
$sql = "UPDATE $table_survey SET survey_id = $new_survey_id WHERE iid = $new_survey_id"; $sql = "UPDATE $table_survey SET survey_id = $new_survey_id
WHERE iid = $new_survey_id";
Database::query($sql); Database::query($sql);
// Insert into item_property // Insert into item_property
@ -609,7 +629,8 @@ class SurveyManager
); );
$insertId = Database::insert($table_survey_question_group, $params); $insertId = Database::insert($table_survey_question_group, $params);
$sql = "UPDATE $table_survey_question_group SET id = iid WHERE iid = $insertId"; $sql = "UPDATE $table_survey_question_group SET id = iid
WHERE iid = $insertId";
Database::query($sql); Database::query($sql);
$group_id[$row['id']] = $insertId; $group_id[$row['id']] = $insertId;
@ -658,7 +679,8 @@ class SurveyManager
); );
$insertId = Database::insert($table_survey_options, $params); $insertId = Database::insert($table_survey_options, $params);
$sql = "UPDATE $table_survey_options SET question_option_id = $insertId WHERE iid = $insertId"; $sql = "UPDATE $table_survey_options SET question_option_id = $insertId
WHERE iid = $insertId";
Database::query($sql); Database::query($sql);
} }
@ -691,7 +713,9 @@ class SurveyManager
} }
$sql = 'DELETE FROM '.$table_survey_invitation.' $sql = 'DELETE FROM '.$table_survey_invitation.'
WHERE c_id = '.$course_id.' AND survey_code = "'.Database::escape_string($datas['code']).'" '.$session_where.' '; WHERE
c_id = '.$course_id.' AND
survey_code = "'.Database::escape_string($datas['code']).'" '.$session_where.' ';
Database::query($sql); Database::query($sql);
$sql = 'DELETE FROM '.$table_survey_answer.' $sql = 'DELETE FROM '.$table_survey_answer.'
@ -780,7 +804,16 @@ class SurveyManager
{ {
// the possible question types // the possible question types
$possible_types = array( $possible_types = array(
'personality', 'yesno', 'multiplechoice', 'multipleresponse', 'open', 'dropdown', 'comment', 'pagebreak', 'percentage', 'score' 'personality',
'yesno',
'multiplechoice',
'multipleresponse',
'open',
'dropdown',
'comment',
'pagebreak',
'percentage',
'score',
); );
// the images array // the images array
@ -948,7 +981,9 @@ class SurveyManager
return $return_message; return $return_message;
} }
if (($form_content['choose']==2)&&($form_content['assigned1'] == $form_content['assigned2'])) { if (($form_content['choose'] == 2) &&
($form_content['assigned1'] == $form_content['assigned2'])
) {
$return_message = 'ChooseDifferentCategories'; $return_message = 'ChooseDifferentCategories';
return $return_message; return $return_message;
} }
@ -1115,7 +1150,9 @@ class SurveyManager
$tbl_survey_question = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION); $tbl_survey_question = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION);
// Storing a new question // Storing a new question
if ($form_content['shared_question_id'] == '' || !is_numeric($form_content['shared_question_id'])) { if ($form_content['shared_question_id'] == '' ||
!is_numeric($form_content['shared_question_id'])
) {
// Finding the max sort order of the questions in the given survey // Finding the max sort order of the questions in the given survey
$sql = "SELECT max(sort) AS max_sort FROM $tbl_survey_question $sql = "SELECT max(sort) AS max_sort FROM $tbl_survey_question
WHERE survey_id='".intval($survey_data['survey_share'])."' WHERE survey_id='".intval($survey_data['survey_share'])."'
@ -1374,7 +1411,7 @@ class SurveyManager
public function save_shared_question_options($form_content, $survey_data) public function save_shared_question_options($form_content, $survey_data)
{ {
if (is_array($form_content) && is_array($form_content['answers'])) { if (is_array($form_content) && is_array($form_content['answers'])) {
// Table defintion // Table definition
$table_survey_question_option = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION); $table_survey_question_option = Database :: get_main_table(TABLE_MAIN_SHARED_SURVEY_QUESTION_OPTION);
// We are editing a question so we first have to remove all the existing options from the database // We are editing a question so we first have to remove all the existing options from the database
@ -1556,6 +1593,7 @@ class SurveyManager
$return[] = $row['user']; $return[] = $row['user'];
} }
} }
return $return; return $return;
} }
@ -1610,7 +1648,9 @@ class SurveyUtil
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
// Getting the information of the question // Getting the information of the question
$sql = "SELECT * FROM $tbl_survey_question WHERE c_id = $course_id AND survey_id='".Database::escape_string($survey_id)."' ORDER BY sort ASC"; $sql = "SELECT * FROM $tbl_survey_question
WHERE c_id = $course_id AND survey_id='".Database::escape_string($survey_id)."'
ORDER BY sort ASC";
$result = Database::query($sql); $result = Database::query($sql);
$total = Database::num_rows($result); $total = Database::num_rows($result);
$counter = 1; $counter = 1;
@ -2120,8 +2160,6 @@ class SurveyUtil
}*/ }*/
} }
$htmlHeadXtra[] = '<script src="' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/tag/jquery.fcbkcomplete.js" type="text/javascript" language="javascript"></script>';
foreach ($questions as $question) { foreach ($questions as $question) {
$chartData = array(); $chartData = array();
$options = array(); $options = array();
@ -2254,7 +2292,11 @@ class SurveyUtil
$sql_restriction = "AND value='".Database::escape_string($_GET['value'])."'"; $sql_restriction = "AND value='".Database::escape_string($_GET['value'])."'";
} }
$sql = "SELECT user FROM $table_survey_answer WHERE c_id = $course_id AND option_id = '".Database::escape_string($_GET['viewoption'])."' $sql_restriction"; $sql = "SELECT user FROM $table_survey_answer
WHERE
c_id = $course_id AND
option_id = '".Database::escape_string($_GET['viewoption'])."'
$sql_restriction";
$result = Database::query($sql); $result = Database::query($sql);
echo '<ul>'; echo '<ul>';
while ($row = Database::fetch_array($result)) { while ($row = Database::fetch_array($result)) {
@ -2274,9 +2316,7 @@ class SurveyUtil
*/ */
public static function display_question_report_score($survey_data, $question, $offset) public static function display_question_report_score($survey_data, $question, $offset)
{ {
$course_id = api_get_course_int_id();
// Database table definitions // Database table definitions
$table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
$table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION); $table_survey_question_option = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
$table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER); $table_survey_answer = Database :: get_course_table(TABLE_SURVEY_ANSWER);
@ -2302,6 +2342,7 @@ class SurveyUtil
question_id = '".Database::escape_string($question['question_id'])."' question_id = '".Database::escape_string($question['question_id'])."'
GROUP BY option_id, value"; GROUP BY option_id, value";
$result = Database::query($sql); $result = Database::query($sql);
$number_of_answers = 0;
while ($row = Database::fetch_array($result)) { while ($row = Database::fetch_array($result)) {
$number_of_answers += $row['total']; $number_of_answers += $row['total'];
$data[$row['option_id']][$row['value']] = $row; $data[$row['option_id']][$row['value']] = $row;
@ -2702,7 +2743,11 @@ class SurveyUtil
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
$sql = "SELECT questions.question_id, questions.type, questions.survey_question, count(options.question_option_id) as number_of_options $sql = "SELECT
questions.question_id,
questions.type,
questions.survey_question,
count(options.question_option_id) as number_of_options
FROM $table_survey_question questions FROM $table_survey_question questions
LEFT JOIN $table_survey_question_option options LEFT JOIN $table_survey_question_option options
ON questions.question_id = options.question_id AND options.c_id = $course_id ON questions.question_id = options.question_id AND options.c_id = $course_id

2
plugin/advanced_subscription/src/terms_and_conditions.php
Unescape View File

@ -57,7 +57,7 @@ if (
} }
$data['session'] = api_get_session_info($data['sessionId']); $data['session'] = api_get_session_info($data['sessionId']);
$data['student'] = UserManager::get_user_info_by_id($data['studentUserId']); $data['student'] = api_get_user_info($data['studentUserId']);
$data['course'] = api_get_course_info_by_id($data['courseId']); $data['course'] = api_get_course_info_by_id($data['courseId']);
$data['acceptTermsUrl'] = $plugin->getQueueUrl($data); $data['acceptTermsUrl'] = $plugin->getQueueUrl($data);
$data['rejectTermsUrl'] = $plugin->getTermsUrl($data, ADVANCED_SUBSCRIPTION_TERMS_MODE_REJECT); $data['rejectTermsUrl'] = $plugin->getTermsUrl($data, ADVANCED_SUBSCRIPTION_TERMS_MODE_REJECT);

2
plugin/advanced_subscription/test/terms_to_pdf.php
Unescape View File

@ -17,7 +17,7 @@ $data['is_connected'] = true;
$data['profile_completed'] = 90.0; $data['profile_completed'] = 90.0;
$data['sessionId'] = intval($_REQUEST['s']); $data['sessionId'] = intval($_REQUEST['s']);
$data['studentUserId'] = intval($_REQUEST['u']); $data['studentUserId'] = intval($_REQUEST['u']);
$data['student'] = UserManager::get_user_info_by_id($data['studentUserId']); $data['student'] = api_get_user_info($data['studentUserId']);
$data['session'] = api_get_session_info($data['sessionId']); $data['session'] = api_get_session_info($data['sessionId']);
if (!empty($data['sessionId']) && !empty($data['studentUserId'])) { if (!empty($data['sessionId']) && !empty($data['studentUserId'])) {

2
plugin/createdrupaluser/src/HookCreateDrupalUser.php
Unescape View File

@ -35,7 +35,7 @@ class HookCreateDrupalUser extends HookObserver implements HookCreateUserObserve
$return = $data['return']; $return = $data['return'];
$originalPassword = $data['originalPassword']; $originalPassword = $data['originalPassword'];
$userInfo = UserManager::get_user_info_by_id($return); $userInfo = api_get_user_info($return);
$fields = array( $fields = array(
'name' => $userInfo['username'], 'name' => $userInfo['username'],
'pass' => $originalPassword, 'pass' => $originalPassword,

15
plugin/ticket/src/ticket.class.php
Unescape View File

@ -171,7 +171,7 @@ class TicketManager
if (self::insert_message($ticket_id, $subject, $content, $file_attachments, $request_user)) { if (self::insert_message($ticket_id, $subject, $content, $file_attachments, $request_user)) {
global $data_files; global $data_files;
if ($other_area) { if ($other_area) {
$user = UserManager::get_user_info_by_id($request_user); $user = api_get_user_info($request_user);
$helpDeskMessage = '<table> $helpDeskMessage = '<table>
<tr> <tr>
<td width="100px"><b>' . get_lang('User') . '</b></td> <td width="100px"><b>' . get_lang('User') . '</b></td>
@ -195,9 +195,14 @@ class TicketManager
</tr> </tr>
</table>'; </table>';
api_mail_html( api_mail_html(
$plugin->get_lang('VirtualSupport'), $email, $plugin->get_lang('IncidentResentToVirtualSupport'), $plugin->get_lang('VirtualSupport'),
$helpDeskMessage, $user['firstname'] . ' ' . $user['lastname'], $personalEmail, $email,
array(), $data_files $plugin->get_lang('IncidentResentToVirtualSupport'),
$helpDeskMessage,
$user['firstname'].' '.$user['lastname'],
$personalEmail,
array(),
$data_files
); );
$studentMessage = sprintf($plugin->get_lang('YourQuestionWasSentToTheResponableAreaX'), $email, $email); $studentMessage = sprintf($plugin->get_lang('YourQuestionWasSentToTheResponableAreaX'), $email, $email);
$studentMessage .= sprintf($plugin->get_lang('YourAnswerToTheQuestionWillBeSentToX'), $personalEmail); $studentMessage .= sprintf($plugin->get_lang('YourAnswerToTheQuestionWillBeSentToX'), $personalEmail);
@ -663,7 +668,7 @@ class TicketManager
} }
$result_unread = Database::query($sql_unread); $result_unread = Database::query($sql_unread);
$unread = Database::fetch_object($result_unread)->unread; $unread = Database::fetch_object($result_unread)->unread;
$userInfo = UserManager::get_user_info_by_id($row['user_id']); $userInfo = api_get_user_info($row['user_id']);
$hrefUser = $webPath . 'main/admin/user_information.php?user_id=' . $row['user_id']; $hrefUser = $webPath . 'main/admin/user_information.php?user_id=' . $row['user_id'];
$name = "<a href='$hrefUser'> {$userInfo['username']} </a>"; $name = "<a href='$hrefUser'> {$userInfo['username']} </a>";
$actions = ""; $actions = "";

Write Preview
Loading…
Cancel
Save