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

Removing custom <form> with FormValidator.

Browse Source
1.10.x
Julio Montoya 13 years ago
parent 966707be13
commit 86a8452141
3 changed files with 50 additions and 34 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. 44
      main/admin/settings.lib.php
  2. 20
      main/admin/settings.php
  3. 20
      src/ChamiloLMS/Controller/Admin/AdminController.php

44
main/admin/settings.lib.php
Unescape View File

@ -1070,17 +1070,18 @@ function update_gradebook_score_display_custom_values($values) {
/**
* @param array $settings
* @param array $settings_by_access_list
* @param array $settings_to_avoid
* @param array $convert_byte_to_mega_list
* @return FormValidator
*/
function generate_settings_form($settings, $settings_by_access_list, $settings_to_avoid, $convert_byte_to_mega_list)
{
global $_configuration;
$urlId = api_get_current_access_url_id();
$table_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
$form = new FormValidator('settings', 'post', 'settings.php?category='.Security::remove_XSS($_GET['category']));
$form->addElement('hidden', 'search_field', (!empty($_GET['search_field'])?Security::remove_XSS($_GET['search_field']):null));
$form->addElement('hidden', 'keyword', (!empty($_GET['keyword']) ? Security::remove_XSS($_GET['keyword']) : null));
$url_id = api_get_current_access_url_id();
@ -1095,29 +1096,44 @@ function generate_settings_form($settings, $settings_by_access_list, $settings_t
$url_info = api_get_access_url($url_id);
$settingsToAvoidKeys = array_filter(array_keys($settings_to_avoid));
foreach ($settings as $row) {
if (in_array($row['variable'], $settingsToAvoidKeys)) {
continue;
}
if (api_is_multiple_url_enabled()) {
if (api_is_global_platform_admin()) {
if ($row['access_url_locked'] == 0) {
if ($url_id == 1) {
if ($row['access_url_changeable'] == '1') {
$form->addElement('html', '<div style="float: right;"><a class="share_this_setting" data_status = "0" data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting')).'</a></div>');
$form->addElement(
'html',
'<div style="float: right;">
<a class="share_this_setting" data_status = "0" data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting')).'
</a>
</div>'
);
} else {
$form->addElement('html', '<div style="float: right;"><a class="share_this_setting" data_status = "1" data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting')).'</a></div>');
$form->addElement(
'html',
'<div style="float: right;">
<a class="share_this_setting" data_status = "1" data_to_send = "'.$row['variable'].'" href="javascript:void(0);">'.
Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting')).'</a>
</div>'
);
}
} else {
if ($row['access_url_changeable'] == '1') {
$form->addElement('html', '<div style="float: right;">'.
Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting')).'</div>');
$form->addElement(
'html',
'<div style="float: right;">'.
Display::return_icon('shared_setting.png', get_lang('ChangeSharedSetting')).'</div>'
);
} else {
$form->addElement('html', '<div style="float: right;">'.
Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting')).'</div>');
$form->addElement(
'html',
'<div style="float: right;">'.
Display::return_icon('shared_setting_na.png', get_lang('ChangeSharedSetting')).'</div>'
);
}
}
}
@ -1194,9 +1210,9 @@ function generate_settings_form($settings, $settings_by_access_list, $settings_t
break;
case 'radio':
$values = api_get_settings_options($row['variable']);
$group = array ();
$group = array();
if (is_array($values )) {
foreach ($values as $key => $value) {
foreach ($values as $value) {
$element = & $form->createElement('radio', $row['variable'], '', get_lang($value['display_text']), $value['value']);
if ($hide_element) {
$element->freeze();

20
main/admin/settings.php
Unescape View File

@ -75,6 +75,8 @@ if (isset($_GET['action']) && $_GET['action'] == 'delete_grading') {
api_delete_setting_option($id);
}
$keyword = isset($_REQUEST['keyword']) ? $_REQUEST['keyword'] : null;
$form_search = new FormValidator('search_settings', 'get', api_get_self(), null, array('class' => 'form-search'));
$form_search->addElement('text', 'keyword');
$form_search->addElement('hidden', 'category', 'search_setting');
@ -84,8 +86,9 @@ $form_search->addElement(
get_lang('Search'),
array('class' => 'search')
);
$form_search->setDefaults(
array('keyword' => (isset($_REQUEST['keyword']) ? $_REQUEST['keyword'] : null))
array('keyword' => $keyword)
);
$form_search_html = $form_search->return_form();
@ -93,14 +96,15 @@ $form_search_html = $form_search->return_form();
$url_id = api_get_current_access_url_id();
$settings = null;
/**
* @param string $category
* @param string $keyword
* @return array
*/
function get_settings($category = null)
function get_settings($category = null, $keyword = null)
{
$url_id = api_get_current_access_url_id();
$settings_by_access_list = array();
if ($url_id == 1) {
@ -135,8 +139,8 @@ function get_settings($category = null)
}
if (isset($category) && $category == 'search_setting') {
if (!empty($_REQUEST['keyword'])) {
$settings = search_setting($_REQUEST['keyword']);
if (!empty($keyword)) {
$settings = search_setting($keyword);
}
}
@ -149,7 +153,7 @@ function get_settings($category = null)
// Build the form.
if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', 'stylesheets', 'Search'))) {
$my_category = isset($_GET['category']) ? $_GET['category'] : null;
$settings_array = get_settings($my_category);
$settings_array = get_settings($my_category, $keyword);
$settings = $settings_array['settings'];
$settings_by_access_list = $settings_array['settings_by_access_list'];
@ -545,8 +549,8 @@ if (!empty($_GET['category'])) {
handle_templates();
break;
case 'search_setting':
search_setting($_REQUEST['keyword']);
if (isset($_REQUEST['keyword'])) {
search_setting($keyword);
if (!empty($keyword)) {
$form->display();
}
break;

20
src/ChamiloLMS/Controller/Admin/AdminController.php
Unescape View File

@ -39,7 +39,7 @@ class AdminController extends CommonController
if ($security->isGranted('ROLE_ADMIN')) {
$this->loadAdminMenu();
}
$response = $template->render_template('admin/index.tpl');
$response = $template->renderTemplate('admin/index.tpl');
return new Response($response, 200, array());
}
@ -52,7 +52,7 @@ class AdminController extends CommonController
$form = new \FormValidator('search-form', 'get', $url, null, array('class' => 'form-inline'));
$form->addElement('text', 'keyword');
$form->addElement('button', 'submit', get_lang('Search'));
return $form->return_form();
return $form;
}
/**
@ -81,7 +81,7 @@ class AdminController extends CommonController
$blocks['users']['label'] = api_ucfirst(get_lang('Users'));
if (api_is_platform_admin()) {
$search_form = $this->getSearchForm($adminUrl.'user_list.php');
$search_form = $this->getSearchForm($adminUrl.'user_list.php')->return_form();
$blocks['users']['search_form'] = $search_form;
$items = array(
array('url'=>$adminUrl.'user_list.php', 'label' => get_lang('UserList')),
@ -109,7 +109,7 @@ class AdminController extends CommonController
$blocks['courses']['icon'] = \Display::return_icon('course.gif', get_lang('Courses'), array(), ICON_SIZE_MEDIUM, false);
$blocks['courses']['label'] = api_ucfirst(get_lang('Courses'));
$search_form = $this->getSearchForm($adminUrl.'course_list.php');
$search_form = $this->getSearchForm($adminUrl.'course_list.php')->return_form();
$blocks['courses']['search_form'] = $search_form;
$items = array();
@ -145,13 +145,9 @@ class AdminController extends CommonController
$blocks['platform']['icon'] = \Display::return_icon('platform.png', get_lang('Platform'), array(), ICON_SIZE_MEDIUM, false);
$blocks['platform']['label'] = api_ucfirst(get_lang('Platform'));
$search_form = $this->getSearchForm($adminUrl.'settings.php');
/*
' <form method="get" action="'.$adminUrl.'settings.php" class="form-search">
<input class="span3" type="text" name="search_field" value="" >
<input type="hidden" value="search_setting" name="category">
<button class="btn" type="submit">'.get_lang('Search').'</button>
</form>';*/
$form = $this->getSearchForm($adminUrl.'settings.php');
$form->addElement('hidden', 'category', 'search_setting');
$search_form = $form->return_form();
$blocks['platform']['search_form'] = $search_form;
$items = array();
@ -190,7 +186,7 @@ class AdminController extends CommonController
/* Sessions */
$blocks['sessions']['icon'] = \Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL, false);
$blocks['sessions']['label'] = api_ucfirst(get_lang('Sessions'));
$search_form = $this->getSearchForm(api_get_path(WEB_CODE_PATH).'session/session_list.php');
$search_form = $this->getSearchForm(api_get_path(WEB_CODE_PATH).'session/session_list.php')->return_form();
$blocks['sessions']['search_form'] = $search_form;
$items = array();
$items[] = array('url'=> api_get_path(WEB_CODE_PATH).'session/session_list.php', 'label' => get_lang('ListSession'));

Write Preview
Loading…
Cancel
Save