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

Add intval + Security::remove_XSS

Browse Source
1.10.x
jmontoyaa 9 years ago
parent 6b71eec4a8
commit 2a47c02329
13 changed files with 37 additions and 73 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/admin/ldap_users_list.php
  2. 4
      main/coursecopy/copy_course.php
  3. 4
      main/dropbox/index.php
  4. 23
      main/gradebook/index.php
  5. 2
      main/inc/lib/course_home.lib.php
  6. 9
      main/mySpace/student.php
  7. 3
      main/mySpace/teachers.php
  8. 4
      main/mySpace/users.php
  9. 33
      main/resourcelinker/resourcelinker.inc.php
  10. 2
      main/social/profile.php
  11. 2
      main/survey/fillsurvey.php
  12. 6
      main/wiki/wiki.inc.php
  13. 16
      tests/main/exercice/freeanswer.class.test.php

2
main/admin/ldap_users_list.php
Unescape View File

@ -78,7 +78,7 @@ if (isset ($_GET['action']))
} }
if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) { if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
ldap_add_user_to_session($UserList, $_GET['id_session']); ldap_add_user_to_session($UserList, $_GET['id_session']);
header('Location: resume_session.php?id_session='.$_GET['id_session']); header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
} else { } else {
Display :: display_header($tool_name); Display :: display_header($tool_name);
if(count($userid_match_login)>0) if(count($userid_match_login)>0)

4
main/coursecopy/copy_course.php
Unescape View File

@ -61,7 +61,9 @@ if (Security::check_token('post') && (
$cr->set_file_option($_POST['same_file_name_option']); $cr->set_file_option($_POST['same_file_name_option']);
$cr->restore($_POST['destination_course']); $cr->restore($_POST['destination_course']);
Display::display_normal_message( Display::display_normal_message(
get_lang('CopyFinished').': <a href="'.api_get_course_url($_POST['destination_course']).'">'.$_POST['destination_course'].'</a>', get_lang('CopyFinished').': <a href="'.api_get_course_url($_POST['destination_course']).'">'.
Security::remove_XSS($_POST['destination_course']).
'</a>',
false false
); );
} elseif (Security::check_token('post') && ( } elseif (Security::check_token('post') && (

4
main/dropbox/index.php
Unescape View File

@ -32,7 +32,7 @@ Display::display_introduction_section(TOOL_DROPBOX);
// Build URL-parameters for table-sorting // Build URL-parameters for table-sorting
$sort_params = array(); $sort_params = array();
if (isset($_GET['dropbox_column'])) { if (isset($_GET['dropbox_column'])) {
$sort_params[] = 'dropbox_column='.$_GET['dropbox_column']; $sort_params[] = 'dropbox_column='.intval($_GET['dropbox_column']);
} }
if (isset($_GET['dropbox_page_nr'])) { if (isset($_GET['dropbox_page_nr'])) {
$sort_params[] = 'page_nr='.intval($_GET['page_nr']); $sort_params[] = 'page_nr='.intval($_GET['page_nr']);
@ -40,7 +40,7 @@ if (isset($_GET['dropbox_page_nr'])) {
if (isset($_GET['dropbox_per_page'])) { if (isset($_GET['dropbox_per_page'])) {
$sort_params[] = 'dropbox_per_page='.intval($_GET['dropbox_per_page']); $sort_params[] = 'dropbox_per_page='.intval($_GET['dropbox_per_page']);
} }
if (isset($_GET['dropbox_direction'])) { if (isset($_GET['dropbox_direction']) && in_array($_GET['dropbox_direction'], ['ASC', 'DESC'])) {
$sort_params[] = 'dropbox_direction='.$_GET['dropbox_direction']; $sort_params[] = 'dropbox_direction='.$_GET['dropbox_direction'];
} }

23
main/gradebook/index.php
Unescape View File

@ -104,27 +104,18 @@ if (empty($cats)) {
$_GET['selectcat'] = $cats[0]->get_id(); $_GET['selectcat'] = $cats[0]->get_id();
if (isset($_GET['isStudentView'])) { if (isset($_GET['isStudentView'])) {
if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) { if ((isset($_GET['selectcat']) && $_GET['selectcat'] > 0) && (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'true')) {
$interbreadcrumb[]= array ('url' => 'index.php'.'?selectcat=0&amp;isStudentView='.$_GET['isStudentView'],'name' => get_lang('ToolGradebook')); $interbreadcrumb[] = array(
'url' => 'index.php'.'?selectcat=0&isStudentView=true',
'name' => get_lang('ToolGradebook'),
);
} }
} }
if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) && if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) &&
(isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') (isset($_SESSION['studentview']) && $_SESSION['studentview']=='true')
) { ) {
/*Display :: display_header();
//Introduction tool: student view
Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
$category = $_GET['selectcat'];
$cats = Category :: load ($category, null, null, null, null, null, false);
$allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
$alleval = $cats[0]->get_evaluations($stud_id);
$alllink = $cats[0]->get_links($stud_id);
$addparams = array();
$gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
$gradebooktable->display();
Display :: display_footer();
exit;*/
} else { } else {
if (!isset($_GET['selectcat']) && if (!isset($_GET['selectcat']) &&
($_SESSION['studentview']=='studentview') || ($_SESSION['studentview']=='studentview') ||

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

@ -1184,7 +1184,7 @@ class CourseHome
} }
if (stristr($url_item['path'], $url_current['path'])) { if (stristr($url_item['path'], $url_current['path'])) {
if (!isset($_GET['learnpath_id']) || strpos($url_item['query'], 'learnpath_id='.$_GET['learnpath_id']) === 0) { if (!isset($_GET['learnpath_id']) || strpos($url_item['query'], 'learnpath_id='.intval($_GET['learnpath_id'])) === 0) {
$html .= ' id="here"'; $html .= ' id="here"';
} }
} }

9
main/mySpace/student.php
Unescape View File

@ -56,6 +56,7 @@ function get_users($from, $limit, $column, $direction)
$active = isset($_GET['active']) ? $_GET['active'] : 1; $active = isset($_GET['active']) ? $_GET['active'] : 1;
$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null; $keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null;
$sleepingDays = isset($_GET['sleeping_days']) ? intval($_GET['sleeping_days']) : null; $sleepingDays = isset($_GET['sleeping_days']) ? intval($_GET['sleeping_days']) : null;
$sessionId = isset($_GET['id_session']) ? (int) $_GET['id_session'] : 0;
$lastConnectionDate = null; $lastConnectionDate = null;
if (!empty($sleepingDays)) { if (!empty($sleepingDays)) {
@ -111,7 +112,7 @@ function get_users($from, $limit, $column, $direction)
foreach ($students as $student_data) { foreach ($students as $student_data) {
$student_id = $student_data['user_id']; $student_id = $student_data['user_id'];
if (isset($_GET['id_session'])) { if (isset($_GET['id_session'])) {
$courses = Tracking :: get_course_list_in_session_from_student($student_id, $_GET['id_session']); $courses = Tracking :: get_course_list_in_session_from_student($student_id, $sessionId);
} }
$avg_time_spent = $avg_student_score = $avg_student_progress = $total_assignments = $total_messages = 0; $avg_time_spent = $avg_student_score = $avg_student_progress = $total_assignments = $total_messages = 0;
@ -121,8 +122,8 @@ function get_users($from, $limit, $column, $direction)
$courseInfo = api_get_course_info($course_code); $courseInfo = api_get_course_info($course_code);
$courseId = $courseInfo['real_id']; $courseId = $courseInfo['real_id'];
if (CourseManager :: is_user_subscribed_in_course($student_id, $course_code, true)) { if (CourseManager :: is_user_subscribed_in_course($student_id, $course_code, true)) {
$avg_time_spent += Tracking :: get_time_spent_on_the_course($student_id, $courseId, $_GET['id_session']); $avg_time_spent += Tracking :: get_time_spent_on_the_course($student_id, $courseId, $sessionId);
$my_average = Tracking :: get_avg_student_score($student_id, $course_code); $my_average = Tracking :: get_avg_student_score($student_id, $course_code);
if (is_numeric($my_average)) { if (is_numeric($my_average)) {
$avg_student_score += $my_average; $avg_student_score += $my_average;
} }
@ -158,7 +159,7 @@ function get_users($from, $limit, $column, $direction)
$row[] = $string_date; $row[] = $string_date;
if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) { if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
$detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$_GET['id_session'].'"> $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
'.Display::return_icon('2rightarrow.png').'</a>'; '.Display::return_icon('2rightarrow.png').'</a>';
} else { } else {
$detailsLink = '<a href="myStudents.php?student='.$student_id.'"> $detailsLink = '<a href="myStudents.php?student='.$student_id.'">

3
main/mySpace/teachers.php
Unescape View File

@ -58,6 +58,7 @@ function get_users($from, $limit, $column, $direction)
$active = isset($_GET['active']) ? $_GET['active'] : 1; $active = isset($_GET['active']) ? $_GET['active'] : 1;
$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null; $keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null;
$sleepingDays = isset($_GET['sleeping_days']) ? intval($_GET['sleeping_days']) : null; $sleepingDays = isset($_GET['sleeping_days']) ? intval($_GET['sleeping_days']) : null;
$sessionId = isset($_GET['id_session']) ? (int) $_GET['id_session'] : 0;
$lastConnectionDate = null; $lastConnectionDate = null;
if (!empty($sleepingDays)) { if (!empty($sleepingDays)) {
@ -159,7 +160,7 @@ function get_users($from, $limit, $column, $direction)
$row[] = $string_date; $row[] = $string_date;
if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) { if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
$detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$_GET['id_session'].'"> $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
'.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>'; '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
} else { } else {
$detailsLink = '<a href="myStudents.php?student='.$student_id.'"> $detailsLink = '<a href="myStudents.php?student='.$student_id.'">

4
main/mySpace/users.php
Unescape View File

@ -57,7 +57,7 @@ function get_users($from, $limit, $column, $direction)
$keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null; $keyword = isset($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null;
$sleepingDays = isset($_GET['sleeping_days']) ? intval($_GET['sleeping_days']) : null; $sleepingDays = isset($_GET['sleeping_days']) ? intval($_GET['sleeping_days']) : null;
$status = isset($_GET['status']) ? Security::remove_XSS($_GET['status']) : null; $status = isset($_GET['status']) ? Security::remove_XSS($_GET['status']) : null;
$sessionId = isset($_GET['id_session']) ? (int) $_GET['id_session'] : 0;
$lastConnectionDate = null; $lastConnectionDate = null;
if (!empty($sleepingDays)) { if (!empty($sleepingDays)) {
@ -160,7 +160,7 @@ function get_users($from, $limit, $column, $direction)
$row[] = $string_date; $row[] = $string_date;
if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) { if (isset($_GET['id_coach']) && intval($_GET['id_coach']) != 0) {
$detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$_GET['id_session'].'"> $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
'.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>'; '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
} else { } else {
$detailsLink = '<a href="myStudents.php?student='.$student_id.'"> $detailsLink = '<a href="myStudents.php?student='.$student_id.'">

33
main/resourcelinker/resourcelinker.inc.php
Unescape View File

@ -1275,41 +1275,8 @@ function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
$link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]; $link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
} }
break; break;
case "Post": case "Post":
/* todo REVIEW THIS SECTION - NOT USING VALID TABLES ANYMORE
$tbl_posts = $_course['dbNameGlu'].'bb_posts';
$tbl_posts_text = $_course['dbNameGlu'].'bb_posts_text';
$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
$result= Database::query("SELECT * FROM $tbl_posts where post_id=$id");
$myrow=Database::fetch_array($result);
// grabbing the title of the post
$sql_titel="SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
$result_titel=Database::query($sql_titel);
$myrow_titel=Database::fetch_array($result_titel);
$sql="select * from $tbl_learnpath_item where id=$id_in_path";
$result=Database::query($sql); $row=Database::fetch_array($result);
if ($row['title'] != '') { $myrow_titel["post_title"]=$row['title']; }
$desc=$row['description'];
$link .= str_repeat("&nbsp;&gt;",$level);
$posternom=$myrow['nom']; $posterprenom=$myrow['prenom'];
$posttime=$myrow['post_time']; $posttext=$myrow_titel['post_text'];
$posttitle=$myrow_titel['post_title'];
$posttext = str_replace('"',"'",$posttext);
if ($builder != 'builder')
{
$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
}
else
{
$link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
}
*/
break; break;
case "Document": case "Document":
$dbTable = Database::get_course_table(TABLE_DOCUMENT); $dbTable = Database::get_course_table(TABLE_DOCUMENT);
$result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE); $result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE);

2
main/social/profile.php
Unescape View File

@ -38,7 +38,7 @@ if (!empty($_POST['social_wall_new_msg_main']) || !empty($_FILES['picture']['tmp
$messageId = 0; $messageId = 0;
$messageContent = $_POST['social_wall_new_msg_main']; $messageContent = $_POST['social_wall_new_msg_main'];
if (!empty($_POST['url_content'])) { if (!empty($_POST['url_content'])) {
$messageContent = $_POST['social_wall_new_msg_main'].'<br><br>'.$_POST['url_content']; $messageContent = $_POST['social_wall_new_msg_main'].'<br /><br />'.$_POST['url_content'];
} }
$idMessage = SocialManager::sendWallMessage( $idMessage = SocialManager::sendWallMessage(
api_get_user_id(), api_get_user_id(),

2
main/survey/fillsurvey.php
Unescape View File

@ -1174,7 +1174,7 @@ $g_ic = isset($_GET['invitationcode']) ? Security::remove_XSS($_GET['invitationc
$g_cr = isset($_GET['cidReq']) ? Security::remove_XSS($_GET['cidReq']) : ''; $g_cr = isset($_GET['cidReq']) ? Security::remove_XSS($_GET['cidReq']) : '';
$p_l = isset($_POST['language']) ? Security::remove_XSS($_POST['language']) : ''; $p_l = isset($_POST['language']) ? Security::remove_XSS($_POST['language']) : '';
$add_parameters = isset($_GET['user_id']) ? 'user_id='.$_GET['user_id'].'&amp;' : ''; $add_parameters = isset($_GET['user_id']) ? 'user_id='.intval($_GET['user_id']).'&amp;' : '';
$url = api_get_self().'?'.$add_parameters.'course='.$g_c.'&invitationcode='.$g_ic.'&show='.$show.'&cidReq='.$g_cr; $url = api_get_self().'?'.$add_parameters.'course='.$g_c.'&invitationcode='.$g_ic.'&show='.$show.'&cidReq='.$g_cr;
$form = new FormValidator('question', 'post', $url); $form = new FormValidator('question', 'post', $url);

6
main/wiki/wiki.inc.php
Unescape View File

@ -2136,7 +2136,9 @@ class Wiki
<tr><td>'.$photo.'<br />'.Display::tag('span', api_get_person_name($userinfo['firstname'], $userinfo['lastname']), array('title'=>$username)).'</td></tr> <tr><td>'.$photo.'<br />'.Display::tag('span', api_get_person_name($userinfo['firstname'], $userinfo['lastname']), array('title'=>$username)).'</td></tr>
</table></div>'; </table></div>';
$content_orig_B = '<br/><div align="center" style="font-size:24px">'.get_lang('AssignmentDescription').': '.$title_orig.'</div><br/>'.$_POST['content']; $content_orig_B = '<br/><div align="center" style="font-size:24px">'.
get_lang('AssignmentDescription').': '.
$title_orig.'</div><br/>'.Security::remove_XSS($_POST['content']);
//Second: student list (names, photo and links to their works). //Second: student list (names, photo and links to their works).
//Third: Create Students work pages. //Third: Create Students work pages.
@ -2180,7 +2182,7 @@ class Wiki
'span', 'span',
strtoupper($o_user_to_add['lastname']).', '.$o_user_to_add['firstname'], array('title'=>$username) strtoupper($o_user_to_add['lastname']).', '.$o_user_to_add['firstname'], array('title'=>$username)
). ).
' [['.$_POST['title']."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.'</li>'; ' [['.Security::remove_XSS($_POST['title'])."_uass".$assig_user_id.' | '.$photo.']] '.$status_in_group.'</li>';
//don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name) //don't change this line without guaranteeing that users will be ordered by last names in the following format (surname, name)
$values['assignment']=2; $values['assignment']=2;
} }

16
tests/main/exercice/freeanswer.class.test.php
Unescape View File

@ -1,29 +1,29 @@
<?php <?php
class TestFreeanswer extends UnitTestCase { class TestFreeanswer extends UnitTestCase {
/** /**
* function which redifines Question::createAnswersForm * function which redifines Question::createAnswersForm
* @param the formvalidator instance * @param the formvalidator instance
*/ */
function testcreateAnswersForm () { function testcreateAnswersForm () {
$form = new FormValidator('exercise_admin', 'post', api_get_self().'?exerciseId='.$_GET['exerciseId']); $form = new FormValidator('exercise_admin', 'post', api_get_self().'?exerciseId='.intval($_GET['exerciseId']));
$res =FreeAnswer::createAnswersForm($form); $res =FreeAnswer::createAnswersForm($form);
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
} }
/** /**
* abstract function which creates the form to create / edit the answers of the question * abstract function which creates the form to create / edit the answers of the question
* @param the formvalidator instance * @param the formvalidator instance
*/ */
function testprocessAnswersCreation () { function testprocessAnswersCreation () {
$form = new FormValidator('exercise_admin', 'post', api_get_self().'?exerciseId='.$_GET['exerciseId']); $form = new FormValidator('exercise_admin', 'post', api_get_self().'?exerciseId='.intval($_GET['exerciseId']));
$res =FreeAnswer::processAnswersCreation($form); $res =FreeAnswer::processAnswersCreation($form);
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
} }
} }
?> ?>

Write Preview
Loading…
Cancel
Save