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 - format code

Browse Source
pull/2926/head
Julio Montoya 6 years ago
parent 0502e3711d
commit 9305964585
3 changed files with 34 additions and 38 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. 33
      main/exercise/question_pool.php
  2. 38
      main/inc/lib/display.lib.php
  3. 1
      main/inc/lib/sortable_table.class.php

33
main/exercise/question_pool.php
Unescape View File

@ -23,20 +23,20 @@ $this_section = SECTION_COURSES;
$is_allowedToEdit = api_is_allowed_to_edit(null, true); $is_allowedToEdit = api_is_allowed_to_edit(null, true);
$delete = isset($_GET['delete']) ? intval($_GET['delete']) : null; $delete = isset($_GET['delete']) ? (int) $_GET['delete'] : null;
$recup = isset($_GET['recup']) ? intval($_GET['recup']) : null; $recup = isset($_GET['recup']) ? (int) $_GET['recup'] : null;
$fromExercise = isset($_REQUEST['fromExercise']) ? intval($_REQUEST['fromExercise']) : null; $fromExercise = isset($_REQUEST['fromExercise']) ? (int) $_REQUEST['fromExercise'] : null;
$exerciseId = isset($_REQUEST['exerciseId']) ? intval($_REQUEST['exerciseId']) : null; $exerciseId = isset($_REQUEST['exerciseId']) ? (int) $_REQUEST['exerciseId'] : null;
$courseCategoryId = isset($_REQUEST['courseCategoryId']) ? intval($_REQUEST['courseCategoryId']) : null; $courseCategoryId = isset($_REQUEST['courseCategoryId']) ? (int) $_REQUEST['courseCategoryId'] : null;
$exerciseLevel = isset($_REQUEST['exerciseLevel']) ? intval($_REQUEST['exerciseLevel']) : -1; $exerciseLevel = isset($_REQUEST['exerciseLevel']) ? (int) $_REQUEST['exerciseLevel'] : -1;
$answerType = isset($_REQUEST['answerType']) ? intval($_REQUEST['answerType']) : null; $answerType = isset($_REQUEST['answerType']) ? (int) $_REQUEST['answerType'] : null;
$question_copy = isset($_REQUEST['question_copy']) ? intval($_REQUEST['question_copy']) : 0; $question_copy = isset($_REQUEST['question_copy']) ? (int) $_REQUEST['question_copy'] : 0;
$session_id = isset($_REQUEST['session_id']) ? intval($_REQUEST['session_id']) : null; $session_id = isset($_REQUEST['session_id']) ? (int) $_REQUEST['session_id'] : null;
$selected_course = isset($_GET['selected_course']) ? intval($_GET['selected_course']) : null; $selected_course = isset($_GET['selected_course']) ? (int) $_GET['selected_course'] : null;
// save the id of the previous course selected by user to reset menu if we detect that user change course hub 13-10-2011 // save the id of the previous course selected by user to reset menu if we detect that user change course hub 13-10-2011
$course_id_changed = isset($_GET['course_id_changed']) ? intval($_GET['course_id_changed']) : null; $course_id_changed = isset($_GET['course_id_changed']) ? (int) $_GET['course_id_changed'] : null;
// save the id of the previous exercise selected by user to reset menu if we detect that user change course hub 13-10-2011 // save the id of the previous exercise selected by user to reset menu if we detect that user change course hub 13-10-2011
$exercise_id_changed = isset($_GET['exercise_id_changed']) ? intval($_GET['exercise_id_changed']) : null; $exercise_id_changed = isset($_GET['exercise_id_changed']) ? (int) $_GET['exercise_id_changed'] : null;
$questionId = isset($_GET['question_id']) && !empty($_GET['question_id']) ? (int) $_GET['question_id'] : ''; $questionId = isset($_GET['question_id']) && !empty($_GET['question_id']) ? (int) $_GET['question_id'] : '';
$description = isset($_GET['description']) ? Database::escape_string($_GET['description']) : ''; $description = isset($_GET['description']) ? Database::escape_string($_GET['description']) : '';
$page = isset($_GET['page']) ? (int) $_GET['page'] : 1; $page = isset($_GET['page']) ? (int) $_GET['page'] : 1;
@ -131,9 +131,7 @@ if ($is_allowedToEdit) {
// Adds the question ID represented by $recup into the list of questions for the current exercise // Adds the question ID represented by $recup into the list of questions for the current exercise
$objExercise->addToList($recup); $objExercise->addToList($recup);
Session::write('objExercise', $objExercise); Session::write('objExercise', $objExercise);
Display::addFlash( Display::addFlash(Display::return_message(get_lang('ItemAdded'), 'success'));
Display::return_message(get_lang('ItemAdded'), 'success')
);
} elseif (isset($_POST['recup']) && is_array($_POST['recup']) && $fromExercise) { } elseif (isset($_POST['recup']) && is_array($_POST['recup']) && $fromExercise) {
$list_recup = $_POST['recup']; $list_recup = $_POST['recup'];
foreach ($list_recup as $course_id => $question_data) { foreach ($list_recup as $course_id => $question_data) {
@ -141,7 +139,7 @@ if ($is_allowedToEdit) {
$origin_course_info = api_get_course_info_by_id($origin_course_id); $origin_course_info = api_get_course_info_by_id($origin_course_id);
$current_course = api_get_course_info(); $current_course = api_get_course_info();
foreach ($question_data as $old_question_id) { foreach ($question_data as $old_question_id) {
//Reading the source question // Reading the source question
$old_question_obj = Question::read($old_question_id, $origin_course_info); $old_question_obj = Question::read($old_question_id, $origin_course_info);
if ($old_question_obj) { if ($old_question_obj) {
$old_question_obj->updateTitle( $old_question_obj->updateTitle(
@ -307,7 +305,7 @@ if (isset($fromExercise) && $fromExercise > 0) {
echo '<a href="exercise.php?'.api_get_cidreq().'">'. echo '<a href="exercise.php?'.api_get_cidreq().'">'.
Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('BackToExercisesList'), '', ICON_SIZE_MEDIUM).'</a>';
echo "<a href='admin.php?exerciseId=0'>". echo "<a href='admin.php?exerciseId=0'>".
Display::return_icon('add_question.gif', get_lang('NewQu'), '', ICON_SIZE_MEDIUM)."</a>"; Display::return_icon('add_question.gif', get_lang('NewQu'), '', ICON_SIZE_MEDIUM).'</a>';
$titleAdd = get_lang('ManageAllQuestions'); $titleAdd = get_lang('ManageAllQuestions');
} }
echo '</div>'; echo '</div>';
@ -993,7 +991,6 @@ $html .= '<div class="btn-group">
</button>'; </button>';
$html .= '<ul class="dropdown-menu">'; $html .= '<ul class="dropdown-menu">';
$actionLabel = get_lang('ReUseACopyInCurrentTest'); $actionLabel = get_lang('ReUseACopyInCurrentTest');
$actions = ['clone' => get_lang('ReUseACopyInCurrentTest')]; $actions = ['clone' => get_lang('ReUseACopyInCurrentTest')];
if ($selected_course == api_get_course_int_id()) { if ($selected_course == api_get_course_int_id()) {

38
main/inc/lib/display.lib.php
Unescape View File

@ -206,25 +206,25 @@ class Display
/** /**
* Displays a table. * Displays a table.
* *
* @param array $header Titles for the table header * @param array $header Titles for the table header
* each item in this array can contain 3 values * each item in this array can contain 3 values
* - 1st element: the column title * - 1st element: the column title
* - 2nd element: true or false (column sortable?) * - 2nd element: true or false (column sortable?)
* - 3th element: additional attributes for * - 3th element: additional attributes for
* th-tag (eg for column-width) * th-tag (eg for column-width)
* - 4the element: additional attributes for the td-tags * - 4the element: additional attributes for the td-tags
* @param array $content 2D-array with the tables content * @param array $content 2D-array with the tables content
* @param array $sorting_options Keys are: * @param array $sorting_options Keys are:
* 'column' = The column to use as sort-key * 'column' = The column to use as sort-key
* 'direction' = SORT_ASC or SORT_DESC * 'direction' = SORT_ASC or SORT_DESC
* @param array $paging_options Keys are: * @param array $paging_options Keys are:
* 'per_page_default' = items per page when switching from * 'per_page_default' = items per page when switching from
* full- list to per-page-view * full- list to per-page-view
* 'per_page' = number of items to show per page * 'per_page' = number of items to show per page
* 'page_nr' = The page to display * 'page_nr' = The page to display
* @param array $query_vars Additional variables to add in the query-string * @param array $query_vars Additional variables to add in the query-string
* @param array $form_actions * @param array $form_actions
* @param string $style The style that the table will show. You can set 'table' or 'grid' * @param string $style The style that the table will show. You can set 'table' or 'grid'
* @param string $tableName * @param string $tableName
* @param string $tableId * @param string $tableId
* *

1
main/inc/lib/sortable_table.class.php
Unescape View File

@ -1050,7 +1050,6 @@ class SortableTableFromArray extends SortableTable
* @param string $tableName * @param string $tableName
* @param string $get_total_number_function * @param string $get_total_number_function
* @param string $tableId * @param string $tableId
*
*/ */
public function __construct( public function __construct(
$table_data, $table_data,

Write Preview
Loading…
Cancel
Save