From 874dca0a68f5d04943fb2c013dc8327e361027cf Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Tue, 9 Mar 2010 02:00:14 +0200 Subject: [PATCH] Feature #272 - The Dropbox tool code - additional minor changes. --- main/dropbox/dropbox_class.inc.php | 4 ++-- main/dropbox/dropbox_config.inc.php | 2 +- main/dropbox/dropbox_download.php | 2 +- main/dropbox/dropbox_functions.inc.php | 2 +- main/dropbox/index.php | 10 +++++----- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main/dropbox/dropbox_class.inc.php b/main/dropbox/dropbox_class.inc.php index d632e2fa27..64e0948572 100755 --- a/main/dropbox/dropbox_class.inc.php +++ b/main/dropbox/dropbox_class.inc.php @@ -40,7 +40,7 @@ * @copyright 2004 * @author Jan Bols * with contributions by René Haentjens (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) { diff --git a/main/dropbox/dropbox_config.inc.php b/main/dropbox/dropbox_config.inc.php index f705614069..e5f6c51221 100755 --- a/main/dropbox/dropbox_config.inc.php +++ b/main/dropbox/dropbox_config.inc.php @@ -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')); diff --git a/main/dropbox/dropbox_download.php b/main/dropbox/dropbox_download.php index edc709dc5e..85e21c1627 100755 --- a/main/dropbox/dropbox_download.php +++ b/main/dropbox/dropbox_download.php @@ -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 diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php index a7bbce604e..9d3b808984 100755 --- a/main/dropbox/dropbox_functions.inc.php +++ b/main/dropbox/dropbox_functions.inc.php @@ -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 , Ghent University * @version march 2006 diff --git a/main/dropbox/index.php b/main/dropbox/index.php index 4fbf9e88bc..d4b4e931d4 100755 --- a/main/dropbox/index.php +++ b/main/dropbox/index.php @@ -1,4 +1,4 @@ -, 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, '');