chamilo / chamilo-lms

main/group/group_category.php

Indentation +26 added lines, -26 removed lines

@@ -18,7 +18,7 @@ 
     isset ($_GET['action']) ||
     isset ($_POST['action']))
 ) {
-	api_not_allowed();
+    api_not_allowed();
 }
 
 /**
@@ -86,30 +86,30 @@ 
 
 // Build the form
 if (isset($_GET['id'])) {
-	// Update settings of existing category
-	$action = 'update_settings';
+    // Update settings of existing category
+    $action = 'update_settings';
     $form = new FormValidator(
         'group_category',
         'post',
         api_get_self().'?id='.$category['id'].'&'.api_get_cidReq()
     );
-	$form->addElement('hidden', 'id');
+    $form->addElement('hidden', 'id');
 } else {
     // Checks if the field was created in the table Category. It creates it if is neccesary
     $table_category = Database :: get_course_table(TABLE_GROUP_CATEGORY);
     if (!Database::query("SELECT wiki_state FROM $table_category WHERE c_id = $course_id")) {
         Database::query("ALTER TABLE $table_category ADD wiki_state tinyint(3) UNSIGNED NOT NULL default '1' WHERE c_id = $course_id");
     }
-	// Create a new category
-	$action = 'add_category';
-	$form = new FormValidator('group_category');
+    // Create a new category
+    $action = 'add_category';
+    $form = new FormValidator('group_category');
 }
 
 // If categories allowed, show title & description field
 if (api_get_setting('allow_group_categories') == 'true') {
     $form->addElement('header', $nameTools);
     $form->addElement('html', '<div class="row"><div class="col-md-6">');
-	$form->addText('title', get_lang('Title'));
+    $form->addText('title', get_lang('Title'));
 
     // Groups per user
     $possible_values = array();
@@ -142,8 +142,8 @@ 
     $form->addElement('html', '</div>');
     $form->addElement('html', '</div>');
 } else {
-	$form->addElement('hidden', 'title');
-	$form->addElement('hidden', 'description');
+    $form->addElement('hidden', 'title');
+    $form->addElement('hidden', 'description');
 }
 
 $form->addElement('header', get_lang('DefaultSettingsForNewGroups'));
@@ -228,17 +228,17 @@ 
 if ($form->validate()) {
     $values = $form->exportValues();
     if ($values['max_member_no_limit'] == GroupManager::MEMBER_PER_GROUP_NO_LIMIT) {
-		$max_member = GroupManager::MEMBER_PER_GROUP_NO_LIMIT;
-	} else {
-		$max_member = $values['max_member'];
-	}
+        $max_member = GroupManager::MEMBER_PER_GROUP_NO_LIMIT;
+    } else {
+        $max_member = $values['max_member'];
+    }
 
-	$self_reg_allowed = isset($values['self_reg_allowed']) ? $values['self_reg_allowed'] : 0;
-	$self_unreg_allowed = isset($values['self_unreg_allowed']) ? $values['self_unreg_allowed'] : 0;
+    $self_reg_allowed = isset($values['self_reg_allowed']) ? $values['self_reg_allowed'] : 0;
+    $self_unreg_allowed = isset($values['self_unreg_allowed']) ? $values['self_unreg_allowed'] : 0;
 
-	switch ($values['action']) {
-		case 'update_settings':
-			GroupManager::update_category(
+    switch ($values['action']) {
+        case 'update_settings':
+            GroupManager::update_category(
                 $values['id'],
                 $values['title'],
                 $values['description'],
@@ -257,8 +257,8 @@ 
             Display::addFlash(Display::return_message(get_lang('GroupPropertiesModified')));
             header("Location: ".$currentUrl."&category=".$values['id']);
             exit;
-		case 'add_category':
-			GroupManager :: create_category(
+        case 'add_category':
+            GroupManager :: create_category(
                 $values['title'],
                 $values['description'],
                 $values['doc_state'],
@@ -276,8 +276,8 @@ 
             Display::addFlash(Display::return_message(get_lang('CategoryCreated')));
             header("Location: ".$currentUrl);
             exit;
-			break;
-	}
+            break;
+    }
 }
 
 // Else display the form
@@ -292,10 +292,10 @@ 
 $defaults = $category;
 $defaults['action'] = $action;
 if ($defaults['max_student'] == GroupManager::MEMBER_PER_GROUP_NO_LIMIT) {
-	$defaults['max_member_no_limit'] = GroupManager::MEMBER_PER_GROUP_NO_LIMIT;
+    $defaults['max_member_no_limit'] = GroupManager::MEMBER_PER_GROUP_NO_LIMIT;
 } else {
-	$defaults['max_member_no_limit'] = 1;
-	$defaults['max_member'] = $defaults['max_student'];
+    $defaults['max_member_no_limit'] = 1;
+    $defaults['max_member'] = $defaults['max_student'];
 }
 $form->setDefaults($defaults);
 $form->display();

Spacing +14 added lines, -14 removed lines

@@ -7,12 +7,12 @@ 
 
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$current_course_tool  = TOOL_GROUP;
+$current_course_tool = TOOL_GROUP;
 
 // Notice for unauthorized people.
 api_protect_course_script(true);
 
-if (!api_is_allowed_to_edit(false,true) ||
+if (!api_is_allowed_to_edit(false, true) ||
     !(isset ($_GET['id']) ||
     isset ($_POST['id']) ||
     isset ($_GET['action']) ||
@@ -59,7 +59,7 @@ 
             'groups_per_user' => 1,
             'doc_state' => GroupManager::TOOL_PRIVATE,
             'work_state' => GroupManager::TOOL_PRIVATE,
-            'wiki_state' => GroupManager::TOOL_PRIVATE ,
+            'wiki_state' => GroupManager::TOOL_PRIVATE,
             'chat_state' => GroupManager::TOOL_PRIVATE,
             'calendar_state' => GroupManager::TOOL_PRIVATE,
             'announcements_state'=> GroupManager::TOOL_PRIVATE,
@@ -113,7 +113,7 @@ 
 
     // Groups per user
     $possible_values = array();
-    for ($i = 1; $i <= 10; $i ++) {
+    for ($i = 1; $i <= 10; $i++) {
         $possible_values[$i] = $i;
     }
     $possible_values[GroupManager::GROUP_PER_MEMBER_NO_LIMIT] = get_lang('All');
@@ -138,7 +138,7 @@ 
 
     $form->addElement('html', '<div class="col-md-6">');
     // Description
-    $form->addElement('textarea', 'description', get_lang('Description'), array ('rows' => 6));
+    $form->addElement('textarea', 'description', get_lang('Description'), array('rows' => 6));
     $form->addElement('html', '</div>');
     $form->addElement('html', '</div>');
 } else {
@@ -158,7 +158,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('user.png', get_lang('GroupSelfRegistration')) . ' ' . get_lang('GroupSelfRegistration'),
+    Display::return_icon('user.png', get_lang('GroupSelfRegistration')).' '.get_lang('GroupSelfRegistration'),
     null,
     false
 );
@@ -172,7 +172,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('folder.png', get_lang('GroupDocument')) . ' ' . get_lang('GroupDocument'),
+    Display::return_icon('folder.png', get_lang('GroupDocument')).' '.get_lang('GroupDocument'),
     null,
     false
 );
@@ -186,7 +186,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('work.png', get_lang('GroupWork'), array(), ICON_SIZE_SMALL) . ' ' . get_lang('GroupWork'),
+    Display::return_icon('work.png', get_lang('GroupWork'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'),
     '',
     false);
 
@@ -199,7 +199,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('agenda.png', get_lang('GroupCalendar')) . ' ' . get_lang('GroupCalendar'),
+    Display::return_icon('agenda.png', get_lang('GroupCalendar')).' '.get_lang('GroupCalendar'),
     null,
     false
 );
@@ -216,7 +216,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('announce.png', get_lang('GroupAnnouncements')) . ' ' . get_lang('GroupAnnouncements'),
+    Display::return_icon('announce.png', get_lang('GroupAnnouncements')).' '.get_lang('GroupAnnouncements'),
     null,
     false
 );
@@ -230,7 +230,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('forum.png', get_lang('GroupForum')) . ' ' . get_lang('GroupForum'),
+    Display::return_icon('forum.png', get_lang('GroupForum')).' '.get_lang('GroupForum'),
     null,
     false
 );
@@ -244,7 +244,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('wiki.png', get_lang('GroupWiki')) . ' ' . get_lang('GroupWiki'),
+    Display::return_icon('wiki.png', get_lang('GroupWiki')).' '.get_lang('GroupWiki'),
     null,
     false
 );
@@ -258,7 +258,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('chat.png', get_lang('Chat')) . ' ' . get_lang('Chat'),
+    Display::return_icon('chat.png', get_lang('Chat')).' '.get_lang('Chat'),
     null,
     false
 );
@@ -333,7 +333,7 @@ 
 // actions bar
 echo '<div class="actions">';
 echo '<a href="group.php">'.
-    Display::return_icon('back.png', get_lang('BackToGroupList'),'',ICON_SIZE_MEDIUM).'</a>';
+    Display::return_icon('back.png', get_lang('BackToGroupList'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 $defaults = $category;

main/group/member_settings.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 require_once '../inc/global.inc.php';
 $this_section = SECTION_COURSES;
-$current_course_tool  = TOOL_GROUP;
+$current_course_tool = TOOL_GROUP;
 
 // Notice for unauthorized people.
 api_protect_course_script(true);
@@ -162,7 +162,7 @@ 
 // Group members
 $group_member_list = GroupManager::get_subscribed_users($current_group['id']);
 
-$selected_users = array ();
+$selected_users = array();
 if (!empty($group_member_list)) {
     foreach ($group_member_list as $index => $user) {
         $selected_users[] = $user['user_id'];

main/dropbox/dropbox_download.php

Indentation +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
             'error'
         )
     );
-	exit;
+    exit;
 } else {
     /*      DOWNLOAD THE FILE */
     // the user is allowed to download the file

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
                 ON (post.file_id = file.id AND post.c_id = $course_id AND file.c_id = $course_id)
                 WHERE
                     post.cat_id = ".intval($_GET['cat_id'])." AND
