chamilo / chamilo-lms

main/document/document_slideshow.inc.php

Indentation +13 added lines, -13 removed lines

@@ -29,8 +29,8 @@ 
 
 // Resetting the images of the slideshow = destroying the slideshow
 if (isset($_GET['action']) && $_GET['action'] == 'exit_slideshow') {
-	$_SESSION['image_files_only'] = null;
-	unset($image_files_only);
+    $_SESSION['image_files_only'] = null;
+    unset($image_files_only);
 }
 
 // We check if there are images in this folder by searching the extensions for .jpg, .gif, .png
@@ -39,10 +39,10 @@ 
 $array_to_search = !empty($documentAndFolders) && is_array($documentAndFolders) ? $documentAndFolders : array();
 
 if (count($array_to_search) > 0) {
-	while (list($key) = each($array_to_search)) {
-		$all_files[] = basename($array_to_search[$key]['path']);
-		//echo basename($array_to_search[$key]['path']).'<br />';
-	}
+    while (list($key) = each($array_to_search)) {
+        $all_files[] = basename($array_to_search[$key]['path']);
+        //echo basename($array_to_search[$key]['path']).'<br />';
+    }
 }
 
 // Always show gallery.
@@ -62,9 +62,9 @@ 
 
 $tablename_column = isset($_GET['tablename_column']) ? Security::remove_XSS($_GET['tablename_column']) : 0;
 if ($tablename_column == 0) {
-	$tablename_column = 1;
+    $tablename_column = 1;
 } else {
-	$tablename_column = intval($tablename_column) - 1;
+    $tablename_column = intval($tablename_column) - 1;
 }
 $tablename_direction = isset($_GET['tablename_direction']) ? Security::remove_XSS($_GET['tablename_direction']) : 'ASC';
 
@@ -98,15 +98,15 @@ 
         $final_array[] = $file_array[1];
     }
 
-	return $final_array;
+    return $final_array;
 }
 
 function sort_table($a, $b) {
-	global $tablename_column;
-	return strnatcmp($a[$tablename_column], $b[$tablename_column]);
+    global $tablename_column;
+    return strnatcmp($a[$tablename_column], $b[$tablename_column]);
 }
 
 function rsort_table($a, $b) {
-	global $tablename_column;
-	return strnatcmp($b[$tablename_column], $a[$tablename_column]);
+    global $tablename_column;
+    return strnatcmp($b[$tablename_column], $a[$tablename_column]);
 }

main/document/slideshowoptions.php

Indentation +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
                     if ($image_resizing == 'noresizing' || $image_resizing == '') {
                             echo ' checked';
                     }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('NoResizing') . '</b>, ' . get_lang('NoResizingComment') ;?>
         </div>
@@ -87,7 +87,7 @@ 
                         if ($image_resizing == 'resizing_auto' || $image_resizing == '') {
                                 echo ' checked';
                         }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('ResizingAuto') . '</b>, ' . get_lang('ResizingAutoComment');?>
 	</div>
@@ -99,7 +99,7 @@ 
                             $width = $_SESSION['image_resizing_width'];
                             $height = $_SESSION['image_resizing_height'];
                     }
-		?>>
+        ?>>
             </label>
             <?php echo '<b>'. get_lang('Resizing') . '</b>, ' . get_lang('ResizingComment'); ?>
 	</div>
@@ -107,13 +107,13 @@ 
             <label class="col-sm-1 control-label"><?php echo get_lang('Width'); ?></label>
             <div class="col-sm-3">
                 <input class="form-control" name="width" type="text" id="width" <?php
