Browse Source

Minor adding api_get_cidreq and fixing PHP warning

Julio Montoya 12 years ago
parent
commit
585afd31dd

+ 1 - 1
main/exercice/exercise_admin.php

@@ -224,7 +224,7 @@ if ($form->validate()) {
 	}
 	$exercise_id = $objExercise->id;
 	Session::erase('objExercise');
-	header('Location:admin.php?message='.$message.'&exerciseId='.$exercise_id);
+	header('Location:admin.php?message='.$message.'&exerciseId='.$exercise_id.'&'.api_get_cidreq());
 	exit;
 } else {
     // DISPLAY FORM

+ 0 - 1
main/exercice/question.class.php

@@ -428,7 +428,6 @@ abstract class Question
     {
         $course_id = $this->course['real_id'];
 
-
         if (!empty($category_list)) {
             $this->deleteCategory();
             $TBL_QUESTION_REL_CATEGORY = Database::get_course_table(TABLE_QUIZ_QUESTION_REL_CATEGORY);

+ 3 - 3
main/exercice/question_admin.inc.php

@@ -74,13 +74,13 @@ if (is_object($objQuestion)) {
         // redirect
         if ($objQuestion->type != HOT_SPOT && $objQuestion->type != HOT_SPOT_DELINEATION) {
             if (isset($_GET['editQuestion'])) {
-                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&message=ItemUpdated"</script>';
+                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemUpdated"</script>';
             } else {
                 //New question
-                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&message=ItemAdded"</script>';
+                echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'&message=ItemAdded"</script>';
             }
         } else {
-            echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&hotspotadmin='.$objQuestion->id.'"</script>';
+            echo '<script type="text/javascript">window.location.href="admin.php?exerciseId='.$exerciseId.'&hotspotadmin='.$objQuestion->id.'&'.api_get_cidreq().'"</script>';
         }
     } else {
 

+ 3 - 3
main/inc/lib/fckeditor/repository.php

@@ -25,9 +25,9 @@ $permissions_for_new_files = api_get_permissions_for_new_files();
 if (!empty($_course['path'])) {
 
     // Get the Chamilo session properties. Before ajaximagemanager!!!
-    $to_group_id = !empty($_SESSION['_gid']) ? $_SESSION['_gid'] : 0;
-    $group_properties = GroupManager::get_group_properties($_SESSION['_gid']);
-    $is_user_in_group = GroupManager::is_user_in_group($_user['user_id'], $_SESSION['_gid']);
+    $to_group_id = api_get_group_id();
+    $group_properties = GroupManager::get_group_properties($to_group_id);
+    $is_user_in_group = GroupManager::is_user_in_group($_user['user_id'], $to_group_id);
 }
 
 $my_path = UserManager::get_user_picture_path_by_id(api_get_user_id(), 'system');