-                    post.dest_user_id = $user_id" ;
+                    post.dest_user_id = $user_id";
     }
     $files_to_download = array();
     $result = Database::query($sql);
@@ -96,7 +96,7 @@ 
     $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX][] = intval($_GET['id']);
 
     $work = new Dropbox_Work($_GET['id']);
-    $path = dropbox_cnf('sysPath') . '/' . $work -> filename; //path to file as stored on server
+    $path = dropbox_cnf('sysPath').'/'.$work -> filename; //path to file as stored on server
 
     if (!Security::check_abs_path($path, dropbox_cnf('sysPath').'/')) {
         exit;

main/dropbox/dropbox_class.inc.php

Spacing +20 added lines, -20 removed lines

@@ -184,7 +184,7 @@ 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
 
         // Do some sanity checks
-        $id	= intval($id);
+        $id = intval($id);
 
         // Get the data from DB
         $sql = "SELECT uploader_id, filename, filesize, title, description, author, upload_date, last_upload_date, cat_id
@@ -226,14 +226,14 @@ 
                 $row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']);
                 $feedback2[] = $row_feedback;
             }
-            $this->feedback2= $feedback2;
+            $this->feedback2 = $feedback2;
         }
 	}
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
+	public $recipients; //array of ['id']['name'] arrays
 
 	/**
 	 * Constructor calls private functions to create a new work or retreive an existing work from DB
@@ -290,15 +290,15 @@ 
 		settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
 
 		$justSubmit = false;
-		if ( is_int($recipient_ids)) {
+		if (is_int($recipient_ids)) {
 			$justSubmit = true;
 			$recipient_ids = array($recipient_ids + $this->id);
-		} elseif ( count($recipient_ids) == 0) {
+		} elseif (count($recipient_ids) == 0) {
 			$justSubmit = true;
 			$recipient_ids = array($uploader_id);
 		}
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+		if (!is_array($recipient_ids) || count($recipient_ids) == 0) {
 			die(get_lang('GeneralError').' (code 209)');
 		}
 
@@ -313,11 +313,11 @@ 
         $table_person = $dropbox_cnf['tbl_person'];
         $session_id = api_get_session_id();
         $uploader_id = $this->uploader_id;
-        $user  = api_get_user_id();
+        $user = api_get_user_id();
 		// Insert data in dropbox_post and dropbox_person table for each recipient
 		foreach ($this->recipients as $rec) {
-            $file_id = (int)$this->id;
-            $user_id = (int)$rec['id'];
+            $file_id = (int) $this->id;
+            $user_id = (int) $rec['id'];
 			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id)";
 	        Database::query($sql);
@@ -333,7 +333,7 @@ 
 
                 // Do not add recipient in person table if mailing zip or just upload.
                 if (!$justSubmit) {
-                    Database::query($sql);	// If work already exists no error is generated
+                    Database::query($sql); // If work already exists no error is generated
                 }
             }
 
@@ -342,7 +342,7 @@ 
 			    $ownerid = getUserOwningThisMailing($ownerid);
 			}
 			if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+			    $recipid = $ownerid; // mailing file recipient = mailing id, not a person
 			}
             api_item_property_update(
                 $_course,
@@ -401,13 +401,13 @@ 
 class Dropbox_Person
 {
 	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
+	public $receivedWork; // an array of Dropbox_Work objects
+	public $sentWork; // an array of Dropbox_SentWork objects
 
 	public $userId = 0;
 	public $isCourseAdmin = false;
 	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
+	public $_orderBy = ''; // private property that determines by which field
 
 	/**
 	 * Constructor for recreating the Dropbox_Person object
@@ -506,7 +506,7 @@ 
 	 */
 	function orderSentWork($sort)
     {
-		switch($sort) {
+		switch ($sort) {
 			case 'lastDate':
 				$this->_orderBy = 'last_upload_date';
 				break;
@@ -539,7 +539,7 @@ 
 	 */
 	function orderReceivedWork($sort)
     {
-		switch($sort) {
+		switch ($sort) {
 			case 'lastDate':
 				$this->_orderBy = 'last_upload_date';
 				break;
@@ -632,7 +632,7 @@ 
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
 		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -649,7 +649,7 @@ 
 			Database::query($sql);
 			removeMoreIfMailing($w->id);
 		}
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -683,7 +683,7 @@ 
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
 		Database::query($sql);
 		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
+		removeUnusedFiles(); // Check for unused files
 	}
 
 	/**
@@ -705,7 +705,7 @@ 
 		$wi = -1;
 		foreach ($this->receivedWork as $w) {
 			$wi++;
-			if ($w->id == $id){
+			if ($w->id == $id) {
 			   $found = true;
 			   break;
 			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)

Braces +12 added lines, -4 removed lines

@@ -303,7 +303,9 @@ 
 		}
 
 		foreach ($recipient_ids as $rec) {
-			if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
+			if (empty($rec)) {
+			    die(get_lang('GeneralError').' (code 210)');
+			}
 			//if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
 				//this check is done when validating submitted data
 			$this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
@@ -593,13 +595,19 @@ 
 		$id = intval($id);
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		$sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
+		if (!Database::query($sql)) {
+		    return false;
+		}
 		return true;
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -267,7 +267,7 @@
 	 * @param string $author
 	 * @param string $filename
 	 * @param int $filesize
-	 * @param array $recipient_ids
+	 * @param unknown_type|null $recipient_ids
 	 */
 	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {

Indentation +422 added lines, -422 removed lines

@@ -78,20 +78,20 @@ 
         }
     }
 
-	/**
-	 * private function creating a new work object
-	 *
-	 * @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
-	 */
-	public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
+    /**
+     * private function creating a new work object
+     *
+     * @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
+     */
+    public function _createNewWork($uploader_id, $title, $description, $author, $filename, $filesize)
     {
         $dropbox_cnf = getDropboxConf();
 
@@ -109,17 +109,17 @@ 
         // Check if object exists already. If it does, the old object is used
         // with updated information (authors, description, upload_date)
         $this->isOldWork = false;
-		$sql = "SELECT id, upload_date FROM ".$dropbox_cnf['tbl_file']."
+        $sql = "SELECT id, upload_date FROM ".$dropbox_cnf['tbl_file']."
 				WHERE c_id = $course_id AND filename = '".Database::escape_string($this->filename)."'";
         $result = Database::query($sql);
-		$res = Database::fetch_array($result);
-		if ($res) {
-			$this->isOldWork = true;
-		}
-		// Insert or update the dropbox_file table and set the id property
-		if ($this->isOldWork) {
-			$this->id = $res['id'];
-			$this->upload_date = $res['upload_date'];
+        $res = Database::fetch_array($result);
+        if ($res) {
+            $this->isOldWork = true;
+        }
+        // Insert or update the dropbox_file table and set the id property
+        if ($this->isOldWork) {
+            $this->id = $res['id'];
+            $this->upload_date = $res['upload_date'];
 
             $params = [
                 'filesize' => $this->filesize,
@@ -136,9 +136,9 @@ 
                 ['c_id = ? AND id = ?' => [$course_id, $this->id]]
             );
 
-		} else {
-			$this->upload_date = $this->last_upload_date;
-			$params = [
+        } else {
+            $this->upload_date = $this->last_upload_date;
+            $params = [
                 'c_id' => $course_id,
                 'uploader_id' => $this->uploader_id,
                 'filename' => $this->filename,
@@ -150,14 +150,14 @@ 
                 'last_upload_date' => $this->last_upload_date,
                 'session_id' => api_get_session_id(),
                 'cat_id' => 0
-			];
+            ];
 
-			$this->id = Database::insert($dropbox_cnf['tbl_file'], $params);
-			if ($this->id) {
-				$sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}";
-				Database::query($sql);
-			}
-		}
+            $this->id = Database::insert($dropbox_cnf['tbl_file'], $params);
+            if ($this->id) {
+                $sql = "UPDATE ".$dropbox_cnf['tbl_file']." SET id = iid WHERE iid = {$this->id}";
+                Database::query($sql);
+            }
+        }
 
         $sql = "SELECT count(file_id) as count
         		FROM ".$dropbox_cnf['tbl_person']."
@@ -171,16 +171,16 @@ 
                     VALUES ($course_id, ".intval($this->id)." , ".intval($this->uploader_id).")";
             Database::query($sql);
         }
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param int $id
-	 */
-	public function _createExistingWork($id)
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param int $id
+     */
+    public function _createExistingWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
 
         $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -231,52 +231,52 @@ 
             }
             $this->feedback2= $feedback2;
         }
