chamilo / chamilo-lms

main/template/default/auth/courses_list.php

Indentation +8 added lines, -8 removed lines

@@ -28,11 +28,11 @@ 
 
 // COURSES WITH CATEGORIES
 if (!empty($user_course_categories)) {
-       foreach ($user_course_categories as $row) {
-           echo Display::page_subheader($row['title']);
-           echo '<a name="category'.$row['id'].'"></a>';
+        foreach ($user_course_categories as $row) {
+            echo Display::page_subheader($row['title']);
+            echo '<a name="category'.$row['id'].'"></a>';
 
-           if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
+            if (isset($_GET['categoryid']) && $_GET['categoryid'] == $row['id']) { ?>
             <!-- We display the edit form for the category -->
 
             <form name="edit_course_category" method="post" action="courses.php?action=<?php echo $action; ?>">
@@ -243,15 +243,15 @@ 
                     </a>
             <?php } else {
                     echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
-                  }
+                    }
 
-                  if ($key < $number_of_courses - 1) { ?>
+                    if ($key < $number_of_courses - 1) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
                     <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
                     </a>
             <?php } else {
                     echo Display::display_icon('down_na.png', get_lang('Down'),'',22);
-                  }?>
+                    }?>
                 </div>
                  <div style="float:left; margin-right:10px;">
                   <!-- cancel subscrioption-->
@@ -269,7 +269,7 @@ 
                     </div>
               <?php }
                 }
-              ?>
+                ?>
             </td>
             </tr>
             <?php

main/group/group_creation.php

Indentation +135 added lines, -135 removed lines

@@ -52,10 +52,10 @@ 
             exit;
             break;
         case 'create_subgroups':
-			GroupManager::create_subgroups(
-				$_POST['base_group'],
-				$_POST['number_of_groups']
-			);
+            GroupManager::create_subgroups(
+                $_POST['base_group'],
+                $_POST['number_of_groups']
+            );
             Display::addFlash(Display::return_message(get_lang('GroupsAdded')));
             header("Location: ".$currentUrl);
             exit;
@@ -80,10 +80,10 @@ 
 if (isset($_POST['number_of_groups'])) {
     if (!is_numeric($_POST['number_of_groups']) || intval($_POST['number_of_groups']) < 1) {
         Display :: display_error_message(
-			get_lang('PleaseEnterValidNumber').'<br /><br />
+            get_lang('PleaseEnterValidNumber').'<br /><br />
 			<a href="group_creation.php?'.api_get_cidreq().'">&laquo; '.get_lang('Back').'</a>',
-			false
-		);
+            false
+        );
     } else {
         $number_of_groups = intval($_POST['number_of_groups']);
         if ($number_of_groups > 1) {
@@ -121,20 +121,20 @@ 
     }
     </script>
     <?php
-		}
-		$group_categories = GroupManager::get_categories();
-		$group_id = GroupManager :: get_number_of_groups() + 1;
-		$cat_options = [];
-		foreach ($group_categories as $index => $category) {
-			$cat_options[$category['id']] = $category['title'];
-		}
+        }
+        $group_categories = GroupManager::get_categories();
+        $group_id = GroupManager :: get_number_of_groups() + 1;
+        $cat_options = [];
+        foreach ($group_categories as $index => $category) {
+            $cat_options[$category['id']] = $category['title'];
+        }
         $form = new FormValidator('create_groups_step2', 'POST', api_get_self().'?'.api_get_cidreq());
 
-		// Modify the default templates
-		$renderer = $form->defaultRenderer();
-		$form_template = "<form {attributes}>\n<div class='create-groups'>\n<table>\n{content}\n</table>\n</div>\n</form>";
-		$renderer->setFormTemplate($form_template);
-		$element_template = <<<EOT
+        // Modify the default templates
+        $renderer = $form->defaultRenderer();
+        $form_template = "<form {attributes}>\n<div class='create-groups'>\n<table>\n{content}\n</table>\n</div>\n</form>";
+        $renderer->setFormTemplate($form_template);
+        $element_template = <<<EOT
         <tr class="separate">
 		<td>
 			<!-- BEGIN required -->
@@ -147,149 +147,149 @@ 
 	</tr>
 
 EOT;
-		$renderer->setCustomElementTemplate($element_template);
+        $renderer->setCustomElementTemplate($element_template);
         $form->addElement('header', $nameTools);
