1.10.x
Julio Montoya 10 years ago
parent 901fd5065b
commit d78e60b288
  1. 8
      main/calendar/agenda_js.php
  2. 2
      main/forum/forumfunction.inc.php
  3. 18
      main/forum/forumsearch.php
  4. 9
      main/inc/lib/agenda.lib.php

@ -201,7 +201,13 @@ if (!empty($userId)) {
$tpl->assign('web_agenda_ajax_url', $agenda_ajax_url);
$course_code = api_get_course_id();
$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">');
$sendTo = $agenda->parseAgendaFilter($userId);

@ -3772,7 +3772,7 @@ function forum_search()
// Setting the form elements.
$form->addElement('header', '', get_lang('ForumSearch'));
$form->addElement('text', 'search_term', get_lang('SearchTerm'), 'class="input_titles" id="search_title"');
$form->addElement('text', 'search_term', get_lang('SearchTerm'), array('id' =>'search_title'));
$form->applyFilter('search_term', 'html_filter');
$form->addElement('static', 'search_information', '', get_lang('ForumSearchInformation'));
$form->addButtonSearch(get_lang('Search'));

@ -62,20 +62,16 @@ if (!empty($gradebook) && $gradebook == 'view') {
);
}
if (!empty ($_GET['gidReq'])) {
$toolgroup = Database::escape_string($_GET['gidReq']);
Session::write('toolgroup',$toolgroup);
}
$groupId = api_get_group_id();
if ($origin == 'group') {
$_clean['toolgroup']=(int)$_SESSION['toolgroup'];
$group_properties = GroupManager :: get_group_properties($_clean['toolgroup']);
$interbreadcrumb[] = array('url' => '../group/group.php', 'name' => get_lang('Groups'));
$interbreadcrumb[] = array('url' => '../group/group_space.php?gidReq='.$_SESSION['toolgroup'], 'name' => get_lang('GroupSpace').' ('.$group_properties['name'].')');
$interbreadcrumb[] = array('url' => 'viewforum.php?origin='.$origin.'&amp;gidReq='.$_SESSION['toolgroup'].'&amp;forum='.Security::remove_XSS($_GET['forum']), 'name' => prepare4display($current_forum['forum_title']));
$interbreadcrumb[] = array('url' => 'forumsearch.php','name' => get_lang('ForumSearch'));
$group_properties = GroupManager :: get_group_properties($groupId);
$interbreadcrumb[] = array('url' => '../group/group.php?'.api_get_cidreq(), 'name' => get_lang('Groups'));
$interbreadcrumb[] = array('url' => '../group/group_space.php?'.api_get_cidreq(), 'name' => get_lang('GroupSpace').' ('.$group_properties['name'].')');
$interbreadcrumb[] = array('url' => 'viewforum.php?origin='.$origin.'&forum='.Security::remove_XSS($_GET['forum']).'&'.api_get_cidreq(), 'name' => prepare4display($current_forum['forum_title']));
$interbreadcrumb[] = array('url' => 'forumsearch.php?'.api_get_cidreq(),'name' => get_lang('ForumSearch'));
} else {
$interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'', 'name' => $nameTools);
$interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq(), 'name' => $nameTools);
//$interbreadcrumb[] = array('url' => 'forumsearch.php', 'name' => );
$nameTools = get_lang('ForumSearch');
}

@ -2232,7 +2232,14 @@ class Agenda
if ($this->type == 'course') {
$form = null;
if (!isset($_GET['action'])) {
$form = new FormValidator('form-search');
$form = new FormValidator(
'form-search',
'post',
'',
'',
array(),
FormValidator::LAYOUT_INLINE);
$attributes = array(
'multiple' => false,
'id' => 'select_form_id_search'

Loading…
Cancel
Save