-	}
+    }
 }
 
 class Dropbox_SentWork extends Dropbox_Work
 {
-	public $recipients;	//array of ['id']['name'] arrays
-
-	/**
-	 * Constructor calls private functions to create a new work or retreive an existing work from DB
-	 * depending on the number of parameters
-	 *
-	 * @param unknown_type $arg1
-	 * @param unknown_type $arg2
-	 * @param unknown_type $arg3
-	 * @param unknown_type $arg4
-	 * @param unknown_type $arg5
-	 * @param unknown_type $arg6
-	 * @param unknown_type $arg7
-	 * @return Dropbox_SentWork
-	 */
-	public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
+    public $recipients;	//array of ['id']['name'] arrays
+
+    /**
+     * Constructor calls private functions to create a new work or retreive an existing work from DB
+     * depending on the number of parameters
+     *
+     * @param unknown_type $arg1
+     * @param unknown_type $arg2
+     * @param unknown_type $arg3
+     * @param unknown_type $arg4
+     * @param unknown_type $arg5
+     * @param unknown_type $arg6
+     * @param unknown_type $arg7
+     * @return Dropbox_SentWork
+     */
+    public function __construct($arg1, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null, $arg6 = null, $arg7 = null)
     {
-		if (func_num_args() > 1) {
-		    $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
-		} else {
-			$this->_createExistingSentWork($arg1);
-		}
-	}
-
-	/**
-	 * private function creating a new SentWork object
-	 *
-	 * @param int $uploader_id
-	 * @param string $title
-	 * @param string $description
-	 * @param string $author
-	 * @param string $filename
-	 * @param int $filesize
-	 * @param array $recipient_ids
-	 */
-	public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
+        if (func_num_args() > 1) {
+            $this->_createNewSentWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
+        } else {
+            $this->_createExistingSentWork($arg1);
+        }
+    }
+
+    /**
+     * private function creating a new SentWork object
+     *
+     * @param int $uploader_id
+     * @param string $title
+     * @param string $description
+     * @param string $author
+     * @param string $filename
+     * @param int $filesize
+     * @param array $recipient_ids
+     */
+    public function _createNewSentWork($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids)
     {
         $dropbox_cnf = getDropboxConf();
         $_course = api_get_course_info();
 
-		// Call constructor of Dropbox_Work object
+        // Call constructor of Dropbox_Work object
         parent::__construct(
             $uploader_id,
             $title,
@@ -286,31 +286,31 @@ 
             $filesize
         );
 
-		$course_id = api_get_course_int_id();
-
-		// Do sanity checks on recipient_ids array & property fillin
-		// The sanity check for ex-coursemembers is already done in base constructor
-		settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
+        $course_id = api_get_course_int_id();
 
-		$justSubmit = false;
-		if ( is_int($recipient_ids)) {
-			$justSubmit = true;
-			$recipient_ids = array($recipient_ids + $this->id);
-		} elseif ( count($recipient_ids) == 0) {
-			$justSubmit = true;
-			$recipient_ids = array($uploader_id);
-		}
+        // Do sanity checks on recipient_ids array & property fillin
+        // The sanity check for ex-coursemembers is already done in base constructor
+        settype($uploader_id, 'integer') or die(get_lang('GeneralError').' (code 208)'); // Set $uploader_id to correct type
+
+        $justSubmit = false;
+        if ( is_int($recipient_ids)) {
+            $justSubmit = true;
+            $recipient_ids = array($recipient_ids + $this->id);
+        } elseif ( count($recipient_ids) == 0) {
+            $justSubmit = true;
+            $recipient_ids = array($uploader_id);
+        }
 
-		if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
-			die(get_lang('GeneralError').' (code 209)');
-		}
+        if (! is_array($recipient_ids) || count($recipient_ids) == 0) {
+            die(get_lang('GeneralError').' (code 209)');
+        }
 
-		foreach ($recipient_ids as $rec) {
-			if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
-			//if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
-				//this check is done when validating submitted data
-			$this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
-		}
+        foreach ($recipient_ids as $rec) {
+            if (empty($rec)) die(get_lang('GeneralError').' (code 210)');
+            //if (!isCourseMember($rec)) die(); //cannot sent document to someone outside of course
+                //this check is done when validating submitted data
+            $this->recipients[] = array('id' => $rec, 'name' => getUserNameFromId($rec));
+        }
 
         $table_post = $dropbox_cnf['tbl_post'];
         $table_person = $dropbox_cnf['tbl_person'];
@@ -319,13 +319,13 @@ 
         $user  = api_get_user_id();
         $now = api_get_utc_datetime();
 
