Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into 1.9.x

license.txt

@@ -11,7 +11,8 @@ Copyright (c) 2003-2007 Ghent University (UGent)
 Copyright (c) 2001-2004 Universite catholique de Louvain (UCL)
 Copyright (c) 2003-2008 Vrije Universiteit Brussel (VUB)
 Copyright (c) 2004-2008 Hoogeschool Gent (HoGent)
-	
+Copyright (c) Logan Cai (cailongqun [at] yahoo [dot] com [dot] cn)
+
 For a full list of contributors detaining copyrights over parts of
 the Chamilo software, see "documentation/credits.html".
 The full license can be read in "documentation/license.html".

main/dropbox/dropbox_init.inc.php

@@ -126,6 +126,8 @@ $language_file = array('dropbox', 'document');
 // including the basic Chamilo initialisation file
 require_once '../inc/global.inc.php';
 $is_allowed_in_course = api_is_allowed_to_edit(false, true);
+$is_courseTutor = api_is_course_tutor();
+$is_courseAdmin = api_is_course_admin();
 $current_course_tool  = TOOL_DROPBOX;
 
 // the dropbox configuration parameters