diff --git a/main/dropbox/dropbox_download.php b/main/dropbox/dropbox_download.php index b5122003ff..338c9d6fcb 100755 --- a/main/dropbox/dropbox_download.php +++ b/main/dropbox/dropbox_download.php @@ -3,9 +3,7 @@ /** * @package chamilo.dropbox */ -/** - * Code - */ + // including the basic Chamilo initialisation file require_once '../inc/global.inc.php'; @@ -95,7 +93,7 @@ if (!$allowed_to_download) { // the user is allowed to download the file $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX][] = intval($_GET['id']); - $work = new Dropbox_work($_GET['id']); + $work = new Dropbox_Work($_GET['id']); $path = dropbox_cnf('sysPath') . '/' . $work -> filename; //path to file as stored on server if (!Security::check_abs_path($path, dropbox_cnf('sysPath').'/')) { diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php index 1464cc9a9b..147627c870 100755 --- a/main/exercice/exercise_submit.php +++ b/main/exercice/exercise_submit.php @@ -617,8 +617,8 @@ if (!empty ($gradebook) && $gradebook == 'view') { $interbreadcrumb[] = array ('url' => '../gradebook/' . Security::remove_XSS($_SESSION['gradebook_dest']),'name' => get_lang('ToolGradebook')); } -$interbreadcrumb[] = array ("url" => "exercice.php?gradebook=$gradebook", "name" => get_lang('Exercices')); -$interbreadcrumb[] = array ("url" => "#","name" => $objExercise->name); +$interbreadcrumb[] = array ("url" => "exercice.php?".api_get_cidreq(), "name" => get_lang('Exercices')); +$interbreadcrumb[] = array ("url" => "#", "name" => $objExercise->name); if ($origin != 'learnpath') { //so we are not in learnpath tool Display :: display_header(null,'Exercises'); @@ -1002,7 +1002,7 @@ if (!empty($error)) { } '; - echo '
+ echo ' diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php index b684b86cab..6bb5f0ea1f 100755 --- a/main/forum/forumfunction.inc.php +++ b/main/forum/forumfunction.inc.php @@ -2479,8 +2479,14 @@ function show_add_post_form($current_forum, $forum_setting, $action = '', $id = $check = Security::check_token('post'); if ($check) { $values = $form->exportValues(); - if ($values['thread_qualify_gradebook'] == '1' && empty($values['weight_calification'])) { - Display::display_error_message(get_lang('YouMustAssignWeightOfQualification').' '.get_lang('Back').'', false); + if (isset($values['thread_qualify_gradebook']) && + $values['thread_qualify_gradebook'] == '1' && + empty($values['weight_calification']) + ) { + Display::display_error_message( + get_lang('YouMustAssignWeightOfQualification').' '.get_lang('Back').'', + false + ); return false; } diff --git a/main/forum/index.php b/main/forum/index.php index c2154edd5f..89f881043a 100755 --- a/main/forum/index.php +++ b/main/forum/index.php @@ -86,11 +86,11 @@ $actions = isset($_GET['action']) ? $_GET['action'] : ''; if ($actions == 'add') { switch ($_GET['content']) { case 'forum': - $interbreadcrumb[] = array('url' => 'index.php?gradebook='.$gradebook.'&search='.$search_forum, 'name' => get_lang('Forum')); + $interbreadcrumb[] = array('url' => 'index.php?search='.$search_forum.'&'.api_get_cidreq(), 'name' => get_lang('Forum')); $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('AddForum')); break; case 'forumcategory': - $interbreadcrumb[] = array('url' =>'index.php?gradebook='.$gradebook.'&search='.$search_forum, 'name' => get_lang('Forum')); + $interbreadcrumb[] = array('url' =>'index.php?search='.$search_forum.'&'.api_get_cidreq(), 'name' => get_lang('Forum')); $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('AddForumCategory')); break; default: diff --git a/main/glossary/index.php b/main/glossary/index.php index f55fceb46d..6e6f03bed2 100755 --- a/main/glossary/index.php +++ b/main/glossary/index.php @@ -1,11 +1,12 @@