Browse Source

[svn r15918] the learners can't send files anymore to other learners if "Do not allow students to send documents to other students within a course" is false (FS#2780)

Eric Marguin 16 years ago
parent
commit
94d1cc974c
2 changed files with 15 additions and 3 deletions
  1. 2 1
      documentation/changelog.html
  2. 13 2
      main/dropbox/dropbox_functions.inc.php

+ 2 - 1
documentation/changelog.html

@@ -64,7 +64,8 @@
   <li>Fixed bug preventing opening of a learning path item following a failed prerequisite condition (SVN#15853)</li>
   <li>Fixed bug preventing the activation of plugins (FS#2771)</li>
   <li>Fixed bug adding double comments in dropbox tool in IE only (FS#2757)</li>
-  <li>Fixed IMS/QTI2 little export problem (FS#2634)</li>
+  <li>Fixed IMS/QTI2 little export problem (FS#2634)</li>
+  <li>The learners can't send files anymore to other learners if "Do not allow students to send documents to other students within a course" is false (FS#2780)</li>
 </ul>
 <br />
 <h3>Known issues</h3>

+ 13 - 2
main/dropbox/dropbox_functions.inc.php

@@ -539,12 +539,23 @@ function display_add_form()
 
 	//list of all users in this course and all virtual courses combined with it
 	if(isset($_SESSION['id_session'])){
-		$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'],true,$_SESSION['id_session']);
+		$complete_user_list_for_dropbox = array();
+		if(api_get_setting('dropbox_allow_student_to_student')=='true' || $_user['status'] != STUDENT)
+		{
+			$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'],true,$_SESSION['id_session']);
+		}
 		$complete_user_list2 = CourseManager :: get_coach_list_from_course_code($course_info['code'],$_SESSION['id_session']);
 		$complete_user_list_for_dropbox = array_merge($complete_user_list_for_dropbox,$complete_user_list2);
 	}
 	else{
-		$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code']);
+		if(api_get_setting('dropbox_allow_student_to_student')=='true' || $_user['status'] != STUDENT)
+		{
+			$complete_user_list_for_dropbox = CourseManager :: get_user_list_from_course_code($course_info['code'],true,$_SESSION['id_session']);
+		}
+		else
+		{
+			$complete_user_list_for_dropbox = CourseManager :: get_teacher_list_from_course_code($course_info['code']);
+		}
 	}
 
 	foreach ($complete_user_list_for_dropbox as $k => $e)