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
1.9.x
Julio Montoya 11 years ago
parent cdc9cb6fcb
commit d9ed7eb692
4 changed files with 67 additions and 27 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. 4
      main/coursecopy/copy_course_session_selected.php
  2. 46
      main/inc/lib/course.lib.php
  3. 9
      main/inc/lib/formvalidator/FormValidator.class.php
  4. 35
      main/inc/lib/userportal.lib.php

4
main/coursecopy/copy_course_session_selected.php
Unescape View File

@ -8,10 +8,6 @@
* @author Angel Fernando Quiroz Campos <angel.quiroz@beeznest.com> Code conventions
* @package chamilo.backup
*/
/**
* Code
*/
/* INIT SECTION */
// Language files that need to be included
$language_file = array('coursebackup', 'admin');

46
main/inc/lib/course.lib.php
Unescape View File

@ -3585,6 +3585,12 @@ class CourseManager
return $html;
}
/**
* @param string $main_content
* @param string $sub_content
* @param string $sub_sub_content
* @return string
*/
public static function course_item_parent($main_content, $sub_content, $sub_sub_content = null)
{
return '<div class="well">'.$main_content.$sub_content.$sub_sub_content.'</div>';
@ -3597,7 +3603,7 @@ class CourseManager
* in the sense that any user clicking them is registered as a student
* @param int User id
* @param bool Whether to show the document quick-loader or not
* @return void
* @return string
*/
public static function display_special_courses($user_id, $load_dirs = false)
{
@ -3702,7 +3708,7 @@ class CourseManager
* @uses display_courses_in_category() to display the courses themselves
* @param int user id
* @param bool Whether to show the document quick-loader or not
* @return void
* @return string
*/
public static function display_courses($user_id, $load_dirs = false)
{
@ -3740,7 +3746,7 @@ class CourseManager
* class userportal-course-item.
* @param int User category id
* @param bool Whether to show the document quick-loader or not
* @return void
* @return string
*/
public static function display_courses_in_category($user_category_id, $load_dirs = false)
{
@ -3748,7 +3754,7 @@ class CourseManager
// Table definitions
$TABLECOURS = Database :: get_main_table(TABLE_MAIN_COURSE);
$TABLECOURSUSER = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
$TABLE_ACCESS_URL_REL_COURSE = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$TABLE_ACCESS_URL_REL_COURSE = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
$current_url_id = api_get_current_access_url_id();
// Get course list auto-register
@ -3862,18 +3868,23 @@ class CourseManager
$course_title_url = '';
if ($course_info['visibility'] != COURSE_VISIBILITY_CLOSED || $course['status'] == COURSEMANAGER) {
$course_title_url = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/?id_session=0';
$course_title_url = api_get_path(WEB_COURSE_PATH).$course_info['path'].'/index.php?id_session=0';
$course_title = Display::url($course_info['title'], $course_title_url);
} else {
$course_title = $course_info['title']." ".Display::tag('span',get_lang('CourseClosed'), array('class'=>'item_closed'));
$course_title = $course_info['title']." ".Display::tag('span', get_lang('CourseClosed'), array('class'=>'item_closed'));
}
// Start displaying the course block itself
if (api_get_setting('display_coursecode_in_courselist') == 'true') {
$course_title .= ' ('.$course_info['visual_code'].') ';
}
if (api_get_setting('display_teacher_in_courselist') == 'true') {
$teachers = CourseManager::get_teacher_list_from_course_code_to_string($course['code'], self::USER_SEPARATOR, true);
$teachers = CourseManager::get_teacher_list_from_course_code_to_string(
$course['code'],
self::USER_SEPARATOR,
true
);
}
$params['link'] = $course_title_url;
@ -3885,11 +3896,11 @@ class CourseManager
$params['notifications'] = $show_notification;
}
$is_subcontent = true;
$isSubcontent = true;
if (empty($user_category_id)) {
$is_subcontent = false;
$isSubcontent = false;
}
$html .= self::course_item_html($params, $is_subcontent);
$html .= self::course_item_html($params, $isSubcontent);
}
return $html;
@ -3914,18 +3925,23 @@ class CourseManager
}
/**
* Get the course id based on the original id and field name in the extra fields. Returns 0 if course was not found
* Get the course id based on the original id and field name in the extra fields.
* Returns 0 if course was not found
*
* @param string Original course code
* @param string Original field name
* @param string $original_course_id_value Original course code
* @param string $original_course_id_name Original field name
* @return int Course id
*/
public static function get_course_id_from_original_id($original_course_id_value, $original_course_id_name)
{
$t_cfv = Database::get_main_table(TABLE_MAIN_COURSE_FIELD_VALUES);
$table_field = Database::get_main_table(TABLE_MAIN_COURSE_FIELD);
$sql_course = "SELECT course_code FROM $table_field cf INNER JOIN $t_cfv cfv ON cfv.field_id=cf.id WHERE field_variable='$original_course_id_name' AND field_value='$original_course_id_value'";
$res = Database::query($sql_course);
$sql = "SELECT course_code FROM $table_field cf
INNER JOIN $t_cfv cfv ON cfv.field_id=cf.id
WHERE
field_variable='$original_course_id_name' AND
field_value='$original_course_id_value'";
$res = Database::query($sql);
$row = Database::fetch_object($res);
if ($row != false) {
return $row->course_code;

9
main/inc/lib/formvalidator/FormValidator.class.php
Unescape View File

@ -556,12 +556,19 @@ EOT;
* @return string $return_value HTML code of the form
*
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, august 2006
* @author Julio Montoya
*/
public function return_form()
{
$error = false;
$addDateLibraries = false;
$dateElementTypes = array('date_range_picker', 'date_time_picker', 'date_picker', 'datepicker', 'datetimepicker');
$dateElementTypes = array(
'date_range_picker',
'date_time_picker',
'date_picker',
'datepicker',
'datetimepicker'
);
/** @var HTML_QuickForm_element $element */
foreach ($this->_elements as $element) {
if (in_array($element->getType(), $dateElementTypes)) {

35
main/inc/lib/userportal.lib.php
Unescape View File

@ -1047,7 +1047,7 @@ class IndexManager
$date_session_start = $session['date_start'];
$date_session_end = $session['date_end'];
$days_access_before_beginning = $session['nb_days_access_before_beginning'];
$days_access_after_end = $session['nb_days_access_after_end'];
$days_access_after_end = $session['nb_days_access_after_end'];
$session_now = time();
$count_courses_session = 0;
@ -1076,7 +1076,10 @@ class IndexManager
}
}
}
if ($session_now > $allowed_time && $days_access_after_end > $dif_time_after - 1) {
if ($session_now > $allowed_time &&
$days_access_after_end > $dif_time_after - 1
) {
// Read only and accessible.
$atLeastOneCourseIsVisible = true;
@ -1104,7 +1107,12 @@ class IndexManager
if ($count_courses_session > 0) {
$params = array();
$session_box = Display::get_session_title_box($session_id);
$params['icon'] = Display::return_icon('window_list.png', $session_box['title'], array('id' => 'session_img_'.$session_id), ICON_SIZE_LARGE);
$params['icon'] = Display::return_icon(
'window_list.png',
$session_box['title'],
array('id' => 'session_img_' . $session_id),
ICON_SIZE_LARGE
);
$extra_info = !empty($session_box['coach']) ? $session_box['coach'] : null;
$extra_info .= !empty($session_box['coach']) ? ' - '.$session_box['dates'] : $session_box['dates'];
$extra_info .= isset($session_box['duration']) ? ' '.$session_box['duration'] : null;
@ -1113,7 +1121,15 @@ class IndexManager
$session_link = $session_box['title'];
$params['link'] = null;
} else {
$session_link = Display::tag('a', $session_box['title'], array('href'=>api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$session_id));
$session_link = Display::tag(
'a',
$session_box['title'],
array(
'href' => api_get_path(
WEB_CODE_PATH
) . 'session/index.php?session_id=' . $session_id
)
);
$params['link'] = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$session_id;
}
@ -1130,15 +1146,20 @@ class IndexManager
// $params['extra'] .= $html_courses_session;
}
$params['description'] = isset($session_box['description']) ? $session_box['description'] : null;
$params['description'] = isset($session_box['description']) ? $session_box['description'] : null;
$parentInfo = CourseManager::course_item_html($params, true);
if (isset($_configuration['show_simple_session_info']) && $_configuration['show_simple_session_info']) {
if (isset($_configuration['show_simple_session_info']) &&
$_configuration['show_simple_session_info']
) {
$params['title'] = $session_box['title'];
$parentInfo = CourseManager::course_item_html_no_icon($params);
}
$sessions_with_no_category .= CourseManager::course_item_parent($parentInfo, $html_courses_session);
$sessions_with_no_category .= CourseManager::course_item_parent(
$parentInfo,
$html_courses_session
);
}
}
} else {

Write Preview
Loading…
Cancel
Save