-		$form->addElement('hidden', 'action');
-		$form->addElement('hidden', 'number_of_groups');
-		$defaults = array();
-		// Table heading
-		$group_el = array();
-		$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
+        $form->addElement('hidden', 'action');
+        $form->addElement('hidden', 'number_of_groups');
+        $defaults = array();
+        // Table heading
+        $group_el = array();
+        $group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupName').'</b>');
 
-		if (api_get_setting('allow_group_categories') == 'true') {
-			$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupCategory').'</b>');
-		}
-		$group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupPlacesThis').'</b>');
-		$form->addGroup($group_el, 'groups', null, "</td><td>", false);
-		// Checkboxes
-		if ($_POST['number_of_groups'] > 1) {
-			$group_el = array ();
-			$group_el[] = $form->createElement('static', null, null, ' ');
-			if (api_get_setting('allow_group_categories') == 'true') {
-				$group_el[] = $form->createElement('checkbox', 'same_category', null, get_lang('SameForAll'), array('onclick' => "javascript: switch_state('category');"));
-			}
-			$group_el[] = $form->createElement('checkbox', 'same_places', null, get_lang('SameForAll'), array ('onclick' => "javascript: switch_state('places');"));
-			$form->addGroup($group_el, 'groups', null, '</td><td>', false);
-		}
-		// Properties for all groups
-		for ($group_number = 0; $group_number < $_POST['number_of_groups']; $group_number ++) {
-			$group_el = array();
-			$group_el[] = $form->createElement('text', 'group_'.$group_number.'_name');
-			if (api_get_setting('allow_group_categories') == 'true') {
-				$group_el[] = $form->createElement('select', 'group_'.$group_number.'_category', null, $cat_options, array('id' => 'category_'.$group_number));
-			}
-			$group_el[] = $form->createElement('text', 'group_'.$group_number.'_places', null, array('class' => 'span1', 'id' => 'places_'.$group_number));
+        if (api_get_setting('allow_group_categories') == 'true') {
+            $group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupCategory').'</b>');
+        }
+        $group_el[] = $form->createElement('static', null, null, '<b>'.get_lang('GroupPlacesThis').'</b>');
+        $form->addGroup($group_el, 'groups', null, "</td><td>", false);
+        // Checkboxes
+        if ($_POST['number_of_groups'] > 1) {
+            $group_el = array ();
+            $group_el[] = $form->createElement('static', null, null, ' ');
+            if (api_get_setting('allow_group_categories') == 'true') {
+                $group_el[] = $form->createElement('checkbox', 'same_category', null, get_lang('SameForAll'), array('onclick' => "javascript: switch_state('category');"));
+            }
+            $group_el[] = $form->createElement('checkbox', 'same_places', null, get_lang('SameForAll'), array ('onclick' => "javascript: switch_state('places');"));
+            $form->addGroup($group_el, 'groups', null, '</td><td>', false);
+        }
+        // Properties for all groups
+        for ($group_number = 0; $group_number < $_POST['number_of_groups']; $group_number ++) {
+            $group_el = array();
+            $group_el[] = $form->createElement('text', 'group_'.$group_number.'_name');
+            if (api_get_setting('allow_group_categories') == 'true') {
+                $group_el[] = $form->createElement('select', 'group_'.$group_number.'_category', null, $cat_options, array('id' => 'category_'.$group_number));
+            }
+            $group_el[] = $form->createElement('text', 'group_'.$group_number.'_places', null, array('class' => 'span1', 'id' => 'places_'.$group_number));
 
-			if ($_POST['number_of_groups'] < 10000) {
-				if ($group_id < 10) {
-					$prev = '000';
-				} elseif ($group_id < 100) {
-					$prev = '00';
-				} elseif ($group_id<1000) {
-					$prev = '0';
-				} else {
-					$prev = '';
-				}
-			}
+            if ($_POST['number_of_groups'] < 10000) {
+                if ($group_id < 10) {
+                    $prev = '000';
+                } elseif ($group_id < 100) {
+                    $prev = '00';
+                } elseif ($group_id<1000) {
+                    $prev = '0';
+                } else {
+                    $prev = '';
+                }
+            }
 
-			$defaults['group_'.$group_number.'_name'] = get_lang('GroupSingle').' '.$prev.$group_id ++;
-			$form->addGroup($group_el, 'group_'.$group_number, null, '</td><td>', false);
-		}
-		$defaults['action'] = 'create_groups';
-		$defaults['number_of_groups'] = intval($_POST['number_of_groups']);
-		$form->setDefaults($defaults);
-		$form->addButtonCreate(get_lang('CreateGroup'), 'submit');
+            $defaults['group_'.$group_number.'_name'] = get_lang('GroupSingle').' '.$prev.$group_id ++;
+            $form->addGroup($group_el, 'group_'.$group_number, null, '</td><td>', false);
+        }
+        $defaults['action'] = 'create_groups';
+        $defaults['number_of_groups'] = intval($_POST['number_of_groups']);
+        $form->setDefaults($defaults);
+        $form->addButtonCreate(get_lang('CreateGroup'), 'submit');
         $form->display();
