chamilo / chamilo-lms

main/group/settings.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 /**
  *	This script displays an area where teachers can edit the group properties and member list.
-  *
+ *
  *	@author various contributors
  *	@author Roan Embrechts (VUB), partial code cleanup, initial virtual course support
  *	@package chamilo.group

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,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);

main/group/group_edit.php

Indentation +2 added lines, -2 removed lines

@@ -161,9 +161,9 @@
 // possible : number_groups_left > 0 and is group member
 $possible_users = array();
 foreach ($complete_user_list as $index => $user) {
-     if ($user['number_groups_left'] > 0 || in_array($user['user_id'], $selected_users)) {
+        if ($user['number_groups_left'] > 0 || in_array($user['user_id'], $selected_users)) {
         $possible_users[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
-     }
+        }
 }
 
 $group_members_element = $form->addElement('advmultiselect', 'group_members', get_lang('GroupMembers'), $possible_users, 'style="width: 280px;"');

Spacing +13 added lines, -13 removed lines

@@ -13,7 +13,7 @@ 
 
 require '../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);
@@ -22,8 +22,8 @@ 
 $current_group = GroupManager :: get_group_properties($group_id);
 
 $nameTools = get_lang('EditGroup');
-$interbreadcrumb[] = array ('url' => 'group.php?'.api_get_cidreq(), 'name' => get_lang('Groups'));
-$interbreadcrumb[] = array ('url' => 'group_space.php?'.api_get_cidreq(), 'name' => $current_group['name']);
+$interbreadcrumb[] = array('url' => 'group.php?'.api_get_cidreq(), 'name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' => 'group_space.php?'.api_get_cidreq(), 'name' => $current_group['name']);
 
 $is_group_member = GroupManager :: is_tutor_of_group(api_get_user_id(), $group_id);
 
@@ -104,7 +104,7 @@ 
         return true;
     }
     if (isset($value['max_member']) && isset($value['group_members']) && $value['max_member'] < count($value['group_members'])) {
-        return array ('group_members' => get_lang('GroupTooMuchMembers'));
+        return array('group_members' => get_lang('GroupTooMuchMembers'));
     }
     return true;
 }
@@ -130,7 +130,7 @@ 
 $form->addText('name', get_lang('GroupName'));
 
 // Description
-$form->addElement('textarea', 'description', get_lang('Description'), array ('rows' => 6));
+$form->addElement('textarea', 'description', get_lang('Description'), array('rows' => 6));
 
 $complete_user_list = GroupManager :: fill_groups_list($current_group['id']);
 usort($complete_user_list, 'sort_users');
@@ -153,7 +153,7 @@ 
 // Group members
 $group_member_list = GroupManager :: get_subscribed_users($current_group['id']);
 
-$selected_users = array ();
+$selected_users = array();
 foreach ($group_member_list as $index => $user) {
     $selected_users[] = $user['user_id'];
 }
@@ -183,42 +183,42 @@ 
     $form->createElement('checkbox', 'self_registration_allowed', get_lang('GroupSelfRegistration'), get_lang('GroupAllowStudentRegistration'), 1),
     $form->createElement('checkbox', 'self_unregistration_allowed', null, get_lang('GroupAllowStudentUnregistration'), 1)
 );
-$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupSelfRegistration'), '', false);
+$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupSelfRegistration'), '', false);
 
 // Documents settings
 $group = array();
 $group[] = $form->createElement('radio', 'doc_state', get_lang('GroupDocument'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'doc_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'doc_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupDocument'), '', false);
+$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupDocument'), '', false);
 
 // Work settings
 $group = array();
 $group[] = $form->createElement('radio', 'work_state', get_lang('GroupWork'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'work_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'work_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'), '', false);
+$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'), '', false);
 
 // Calendar settings
 $group = array();
 $group[] = $form->createElement('radio', 'calendar_state', get_lang('GroupCalendar'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupCalendar'), '', false);
+$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupCalendar'), '', false);
 
 // Announcements settings
 $group = array();
 $group[] = $form->createElement('radio', 'announcements_state', get_lang('GroupAnnouncements'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupAnnouncements'), '', false);
+$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupAnnouncements'), '', false);
 
 //Forum settings
 $group = array();
 $group[] = $form->createElement('radio', 'forum_state', get_lang('GroupForum'), get_lang('NotAvailable'), GroupManager::TOOL_NOT_AVAILABLE);
 $group[] = $form->createElement('radio', 'forum_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC);
 $group[] = $form->createElement('radio', 'forum_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE);
-$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupForum'), '', false);
+$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupForum'), '', false);
 
 // Wiki settings
 $group = array(
@@ -226,7 +226,7 @@ 
     $form->createElement('radio', 'wiki_state', null, get_lang('Public'), GroupManager::TOOL_PUBLIC),
     $form->createElement('radio', 'wiki_state', null, get_lang('Private'), GroupManager::TOOL_PRIVATE)
 );
-$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWiki'), '', false);
+$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki'), array(), ICON_SIZE_SMALL).' '.get_lang('GroupWiki'), '', false);
 
 // Chat settings
 $group = array(

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 +6 added lines, -6 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 {
@@ -286,7 +286,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_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.')');
 }
 

Doc Comments +8 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
 
 /**
 * This function is a wrapper function for the multiple actions feature.
-* @return   Mixed   If there is a problem, return a string message, otherwise nothing
+* @return   string|null   If there is a problem, return a string message, otherwise nothing
 * @author   Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @version  march 2006
 */
@@ -209,9 +209,9 @@ 
 *
 * @param $id the id of the file we are moving
 * @param $target the id of the folder we are moving to
-* @param $part are we moving a received file or a sent file?
+* @param string $part are we moving a received file or a sent file?
 *
-* @return language string
+* @return string string
 *
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @version march 2006
@@ -290,7 +290,7 @@ 
 * @param $id the unique id of the file
 * @param $part are we dealing with a sent or with a received file?
 *
-* @return html code
+* @return string code
 *
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @version march 2006
@@ -786,6 +786,7 @@ 
 }
 
 /**
+* @param string $user_id
 * @return boolean indicating if user with user_id=$user_id is a course member
 * @todo check if this function is still necessary. There might be a library function for this.
 */
@@ -1147,7 +1148,7 @@ 
 /**
 * This function returns the html code to display the feedback messages on a given dropbox file
 * @param $feedback_array an array that contains all the feedback messages about the given document.
-* @return html code
+* @return string code
 * @todo add the form for adding new comment (if the other party has not deleted it yet).
 *
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
@@ -1164,7 +1165,7 @@ 
 
 /**
 * this function returns the code for the form for adding a new feedback message to a dropbox file.
-* @return html code
+* @return string code
 *
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @version march 2006
@@ -1225,7 +1226,7 @@ 
 }
 
 /**
-* @return a language string (depending on the success or failure.
+* @return string language string (depending on the success or failure.
 *
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 * @version march 2006

main/course_progress/thematic_controller.php

Indentation +1 added lines, -1 removed lines

@@ -390,7 +390,7 @@
      *
      */
     public function thematic_advance($action)
-     {
+        {
         $thematic = new Thematic();
         $attendance = new Attendance();
         $data = array();

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;