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

Fix variables, add AddFlash functions

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent 96dfd2eadc
commit 3ae340930e
2 changed files with 499 additions and 504 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. 952
      main/exercise/TestCategory.php
  2. 51
      main/exercise/tests_category.php

952
main/exercise/TestCategory.php
View File

File diff suppressed because it is too large Load Diff

51
main/exercise/tests_category.php
Unescape View File

@ -19,7 +19,7 @@ $htmlHeadXtra[] = '
} }
</script>'; </script>';
$nameTools = ""; $nameTools = '';
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
@ -94,10 +94,8 @@ Display::display_footer();
function importCategoryForm() function importCategoryForm()
{ {
$form = new FormValidator('import', 'post', api_get_self().'?action=import_category&'.api_get_cidreq()); $form = new FormValidator('import', 'post', api_get_self().'?action=import_category&'.api_get_cidreq());
//$form->addElement('header', get_lang('ImportGroups'));
$form->addElement('file', 'file', get_lang('ImportCSVFileLocation')); $form->addElement('file', 'file', get_lang('ImportCSVFileLocation'));
$form->addRule('file', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('file', get_lang('ThisFieldIsRequired'), 'required');
//$form->addElement('label', null, Display::url(get_lang('ExampleCSVFile'), api_get_path(WEB_CODE_PATH).'group/example.csv'));
$form->addButtonImport(get_lang('Import')); $form->addButtonImport(get_lang('Import'));
return $form; return $form;
@ -149,19 +147,19 @@ function edit_category_form($action)
$check = Security::check_token('post'); $check = Security::check_token('post');
if ($check) { if ($check) {
$values = $form->exportValues(); $values = $form->exportValues();
$v_id = Security::remove_XSS($values['category_id']); $category = new TestCategory(
$v_name = Security::remove_XSS($values['category_name'], COURSEMANAGER); $values['category_id'],
$v_description = Security::remove_XSS($values['category_description'], COURSEMANAGER); $values['category_name'],
$objcat = new TestCategory($v_id, $v_name, $v_description); $values['category_description']
if ($objcat->modifyCategory()) { );
Display::addFlash(Display::return_message(get_lang('MofidfyCategoryDone'))); if ($category->modifyCategory()) {
Display::addFlash(Display::return_message(get_lang('Updated')));
} else { } else {
Display::addFlash(Display::return_message(get_lang('ModifyCategoryError'))); Display::addFlash(Display::return_message(get_lang('ModifyCategoryError'), 'error'));
} }
} }
Security::clear_token(); Security::clear_token();
} else { } else {
display_goback();
$token = Security::get_token(); $token = Security::get_token();
$form->addElement('hidden', 'sec_token'); $form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token)); $form->setConstants(array('sec_token' => $token));
@ -179,15 +177,14 @@ function edit_category_form($action)
function delete_category_form($action) function delete_category_form($action)
{ {
if (isset($_GET['category_id']) && is_numeric($_GET['category_id'])) { if (isset($_GET['category_id']) && is_numeric($_GET['category_id'])) {
$category_id = Security::remove_XSS($_GET['category_id']); $category = new TestCategory($_GET['category_id']);
$catobject = new TestCategory($category_id); if ($category->removeCategory()) {
if ($catobject->removeCategory()) { Display::addFlash(Display::return_message(get_lang('DeleteCategoryDone')));
Display::display_confirmation_message(get_lang('DeleteCategoryDone'));
} else { } else {
Display::display_error_message(get_lang('CannotDeleteCategoryError')); Display::addFlash(Display::return_message(get_lang('CannotDeleteCategoryError'), 'error'));
} }
} else { } else {
Display::display_error_message(get_lang('CannotDeleteCategoryError')); Display::addFlash(Display::return_message(get_lang('CannotDeleteCategoryError'), 'error'));
} }
} }
@ -219,18 +216,15 @@ function add_category_form($action)
$check = Security::check_token('post'); $check = Security::check_token('post');
if ($check) { if ($check) {
$values = $form->exportValues(); $values = $form->exportValues();
$v_name = Security::remove_XSS($values['category_name'], COURSEMANAGER); $category = new TestCategory(0, $values['category_name'], $values['category_description']);
$v_description = Security::remove_XSS($values['category_description'], COURSEMANAGER); if ($category->addCategoryInBDD()) {
$objcat = new TestCategory(0, $v_name, $v_description); Display::addFlash(Display::return_message(get_lang('AddCategoryDone')));
if ($objcat->addCategoryInBDD()) {
Display::display_confirmation_message(get_lang('AddCategoryDone'));
} else { } else {
Display::display_confirmation_message(get_lang('AddCategoryNameAlreadyExists')); Display::addFlash(Display::return_message(get_lang('AddCategoryNameAlreadyExists'), 'warning'));
} }
} }
Security::clear_token(); Security::clear_token();
} else { } else {
//display_goback();
$token = Security::get_token(); $token = Security::get_token();
$form->addElement('hidden', 'sec_token'); $form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token)); $form->setConstants(array('sec_token' => $token));
@ -263,12 +257,3 @@ function displayActionBar()
echo "<br/>"; echo "<br/>";
echo "<fieldset><legend>" . get_lang('QuestionCategory') . "</legend></fieldset>"; echo "<fieldset><legend>" . get_lang('QuestionCategory') . "</legend></fieldset>";
} }
// display goback to category list page link
function display_goback()
{
echo '<div class="actions">';
echo '<a href="' . api_get_self() . '?'.api_get_cidreq().'">' .
Display::return_icon('back.png', get_lang('BackToCategoryList'), array(), 32) . '</a>';
echo '</div>';
}

Write Preview
Loading…
Cancel
Save