-	}
+    }
 } else {
-	/*
+    /*
 	 * Show form to generate new groups
 	 */
 
-	$create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq());
-	$create_groups_form->addElement('header', $nameTools);
-	/* $group_el = array ();
+    $create_groups_form = new FormValidator('create_groups', 'post', api_get_self().'?'.api_get_cidreq());
+    $create_groups_form->addElement('header', $nameTools);
+    /* $group_el = array ();
 	$group_el[] = $create_groups_form->createElement('text', 'number_of_groups', array(get_lang('Create'), '1'));
 	$group_el[] = $create_groups_form->addButtonCreate(get_lang('ProceedToCreateGroup'), 'submit', true);
 	$create_groups_form->addGroup($group_el, 'create_groups', get_lang('NumberOfGroupsToCreate'), ' ', false);
 	*/
     $create_groups_form->addText('number_of_groups',get_lang('NumberOfGroupsToCreate'),null,array('value'=>'1'));
     $create_groups_form->addButton('submit', get_lang('ProceedToCreateGroup'),'plus','primary');
-	$defaults = array();
-	$defaults['number_of_groups'] = 1;
-	$create_groups_form->setDefaults($defaults);
-	$create_groups_form->display();
+    $defaults = array();
+    $defaults['number_of_groups'] = 1;
+    $create_groups_form->setDefaults($defaults);
+    $create_groups_form->display();
 
-	/*
+    /*
 	 * Show form to generate subgroups
 	 */
-	if (api_get_setting('allow_group_categories') == 'true' && count(GroupManager :: get_group_list()) > 0) {
-		$base_group_options = array ();
-		$groups = GroupManager :: get_group_list();
-		foreach ($groups as $index => $group) {
-			$number_of_students = GroupManager :: number_of_students($group['id']);
-			if ($number_of_students > 0) {
-				$base_group_options[$group['id']] = $group['name'].' ('.$number_of_students.' '.get_lang('Users').')';
-			}
-		}
-		if (count($base_group_options) > 0) {
-			$create_subgroups_form = new FormValidator('create_subgroups', 'post', api_get_self().'?'.api_get_cidreq());
+    if (api_get_setting('allow_group_categories') == 'true' && count(GroupManager :: get_group_list()) > 0) {
+        $base_group_options = array ();
+        $groups = GroupManager :: get_group_list();
+        foreach ($groups as $index => $group) {
+            $number_of_students = GroupManager :: number_of_students($group['id']);
+            if ($number_of_students > 0) {
+                $base_group_options[$group['id']] = $group['name'].' ('.$number_of_students.' '.get_lang('Users').')';
+            }
+        }
+        if (count($base_group_options) > 0) {
+            $create_subgroups_form = new FormValidator('create_subgroups', 'post', api_get_self().'?'.api_get_cidreq());
             $create_subgroups_form->addElement('header', get_lang('CreateSubgroups'));
             $create_subgroups_form->addElement('html', get_lang('CreateSubgroupsInfo'));
-			$create_subgroups_form->addElement('hidden', 'action');
-			$group_el = array();
-			$group_el[] = $create_subgroups_form->createElement('static', null, null, get_lang('CreateNumberOfGroups'));
-			$group_el[] = $create_subgroups_form->createElement('text', 'number_of_groups', null, array('size' => 3));
-			$group_el[] = $create_subgroups_form->createElement('static', null, null, get_lang('WithUsersFrom'));
-			$group_el[] = $create_subgroups_form->createElement('select', 'base_group', null, $base_group_options);
-			$group_el[] = $create_subgroups_form->createElement('button', 'submit', get_lang('Ok'));
-			$create_subgroups_form->addGroup($group_el, 'create_groups', null, ' ', false);
-			$defaults = array();
-			$defaults['action'] = 'create_subgroups';
-			$create_subgroups_form->setDefaults($defaults);
-			$create_subgroups_form->display();
-		}
-	}
+            $create_subgroups_form->addElement('hidden', 'action');
+            $group_el = array();
+            $group_el[] = $create_subgroups_form->createElement('static', null, null, get_lang('CreateNumberOfGroups'));
+            $group_el[] = $create_subgroups_form->createElement('text', 'number_of_groups', null, array('size' => 3));
+            $group_el[] = $create_subgroups_form->createElement('static', null, null, get_lang('WithUsersFrom'));
+            $group_el[] = $create_subgroups_form->createElement('select', 'base_group', null, $base_group_options);
+            $group_el[] = $create_subgroups_form->createElement('button', 'submit', get_lang('Ok'));
+            $create_subgroups_form->addGroup($group_el, 'create_groups', null, ' ', false);
+            $defaults = array();
+            $defaults['action'] = 'create_subgroups';
+            $create_subgroups_form->setDefaults($defaults);
+            $create_subgroups_form->display();
+        }
+    }
 
