Minor cosmectic changes

main/course_home/course_home.php

@@ -60,7 +60,6 @@ define('TOOL_INTERACTION',              'toolinteraction');
 define('TOOL_COURSE_PLUGIN',            'toolcourseplugin'); //all plugins that can be enabled in courses
 define('TOOL_ADMIN',                    'tooladmin');
 define('TOOL_ADMIN_PLATFORM',           'tooladminplatform');
-
 define('TOOL_STUDENT_VIEW',              'toolstudentview');
 define('TOOL_ADMIN_VISIBLE',             'tooladminvisible');
 
@@ -254,4 +253,4 @@ if (api_get_setting('homepage_view') == 'activity' || api_get_setting('homepage_
 $content = '<div id="course_tools">'.$content.'</div>';
 Session::erase('_gid');
 
-return array('content' => $content, 'message' => $show_message);
+return array('content' => $content, 'message' => $show_message);

main/exercice/answer_admin.inc.php

@@ -147,11 +147,7 @@ if ($submitAnswers || $buttonBack) {
             } else {
                 // adds the answer into the object
                 $objAnswer->createAnswer($reponse[$i], $goodAnswer, $comment[$i], $weighting[$i], $i);
-                //added
-                //if($_REQUEST['myid']==1)
                 $mainurl = "admin.php";
-                //	else
-                //  $mainurl="question_pool.php";
                 ?>
                 <script>
                     window.location.href='<?php echo $mainurl; ?>';
@@ -220,10 +216,7 @@ if ($submitAnswers || $buttonBack) {
                     $objAnswer->createAnswer($reponse, 0, '', 0, '');
                     $objAnswer->save();
                     //added
-                    //if($_REQUEST['myid']==1)
                     $mainurl = "admin.php";
-                    //	else
-                    //  $mainurl="question_pool.php";
                     ?>
                     <script>
                         window.location.href='<?php echo $mainurl; ?>';
@@ -330,14 +323,9 @@ if ($submitAnswers || $buttonBack) {
                     // sets the total weighting of the question
                     $objQuestion->updateWeighting($weighting);
                     $objQuestion->save($exerciseId);
-
                     $editQuestion = $questionId;
-
                     unset($modifyAnswers); //added
-                    //if($_REQUEST['myid']==1)
                     $mainurl = "admin.php";
-                    //	else
-                    //  $mainurl="question_pool.php";
                     ?>
                     <script>
                         window.location.href='<?php echo $mainurl; ?>';
@@ -411,11 +399,7 @@ if ($submitAnswers || $buttonBack) {
                 else {
                     // adds the answer into the object
                     $objAnswer->createAnswer($match[$i], $sel[$i], '', $weighting[$i], $i);
-                    //added
-                    //if($_REQUEST['myid']==1)
                     $mainurl = "admin.php";
-                    //else
-                    //$mainurl="question_pool.php";
                     ?>
                     <script>
                         window.location.href='<?php echo $mainurl; ?>';
@@ -1306,4 +1290,4 @@ if ($modifyAnswers) {
             if ($debug > 0) {
                 echo str_repeat('&nbsp;', 0) . '$modifyAnswers was set - end' . "<br />\n";
             }
-        }
+        }

main/inc/lib/document.lib.php

@@ -3271,9 +3271,7 @@ class DocumentManager
                         // Show the "image name" not the filename of the image.
                         if ($lp_id) {
                             //LP URL
-                            $url = api_get_self().'?cidReq='.Security::remove_XSS(
-                                $_GET['cidReq']
-                            ).'&action=add_item&type='.TOOL_DOCUMENT.'&file='.$key.'&lp_id='.$lp_id;
+                            $url = api_get_self().'?cidReq='.$course_info['code'].'&action=add_item&type='.TOOL_DOCUMENT.'&file='.$key.'&lp_id='.$lp_id;
                             if (!empty($overwrite_url)) {
                                 $url = $overwrite_url.'&document_id='.$key;
                             }