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 - fix message

Browse Source
pull/2990/head
Julio 6 years ago
parent de02f907b0
commit 04092c431f
2 changed files with 36 additions and 36 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. 60
      main/exercise/exercise.php
  2. 2
      main/exercise/hotpotatoes.lib.php

60
main/exercise/exercise.php
Unescape View File

@ -283,16 +283,6 @@ if (!empty($action) && $is_allowedToEdit) {
} }
} }
if ($origin !== 'learnpath') {
//so we are not in learnpath tool
Display::display_header($nameTools, get_lang('Exercise'));
if (isset($_GET['message']) && in_array($_GET['message'], ['ExerciseEdited'])) {
echo Display::return_message(get_lang('ExerciseEdited'), 'confirmation');
}
} else {
Display::display_reduced_header();
}
Event::event_access_tool(TOOL_QUIZ); Event::event_access_tool(TOOL_QUIZ);
$logInfo = [ $logInfo = [
@ -304,9 +294,6 @@ $logInfo = [
]; ];
Event::registerLog($logInfo); Event::registerLog($logInfo);
// Tool introduction
Display::display_introduction_section(TOOL_QUIZ);
HotPotGCt($documentPath, 1, $userId); HotPotGCt($documentPath, 1, $userId);
// Only for administrator // Only for administrator
@ -335,7 +322,7 @@ if ($is_allowedToEdit) {
// deletes an exercise // deletes an exercise
$result = $objExerciseTmp->delete(); $result = $objExerciseTmp->delete();
if ($result) { if ($result) {
echo Display::return_message(get_lang('ExerciseDeleted'), 'confirmation'); Display::addFlash(Display::return_message(get_lang('ExerciseDeleted'), 'confirmation'));
} }
break; break;
case 'enable': case 'enable':
@ -362,7 +349,7 @@ if ($is_allowedToEdit) {
'visible', 'visible',
$userId $userId
); );
echo Display::return_message(get_lang('VisibilityChanged'), 'confirmation'); Display::addFlash(Display::return_message(get_lang('VisibilityChanged'), 'confirmation'));
break; break;
case 'disable': case 'disable':
if ($limitTeacherAccess && !api_is_platform_admin()) { if ($limitTeacherAccess && !api_is_platform_admin()) {
@ -388,28 +375,21 @@ if ($is_allowedToEdit) {
'invisible', 'invisible',
$userId $userId
); );
echo Display::return_message( Display::addFlash(Display::return_message(get_lang('VisibilityChanged'), 'confirmation'));
get_lang('VisibilityChanged'),
'confirmation'
);
break; break;
case 'disable_results': case 'disable_results':
//disable the results for the learners //disable the results for the learners
$objExerciseTmp->disable_results(); $objExerciseTmp->disable_results();
$objExerciseTmp->save(); $objExerciseTmp->save();
echo Display::return_message( Display::addFlash(Display::return_message(get_lang('ResultsDisabled'), 'confirmation'));
get_lang('ResultsDisabled'),
'confirmation'
);
break; break;
case 'enable_results': case 'enable_results':
//disable the results for the learners //disable the results for the learners
$objExerciseTmp->enable_results(); $objExerciseTmp->enable_results();
$objExerciseTmp->save(); $objExerciseTmp->save();
echo Display::return_message( Display::addFlash(Display::return_message(get_lang('ResultsEnabled'), 'confirmation'));
get_lang('ResultsEnabled'),
'confirmation'
);
break; break;
case 'clean_results': case 'clean_results':
if ($limitTeacherAccess && !api_is_platform_admin()) { if ($limitTeacherAccess && !api_is_platform_admin()) {
@ -421,24 +401,29 @@ if ($is_allowedToEdit) {
if ($exercise_action_locked == false) { if ($exercise_action_locked == false) {
$quantity_results_deleted = $objExerciseTmp->cleanResults(true); $quantity_results_deleted = $objExerciseTmp->cleanResults(true);
$title = $objExerciseTmp->selectTitle(); $title = $objExerciseTmp->selectTitle();
echo Display::return_message(
Display::addFlash(
Display::return_message(
$title.': '.sprintf( $title.': '.sprintf(
get_lang('XResultsCleaned'), get_lang('XResultsCleaned'),
$quantity_results_deleted $quantity_results_deleted
), ),
'confirmation' 'confirmation'
)
); );
} }
break; break;
case 'copy_exercise': //copy an exercise case 'copy_exercise': //copy an exercise
api_set_more_memory_and_time_limits(); api_set_more_memory_and_time_limits();
$objExerciseTmp->copyExercise(); $objExerciseTmp->copyExercise();
echo Display::return_message( Display::addFlash(Display::return_message(
get_lang('ExerciseCopied'), get_lang('ExerciseCopied'),
'confirmation' 'confirmation'
); ));
break; break;
} }
header('Location: '.$currentUrl);
exit;
} }
} }
// destruction of Exercise // destruction of Exercise
@ -502,6 +487,8 @@ if ($is_allowedToEdit) {
$userId $userId
); );
Display::addFlash(Display::return_message(get_lang('Updated')));
break; break;
case 'disable': // disables an exercise case 'disable': // disables an exercise
if ($limitTeacherAccess && !api_is_platform_admin()) { if ($limitTeacherAccess && !api_is_platform_admin()) {
@ -524,8 +511,21 @@ if ($is_allowedToEdit) {
default: default:
break; break;
} }
header('Location: '.$currentUrl);
exit;
}
}
if ($origin !== 'learnpath') {
//so we are not in learnpath tool
Display::display_header($nameTools, get_lang('Exercise'));
if (isset($_GET['message']) && in_array($_GET['message'], ['ExerciseEdited'])) {
echo Display::return_message(get_lang('ExerciseEdited'), 'confirmation');
} }
} else {
Display::display_reduced_header();
} }
Display::display_introduction_section(TOOL_QUIZ);
// Selects $limit exercises at the same time // Selects $limit exercises at the same time
// maximum number of exercises on a same page // maximum number of exercises on a same page

2
main/exercise/hotpotatoes.lib.php
Unescape View File

@ -424,7 +424,7 @@ function GenerateHpFolder($folder)
function GetFolderName($fname) function GetFolderName($fname)
{ {
$name = explode('/', $fname); $name = explode('/', $fname);
$name = $name[sizeof($name) - 2]; $name = $name[count($name) - 2];
return $name; return $name;
} }

Write Preview
Loading…
Cancel
Save