-	/*
+    /*
 	 * Show form to generate groups from classes subscribed to the course
 	 */
     $options['where'] = array(" usergroup.course_id = ? " =>  api_get_real_course_id());
     $obj = new UserGroup();
     $classes = $obj->getUserGroupInCourse($options);
-	if (count($classes) > 0) {
-		echo '<b>'.get_lang('GroupsFromClasses').'</b>';
-		echo '<blockquote>';
-		echo '<p>'.get_lang('GroupsFromClassesInfo').'</p>';
-		echo '<ul>';
-		foreach ($classes as $index => $class) {
-			$number_of_users = count($obj->get_users_by_usergroup($class['id']));
-			echo '<li>';
-			echo $class['name'];
-			echo ' ('.$number_of_users.' '.get_lang('Users').')';
-			echo '</li>';
-		}
-		echo '</ul>';
+    if (count($classes) > 0) {
+        echo '<b>'.get_lang('GroupsFromClasses').'</b>';
+        echo '<blockquote>';
+        echo '<p>'.get_lang('GroupsFromClassesInfo').'</p>';
+        echo '<ul>';
+        foreach ($classes as $index => $class) {
+            $number_of_users = count($obj->get_users_by_usergroup($class['id']));
+            echo '<li>';
+            echo $class['name'];
+            echo ' ('.$number_of_users.' '.get_lang('Users').')';
+            echo '</li>';
+        }
+        echo '</ul>';
 
-		$create_class_groups_form = new FormValidator('create_class_groups_form', 'post', api_get_self().'?'.api_get_cidreq());
-		$create_class_groups_form->addElement('hidden', 'action');
-		if (api_get_setting('allow_group_categories') == 'true') {
-			$group_categories = GroupManager :: get_categories();
-			$cat_options = array();
-			foreach ($group_categories as $index => $category) {
-				$cat_options[$category['id']] = $category['title'];
-			}
-			$create_class_groups_form->addElement('select', 'group_category', null, $cat_options);
-		} else {
-			$create_class_groups_form->addElement('hidden', 'group_category');
-		}
-		$create_class_groups_form->addElement('submit', 'submit', get_lang('Ok'));
-		$defaults['group_category'] = GroupManager::DEFAULT_GROUP_CATEGORY;
-		$defaults['action'] = 'create_class_groups';
-		$create_class_groups_form->setDefaults($defaults);
-		$create_class_groups_form->display();
-		echo '</blockquote>';
-	}
+        $create_class_groups_form = new FormValidator('create_class_groups_form', 'post', api_get_self().'?'.api_get_cidreq());
+        $create_class_groups_form->addElement('hidden', 'action');
+        if (api_get_setting('allow_group_categories') == 'true') {
+            $group_categories = GroupManager :: get_categories();
+            $cat_options = array();
+            foreach ($group_categories as $index => $category) {
+                $cat_options[$category['id']] = $category['title'];
+            }
+            $create_class_groups_form->addElement('select', 'group_category', null, $cat_options);
+        } else {
+            $create_class_groups_form->addElement('hidden', 'group_category');
+        }
+        $create_class_groups_form->addElement('submit', 'submit', get_lang('Ok'));
+        $defaults['group_category'] = GroupManager::DEFAULT_GROUP_CATEGORY;
+        $defaults['action'] = 'create_class_groups';
+        $create_class_groups_form->setDefaults($defaults);
+        $create_class_groups_form->display();
+        echo '</blockquote>';
+    }
 }
 
 Display :: display_footer();

main/group/group_overview.php

Indentation +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                     break;
             }
             break;
-	}
+    }
 }
 
 /*	Header */

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

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;"');

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();

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

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="',

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) {