-		// Insert data in dropbox_post and dropbox_person table for each recipient
-		foreach ($this->recipients as $rec) {
+        // Insert data in dropbox_post and dropbox_person table for each recipient
+        foreach ($this->recipients as $rec) {
             $file_id = (int)$this->id;
             $user_id = (int)$rec['id'];
-			$sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
+            $sql = "INSERT INTO $table_post (c_id, file_id, dest_user_id, session_id, feedback_date, cat_id)
                     VALUES ($course_id, $file_id, $user_id, $session_id, '$now', 0)";
-	        Database::query($sql);
+            Database::query($sql);
             // If work already exists no error is generated
 
             /**
@@ -342,13 +342,13 @@ 
                 }
             }
 
-			// Update item_property table for each recipient
-			if (($ownerid = $this->uploader_id) > $dropbox_cnf['mailingIdBase']) {
-			    $ownerid = getUserOwningThisMailing($ownerid);
-			}
-			if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
-			    $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
-			}
+            // Update item_property table for each recipient
+            if (($ownerid = $this->uploader_id) > $dropbox_cnf['mailingIdBase']) {
+                $ownerid = getUserOwningThisMailing($ownerid);
+            }
+            if (($recipid = $rec["id"]) > $dropbox_cnf['mailingIdBase']) {
+                $recipid = $ownerid;  // mailing file recipient = mailing id, not a person
+            }
             api_item_property_update(
                 $_course,
                 TOOL_DROPBOX,
@@ -358,91 +358,91 @@ 
                 null,
                 $recipid
             );
-		}
-	}
-
-	/**
-	 * private function creating existing object by retreiving info from db
-	 *
-	 * @param unknown_type $id
-	 */
-	public function _createExistingSentWork($id)
+        }
+    }
+
+    /**
+     * private function creating existing object by retreiving info from db
+     *
+     * @param unknown_type $id
+     */
+    public function _createExistingSentWork($id)
     {
         $dropbox_cnf = getDropboxConf();
         $id = intval($id);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Call constructor of Dropbox_Work object
-		parent::__construct($id);
+        // Call constructor of Dropbox_Work object
+        parent::__construct($id);
 
-		// Fill in recipients array
-		$this->recipients = array();
-		$sql = "SELECT dest_user_id, feedback_date, feedback
+        // Fill in recipients array
+        $this->recipients = array();
+        $sql = "SELECT dest_user_id, feedback_date, feedback
 				FROM ".$dropbox_cnf['tbl_post']."
 				WHERE c_id = $course_id AND file_id = ".intval($id)."";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result, 'ASSOC')) {
-			// Check for deleted users
-			$dest_user_id = $res['dest_user_id'];
-			$user_info = api_get_user_info($dest_user_id);
-			//$this->category = $res['cat_id'];
-			if (!$user_info) {
-				$this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
-			} else {
-				$this->recipients[] = array(
+        while ($res = Database::fetch_array($result, 'ASSOC')) {
+            // Check for deleted users
+            $dest_user_id = $res['dest_user_id'];
+            $user_info = api_get_user_info($dest_user_id);
+            //$this->category = $res['cat_id'];
+            if (!$user_info) {
+                $this->recipients[] = array('id' => -1, 'name' => get_lang('Unknown', ''));
+            } else {
+                $this->recipients[] = array(
                     'id' => $dest_user_id,
                     'name' => $user_info['complete_name'],
                     'user_id' => $dest_user_id,
-				    'feedback_date' => $res['feedback_date'],
+                    'feedback_date' => $res['feedback_date'],
                     'feedback' => $res['feedback']
                 );
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 class Dropbox_Person
 {
-	// The receivedWork and the sentWork arrays are sorted.
-	public $receivedWork;	// an array of Dropbox_Work objects
-	public $sentWork;		// an array of Dropbox_SentWork objects
-
-	public $userId = 0;
-	public $isCourseAdmin = false;
-	public $isCourseTutor = false;
-	public $_orderBy = '';	// private property that determines by which field
-
-	/**
-	 * Constructor for recreating the Dropbox_Person object
-	 *
-	 * @param int $userId
-	 * @param bool $isCourseAdmin
-	 * @param bool $isCourseTutor
-	 * @return Dropbox_Person
-	 */
-	public function __construct($userId, $isCourseAdmin, $isCourseTutor)
+    // The receivedWork and the sentWork arrays are sorted.
+    public $receivedWork;	// an array of Dropbox_Work objects
+    public $sentWork;		// an array of Dropbox_SentWork objects
+
+    public $userId = 0;
+    public $isCourseAdmin = false;
+    public $isCourseTutor = false;
+    public $_orderBy = '';	// private property that determines by which field
+
+    /**
+     * Constructor for recreating the Dropbox_Person object
+     *
+     * @param int $userId
+     * @param bool $isCourseAdmin
+     * @param bool $isCourseTutor
+     * @return Dropbox_Person
+     */
+    public function __construct($userId, $isCourseAdmin, $isCourseTutor)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Fill in properties
+        // Fill in properties
         $this->userId = $userId;
         $this->isCourseAdmin = $isCourseAdmin;
         $this->isCourseTutor = $isCourseTutor;
         $this->receivedWork = array();
         $this->sentWork = array();
 
-		// Note: perhaps include an ex coursemember check to delete old files
+        // Note: perhaps include an ex coursemember check to delete old files
 
-		$session_id = api_get_session_id();
-		$condition_session = api_get_session_condition($session_id);
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id);
 
-		$post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
-		$person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
-		$file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
+        $post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
+        $person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
+        $file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
 
         // Find all entries where this person is the recipient
-		$sql = "SELECT DISTINCT r.file_id, r.cat_id
+        $sql = "SELECT DISTINCT r.file_id, r.cat_id
                 FROM $post_tbl r
                 INNER JOIN $person_tbl p
                     ON (r.file_id = p.file_id AND r.c_id = $course_id AND p.c_id = $course_id )
@@ -451,12 +451,12 @@ 
                      r.dest_user_id = ".intval($this->userId)." $condition_session ";
 
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$temp = new Dropbox_Work($res['file_id']);
-			$temp->category = $res['cat_id'];
-			$this->receivedWork[] = $temp;
-		}
-		// Find all entries where this person is the sender/uploader
+        while ($res = Database::fetch_array($result)) {
+            $temp = new Dropbox_Work($res['file_id']);
+            $temp->category = $res['cat_id'];
+            $this->receivedWork[] = $temp;
+        }
+        // Find all entries where this person is the sender/uploader
         $sql = "SELECT DISTINCT f.id
 				FROM $file_tbl f
 				INNER JOIN $person_tbl p
@@ -467,261 +467,261 @@ 
                     $condition_session
                 ";
         $result = Database::query($sql);
-		while ($res = Database::fetch_array($result)) {
-			$this->sentWork[] = new Dropbox_SentWork($res['id']);
-		}
-	}
-
-	/**
-	 * This private method is used by the usort function in  the
-	 * orderSentWork and orderReceivedWork methods.
-	 * It compares 2 work-objects by 1 of the properties of that object, dictated by the
-	 * private property _orderBy
-	 *
-	 * @param unknown_type $a
-	 * @param unknown_type $b
-	 * @return int -1, 0 or 1 dependent of the result of the comparison.
-	 */
-	function _cmpWork($a, $b)
+        while ($res = Database::fetch_array($result)) {
+            $this->sentWork[] = new Dropbox_SentWork($res['id']);
+        }
+    }
+
+    /**
+     * This private method is used by the usort function in  the
+     * orderSentWork and orderReceivedWork methods.
+     * It compares 2 work-objects by 1 of the properties of that object, dictated by the
+     * private property _orderBy
+     *
+     * @param unknown_type $a
+     * @param unknown_type $b
+     * @return int -1, 0 or 1 dependent of the result of the comparison.
+     */
+    function _cmpWork($a, $b)
     {
-		$sort = $this->_orderBy;
-		$aval = $a->$sort;
-		$bval = $b->$sort;
-		if ($sort == 'recipients') {
-		    // The recipients property is an array so we do the comparison based
-		    // on the first item of the recipients array
-		    $aval = $aval[0]['name'];
-			$bval = $bval[0]['name'];
-		}
-		if ($sort == 'filesize') {    // Filesize is not a string, so we use other comparison technique
-			return $aval < $bval ? -1 : 1;
-		} elseif ($sort == 'title') { // Natural order for sorting titles is more "human-friendly"
-			return api_strnatcmp($aval, $bval);
-		} else {
-		    return api_strcasecmp($aval, $bval);
-		}
-	}
-
-	/**
-	 * A method that sorts the objects in the sentWork array, dependent on the $sort parameter.
-	 * $sort can be lastDate, firstDate, title, size, ...
-	 *
-	 * @param unknown_type $sort
-	 */
-	function orderSentWork($sort)
+        $sort = $this->_orderBy;
+        $aval = $a->$sort;
+        $bval = $b->$sort;
+        if ($sort == 'recipients') {
+            // The recipients property is an array so we do the comparison based
+            // on the first item of the recipients array
+            $aval = $aval[0]['name'];
+            $bval = $bval[0]['name'];
+        }
+        if ($sort == 'filesize') {    // Filesize is not a string, so we use other comparison technique
+            return $aval < $bval ? -1 : 1;
+        } elseif ($sort == 'title') { // Natural order for sorting titles is more "human-friendly"
+            return api_strnatcmp($aval, $bval);
+        } else {
+            return api_strcasecmp($aval, $bval);
+        }
+    }
+
+    /**
+     * A method that sorts the objects in the sentWork array, dependent on the $sort parameter.
+     * $sort can be lastDate, firstDate, title, size, ...
+     *
+     * @param unknown_type $sort
+     */
+    function orderSentWork($sort)
     {
-		switch($sort) {
-			case 'lastDate':
-				$this->_orderBy = 'last_upload_date';
-				break;
-			case 'firstDate':
-				$this->_orderBy = 'upload_date';
-				break;
-			case 'title':
-				$this->_orderBy = 'title';
-				break;
-			case 'size':
-				$this->_orderBy = 'filesize';
-				break;
-			case 'author':
-				$this->_orderBy = 'author';
-				break;
-			case 'recipient':
-				$this->_orderBy = 'recipients';
-				break;
-			default:
-				$this->_orderBy = 'last_upload_date';
-		}
-
-		usort($this->sentWork, array($this, '_cmpWork'));
-	}
-
-	/**
-	 * method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
-	 * $sort can be lastDate, firstDate, title, size, ...
-	 * @param unknown_type $sort
-	 */
-	function orderReceivedWork($sort)
+        switch($sort) {
+            case 'lastDate':
+                $this->_orderBy = 'last_upload_date';
+                break;
+            case 'firstDate':
+                $this->_orderBy = 'upload_date';
+                break;
+            case 'title':
+                $this->_orderBy = 'title';
+                break;
+            case 'size':
+                $this->_orderBy = 'filesize';
+                break;
+            case 'author':
+                $this->_orderBy = 'author';
+                break;
+            case 'recipient':
+                $this->_orderBy = 'recipients';
+                break;
+            default:
+                $this->_orderBy = 'last_upload_date';
+        }
+
+        usort($this->sentWork, array($this, '_cmpWork'));
+    }
+
+    /**
+     * method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
+     * $sort can be lastDate, firstDate, title, size, ...
+     * @param unknown_type $sort
+     */
+    function orderReceivedWork($sort)
     {
-		switch($sort) {
-			case 'lastDate':
-				$this->_orderBy = 'last_upload_date';
-				break;
-			case 'firstDate':
-				$this->_orderBy = 'upload_date';
-				break;
-			case 'title':
-				$this->_orderBy = 'title';
-				break;
-			case 'size':
-				$this->_orderBy = 'filesize';
-				break;
-			case 'author':
-				$this->_orderBy = 'author';
-				break;
-			case 'sender':
-				$this->_orderBy = 'uploaderName';
-				break;
-			default:
-				$this->_orderBy = 'last_upload_date';
-		}
-
-		usort($this->receivedWork, array($this, '_cmpWork'));
-	}
-
-	/**
-	 * Deletes all the received work of this person
-	 */
-	public function deleteAllReceivedWork()
+        switch($sort) {
+            case 'lastDate':
+                $this->_orderBy = 'last_upload_date';
+                break;
+            case 'firstDate':
+                $this->_orderBy = 'upload_date';
+                break;
+            case 'title':
+                $this->_orderBy = 'title';
+                break;
+            case 'size':
+                $this->_orderBy = 'filesize';
+                break;
+            case 'author':
+                $this->_orderBy = 'author';
+                break;
+            case 'sender':
+                $this->_orderBy = 'uploaderName';
+                break;
+            default:
+                $this->_orderBy = 'last_upload_date';
+        }
+
+        usort($this->receivedWork, array($this, '_cmpWork'));
+    }
+
+    /**
+     * Deletes all the received work of this person
+     */
+    public function deleteAllReceivedWork()
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		// Delete entries in person table concerning received works
-		foreach ($this->receivedWork as $w) {
+        // Delete entries in person table concerning received works
+        foreach ($this->receivedWork as $w) {
             $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
 			        WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-		}
+            Database::query($sql);
+        }
         // Check for unused files
-		removeUnusedFiles();
-	}
-
-	/**
-	 * Deletes all the received categories and work of this person
-	 * @param integer $id
-	 */
-	public function deleteReceivedWorkFolder($id)
+        removeUnusedFiles();
+    }
+
+    /**
+     * Deletes all the received categories and work of this person
+     * @param integer $id
+     */
+    public function deleteReceivedWorkFolder($id)
     {
         $dropbox_cnf = getDropboxConf();
         $course_id = api_get_course_int_id();
 
-		$id = intval($id);
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
+        $id = intval($id);
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_file']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_category']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		$sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
+        if (!Database::query($sql)) return false;
+        $sql = "DELETE FROM ".$dropbox_cnf['tbl_post']."
 		        WHERE c_id = $course_id AND cat_id = '".$id."' ";
