Minor - format code

1.9.x
Julio Montoya 11 years ago
parent f32cacb292
commit 0e1a9c8004
  1. 14
      main/calendar/agenda_js.php
  2. 36
      main/inc/ajax/agenda.ajax.php
  3. 2
      main/newscorm/learnpath.class.php

@ -93,8 +93,14 @@ switch ($type) {
if (api_is_anonymous()) { if (api_is_anonymous()) {
api_not_allowed(true); api_not_allowed(true);
} }
$extra_field_data = UserManager::get_extra_user_data_by_field(api_get_user_id(), 'google_calendar_url'); $extra_field_data = UserManager::get_extra_user_data_by_field(
if (!empty($extra_field_data) && isset($extra_field_data['google_calendar_url']) && !empty($extra_field_data['google_calendar_url'])) { api_get_user_id(),
'google_calendar_url'
);
if (!empty($extra_field_data) &&
isset($extra_field_data['google_calendar_url']) &&
!empty($extra_field_data['google_calendar_url'])
) {
$tpl->assign('use_google_calendar', 1); $tpl->assign('use_google_calendar', 1);
$tpl->assign('google_calendar_url', $extra_field_data['google_calendar_url']); $tpl->assign('google_calendar_url', $extra_field_data['google_calendar_url']);
} }
@ -189,8 +195,6 @@ if (!empty($userId)) {
$tpl->assign('web_agenda_ajax_url', $agenda_ajax_url); $tpl->assign('web_agenda_ajax_url', $agenda_ajax_url);
$course_code = api_get_course_id(); $course_code = api_get_course_id();
//if ((api_is_allowed_to_edit() || $is_group_tutor) && $course_code != '-1' && $type == 'course') {
$form = new FormValidator('form', 'get', null, null, array('id' => 'add_event_form')); $form = new FormValidator('form', 'get', null, null, array('id' => 'add_event_form'));
$form->addElement('html', '<div id="visible_to_input">'); $form->addElement('html', '<div id="visible_to_input">');
@ -212,6 +216,7 @@ $course_code = api_get_course_id();
$form->addElement('label', get_lang('Date'), '<span id="start_date"></span><span id="end_date"></span>'); $form->addElement('label', get_lang('Date'), '<span id="start_date"></span><span id="end_date"></span>');
$form->addElement('text', 'title', get_lang('Title'), array('id' => 'title')); $form->addElement('text', 'title', get_lang('Title'), array('id' => 'title'));
$form->addElement('textarea', 'content', get_lang('Description'), array('id' => 'content')); $form->addElement('textarea', 'content', get_lang('Description'), array('id' => 'content'));
if ($agenda->type == 'course') { if ($agenda->type == 'course') {
$form->addElement('html', '<div id="add_as_announcement_div" style="display: none">'); $form->addElement('html', '<div id="add_as_announcement_div" style="display: none">');
$form->addElement('checkbox', 'add_as_annonuncement', null, get_lang('AddAsAnnouncement')); $form->addElement('checkbox', 'add_as_annonuncement', null, get_lang('AddAsAnnouncement'));
@ -219,7 +224,6 @@ $course_code = api_get_course_id();
} }
$tpl->assign('form_add', $form->return_form()); $tpl->assign('form_add', $form->return_form());
//}
// Loading Agenda template. // Loading Agenda template.
$content = $tpl->fetch('default/agenda/month.tpl'); $content = $tpl->fetch('default/agenda/month.tpl');

@ -138,13 +138,41 @@ switch ($action) {
} }
$monthName = $MonthsLong[$month - 1]; $monthName = $MonthsLong[$month - 1];
$agendaitems = get_myagendaitems($user_id, $my_course_list, $month, $year); $agendaitems = get_myagendaitems(
$agendaitems = get_global_agenda_items($agendaitems, $day, $month, $year, $week, "month_view"); $user_id,
$my_course_list,
$month,
$year
);
$agendaitems = get_global_agenda_items(
$agendaitems,
$day,
$month,
$year,
$week,
"month_view"
);
if (api_get_setting('allow_personal_agenda') == 'true') { if (api_get_setting('allow_personal_agenda') == 'true') {
$agendaitems = get_personal_agenda_items($user_id, $agendaitems, $day, $month, $year, $week, "month_view"); $agendaitems = get_personal_agenda_items(
$user_id,
$agendaitems,
$day,
$month,
$year,
$week,
"month_view"
);
} }
display_mymonthcalendar($user_id, $agendaitems, $month, $year, array(), $monthName, false); display_mymonthcalendar(
$user_id,
$agendaitems,
$month,
$year,
array(),
$monthName,
false
);
} }
break; break;
default: default:

@ -7137,8 +7137,6 @@ class learnpath
$form->applyFilter('title', 'html_filter'); $form->applyFilter('title', 'html_filter');
} }
//$arrHide = array($id);
$arrHide[0]['value'] = $this->name; $arrHide[0]['value'] = $this->name;
$arrHide[0]['padding'] = 3; $arrHide[0]['padding'] = 3;

Loading…
Cancel
Save