chamilo / chamilo-lms

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

Spacing +11 added lines, -11 removed lines

@@ -6,7 +6,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);
@@ -19,7 +19,7 @@ 
         case 'create_groups':
             $groups = array();
 
-            for ($i = 0; $i < $_POST['number_of_groups']; $i ++) {
+            for ($i = 0; $i < $_POST['number_of_groups']; $i++) {
                 $group1['name'] = empty($_POST['group_'.$i.'_name']) ? get_lang('Group').' '.$i : $_POST['group_'.$i.'_name'];
                 $group1['category'] = isset($_POST['group_'.$i.'_category']) ? $_POST['group_'.$i.'_category'] : null;
                 $group1['tutor'] = isset($_POST['group_'.$i.'_tutor']) ? $_POST['group_'.$i.'_tutor'] : null;
@@ -70,7 +70,7 @@ 
 }
 
 $nameTools = get_lang('GroupCreation');
-$interbreadcrumb[] = array ('url' => 'group.php', 'name' => get_lang('Groups'));
+$interbreadcrumb[] = array('url' => 'group.php', 'name' => get_lang('Groups'));
 Display :: display_header($nameTools, 'Group');
 
 if (!api_is_allowed_to_edit(false, true)) {
@@ -163,16 +163,16 @@ 
 		$form->addGroup($group_el, 'groups', null, "</td><td>", false);
 		// Checkboxes
 		if ($_POST['number_of_groups'] > 1) {
-			$group_el = array ();
+			$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');"));
+			$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 ++) {
+		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') {
@@ -185,14 +185,14 @@ 
 					$prev = '000';
 				} elseif ($group_id < 100) {
 					$prev = '00';
-				} elseif ($group_id<1000) {
+				} elseif ($group_id < 1000) {
 					$prev = '0';
 				} else {
 					$prev = '';
 				}
 			}
 
-			$defaults['group_'.$group_number.'_name'] = get_lang('GroupSingle').' '.$prev.$group_id ++;
+			$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';
@@ -213,8 +213,8 @@ 
 	$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');
+    $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);
@@ -224,7 +224,7 @@ 
 	 * Show form to generate subgroups
 	 */
 	if (api_get_setting('allow_group_categories') == 'true' && count(GroupManager :: get_group_list()) > 0) {
-		$base_group_options = array ();
+		$base_group_options = array();
 		$groups = GroupManager :: get_group_list();
 		foreach ($groups as $index => $group) {
 			$number_of_students = GroupManager :: number_of_students($group['id']);

main/group/group_overview.php

Indentation +1 added lines, -1 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -15,7 +15,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);
@@ -85,29 +85,29 @@ 
         Display::return_icon('add.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
 
     if (api_get_setting('allow_group_categories') == 'true') {
-        $actions.= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
+        $actions .= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
             Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).'</a>';
     } else {
-        $actions.= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
+        $actions .= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
             Display::return_icon('settings.png', get_lang('PropModify'), '', ICON_SIZE_MEDIUM).'</a>';
     }
-    $actions.= '<a href="import.php?'.api_get_cidreq().'&action=import">'.
+    $actions .= '<a href="import.php?'.api_get_cidreq().'&action=import">'.
         Display::return_icon('import_csv.png', get_lang('Import'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_all&type=csv">'.
+    $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_all&type=csv">'.
         Display::return_icon('export_csv.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.
+    $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.
     Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_pdf">'.
+    $actions .= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_pdf">'.
         Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    $actions.= '<a href="group.php?'.api_get_cidreq().'">'.
-        Display::return_icon('group.png', get_lang('Groups'),'',ICON_SIZE_MEDIUM).'</a>';
+    $actions .= '<a href="group.php?'.api_get_cidreq().'">'.
+        Display::return_icon('group.png', get_lang('Groups'), '', ICON_SIZE_MEDIUM).'</a>';
 
 
-    $actions.= '<a href="../user/user.php?'.api_get_cidreq().'">'.
+    $actions .= '<a href="../user/user.php?'.api_get_cidreq().'">'.
     Display::return_icon('user.png', get_lang('GoTo').' '.get_lang('Users'), '', ICON_SIZE_MEDIUM).'</a>';
 
 // Action links

main/group/group.php

Spacing +10 added lines, -10 removed lines

@@ -20,7 +20,7 @@ 
 $userId = api_get_user_id();
 
 $this_section = SECTION_COURSES;
-$current_course_tool  = TOOL_GROUP;
+$current_course_tool = TOOL_GROUP;
 
 // Notice for unauthorized people.
 api_protect_course_script(true);
@@ -42,7 +42,7 @@ 
  * Self-registration and un-registration
  */
 $my_group_id = isset($_GET['group_id']) ? intval($_GET['group_id']) : null;
-$my_msg	= isset($_GET['msg']) ? Security::remove_XSS($_GET['msg']) : null;
+$my_msg = isset($_GET['msg']) ? Security::remove_XSS($_GET['msg']) : null;
 $my_group = isset($_REQUEST['group']) ? Security::remove_XSS($_REQUEST['group']) : null;
 $my_get_id1 = isset($_GET['id1']) ? Security::remove_XSS($_GET['id1']) : null;
 $my_get_id2 = isset($_GET['id2']) ? Security::remove_XSS($_GET['id2']) : null;
@@ -169,7 +169,7 @@ 
         Display::return_icon('add-groups.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
 
     if (api_get_setting('allow_group_categories') == 'true') {
-        $actionsLeft .=  '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
+        $actionsLeft .= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
             Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).'</a>';
     } else {
         $actionsLeft .= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
@@ -194,7 +194,7 @@ 
 
 
 $actionsRight = GroupManager::getSearchForm();
-$toolbar = Display::toolbarAction('toolbar-groups', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+$toolbar = Display::toolbarAction('toolbar-groups', $content = array(0 => $actionsLeft, 1 => $actionsRight));
 $group_cats = GroupManager::get_categories(api_get_course_id());
 
 echo $toolbar;
@@ -225,7 +225,7 @@ 
         $actions = null;
         if (api_is_allowed_to_edit(false, true) && !empty($categoryId)) {
             $actions .= '<a href="group_category.php?'.api_get_cidreq().'&id='.$categoryId.'" title="'.get_lang('Edit').'">'.
-                Display::return_icon('edit.png', get_lang('EditGroup'),'',ICON_SIZE_SMALL).'</a>';
+                Display::return_icon('edit.png', get_lang('EditGroup'), '', ICON_SIZE_SMALL).'</a>';
             $actions .=
                 Display::url(
                     Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL),
@@ -235,17 +235,17 @@ 
                     )
                 );
             if ($index != 0) {
-                $actions .=  ' <a href="group.php?'.api_get_cidreq().'&action=swap_cat_order&id1='.$categoryId.'&id2='.$group_cats[$index -1]['id'].'">'.
-                    Display::return_icon('up.png','&nbsp;','',ICON_SIZE_SMALL).'</a>';
+                $actions .= ' <a href="group.php?'.api_get_cidreq().'&action=swap_cat_order&id1='.$categoryId.'&id2='.$group_cats[$index - 1]['id'].'">'.
+                    Display::return_icon('up.png', '&nbsp;', '', ICON_SIZE_SMALL).'</a>';
             }
             if ($index != count($group_cats) - 1) {
-                $actions .= ' <a href="group.php?'.api_get_cidreq().'&action=swap_cat_order&id1='.$categoryId.'&id2='.$group_cats[$index +1]['id'].'">'.
-                    Display::return_icon('down.png','&nbsp;','',ICON_SIZE_SMALL).'</a>';
+                $actions .= ' <a href="group.php?'.api_get_cidreq().'&action=swap_cat_order&id1='.$categoryId.'&id2='.$group_cats[$index + 1]['id'].'">'.
+                    Display::return_icon('down.png', '&nbsp;', '', ICON_SIZE_SMALL).'</a>';
             }
         }
 
         echo Display::page_header(
-            Security::remove_XSS($category['title'].' '. $label.' ').$actions,
+            Security::remove_XSS($category['title'].' '.$label.' ').$actions,
             null,
             'h4',
             false

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/tutor_settings.php

Spacing +3 added lines, -3 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);
@@ -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);
 

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;