-		if (!Database::query($sql)) return false;
-		return true;
-	}
-
-	/**
-	 * Deletes a received dropbox file of this person with id=$id
-	 *
-	 * @param integer $id
-	 */
-	public function deleteReceivedWork($id)
+        if (!Database::query($sql)) return false;
+        return true;
+    }
+
+    /**
+     * Deletes a received dropbox file of this person with id=$id
+     *
+     * @param integer $id
+     */
+    public function deleteReceivedWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->receivedWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 216)');
-			}
-		}
-		// Delete entries in person table concerning received works
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->receivedWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 216)');
+            }
+        }
+        // Delete entries in person table concerning received works
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id = '".$this->userId."' AND file_id ='".$id."'";
-		Database::query($sql);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes all the sent dropbox files of this person
-	 */
-	public function deleteAllSentWork()
+        Database::query($sql);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes all the sent dropbox files of this person
+     */
+    public function deleteAllSentWork()
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
-		//delete entries in person table concerning sent works
-		foreach ($this->sentWork as $w) {
+        //delete entries in person table concerning sent works
+        foreach ($this->sentWork as $w) {
             $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                     WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$w->id."'";
-			Database::query($sql);
-			removeMoreIfMailing($w->id);
-		}
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Deletes a sent dropbox file of this person with id=$id
-	 *
-	 * @param unknown_type $id
-	 */
-	public function deleteSentWork($id)
+            Database::query($sql);
+            removeMoreIfMailing($w->id);
+        }
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Deletes a sent dropbox file of this person with id=$id
+     *
+     * @param unknown_type $id
+     */
+    public function deleteSentWork($id)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $dropbox_cnf = getDropboxConf();
 
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		foreach ($this->sentWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-		if (!$found) {
-			if (!$this->deleteReceivedWorkFolder($id)) {
-				die(get_lang('GeneralError').' (code 219)');
-			}
-		}
-		//$file_id = $this->sentWork[$index]->id;
-		// Delete entries in person table concerning sent works
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        foreach ($this->sentWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+        if (!$found) {
+            if (!$this->deleteReceivedWorkFolder($id)) {
+                die(get_lang('GeneralError').' (code 219)');
+            }
+        }
+        //$file_id = $this->sentWork[$index]->id;
+        // Delete entries in person table concerning sent works
         $sql = "DELETE FROM ".$dropbox_cnf['tbl_person']."
                 WHERE c_id = $course_id AND user_id='".$this->userId."' AND file_id='".$id."'";
-		Database::query($sql);
-		removeMoreIfMailing($id);
-		removeUnusedFiles();	// Check for unused files
-	}
-
-	/**
-	 * Updates feedback for received work of this person with id=$id
-	 *
-	 * @param string $id
-	 * @param string $text
-	 */
-	public function updateFeedback($id, $text)
+        Database::query($sql);
+        removeMoreIfMailing($id);
+        removeUnusedFiles();	// Check for unused files
+    }
+
+    /**
+     * Updates feedback for received work of this person with id=$id
+     *
+     * @param string $id
+     * @param string $text
+     */
+    public function updateFeedback($id, $text)
     {
-	    $course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
         $_course = api_get_course_info();
         $dropbox_cnf = getDropboxConf();
 
-		$id = intval($id);
-
-		// index check
-		$found = false;
-		$wi = -1;
-		foreach ($this->receivedWork as $w) {
-			$wi++;
-			if ($w->id == $id){
-			   $found = true;
-			   break;
-			}  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
-		}
-		if (!$found) {
-			die(get_lang('GeneralError').' (code 221)');
-		}
-
-		$feedback_date = api_get_utc_datetime();
-		$this->receivedWork[$wi]->feedback_date = $feedback_date;
-		$this->receivedWork[$wi]->feedback = $text;
+        $id = intval($id);
+
+        // index check
+        $found = false;
+        $wi = -1;
+        foreach ($this->receivedWork as $w) {
+            $wi++;
+            if ($w->id == $id){
+                $found = true;
+                break;
+            }  // foreach (... as $wi -> $w) gives error 221! (no idea why...)
+        }
+        if (!$found) {
+            die(get_lang('GeneralError').' (code 221)');
+        }
+
+        $feedback_date = api_get_utc_datetime();
+        $this->receivedWork[$wi]->feedback_date = $feedback_date;
+        $this->receivedWork[$wi]->feedback = $text;
 
         $params = [
             'feedback_date' => $feedback_date,
@@ -739,11 +739,11 @@ 
             ]
         );
 
-		// Update item_property table
+        // Update item_property table
 
-		if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $dropbox_cnf['mailingIdBase']) {
-		    $ownerid = getUserOwningThisMailing($ownerid);
-		}
+        if (($ownerid = $this->receivedWork[$wi]->uploader_id) > $dropbox_cnf['mailingIdBase']) {
+            $ownerid = getUserOwningThisMailing($ownerid);
+        }
         api_item_property_update(
             $_course,
             TOOL_DROPBOX,
@@ -754,31 +754,31 @@ 
             $ownerid
         );
 
-	}
+    }
 
-	/**
-	 * Filter the received work
-	 * @param string $type
-	 * @param string $value
-	 */
-	public function filter_received_work($type, $value)
+    /**
+     * Filter the received work
+     * @param string $type
+     * @param string $value
+     */
+    public function filter_received_work($type, $value)
     {
         $dropbox_cnf = getDropboxConf();
-    	$new_received_work = array();
-		foreach ($this->receivedWork as $work) {
-			switch ($type) {
-				case 'uploader_id':
-					if ($work->uploader_id == $value ||
-						($work->uploader_id > $dropbox_cnf['mailingIdBase'] &&
+        $new_received_work = array();
+        foreach ($this->receivedWork as $work) {
+            switch ($type) {
+                case 'uploader_id':
+                    if ($work->uploader_id == $value ||
+                        ($work->uploader_id > $dropbox_cnf['mailingIdBase'] &&
                         getUserOwningThisMailing($work->uploader_id) == $value)
                     ) {
-						$new_received_work[] = $work;
-					}
-					break;
-				default:
-					$new_received_work[] = $work;
-			}
-		}
-		$this->receivedWork = $new_received_work;
-	}
+                        $new_received_work[] = $work;
+                    }
+                    break;
+                default:
+                    $new_received_work[] = $work;
+            }
+        }
+        $this->receivedWork = $new_received_work;
+    }
 }

main/dropbox/dropbox_submit.php

Indentation +54 added lines, -54 removed lines

@@ -33,21 +33,21 @@ 
         $thisIsAMailing = false;
         $thisIsJustUpload = false;
 
-	    foreach ($_POST['recipients'] as $rec) {
+        foreach ($_POST['recipients'] as $rec) {
             if ($rec == 'mailing') {
-	            $thisIsAMailing = true;
+                $thisIsAMailing = true;
             } elseif ($rec == 'upload') {
-	            $thisIsJustUpload = true;
+                $thisIsJustUpload = true;
             } elseif (strpos($rec, 'user_') === 0 && !isCourseMember(substr($rec, strlen('user_')))) {
-	        	echo '401';
-	        	die(get_lang('BadFormData').' (code 401)');
-	        } elseif (strpos($rec, 'group_') !== 0 && strpos($rec, 'user_') !== 0) {
-	        	echo '402';
-	        	die(get_lang('BadFormData').' (code 402)');
-	        }
+                echo '401';
+                die(get_lang('BadFormData').' (code 401)');
+            } elseif (strpos($rec, 'group_') !== 0 && strpos($rec, 'user_') !== 0) {
+                echo '402';
+                die(get_lang('BadFormData').' (code 402)');
+            }
         }
 
-		// we are doing a mailing but an additional recipient is selected
+        // we are doing a mailing but an additional recipient is selected
         if ($thisIsAMailing && ( count($_POST['recipients']) != 1)) {
             $error = true;
             $errormsg = get_lang('MailingSelectNoOther');
@@ -62,11 +62,11 @@ 
         }
     }
 
-	//check if $_POST['cb_overwrite'] is true or false
-	$dropbox_overwrite = false;
-	if (isset($_POST['cb_overwrite']) && $_POST['cb_overwrite']) {
-		$dropbox_overwrite = true;
-	}
+    //check if $_POST['cb_overwrite'] is true or false
+    $dropbox_overwrite = false;
+    if (isset($_POST['cb_overwrite']) && $_POST['cb_overwrite']) {
+        $dropbox_overwrite = true;
+    }
 
     /**
      * FORM SUBMIT : UPLOAD NEW FILE
@@ -168,13 +168,13 @@ 
                     }
                 }
 
-				// After uploading the file, create the db entries
+                // After uploading the file, create the db entries
 
-	        	if (!$error) {
-		            @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);
-	        	}
+                if (!$error) {
+                    @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);
+                }
             }
         }
     } //end if(!$error)
@@ -183,9 +183,9 @@ 
      * SUBMIT FORM RESULTMESSAGE
      */
     if (!$error) {
-		$return_message = get_lang('FileUploadSucces');
+        $return_message = get_lang('FileUploadSucces');
     } else {
-		$return_message = $errormsg;
+        $return_message = $errormsg;
     }
 }
 
