Feature #272 - The Dropbox tool code - additional minor changes.

skala
Ivan Tcholakov 16 years ago
parent 7b8738101a
commit 874dca0a68
  1. 4
      main/dropbox/dropbox_class.inc.php
  2. 2
      main/dropbox/dropbox_config.inc.php
  3. 2
      main/dropbox/dropbox_download.php
  4. 2
      main/dropbox/dropbox_functions.inc.php
  5. 10
      main/dropbox/index.php

@ -40,7 +40,7 @@
* @copyright 2004
* @author Jan Bols <jan@ivpv.UGent.be>
* with contributions by René Haentjens <rene.haentjens@UGent.be> (see RH)
* @package dokeos.dropbox
* @package chamilo.dropbox
*/
class Dropbox_Work {
public $id;
@ -177,7 +177,7 @@ class Dropbox_Work {
$result = Database::query($sql);
$res = Database::fetch_array($result, 'ASSOC');
// Check if uploader is still in Dokeos system
// Check if uploader is still in Chamilo system
$uploader_id = stripslashes($res['uploader_id']);
$uploaderName = getUserNameFromId($uploader_id);
if (!$uploaderName) {

@ -24,7 +24,7 @@ $dropbox_cnf['tbl_feedback'] = Database::get_course_table(TABLE_DROPBOX_FEEDBAC
$dropbox_cnf['courseId'] = $_cid;
$dropbox_cnf['sysPath'] = api_get_path('SYS_COURSE_PATH') . $_course['path'] . '/dropbox'; //path to dropbox subdir in course containing the uploaded files
$dropbox_cnf['webPath'] = api_get_path('WEB_COURSE_PATH') . $_course['path'] . '/dropbox';
$dropbox_cnf['maxFilesize'] = api_get_setting('dropbox_max_filesize'); //file size limit as imposed by the platform admin (see Dokeos Config Settings on the platform administration section)
$dropbox_cnf['maxFilesize'] = api_get_setting('dropbox_max_filesize'); //file size limit as imposed by the platform admin (see Chamilo Config Settings on the platform administration section)
//$dropbox_cnf['version'] = '1.4';
$dropbox_cnf['allowOverwrite'] = string_2_boolean(api_get_setting('dropbox_allow_overwrite'));
$dropbox_cnf['allowJustUpload'] = string_2_boolean(api_get_setting('dropbox_allow_just_upload'));

@ -8,7 +8,7 @@
$language_file = 'dropbox';
// including the basic Dokeos initialisation file
// including the basic Chamilo initialisation file
require_once '../inc/global.inc.php';
// the dropbox configuration parameters

@ -149,7 +149,7 @@ function delete_category($action, $id) {
/**
* Displays the form to move one individual file to a category
*
* @return html code of the form that appears in a dokeos message box.
* @return html code of the form that appears in a message box.
*
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @version march 2006

@ -1,4 +1,4 @@
<?php //$id: $
<?php
/* For licensing terms, see /license.txt */
/**
@ -12,7 +12,7 @@
* @author Roan Embrechts, virtual course support
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University (see history version 1.3)
*
* @package dokeos.dropbox
* @package chamilo.dropbox
*
* @todo complete refactoring. Currently there are about at least 3 sql queries needed for every individual dropbox document.
* first we find all the documents that were sent (resp. received) by the user
@ -227,7 +227,7 @@ if (!isset($_POST['feedback']) && (strstr($_POST['action'], 'move_received') OR
// Store Feedback
if ($_POST['feedback']) {
if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false,true)) {
if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
api_not_allowed();
}
$check = Security::check_token();
@ -379,7 +379,7 @@ if ($_GET['action'] != 'add') {
// the headers of the sortable tables
$column_header = array();
$column_header[] = array('', false, '');
$column_header[] = array(get_lang('Type'), true, '', 'style="width:40px; text-align:center"');
$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
$column_header[] = array(get_lang('ReceivedTitle'), true, '');
$column_header[] = array(get_lang('Size'), true, '');
$column_header[] = array(get_lang('Authors'), true, '');
@ -535,7 +535,7 @@ if ($_GET['action'] != 'add') {
$column_header = array();
$column_header[] = array('', false, '');
$column_header[] = array(get_lang('Type'), true, '', 'style="width:40px; text-align:center"');
$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
$column_header[] = array(get_lang('SentTitle'), true, '');
$column_header[] = array(get_lang('Size'), true, '');
$column_header[] = array(get_lang('SentTo'), true, '');

Loading…
Cancel
Save