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

Improve code precision as suggested by #scrutinizer

Browse Source
pull/2487/head
Yannick Warnier 10 years ago
parent 9e0d45e9b6
commit 59ee624414
8 changed files with 54 additions and 36 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. 6
      main/admin/access_url_edit.php
  2. 13
      main/admin/add_sessions_to_usergroup.php
  3. 4
      main/admin/class_import.php
  4. 8
      main/admin/class_user_import.php
  5. 12
      main/admin/course_export.php
  6. 12
      main/admin/course_import.php
  7. 4
      main/admin/course_list.php
  8. 31
      main/inc/lib/career.lib.php

6
main/admin/access_url_edit.php
Unescape View File

@ -44,7 +44,8 @@ if ($form->validate()) {
foreach ($image_fields as $image_field) {
if ($_FILES[$image_field]['error'] == 0) {
// Hardcoded: only PNG files allowed
if (end(explode('.', $_FILES[$image_field]['name'])) == 'png') {
$fileFields = explode('.', $_FILES[$image_field]['name']);
if (end($fileFields) == 'png') {
if (file_exists($url_images_dir . $url_id . '_' . $image_field . '.png')) {
// if the file exists, we have to remove it before move_uploaded_file
unlink($url_images_dir . $url_id . '_' . $image_field . '.png');
@ -83,7 +84,8 @@ if ($form->validate()) {
foreach ($image_fields as $image_field) {
if ($_FILES[$image_field]['error'] == 0) {
// Hardcoded: only PNG files allowed
if (end(explode('.', $_FILES[$image_field]['name'])) == 'png') {
$fileFields = explode('.', $_FILES[$image_field]['name']);
if (end($fileFields) == 'png') {
move_uploaded_file($_FILES[$image_field]['tmp_name'], $url_images_dir . $url_id . '_' . $image_field . '.png');
}
// else fail silently

13
main/admin/add_sessions_to_usergroup.php
Unescape View File

@ -12,7 +12,7 @@ require_once '../inc/global.inc.php';
$xajax = new xajax();
//$xajax->debugOn();
$xajax->registerFunction('search_sessions');
$xajax->registerFunction('search_usergroup_sessions');
// setting the section (for the tabs)
$this_section = SECTION_PLATFORM_ADMIN;
@ -119,7 +119,7 @@ $ajax_search = $add_type == 'unique' ? true : false;
//checking for extra field with filter on
function search_sessions($needle,$type) {
function search_usergroup_sessions($needle,$type) {
global $elements_in;
$xajax_response = new xajaxResponse();
$return = '';
@ -154,13 +154,14 @@ $xajax->processRequests();
Display::display_header($tool_name);
$add = (empty($_GET['add']) ? '' : Security::remove_XSS($_GET['add']));
if ($add_type == 'multiple') {
$link_add_type_unique = '<a href="'.api_get_self().'?add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.
$link_add_type_unique = '<a href="' . api_get_self() . '?add=' . $add . '&add_type=unique">'.
Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
$link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
} else {
$link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
$link_add_type_multiple = '<a href="'.api_get_self().'?add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.
$link_add_type_multiple = '<a href="' . api_get_self() . '?add=' . $add . '&add_type=multiple">'.
Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
}
@ -170,7 +171,7 @@ echo '<a href="javascript://" class="advanced_parameters" style="margin-top: 8px
Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'</span></a>';
echo '</div>';
echo '<div id="advancedSearch" style="display: none">'. get_lang('SearchSessions'); ?> :
<input name="SearchSession" onchange = "xajax_search_sessions(this.value,'searchbox')" onkeyup="this.onchange()">
<input name="SearchSession" onchange = "xajax_search_usergroup_sessions(this.value,'searchbox')" onkeyup="this.onchange()">
</div>
<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
<?php
@ -195,7 +196,7 @@ if(!empty($errorMsg)) {
<tr>
<td align="center">
<?php echo get_lang('FirstLetterSessions'); ?> :
<select name="firstLetterUser" onchange = "xajax_search_sessions(this.value,'multiple')" >
<select name="firstLetterUser" onchange = "xajax_search_usergroup_sessions(this.value,'multiple')" >
<option value = "%">--</option>
<?php
echo Display :: get_alphabet_options();

4
main/admin/class_import.php
Unescape View File

@ -11,6 +11,8 @@
/**
* Validates imported data.
* @param array $classes A list of classes to be validated
* @return array An array with error messages (if any)
*/
function validate_data($classes) {
$errors = array();
@ -35,6 +37,8 @@ function validate_data($classes) {
/**
* Save imported class data to database
* @param array $classes A list of classes to be imported
* @return int The number of classes that where successfully imported
*/
function save_data($classes) {
$number_of_added_classes = 0;

8
main/admin/class_user_import.php
Unescape View File

@ -12,7 +12,7 @@
/**
* Validates imported data.
*/
function validate_data($user_classes) {
function validate_users_data($user_classes) {
global $purification_option_for_usernames;
$errors = array ();
$classcodes = array ();
@ -71,7 +71,7 @@ function validate_data($user_classes) {
/**
* Saves imported data.
*/
function save_data($users_classes) {
function save_users_data($users_classes) {
global $purification_option_for_usernames;
@ -157,9 +157,9 @@ $form->addButtonImport(get_lang('Import'));
if ($form->validate()) {
$users_classes = parse_csv_data($_FILES['import_file']['tmp_name']);
$errors = validate_data($users_classes);
$errors = validate_users_data($users_classes);
if (count($errors) == 0) {
save_data($users_classes);
save_users_data($users_classes);
header('Location: class_list.php?action=show_message&message='.urlencode(get_lang('FileImported')));
exit();
}

12
main/admin/course_export.php
Unescape View File

@ -81,11 +81,13 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
$usersInCourse = CourseManager::get_user_list_from_course_code($course['code']);
foreach ($usersInCourse as $user) {
if ($user['status_rel'] == COURSEMANAGER) {
$dataToExport['teachers'] .= $user['username'].'|';
} else {
$dataToExport['students'] .= $user['username'].'|';
if (is_array($usersInCourse) && !empty($usersInCourse)) {
foreach ($usersInCourse as $user) {
if ($user['status_rel'] == COURSEMANAGER) {
$dataToExport['teachers'] .= $user['username'] . '|';
} else {
$dataToExport['students'] .= $user['username'] . '|';
}
}
}
$dataToExport['students'] = substr($dataToExport['students'], 0, -1);

12
main/admin/course_import.php
Unescape View File

@ -13,7 +13,7 @@
* @param array $courses
* @return array $errors
*/
function validate_data($courses)
function validate_courses_data($courses)
{
$errors = array ();
$coursecodes = array ();
@ -92,7 +92,7 @@ function getTeacherListInArray($teachers)
* Saves imported data.
* @param array $courses List of courses
*/
function save_data($courses)
function save_courses_data($courses)
{
$msg = '';
foreach ($courses as $course) {
@ -148,7 +148,7 @@ function save_data($courses)
* @param string $file Path to the CSV-file
* @return array All course-information read from the file
*/
function parse_csv_data($file)
function parse_csv_courses_data($file)
{
$courses = Import::csv_reader($file);
return $courses;
@ -186,11 +186,11 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
if (!in_array($ext_import_file, $allowed_file_mimetype)) {
Display :: display_error_message(get_lang('YouMustImportAFileAccordingToSelectedOption'));
} else {
$courses = parse_csv_data($_FILES['import_file']['tmp_name']);
$courses = parse_csv_courses_data($_FILES['import_file']['tmp_name']);
$errors = validate_data($courses);
$errors = validate_courses_data($courses);
if (count($errors) == 0) {
save_data($courses);
save_courses_data($courses);
}
}
}

4
main/admin/course_list.php
Unescape View File

@ -229,7 +229,7 @@ function get_course_data_by_session($from, $number_of_items, $column, $direction
/**
* Filter to display the edit-buttons
*/
function modify_filter($code)
function modify_courses_filter($code)
{
$icourse = api_get_course_info($code);
$path = api_get_path(WEB_CODE_PATH);
@ -455,7 +455,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
//$table->set_header(7, get_lang('Teacher'));
$table->set_header(7, get_lang('Action'), false, null, array('class'=>'td_actions'));
$table->set_column_filter(7, 'modify_filter');
$table->set_column_filter(7, 'modify_courses_filter');
$table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course');
$content .= $table->return_table();
}

31
main/inc/lib/career.lib.php
Unescape View File

@ -239,27 +239,36 @@ class Career extends Model
}
/**
* @param int $id
* @return bool|void
* Delete a record from the career table and report in the default events log table
* @param int $id The ID of the career to delete
* @return bool True if the career could be deleted, false otherwise
*/
public function delete($id)
{
parent::delete($id);
Event::addEvent(
LOG_CAREER_DELETE,
LOG_CAREER_ID,
$id,
api_get_utc_datetime(),
api_get_user_id()
);
$res = parent::delete($id);
if ($res) {
Event::addEvent(
LOG_CAREER_DELETE,
LOG_CAREER_ID,
$id,
api_get_utc_datetime(),
api_get_user_id()
);
}
return $res;
}
/**
* Update the career table with the given params
* @param array $params The field values to be set
* @return bool Returns true if the record could be updated, false otherwise
*/
public function update($params)
{
if (isset($params['description'])) {
$params['description'] = Security::remove_XSS($params['description']);
}
parent::update($params);
return parent::update($params);
}
}

Write Preview
Loading…
Cancel
Save