chamilo / chamilo-lms

main/upload/upload.document.php

Braces +9 added lines, -4 removed lines

@@ -65,12 +65,17 @@
     	$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
     	$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
 
-    	if ($new_path && ($new_comment || $new_title))
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
+    	if ($new_path && ($new_comment || $new_title)) {
+    	    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
         	$table_document = Database::get_course_table(TABLE_DOCUMENT);
+    	}
         	$ct = '';
-        	if ($new_comment) $ct .= ", comment='$new_comment'";
-        	if ($new_title)   $ct .= ", title='$new_title'";
+        	if ($new_comment) {
+        	    $ct .= ", comment='$new_comment'";
+        	}
+        	if ($new_title) {
+        	    $ct .= ", title='$new_title'";
+        	}
         	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
     	}
         //check for missing images in html files

Indentation +24 added lines, -24 removed lines

@@ -48,9 +48,9 @@ 
  */
 //user has submitted a file
 if (isset($_FILES['user_upload'])) {
-	$upload_ok = process_uploaded_file($_FILES['user_upload']);
-	if ($upload_ok) {
-		//file got on the server without problems, now process it
+    $upload_ok = process_uploaded_file($_FILES['user_upload']);
+    if ($upload_ok) {
+        //file got on the server without problems, now process it
         $new_path = handle_uploaded_document(
             $_course,
             $_FILES['user_upload'],
@@ -62,17 +62,17 @@ 
             $_POST['unzip'],
             $_POST['if_exists']
         );
-    	$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
-    	$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
+        $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
+        $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
 
-    	if ($new_path && ($new_comment || $new_title))
-    	if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
-        	$table_document = Database::get_course_table(TABLE_DOCUMENT);
-        	$ct = '';
-        	if ($new_comment) $ct .= ", comment='$new_comment'";
-        	if ($new_title)   $ct .= ", title='$new_title'";
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
-    	}
+        if ($new_path && ($new_comment || $new_title))
+        if (($docid = DocumentManager::get_document_id($_course, $new_path))) {
+            $table_document = Database::get_course_table(TABLE_DOCUMENT);
+            $ct = '';
+            if ($new_comment) $ct .= ", comment='$new_comment'";
+            if ($new_title)   $ct .= ", title='$new_title'";
+            Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
+        }
         //check for missing images in html files
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
         if ($missing_files)  {
@@ -128,8 +128,8 @@ 
 }
 //they want to create a directory
 if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
-	$added_slash = ($path=='/')?'':'/';
-	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
+    $added_slash = ($path=='/')?'':'/';
+    $dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
     $created_dir = create_unexisting_directory(
         $_course,
         $_user['user_id'],
@@ -149,15 +149,15 @@ 
 }
 
 if (isset($_GET['createdir'])) {
-	//create the form that asks for the directory name
-	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
-	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
-	$new_folder_text .= get_lang('NewDir') .' ';
-	$new_folder_text .= '<input type="text" name="dirname"/>';
-	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
-	$new_folder_text .= '</form>';
-	//show the form
-	Display::display_normal_message($new_folder_text);
+    //create the form that asks for the directory name
+    $new_folder_text = '<form action="'.api_get_self().'" method="POST">';
+    $new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
+    $new_folder_text .= get_lang('NewDir') .' ';
+    $new_folder_text .= '<input type="text" name="dirname"/>';
+    $new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
+    $new_folder_text .= '</form>';
+    //show the form
+    Display::display_normal_message($new_folder_text);
 } else {	//give them a link to create a directory
 ?>
 	<p>

Spacing +23 added lines, -23 removed lines

@@ -9,9 +9,9 @@ 
  * @author Yannick Warnier <ywarnier@beeznest.org>
  */
 
-$courseDir = $_course['path'] . "/document";
+$courseDir = $_course['path']."/document";
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
-$base_work_dir = $sys_course_path . $courseDir;
+$base_work_dir = $sys_course_path.$courseDir;
 $noPHP_SELF = true;
 $max_filled_space = DocumentManager::get_course_quota();
 
@@ -34,14 +34,14 @@ 
 
 $nameTools = get_lang('UplUploadDocument');
 $interbreadcrumb[] = array(
-    "url" => "./document.php?curdirpath=" . urlencode(
+    "url" => "./document.php?curdirpath=".urlencode(
             $path
-        ) . $req_gid,
+        ).$req_gid,
     "name" => $langDocuments
 );
 Display::display_header($nameTools, "Doc");
 //show the title
-api_display_tool_title($nameTools . $add_group_to_title);
+api_display_tool_title($nameTools.$add_group_to_title);
 
 /**
  * Process
@@ -71,11 +71,11 @@ 
         	$ct = '';
         	if ($new_comment) $ct .= ", comment='$new_comment'";
         	if ($new_title)   $ct .= ", title='$new_title'";
-        	Database::query("UPDATE $table_document SET" . substr($ct, 1) ." WHERE id = '$docid'");
+        	Database::query("UPDATE $table_document SET".substr($ct, 1)." WHERE id = '$docid'");
     	}
         //check for missing images in html files
         $missing_files = check_for_missing_files($base_work_dir.$_POST['curdirpath'].$new_path);
-        if ($missing_files)  {
+        if ($missing_files) {
             //show a form to upload the missing files
             Display::display_normal_message(
                 build_missing_files_form(
@@ -94,7 +94,7 @@ 
     if ($number_of_uploaded_images > 0) {
         //we could also create a function for this, I'm not sure...
         //create a directory for the missing files
-        $img_directory = str_replace('.','_',$_POST['related_file']."_files");
+        $img_directory = str_replace('.', '_', $_POST['related_file']."_files");
         $folderData = create_unexisting_directory(
             $_course,
             $_user['user_id'],
@@ -120,15 +120,15 @@ 
         replace_img_path_in_html_file(
             $_POST['img_file_path'],
             $paths_to_replace_in_file,
-            $base_work_dir . $_POST['related_file']
+            $base_work_dir.$_POST['related_file']
         );
         //update parent folders
-        item_property_update_on_folder($_course,$_POST['curdirpath'],$_user['user_id']);
+        item_property_update_on_folder($_course, $_POST['curdirpath'], $_user['user_id']);
     }
 }
 //they want to create a directory
-if (isset($_POST['create_dir']) && $_POST['dirname']!='') {
-	$added_slash = ($path=='/')?'':'/';
+if (isset($_POST['create_dir']) && $_POST['dirname'] != '') {
+	$added_slash = ($path == '/') ? '' : '/';
 	$dir_name = $path.$added_slash.api_replace_dangerous_char($_POST['dirname']);
     $created_dir = create_unexisting_directory(
         $_course,
@@ -152,7 +152,7 @@ 
 	//create the form that asks for the directory name
 	$new_folder_text = '<form action="'.api_get_self().'" method="POST">';
 	$new_folder_text .= '<input type="hidden" name="curdirpath" value="'.$path.'"/>';
-	$new_folder_text .= get_lang('NewDir') .' ';
+	$new_folder_text .= get_lang('NewDir').' ';
 	$new_folder_text .= '<input type="text" name="dirname"/>';
 	$new_folder_text .= '<input type="submit" name="create_dir" value="'.get_lang('Ok').'"/>';
 	$new_folder_text .= '</form>';
@@ -163,7 +163,7 @@ 
 	<p>
         <a href="<?php echo api_get_self(); ?>?path=<?php echo $path; ?>&amp;createdir=1">
             <?php echo Display::return_icon('new_folder.gif'); ?>
-            <?php echo(get_lang('CreateDir'));?>
+            <?php echo(get_lang('CreateDir')); ?>
         </a>
     </p>
 <?php
@@ -186,11 +186,11 @@ 
 </td>
 </tr>
 <tr>
-<td><?php echo get_lang('Title');?></td>
+<td><?php echo get_lang('Title'); ?></td>
 <td><input type="text" size="20" name="title" style="width:300px;"></td>
 </tr>
 <tr>
-<td valign="top"><?php echo get_lang('Comment');?></td>
+<td valign="top"><?php echo get_lang('Comment'); ?></td>
 <td><textarea rows="3" cols="20" name="comment" wrap="virtual" style="width:300px;"></textarea></td>
 </tr>
 <tr>
@@ -198,22 +198,22 @@ 
 <?php echo get_lang('Options'); ?>
 </td>
 <td>
-- <input type="checkbox" name="unzip" value="1" onclick="check_unzip()"/> <?php echo(get_lang('Uncompress'));?><br/>
-- <?php echo (get_lang('UplWhatIfFileExists'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="nothing" title="<?php echo (get_lang('UplDoNothingLong'));?>" checked="checked"/>  <?php echo (get_lang('UplDoNothing'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="overwrite" title="<?php echo (get_lang('UplOverwriteLong'));?>"/> <?php echo (get_lang('UplOverwrite'));?><br/>
-&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="rename" title="<?php echo (get_lang('UplRenameLong'));?>"/> <?php echo (get_lang('UplRename'));?>
+- <input type="checkbox" name="unzip" value="1" onclick="check_unzip()"/> <?php echo(get_lang('Uncompress')); ?><br/>
+- <?php echo (get_lang('UplWhatIfFileExists')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="nothing" title="<?php echo (get_lang('UplDoNothingLong')); ?>" checked="checked"/>  <?php echo (get_lang('UplDoNothing')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="overwrite" title="<?php echo (get_lang('UplOverwriteLong')); ?>"/> <?php echo (get_lang('UplOverwrite')); ?><br/>
+&nbsp;&nbsp;&nbsp;<input type="radio" name="if_exists" value="rename" title="<?php echo (get_lang('UplRenameLong')); ?>"/> <?php echo (get_lang('UplRename')); ?>
 
 </td>
 </tr>
 </table>
 
-<input type="submit" value="<?php echo(get_lang('Ok'));?>">
+<input type="submit" value="<?php echo(get_lang('Ok')); ?>">
 </form>
 <!-- end upload form -->
 
  <!-- so they can get back to the documents   -->
- <p><?php echo (get_lang('Back'));?> <?php echo (get_lang('To'));?> <a href="document.php?curdirpath=<?php echo $path; ?>"><?php echo (get_lang('DocumentsOverview'));?></a></p>
+ <p><?php echo (get_lang('Back')); ?> <?php echo (get_lang('To')); ?> <a href="document.php?curdirpath=<?php echo $path; ?>"><?php echo (get_lang('DocumentsOverview')); ?></a></p>
 <?php
 
 Display::display_footer();

main/upload/upload.php

Switch Indentation +10 added lines, -10 removed lines

@@ -26,14 +26,14 @@
  * Redirect to the correct script to handle this type of upload
  */
 switch ($_SESSION['my_tool']) {
-    case TOOL_LEARNPATH:
-        require 'upload.scorm.php';
-        break;
-    //the following cases need to be distinguished later on
-    case TOOL_DROPBOX:
-    case TOOL_STUDENTPUBLICATION:
-    case TOOL_DOCUMENT:
-    default:
-        require 'upload.document.php';
-        break;
+        case TOOL_LEARNPATH:
+            require 'upload.scorm.php';
+            break;
+        //the following cases need to be distinguished later on
+        case TOOL_DROPBOX:
+        case TOOL_STUDENTPUBLICATION:
+        case TOOL_DOCUMENT:
+        default:
+            require 'upload.document.php';
+            break;
 }

main/upload/form.document.php

Spacing +3 added lines, -3 removed lines

@@ -12,8 +12,8 @@ 
  */
 $noPHP_SELF = false;
 $nameTools = get_lang('FileUpload');
-$interbreadcrumb[]= array ("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang(TOOL_DOCUMENT));
-Display::display_header($nameTools,"Doc");
+$interbreadcrumb[] = array("url"=>"../newscorm/lp_controller.php?action=list", "name"=> get_lang(TOOL_DOCUMENT));
+Display::display_header($nameTools, "Doc");
 //show the title
 api_display_tool_title($nameTools.$add_group_to_title);
 ?>
@@ -21,7 +21,7 @@ 
 <div id="dynamic_div" style="display:block;margin-left:40%;margin-top:10px;height:50px;">
 </div>
 <div id="upload_form_div" name="form_div" style="display:block;">
-	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', ''));?>','upload_form_div');">
+	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', '')); ?>','upload_form_div');">
 		<input type="hidden" name="curdirpath" value="<?php echo $path; ?>">
 		<input type="hidden" name="tool" value="<?php echo $my_tool; ?>">
 		<input type="file" name="user_file">

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/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'];