chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code.

Browse Source
1.9.x
Julio Montoya 12 years ago
parent 01313ac8ee
commit aa735666fb
5 changed files with 159 additions and 185 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      main/dropbox/dropbox_class.inc.php
  2. 25
      main/dropbox/dropbox_download.php
  3. 19
      main/dropbox/dropbox_functions.inc.php
  4. 8
      main/dropbox/dropbox_init.inc.php
  5. 10
      main/dropbox/dropbox_submit.php

16
main/dropbox/dropbox_class.inc.php
Unescape View File

@ -68,7 +68,7 @@ class Dropbox_Work
* @param unknown_type $arg6
* @return Dropbox_Work
*/
function Dropbox_Work($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null)
public function Dropbox_Work($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null)
{
if (func_num_args() > 1) {
$this->_createNewWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
@ -80,17 +80,17 @@ class Dropbox_Work
/**
* private function creating a new work object
*
* @param unknown_type $uploader_id
* @param unknown_type $title
* @param unknown_type $description
* @param unknown_type $author
* @param unknown_type $filename
* @param unknown_type $filesize
* @param int $uploader_id
* @param string $title
* @param string $description
* @param string $author
* @param string $filename
* @param int $filesize
*
* @todo $author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
* As a consequence this parameter can be removed
*/
function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
{
global $_user, $dropbox_cnf;
// Fill in the properties

25
main/dropbox/dropbox_download.php
Unescape View File

@ -6,10 +6,8 @@
/**
* Code
*/
/* INIT SECTION */
// We cannot use dropbox_init.inc.php because this one already outputs data.
$language_file = 'dropbox';
// including the basic Chamilo initialisation file
@ -32,11 +30,12 @@ $course_id = api_get_course_int_id();
$user_id = api_get_user_id();
if (isset($_GET['cat_id']) AND is_numeric($_GET['cat_id']) AND $_GET['action'] == 'downloadcategory' AND isset($_GET['sent_received'])) {
// step 1: constructingd' the sql statement. Due to the nature off the classes of the dropbox the categories for sent files are stored in the table
// dropbox_file while the categories for the received files are stored in dropbox_post. It would have been more elegant if these could be stored
// in dropbox_person (which stores the link file-person)
// Therefore we have to create to separate sql statements to find which files are in the categorie (depending if we zip-download a sent category or a
// received category)
/** step 1: constructing the sql statement.
Due to the nature off the classes of the dropbox the categories for sent files are stored in the table
dropbox_file while the categories for the received files are stored in dropbox_post.
It would have been more elegant if these could be stored in dropbox_person (which stores the link file-person)
Therefore we have to create to separate sql statements to find which files are in the category
(depending if we zip-download a sent category or a received category)*/
if ($_GET['sent_received'] == 'sent') {
// here we also incorporate the person table to make sure that deleted sent documents are not included.
@ -71,10 +70,7 @@ if (isset($_GET['cat_id']) AND is_numeric($_GET['cat_id']) AND $_GET['action'] =
zip_download($files_to_download);
exit;
}
/* DOWNLOAD A FILE */
/* AUTHORIZATION */
// Check if the id makes sense
@ -93,7 +89,6 @@ if (user_can_download_file($_GET['id'], api_get_user_id())) {
/* ERROR IF NOT ALLOWED TO DOWNLOAD */
if (!$allowed_to_download) {
Display::display_header($nameTools, 'Dropbox');
Display::display_error_message(get_lang('YouAreNotAllowedToDownloadThisFile'));
@ -122,13 +117,6 @@ if (!$allowed_to_download) {
//no information about filetype: force a download dialog window in browser
header( "Content-type: application/octet-stream\n");
}
/*if (!in_array(strtolower($extension), array('doc', 'xls', 'ppt', 'pps', 'sxw', 'sxc', 'sxi'))) {
header('Content-Disposition: inline; filename='.$file); // bugs with open office
} else {
header('Content-Disposition: attachment; filename='.$file);
}*/
header('Content-Disposition: attachment; filename='.$file);
/**
@ -163,6 +151,5 @@ if (!$allowed_to_download) {
fpassthru($fp);
exit();
}
//@todo clean this file the code below is useless there are 2 exits in previous conditions ... maybe a bad copy/paste/merge?
exit;

19
main/dropbox/dropbox_functions.inc.php
Unescape View File

@ -37,10 +37,9 @@ function handle_multiple_actions() {
// STEP 2: at least one file has to be selected. If not we return an error message
$ids = Request::get('id', array());
if(count($ids)>0){
if (count($ids)>0) {
$checked_file_ids = $_POST['id'];
}
else{
} else {
foreach ($_POST as $key => $value) {
if (strstr($value, $part.'_') AND $key != 'view_received_category' AND $key != 'view_sent_category') {
$checked_files = true;
@ -107,7 +106,8 @@ function handle_multiple_actions() {
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
* @version march 2006
*/
function delete_category($action, $id, $user_id = null) {
function delete_category($action, $id, $user_id = null)
{
$course_id = api_get_course_int_id();
global $dropbox_cnf;
@ -160,11 +160,8 @@ function delete_category($action, $id, $user_id = null) {
/**
* Displays the form to move one individual file to a category
*
* @return html code of the form that appears in a message box.
*
*@ return html code of the form that appears in a message box.
* @author Julio Montoya - function rewritten
*/
function display_move_form($part, $id, $target = array(), $extra_params = array())
{
@ -180,7 +177,6 @@ function display_move_form($part, $id, $target = array(), $extra_params = array(
$form->addElement('select', 'move_target', get_lang('MoveFileTo'), $options);
$form->addElement('button', 'do_move', get_lang('MoveFile'));
$form->display();
}
/**
@ -241,7 +237,7 @@ function display_action_options($part, $categories, $current_category = 0)
if ($current_category != 0) {
echo '<option value="move_0">'.get_lang('Root').'</a>';
}
foreach ($categories as $key => $value) {
foreach ($categories as $value) {
if ($current_category != $value['cat_id']) {
echo '<option value="move_'.$value['cat_id'].'">'.$value['cat_name'].'</option>';
}
@ -310,7 +306,8 @@ function get_dropbox_categories($filter = '')
* @param int The category ID
* @return array The details of this category
*/
function get_dropbox_category($id) {
function get_dropbox_category($id)
{
global $dropbox_cnf;
$course_id = api_get_course_int_id();
if (empty($id) or $id != intval($id)) { return array(); }

8
main/dropbox/dropbox_init.inc.php
Unescape View File

@ -54,12 +54,8 @@ require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
// protecting the script
api_protect_course_script();
/* Libraries */
// including the library for the sortable table
//require_once api_get_path(LIBRARY_PATH).'tablesort.lib.php';moved to autoload
// including the library for the dropbox
require_once 'dropbox_class.inc.php';
@ -68,7 +64,6 @@ require_once api_get_path(SYS_CODE_PATH).'document/document.inc.php'; // we use
require_once api_get_path(LIBRARY_PATH).'fileDisplay.lib.php'; // the function choose_image is used
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
/* Virtual course support */
$user_id = api_get_user_id();
@ -139,7 +134,6 @@ if (dropbox_cnf('allowOverwrite')) {
$javascript .= ", ";
}
$javascript .= "'".$dropbox_person->sentWork[$i]->title."'";
//echo '***'.$dropbox_person->sentWork[$i]->title;
}
$javascript .= ");
@ -188,9 +182,7 @@ if (dropbox_cnf('allowOverwrite')) {
$javascript .= "
</script>";
$htmlHeadXtra[] = $javascript;
$htmlHeadXtra[] =
"<script type=\"text/javascript\">
function confirmation (name)

10
main/dropbox/dropbox_submit.php
Unescape View File

@ -115,7 +115,7 @@ if (isset($_POST['submitWork'])) {
$error = true;
$errormsg = get_lang('MailingNonMailingError');
}
if ( ($w->recipients[0]['id'] == $_user['user_id']) xor $thisIsJustUpload) {
if (($w->recipients[0]['id'] == $_user['user_id']) xor $thisIsJustUpload) {
$error = true;
$errormsg = get_lang('MailingJustUploadSelectNoOther');
}
@ -142,8 +142,8 @@ if (isset($_POST['submitWork'])) {
php_flag zlib.output_compression off") or die(get_lang('ErrorCreatingDir').' (code 406)');
}
if ($error) {}
elseif ($thisIsAMailing) {
if ($error) {
} elseif ($thisIsAMailing) {
if (preg_match(dropbox_cnf('mailingZipRegexp'), $dropbox_title)) {
$newWorkRecipients = dropbox_cnf('mailingIdBase');
} else {
@ -172,7 +172,7 @@ if (isset($_POST['submitWork'])) {
// After uploading the file, create the db entries
if (!$error) {
@move_uploaded_file( $dropbox_filetmpname, dropbox_cnf('sysPath') . '/' . $dropbox_filename)
@move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath') . '/' . $dropbox_filename)
or die(get_lang('UploadError').' (code 407)');
new Dropbox_SentWork($_user['user_id'], $dropbox_title, $_POST['description'], strip_tags($_POST['authors']), $dropbox_filename, $dropbox_filesize, $newWorkRecipients);
}
@ -180,11 +180,9 @@ if (isset($_POST['submitWork'])) {
}
} //end if(!$error)
/**
* SUBMIT FORM RESULTMESSAGE
*/
if (!$error) {
$return_message = get_lang('FileUploadSucces');
} else {

Write Preview
Loading…
Cancel
Save