-		if ($image_resizing == 'resizing') {
-			echo ' value="'.$width.'"';
-			echo ' class="enabled_input"';
+        if ($image_resizing == 'resizing') {
+            echo ' value="'.$width.'"';
+            echo ' class="enabled_input"';
                     } else {
                     echo ' class="disabled_input"';
                 }
-		?> >
+        ?> >
             </div>
             <div class="col-sm-8"></div>
         </div>
@@ -121,13 +121,13 @@ 
             <label class="col-sm-1 control-label"><?php echo get_lang('Height'); ?></label>
             <div class="col-sm-3">
                 <input class="form-control" name="height" type="text" id="height" <?php
-		if ($image_resizing == 'resizing') {
-			echo ' value="'.$height.'"';
-			echo ' class="enabled_input"';
-		} else {
+        if ($image_resizing == 'resizing') {
+            echo ' value="'.$height.'"';
+            echo ' class="enabled_input"';
+        } else {
                         echo ' class="disabled_input"';
                 }
-		?> >
+        ?> >
             </div>
             <div class="col-sm-8"></div>
         </div>

main/document/record_audio.php

Indentation +40 added lines, -40 removed lines

@@ -23,11 +23,11 @@ 
 $document_data  = array();
 
 if (isset($_GET['id'])) {
-	$document_data = DocumentManager::get_document_data_by_id(
-		$_GET['id'],
-		api_get_course_id(),
-		true
-	);
+    $document_data = DocumentManager::get_document_data_by_id(
+        $_GET['id'],
+        api_get_course_id(),
+        true
+    );
 }
 
 if (empty($document_data)) {
@@ -46,46 +46,46 @@ 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
-	$group = GroupManager :: get_group_properties($groupId);
-	$path = explode('/', $dir);
-	if ('/'.$path[1] != $group['directory']) {
-		api_not_allowed(true);
-	}
+    $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+    $group = GroupManager :: get_group_properties($groupId);
+    $path = explode('/', $dir);
+    if ('/'.$path[1] != $group['directory']) {
+        api_not_allowed(true);
+    }
 }
 
 $interbreadcrumb[] = array("url" => "./document.php?id=".$document_id.'&'.api_get_cidreq(), "name" => get_lang('Documents'));
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
-	api_not_allowed(true);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), Security::remove_XSS($dir),api_get_session_id()))) {
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -93,10 +93,10 @@ 
 
 $display_dir = $dir;
 if (isset ($group)) {
-	$display_dir = explode('/', $dir);
-	unset ($display_dir[0]);
-	unset ($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset ($display_dir[0]);
+    unset ($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 // Interbreadcrumb for the current directory root path
@@ -117,7 +117,7 @@ 
 Display :: display_header($nameTools, 'Doc');
 
 echo '<div class="actions">';
-		echo '<a href="document.php?'.api_get_cidreq().'&id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
+        echo '<a href="document.php?'.api_get_cidreq().'&id='.$document_id.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 
 ?>
@@ -178,24 +178,24 @@ 
 Display::display_icon('microphone.png', get_lang('PressRecordButton'),'','128');
 echo '<br/>';
 echo '<applet id="nanogong" archive="'.api_get_path(WEB_LIBRARY_PATH).'nanogong/nanogong.jar" code="gong.NanoGong" width="250" height="95" ALIGN="middle">';
-	//echo '<param name="ShowRecordButton" value="false" />'; // default true
-	// echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
-	//echo '<param name="ShowSpeedButton" value="false" />'; // default true
-	//echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
-	echo '<param name="ShowTime" value="true" />'; // default false
-	//echo '<param name="Color" value="#C0E0FF" />'; // default #FFFFFF
-	//echo '<param name="StartTime" value="10.5" />';
-	//echo '<param name="EndTime" value="65" />';
-	echo '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
-	//echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
-	//echo '<param name="MaxDuration" value="60" />';
-	//echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
+    //echo '<param name="ShowRecordButton" value="false" />'; // default true
+    // echo '<param name="ShowSaveButton" value="false" />'; //you can save in local computer | (default true)
+    //echo '<param name="ShowSpeedButton" value="false" />'; // default true
+    //echo '<param name="ShowAudioLevel" value="false" />'; //  it displays the audiometer | (default true)
+    echo '<param name="ShowTime" value="true" />'; // default false
+    //echo '<param name="Color" value="#C0E0FF" />'; // default #FFFFFF
+    //echo '<param name="StartTime" value="10.5" />';
+    //echo '<param name="EndTime" value="65" />';
+    echo '<param name="AudioFormat" value="ImaADPCM" />';// ImaADPCM (more speed), Speex (more compression)|(default Speex)
+    //echo '<param name="SamplingRate" value="32000" />';//Quality for ImaADPCM (low 8000, medium 11025, normal 22050, hight 44100) OR Quality for Speex (low 8000, medium 16000, normal 32000, hight 44100) | (default 44100)
+    //echo '<param name="MaxDuration" value="60" />';
+    //echo '<param name="SoundFileURL" value="http://somewhere.com/mysoundfile.wav" />';//load a file |(default "")
 echo '</applet>';
 
 echo '<form name="form_nanogong">';
-	echo '<input placeholder="'.get_lang('InputNameHere').'" type="text" id="audio_title">';
-	echo '<input id="status" type="hidden" name="status" value="0">';
-	echo '<button class="upload" type="submit" value="'.get_lang('Send').'" onClick="submitVoice()" />'.get_lang('Send').'</button>';
+    echo '<input placeholder="'.get_lang('InputNameHere').'" type="text" id="audio_title">';
+    echo '<input id="status" type="hidden" name="status" value="0">';
+    echo '<button class="upload" type="submit" value="'.get_lang('Send').'" onClick="submitVoice()" />'.get_lang('Send').'</button>';
 echo '</form>';
 
 echo '</div>';

main/document/exit_pixlr.php

Indentation +7 added lines, -7 removed lines

@@ -24,12 +24,12 @@
 unset($_SESSION['temp_realpath_image']);
 
 if (!isset($_SESSION['exit_pixlr'])){
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php';
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
-	api_not_allowed(true);
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php';
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
+    api_not_allowed(true);
 } else {
-	echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
-	$location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
-	echo '<script>window.parent.location.href="'.$location.'"</script>';
-	unset($_SESSION['exit_pixlr']);
+    echo '<div align="center" style="padding-top:150; font-family:Arial, Helvetica, Sans-serif;font-size:25px;color:#aaa;font-weight:bold;">'.get_lang('PleaseStandBy').'</div>';
+    $location=api_get_path(WEB_CODE_PATH).'document/document.php?id='.Security::remove_XSS($_SESSION['exit_pixlr']);
+    echo '<script>window.parent.location.href="'.$location.'"</script>';
+    unset($_SESSION['exit_pixlr']);
 }

main/document/slideshow.inc.php

Indentation +11 added lines, -13 removed lines

@@ -15,8 +15,6 @@ 
 	This file has two large sections.
 	1. code that belongs in document.php, but to avoid clutter I put the code here
 	2. the function resize_image that handles the image resizing
-
-
  *	@author Patrick Cool
  *	@package chamilo.document
  *	@todo convert comments to be understandable to phpDocumentor
@@ -34,16 +32,16 @@ 
  *							view is also possible when you choose not to resize the source images
  */
 function resize_image($image, $target_width, $target_height, $slideshow = 0) {
-	// Modifications by Ivan Tcholakov, 04-MAY-2009.
-	$result = array();
-	if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
-		$new_sizes = api_resize_image($image, $target_width, $target_height);
-		$result[] = $new_sizes['height'];
-		$result[] = $new_sizes['width'];
-	} else {		
+    // Modifications by Ivan Tcholakov, 04-MAY-2009.
+    $result = array();
+    if ( (isset($_SESSION['image_resizing']) && $_SESSION['image_resizing']== 'resizing') or $slideshow == 1) {
+        $new_sizes = api_resize_image($image, $target_width, $target_height);
+        $result[] = $new_sizes['height'];
+        $result[] = $new_sizes['width'];
+    } else {		
         $size = api_getimagesize($image);
-		$result[] = $size['height'];
-		$result[] = $size['width'];
-	}
-	return $result;
+        $result[] = $size['height'];
+        $result[] = $size['width'];
+    }
+    return $result;
 }

main/resourcelinker/resourcelinker.php

Indentation +462 added lines, -462 removed lines

@@ -79,81 +79,81 @@ 
 */
 if ($from_learnpath == 'yes')
 {
-	//start from clear every time in LearnPath Builder
-	$_SESSION['addedresource'] = null;
-	$_SESSION['addedresourceid'] = null;
-	$_SESSION['addedresourceassigned'] = null;
-	unset ($_SESSION['addedresource']);
-	unset ($_SESSION['addedresourceid']);
-	unset ($_SESSION['addedresourceassigned']);
+    //start from clear every time in LearnPath Builder
+    $_SESSION['addedresource'] = null;
+    $_SESSION['addedresourceid'] = null;
+    $_SESSION['addedresourceassigned'] = null;
+    unset ($_SESSION['addedresource']);
+    unset ($_SESSION['addedresourceid']);
+    unset ($_SESSION['addedresourceassigned']);
 }
 
 // Process a new chapter?
 if (!empty ($_POST['add_chapter']) && !empty ($_POST['title']))
 {
-	$title = $_POST['title'];
-	$description = '';
-	if (!empty ($_POST['description']))
-	{
-		$description = $_POST['description'];
-	}
-
-	// get max display_order so far in this parent chapter
-	$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE learnpath_id = $learnpath_id "." AND parent_chapter_id = $chapter_id";
-	$res = Database::query($sql);
-	$row = Database::fetch_array($res);
-	$max_temp = $row[0];
-
-	$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE "." chapter_id = $chapter_id";
-	$res = Database::query($sql);
-	$row = Database::fetch_array($res);
-	$max_temp2 = $row[0];
-	if ($max_temp2 > $max_temp)
-	{
-		$order = $max_temp2 +1;
-	}
-	else
-	{
-		$order = $max_temp +1;
-	}
-
-	$sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
-	$res = Database::query($sql);
-	if ($res !== false)
-	{
-		$title = '';
-		$description = '';
-	}
+    $title = $_POST['title'];
+    $description = '';
+    if (!empty ($_POST['description']))
+    {
+        $description = $_POST['description'];
+    }
+
+    // get max display_order so far in this parent chapter
+    $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE learnpath_id = $learnpath_id "." AND parent_chapter_id = $chapter_id";
+    $res = Database::query($sql);
+    $row = Database::fetch_array($res);
+    $max_temp = $row[0];
+
+    $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE "." chapter_id = $chapter_id";
+    $res = Database::query($sql);
+    $row = Database::fetch_array($res);
+    $max_temp2 = $row[0];
+    if ($max_temp2 > $max_temp)
+    {
+        $order = $max_temp2 +1;
+    }
+    else
+    {
+        $order = $max_temp +1;
+    }
+
+    $sql = "INSERT INTO $tbl_learnpath_chapter "."(learnpath_id,chapter_name,chapter_description,parent_chapter_id,display_order) "." VALUES "."($learnpath_id, '$title', '$description', $chapter_id, $order )";
+    $res = Database::query($sql);
+    if ($res !== false)
+    {
+        $title = '';
+        $description = '';
+    }
 }
 
 // This if when a external link is submitted
 if (!empty ($_POST['external_link_submit']))
 {
-	$add = true;
-	if ($add_2_links != "niet toevoegen")
-	{
-		// add external link to the links table.
-		$pos = strpos($external_link, 'ttp:');
-		if ($pos == '')
-		{
-			$external_link = 'http://'.$external_link;
-		}
-
-		$sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
-		$result = Database::query($sql);
-		$addedresource[] = "Link";
-		$addedresourceid[] = Database::insert_id();
-		$_SESSION['addedresource'] = $addedresource;
-		$_SESSION['addedresourceid'] = $addedresourceid;
-	}
-	else
-	{
-		// do not add external link to the links table
-		$addedresource[] = "Externallink";
-		$addedresourceid[] = $external_link;
-		$_SESSION['addedresource'] = $addedresource;
-		$_SESSION['addedresourceid'] = $addedresourceid;
-	}
+    $add = true;
+    if ($add_2_links != "niet toevoegen")
+    {
+        // add external link to the links table.
+        $pos = strpos($external_link, 'ttp:');
+        if ($pos == '')
+        {
+            $external_link = 'http://'.$external_link;
+        }
+
+        $sql = "INSERT INTO $link_table (url, title, category_id) VALUES ('$external_link','$external_link','$add_2_links')";
+        $result = Database::query($sql);
+        $addedresource[] = "Link";
+        $addedresourceid[] = Database::insert_id();
+        $_SESSION['addedresource'] = $addedresource;
+        $_SESSION['addedresourceid'] = $addedresourceid;
+    }
+    else
+    {
+        // do not add external link to the links table
+        $addedresource[] = "Externallink";
+        $addedresourceid[] = $external_link;
+        $_SESSION['addedresource'] = $addedresource;
+        $_SESSION['addedresourceid'] = $addedresourceid;
+    }
 }
 
 // loading the session variables into local array
@@ -163,107 +163,107 @@ 
 // This is when a resource was added to the session
 if ($add)
 {
-	// adding the new variable to the local array
-	if (empty ($_POST['external_link_submit']))
-	{
-		//that case is already arranged, see upwards
-		$addedresource[] = $content;
-		$addedresourceid[] = $add;
-	}
-	$addedresourceassigned[] = 0;
-
-	// loading the local array into the session variable
-	$_SESSION['addedresource'] = $addedresource;
-	$_SESSION['addedresourceid'] = $addedresourceid;
+    // adding the new variable to the local array
+    if (empty ($_POST['external_link_submit']))
+    {
+        //that case is already arranged, see upwards
+        $addedresource[] = $content;
+        $addedresourceid[] = $add;
+    }
+    $addedresourceassigned[] = 0;
+
+    // loading the local array into the session variable
+    $_SESSION['addedresource'] = $addedresource;
+    $_SESSION['addedresourceid'] = $addedresourceid;
+
+    //---------------------------------------
+    //we assign to chapters immediately !
+    //---------------------------------------
+    $resource_added = false;
+    if ($from_learnpath == 'yes')
+    {
+        $i = 0;
+        //calculating the last order of the items of this chapter
+        $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE chapter_id=$chapter_id";
+        $result = Database::query($sql);
+        if(Database::num_rows($result)==0){
+            $lastorder_item = 0;
+        }else{
+            $row = Database::fetch_array($result);
+            $lastorder_item = ($row[0]);
+        }
+        $sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
+        $result = Database::query($sql);
+        if(Database::num_rows($result)==0){
+            $lastorder_chapter = 0;
+        }else{
+            $row = Database::fetch_array($result);
+            $lastorder_chapter = ($row[0]);
+        }
+        $lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
 
-	//---------------------------------------
-	//we assign to chapters immediately !
-	//---------------------------------------
-	$resource_added = false;
-	if ($from_learnpath == 'yes')
-	{
-		$i = 0;
-		//calculating the last order of the items of this chapter
-		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_item WHERE chapter_id=$chapter_id";
-		$result = Database::query($sql);
-		if(Database::num_rows($result)==0){
-			$lastorder_item = 0;
-		}else{
-			$row = Database::fetch_array($result);
-			$lastorder_item = ($row[0]);
-		}
-		$sql = "SELECT MAX(display_order) FROM $tbl_learnpath_chapter WHERE parent_chapter_id=$chapter_id";
-		$result = Database::query($sql);
-		if(Database::num_rows($result)==0){
-			$lastorder_chapter = 0;
-		}else{
-			$row = Database::fetch_array($result);
-			$lastorder_chapter = ($row[0]);
-		}
-		$lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
-
-		foreach ($addedresource as $addedresource_item)
-		{
-			// in the case we added a chapter, add this into the chapters list with the correct parent_id
-			if ($addedresource_item == "Chap")
-			{
-				$sql = "INSERT INTO $tbl_learnpath_chapter ("."'learnpath_id','chapter_name','chapter_description','parent_chapter_id','display_order'".") VALUES (".$learnpath_id.",'".$learnpath_chapter_name."','".$learnpath_chapter_description."',".$chapter_id.",".$lastorder.")";
-				Database::query($sql);
-			}
-
-			if (!$addedresourceassigned[$i])
-			{
-				//not to assign it twice
-				if ($addedresource_item == "Ass")
-				{
-					$addedresource_item = "Assignments";
-				}
-				if ($addedresource_item == "Drop")
-				{
-					$addedresource_item = "Dropbox";
-				}
-				if ($addedresource_item == "Intro")
-				{
-					$addedresource_item = "Introduction_text";
-				}
-				if ($addedresource_item == "Course_desc")
-				{
-					$addedresource_item = "Course_description";
-				}
-				if ($addedresource_item == "Group")
-				{
-					$addedresource_item = "Groups";
-				}
-				if ($addedresource_item == "User")
-				{
-					$addedresource_item = "Users";
-				}
-				if ($target == '')
-				{
-					$target = '_self';
-				}
-				if ($addedresource_item == 'Link')
-				{
-					$addedresource_item .= ' '.$target;
-				}
-				$sql = "INSERT INTO $tbl_learnpath_item (id, chapter_id, item_type, item_id, display_order) VALUES ( '$autoid', '$chapter_id', '$addedresource_item','$addedresourceid[$i]','".$lastorder."')";
-				$result = Database::query($sql);
-				$addedresourceassigned[$i] = 1;
-				$resource_added = true;
-			}
-			$i ++;
-			$lastorder ++;
-		}
-		//$_SESSION['addedresource']=null;
-		//$_SESSION['addedresourceid']=null;
-		// cleaning up the session once again
-		$_SESSION['addedresource'] = null;
-   		$_SESSION['addedresourceid'] = null;
-   		$_SESSION['addedresourceassigned'] = null;
-   		unset ($_SESSION['addedresource']);
-   		unset ($_SESSION['addedresourceid']);
-   		unset ($_SESSION['addedresourceassigned']);
-	}
+        foreach ($addedresource as $addedresource_item)
+        {
+            // in the case we added a chapter, add this into the chapters list with the correct parent_id
+            if ($addedresource_item == "Chap")
+            {
+                $sql = "INSERT INTO $tbl_learnpath_chapter ("."'learnpath_id','chapter_name','chapter_description','parent_chapter_id','display_order'".") VALUES (".$learnpath_id.",'".$learnpath_chapter_name."','".$learnpath_chapter_description."',".$chapter_id.",".$lastorder.")";
+                Database::query($sql);
+            }
+
+            if (!$addedresourceassigned[$i])
+            {
+                //not to assign it twice
+                if ($addedresource_item == "Ass")
+                {
+                    $addedresource_item = "Assignments";
+                }
+                if ($addedresource_item == "Drop")
+                {
+                    $addedresource_item = "Dropbox";
+                }
+                if ($addedresource_item == "Intro")
+                {
+                    $addedresource_item = "Introduction_text";
+                }
+                if ($addedresource_item == "Course_desc")
+                {
+                    $addedresource_item = "Course_description";
+                }
+                if ($addedresource_item == "Group")
+                {
+                    $addedresource_item = "Groups";
+                }
+                if ($addedresource_item == "User")
+                {
+                    $addedresource_item = "Users";
+                }
+                if ($target == '')
+                {
+                    $target = '_self';
+                }
+                if ($addedresource_item == 'Link')
+                {
+                    $addedresource_item .= ' '.$target;
+                }
+                $sql = "INSERT INTO $tbl_learnpath_item (id, chapter_id, item_type, item_id, display_order) VALUES ( '$autoid', '$chapter_id', '$addedresource_item','$addedresourceid[$i]','".$lastorder."')";
+                $result = Database::query($sql);
+                $addedresourceassigned[$i] = 1;
+                $resource_added = true;
+            }
+            $i ++;
+            $lastorder ++;
+        }
+        //$_SESSION['addedresource']=null;
+        //$_SESSION['addedresourceid']=null;
+        // cleaning up the session once again
+        $_SESSION['addedresource'] = null;
+            $_SESSION['addedresourceid'] = null;
+            $_SESSION['addedresourceassigned'] = null;
+            unset ($_SESSION['addedresource']);
+            unset ($_SESSION['addedresourceid']);
+            unset ($_SESSION['addedresourceassigned']);
+    }
 }
 
 /*
@@ -278,64 +278,64 @@ 
 */
 if ($_GET["source_id"])
 {
-	switch ($_GET["source_id"])
-	{
-		case "1" : // coming from Agenda
-			if ($action == "edit")
-			{
-				$url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
-			}
-			elseif ($action == "add")
-		{
-				$url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
-			}
-			else
-			{
-				$url = "../calendar/agenda.php?action=add";
-			}
-			$originaltoolname = get_lang("Agenda");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			session_unregister('from_learnpath');
-			unset ($from_learnpath);
-			break;
-		case "2" : // coming from forum: new topic
-			$url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
-			$originaltoolname = get_lang("ForumAddNewTopic");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			session_unregister('from_learnpath');
-			unset ($from_learnpath);
-			break;
-		case "3" : // coming from forum: edit topic
-			$url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
-			$originaltoolname = get_lang("ForumEditTopic");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			session_unregister('from_learnpath');
-			unset ($from_learnpath);
-			break;
-		case "4" : // coming from exercises: edit topic
-			$url = "../exercice/admin.php?modifyAnswers=$modifyAnswers";
-			$originaltoolname = get_lang("ExerciseAnswers");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			session_unregister('from_learnpath');
-			unset ($from_learnpath);
-			break;
-		case "5" : // coming from learning path
-			$from_learnpath = 'yes';
-			Session::write('from_learnpath',$from_learnpath);
-			break;
-			/*************************************** end add Frederik.Vermeire@pandora.be *********************************/
-
-	}
-	// We do not come from the learning path. We store the name of the tool & url in a session.
-	if ($from_learnpath != 'yes')
-	{
-		if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
-		{
-			$_SESSION["origintoolurl"] = $breadcrumbelement["url"];
-			$_SESSION["origintoolname"] = $breadcrumbelement["name"];
-			$interbreadcrumb = "";
-		}
-	}
+    switch ($_GET["source_id"])
+    {
+        case "1" : // coming from Agenda
+            if ($action == "edit")
+            {
+                $url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
+            }
+            elseif ($action == "add")
+        {
+                $url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
+            }
+            else
+            {
+                $url = "../calendar/agenda.php?action=add";
+            }
+            $originaltoolname = get_lang("Agenda");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            session_unregister('from_learnpath');
+            unset ($from_learnpath);
+            break;
+        case "2" : // coming from forum: new topic
+            $url = "../phpbb/newtopic.php?forum=$source_forum&md5=$md5";
+            $originaltoolname = get_lang("ForumAddNewTopic");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            session_unregister('from_learnpath');
+            unset ($from_learnpath);
+            break;
+        case "3" : // coming from forum: edit topic
+            $url = "../phpbb/editpost.php?post_id=$post_id&topic=$topic&forum=$forum&md5=$md5&originalresource=no";
+            $originaltoolname = get_lang("ForumEditTopic");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            session_unregister('from_learnpath');
+            unset ($from_learnpath);
+            break;
+        case "4" : // coming from exercises: edit topic
+            $url = "../exercice/admin.php?modifyAnswers=$modifyAnswers";
+            $originaltoolname = get_lang("ExerciseAnswers");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            session_unregister('from_learnpath');
+            unset ($from_learnpath);
+            break;
+        case "5" : // coming from learning path
+            $from_learnpath = 'yes';
+            Session::write('from_learnpath',$from_learnpath);
+            break;
+            /*************************************** end add Frederik.Vermeire@pandora.be *********************************/
+
+    }
+    // We do not come from the learning path. We store the name of the tool & url in a session.
+    if ($from_learnpath != 'yes')
+    {
+        if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"]<>$interbreadcrumb["url"])
+        {
+            $_SESSION["origintoolurl"] = $breadcrumbelement["url"];
+            $_SESSION["origintoolname"] = $breadcrumbelement["name"];
+            $interbreadcrumb = "";
+        }
+    }
 
 }
 
@@ -343,26 +343,26 @@ 
 // the information from the session. Else we use the information of the learningpath itself.
 if ($from_learnpath != 'yes')
 {
-	$nameTools = get_lang('AddResource');
-	$interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
+    $nameTools = get_lang('AddResource');
+    $interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
 }
 else
 {
-	$learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
+    $learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
 		  								WHERE learnpath_id=$learnpath_id";
-	$sql_result = Database::query($learnpath_select_query);
-	$therow = Database::fetch_array($sql_result);
+    $sql_result = Database::query($learnpath_select_query);
+    $therow = Database::fetch_array($sql_result);
 
-	$learnpath_chapter_query = "	SELECT * FROM $tbl_learnpath_chapter
+    $learnpath_chapter_query = "	SELECT * FROM $tbl_learnpath_chapter
 		  								WHERE (learnpath_id = '$learnpath_id' and id = '$chapter_id')";
-	$sql_result = Database::query($learnpath_chapter_query);
-	$therow2 = Database::fetch_array($sql_result);
+    $sql_result = Database::query($learnpath_chapter_query);
+    $therow2 = Database::fetch_array($sql_result);
 
-	$from_learnpath = 'yes';
-	session_register('from_learnpath');
-	$interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
-	$interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
-	$interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
+    $from_learnpath = 'yes';
+    session_register('from_learnpath');
+    $interbreadcrumb[] = array ("url" => "../scorm/scormdocument.php", "name" => get_lang('LearningPath'));
+    $interbreadcrumb[] = array ("url" => "../learnpath/learnpath_handler.php?learnpath_id=$learnpath_id", "name" => "{$therow['learnpath_name']}");
+    $interbreadcrumb[] = array ("url" => api_get_self()."?action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no", "name" => "{$therow2['chapter_name']}");
 
 }
 
@@ -380,7 +380,7 @@ 
 echo "<h3>".$nameTools;
 if ($from_learnpath == 'yes')
 {
-	echo get_lang("AddResource")." - {$therow2['chapter_name']}";
+    echo get_lang("AddResource")." - {$therow2['chapter_name']}";
 }
 echo "</h3>";
 
@@ -393,7 +393,7 @@ 
 $result_select_active=Database::query($sql_select_active);
 while ($row=Database::fetch_array($result_select_active))
 {
-	$active_modules[]=$row['name'];
+    $active_modules[]=$row['name'];
 }
 
 
@@ -536,12 +536,12 @@ 
 
 if ($from_learnpath != 'yes')
 {
-	echo "<tr><td>&nbsp;</td></tr>";
-	echo "<tr><td><b>".get_lang('ResourcesAdded')." (";
-	echo count($addedresource);
-	echo ")</b></td></tr>";
-	echo "<tr><td nowrap><a href=\"".api_get_self()."?showresources=true&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('ShowDelete')."</a>";
-	echo "</td></tr>";
+    echo "<tr><td>&nbsp;</td></tr>";
+    echo "<tr><td><b>".get_lang('ResourcesAdded')." (";
+    echo count($addedresource);
+    echo ")</b></td></tr>";
+    echo "<tr><td nowrap><a href=\"".api_get_self()."?showresources=true&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('ShowDelete')."</a>";
+    echo "</td></tr>";
 }
 ?>
         <tr>
@@ -557,11 +557,11 @@ 
 
 if ($from_learnpath != 'yes')
 {
-	echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
+    echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
 }
 else
 {
-	echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
+    echo "<form method=\"get\" action=\"../learnpath/learnpath_handler.php\" style=\"margin: 0px;\"><input type=\"hidden\" name=\"learnpath_id\" value=\"".htmlentities($learnpath_id)."\"><input type=\"submit\" value=\"".'  '.get_lang('Ok').'  '."\"></form>";
 }
 ?>
 
@@ -577,40 +577,40 @@ 
 
 if ($resource_added)
 {
-	Display :: display_normal_message(get_lang("ResourceAdded"));
+    Display :: display_normal_message(get_lang("ResourceAdded"));
 }
 
 if ($from_learnpath != 'yes')
 {
-	echo count($addedresource)." ".api_strtolower(get_lang('ResourcesAdded'))."<br/>";
+    echo count($addedresource)." ".api_strtolower(get_lang('ResourcesAdded'))."<br/>";
 }
 //echo "<hr>";
 
 // Agenda items -->
 if ($content == "Agenda")
 {
-	$TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
-	$TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
+    $TABLEAGENDA 			= Database::get_course_table(TABLE_AGENDA);
+    $TABLE_ITEM_PROPERTY 	= Database::get_course_table(TABLE_ITEM_PROPERTY);
 
-	$sql="SELECT agenda.*, toolitemproperties.*
+    $sql="SELECT agenda.*, toolitemproperties.*
 					FROM ".$TABLEAGENDA." agenda, ".$TABLE_ITEM_PROPERTY." toolitemproperties
 					WHERE agenda.id = toolitemproperties.ref
 					AND toolitemproperties.tool='".TOOL_CALENDAR_EVENT."'
 					AND (toolitemproperties.to_group_id='0' OR toolitemproperties.to_group_id IS NULL)
 					AND toolitemproperties.visibility='1'";
 
-	$result = Database::query($sql);
-
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\">";
-		echo "<img src='../img/agenda.gif' alt='agenda'>";
-		echo api_convert_and_format_date($myrow["start_date"], null, date_default_timezone_get())."<br />";
-		echo "<b>".$myrow["title"]."</b></td></tr><tr><td>";
-		echo $myrow["content"]."<br />";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "</td></tr></table><br />";
-	}
+    $result = Database::query($sql);
+
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\">";
+        echo "<img src='../img/agenda.gif' alt='agenda'>";
+        echo api_convert_and_format_date($myrow["start_date"], null, date_default_timezone_get())."<br />";
+        echo "<b>".$myrow["title"]."</b></td></tr><tr><td>";
+        echo $myrow["content"]."<br />";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "</td></tr></table><br />";
+    }
 } // end if ($_GET["resource"]=="Agenda")
 
 /*
@@ -620,12 +620,12 @@ 
 */
 if ($content == "chapter")
 {
-	echo '<table><form name="add_chapter" action="'.'" method="POST">'."\n";
-	echo '  <tr><td>'.get_lang('Title').'</td><td><input type="text" name="title" value="'.$title.'"></input></td></tr>'."\n";
-	echo '  <tr><td>'.get_lang('Description').'</td><td><input type="text" name="description" value="'.$description.'"></input></td></tr>'."\n";
-	echo '  <tr><td></td><td><input type="submit" name="add_chapter" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
-	echo '</form></table>'."\n";
-	//echo "<hr>";
+    echo '<table><form name="add_chapter" action="'.'" method="POST">'."\n";
+    echo '  <tr><td>'.get_lang('Title').'</td><td><input type="text" name="title" value="'.$title.'"></input></td></tr>'."\n";
+    echo '  <tr><td>'.get_lang('Description').'</td><td><input type="text" name="description" value="'.$description.'"></input></td></tr>'."\n";
+    echo '  <tr><td></td><td><input type="submit" name="add_chapter" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
+    echo '</form></table>'."\n";
+    //echo "<hr>";
 }
 
 /*
@@ -640,23 +640,23 @@ 
 //				b. one is a student AND the documents tool is active. Student cannot add documents if the documents tool is inactive (teacher can do this)
 if ($content == "Document" OR (empty($content) AND (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT,$active_modules))) AND !$_GET['showresources'])
 {
-	// setting variables for file locations
-	$baseServDir = $_configuration['root_sys'];
-	$courseDir = $_course['path']."/document";
-	$baseWorkDir = $baseServDir.$courseDir;
-	// showing the link to move one folder up (when not in the root folder)
-	show_folder_up();
-	// showing the blue bar with the path in it when we are not in the root
-	if (get_levels($folder))
-	{
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#4171B5\">";
-		echo "<img src=\"../img/opendir.gif\" alt='directory'><font color=\"#ffffff\"><b>";
-		echo $folder."</b></font></td></tr></table>";
-	}
-
-	// showing the documents and subfolders of the folder we are in.
-	show_documents($folder);
-	//echo "<hr>";
+    // setting variables for file locations
+    $baseServDir = $_configuration['root_sys'];
+    $courseDir = $_course['path']."/document";
+    $baseWorkDir = $baseServDir.$courseDir;
+    // showing the link to move one folder up (when not in the root folder)
+    show_folder_up();
+    // showing the blue bar with the path in it when we are not in the root
+    if (get_levels($folder))
+    {
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#4171B5\">";
+        echo "<img src=\"../img/opendir.gif\" alt='directory'><font color=\"#ffffff\"><b>";
+        echo $folder."</b></font></td></tr></table>";
+    }
+
+    // showing the documents and subfolders of the folder we are in.
+    show_documents($folder);
+    //echo "<hr>";
 }
 
 /*
@@ -666,8 +666,8 @@ 
 */
 if ($content == "Ad_Valvas")
 {
-	$tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-	$sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i
+    $tbl_announcement = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+    $sql = "SELECT * FROM ".$tbl_announcement." a, ".$item_property_table." i
 			WHERE
 				i.tool = '".TOOL_ANNOUNCEMENT."' AND
 				a.id=i.ref AND
@@ -676,17 +676,17 @@ 
 				i.to_user_id IS NULL
 			ORDER BY a.display_order ASC";
 
-	$result = Database::query($sql);
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<table width=\"100%\"><tr><td>";
-		echo "<img src='../img/valves.gif' alt='advalvas'>";
-		echo api_convert_and_format_date($myrow["end_date"], DATE_FORMAT_LONG, date_default_timezone_get());
-		echo "</td></tr><tr><td>";
-		echo $myrow["title"]."<br />";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "</td></tr></table>";
-	}
+    $result = Database::query($sql);
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<table width=\"100%\"><tr><td>";
+        echo "<img src='../img/valves.gif' alt='advalvas'>";
+        echo api_convert_and_format_date($myrow["end_date"], DATE_FORMAT_LONG, date_default_timezone_get());
+        echo "</td></tr><tr><td>";
+        echo $myrow["title"]."<br />";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "</td></tr></table>";
+    }
 }
 
 /*
@@ -696,75 +696,75 @@ 
 */
 if ($content == "Forum")
 {
-	$TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
-	$TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
-	$TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
-	$tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
-	$tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
-
-	echo "<table width='100%'>";
+    $TBL_FORUMS 		= Database::get_course_table(TABLE_FORUM);
+    $TBL_CATAGORIES 	= Database::get_course_table(TABLE_FORUM_CATEGORY);
+    $TBL_FORUMTOPICS 	= Database::get_course_table(TABLE_FORUM_POST);
+    $tbl_posts 			= Database::get_course_table(TABLE_FORUM_POST);
+    $tbl_posts_text 	= Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
+
+    echo "<table width='100%'>";
+
+    // displaying the categories and the forums
+    if (!$forum and !$thread)
+    {
+        $sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_CATAGORIES." categories WHERE forums.cat_id=categories.cat_id ORDER BY forums.cat_id DESC";
+        $result = Database::query($sql);
+        while ($myrow = Database::fetch_array($result))
+        {
+            if ($myrow["cat_title"] !== $old_cat_title)
+            {
+                echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
+            }
+            $old_cat_title = $myrow["cat_title"];
+            echo "<tr><td><img src='../img/forum.gif'><a href='".api_get_self()."?content=Forum&category=".$myrow["cat_id"]."&forum=".$myrow["forum_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["forum_name"]."</td><td>";
+            showorhide_addresourcelink("Forum", $myrow["forum_id"]);
+            echo "</td></tr>";
+        }
+    }
+    //displaying all the threads of one forum
+    if ($forum)
+    {
+        // displaying the category title
+        $sql = "SELECT * FROM ".$TBL_CATAGORIES." WHERE cat_id=$category";
+        $result = Database::query($sql);
+        $myrow = Database::fetch_array($result);
+        echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
+
+        // displaying the forum title
+        $sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_FORUMTOPICS." topics WHERE forums.forum_id=topics.forum_id";
+        $result = Database::query($sql);
+        $myrow = Database::fetch_array($result);
+        echo "<tr><td bgcolor='#cccccc' colspan='2'><b>".$myrow["forum_name"]."</b></td></tr>";
+
+        if (!$thread)
+        {
+            // displaying all the threads of this forum
+            $sql = "SELECT * FROM ".$TBL_FORUMTOPICS." WHERE forum_id=$forum";
+            $result = Database::query($sql);
+            while ($myrow = Database::fetch_array($result))
+            {
+                echo "<tr><td><a href='".api_get_self()."?content=Forum&category=$category&forum=1&thread=".$myrow["topic_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["topic_title"]."</a>  (".$myrow["prenom"]." ".$myrow["nom"].")</td><td>";
+                showorhide_addresourcelink("Thread", $myrow["topic_id"]);
+                echo "</td></tr>";
+            }
+        }
+        else
+        {
+            // displaying all the replies
+            $sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
+            $result = Database::query($sql);
+            while ($myrow = Database::fetch_array($result))
+            {
+                echo "<tr><td><b>".$myrow["post_title"]."</b><br>";
+                echo $myrow["post_text"]."</td>";
+                echo "<td>";
+                showorhide_addresourcelink("Post", $myrow["post_id"]);
+                echo "</td></tr><tr><td colspan='2'><hr noshade></td></tr>";
+            }
 
-	// displaying the categories and the forums
-	if (!$forum and !$thread)
-	{
-		$sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_CATAGORIES." categories WHERE forums.cat_id=categories.cat_id ORDER BY forums.cat_id DESC";
-		$result = Database::query($sql);
-		while ($myrow = Database::fetch_array($result))
-		{
-			if ($myrow["cat_title"] !== $old_cat_title)
-			{
-				echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
-			}
-			$old_cat_title = $myrow["cat_title"];
-			echo "<tr><td><img src='../img/forum.gif'><a href='".api_get_self()."?content=Forum&category=".$myrow["cat_id"]."&forum=".$myrow["forum_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["forum_name"]."</td><td>";
-			showorhide_addresourcelink("Forum", $myrow["forum_id"]);
-			echo "</td></tr>";
-		}
-	}
-	//displaying all the threads of one forum
-	if ($forum)
-	{
-		// displaying the category title
-		$sql = "SELECT * FROM ".$TBL_CATAGORIES." WHERE cat_id=$category";
-		$result = Database::query($sql);
-		$myrow = Database::fetch_array($result);
-		echo "<tr><td bgcolor='#4171B5' colspan='2'><font color='white'><b>".$myrow["cat_title"]."</b></font></td></tr>";
-
-		// displaying the forum title
-		$sql = "SELECT * FROM ".$TBL_FORUMS." forums, ".$TBL_FORUMTOPICS." topics WHERE forums.forum_id=topics.forum_id";
-		$result = Database::query($sql);
-		$myrow = Database::fetch_array($result);
-		echo "<tr><td bgcolor='#cccccc' colspan='2'><b>".$myrow["forum_name"]."</b></td></tr>";
-
-		if (!$thread)
-		{
-			// displaying all the threads of this forum
-			$sql = "SELECT * FROM ".$TBL_FORUMTOPICS." WHERE forum_id=$forum";
-			$result = Database::query($sql);
-			while ($myrow = Database::fetch_array($result))
-			{
-				echo "<tr><td><a href='".api_get_self()."?content=Forum&category=$category&forum=1&thread=".$myrow["topic_id"]."&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".$myrow["topic_title"]."</a>  (".$myrow["prenom"]." ".$myrow["nom"].")</td><td>";
-				showorhide_addresourcelink("Thread", $myrow["topic_id"]);
-				echo "</td></tr>";
-			}
-		}
-		else
-		{
-			// displaying all the replies
-			$sql = "SELECT * FROM ".$tbl_posts." post, ".$tbl_posts_text." post_text WHERE post_text.post_id=post.post_id and post.topic_id=$thread ORDER BY post_text.post_id ASC";
-			$result = Database::query($sql);
-			while ($myrow = Database::fetch_array($result))
-			{
-				echo "<tr><td><b>".$myrow["post_title"]."</b><br>";
-				echo $myrow["post_text"]."</td>";
-				echo "<td>";
-				showorhide_addresourcelink("Post", $myrow["post_id"]);
-				echo "</td></tr><tr><td colspan='2'><hr noshade></td></tr>";
-			}
-
-		}
-	}
-	echo "</table>";
+        }
+    }
+    echo "</table>";
 }
 
 /*
@@ -774,57 +774,57 @@ 
 */
 if ($content == "Link")
 {
-	// including the links language file
-	include ("../lang/$language/link.inc.php");
-
-	$tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
-	if (($learnpath_id != '') and ($content == 'Link'))
-	{
-		echo "<form name='learnpath_link'><table>";
-		echo "<tr></td><td align='left'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target' onchange='targetfunc()'><option value='_self' ";
-		if ($target == '_self')
-		{
-			echo "selected";
-		}
-		echo ">".get_lang('SameWindow')."</option><option value='_blank'";
-		if ($target == '_blank')
-		{
-			echo "selected";
-		}
-		echo ">".get_lang('NewWindow')."</option></select></td></tr></table></form>";
-	}
-
-	// showing the links that are in the root (having no category)
-	$sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
-	$result = Database::query($sql);
-	if (Database::num_rows($result) > 0)
-	{
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".get_lang('NoCategory')."</i></td></tr></table>";
-		while ($myrow = Database::fetch_array($result))
-		{
-			echo "<img src='../img/links.gif'>".$myrow["title"];
-			echo "<br>";
-			showorhide_addresourcelink($content, $myrow["id"]);
-			echo "<br><br>";
-		}
-	}
-
-	// showing the categories and the links in it.
-	$sqlcategories = "SELECT * FROM ".$tbl_categories." ORDER by display_order DESC";
-	$resultcategories = Database::query($sqlcategories) or die;
-	while ($myrow = @ Database::fetch_array($resultcategories))
-	{
-		$sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
-		echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
-		$result_links = Database::query($sql_links);
-		while ($myrow = Database::fetch_array($result_links))
-		{
-			echo "<img src='../img/links.gif' />".$myrow["title"];
-			echo "<br>";
-			showorhide_addresourcelink($content, $myrow["id"]);
-			echo "<br><br>";
-		}
-	}
+    // including the links language file
+    include ("../lang/$language/link.inc.php");
+
+    $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
+    if (($learnpath_id != '') and ($content == 'Link'))
+    {
+        echo "<form name='learnpath_link'><table>";
+        echo "<tr></td><td align='left'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target' onchange='targetfunc()'><option value='_self' ";
+        if ($target == '_self')
+        {
+            echo "selected";
+        }
+        echo ">".get_lang('SameWindow')."</option><option value='_blank'";
+        if ($target == '_blank')
+        {
+            echo "selected";
+        }
+        echo ">".get_lang('NewWindow')."</option></select></td></tr></table></form>";
+    }
+
+    // showing the links that are in the root (having no category)
+    $sql = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE (l.category_id=0 or l.category_id IS NULL) AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1'";
+    $result = Database::query($sql);
+    if (Database::num_rows($result) > 0)
+    {
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".get_lang('NoCategory')."</i></td></tr></table>";
+        while ($myrow = Database::fetch_array($result))
+        {
+            echo "<img src='../img/links.gif'>".$myrow["title"];
+            echo "<br>";
+            showorhide_addresourcelink($content, $myrow["id"]);
+            echo "<br><br>";
+        }
+    }
+
+    // showing the categories and the links in it.
+    $sqlcategories = "SELECT * FROM ".$tbl_categories." ORDER by display_order DESC";
+    $resultcategories = Database::query($sqlcategories) or die;
+    while ($myrow = @ Database::fetch_array($resultcategories))
+    {
+        $sql_links = "SELECT * FROM ".$link_table." l, ".$item_property_table." ip WHERE l.category_id='".$myrow["id"]."' AND ip.tool = '".TOOL_LINK."' AND l.id=ip.ref AND ip.visibility='1' ORDER BY l.display_order DESC";
+        echo "<table width=\"100%\"><tr><td bgcolor=\"#E6E6E6\"><i>".$myrow["category_title"]."</i></td></tr></table>";
+        $result_links = Database::query($sql_links);
+        while ($myrow = Database::fetch_array($result_links))
+        {
+            echo "<img src='../img/links.gif' />".$myrow["title"];
+            echo "<br>";
+            showorhide_addresourcelink($content, $myrow["id"]);
+            echo "<br><br>";
+        }
+    }
 }
 
 /*
@@ -834,31 +834,31 @@ 
 */
 if (($content == "Exercise") or ($content == "HotPotatoes"))
 {
-	$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
-	$result = Database::query("SELECT * FROM ".$TBL_EXERCICES." WHERE active='1' ORDER BY id ASC");
-	while ($myrow = Database::fetch_array($result))
-	{
-		echo "<img src='../img/quiz.gif'>".$myrow["title"]."<br>";
-		showorhide_addresourcelink($content, $myrow["id"]);
-		echo "<br><br>";
-	}
+    $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+    $result = Database::query("SELECT * FROM ".$TBL_EXERCICES." WHERE active='1' ORDER BY id ASC");
+    while ($myrow = Database::fetch_array($result))
+    {
+        echo "<img src='../img/quiz.gif'>".$myrow["title"]."<br>";
+        showorhide_addresourcelink($content, $myrow["id"]);
+        echo "<br><br>";
+    }
+
+    if ($from_learnpath == 'yes')
+    {
+        $uploadPath = "/HotPotatoes_files";
+        $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
+        $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+        $sql = "SELECT * FROM ".$TBL_DOCUMENT." WHERE (path LIKE '%htm%' OR path LIKE '%html%') AND path LIKE '".$uploadPath."/%/%' ORDER BY id ASC";
+        $result = Database::query($sql);
+        while ($myrow = Database::fetch_array($result))
+        {
+            $path = $myrow["path"];
+            echo "<img src='../img/jqz.gif'>".GetQuizName($path, $documentPath)."<br>";
+            showorhide_addresourcelink("HotPotatoes", $myrow["id"]);
+            echo "<br><br>";
 
-	if ($from_learnpath == 'yes')
-	{
-		$uploadPath = "/HotPotatoes_files";
-		$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
-		$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-		$sql = "SELECT * FROM ".$TBL_DOCUMENT." WHERE (path LIKE '%htm%' OR path LIKE '%html%') AND path LIKE '".$uploadPath."/%/%' ORDER BY id ASC";
-		$result = Database::query($sql);
-		while ($myrow = Database::fetch_array($result))
-		{
-			$path = $myrow["path"];
-			echo "<img src='../img/jqz.gif'>".GetQuizName($path, $documentPath)."<br>";
-			showorhide_addresourcelink("HotPotatoes", $myrow["id"]);
-			echo "<br><br>";
-
-		}
-	}
+        }
+    }
 }
 
 /*
@@ -876,10 +876,10 @@ 
       <td align="left"><input name="external_link" type="text" id="external_link" value="http://"></td>
 	  <?php
 
-	if ($learnpath_id != '')
-	{
-		echo "</tr><tr><td align='right'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target'><option value='_self'>".get_lang('SameWindow')."</option><option value='_blank'>".get_lang('NewWindow')."</option></select></td>";
-	}
+    if ($learnpath_id != '')
+    {
+        echo "</tr><tr><td align='right'>".get_lang('LinkTarget')." :</td><td align='left'><select name='target'><option value='_self'>".get_lang('SameWindow')."</option><option value='_blank'>".get_lang('NewWindow')."</option></select></td>";
+    }
 ?>
 	</tr>
     <tr>
@@ -891,14 +891,14 @@ 
 	  <option value="0"><?php echo get_lang('MainCategory'); ?></option>
 		<?php
 
-	$tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
-	$sql = "SELECT * FROM $tbl_categories ORDER BY display_order ASC";
-	echo $sql;
-	$result = Database::query($sql);
-	while ($row = Database::fetch_array($result))
-	{
-		echo "<option value='".$row["id"]."'>".$row["category_title"]."</option>";
-	}
+    $tbl_categories = Database::get_course_table(TABLE_LINK_CATEGORY);
+    $sql = "SELECT * FROM $tbl_categories ORDER BY display_order ASC";
+    echo $sql;
+    $result = Database::query($sql);
+    while ($row = Database::fetch_array($result))
+    {
+        echo "<option value='".$row["id"]."'>".$row["category_title"]."</option>";
+    }
 ?>
 
       </select><?php } ?></td>
@@ -927,7 +927,7 @@ 
 */
 if ($content == "Assignment")
 {
-	echo "<a href=".api_get_self()."?content=Ass&add=Ass&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".get_lang('AddAssignmentPage')."</a>";
+    echo "<a href=".api_get_self()."?content=Ass&add=Ass&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".get_lang('AddAssignmentPage')."</a>";
 }
 
 /*
@@ -937,7 +937,7 @@ 
 */
 if ($content == "Dropbox")
 {
-	echo "<a href='".api_get_self()."?content=Drop&add=Drop&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('DropboxAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Drop&add=Drop&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('DropboxAdd')."</a>";
 }
 
 /*
@@ -947,7 +947,7 @@ 
 */
 if ($content == "Introduction_text")
 {
-	echo "<a href='".api_get_self()."?content=Intro&add=Intro&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('IntroductionTextAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Intro&add=Intro&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('IntroductionTextAdd')."</a>";
 }
 
 /*
@@ -957,7 +957,7 @@ 
 */
 if ($content == "Course_description")
 {
-	echo "<a href='".api_get_self()."?content=Course_desc&add=Course_desc&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('CourseDescriptionAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Course_desc&add=Course_desc&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('CourseDescriptionAdd')."</a>";
 }
 
 /*
@@ -967,7 +967,7 @@ 
 */
 if ($content == "Groups")
 {
-	echo "<a href='".api_get_self()."?content=Group&add=Group&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('$GroupsAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=Group&add=Group&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('$GroupsAdd')."</a>";
 }
 
 /*
@@ -977,13 +977,13 @@ 
 */
 if ($content == "Users")
 {
-	echo "<a href='".api_get_self()."?content=User&add=User&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('UsersAdd')."</a>";
+    echo "<a href='".api_get_self()."?content=User&add=User&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no'>".get_lang('UsersAdd')."</a>";
 }
 
 if ($showresources)
 {
-	//echo "<h4>".get_lang('ResourceAdded')."</h4>";
-	display_resources(1);
+    //echo "<h4>".get_lang('ResourceAdded')."</h4>";
+    display_resources(1);
 }
 
 echo "</td></tr></table>";

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_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