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, replace "else if" with "elseif".

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent 2b35e8125c
commit 71cfdebcf6
16 changed files with 147 additions and 125 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. 58
      main/attendance/attendance_controller.php
  2. 4
      main/course_progress/thematic_advance.php
  3. 2
      main/course_progress/thematic_controller.php
  4. 6
      main/exercise/question_pool.php
  5. 8
      main/inc/lib/course_home.lib.php

58
main/attendance/attendance_controller.php
Unescape View File

@ -30,10 +30,8 @@ class AttendanceController
*/ */
public function attendance_list() public function attendance_list()
{ {
$data = array();
// render to the view // render to the view
$this->view->set_data($data); $this->view->set_data([]);
$this->view->set_layout('layout'); $this->view->set_layout('layout');
$this->view->set_template('attendance_list'); $this->view->set_template('attendance_list');
$this->view->render(); $this->view->render();
@ -264,8 +262,12 @@ class AttendanceController
* @param int $student_id * @param int $student_id
* @param bool $edit * @param bool $edit
*/ */
public function attendance_sheet($action, $attendance_id, $student_id = 0, $edit = true) public function attendance_sheet(
{ $action,
$attendance_id,
$student_id = 0,
$edit = true
) {
$attendance = new Attendance(); $attendance = new Attendance();
$data = array(); $data = array();
$data['attendance_id'] = $attendance_id; $data['attendance_id'] = $attendance_id;
@ -284,7 +286,11 @@ class AttendanceController
if ($edit == true) { if ($edit == true) {
if (api_is_allowed_to_edit(null, true) || $isDrhOfCourse) { if (api_is_allowed_to_edit(null, true) || $isDrhOfCourse) {
$data['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id, 0, $groupId); $data['users_presence'] = $attendance->get_users_attendance_sheet(
$attendance_id,
0,
$groupId
);
} }
} else { } else {
if (!empty($student_id)) { if (!empty($student_id)) {
@ -297,17 +303,29 @@ class AttendanceController
api_is_coach(api_get_session_id(), api_get_course_int_id()) || api_is_coach(api_get_session_id(), api_get_course_int_id()) ||
$isDrhOfCourse $isDrhOfCourse
) { ) {
$data['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id, 0, $groupId); $data['users_presence'] = $attendance->get_users_attendance_sheet(
$attendance_id,
0,
$groupId
);
} else { } else {
$data['users_presence'] = $attendance->get_users_attendance_sheet($attendance_id, $user_id, $groupId); $data['users_presence'] = $attendance->get_users_attendance_sheet(
$attendance_id,
$user_id,
$groupId
);
} }
$data['faults'] = $attendance->get_faults_of_user($user_id, $attendance_id, $groupId); $data['faults'] = $attendance->get_faults_of_user($user_id, $attendance_id, $groupId);
$data['user_id'] = $user_id; $data['user_id'] = $user_id;
} }
$data['next_attendance_calendar_id'] = $attendance->get_next_attendance_calendar_id($attendance_id); $data['next_attendance_calendar_id'] = $attendance->get_next_attendance_calendar_id(
$data['next_attendance_calendar_datetime'] = $attendance->get_next_attendance_calendar_datetime($attendance_id); $attendance_id
);
$data['next_attendance_calendar_datetime'] = $attendance->get_next_attendance_calendar_datetime(
$attendance_id
);
if (strtoupper($_SERVER['REQUEST_METHOD']) == 'POST') { if (strtoupper($_SERVER['REQUEST_METHOD']) == 'POST') {
if (isset($_POST['hidden_input'])) { if (isset($_POST['hidden_input'])) {
@ -375,7 +393,8 @@ class AttendanceController
if (isset($_POST['repeat'])) { if (isset($_POST['repeat'])) {
//@todo check this error_logs //@todo check this error_logs
$start_datetime = api_strtotime( $start_datetime = api_strtotime(
api_get_utc_datetime($_POST['date_time']), 'UTC' api_get_utc_datetime($_POST['date_time']),
'UTC'
); );
$end_datetime = api_strtotime(api_get_utc_datetime($_POST['end_date_time'].' 23:59:59'), 'UTC'); $end_datetime = api_strtotime(api_get_utc_datetime($_POST['end_date_time'].' 23:59:59'), 'UTC');
@ -459,10 +478,14 @@ class AttendanceController
* @param string $action * @param string $action
* @param int $attendance_id * @param int $attendance_id
*/ */
public function attendance_sheet_export_to_pdf($action, $attendance_id, $student_id = 0, $course_id = '') public function attendance_sheet_export_to_pdf(
{ $action,
$attendance_id,
$student_id = 0,
$course_id = ''
) {
$attendance = new Attendance(); $attendance = new Attendance();
$courseInfo = CourseManager::get_course_information($course_id); $courseInfo = api_get_course_info($course_id);
$attendance->set_course_id($courseInfo['code']); $attendance->set_course_id($courseInfo['code']);
$groupId = isset($_REQUEST['group_id']) ? $_REQUEST['group_id'] : null; $groupId = isset($_REQUEST['group_id']) ? $_REQUEST['group_id'] : null;
$data_array = array(); $data_array = array();
@ -504,7 +527,7 @@ class AttendanceController
$data_array['next_attendance_calendar_id'] = $attendance->get_next_attendance_calendar_id($attendance_id); $data_array['next_attendance_calendar_id'] = $attendance->get_next_attendance_calendar_id($attendance_id);
// Set headers pdf. // Set headers pdf.
$courseCategory = CourseManager::get_course_category($courseInfo['category_code']); $courseCategory = CourseManager::get_course_category($courseInfo['categoryCode']);
$teacherInfo = CourseManager::get_teacher_list_from_course_code($courseInfo['code']); $teacherInfo = CourseManager::get_teacher_list_from_course_code($courseInfo['code']);
$teacherName = null; $teacherName = null;
foreach ($teacherInfo as $teacherData) { foreach ($teacherInfo as $teacherData) {
@ -615,6 +638,7 @@ class AttendanceController
* Gets attendance base in the table: * Gets attendance base in the table:
* TABLE_STATISTIC_TRACK_E_COURSE_ACCESS * TABLE_STATISTIC_TRACK_E_COURSE_ACCESS
* @param bool $showForm * @param bool $showForm
* @param bool $exportToPdf
*/ */
public function getAttendanceBaseInLogin($showForm = false, $exportToPdf = true) public function getAttendanceBaseInLogin($showForm = false, $exportToPdf = true)
{ {
@ -628,8 +652,7 @@ class AttendanceController
$form = new FormValidator( $form = new FormValidator(
'search', 'search',
'post', 'post',
api_get_self().'?'.api_get_cidreq( api_get_self().'?'.api_get_cidreq().'&action=calendar_logins'
).'&action=calendar_logins'
); );
$form->addDateRangePicker('range', get_lang('DateRange')); $form->addDateRangePicker('range', get_lang('DateRange'));
$form->addButton('submit', get_lang('Submit')); $form->addButton('submit', get_lang('Submit'));
@ -650,7 +673,6 @@ class AttendanceController
} }
$attendance = new Attendance(); $attendance = new Attendance();
if ($exportToPdf) { if ($exportToPdf) {
$result = $attendance->exportAttendanceLogin($startDate, $endDate); $result = $attendance->exportAttendanceLogin($startDate, $endDate);
if (empty($result)) { if (empty($result)) {

4
main/course_progress/thematic_advance.php
Unescape View File

@ -12,7 +12,6 @@
api_protect_course_script(true); api_protect_course_script(true);
if ($action === 'thematic_advance_add' || $action === 'thematic_advance_edit') { if ($action === 'thematic_advance_add' || $action === 'thematic_advance_edit') {
$header_form = get_lang('NewThematicAdvance'); $header_form = get_lang('NewThematicAdvance');
if ($action === 'thematic_advance_edit') { if ($action === 'thematic_advance_edit') {
$header_form = get_lang('EditThematicAdvance'); $header_form = get_lang('EditThematicAdvance');
@ -137,7 +136,6 @@ if ($action === 'thematic_advance_add' || $action === 'thematic_advance_edit') {
} }
$attendance_select_item_id = null; $attendance_select_item_id = null;
if (count($attendance_select) > 1) { if (count($attendance_select) > 1) {
$i = 1; $i = 1;
foreach ($attendance_select as $key => $attendance_select_item) { foreach ($attendance_select as $key => $attendance_select_item) {
@ -162,7 +160,6 @@ if ($action === 'thematic_advance_add' || $action === 'thematic_advance_edit') {
$default['duration_in_hours'] = 1; $default['duration_in_hours'] = 1;
if (!empty($thematic_advance_data)) { if (!empty($thematic_advance_data)) {
// set default values // set default values
$default['content'] = isset($thematic_advance_data['content']) ? $thematic_advance_data['content'] : null; $default['content'] = isset($thematic_advance_data['content']) ? $thematic_advance_data['content'] : null;
$default['duration_in_hours'] = isset($thematic_advance_data['duration']) ? $thematic_advance_data['duration'] : 1; $default['duration_in_hours'] = isset($thematic_advance_data['duration']) ? $thematic_advance_data['duration'] : 1;
@ -225,7 +222,6 @@ if ($action === 'thematic_advance_add' || $action === 'thematic_advance_edit') {
} }
$form->display(); $form->display();
} elseif ($action == 'thematic_advance_list') { } elseif ($action == 'thematic_advance_list') {
// thematic advance list // thematic advance list
echo '<div class="actions">'; echo '<div class="actions">';

2
main/course_progress/thematic_controller.php
Unescape View File

@ -509,7 +509,6 @@ class ThematicController
$thematic = new Thematic(); $thematic = new Thematic();
$attendance = new Attendance(); $attendance = new Attendance();
$data = array(); $data = array();
$displayHeader = (!empty($_REQUEST['display']) && $_REQUEST['display'] === 'no_header') ? false : true; $displayHeader = (!empty($_REQUEST['display']) && $_REQUEST['display'] === 'no_header') ? false : true;
// get data for attendance input select // get data for attendance input select
@ -576,7 +575,6 @@ class ThematicController
$layoutName = $displayHeader ? 'layout' : 'layout_no_header'; $layoutName = $displayHeader ? 'layout' : 'layout_no_header';
// render to the view // render to the view
$this->view->set_data($data); $this->view->set_data($data);
$this->view->set_layout($layoutName); $this->view->set_layout($layoutName);
$this->view->set_template('thematic_advance'); $this->view->set_template('thematic_advance');

6
main/exercise/question_pool.php
Unescape View File

@ -1,6 +1,8 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/** /**
* Question Pool * Question Pool
* This script allows administrators to manage questions and add them into their exercises. * This script allows administrators to manage questions and add them into their exercises.
@ -11,8 +13,6 @@
* @author Modify by hubert borderiou 2011-10-21 Question's category * @author Modify by hubert borderiou 2011-10-21 Question's category
*/ */
use ChamiloSession as Session;
require_once __DIR__.'/../inc/global.inc.php'; require_once __DIR__.'/../inc/global.inc.php';
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
@ -58,7 +58,7 @@ if (!empty($objExercise)) {
} }
// message to be displayed if actions successful // message to be displayed if actions successful
$displayMessage = ""; $displayMessage = '';
if ($is_allowedToEdit) { if ($is_allowedToEdit) {
// Duplicating a Question // Duplicating a Question
if (!isset($_POST['recup']) && $question_copy != 0 && isset($fromExercise)) { if (!isset($_POST['recup']) && $question_copy != 0 && isset($fromExercise)) {

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

@ -1306,7 +1306,13 @@ class CourseHome
); );
} else { } else {
$class = 'icons-text'; $class = 'icons-text';
$item = $navigation_item['name'].Display::return_icon(substr($navigation_item['image'], 0, -3)."png", $navigation_item['name'], array('class'=>'tool-img'), ICON_SIZE_SMALL); $item = $navigation_item['name'].
Display::return_icon(
substr($navigation_item['image'], 0, -3)."png",
$navigation_item['name'],
array('class' => 'tool-img'),
ICON_SIZE_SMALL
);
} }
if (stristr($url_item['path'], $url_current['path'])) { if (stristr($url_item['path'], $url_current['path'])) {

Write Preview
Loading…
Cancel
Save