@@ -199,25 +199,25 @@ 
  */
 if (isset($_GET['deleteReceived']) || isset($_GET['deleteSent'])
          || isset( $_GET['showFeedback']) || isset( $_GET['editFeedback'])) {
-	if ($_GET['mailing']) {
-		getUserOwningThisMailing($_GET['mailing'], $_user['user_id'], '408');
-		$dropbox_person = new Dropbox_Person($_GET['mailing'], $is_courseAdmin, $is_courseTutor);
-	} else {
-	    $dropbox_person = new Dropbox_Person($_user['user_id'], $is_courseAdmin, $is_courseTutor);
+    if ($_GET['mailing']) {
+        getUserOwningThisMailing($_GET['mailing'], $_user['user_id'], '408');
+        $dropbox_person = new Dropbox_Person($_GET['mailing'], $is_courseAdmin, $is_courseTutor);
+    } else {
+        $dropbox_person = new Dropbox_Person($_user['user_id'], $is_courseAdmin, $is_courseTutor);
     }
 
-	if (isset($_SESSION['sentOrder'])) {
-		$dropbox_person->orderSentWork($_SESSION['sentOrder']);
-	}
-	if (isset($_SESSION['receivedOrder'])) {
-		$dropbox_person->orderReceivedWork($_SESSION['receivedOrder']);
-	}
+    if (isset($_SESSION['sentOrder'])) {
+        $dropbox_person->orderSentWork($_SESSION['sentOrder']);
+    }
+    if (isset($_SESSION['receivedOrder'])) {
+        $dropbox_person->orderReceivedWork($_SESSION['receivedOrder']);
+    }
 
-	/*if (!$dropbox_person->isCourseAdmin || ! $dropbox_person->isCourseTutor) {
+    /*if (!$dropbox_person->isCourseAdmin || ! $dropbox_person->isCourseTutor) {
 	    die(get_lang('GeneralError').' (code 408)');
 	}*/
 
-	$tellUser = get_lang('FileDeleted');
+    $tellUser = get_lang('FileDeleted');
 
     if (isset($_GET['deleteReceived'])) {
         if ($_GET['deleteReceived'] == 'all') {
@@ -236,20 +236,20 @@ 
             die(get_lang('GeneralError').' (code 410)');
         }
     } elseif (isset($_GET['showFeedback'])) {
-		$w = new Dropbox_SentWork($id = $_GET['showFeedback']);
+        $w = new Dropbox_SentWork($id = $_GET['showFeedback']);
 
-		if ($w->uploader_id != $_user['user_id']) {
-		    getUserOwningThisMailing($w->uploader_id, $_user['user_id'], '411');
-		}
+        if ($w->uploader_id != $_user['user_id']) {
+            getUserOwningThisMailing($w->uploader_id, $_user['user_id'], '411');
+        }
 
-    	foreach ($w -> recipients as $r) {
-    		if (($fb = $r['feedback'])) {
-    			$fbarray[$r['feedback_date'].$r['name']] = $r['name'].' '.get_lang('SentOn', '').' '.$r['feedback_date'].":\n".$fb;
-    		}
-    	}
+        foreach ($w -> recipients as $r) {
+            if (($fb = $r['feedback'])) {
+                $fbarray[$r['feedback_date'].$r['name']] = $r['name'].' '.get_lang('SentOn', '').' '.$r['feedback_date'].":\n".$fb;
+            }
+        }
 
-    	if ($fbarray) {
-        	krsort($fbarray);
+        if ($fbarray) {
+            krsort($fbarray);
             echo '<textarea class="dropbox_feedbacks">',
                     htmlspecialchars(implode("\n\n", $fbarray), ENT_QUOTES, api_get_system_encoding()), '</textarea>', "\n";
         } else {
@@ -261,13 +261,13 @@ 
     } else { // if ( isset( $_GET['editFeedback'])) {
         $id = $_GET['editFeedback'];
         $found = false;
-		foreach ($dropbox_person->receivedWork as $w) {
-			if ($w->id == $id) {
-			   $found = true;
-			   break;
-			}
-		}
-		if (!$found) die(get_lang('GeneralError').' (code 415)');
+        foreach ($dropbox_person->receivedWork as $w) {
+            if ($w->id == $id) {
+                $found = true;
+                break;
+            }
+        }
+        if (!$found) die(get_lang('GeneralError').' (code 415)');
 
         echo '<form method="post" action="index.php">', "\n",
             '<input type="hidden" name="feedbackid" value="',

Braces +3 added lines, -1 removed lines

@@ -267,7 +267,9 @@
 			   break;
 			}
 		}
-		if (!$found) die(get_lang('GeneralError').' (code 415)');
+		if (!$found) {
+		    die(get_lang('GeneralError').' (code 415)');
+		}
 
         echo '<form method="post" action="index.php">', "\n",
             '<input type="hidden" name="feedbackid" value="',

Spacing +9 added lines, -9 removed lines

@@ -23,10 +23,10 @@ 
      */
 
     // the author or description field is empty
-    if (!isset($_POST['authors']) || !isset( $_POST['description'])) {
+    if (!isset($_POST['authors']) || !isset($_POST['description'])) {
         $error = true;
         $errormsg = get_lang('BadFormData');
-    } elseif (!isset( $_POST['recipients']) || count( $_POST['recipients']) <= 0) {
+    } elseif (!isset($_POST['recipients']) || count($_POST['recipients']) <= 0) {
         $error = true;
         $errormsg = get_lang('NoUserSelected');
     } else {
@@ -48,12 +48,12 @@ 
         }
 
 		// we are doing a mailing but an additional recipient is selected
-        if ($thisIsAMailing && ( count($_POST['recipients']) != 1)) {
+        if ($thisIsAMailing && (count($_POST['recipients']) != 1)) {
             $error = true;
             $errormsg = get_lang('MailingSelectNoOther');
         }
         // we are doing a just upload but an additional recipient is selected.
-        elseif ( $thisIsJustUpload && ( count($_POST['recipients']) != 1)) {
+        elseif ($thisIsJustUpload && (count($_POST['recipients']) != 1)) {
             $error = true;
             $errormsg = get_lang('MailingJustUploadSelectNoOther');
         } elseif (empty($_FILES['file']['name'])) {
@@ -125,7 +125,7 @@ 
                     }
                 } else {
                     // rename file to login_filename_uniqueId format
-                    $dropbox_filename = getLoginFromId( $_user['user_id']) . '_' . $dropbox_filename . '_'.uniqid('');
+                    $dropbox_filename = getLoginFromId($_user['user_id']).'_'.$dropbox_filename.'_'.uniqid('');
                 }
 
                 if (!is_dir(dropbox_cnf('sysPath'))) {
@@ -147,7 +147,7 @@ 
                         $newWorkRecipients = dropbox_cnf('mailingIdBase');
                     } else {
                         $error = true;
-                        $errormsg = $dropbox_title . ': ' . get_lang('MailingWrongZipfile');
+                        $errormsg = $dropbox_title.': '.get_lang('MailingWrongZipfile');
                     }
                 } elseif ($thisIsJustUpload) {
                     $newWorkRecipients = array();
@@ -171,7 +171,7 @@ 
 				// 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);
 	        	}
@@ -198,7 +198,7 @@ 
  * - EDIT FEEDBACK
  */
 if (isset($_GET['deleteReceived']) || isset($_GET['deleteSent'])
-         || isset( $_GET['showFeedback']) || isset( $_GET['editFeedback'])) {
+         || isset($_GET['showFeedback']) || isset($_GET['editFeedback'])) {
 	if ($_GET['mailing']) {
 		getUserOwningThisMailing($_GET['mailing'], $_user['user_id'], '408');
 		$dropbox_person = new Dropbox_Person($_GET['mailing'], $is_courseAdmin, $is_courseTutor);
@@ -223,7 +223,7 @@ 
         if ($_GET['deleteReceived'] == 'all') {
             $dropbox_person->deleteAllReceivedWork();
         } elseif (is_numeric($_GET['deleteReceived'])) {
-            $dropbox_person->deleteReceivedWork( $_GET['deleteReceived']);
+            $dropbox_person->deleteReceivedWork($_GET['deleteReceived']);
         } else {
             die(get_lang('GeneralError').' (code 409)');
         }

main/dropbox/dropbox_config.inc.php

Spacing +3 added lines, -3 removed lines

@@ -18,8 +18,8 @@ 
  */
 $dropbox_cnf['courseId'] = $_cid;
 //path to dropbox subdir in course containing the uploaded files
-$dropbox_cnf['sysPath'] = api_get_path(SYS_COURSE_PATH) . $_course['path'] . '/dropbox';
-$dropbox_cnf['webPath'] = api_get_path(WEB_COURSE_PATH) . $_course['path'] . '/dropbox';
+$dropbox_cnf['sysPath'] = api_get_path(SYS_COURSE_PATH).$_course['path'].'/dropbox';
+$dropbox_cnf['webPath'] = api_get_path(WEB_COURSE_PATH).$_course['path'].'/dropbox';
 
 //file size limit as imposed by the platform admin (see Chamilo Config Settings on the platform administration section)
 $dropbox_cnf['maxFilesize'] = api_get_setting('dropbox_max_filesize');
@@ -33,7 +33,7 @@ 
  */
 // false = no mailing functionality
 $dropbox_cnf['allowMailing'] = api_string_2_boolean(api_get_setting('dropbox_allow_mailing'));
-$dropbox_cnf['mailingIdBase'] = 10000000;  // bigger than any user_id,
+$dropbox_cnf['mailingIdBase'] = 10000000; // bigger than any user_id,
 // allowing enough space for pseudo_ids as uploader_id, dest_user_id, user_id:
 // mailing pseudo_id = dropbox_cnf('mailingIdBase') + mailing id
 $dropbox_cnf['mailingZipRegexp'] = '/^(.*)(STUDENTID|USERID|LOGINNAME)(.*)\.ZIP$/i';

main/dropbox/dropbox_functions.inc.php

Indentation +4 added lines, -4 removed lines

@@ -83,11 +83,11 @@
     if (strstr($_POST['action'], 'move_')) {
         // check move_received_n or move_sent_n command
         if (strstr($_POST['action'], 'received')) {
-              $part = 'received';
-              $to_cat_id = str_replace('move_received_', '', $_POST['action']);
+                $part = 'received';
+                $to_cat_id = str_replace('move_received_', '', $_POST['action']);
         } else {
-              $part = 'sent';
-              $to_cat_id = str_replace('move_sent_', '', $_POST['action']);
+                $part = 'sent';
+                $to_cat_id = str_replace('move_sent_', '', $_POST['action']);
         }
 
         foreach ($checked_file_ids as $value) {

Spacing +30 added lines, -30 removed lines

@@ -41,7 +41,7 @@ 
 
     // STEP 2: at least one file has to be selected. If not we return an error message
     $ids = isset($_GET['id']) ? $_GET['id'] : array();
-    if (count($ids)>0) {
+    if (count($ids) > 0) {
         $checked_file_ids = $_POST['id'];
     } else {
         foreach ($_POST as $key => $value) {
@@ -133,7 +133,7 @@ 
     }
 
     $cat = get_dropbox_category($id);
-    if (count($cat)==0) {
+    if (count($cat) == 0) {
         return false;
     }
 
@@ -166,7 +166,7 @@ 
             WHERE c_id = $course_id AND cat_id='".intval($id)."'";
     $result = Database::query($sql);
 
-    while($row = Database::fetch_array($result)) {
+    while ($row = Database::fetch_array($result)) {
         $dropboxfile = new Dropbox_Person($user_id, $is_courseAdmin, $is_courseTutor);
         if ($action == 'deletereceivedcategory') {
             $dropboxfile->deleteReceivedWork($row[$id_field]);
@@ -657,7 +657,7 @@ 
 
                 $full_name = $userInfo['complete_name'].$groupNameListToString;
                 $current_user_id = $current_user['user_id'];
-                $options['user_' . $current_user_id] = $full_name;
+                $options['user_'.$current_user_id] = $full_name;
             }
         }
     }
@@ -706,11 +706,11 @@ 
 
     $mailingId = $id - dropbox_cnf('mailingIdBase');
     if ($mailingId > 0) {
-        return get_lang('MailingAsUsername', '') . $mailingId;
+        return get_lang('MailingAsUsername', '').$mailingId;
     }
     $id = intval($id);
     $sql = "SELECT ".(api_is_western_name_order() ? "CONCAT(firstname,' ', lastname)" : "CONCAT(lastname,' ', firstname)")." AS name
-            FROM " . $dropbox_cnf['tbl_user'] . "
+            FROM " . $dropbox_cnf['tbl_user']."
             WHERE user_id='$id'";
     $result = Database::query($sql);
     $res = Database::fetch_array($result);
@@ -730,7 +730,7 @@ 
 {
     $id = intval($id);
     $sql = "SELECT username
-            FROM " . dropbox_cnf('tbl_user') . "
+            FROM " . dropbox_cnf('tbl_user')."
             WHERE user_id='$id'";
     $result = Database::query($sql);
     $res = Database::fetch_array($result);
@@ -762,8 +762,8 @@ 
 
     // select all files that aren't referenced anymore
     $sql = "SELECT DISTINCT f.id, f.filename
-            FROM " . dropbox_cnf('tbl_file') . " f
-            LEFT JOIN " . dropbox_cnf('tbl_person') . " p
+            FROM " . dropbox_cnf('tbl_file')." f
+            LEFT JOIN " . dropbox_cnf('tbl_person')." p
             ON (f.id = p.file_id)
             WHERE p.user_id IS NULL AND
                   f.c_id = $course_id
@@ -771,14 +771,14 @@ 
     $result = Database::query($sql);
     while ($res = Database::fetch_array($result)) {
         //delete the selected files from the post and file tables
-        $sql = "DELETE FROM " . dropbox_cnf('tbl_post') . "
-                WHERE c_id = $course_id AND file_id = '" . $res['id'] . "'";
+        $sql = "DELETE FROM ".dropbox_cnf('tbl_post')."
+                WHERE c_id = $course_id AND file_id = '".$res['id']."'";
         Database::query($sql);
-        $sql = "DELETE FROM " . dropbox_cnf('tbl_file') . "
-                WHERE c_id = $course_id AND id ='" . $res['id'] . "'";
+        $sql = "DELETE FROM ".dropbox_cnf('tbl_file')."
+                WHERE c_id = $course_id AND id ='".$res['id']."'";
         Database::query($sql);
         //delete file from server
-        @unlink( dropbox_cnf('sysPath') . '/' . $res['filename']);
+        @unlink(dropbox_cnf('sysPath').'/'.$res['filename']);
     }
 }
 
@@ -801,11 +801,11 @@ 
 
     $mailingPseudoId = intval($mailingPseudoId);
     $sql = "SELECT f.uploader_id
-            FROM " . $dropbox_cnf['tbl_file'] . " f
-            LEFT JOIN " . $dropbox_cnf['tbl_post'] . " p
+            FROM " . $dropbox_cnf['tbl_file']." f
+            LEFT JOIN " . $dropbox_cnf['tbl_post']." p
             ON (f.id = p.file_id AND f.c_id = $course_id AND p.c_id = $course_id)
             WHERE
-                p.dest_user_id = '" . $mailingPseudoId . "' AND
+                p.dest_user_id = '".$mailingPseudoId."' AND
                 p.c_id = $course_id
             ";
     $result = Database::query($sql);
@@ -832,20 +832,20 @@ 
     //    for all content files, replace mailingPseudoId by owner as uploader
     $file_id = intval($file_id);
     $sql = "SELECT p.dest_user_id
-            FROM " . $dropbox_cnf['tbl_post'] . " p
-            WHERE c_id = $course_id AND p.file_id = '" . $file_id . "'";
+            FROM " . $dropbox_cnf['tbl_post']." p
+            WHERE c_id = $course_id AND p.file_id = '".$file_id."'";
     $result = Database::query($sql);
 
     if ($res = Database::fetch_array($result)) {
         $mailingPseudoId = $res['dest_user_id'];
         if ($mailingPseudoId > dropbox_cnf('mailingIdBase')) {
-            $sql = "DELETE FROM " . dropbox_cnf('tbl_person') . "
-                    WHERE c_id = $course_id AND user_id='" . $mailingPseudoId . "'";
+            $sql = "DELETE FROM ".dropbox_cnf('tbl_person')."
+                    WHERE c_id = $course_id AND user_id='".$mailingPseudoId."'";
             Database::query($sql);
 
-            $sql = "UPDATE " . dropbox_cnf('tbl_file') ."
-                    SET uploader_id='" . api_get_user_id() . "'
-                    WHERE c_id = $course_id AND uploader_id='" . $mailingPseudoId . "'";
+            $sql = "UPDATE ".dropbox_cnf('tbl_file')."
+                    SET uploader_id='" . api_get_user_id()."'
+                    WHERE c_id = $course_id AND uploader_id='".$mailingPseudoId."'";
             Database::query($sql);
         }
     }
@@ -984,7 +984,7 @@ 
             }
         }
     } else {  // rename file to login_filename_uniqueId format
-        $dropbox_filename = getLoginFromId($_user['user_id']) . "_" . $dropbox_filename . "_".uniqid('');
+        $dropbox_filename = getLoginFromId($_user['user_id'])."_".$dropbox_filename."_".uniqid('');
     }
 
     // creating the array that contains all the users who will receive the file
@@ -1002,7 +1002,7 @@ 
         }
     }
 
-    @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath') . '/' . $dropbox_filename);
+    @move_uploaded_file($dropbox_filetmpname, dropbox_cnf('sysPath').'/'.$dropbox_filename);
 
     $b_send_mail = api_get_course_setting('email_alert_on_new_doc_dropbox');
 
@@ -1023,14 +1023,14 @@ 
                 ),
                 $recipent_temp['email'],
                 get_lang('NewDropboxFileUploaded'),
-                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?' . api_get_cidreq() . '">'.get_lang('SeeFile').'</a>'.
+                get_lang('NewDropboxFileUploadedContent').' <a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?'.api_get_cidreq().'">'.get_lang('SeeFile').'</a>'.
                 "\n\n".
                 api_get_person_name(
                     $_user['firstName'],
                     $_user['lastName'],
                     null,
                     PERSON_NAME_EMAIL_ADDRESS
-                )."\n".  get_lang('Email') ." : ".$_user['mail'],
+                )."\n".get_lang('Email')." : ".$_user['mail'],
                 api_get_person_name(
                     $_user['firstName'],
                     $_user['lastName'],
@@ -1308,7 +1308,7 @@ 
         // Adding the content.
         $return .= "\n<tr>";
         foreach ($column as $column_key => $column_value) {
-            if (!in_array($column_value,$dont_show_columns)) {
+            if (!in_array($column_value, $dont_show_columns)) {
                 $return .= "\n\t<td>";
                 if (in_array($column_value, $make_link)) {
                     $return .= '<a href="'.$value[$column_value].'">'.$value[$column_value].'</a>';
@@ -1341,7 +1341,7 @@ 
             WHERE c_id = $course_id GROUP BY file_id";
     $result = Database::query($sql);
     $return = array();
-    while ($row=Database::fetch_array($result)) {
+    while ($row = Database::fetch_array($result)) {
         $return[$row['file_id']] = $row['total'];
     }
     return $return;

Braces +12 added lines, -5 removed lines

@@ -734,7 +734,9 @@ 
             WHERE user_id='$id'";
     $result = Database::query($sql);
     $res = Database::fetch_array($result);
-    if (!$res) return false;
+    if (!$res) {
+        return false;
+    }
 
     return stripslashes($res['username']);
 }
@@ -810,10 +812,15 @@ 
             ";
     $result = Database::query($sql);
 
-    if (!($res = Database::fetch_array($result)))
-        die(get_lang('GeneralError').' (code 901)');
-    if ($owner == 0) return $res['uploader_id'];
-    if ($res['uploader_id'] == $owner) return true;
+    if (!($res = Database::fetch_array($result))) {
+            die(get_lang('GeneralError').' (code 901)');
+    }
+    if ($owner == 0) {
+        return $res['uploader_id'];
+    }
+    if ($res['uploader_id'] == $owner) {
+        return true;
+    }
     die(get_lang('GeneralError').' (code '.$or_die.')');
 }
 

main/course_progress/thematic_controller.php

Spacing +6 added lines, -6 removed lines

@@ -201,20 +201,20 @@ 
                         $plan_html = null;
                         if (!empty($data)) {
                             foreach ($data as $plan) {
-                                $plan_html .= '<strong>' . $plan['title'] . '</strong><br /> ' . $plan['description'] . '<br />';
+                                $plan_html .= '<strong>'.$plan['title'].'</strong><br /> '.$plan['description'].'<br />';
                             }
                         }
                         $data = $thematic->get_thematic_advance_by_thematic_id($theme['id']);
                         $advance_html = null;
                         if (!empty($data)) {
                             foreach ($data as $advance) {
-                                $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG) . ' ('.$advance['duration'].' '.get_lang('HourShort').')<br />'.$advance['content'].'<br />';
+                                $advance_html .= api_convert_and_format_date($advance['start_date'], DATE_FORMAT_LONG).' ('.$advance['duration'].' '.get_lang('HourShort').')<br />'.$advance['content'].'<br />';
                             }
                         }
                         $table[] = array($theme['title'], $plan_html, $advance_html);
                     }
                     $params = array(
-                        'filename' => get_lang('Thematic') . '-' . api_get_local_time(),
+                        'filename' => get_lang('Thematic').'-'.api_get_local_time(),
                         'pdf_title' => get_lang('Thematic'),
                         'add_signatures' => true,
                         'format' => 'A4-L',
@@ -311,9 +311,9 @@ 
                             unset($_SESSION['thematic_plan_token']);
                             $data['message'] = 'ok';
 
-                            $saveRedirect = api_get_path(WEB_PATH) . 'main/course_progress/index.php?';
-                            $saveRedirect.= api_get_cidreq() . '&';
-                            $saveRedirect.= 'thematic_plan_save_message=ok';
+                            $saveRedirect = api_get_path(WEB_PATH).'main/course_progress/index.php?';
+                            $saveRedirect .= api_get_cidreq().'&';
+                            $saveRedirect .= 'thematic_plan_save_message=ok';
 
                             header("Location: $saveRedirect");
                             exit;

main/course_progress/thematic.php

Spacing +34 added lines, -34 removed lines

@@ -23,25 +23,25 @@ 
         case 'thematic_add' :
         case 'thematic_import_select' :
             echo '<a href="index.php?'.api_get_cidreq().'">'.
-                Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ThematicDetails'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ThematicDetails'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         case 'thematic_list' :
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         case 'thematic_details' :
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_import_select'.$url_token.'">'.
-                Display::return_icon('import_csv.png',get_lang('ImportThematic'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('import_csv.png', get_lang('ImportThematic'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export'.$url_token.'">'.
-                Display::return_icon('export_csv.png',get_lang('ExportThematic'),'', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('export_csv.png', get_lang('ExportThematic'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_export_pdf'.$url_token.'">'.
-                Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
             break;
         default :
             echo '<a href="index.php?'.api_get_cidreq().'&action=thematic_add'.$url_token.'">'.
-                Display::return_icon('new_course_progress.png',get_lang('NewThematicSection'),'',ICON_SIZE_MEDIUM).'</a>';
+                Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     echo '</div>';
 }
@@ -57,10 +57,10 @@ 
     $parameters['action'] = $action;
     $table->set_additional_parameters($parameters);
     $table->set_header(0, '', false, array('style'=>'width:20px;'));
-    $table->set_header(1, get_lang('Title'), false );
+    $table->set_header(1, get_lang('Title'), false);
     if (api_is_allowed_to_edit(null, true)) {
-        $table->set_header(2, get_lang('Actions'), false,array('style'=>'text-align:center;width:40%;'));
-        $table->set_form_actions(array ('thematic_delete_select' => get_lang('DeleteAllThematics')));
+        $table->set_header(2, get_lang('Actions'), false, array('style'=>'text-align:center;width:40%;'));
+        $table->set_form_actions(array('thematic_delete_select' => get_lang('DeleteAllThematics')));
     }
     $table->display();
 
@@ -72,11 +72,11 @@ 
 
     if (isset($last_id) && $last_id) {
         $link_to_thematic_plan = '<a href="index.php?'.api_get_cidreq().'&action=thematic_plan_list&thematic_id='.$last_id.'">'.
-            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'</a>';
+            Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle;float:none;'), ICON_SIZE_SMALL).'</a>';
         $link_to_thematic_advance = '<a href="index.php?'.api_get_cidreq().'&action=thematic_advance_list&thematic_id='.$last_id.'">'.
-            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle;float:none;'),ICON_SIZE_SMALL).'</a>';
+            Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle;float:none;'), ICON_SIZE_SMALL).'</a>';
         Display::display_confirmation_message(
-            get_lang('ThematicSectionHasBeenCreatedSuccessfull').'<br />'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'),$link_to_thematic_plan, $link_to_thematic_advance),
+            get_lang('ThematicSectionHasBeenCreatedSuccessfull').'<br />'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'), $link_to_thematic_plan, $link_to_thematic_advance),
             false
         );
     }
@@ -113,27 +113,27 @@ 
             $actions_first_col = '';
             if (api_is_allowed_to_edit(null, true)) {
                 // Thematic title
-                $actions_first_col  = Display::url(
+                $actions_first_col = Display::url(
                     Display::return_icon('cd.gif', get_lang('Copy')),
                     'index.php?'.api_get_cidreq().'&action=thematic_copy&thematic_id='.$my_thematic_id.$params.$url_token
                 );
-                if (api_get_session_id() == 0 ) {
+                if (api_get_session_id() == 0) {
 
                     if ($thematic['display_order'] > 1) {
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).'</a>';
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=moveup&'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('up.png', get_lang('Up'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions_first_col .= ' '.Display::return_icon('up_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions_first_col .= ' '.Display::return_icon('up_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
                     if (isset($thematic['max_thematic_item']) && $thematic['display_order'] < $thematic['max_thematic_item']) {
-                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).'</a>';
+                        $actions_first_col .= ' <a href="'.api_get_self().'?action=movedown&a'.api_get_cidreq().'&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('down.png', get_lang('Down'), '', ICON_SIZE_SMALL).'</a>';
                     } else {
-                        $actions_first_col .= ' '.Display::return_icon('down_na.png','&nbsp;','',ICON_SIZE_SMALL);
+                        $actions_first_col .= ' '.Display::return_icon('down_na.png', '&nbsp;', '', ICON_SIZE_SMALL);
                     }
 
                 }
                 if (api_get_session_id() == $thematic['session_id']) {
-                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>';
-                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
+                    $actions_first_col .= '<a href="index.php?'.api_get_cidreq().'&action=thematic_edit&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+                    $actions_first_col .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_delete&thematic_id='.$my_thematic_id.$params.$url_token.'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
                 }
 
                 $actions_first_col = Display::div($actions_first_col, array('id'=>'thematic_id_content_'.$thematic['id'], 'class'=>'thematic_tools'));
@@ -149,7 +149,7 @@ 
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
             if (api_is_allowed_to_edit(null, true)) {
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'&width=700&height=500">'.
-                    Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style'=>'vertical-align:middle'),ICON_SIZE_MEDIUM).'</a></div><br />';
+                    Display::return_icon('edit.png', get_lang('EditThematicPlan'), array('style'=>'vertical-align:middle'), ICON_SIZE_MEDIUM).'</a></div><br />';
             }
 
             if (empty($thematic_plan_div[$thematic['id']])) {
@@ -165,7 +165,7 @@ 
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
             if (api_is_allowed_to_edit(null, true)) {
                 echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&action=thematic_advance_add&thematic_id='.$thematic['id'].'">'.
-                    Display::return_icon('add.png',get_lang('NewThematicAdvance'),'',ICON_SIZE_MEDIUM).'</a></div>';
+                    Display::return_icon('add.png', get_lang('NewThematicAdvance'), '', ICON_SIZE_MEDIUM).'</a></div>';
             }
 
             //if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
@@ -187,7 +187,7 @@ 
                                 [],
                                 ICON_SIZE_SMALL
                             ),
-                            'index.php?' . api_get_cidreq() . '&' . http_build_query([
+                            'index.php?'.api_get_cidreq().'&'.http_build_query([
                                 'action' => 'thematic_advance_edit',
                                 'thematic_id' => $thematic['id'],
                                 'thematic_advance_id' => $thematic_advance['id'],
@@ -198,17 +198,17 @@ 
                                 'data-title' => get_lang('EditThematicAdvance')
                             ]
                         );
-                        $edit_link  .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
-                            Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a></center>';
+                        $edit_link .= '<a onclick="javascript:if(!confirm(\''.get_lang('AreYouSureToDelete').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=thematic_advance_delete&thematic_id='.$thematic['id'].'&thematic_advance_id='.$thematic_advance['id'].'">'.
+                            Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a></center>';
 
                         //Links
                         $edit_link = Display::div(
-                            Display::div($edit_link , array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
+                            Display::div($edit_link, array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')),
                             array('style'=>'height:20px;')
                         );
                     }
 
-                    $thematic_advance_item =  isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
+                    $thematic_advance_item = isset($thematic_advance_div[$thematic['id']][$thematic_advance['id']]) ? $thematic_advance_div[$thematic['id']][$thematic_advance['id']] : null;
                     echo Display::div($thematic_advance_item, array('id'=>'thematic_advance_'.$thematic_advance['id']));
                     echo $edit_link;
                     echo '</td>';
@@ -253,7 +253,7 @@ 
 } elseif ($action == 'thematic_add' || $action == 'thematic_edit') {
 
     // Display form
-    $form = new FormValidator('thematic_add','POST','index.php?action=thematic_add&'.api_get_cidreq());
+    $form = new FormValidator('thematic_add', 'POST', 'index.php?action=thematic_add&'.api_get_cidreq());
 
     if ($action == 'thematic_edit') {
         $form->addElement('header', '', get_lang('EditThematicSection'));
@@ -263,7 +263,7 @@ 
     $form->addElement('hidden', 'action', $action);
 
     if (!empty($thematic_id)) {
-        $form->addElement('hidden', 'thematic_id',$thematic_id);
+        $form->addElement('hidden', 'thematic_id', $thematic_id);
     }
 
     $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
@@ -275,8 +275,8 @@ 
     if (!empty($thematic_data)) {
         if (api_get_session_id()) {
             if ($thematic_data['session_id'] != api_get_session_id()) {
-                $show_form  = false;
-                Display::display_error_message(get_lang('NotAllowedClickBack'),false);
+                $show_form = false;
+                Display::display_error_message(get_lang('NotAllowedClickBack'), false);
             }
         }
         // set default values
@@ -287,14 +287,14 @@ 
 
     // error messages
     if (isset($error)) {
-        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+        Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
     }
     if ($show_form) {
         $form->display();
     }
 } elseif ($action == 'thematic_import_select') {
     // Create form to upload csv file.
-    $form = new FormValidator('thematic_import','POST','index.php?action=thematic_import&'.api_get_cidreq().$url_token);
+    $form = new FormValidator('thematic_import', 'POST', 'index.php?action=thematic_import&'.api_get_cidreq().$url_token);
     $form->addElement('header', get_lang('ImportThematic'));
     $form->addElement('file', 'file');
     $form->addElement('checkbox', 'replace', null, get_lang('DeleteAllThematic'));