chamilo / chamilo-lms

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;
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 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) {
+	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'];

main/document/document_quota.php

Spacing +13 added lines, -13 removed lines

@@ -32,11 +32,11 @@ 
 $session = array();
 $user_name = $user_info['complete_name'];
 
-$course_list = SessionManager::get_course_list_by_session_id ($session_id);
+$course_list = SessionManager::get_course_list_by_session_id($session_id);
 $session_list = SessionManager::get_session_by_course($course_id);
 $total_quota_bytes = DocumentManager::get_course_quota();
-$quota_bytes = DocumentManager::documents_total_space($course_id, 0 , 0);
-$quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+$quota_bytes = DocumentManager::documents_total_space($course_id, 0, 0);
+$quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
 
 $session[] = array(get_lang('Course').' ('.format_file_size($quota_bytes).')', $quota_percentage);
 
@@ -46,11 +46,11 @@ 
     foreach ($session_list as $session_data) {
         $quota_percentage = 0;
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, null, $session_data['id']));
-        if (!empty($quota_bytes))  {
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+        if (!empty($quota_bytes)) {
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
         }
         if ($session_id == $session_data['id']) {
-            $session_data['name'] = $session_data['name'] . ' * ';
+            $session_data['name'] = $session_data['name'].' * ';
         }
         $used_quota_bytes += $quota_bytes;
         $session[] = array(
@@ -66,11 +66,11 @@ 
         $quota_percentage = 0;
         $my_group_id = $group_data['id'];
         $quota_bytes = intval(DocumentManager::documents_total_space($course_id, $my_group_id, 0));
-        if (!empty($quota_bytes))  {
-            $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+        if (!empty($quota_bytes)) {
+            $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
         }
         if ($group_id == $my_group_id) {
-            $group_data['name'] = $group_data['name'] . ' * ';
+            $group_data['name'] = $group_data['name'].' * ';
         }
         $used_quota_bytes += $quota_bytes;
         $session[] = array(addslashes(get_lang('Group').': '.$group_data['name']).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -85,7 +85,7 @@ 
         }
     }
     if ($quota_bytes != 0) {
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+       $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
     }
 
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -98,15 +98,15 @@ 
                 $total_quota_bytes += DocumentManager::get_course_quota($course_data['id']);
             }
             if ($quota_bytes != 0) {
-                $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+                $quota_percentage = round($quota_bytes / $total_quota_bytes, 2) * 100;
             }
         }
-        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
+        $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'), $user_name)), $quota_percentage);
 
    }
 }
 
-$quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;
+$quota_percentage = round(($total_quota_bytes - $used_quota_bytes) / $total_quota_bytes, 2) * 100;
 $session[] = array(addslashes(get_lang('ShowCourseQuotaUse')).' ('.format_file_size($total_quota_bytes - $used_quota_bytes).') ', $quota_percentage);
 $quota_data = json_encode($session);
 

Indentation +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
         }
     }
     if ($quota_bytes != 0) {
-       $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
+        $quota_percentage = round($quota_bytes/$total_quota_bytes, 2)*100;
     }
 
     $session[] = array(addslashes(get_lang('Teacher').': '.$user_name).' ('.format_file_size($quota_bytes).')', $quota_percentage);
@@ -103,7 +103,7 @@ 
         }
         $session[] = array(addslashes(sprintf(get_lang('TeacherXInSession'),$user_name)), $quota_percentage);
 
-   }
+    }
 }
 
 $quota_percentage = round(($total_quota_bytes - $used_quota_bytes)/$total_quota_bytes, 2)*100;

main/resourcelinker/resourcelinker.inc.php

Braces +75 added lines, -116 removed lines

@@ -69,8 +69,7 @@ 
 	if (api_is_allowed_to_edit())
 	{
 		$visibility="ip.visibility<>'2'";
-	}
-	else
+	} else
 	{
 		$visibility="ip.visibility='1'";
 	}
@@ -96,8 +95,7 @@ 
 				if (file_or_folder($row['path']))
 				{
 						echo '<img src="../img/file.gif" align="middle" />';
-				}
-				else
+				} else
 				{
 					$image = choose_image($row['path']);
 					echo "<img src=\"../img/$image\" align=\"middle\" />";
@@ -108,16 +106,14 @@ 
 				{
 					echo "<a href='".api_get_self()."?content=Document";
 					echo "&amp;folder=".substr($row['path'],1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'],1).'</a><br />';
-				}
-				else
+				} else
 				{
 					echo substr($row['path'],1).' ';
 					echo showorhide_addresourcelink('Document',$row['id']);
 					echo '<br />';
 				}
 			}
-		}
-		else
+		} else
 		{
 			// we calculate the level we are in by using the $folder in the url
 			// we put +1 because it does not start with an / and in the database it does
@@ -156,8 +152,7 @@ 
 				if (file_or_folder($path))
 				{
 					echo '<img src="../img/file.gif" align="middle" />';
-				}
-				else
+				} else
 				{
 					$image = choose_image($path);
 					echo "<img src=\"../img/$image\" align=\"middle\" />";
@@ -172,8 +167,7 @@ 
 					//using the correct name of the folder
 					$folder_name=str_replace($folder.'/','',$path);
 					echo "<a href='$newuri'>".$folder_name.'</a><br />';
-				}
-				else
+				} else
 				{
 					echo str_replace("/$folder/", '',$path).' ';
 					echo showorhide_addresourcelink('Document',$good_ids[$good_key]);
@@ -349,9 +343,14 @@ 
 
 	$length = ((($builder == 'builder') and ($icon == 'nolink')) ? 65 : 32);
 
-	if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
+	if ($builder != 'builder') {
+	    $origin = 'learnpath';
+	}
+	//origin = learnpath in student view
 	$linktype = $type;
-	if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
+	if (($type == 'Link _self') or ($type == 'Link _blank')) {
+	    $type = 'Link';
+	}
 
 	switch ($type)
 	{
@@ -371,7 +370,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -391,14 +390,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
 			}
@@ -426,7 +423,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -450,14 +447,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title,($length-3*$level))."</a>";
 			}
@@ -479,7 +474,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -495,8 +490,7 @@ 
 			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
 			if ($icon == 'icon')
 			{
-				if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
-				   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
+				if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; } else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
 			}
 			$thelink=$myrow["url"];
 			if ($builder != 'builder')
@@ -508,14 +502,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
 			}
@@ -540,7 +532,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -563,14 +555,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "<a href=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
 			}
@@ -598,7 +588,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -621,14 +611,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "&nbsp;<a href=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
 			}
@@ -650,7 +638,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -671,14 +659,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
 			}
@@ -704,7 +690,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -724,14 +710,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
 			}
@@ -765,7 +749,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -788,14 +772,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>";
 			}
@@ -816,7 +798,7 @@ 
 			if ($icon != 'nolink') {
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -844,22 +826,19 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				} $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
-			}
-			else
+			} else
 			{
 				$enableDocumentParsing='yes';
 				if (!$enableDocumentParsing)
 				{ //this is the solution for the non-parsing version in the builder
 					$file=urlencode($myrow["path"]);
 					echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
-				}
-				else
+				} else
 				{
 					echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
 				}
@@ -879,7 +858,7 @@ 
 			{
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -901,14 +880,12 @@ 
 					if ($icon != 'wrap')
 					{
 						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
+					} else
 					{
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
 					}
 				}
-			}
-			else
+			} else
 			{
 				echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
 			}
@@ -925,7 +902,7 @@ 
 			if ($icon != 'nolink') {
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -942,8 +919,7 @@ 
 				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
 				}
 			} else {
@@ -962,7 +938,7 @@ 
 			if ($icon != 'nolink') {
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -980,8 +956,7 @@ 
 				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
 				}
 			} else {
@@ -1001,7 +976,7 @@ 
 			if ($icon != 'nolink') {
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -1018,8 +993,7 @@ 
 				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
 				}
 			} else {
@@ -1039,7 +1013,7 @@ 
 			if ($icon != 'nolink') {
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -1056,8 +1030,7 @@ 
 				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
 				}
 			} else {
@@ -1076,7 +1049,7 @@ 
 			if ($icon != 'nolink') {
 				if ($completed=='completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
@@ -1093,8 +1066,7 @@ 
 				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; } else {
 						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
 				}
 			} else {
@@ -1144,8 +1116,7 @@ 
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
-			}
-			else
+			} else
 			{
 				$link .= "../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id";
 			}
@@ -1159,8 +1130,7 @@ 
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$id#$id_in_path";
-			}
-			else
+			} else
 			{
 				$link .= "../announcements/announcements.php?origin=$origin&ann_id=$id";
 			}
@@ -1178,8 +1148,7 @@ 
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
-			}
-			else
+			} else
 			{
 				$link .= $thelink;
 			}
@@ -1200,8 +1169,7 @@ 
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
-			}
-			else
+			} else
 			{
 				$link .= "../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"];
 			}
@@ -1222,8 +1190,7 @@ 
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
-			}
-			else
+			} else
 			{
 				$link .= "../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."";
 			}
@@ -1247,8 +1214,7 @@ 
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
-			}
-			else
+			} else
 			{
 				$link .= "../phpbb/viewforum.php?$forumparameters";
 			}
@@ -1269,8 +1235,7 @@ 
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
-			}
-			else
+			} else
 			{
 				$link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
 			}
@@ -1326,16 +1291,14 @@ 
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
 
-			}
-			else
+			} else
 			{
 				$enableDocumentParsing='yes';
 				if (!$enableDocumentParsing)
 				{ //this is the solution for the non-parsing version in the builder
 					$file=urlencode($myrow["path"]);
 					$link .= "../document/showinframes.php?file=$file";
-				}
-				else
+				} else
 				{
 					$link .= "../document/download.php?doc_url=".$myrow["path"];
 				}
@@ -1346,8 +1309,7 @@ 
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
-			}
-			else
+			} else
 			{
 				$link .= "../work/work.php";
 			}
@@ -1472,11 +1434,12 @@ 
 	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
 	$result=Database::query($sql);
 	$number_added=Database::num_rows($result);
-	if ($number_added<>0)
-		return true;
-	else
-		return false;
-}
+	if ($number_added<>0) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 
 /**
@@ -1540,8 +1503,7 @@ 
 		if ($origin != 'learnpath')
 		{
 			display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
-		}
-		else
+		} else
 		{
 			display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
 		}
@@ -1616,8 +1578,7 @@ 
 			//$_SESSION['edit']=='';
 		}
 		echo '</table>';
-	}
-	else // it is a string
+	} else // it is a string
 	{
 		echo '';
 	}
@@ -1661,14 +1622,12 @@ 
 			if ($type=="Document")
 			{
 				echo "<a href=".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".$lang_add_it_or_resource."</a>";
-			}
-			else
+			} else
 			{
 				echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
 			}
 		}
-	}
-	else // if it is not an array, it is a string
+	} else // if it is not an array, it is a string
 	{
 		if ($_SESSION['addedresource']!==$type or $_SESSION['addedresourceid']!==$id)
 		{

Doc Comments +6 added lines, -2 removed lines

@@ -205,8 +205,8 @@ 
 /**
  * Inserts a resource into the database
  *
- * @param $source_type
- * @param $source_id
+ * @param string $source_type
+ * @param integer $source_id
  */
 function store_resources($source_type, $source_id)
 {
@@ -338,6 +338,10 @@ 
 * @param icon        - if ="icon" then the small icon will appear
 *                      if ="wrap" then wrapped settings are used (and no icon is displayed)
 *                      if ="nolink" then only the name is returned with no href and no icon (note:only in this case, the result is not displayed, but returned)
+* @param string $completed
+* @param string $id_in_path
+* @param string $builder
+* @param string $icon
 * @todo this function is too long, rewrite
 */
 function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0)

Indentation +1387 added lines, -1387 removed lines

@@ -24,10 +24,10 @@ 
 */
 
 function unset_session_resources() {
-	$_SESSION['addedresource']='';
-	$_SESSION['addedresourceid']='';
-	Session::erase('addedresource');
-	Session::erase('addedresourceid');
+    $_SESSION['addedresource']='';
+    $_SESSION['addedresourceid']='';
+    Session::erase('addedresource');
+    Session::erase('addedresourceid');
 }
 
 /**
@@ -35,24 +35,24 @@ 
  */
 function show_folder_up()
 {
-	global $folder;
-	global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
-
-	$level = get_levels($folder);
-
-	if ($level == 1)
-	{
-		echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
-	}
-	if ($level and $level != 0 and $level != 1)
-	{
-		$folder_up=$folder;
-		$folder_temp=explode('/',$folder);
-		$last=count($folder_temp)-1;
-		unset($folder_temp[$last]);
-		$folder_up=implode('/',$folder_temp);
-		echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;folder=$folder_up&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
-	}
+    global $folder;
+    global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
+
+    $level = get_levels($folder);
+
+    if ($level == 1)
+    {
+        echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
+    }
+    if ($level and $level != 0 and $level != 1)
+    {
+        $folder_up=$folder;
+        $folder_temp=explode('/',$folder);
+        $last=count($folder_temp)-1;
+        unset($folder_temp[$last]);
+        $folder_up=implode('/',$folder_temp);
+        echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;folder=$folder_up&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
+    }
 }
 
 /**
@@ -61,23 +61,23 @@ 
  */
 function show_documents($folder)
 {
-	global $_course;
-	global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
-
-	// documents are a special case: the teacher can add an invisible document (it will be viewable by the user)
-	// other tools do not have this feature. This only counts
-	if (api_is_allowed_to_edit())
-	{
-		$visibility="ip.visibility<>'2'";
-	}
-	else
-	{
-		$visibility="ip.visibility='1'";
-	}
-
-	$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
-	$document_table = Database::get_course_table(TABLE_DOCUMENT);
-	$sql = "SELECT * from $document_table docs, $item_property_table ip
+    global $_course;
+    global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
+
+    // documents are a special case: the teacher can add an invisible document (it will be viewable by the user)
+    // other tools do not have this feature. This only counts
+    if (api_is_allowed_to_edit())
+    {
+        $visibility="ip.visibility<>'2'";
+    }
+    else
+    {
+        $visibility="ip.visibility='1'";
+    }
+
+    $item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
+    $document_table = Database::get_course_table(TABLE_DOCUMENT);
+    $sql = "SELECT * from $document_table docs, $item_property_table ip
 			WHERE
 			    docs.id=ip.ref AND
 			    ip.tool = '".TOOL_DOCUMENT."' AND
@@ -85,104 +85,104 @@ 
 			    (ip.to_group_id = 0 OR i.to_group_id IS NULL) AND
 			    ip.to_user_id IS NULL
 			ORDER BY docs.path ASC";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
-	{
-		if (!$folder)
-		{
-			if (get_levels($row['path'])-1==1)
-			{
-				// showing the right icon
-				if (file_or_folder($row['path']))
-				{
-						echo '<img src="../img/file.gif" align="middle" />';
-				}
-				else
-				{
-					$image = choose_image($row['path']);
-					echo "<img src=\"../img/$image\" align=\"middle\" />";
-				}
-
-				// folders should be clickable
-				if (file_or_folder($row['path']))
-				{
-					echo "<a href='".api_get_self()."?content=Document";
-					echo "&amp;folder=".substr($row['path'],1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'],1).'</a><br />';
-				}
-				else
-				{
-					echo substr($row['path'],1).' ';
-					echo showorhide_addresourcelink('Document',$row['id']);
-					echo '<br />';
-				}
-			}
-		}
-		else
-		{
-			// we calculate the level we are in by using the $folder in the url
-			// we put +1 because it does not start with an / and in the database it does
-			$level=get_levels($folder)+1;
-
-			// we calculate each level of the database entry
-			$file_level=get_levels($row['path'])-1;
-			// if the level of the database entry is equal to the level we ar in, we put it into an array
-			// as this is a potential good entry
-			if ($file_level==$level)
-			{
-				$good_paths[]=$row['path'];
-				$good_ids[]=$row['id'];
-			}
-			//$haystack=$row['path'];
-			//$conform_folder=strstr($haystack, $folder);
-			//if (str_replace($folder.'/','',$conform_folder)!==$folder)
-			//	{
-			//	$good_folders[]=$row['path'];
-				//echo str_replace($folder.'/','',$conform_folder);
-			//	echo '<br />';
-			//	}// if (str_replace($folder.'/','',$conform_folder)!==$folder)
-		} // else (if (!$folder))
-	} //while ($row=Database::fetch_array($result))
-
-	// this is code for the case that we are in a subfolder
-	if ($good_paths)
-	{
-		// we have all the potential good database entries, the good ones are those that start with $folder
-		foreach ($good_paths as $path)
-		{
-			if (strstr($path,$folder))
-			{
-				$good_key=key($good_paths);
-				// showing the right icon
-				if (file_or_folder($path))
-				{
-					echo '<img src="../img/file.gif" align="middle" />';
-				}
-				else
-				{
-					$image = choose_image($path);
-					echo "<img src=\"../img/$image\" align=\"middle\" />";
-				}
-
-				// folders should be clickable
-				if (file_or_folder($path))
-				{
-					$path=substr($path,1); // remove the first / in folder_up
-					$uri=str_replace($folder,$path,$_SERVER['REQUEST_URI']);
-					$newuri=str_replace('add=','addnot=',$uri);
-					//using the correct name of the folder
-					$folder_name=str_replace($folder.'/','',$path);
-					echo "<a href='$newuri'>".$folder_name.'</a><br />';
-				}
-				else
-				{
-					echo str_replace("/$folder/", '',$path).' ';
-					echo showorhide_addresourcelink('Document',$good_ids[$good_key]);
-					echo '<br />';
-				}
-			}
-			next($good_paths);
-		}
-	}
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))
+    {
+        if (!$folder)
+        {
+            if (get_levels($row['path'])-1==1)
+            {
+                // showing the right icon
+                if (file_or_folder($row['path']))
+                {
+                        echo '<img src="../img/file.gif" align="middle" />';
+                }
+                else
+                {
+                    $image = choose_image($row['path']);
+                    echo "<img src=\"../img/$image\" align=\"middle\" />";
+                }
+
+                // folders should be clickable
+                if (file_or_folder($row['path']))
+                {
+                    echo "<a href='".api_get_self()."?content=Document";
+                    echo "&amp;folder=".substr($row['path'],1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'],1).'</a><br />';
+                }
+                else
+                {
+                    echo substr($row['path'],1).' ';
+                    echo showorhide_addresourcelink('Document',$row['id']);
+                    echo '<br />';
+                }
+            }
+        }
+        else
+        {
+            // we calculate the level we are in by using the $folder in the url
+            // we put +1 because it does not start with an / and in the database it does
+            $level=get_levels($folder)+1;
+
+            // we calculate each level of the database entry
+            $file_level=get_levels($row['path'])-1;
+            // if the level of the database entry is equal to the level we ar in, we put it into an array
+            // as this is a potential good entry
+            if ($file_level==$level)
+            {
+                $good_paths[]=$row['path'];
+                $good_ids[]=$row['id'];
+            }
+            //$haystack=$row['path'];
+            //$conform_folder=strstr($haystack, $folder);
+            //if (str_replace($folder.'/','',$conform_folder)!==$folder)
+            //	{
+            //	$good_folders[]=$row['path'];
+                //echo str_replace($folder.'/','',$conform_folder);
+            //	echo '<br />';
+            //	}// if (str_replace($folder.'/','',$conform_folder)!==$folder)
+        } // else (if (!$folder))
+    } //while ($row=Database::fetch_array($result))
+
+    // this is code for the case that we are in a subfolder
+    if ($good_paths)
+    {
+        // we have all the potential good database entries, the good ones are those that start with $folder
+        foreach ($good_paths as $path)
+        {
+            if (strstr($path,$folder))
+            {
+                $good_key=key($good_paths);
+                // showing the right icon
+                if (file_or_folder($path))
+                {
+                    echo '<img src="../img/file.gif" align="middle" />';
+                }
+                else
+                {
+                    $image = choose_image($path);
+                    echo "<img src=\"../img/$image\" align=\"middle\" />";
+                }
+
+                // folders should be clickable
+                if (file_or_folder($path))
+                {
+                    $path=substr($path,1); // remove the first / in folder_up
+                    $uri=str_replace($folder,$path,$_SERVER['REQUEST_URI']);
+                    $newuri=str_replace('add=','addnot=',$uri);
+                    //using the correct name of the folder
+                    $folder_name=str_replace($folder.'/','',$path);
+                    echo "<a href='$newuri'>".$folder_name.'</a><br />';
+                }
+                else
+                {
+                    echo str_replace("/$folder/", '',$path).' ';
+                    echo showorhide_addresourcelink('Document',$good_ids[$good_key]);
+                    echo '<br />';
+                }
+            }
+            next($good_paths);
+        }
+    }
 }
 
 /**
@@ -193,13 +193,13 @@ 
  */
 function file_or_folder($filefolder)
 {
-	global $_course;
-	global $baseServDir;
+    global $_course;
+    global $baseServDir;
 
-	$courseDir   = $_course['path'].'/document';
-	$baseWorkDir = api_get_path(SYS_COURSE_PATH).$courseDir;
+    $courseDir   = $_course['path'].'/document';
+    $baseWorkDir = api_get_path(SYS_COURSE_PATH).$courseDir;
 
-	return (is_dir($baseWorkDir.$filefolder) ? 1 : 0);
+    return (is_dir($baseWorkDir.$filefolder) ? 1 : 0);
 }
 
 /**
@@ -210,23 +210,23 @@ 
  */
 function store_resources($source_type, $source_id)
 {
-	global $_course;
-	$resource_table = Database::get_course_table(TABLE_LINKED_RESOURCES);
-
-	$addedresource = $_SESSION['addedresource'];
-	$addedresourceid = $_SESSION['addedresourceid'];
-	if ($_SESSION['addedresource'])
-	{
-		foreach ($addedresource as $resource_type)
-		{
-			$sql="INSERT INTO $resource_table (source_type, source_id, resource_type, resource_id) VALUES ('$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
-			Database::query($sql);
-			$i=key($addedresource);
-			next($addedresource);
-		}
-		$_SESSION['addedresource']='';
-		$_SESSION['addedresourceid']='';
-	}
+    global $_course;
+    $resource_table = Database::get_course_table(TABLE_LINKED_RESOURCES);
+
+    $addedresource = $_SESSION['addedresource'];
+    $addedresourceid = $_SESSION['addedresourceid'];
+    if ($_SESSION['addedresource'])
+    {
+        foreach ($addedresource as $resource_type)
+        {
+            $sql="INSERT INTO $resource_table (source_type, source_id, resource_type, resource_id) VALUES ('$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
+            Database::query($sql);
+            $i=key($addedresource);
+            next($addedresource);
+        }
+        $_SESSION['addedresource']='';
+        $_SESSION['addedresourceid']='';
+    }
 }
 
 /**
@@ -240,87 +240,87 @@ 
  */
 function display_addedresource_link($type, $id, $style='')
 {
-	global $_course;
+    global $_course;
 
-	// styling the link of the added resource
-	if ($style <> '')
-	{
-		$styling = ' class="'.$style.'"';
-	}
+    // styling the link of the added resource
+    if ($style <> '')
+    {
+        $styling = ' class="'.$style.'"';
+    }
 
     $course_id = api_get_course_int_id();
 
-	switch ($type)
-	{
-		case 'Agenda':
-			$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
-			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id=$id");
-			$myrow = Database::fetch_array($result);
-			echo '<img src="../img/agenda.gif" align="middle" /> <a href="../calendar/agenda.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
-			break;
-		case 'Ad_Valvas':
-			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
-			$result = Database::query("SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id=$id");
-			$myrow = Database::fetch_array($result);
-			echo '<img src="../img/valves.gif" align="middle" /> <a href="../announcements/announcements.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
-			break;
-		case 'Link':Database::get_course_table(TABLE_LINK);
-			$result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
-			$myrow = Database::fetch_array($result);
-			echo '<img src="../img/links.gif" align="middle" /> <a href="#" onclick="javascript:window.open(\'../link/link_goto.php?link_id='.$myrow['id'].'&amp;link_url='.urlencode($myrow['url'])."','MyWindow','width=500,height=400,top='+((screen.height-400)/2)+',left='+((screen.width-500)/2)+',scrollbars=1,resizable=1,menubar=1'); return false;\"".$styling.'>'.$myrow['title']."</a><br />\n";
-			break;
-		case 'Exercise':
-			$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
-			$result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND  id=$id");
-			$myrow = Database::fetch_array($result);
-			echo '<img src="../img/quiz.gif" align="middle" /> <a href="../exercise/exercise_submit.php?exerciseId='.$myrow['id'].'"'.$styling.'>'.$myrow['title']."</a><br />\n";
-			break;
-		case 'Forum':
-			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
-			$result = Database::query("SELECT * FROM $TBL_FORUMS WHERE c_id = $course_id AND forum_id=$id");
-			$myrow = Database::fetch_array($result);
-			echo '<img src="../img/forum.gif" align="middle" /> <a href="../forum/viewforum.php?forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow['forum_name']."</a><br />\n";
-			break;
-		case 'Thread':  //=topics
+    switch ($type)
+    {
+        case 'Agenda':
+            $TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
+            $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE c_id = $course_id AND id=$id");
+            $myrow = Database::fetch_array($result);
+            echo '<img src="../img/agenda.gif" align="middle" /> <a href="../calendar/agenda.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
+            break;
+        case 'Ad_Valvas':
+            $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
+            $result = Database::query("SELECT * FROM $tbl_announcement WHERE c_id = $course_id AND id=$id");
+            $myrow = Database::fetch_array($result);
+            echo '<img src="../img/valves.gif" align="middle" /> <a href="../announcements/announcements.php"'.$styling.'>'.$myrow['title']."</a><br />\n";
+            break;
+        case 'Link':Database::get_course_table(TABLE_LINK);
+            $result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE c_id = $course_id AND id=$id");
+            $myrow = Database::fetch_array($result);
+            echo '<img src="../img/links.gif" align="middle" /> <a href="#" onclick="javascript:window.open(\'../link/link_goto.php?link_id='.$myrow['id'].'&amp;link_url='.urlencode($myrow['url'])."','MyWindow','width=500,height=400,top='+((screen.height-400)/2)+',left='+((screen.width-500)/2)+',scrollbars=1,resizable=1,menubar=1'); return false;\"".$styling.'>'.$myrow['title']."</a><br />\n";
+            break;
+        case 'Exercise':
+            $TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+            $result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE c_id = $course_id AND  id=$id");
+            $myrow = Database::fetch_array($result);
+            echo '<img src="../img/quiz.gif" align="middle" /> <a href="../exercise/exercise_submit.php?exerciseId='.$myrow['id'].'"'.$styling.'>'.$myrow['title']."</a><br />\n";
+            break;
+        case 'Forum':
+            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
+            $result = Database::query("SELECT * FROM $TBL_FORUMS WHERE c_id = $course_id AND forum_id=$id");
+            $myrow = Database::fetch_array($result);
+            echo '<img src="../img/forum.gif" align="middle" /> <a href="../forum/viewforum.php?forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow['forum_name']."</a><br />\n";
+            break;
+        case 'Thread':  //=topics
         //deprecated
-			$tbl_posts		= $_course['dbNameGlu'].'bb_posts';
-			$tbl_posts_text	= $_course['dbNameGlu'].'bb_posts_text';
-			$TBL_FORUMS		= $_course['dbNameGlu'].'bb_forums';
-			$result = Database::query("SELECT * FROM $tbl_posts posts, $TBL_FORUMS forum WHERE forum.forum_id=posts.forum_id and post_id=$id");
-			$myrow = Database::fetch_array($result);
-			// grabbing the title of the post
-			$sql_title = "SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
-			$result_title = Database::query($sql_title);
-			$myrow_title = Database::fetch_array($result_title);
-			echo '<img src="../img/forum.gif" align="middle" /> <a href="../forum/viewtopic.php?topic='.$myrow['topic_id'].'&amp;forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow_title['post_title']."</a><br />\n";
-			break;
-		case 'Post':
+            $tbl_posts		= $_course['dbNameGlu'].'bb_posts';
+            $tbl_posts_text	= $_course['dbNameGlu'].'bb_posts_text';
+            $TBL_FORUMS		= $_course['dbNameGlu'].'bb_forums';
+            $result = Database::query("SELECT * FROM $tbl_posts posts, $TBL_FORUMS forum WHERE forum.forum_id=posts.forum_id and post_id=$id");
+            $myrow = Database::fetch_array($result);
+            // grabbing the title of the post
+            $sql_title = "SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
+            $result_title = Database::query($sql_title);
+            $myrow_title = Database::fetch_array($result_title);
+            echo '<img src="../img/forum.gif" align="middle" /> <a href="../forum/viewtopic.php?topic='.$myrow['topic_id'].'&amp;forum='.$myrow['forum_id'].'&amp;md5='.$myrow['md5'].'"'.$styling.'>'.$myrow_title['post_title']."</a><br />\n";
+            break;
+        case 'Post':
         //deprecated
-			$tbl_post = Database::get_course_table(TABLE_FORUM_POST);
-			$tbl_post_text = Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
-			$sql = "SELECT * FROM $tbl_post p, $tbl_post_text t WHERE p.post_id = t.post_id AND p.post_id = $id";
-			$result = Database::query($sql);
-			$post = Database::fetch_object($result);
-			echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$post->topic_id.'&amp;forum='.$post->forum_id.'"'.$styling.'>'.$post->post_title."</a><br />\n";
-			break;
-		case 'Document':
-			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
-			$result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
-			$myrow = Database::fetch_array($result);
-			$pathname = explode('/',$myrow['path']); // making a correct name for the link
-			$last = count($pathname) - 1;  // making a correct name for the link
-			$filename = $pathname[$last];  // making a correct name for the link
-			$image = choose_image($filename);
-			$ext = explode('.',$filename);
-			$ext = strtolower($ext[sizeof($ext)-1]);
-			$myrow['path'] = rawurlencode($myrow['path']);
-			$in_frames = in_array($ext, array('htm','html','gif','jpg','jpeg','png'));
-			echo '<img src="../img/'.$image.'" align="middle" /> <a href="../document/'.($in_frames ? 'showinframes.php?file=' : 'download.php?doc_url=').$myrow['path'].'"'.$styling.'>'.$filename."</a><br />\n";
-			break;
-		case 'Externallink':
-			echo '<img src="../img/links.gif" align="middle" /> <a href="'.$id.'"'.$styling.'>'.$id."</a><br />\n";
-			break;
-	}
+            $tbl_post = Database::get_course_table(TABLE_FORUM_POST);
+            $tbl_post_text = Database::get_course_table(TOOL_FORUM_POST_TEXT_TABLE);
+            $sql = "SELECT * FROM $tbl_post p, $tbl_post_text t WHERE p.post_id = t.post_id AND p.post_id = $id";
+            $result = Database::query($sql);
+            $post = Database::fetch_object($result);
+            echo '<img src="../img/forum.gif" align="middle" /> <a href="../phpbb/viewtopic.php?topic='.$post->topic_id.'&amp;forum='.$post->forum_id.'"'.$styling.'>'.$post->post_title."</a><br />\n";
+            break;
+        case 'Document':
+            $dbTable = Database::get_course_table(TABLE_DOCUMENT);
+            $result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
+            $myrow = Database::fetch_array($result);
+            $pathname = explode('/',$myrow['path']); // making a correct name for the link
+            $last = count($pathname) - 1;  // making a correct name for the link
+            $filename = $pathname[$last];  // making a correct name for the link
+            $image = choose_image($filename);
+            $ext = explode('.',$filename);
+            $ext = strtolower($ext[sizeof($ext)-1]);
+            $myrow['path'] = rawurlencode($myrow['path']);
+            $in_frames = in_array($ext, array('htm','html','gif','jpg','jpeg','png'));
+            echo '<img src="../img/'.$image.'" align="middle" /> <a href="../document/'.($in_frames ? 'showinframes.php?file=' : 'download.php?doc_url=').$myrow['path'].'"'.$styling.'>'.$filename."</a><br />\n";
+            break;
+        case 'Externallink':
+            echo '<img src="../img/links.gif" align="middle" /> <a href="'.$id.'"'.$styling.'>'.$id."</a><br />\n";
+            break;
+    }
 }
 
 /**
@@ -342,766 +342,766 @@ 
 */
 function display_addedresource_link_in_learnpath($type, $id, $completed, $id_in_path, $builder, $icon, $level = 0)
 {
-	global $learnpath_id, $tbl_learnpath_item, $items;
-	global $_course, $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid;
-
-	$hyperlink_target_parameter = ''; //or e.g. 'target="_blank"'
-
-	$length = ((($builder == 'builder') and ($icon == 'nolink')) ? 65 : 32);
-
-	if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
-	$linktype = $type;
-	if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
-
-	switch ($type)
-	{
-		case "Agenda":
-			$TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);
-			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-			$desc=$row['description'];
-			$agenda_id=$row['item_id'];
-			echo str_repeat("&nbsp;&gt;",$level);
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($myrow["title"]=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/agenda.gif' align=\"absmiddle\" alt='agenda'>"; }
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
-        		$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
-			}
-			break;
-
-		case "Ad_Valvas":
-			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
-			$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["content"]=$row['title']; }
-			$desc=$row['description'];
-			$ann_id=$row['item_id'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			// the title and the text are in the content field and we only want to display the title
-			list($title, $text)=split('<br>',$myrow['content']);
-			if ($title=='') { $title=$myrow['content']; }
-			$title=$myrow['title'];
-			$text=$myrow['content'];
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($title=='') {
-				$type="Announcement";
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
-				return(true);
-			}
-
-			if ($icon == 'nolink') { return(shorten($title,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/valves.gif' align=\"absmiddle\" alt='ad valvas'>"; }
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title,($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title,($length-3*$level))."</a>";
-			}
-			break;
-
-		case "Link" :
-			$TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
-			$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($myrow["title"]=='')
-			{
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
-				return(true);
-			}
-
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
-			if ($icon == 'icon')
-			{
-				if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
-				   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
-			}
-			$thelink=$myrow["url"];
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
-			}
-			break;
-
-		case "Exercise":
-			$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
-			$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			if ($builder=='builder') { $origin='builder'; }
-			  //this is needed for the exercise_submit.php can delete the session info about tests
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($myrow["title"]=='') {
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
-				return(true);
-			}
-
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/quiz.gif' align=\"absmiddle\" alt='quizz'>"; }
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "<a href=\"../exercise/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
-			}
-			break;
-
-		case "HotPotatoes":
-			$TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
-			$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-			$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
-			$myrow= Database::fetch_array($result);
-			$path=$myrow["path"];
-			$name=GetQuizName($path,$documentPath);
-
-			if ($builder=='builder') { $origin='builder'; }
-			  //this is needed for the exercise_submit.php can delete the session info about tests
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/jqz.gif' align=\"absmiddle\" alt='hot potatoes'>"; }
-
-			$cid = $_course['official_code'];
-
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "&nbsp;<a href=\"../exercise/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
-			}
-			break;
-
-		case "Forum":
-			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
-			$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($myrow["forum_name"]=='') { $type="Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($myrow["forum_name"],$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
-			$forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
-			}
-			break;
-
-		case "Thread":  //forum post
+    global $learnpath_id, $tbl_learnpath_item, $items;
+    global $_course, $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid;
+
+    $hyperlink_target_parameter = ''; //or e.g. 'target="_blank"'
+
+    $length = ((($builder == 'builder') and ($icon == 'nolink')) ? 65 : 32);
+
+    if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
+    $linktype = $type;
+    if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
+
+    switch ($type)
+    {
+        case "Agenda":
+            $TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);
+            $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
+            $desc=$row['description'];
+            $agenda_id=$row['item_id'];
+            echo str_repeat("&nbsp;&gt;",$level);
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($myrow["title"]=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/agenda.gif' align=\"absmiddle\" alt='agenda'>"; }
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
+            }
+            break;
+
+        case "Ad_Valvas":
+            $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
+            $result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["content"]=$row['title']; }
+            $desc=$row['description'];
+            $ann_id=$row['item_id'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            // the title and the text are in the content field and we only want to display the title
+            list($title, $text)=split('<br>',$myrow['content']);
+            if ($title=='') { $title=$myrow['content']; }
+            $title=$myrow['title'];
+            $text=$myrow['content'];
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($title=='') {
+                $type="Announcement";
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
+                return(true);
+            }
+
+            if ($icon == 'nolink') { return(shorten($title,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/valves.gif' align=\"absmiddle\" alt='ad valvas'>"; }
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title,($length-3*$level))."</a>";
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title,($length-3*$level))."</a>";
+            }
+            break;
+
+        case "Link" :
+            $TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
+            $result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($myrow["title"]=='')
+            {
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
+                return(true);
+            }
+
+            if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
+            if ($icon == 'icon')
+            {
+                if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
+                    else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
+            }
+            $thelink=$myrow["url"];
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
+            }
+            break;
+
+        case "Exercise":
+            $TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
+            $result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            if ($builder=='builder') { $origin='builder'; }
+                //this is needed for the exercise_submit.php can delete the session info about tests
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($myrow["title"]=='') {
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
+                return(true);
+            }
+
+            if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/quiz.gif' align=\"absmiddle\" alt='quizz'>"; }
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "<a href=\"../exercise/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
+            }
+            break;
+
+        case "HotPotatoes":
+            $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
+            $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+            $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
+            $myrow= Database::fetch_array($result);
+            $path=$myrow["path"];
+            $name=GetQuizName($path,$documentPath);
+
+            if ($builder=='builder') { $origin='builder'; }
+                //this is needed for the exercise_submit.php can delete the session info about tests
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $name=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/jqz.gif' align=\"absmiddle\" alt='hot potatoes'>"; }
+
+            $cid = $_course['official_code'];
+
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "&nbsp;<a href=\"../exercise/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+            }
+            break;
+
+        case "Forum":
+            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
+            $result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
+            $myrow=Database::fetch_array($result);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($myrow["forum_name"]=='') { $type="Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($myrow["forum_name"],$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
+            $forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
+            }
+            break;
+
+        case "Thread":  //forum post
         //deprecated
-			$tbl_topics      = $_course['dbNameGlu'].'bb_topics';
-			$tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
-			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
-			$sql="SELECT * FROM $tbl_topics where topic_id=$id";
-			$result= Database::query($sql);
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["topic_title"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($myrow["topic_title"]=='') { $type="Forum Post"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($myrow["topic_title"],$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
-			}
-			break;
-
-		case "Post":
+            $tbl_topics      = $_course['dbNameGlu'].'bb_topics';
+            $tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
+            $TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
+            $sql="SELECT * FROM $tbl_topics where topic_id=$id";
+            $result= Database::query($sql);
+            $myrow=Database::fetch_array($result);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["topic_title"]=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($myrow["topic_title"]=='') { $type="Forum Post"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($myrow["topic_title"],$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
+            }
+            break;
+
+        case "Post":
         //deprecated
-			$tbl_posts       = $_course['dbNameGlu'].'bb_posts';
-			$tbl_posts_text  = $_course['dbNameGlu'].'bb_posts_text';
-			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
-			$result= Database::query("SELECT * FROM $tbl_posts where post_id=$id");
-			$myrow=Database::fetch_array($result);
-			// grabbing the title of the post
-			$sql_titel="SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
-			$result_titel=Database::query($sql_titel);
-			$myrow_titel=Database::fetch_array($result_titel);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow_titel["post_title"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			$posternom=$myrow['nom'];				$posterprenom=$myrow['prenom'];
-			$posttime=$myrow['post_time'];			$posttext=$myrow_titel['post_text'];
-			$posttitle=$myrow_titel['post_title'];
-			$posttext = str_replace('"',"'",$posttext);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($myrow_titel["post_title"]=='')
-			{
-				$type="Forum";
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
-			}
-
-			if ($icon == 'nolink') { return(shorten($myrow_titel["post_title"],$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>";
-			}
-			break;
-
-		case "Document":
-			$dbTable  = Database::get_course_table(TABLE_DOCUMENT);
-			$result=Database::query("SELECT * FROM $dbTable WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			$pathname=explode("/",$myrow["path"]); // making a correct name for the link
-			$last=count($pathname)-1;  // making a correct name for the link
-			$filename=$pathname[$last];  // making a correct name for the link
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if ($icon != 'nolink') {
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-			$image=choose_image($filename);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $filename=$row['title']; }
-			$desc=$row['description'];
-
-			if (($myrow["path"]=='') and ($filename=='')) {
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
-				return(true);
-			}
-
-			if ($icon == 'nolink') { return(shorten($filename,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/$image' align=\"absmiddle\" alt='$image'>"; }
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename,($length-3*$level))."</a>";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				} $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
-			}
-			else
-			{
-				$enableDocumentParsing='yes';
-				if (!$enableDocumentParsing)
-				{ //this is the solution for the non-parsing version in the builder
-					$file=urlencode($myrow["path"]);
-					echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
-				}
-				else
-				{
-					echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
-				}
-			}
-			break;
-
-		case "Assignments":
-			$name=get_lang('Assignments');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink')
-			{
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($name=='')
-			{
-				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
-			}
-
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/works.gif' align=\"absmiddle\">"; }
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
-				if ($desc != '')
-				{
-					if ($icon != 'wrap')
-					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
-					}
-					else
-					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
-					}
-				}
-			}
-			else
-			{
-				echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
-			}
-			break;
-		case "Dropbox":
-			$name=get_lang('Dropbox');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink') {
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/dropbox.gif' align=\"absmiddle\">"; }
-
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
-				if ($desc != '') {
-					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
-				}
-			} else {
-				echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
-			}
-			break;
-		case "Introduction_text":
-			$name=get_lang('IntroductionText');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink') {
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/introduction.gif' align=\"absmiddle\" alt='introduction'>"; }
-
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
-				if ($desc != '') {
-					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
-				}
-			} else {
-				$s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
-				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
-			}
-			break;
-		case "Course_description":
-			$name=get_lang('CourseDescription');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink') {
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/info.gif' align=\"absmiddle\" alt='info'>"; }
-
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
-				if ($desc != '') {
-					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
-				}
-			} else {
-				$s=api_get_path(WEB_CODE_PATH)."course_description";
-				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
-			}
-			break;
-		case "Groups":
-			$name=get_lang('Groups');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink') {
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/group.gif' align=\"absmiddle\" alt='group'>"; }
-
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
-				if ($desc != '') {
-					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
-				}
-			} else {
-				echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
-			}
-			break;
-		case "Users":
-			$name=get_lang('Users');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
-
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
-			if ($icon != 'nolink') {
-				if ($completed=='completed') {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
-					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
-					//echo "&nbsp;";
-				}
-			}
-			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
-
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
-			if ($icon == 'icon') { echo "<img src='../img/members.gif' align=\"absmiddle\" alt='members'>"; }
-
-			if ($builder != 'builder')
-			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
-				if ($desc != '') {
-					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
-					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
-				}
-			} else {
-				echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
-			}
-			break;
-	}//end huge switch-statement
+            $tbl_posts       = $_course['dbNameGlu'].'bb_posts';
+            $tbl_posts_text  = $_course['dbNameGlu'].'bb_posts_text';
+            $TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
+            $result= Database::query("SELECT * FROM $tbl_posts where post_id=$id");
+            $myrow=Database::fetch_array($result);
+            // grabbing the title of the post
+            $sql_titel="SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
+            $result_titel=Database::query($sql_titel);
+            $myrow_titel=Database::fetch_array($result_titel);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow_titel["post_title"]=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            $posternom=$myrow['nom'];				$posterprenom=$myrow['prenom'];
+            $posttime=$myrow['post_time'];			$posttext=$myrow_titel['post_text'];
+            $posttitle=$myrow_titel['post_title'];
+            $posttext = str_replace('"',"'",$posttext);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($myrow_titel["post_title"]=='')
+            {
+                $type="Forum";
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
+            }
+
+            if ($icon == 'nolink') { return(shorten($myrow_titel["post_title"],$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>";
+            }
+            break;
+
+        case "Document":
+            $dbTable  = Database::get_course_table(TABLE_DOCUMENT);
+            $result=Database::query("SELECT * FROM $dbTable WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            $pathname=explode("/",$myrow["path"]); // making a correct name for the link
+            $last=count($pathname)-1;  // making a correct name for the link
+            $filename=$pathname[$last];  // making a correct name for the link
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if ($icon != 'nolink') {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+            $image=choose_image($filename);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $filename=$row['title']; }
+            $desc=$row['description'];
+
+            if (($myrow["path"]=='') and ($filename=='')) {
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
+                return(true);
+            }
+
+            if ($icon == 'nolink') { return(shorten($filename,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/$image' align=\"absmiddle\" alt='$image'>"; }
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename,($length-3*$level))."</a>";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                } $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
+            }
+            else
+            {
+                $enableDocumentParsing='yes';
+                if (!$enableDocumentParsing)
+                { //this is the solution for the non-parsing version in the builder
+                    $file=urlencode($myrow["path"]);
+                    echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
+                }
+                else
+                {
+                    echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
+                }
+            }
+            break;
+
+        case "Assignments":
+            $name=get_lang('Assignments');
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $name=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink')
+            {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($name=='')
+            {
+                echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
+            }
+
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/works.gif' align=\"absmiddle\">"; }
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
+                if ($desc != '')
+                {
+                    if ($icon != 'wrap')
+                    {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+                    }
+                    else
+                    {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+                    }
+                }
+            }
+            else
+            {
+                echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+            }
+            break;
+        case "Dropbox":
+            $name=get_lang('Dropbox');
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $name=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink') {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/dropbox.gif' align=\"absmiddle\">"; }
+
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
+                if ($desc != '') {
+                    if ($icon != 'wrap') {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+                    else {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+                }
+            } else {
+                echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+            }
+            break;
+        case "Introduction_text":
+            $name=get_lang('IntroductionText');
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $name=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink') {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/introduction.gif' align=\"absmiddle\" alt='introduction'>"; }
+
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
+                $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
+                if ($desc != '') {
+                    if ($icon != 'wrap') {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+                    else {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+                }
+            } else {
+                $s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
+                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+            }
+            break;
+        case "Course_description":
+            $name=get_lang('CourseDescription');
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $name=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink') {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/info.gif' align=\"absmiddle\" alt='info'>"; }
+
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
+                if ($desc != '') {
+                    if ($icon != 'wrap') {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+                    else {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+                }
+            } else {
+                $s=api_get_path(WEB_CODE_PATH)."course_description";
+                echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+            }
+            break;
+        case "Groups":
+            $name=get_lang('Groups');
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $name=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink') {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/group.gif' align=\"absmiddle\" alt='group'>"; }
+
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
+                if ($desc != '') {
+                    if ($icon != 'wrap') {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+                    else {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+                }
+            } else {
+                echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+            }
+            break;
+        case "Users":
+            $name=get_lang('Users');
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $name=$row['title']; }
+            $desc=$row['description'];
+            echo str_repeat("&nbsp;&gt;",$level);
+
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
+            if ($icon != 'nolink') {
+                if ($completed=='completed') {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
+                }	else {
+                    echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
+                    //echo "&nbsp;";
+                }
+            }
+            if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
+
+            if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+
+            if ($icon == 'nolink') { return(shorten($name,$length)); }
+            if ($icon == 'icon') { echo "<img src='../img/members.gif' align=\"absmiddle\" alt='members'>"; }
+
+            if ($builder != 'builder')
+            {
+                echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
+                if ($desc != '') {
+                    if ($icon != 'wrap') {
+                        echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+                    else {
+                        echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+                }
+            } else {
+                echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+            }
+            break;
+    }//end huge switch-statement
 }
 
 /**
@@ -1116,253 +1116,253 @@ 
 */
 function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
 {
-	global $_course, $learnpath_id, $tbl_learnpath_item, $items;
-	global $curDirPath, $_configuration, $enableDocumentParsing, $_user , $_cid;
-
-	$hyperlink_target_parameter = ""; //or e.g. target='_blank'
- $builder = 'player';
-	$origin='learnpath';
-
-	$linktype=$type;
-	if (($type=="Link _self") or ($type=="Link _blank")) { $type="Link"; }
-
- $link = '';
-
-	switch ($type)
-	{
-		case "Agenda":
-			$TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);;
-			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-			$desc=$row['description'];
-			$agenda_id=$row['item_id'];
-
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
-			}
-			else
-			{
-				$link .= "../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id";
-			}
-			break;
-
-		case "Ad_Valvas":
-			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
-			$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$id#$id_in_path";
-			}
-			else
-			{
-				$link .= "../announcements/announcements.php?origin=$origin&ann_id=$id";
-			}
-			break;
-
-		case "Link" :
-			$TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
-			$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-
-			$thelink=$myrow["url"];
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
-			}
-			else
-			{
-				$link .= $thelink;
-			}
-			break;
-
-		case "Exercise":
-			$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
-			$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			if ($builder=='builder') { $origin='builder'; }
-			  //this is needed for the exercise_submit.php can delete the session info about tests
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
-			}
-			else
-			{
-				$link .= "../exercise/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"];
-			}
-			break;
-
-		case "HotPotatoes":
-	  	    $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
-		    $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
-			$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
-		    $myrow= Database::fetch_array($result);
-		    $path=$myrow["path"];
-		  	$name=GetQuizName($path,$documentPath);
-
-			if ($builder=='builder') { $origin='builder'; }
-
-			$cid = $_course['official_code'];
-
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
-			}
-			else
-			{
-				$link .= "../exercise/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."";
-			}
-			break;
-
-		case "Forum":
+    global $_course, $learnpath_id, $tbl_learnpath_item, $items;
+    global $curDirPath, $_configuration, $enableDocumentParsing, $_user , $_cid;
+
+    $hyperlink_target_parameter = ""; //or e.g. target='_blank'
+    $builder = 'player';
+    $origin='learnpath';
+
+    $linktype=$type;
+    if (($type=="Link _self") or ($type=="Link _blank")) { $type="Link"; }
+
+    $link = '';
+
+    switch ($type)
+    {
+        case "Agenda":
+            $TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);;
+            $result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
+            $desc=$row['description'];
+            $agenda_id=$row['item_id'];
+
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
+            }
+            else
+            {
+                $link .= "../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id";
+            }
+            break;
+
+        case "Ad_Valvas":
+            $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
+            $result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$id#$id_in_path";
+            }
+            else
+            {
+                $link .= "../announcements/announcements.php?origin=$origin&ann_id=$id";
+            }
+            break;
+
+        case "Link" :
+            $TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
+            $result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+
+            $thelink=$myrow["url"];
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
+            }
+            else
+            {
+                $link .= $thelink;
+            }
+            break;
+
+        case "Exercise":
+            $TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
+            $result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
+            $myrow=Database::fetch_array($result);
+
+            if ($builder=='builder') { $origin='builder'; }
+                //this is needed for the exercise_submit.php can delete the session info about tests
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["title"]=$row['title']; }
+
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
+            }
+            else
+            {
+                $link .= "../exercise/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"];
+            }
+            break;
+
+        case "HotPotatoes":
+              $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
+            $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+            $result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
+            $myrow= Database::fetch_array($result);
+            $path=$myrow["path"];
+                $name=GetQuizName($path,$documentPath);
+
+            if ($builder=='builder') { $origin='builder'; }
+
+            $cid = $_course['official_code'];
+
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
+            }
+            else
+            {
+                $link .= "../exercise/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."";
+            }
+            break;
+
+        case "Forum":
         //deprecated
-			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
-			$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
-			$myrow=Database::fetch_array($result);
-
-			if ($builder=='builder') { $origin='builder'; }
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
-
-			if ($myrow["forum_name"]=='') { $type="Forum"; }
-
-			$forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
-			}
-			else
-			{
-				$link .= "../phpbb/viewforum.php?$forumparameters";
-			}
-			break;
-
-		case "Thread":  //forum post
+            $TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
+            $result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
+            $myrow=Database::fetch_array($result);
+
+            if ($builder=='builder') { $origin='builder'; }
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+            if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
+
+            if ($myrow["forum_name"]=='') { $type="Forum"; }
+
+            $forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
+            }
+            else
+            {
+                $link .= "../phpbb/viewforum.php?$forumparameters";
+            }
+            break;
+
+        case "Thread":  //forum post
         //deprecated
-			$tbl_topics      = $_course['dbNameGlu'].'bb_topics';
-			$tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
-			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
-			$sql="SELECT * FROM $tbl_topics where topic_id=$id";
-			$result= Database::query($sql);
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
-			}
-			else
-			{
-				$link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
-			}
-			break;
-		case "Post":
-			break;
-		case "Document":
-			$dbTable  = Database::get_course_table(TABLE_DOCUMENT);
-			$result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE);
-			$myrow=Database::fetch_array($result);
-
-			$pathname=explode("/",$myrow["path"]); // making a correct name for the link
-			$last=count($pathname)-1;  // making a correct name for the link
-			$filename=$pathname[$last];  // making a correct name for the link
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
-
-			}
-			else
-			{
-				$enableDocumentParsing='yes';
-				if (!$enableDocumentParsing)
-				{ //this is the solution for the non-parsing version in the builder
-					$file=urlencode($myrow["path"]);
-					$link .= "../document/showinframes.php?file=$file";
-				}
-				else
-				{
-					$link .= "../document/download.php?doc_url=".$myrow["path"];
-				}
-			}
-			break;
-
-		case "Assignments":
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
-			}
-			else
-			{
-				$link .= "../work/work.php";
-			}
-			break;
-		case "Dropbox":
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
-			} else {
-				$link .= "../dropbox/index.php";
-			}
-			break;
-		case "Introduction_text":
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
-			} else {
-				$s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
-				$link .= $s;
-			}
-			break;
-		case "Course_description":
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
-			} else {
-				$s=api_get_path(WEB_CODE_PATH)."course_description";
-				$link .= $s;
-			}
-			break;
-		case "Groups":
-
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
-			} else {
-				$link .= "../group/group.php?origin=$origin";
-			}
-			break;
-		case "Users":
-			if ($builder != 'builder')
-			{
-				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
-			} else {
-				$link .= "../user/user.php?origin=$origin";
-			}
-			break;
-	}//end huge switch-statement
+            $tbl_topics      = $_course['dbNameGlu'].'bb_topics';
+            $tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
+            $TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
+            $sql="SELECT * FROM $tbl_topics where topic_id=$id";
+            $result= Database::query($sql);
+            $myrow=Database::fetch_array($result);
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
+            }
+            else
+            {
+                $link .= "../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
+            }
+            break;
+        case "Post":
+            break;
+        case "Document":
+            $dbTable  = Database::get_course_table(TABLE_DOCUMENT);
+            $result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE);
+            $myrow=Database::fetch_array($result);
+
+            $pathname=explode("/",$myrow["path"]); // making a correct name for the link
+            $last=count($pathname)-1;  // making a correct name for the link
+            $filename=$pathname[$last];  // making a correct name for the link
+
+            $sql="select * from $tbl_learnpath_item where id=$id_in_path";
+            $result=Database::query($sql);	$row=Database::fetch_array($result);
+
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
+
+            }
+            else
+            {
+                $enableDocumentParsing='yes';
+                if (!$enableDocumentParsing)
+                { //this is the solution for the non-parsing version in the builder
+                    $file=urlencode($myrow["path"]);
+                    $link .= "../document/showinframes.php?file=$file";
+                }
+                else
+                {
+                    $link .= "../document/download.php?doc_url=".$myrow["path"];
+                }
+            }
+            break;
+
+        case "Assignments":
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
+            }
+            else
+            {
+                $link .= "../work/work.php";
+            }
+            break;
+        case "Dropbox":
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
+            } else {
+                $link .= "../dropbox/index.php";
+            }
+            break;
+        case "Introduction_text":
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
+            } else {
+                $s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
+                $link .= $s;
+            }
+            break;
+        case "Course_description":
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
+            } else {
+                $s=api_get_path(WEB_CODE_PATH)."course_description";
+                $link .= $s;
+            }
+            break;
+        case "Groups":
+
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
+            } else {
+                $link .= "../group/group.php?origin=$origin";
+            }
+            break;
+        case "Users":
+            if ($builder != 'builder')
+            {
+                $link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
+            } else {
+                $link .= "../user/user.php?origin=$origin";
+            }
+            break;
+    }//end huge switch-statement
     return $link;
 }
 
@@ -1371,12 +1371,12 @@ 
 */
 function remove_resource($resource_key)
 {
-	$addedresource = $_SESSION['addedresource'];
-	$addedresourceid = $_SESSION['addedresourceid'];
-	unset($addedresource[$resource_key]);
-	unset($addedresourceid[$resource_key]);
-	$_SESSION['addedresource']=$addedresource;
-	$_SESSION['addedresourceid']=$addedresourceid ;
+    $addedresource = $_SESSION['addedresource'];
+    $addedresourceid = $_SESSION['addedresourceid'];
+    unset($addedresource[$resource_key]);
+    unset($addedresourceid[$resource_key]);
+    $_SESSION['addedresource']=$addedresource;
+    $_SESSION['addedresourceid']=$addedresourceid ;
 }
 
 /**
@@ -1385,8 +1385,8 @@ 
 */
 function show_addresource_button($additionalparameters = '')
 {
-	global $charset;
-	echo '<label for="addresources"><img src="../img/attachment.gif" /></label><input class="link_alike" type="submit" name="addresources" id="addresources" value="'.api_htmlentities(get_lang('Attachment'), ENT_QUOTES, $charset).'" '.$additionalparameters.' />';
+    global $charset;
+    echo '<label for="addresources"><img src="../img/attachment.gif" /></label><input class="link_alike" type="submit" name="addresources" id="addresources" value="'.api_htmlentities(get_lang('Attachment'), ENT_QUOTES, $charset).'" '.$additionalparameters.' />';
 }
 
 /**
@@ -1408,11 +1408,11 @@ 
 */
 function delete_added_resource($type, $id)
 {
-	global $_course;
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+    global $_course;
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
 
-	$sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
-	Database::query($sql);
+    $sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
+    Database::query($sql);
 }
 
 /**
@@ -1421,12 +1421,12 @@ 
 */
 function delete_all_resources_type($type)
 {
-  global $_course;
-  $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+    global $_course;
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
 
-  $sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
+    $sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
 
-  Database::query($sql);
+    Database::query($sql);
 }
 
 /**
@@ -1434,15 +1434,15 @@ 
 */
 function check_added_resources($type, $id)
 {
-	global $_course, $origin;
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
-	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
-	$result=Database::query($sql);
-	$number_added=Database::num_rows($result);
-	if ($number_added<>0)
-		return true;
-	else
-		return false;
+    global $_course, $origin;
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+    $sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
+    $result=Database::query($sql);
+    $number_added=Database::num_rows($result);
+    if ($number_added<>0)
+        return true;
+    else
+        return false;
 }
 
 
@@ -1452,18 +1452,18 @@ 
 */
 function edit_added_resources($type, $id)
 {
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
     $course_id = api_get_course_int_id();
     $id = intval($id);
     $type = Database::escape_string($type);
-	$sql="SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))	{
-		$addedresource[]=$row["resource_type"];
-		$addedresourceid[]=$row["resource_id"];
-	}
-	$_SESSION['addedresource']=$addedresource;
-	$_SESSION['addedresourceid']=$addedresourceid;
+    $sql="SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))	{
+        $addedresource[]=$row["resource_type"];
+        $addedresourceid[]=$row["resource_id"];
+    }
+    $_SESSION['addedresource']=$addedresource;
+    $_SESSION['addedresourceid']=$addedresourceid;
 }
 
 /**
@@ -1473,20 +1473,20 @@ 
 */
 function update_added_resources($type, $id)
 {
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
     $course_id = api_get_course_int_id();
     $id = intval($id);
     $type = Database::escape_string($type);
-	// delete all the added resources for this item in the database;
-	$sql="DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' AND source_id='$id'";
-	//echo $sql;
-	Database::query($sql);
+    // delete all the added resources for this item in the database;
+    $sql="DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' AND source_id='$id'";
+    //echo $sql;
+    Database::query($sql);
 
-	// store the resources from the session into the database
-	store_resources($type, $id);
+    // store the resources from the session into the database
+    store_resources($type, $id);
 
-	//delete_added_resource_($type, $id);
-	unset_session_resources();
+    //delete_added_resource_($type, $id);
+    unset_session_resources();
 }
 
 /**
@@ -1494,25 +1494,25 @@ 
 */
 function display_added_resources($type, $id, $style='')
 {
-	// the array containing the icons
-	$arr_icons=array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif' );
-
-	global $_course, $origin;
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
-
-	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
-	{
-		if ($origin != 'learnpath')
-		{
-			display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
-		}
-		else
-		{
-			display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
-		}
-	}
+    // the array containing the icons
+    $arr_icons=array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif' );
+
+    global $_course, $origin;
+    $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+
+    $sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
+    $result=Database::query($sql);
+    while ($row=Database::fetch_array($result))
+    {
+        if ($origin != 'learnpath')
+        {
+            display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
+        }
+        else
+        {
+            display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
+        }
+    }
 }
 
 
@@ -1523,15 +1523,15 @@ 
 */
 function display_resources($showdeleteimg)
 {
-	global $action;
-	global $resourceaction;
-	global $id;
-	global $locationkey;
-	global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
-
-	if ($resourceaction=="removeresource")
-	{
-		/* unneccessary because when editing we delete all the added resources from the
+    global $action;
+    global $resourceaction;
+    global $id;
+    global $locationkey;
+    global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
+
+    if ($resourceaction=="removeresource")
+    {
+        /* unneccessary because when editing we delete all the added resources from the
 		database and add all these from the session
 		if ($action=="edit") // we have an edit and thus we delete from the database and from the session
 		{
@@ -1547,41 +1547,41 @@ 
 		}
 		else // we remove from the session
 		{*/
-		//echo "remove from session";
-		remove_resource($locationkey);
-	}
-	$addedresource=$_SESSION['addedresource'];
-	$addedresourceid=$_SESSION['addedresourceid'];
-	if (is_array($addedresource))
-	{
-		echo '<table>';
-		foreach ($addedresource as $resource)
-		{
-			//echo $resource.":".$addedresourceid[key($addedresource)];
-			echo '<tr><td>';
-			display_addedresource_link($resource,$addedresourceid[key($addedresource)]);
-			echo '</td><td width="30">';
-
-			// if $_SERVER['REQUEST_URI'] contains and ?id=xx we have an edit and the url for deleting a session added resource
-			// should also contain this id.
-			$test=parse_url($_SERVER['REQUEST_URI']);
-			$output = array();
-			parse_str($test['query'],$output);
-
-			if ($showdeleteimg==1)
-			{
-				echo "<a href=".api_get_self()."?showresources=true&amp;source_forum=".$_GET['source_forum']."&amp;resourceaction=removeresource&amp;locationkey=".key($addedresource)."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no><img src='../img/delete.gif' border='0' alt='resource ".get_lang('Delete')."' /></a><br />";
-			}
-			echo '</td></tr>';
-			next($addedresource);
-			//$_SESSION['edit']=='';
-		}
-		echo '</table>';
-	}
-	else // it is a string
-	{
-		echo '';
-	}
+        //echo "remove from session";
+        remove_resource($locationkey);
+    }
+    $addedresource=$_SESSION['addedresource'];
+    $addedresourceid=$_SESSION['addedresourceid'];
+    if (is_array($addedresource))
+    {
+        echo '<table>';
+        foreach ($addedresource as $resource)
+        {
+            //echo $resource.":".$addedresourceid[key($addedresource)];
+            echo '<tr><td>';
+            display_addedresource_link($resource,$addedresourceid[key($addedresource)]);
+            echo '</td><td width="30">';
+
+            // if $_SERVER['REQUEST_URI'] contains and ?id=xx we have an edit and the url for deleting a session added resource
+            // should also contain this id.
+            $test=parse_url($_SERVER['REQUEST_URI']);
+            $output = array();
+            parse_str($test['query'],$output);
+
+            if ($showdeleteimg==1)
+            {
+                echo "<a href=".api_get_self()."?showresources=true&amp;source_forum=".$_GET['source_forum']."&amp;resourceaction=removeresource&amp;locationkey=".key($addedresource)."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no><img src='../img/delete.gif' border='0' alt='resource ".get_lang('Delete')."' /></a><br />";
+            }
+            echo '</td></tr>';
+            next($addedresource);
+            //$_SESSION['edit']=='';
+        }
+        echo '</table>';
+    }
+    else // it is a string
+    {
+        echo '';
+    }
 } // end of the display_resources function
 
 
@@ -1593,49 +1593,49 @@ 
 */
 function showorhide_addresourcelink($type, $id)
 {
-	global $from_learnpath, $source_id, $action, $learnpath_id, $chapter_id, $originalresource, $folder, $content, $target;
-	//global $_SESSION['addresource'];
-	//global $_SESSION['addresourceid'];
-	$addedresource=$_SESSION['addedresource'];
-	$addedresourceid=$_SESSION['addedresourceid'];
-
-	if (is_array($_SESSION['addedresource']))
-	{
-		foreach ($addedresource as $toolcompare)
-		{
-			//echo $toolcompare;
-			//echo "/".$type."/".$id."****";
-			//$key=key($addedresource);
-			//echo $addedresourceid[$key];
-			//print_r($addedresourceid);
-			//echo "<br>";
-
-			if ($toolcompare==$type and $addedresourceid[key($addedresource)]==$id)
-			{
-				$show=0;
-			}
-			next($addedresource);
-		}
-		if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
-		if ($show!==0)
-		{
-			if ($type=="Document")
-			{
-				echo "<a href=".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".$lang_add_it_or_resource."</a>";
-			}
-			else
-			{
-				echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
-			}
-		}
-	}
-	else // if it is not an array, it is a string
-	{
-		if ($_SESSION['addedresource']!==$type or $_SESSION['addedresourceid']!==$id)
-		{
-			if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
-			echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
-		}
-	}
+    global $from_learnpath, $source_id, $action, $learnpath_id, $chapter_id, $originalresource, $folder, $content, $target;
+    //global $_SESSION['addresource'];
+    //global $_SESSION['addresourceid'];
+    $addedresource=$_SESSION['addedresource'];
+    $addedresourceid=$_SESSION['addedresourceid'];
+
+    if (is_array($_SESSION['addedresource']))
+    {
+        foreach ($addedresource as $toolcompare)
+        {
+            //echo $toolcompare;
+            //echo "/".$type."/".$id."****";
+            //$key=key($addedresource);
+            //echo $addedresourceid[$key];
+            //print_r($addedresourceid);
+            //echo "<br>";
+
+            if ($toolcompare==$type and $addedresourceid[key($addedresource)]==$id)
+            {
+                $show=0;
+            }
+            next($addedresource);
+        }
+        if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
+        if ($show!==0)
+        {
+            if ($type=="Document")
+            {
+                echo "<a href=".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".$lang_add_it_or_resource."</a>";
+            }
+            else
+            {
+                echo "<a href='".api_get_self()."?content=".$type."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
+            }
+        }
+    }
+    else // if it is not an array, it is a string
+    {
+        if ($_SESSION['addedresource']!==$type or $_SESSION['addedresourceid']!==$id)
+        {
+            if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
+            echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
+        }
+    }
 }
 ?>

Spacing +409 added lines, -409 removed lines

@@ -24,8 +24,8 @@ 
 */
 
 function unset_session_resources() {
-	$_SESSION['addedresource']='';
-	$_SESSION['addedresourceid']='';
+	$_SESSION['addedresource'] = '';
+	$_SESSION['addedresourceid'] = '';
 	Session::erase('addedresource');
 	Session::erase('addedresourceid');
 }
@@ -46,11 +46,11 @@ 
 	}
 	if ($level and $level != 0 and $level != 1)
 	{
-		$folder_up=$folder;
-		$folder_temp=explode('/',$folder);
-		$last=count($folder_temp)-1;
+		$folder_up = $folder;
+		$folder_temp = explode('/', $folder);
+		$last = count($folder_temp) - 1;
 		unset($folder_temp[$last]);
-		$folder_up=implode('/',$folder_temp);
+		$folder_up = implode('/', $folder_temp);
 		echo "<a href='".api_get_self()."?content=Document&amp;source_forum=".$_GET['source_forum']."&amp;folder=$folder_up&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'><img src='../img/folder_up.gif' border='0' />".get_lang('LevelUp')."</a>";
 	}
 }
@@ -68,11 +68,11 @@ 
 	// other tools do not have this feature. This only counts
 	if (api_is_allowed_to_edit())
 	{
-		$visibility="ip.visibility<>'2'";
+		$visibility = "ip.visibility<>'2'";
 	}
 	else
 	{
-		$visibility="ip.visibility='1'";
+		$visibility = "ip.visibility='1'";
 	}
 
 	$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
@@ -85,12 +85,12 @@ 
 			    (ip.to_group_id = 0 OR i.to_group_id IS NULL) AND
 			    ip.to_user_id IS NULL
 			ORDER BY docs.path ASC";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
 		if (!$folder)
 		{
-			if (get_levels($row['path'])-1==1)
+			if (get_levels($row['path']) - 1 == 1)
 			{
 				// showing the right icon
 				if (file_or_folder($row['path']))
@@ -107,12 +107,12 @@ 
 				if (file_or_folder($row['path']))
 				{
 					echo "<a href='".api_get_self()."?content=Document";
-					echo "&amp;folder=".substr($row['path'],1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'],1).'</a><br />';
+					echo "&amp;folder=".substr($row['path'], 1)."&amp;source_id=$source_id&amp;source_forum=".$_GET['source_forum']."&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no'>".substr($row['path'], 1).'</a><br />';
 				}
 				else
 				{
-					echo substr($row['path'],1).' ';
-					echo showorhide_addresourcelink('Document',$row['id']);
+					echo substr($row['path'], 1).' ';
+					echo showorhide_addresourcelink('Document', $row['id']);
 					echo '<br />';
 				}
 			}
@@ -121,16 +121,16 @@ 
 		{
 			// we calculate the level we are in by using the $folder in the url
 			// we put +1 because it does not start with an / and in the database it does
-			$level=get_levels($folder)+1;
+			$level = get_levels($folder) + 1;
 
 			// we calculate each level of the database entry
-			$file_level=get_levels($row['path'])-1;
+			$file_level = get_levels($row['path']) - 1;
 			// if the level of the database entry is equal to the level we ar in, we put it into an array
 			// as this is a potential good entry
-			if ($file_level==$level)
+			if ($file_level == $level)
 			{
-				$good_paths[]=$row['path'];
-				$good_ids[]=$row['id'];
+				$good_paths[] = $row['path'];
+				$good_ids[] = $row['id'];
 			}
 			//$haystack=$row['path'];
 			//$conform_folder=strstr($haystack, $folder);
@@ -149,9 +149,9 @@ 
 		// we have all the potential good database entries, the good ones are those that start with $folder
 		foreach ($good_paths as $path)
 		{
-			if (strstr($path,$folder))
+			if (strstr($path, $folder))
 			{
-				$good_key=key($good_paths);
+				$good_key = key($good_paths);
 				// showing the right icon
 				if (file_or_folder($path))
 				{
@@ -166,17 +166,17 @@ 
 				// folders should be clickable
 				if (file_or_folder($path))
 				{
-					$path=substr($path,1); // remove the first / in folder_up
-					$uri=str_replace($folder,$path,$_SERVER['REQUEST_URI']);
-					$newuri=str_replace('add=','addnot=',$uri);
+					$path = substr($path, 1); // remove the first / in folder_up
+					$uri = str_replace($folder, $path, $_SERVER['REQUEST_URI']);
+					$newuri = str_replace('add=', 'addnot=', $uri);
 					//using the correct name of the folder
-					$folder_name=str_replace($folder.'/','',$path);
+					$folder_name = str_replace($folder.'/', '', $path);
 					echo "<a href='$newuri'>".$folder_name.'</a><br />';
 				}
 				else
 				{
-					echo str_replace("/$folder/", '',$path).' ';
-					echo showorhide_addresourcelink('Document',$good_ids[$good_key]);
+					echo str_replace("/$folder/", '', $path).' ';
+					echo showorhide_addresourcelink('Document', $good_ids[$good_key]);
 					echo '<br />';
 				}
 			}
@@ -219,13 +219,13 @@ 
 	{
 		foreach ($addedresource as $resource_type)
 		{
-			$sql="INSERT INTO $resource_table (source_type, source_id, resource_type, resource_id) VALUES ('$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
+			$sql = "INSERT INTO $resource_table (source_type, source_id, resource_type, resource_id) VALUES ('$source_type', '$source_id', '$resource_type', '".$addedresourceid[key($addedresource)]."')";
 			Database::query($sql);
-			$i=key($addedresource);
+			$i = key($addedresource);
 			next($addedresource);
 		}
-		$_SESSION['addedresource']='';
-		$_SESSION['addedresourceid']='';
+		$_SESSION['addedresource'] = '';
+		$_SESSION['addedresourceid'] = '';
 	}
 }
 
@@ -238,7 +238,7 @@ 
  * @param $style this is used to style the link (for instance when a resource is hidden => the added resources should also be styled like they are hidden)
  * @todo use the constants for the type definitions.
  */
-function display_addedresource_link($type, $id, $style='')
+function display_addedresource_link($type, $id, $style = '')
 {
 	global $_course;
 
@@ -283,9 +283,9 @@ 
 			break;
 		case 'Thread':  //=topics
         //deprecated
-			$tbl_posts		= $_course['dbNameGlu'].'bb_posts';
-			$tbl_posts_text	= $_course['dbNameGlu'].'bb_posts_text';
-			$TBL_FORUMS		= $_course['dbNameGlu'].'bb_forums';
+			$tbl_posts = $_course['dbNameGlu'].'bb_posts';
+			$tbl_posts_text = $_course['dbNameGlu'].'bb_posts_text';
+			$TBL_FORUMS = $_course['dbNameGlu'].'bb_forums';
 			$result = Database::query("SELECT * FROM $tbl_posts posts, $TBL_FORUMS forum WHERE forum.forum_id=posts.forum_id and post_id=$id");
 			$myrow = Database::fetch_array($result);
 			// grabbing the title of the post
@@ -307,14 +307,14 @@ 
 			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
 			$result = Database::query("SELECT * FROM $dbTable WHERE c_id = $course_id AND id=$id");
 			$myrow = Database::fetch_array($result);
-			$pathname = explode('/',$myrow['path']); // making a correct name for the link
-			$last = count($pathname) - 1;  // making a correct name for the link
-			$filename = $pathname[$last];  // making a correct name for the link
+			$pathname = explode('/', $myrow['path']); // making a correct name for the link
+			$last = count($pathname) - 1; // making a correct name for the link
+			$filename = $pathname[$last]; // making a correct name for the link
 			$image = choose_image($filename);
-			$ext = explode('.',$filename);
-			$ext = strtolower($ext[sizeof($ext)-1]);
+			$ext = explode('.', $filename);
+			$ext = strtolower($ext[sizeof($ext) - 1]);
 			$myrow['path'] = rawurlencode($myrow['path']);
-			$in_frames = in_array($ext, array('htm','html','gif','jpg','jpeg','png'));
+			$in_frames = in_array($ext, array('htm', 'html', 'gif', 'jpg', 'jpeg', 'png'));
 			echo '<img src="../img/'.$image.'" align="middle" /> <a href="../document/'.($in_frames ? 'showinframes.php?file=' : 'download.php?doc_url=').$myrow['path'].'"'.$styling.'>'.$filename."</a><br />\n";
 			break;
 		case 'Externallink':
@@ -349,391 +349,391 @@ 
 
 	$length = ((($builder == 'builder') and ($icon == 'nolink')) ? 65 : 32);
 
-	if ($builder != 'builder') $origin = 'learnpath';	//origin = learnpath in student view
+	if ($builder != 'builder') $origin = 'learnpath'; //origin = learnpath in student view
 	$linktype = $type;
 	if (($type == 'Link _self') or ($type == 'Link _blank')) $type = 'Link';
 
 	switch ($type)
 	{
 		case "Agenda":
-			$TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);
+			$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA);
 			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
-			$myrow=Database::fetch_array($result);
-
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-			$desc=$row['description'];
-			$agenda_id=$row['item_id'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$myrow = Database::fetch_array($result);
+
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
+			$desc = $row['description'];
+			$agenda_id = $row['item_id'];
+			echo str_repeat("&nbsp;&gt;", $level);
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($myrow["title"]=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($myrow["title"] == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
+			if ($icon == 'nolink') { return(shorten($myrow["title"], $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/agenda.gif' align=\"absmiddle\" alt='agenda'>"; }
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
-        		$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path\" class='$completed'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
+        		$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Agenda&origin=$origin&agenda_id=$agenda_id#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
+				echo "<a href=\"../calendar/agenda.php?origin=$origin&agenda_id=$agenda_id\" class='$completed' target='_blank'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
 			}
 			break;
 
 		case "Ad_Valvas":
 			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
 			$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
-			$myrow=Database::fetch_array($result);
+			$myrow = Database::fetch_array($result);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["content"]=$row['title']; }
-			$desc=$row['description'];
-			$ann_id=$row['item_id'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["content"] = $row['title']; }
+			$desc = $row['description'];
+			$ann_id = $row['item_id'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			// the title and the text are in the content field and we only want to display the title
-			list($title, $text)=split('<br>',$myrow['content']);
-			if ($title=='') { $title=$myrow['content']; }
-			$title=$myrow['title'];
-			$text=$myrow['content'];
+			list($title, $text) = split('<br>', $myrow['content']);
+			if ($title == '') { $title = $myrow['content']; }
+			$title = $myrow['title'];
+			$text = $myrow['content'];
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($title=='') {
-				$type="Announcement";
+			if ($title == '') {
+				$type = "Announcement";
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
 				return(true);
 			}
 
-			if ($icon == 'nolink') { return(shorten($title,$length)); }
+			if ($icon == 'nolink') { return(shorten($title, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/valves.gif' align=\"absmiddle\" alt='ad valvas'>"; }
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title,($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path\" class='$completed'>".shorten($title, ($length - 3 * $level))."</a>";
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Ad_Valvas&origin=$origin&ann_id=$ann_id#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title,($length-3*$level))."</a>";
+				echo "<a href=\"../announcements/announcements.php?origin=$origin&ann_id=$ann_id\" class='$completed' target='_blank'>".shorten($title, ($length - 3 * $level))."</a>";
 			}
 			break;
 
 		case "Link" :
-			$TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
-			$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
-			$myrow=Database::fetch_array($result);
+			$TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
+			$result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
+			$myrow = Database::fetch_array($result);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($myrow["title"]=='')
+			if ($myrow["title"] == '')
 			{
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
 				return(true);
 			}
 
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
+			if ($icon == 'nolink') { return(shorten($myrow["title"], $length)); }
 			if ($icon == 'icon')
 			{
-				if ($linktype=='Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
+				if ($linktype == 'Link _self') { echo "<img src='../img/links.gif' align=\"absmiddle\" alt='links'>"; }
 				   else { echo "<img src='../img/link_blank.gif' align=\"absmiddle\" alt='blank links'>"; }
 			}
-			$thelink=$myrow["url"];
+			$thelink = $myrow["url"];
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path\" class='$completed'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
+				echo "<a href=\"$thelink\" class='$completed' target='_blank'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
 			}
 			break;
 
 		case "Exercise":
-			$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
-			$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
-			$myrow=Database::fetch_array($result);
+			$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+			$result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
+			$myrow = Database::fetch_array($result);
 
-			if ($builder=='builder') { $origin='builder'; }
+			if ($builder == 'builder') { $origin = 'builder'; }
 			  //this is needed for the exercise_submit.php can delete the session info about tests
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($myrow["title"]=='') {
+			if ($myrow["title"] == '') {
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
 				return(true);
 			}
 
-			if ($icon == 'nolink') { return(shorten($myrow["title"],$length)); }
+			if ($icon == 'nolink') { return(shorten($myrow["title"], $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/quiz.gif' align=\"absmiddle\" alt='quizz'>"; }
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow["title"],($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path\" class='$completed'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Exercise&origin=$origin&exerciseId=".$myrow["id"]."#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "<a href=\"../exercise/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
+				echo "<a href=\"../exercise/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"], ($length - 3 * $level))."</a>";
 			}
 			break;
 
 		case "HotPotatoes":
-			$TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
-			$documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+			$TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
+			$documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 			$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
-			$myrow= Database::fetch_array($result);
-			$path=$myrow["path"];
-			$name=GetQuizName($path,$documentPath);
+			$myrow = Database::fetch_array($result);
+			$path = $myrow["path"];
+			$name = GetQuizName($path, $documentPath);
 
-			if ($builder=='builder') { $origin='builder'; }
+			if ($builder == 'builder') { $origin = 'builder'; }
 			  //this is needed for the exercise_submit.php can delete the session info about tests
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $name = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/jqz.gif' align=\"absmiddle\" alt='hot potatoes'>"; }
 
 			$cid = $_course['official_code'];
 
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>";
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=HotPotatoes&origin=$origin&id=$id#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "&nbsp;<a href=\"../exercise/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+				echo "&nbsp;<a href=\"../exercise/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
 			}
 			break;
 
 		case "Forum":
 			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
-			$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
-			$myrow=Database::fetch_array($result);
+			$result = Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
+			$myrow = Database::fetch_array($result);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["forum_name"] = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($myrow["forum_name"]=='') { $type="Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($myrow["forum_name"] == '') { $type = "Forum"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($myrow["forum_name"],$length)); }
+			if ($icon == 'nolink') { return(shorten($myrow["forum_name"], $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
-			$forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
+			$forumparameters = "forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path\" class='$completed'>".shorten($myrow["forum_name"], ($length - 3 * $level))."</a>";
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"],($length-3*$level))."</a>";
+				echo "<a href=\"../phpbb/viewforum.php?$forumparameters\" class='$completed' target='_blank'>".shorten($myrow["forum_name"], ($length - 3 * $level))."</a>";
 			}
 			break;
 
 		case "Thread":  //forum post
         //deprecated
-			$tbl_topics      = $_course['dbNameGlu'].'bb_topics';
-			$tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
+			$tbl_topics = $_course['dbNameGlu'].'bb_topics';
+			$tbl_posts = $_course['dbNameGlu'].'bb_posts';
 			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
-			$sql="SELECT * FROM $tbl_topics where topic_id=$id";
-			$result= Database::query($sql);
-			$myrow=Database::fetch_array($result);
+			$sql = "SELECT * FROM $tbl_topics where topic_id=$id";
+			$result = Database::query($sql);
+			$myrow = Database::fetch_array($result);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["topic_title"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["topic_title"] = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($myrow["topic_title"]=='') { $type="Forum Post"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($myrow["topic_title"] == '') { $type = "Forum Post"; echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($myrow["topic_title"],$length)); }
+			if ($icon == 'nolink') { return(shorten($myrow["topic_title"], $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path\" class='$completed'>".shorten($myrow["topic_title"], ($length - 3 * $level))."</a>";
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Thread&origin=$origin&topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"],($length-3*$level))."</a>";
+				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow["topic_title"], ($length - 3 * $level))."</a>";
 			}
 			break;
 
@@ -742,363 +742,363 @@ 
 			$tbl_posts       = $_course['dbNameGlu'].'bb_posts';
 			$tbl_posts_text  = $_course['dbNameGlu'].'bb_posts_text';
 			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
-			$result= Database::query("SELECT * FROM $tbl_posts where post_id=$id");
-			$myrow=Database::fetch_array($result);
+			$result = Database::query("SELECT * FROM $tbl_posts where post_id=$id");
+			$myrow = Database::fetch_array($result);
 			// grabbing the title of the post
-			$sql_titel="SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
-			$result_titel=Database::query($sql_titel);
-			$myrow_titel=Database::fetch_array($result_titel);
+			$sql_titel = "SELECT * FROM $tbl_posts_text WHERE post_id=".$myrow["post_id"];
+			$result_titel = Database::query($sql_titel);
+			$myrow_titel = Database::fetch_array($result_titel);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow_titel["post_title"]=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow_titel["post_title"] = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
-			$posternom=$myrow['nom'];				$posterprenom=$myrow['prenom'];
-			$posttime=$myrow['post_time'];			$posttext=$myrow_titel['post_text'];
-			$posttitle=$myrow_titel['post_title'];
-			$posttext = str_replace('"',"'",$posttext);
+			$posternom = $myrow['nom']; $posterprenom = $myrow['prenom'];
+			$posttime = $myrow['post_time']; $posttext = $myrow_titel['post_text'];
+			$posttitle = $myrow_titel['post_title'];
+			$posttext = str_replace('"', "'", $posttext);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($myrow_titel["post_title"]=='')
+			if ($myrow_titel["post_title"] == '')
 			{
-				$type="Forum";
+				$type = "Forum";
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
 			}
 
-			if ($icon == 'nolink') { return(shorten($myrow_titel["post_title"],$length)); }
+			if ($icon == 'nolink') { return(shorten($myrow_titel["post_title"], $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/forum.gif' align=\"absmiddle\" alt='forum'>"; }
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path\" class='$completed'>".shorten($myrow_titel["post_title"], ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Post&origin=$origin&posternom=$posternom&posterprenom=$posterprenom&posttime=$posttime&posttext=$posttext&posttitle=$posttitle#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"],($length-3*$level))."</a>";
+				echo "<a href=\"../phpbb/viewtopic.php?topic=".$myrow["topic_id"]."&forum=".$myrow["forum_id"]."&md5=".$myrow["md5"]."\" class='$completed' target='_blank'>".shorten($myrow_titel["post_title"], ($length - 3 * $level))."</a>";
 			}
 			break;
 
 		case "Document":
-			$dbTable  = Database::get_course_table(TABLE_DOCUMENT);
-			$result=Database::query("SELECT * FROM $dbTable WHERE id=$id");
-			$myrow=Database::fetch_array($result);
+			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
+			$result = Database::query("SELECT * FROM $dbTable WHERE id=$id");
+			$myrow = Database::fetch_array($result);
 
-			$pathname=explode("/",$myrow["path"]); // making a correct name for the link
-			$last=count($pathname)-1;  // making a correct name for the link
-			$filename=$pathname[$last];  // making a correct name for the link
+			$pathname = explode("/", $myrow["path"]); // making a correct name for the link
+			$last = count($pathname) - 1; // making a correct name for the link
+			$filename = $pathname[$last]; // making a correct name for the link
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 
-			echo str_repeat("&nbsp;&gt;",$level);
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if ($icon != 'nolink') {
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
-			$image=choose_image($filename);
+			$image = choose_image($filename);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $filename=$row['title']; }
-			$desc=$row['description'];
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $filename = $row['title']; }
+			$desc = $row['description'];
 
-			if (($myrow["path"]=='') and ($filename=='')) {
+			if (($myrow["path"] == '') and ($filename == '')) {
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>";
 				return(true);
 			}
 
-			if ($icon == 'nolink') { return(shorten($filename,$length)); }
+			if ($icon == 'nolink') { return(shorten($filename, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/$image' align=\"absmiddle\" alt='$image'>"; }
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename,($length-3*$level))."</a>";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path\" class='$completed'>".shorten($filename, ($length - 3 * $level))."</a>";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
-				} $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
+				} $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Document&origin=$origin&docurl=".$myrow["path"]."#$id_in_path";
 			}
 			else
 			{
-				$enableDocumentParsing='yes';
+				$enableDocumentParsing = 'yes';
 				if (!$enableDocumentParsing)
 				{ //this is the solution for the non-parsing version in the builder
-					$file=urlencode($myrow["path"]);
-					echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
+					$file = urlencode($myrow["path"]);
+					echo "<a href='../document/showinframes.php?file=$file' class='$completed' $hyperlink_target_parameter>".shorten($filename, ($length - 3 * $level))."</a>";
 				}
 				else
 				{
-					echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename,($length-3*$level))."</a>";
+					echo "<a href=\"../document/download.php?doc_url=".$myrow["path"]."\" class='$completed' $hyperlink_target_parameter>".shorten($filename, ($length - 3 * $level))."</a>";
 				}
 			}
 			break;
 
 		case "Assignments":
-			$name=get_lang('Assignments');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$name = get_lang('Assignments');
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $name = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink')
 			{
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($name=='')
+			if ($name == '')
 			{
 				echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true);
 			}
 
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/works.gif' align=\"absmiddle\">"; }
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Assignments&origin=$origin#$id_in_path";
 				if ($desc != '')
 				{
 					if ($icon != 'wrap')
 					{
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>";
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>";
 					}
 					else
 					{
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>";
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>";
 					}
 				}
 			}
 			else
 			{
-				echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+				echo "<a href=\"../work/work.php\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
 			}
 			break;
 		case "Dropbox":
-			$name=get_lang('Dropbox');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$name = get_lang('Dropbox');
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $name = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink') {
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/dropbox.gif' align=\"absmiddle\">"; }
 
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Dropbox&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
 					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
 				}
 			} else {
-				echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+				echo "<a href=\"../dropbox/index.php\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
 			}
 			break;
 		case "Introduction_text":
-			$name=get_lang('IntroductionText');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$name = get_lang('IntroductionText');
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $name = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink') {
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/introduction.gif' align=\"absmiddle\" alt='introduction'>"; }
 
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>";
-				$items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>";
+				$items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Introduction_text&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
 					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
 				}
 			} else {
 				$s = api_get_path(WEB_COURSE_PATH)."$_cid/index.php?intro_cmdEdit=1";
-				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
 			}
 			break;
 		case "Course_description":
-			$name=get_lang('CourseDescription');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$name = get_lang('CourseDescription');
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $name = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink') {
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/info.gif' align=\"absmiddle\" alt='info'>"; }
 
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
 					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
 				}
 			} else {
-				$s=api_get_path(WEB_CODE_PATH)."course_description";
-				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+				$s = api_get_path(WEB_CODE_PATH)."course_description";
+				echo "<a href=\"$s\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
 			}
 			break;
 		case "Groups":
-			$name=get_lang('Groups');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$name = get_lang('Groups');
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $name = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink') {
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/group.gif' align=\"absmiddle\" alt='group'>"; }
 
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Groups&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
 					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
 				}
 			} else {
-				echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+				echo "<a href=\"../group/group.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
 			}
 			break;
 		case "Users":
-			$name=get_lang('Users');
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $name=$row['title']; }
-			$desc=$row['description'];
-			echo str_repeat("&nbsp;&gt;",$level);
+			$name = get_lang('Users');
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $name = $row['title']; }
+			$desc = $row['description'];
+			echo str_repeat("&nbsp;&gt;", $level);
 
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "<td>"; }
 			if ($icon != 'nolink') {
-				if ($completed=='completed') {
+				if ($completed == 'completed') {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on'>";
-				}	else {
+				} else {
 					echo "<img src='../img/checkbox_on2.gif' border='0' width='13' height='11' alt='on' style='visibility: hidden'>";
 					//echo "&nbsp;";
 				}
 			}
 			if (($builder != 'builder') and ($icon != 'wrap')) { echo "</td><td>"; }
 
-			if ($name=='') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
+			if ($name == '') { echo "<span class='messagesmall'>".get_lang('StepDeleted1')." $type ".get_lang('StepDeleted2')."</span>"; return(true); }
 
-			if ($icon == 'nolink') { return(shorten($name,$length)); }
+			if ($icon == 'nolink') { return(shorten($name, $length)); }
 			if ($icon == 'icon') { echo "<img src='../img/members.gif' align=\"absmiddle\" alt='members'>"; }
 
 			if ($builder != 'builder')
 			{
-				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name,($length-3*$level))."</a>"; $items[]=api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
+				echo "<a href=\"".api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path\" class='$completed'>".shorten($name, ($length - 3 * $level))."</a>"; $items[] = api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Users&origin=$origin#$id_in_path";
 				if ($desc != '') {
 					if ($icon != 'wrap') {
-						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div></td></tr>"; }
+						echo "</tr><tr><td></td><td></td><td><div class='description'>&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div></td></tr>"; }
 					else {
-						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc,($length-3*$level))."</div>"; }
+						echo "<div class='description'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".shorten($desc, ($length - 3 * $level))."</div>"; }
 				}
 			} else {
-				echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+				echo "<a href=\"../user/user.php?origin=$origin\" class='$completed' target='_blank'>".shorten($name, ($length - 3 * $level))."</a>";
 			}
 			break;
 	}//end huge switch-statement
@@ -1117,29 +1117,29 @@ 
 function get_addedresource_link_in_learnpath($type, $id, $id_in_path)
 {
 	global $_course, $learnpath_id, $tbl_learnpath_item, $items;
-	global $curDirPath, $_configuration, $enableDocumentParsing, $_user , $_cid;
+	global $curDirPath, $_configuration, $enableDocumentParsing, $_user, $_cid;
 
 	$hyperlink_target_parameter = ""; //or e.g. target='_blank'
  $builder = 'player';
-	$origin='learnpath';
+	$origin = 'learnpath';
 
-	$linktype=$type;
-	if (($type=="Link _self") or ($type=="Link _blank")) { $type="Link"; }
+	$linktype = $type;
+	if (($type == "Link _self") or ($type == "Link _blank")) { $type = "Link"; }
 
  $link = '';
 
 	switch ($type)
 	{
 		case "Agenda":
-			$TABLEAGENDA 		= Database::get_course_table(TABLE_AGENDA);;
+			$TABLEAGENDA = Database::get_course_table(TABLE_AGENDA); ;
 			$result = Database::query("SELECT * FROM $TABLEAGENDA WHERE id=$id");
-			$myrow=Database::fetch_array($result);
+			$myrow = Database::fetch_array($result);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
-			$desc=$row['description'];
-			$agenda_id=$row['item_id'];
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
+			$desc = $row['description'];
+			$agenda_id = $row['item_id'];
 
 			if ($builder != 'builder')
 			{
@@ -1154,7 +1154,7 @@ 
 		case "Ad_Valvas":
 			$tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
 			$result = Database::query("SELECT * FROM $tbl_announcement WHERE id=$id");
-			$myrow=Database::fetch_array($result);
+			$myrow = Database::fetch_array($result);
 
 			if ($builder != 'builder')
 			{
@@ -1167,14 +1167,14 @@ 
 			break;
 
 		case "Link" :
-			$TABLETOOLLINK	= Database::get_course_table(TABLE_LINK);
-			$result= Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
-			$myrow=Database::fetch_array($result);
+			$TABLETOOLLINK = Database::get_course_table(TABLE_LINK);
+			$result = Database::query("SELECT * FROM $TABLETOOLLINK WHERE id=$id");
+			$myrow = Database::fetch_array($result);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
 
-			$thelink=$myrow["url"];
+			$thelink = $myrow["url"];
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=$linktype&origin=$origin&thelink=$thelink#$id_in_path";
@@ -1186,16 +1186,16 @@ 
 			break;
 
 		case "Exercise":
-			$TBL_EXERCICES  = Database::get_course_table(TABLE_QUIZ_TEST);
-			$result= Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
-			$myrow=Database::fetch_array($result);
+			$TBL_EXERCICES = Database::get_course_table(TABLE_QUIZ_TEST);
+			$result = Database::query("SELECT * FROM $TBL_EXERCICES WHERE id=$id");
+			$myrow = Database::fetch_array($result);
 
-			if ($builder=='builder') { $origin='builder'; }
+			if ($builder == 'builder') { $origin = 'builder'; }
 			  //this is needed for the exercise_submit.php can delete the session info about tests
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["title"]=$row['title']; }
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["title"] = $row['title']; }
 
 			if ($builder != 'builder')
 			{
@@ -1208,14 +1208,14 @@ 
 			break;
 
 		case "HotPotatoes":
-	  	    $TBL_DOCUMENT  = Database::get_course_table(TABLE_DOCUMENT);
-		    $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
+	  	    $TBL_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
+		    $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 			$result = Database::query("SELECT * FROM ".$TBL_DOCUMENT." WHERE id=$id");
-		    $myrow= Database::fetch_array($result);
-		    $path=$myrow["path"];
-		  	$name=GetQuizName($path,$documentPath);
+		    $myrow = Database::fetch_array($result);
+		    $path = $myrow["path"];
+		  	$name = GetQuizName($path, $documentPath);
 
-			if ($builder=='builder') { $origin='builder'; }
+			if ($builder == 'builder') { $origin = 'builder'; }
 
 			$cid = $_course['official_code'];
 
@@ -1232,18 +1232,18 @@ 
 		case "Forum":
         //deprecated
 			$TBL_FORUMS = Database::get_course_table(TABLE_FORUM);
-			$result= Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
-			$myrow=Database::fetch_array($result);
+			$result = Database::query("SELECT * FROM $TBL_FORUMS WHERE forum_id=$id");
+			$myrow = Database::fetch_array($result);
 
-			if ($builder=='builder') { $origin='builder'; }
+			if ($builder == 'builder') { $origin = 'builder'; }
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
-			if ($row['title'] != '') { $myrow["forum_name"]=$row['title']; }
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
+			if ($row['title'] != '') { $myrow["forum_name"] = $row['title']; }
 
-			if ($myrow["forum_name"]=='') { $type="Forum"; }
+			if ($myrow["forum_name"] == '') { $type = "Forum"; }
 
-			$forumparameters="forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
+			$forumparameters = "forum=".$myrow["forum_id"]."&md5=".$myrow["md5"];
 			if ($builder != 'builder')
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Forum&origin=$origin&forumparameters=$forumparameters#$id_in_path";
@@ -1256,15 +1256,15 @@ 
 
 		case "Thread":  //forum post
         //deprecated
-			$tbl_topics      = $_course['dbNameGlu'].'bb_topics';
-			$tbl_posts		 = $_course['dbNameGlu'].'bb_posts';
+			$tbl_topics = $_course['dbNameGlu'].'bb_topics';
+			$tbl_posts = $_course['dbNameGlu'].'bb_posts';
 			$TBL_FORUMS = $_course['dbNameGlu']."bb_forums";
-			$sql="SELECT * FROM $tbl_topics where topic_id=$id";
-			$result= Database::query($sql);
-			$myrow=Database::fetch_array($result);
+			$sql = "SELECT * FROM $tbl_topics where topic_id=$id";
+			$result = Database::query($sql);
+			$myrow = Database::fetch_array($result);
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
 
 			if ($builder != 'builder')
 			{
@@ -1278,16 +1278,16 @@ 
 		case "Post":
 			break;
 		case "Document":
-			$dbTable  = Database::get_course_table(TABLE_DOCUMENT);
-			$result=Database::query("SELECT * FROM $dbTable WHERE id=$id",__FILE__,__LINE);
-			$myrow=Database::fetch_array($result);
+			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
+			$result = Database::query("SELECT * FROM $dbTable WHERE id=$id", __FILE__, __LINE);
+			$myrow = Database::fetch_array($result);
 
-			$pathname=explode("/",$myrow["path"]); // making a correct name for the link
-			$last=count($pathname)-1;  // making a correct name for the link
-			$filename=$pathname[$last];  // making a correct name for the link
+			$pathname = explode("/", $myrow["path"]); // making a correct name for the link
+			$last = count($pathname) - 1; // making a correct name for the link
+			$filename = $pathname[$last]; // making a correct name for the link
 
-			$sql="select * from $tbl_learnpath_item where id=$id_in_path";
-			$result=Database::query($sql);	$row=Database::fetch_array($result);
+			$sql = "select * from $tbl_learnpath_item where id=$id_in_path";
+			$result = Database::query($sql); $row = Database::fetch_array($result);
 
 			if ($builder != 'builder')
 			{
@@ -1296,10 +1296,10 @@ 
 			}
 			else
 			{
-				$enableDocumentParsing='yes';
+				$enableDocumentParsing = 'yes';
 				if (!$enableDocumentParsing)
 				{ //this is the solution for the non-parsing version in the builder
-					$file=urlencode($myrow["path"]);
+					$file = urlencode($myrow["path"]);
 					$link .= "../document/showinframes.php?file=$file";
 				}
 				else
@@ -1341,7 +1341,7 @@ 
 			{
 				$link .= api_get_self()."?action=closelesson&source_forum=".$_GET['source_forum']."&how=complete&id_in_path=$id_in_path&learnpath_id=$learnpath_id&type=Course_description&origin=$origin#$id_in_path";
 			} else {
-				$s=api_get_path(WEB_CODE_PATH)."course_description";
+				$s = api_get_path(WEB_CODE_PATH)."course_description";
 				$link .= $s;
 			}
 			break;
@@ -1375,8 +1375,8 @@ 
 	$addedresourceid = $_SESSION['addedresourceid'];
 	unset($addedresource[$resource_key]);
 	unset($addedresourceid[$resource_key]);
-	$_SESSION['addedresource']=$addedresource;
-	$_SESSION['addedresourceid']=$addedresourceid ;
+	$_SESSION['addedresource'] = $addedresource;
+	$_SESSION['addedresourceid'] = $addedresourceid;
 }
 
 /**
@@ -1409,9 +1409,9 @@ 
 function delete_added_resource($type, $id)
 {
 	global $_course;
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
 
-	$sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
+	$sql = "DELETE FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
 	Database::query($sql);
 }
 
@@ -1422,9 +1422,9 @@ 
 function delete_all_resources_type($type)
 {
   global $_course;
-  $TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+  $TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
 
-  $sql="DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
+  $sql = "DELETE FROM $TABLERESOURCE WHERE source_type='$type'";
 
   Database::query($sql);
 }
@@ -1435,11 +1435,11 @@ 
 function check_added_resources($type, $id)
 {
 	global $_course, $origin;
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
-	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
-	$result=Database::query($sql);
-	$number_added=Database::num_rows($result);
-	if ($number_added<>0)
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
+	$sql = "SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
+	$result = Database::query($sql);
+	$number_added = Database::num_rows($result);
+	if ($number_added <> 0)
 		return true;
 	else
 		return false;
@@ -1452,18 +1452,18 @@ 
 */
 function edit_added_resources($type, $id)
 {
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
     $course_id = api_get_course_int_id();
     $id = intval($id);
     $type = Database::escape_string($type);
-	$sql="SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))	{
-		$addedresource[]=$row["resource_type"];
-		$addedresourceid[]=$row["resource_id"];
+	$sql = "SELECT * FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' and source_id=$id";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result)) {
+		$addedresource[] = $row["resource_type"];
+		$addedresourceid[] = $row["resource_id"];
 	}
-	$_SESSION['addedresource']=$addedresource;
-	$_SESSION['addedresourceid']=$addedresourceid;
+	$_SESSION['addedresource'] = $addedresource;
+	$_SESSION['addedresourceid'] = $addedresourceid;
 }
 
 /**
@@ -1473,12 +1473,12 @@ 
 */
 function update_added_resources($type, $id)
 {
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
     $course_id = api_get_course_int_id();
     $id = intval($id);
     $type = Database::escape_string($type);
 	// delete all the added resources for this item in the database;
-	$sql="DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' AND source_id='$id'";
+	$sql = "DELETE FROM $TABLERESOURCE WHERE c_id = $course_id AND source_type='$type' AND source_id='$id'";
 	//echo $sql;
 	Database::query($sql);
 
@@ -1492,25 +1492,25 @@ 
 /**
 * this function is to display the resources that were added to a specific item
 */
-function display_added_resources($type, $id, $style='')
+function display_added_resources($type, $id, $style = '')
 {
 	// the array containing the icons
-	$arr_icons=array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif' );
+	$arr_icons = array('Agenda'=>'../img/agenda.gif', 'Ad Valvas'=>'../img/valves.gif', 'Link'=>'../img/links.gif', 'Exercise'=>'../img/quiz.gif');
 
 	global $_course, $origin;
-	$TABLERESOURCE 		= Database::get_course_table(TABLE_LINKED_RESOURCES);
+	$TABLERESOURCE = Database::get_course_table(TABLE_LINKED_RESOURCES);
 
-	$sql="SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
-	$result=Database::query($sql);
-	while ($row=Database::fetch_array($result))
+	$sql = "SELECT * FROM $TABLERESOURCE WHERE source_type='$type' and source_id='$id'";
+	$result = Database::query($sql);
+	while ($row = Database::fetch_array($result))
 	{
 		if ($origin != 'learnpath')
 		{
-			display_addedresource_link($row['resource_type'], $row['resource_id'], $style) ;
+			display_addedresource_link($row['resource_type'], $row['resource_id'], $style);
 		}
 		else
 		{
-			display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'],'agendaitems','','builder','icon') ; echo "<br>";
+			display_addedresource_link_in_learnpath($row['resource_type'], $row['resource_id'], 'agendaitems', '', 'builder', 'icon'); echo "<br>";
 		}
 	}
 }
@@ -1529,7 +1529,7 @@ 
 	global $locationkey;
 	global $source_id, $action, $learnpath_id, $chapter_id, $originalresource;
 
-	if ($resourceaction=="removeresource")
+	if ($resourceaction == "removeresource")
 	{
 		/* unneccessary because when editing we delete all the added resources from the
 		database and add all these from the session
@@ -1550,8 +1550,8 @@ 
 		//echo "remove from session";
 		remove_resource($locationkey);
 	}
-	$addedresource=$_SESSION['addedresource'];
-	$addedresourceid=$_SESSION['addedresourceid'];
+	$addedresource = $_SESSION['addedresource'];
+	$addedresourceid = $_SESSION['addedresourceid'];
 	if (is_array($addedresource))
 	{
 		echo '<table>';
@@ -1559,16 +1559,16 @@ 
 		{
 			//echo $resource.":".$addedresourceid[key($addedresource)];
 			echo '<tr><td>';
-			display_addedresource_link($resource,$addedresourceid[key($addedresource)]);
+			display_addedresource_link($resource, $addedresourceid[key($addedresource)]);
 			echo '</td><td width="30">';
 
 			// if $_SERVER['REQUEST_URI'] contains and ?id=xx we have an edit and the url for deleting a session added resource
 			// should also contain this id.
-			$test=parse_url($_SERVER['REQUEST_URI']);
+			$test = parse_url($_SERVER['REQUEST_URI']);
 			$output = array();
-			parse_str($test['query'],$output);
+			parse_str($test['query'], $output);
 
-			if ($showdeleteimg==1)
+			if ($showdeleteimg == 1)
 			{
 				echo "<a href=".api_get_self()."?showresources=true&amp;source_forum=".$_GET['source_forum']."&amp;resourceaction=removeresource&amp;locationkey=".key($addedresource)."&amp;source_id=$source_id&amp;action=$action&amp;learnpath_id=$learnpath_id&amp;chapter_id=$chapter_id&amp;originalresource=no><img src='../img/delete.gif' border='0' alt='resource ".get_lang('Delete')."' /></a><br />";
 			}
@@ -1596,8 +1596,8 @@ 
 	global $from_learnpath, $source_id, $action, $learnpath_id, $chapter_id, $originalresource, $folder, $content, $target;
 	//global $_SESSION['addresource'];
 	//global $_SESSION['addresourceid'];
-	$addedresource=$_SESSION['addedresource'];
-	$addedresourceid=$_SESSION['addedresourceid'];
+	$addedresource = $_SESSION['addedresource'];
+	$addedresourceid = $_SESSION['addedresourceid'];
 
 	if (is_array($_SESSION['addedresource']))
 	{
@@ -1610,16 +1610,16 @@ 
 			//print_r($addedresourceid);
 			//echo "<br>";
 
-			if ($toolcompare==$type and $addedresourceid[key($addedresource)]==$id)
+			if ($toolcompare == $type and $addedresourceid[key($addedresource)] == $id)
 			{
-				$show=0;
+				$show = 0;
 			}
 			next($addedresource);
 		}
-		if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
-		if ($show!==0)
+		if ($from_learnpath) { $lang_add_it_or_resource = get_lang('AddIt'); } else { $lang_add_it_or_resource = get_lang('AddResource'); }
+		if ($show !== 0)
 		{
-			if ($type=="Document")
+			if ($type == "Document")
 			{
 				echo "<a href=".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no>".$lang_add_it_or_resource."</a>";
 			}
@@ -1631,9 +1631,9 @@ 
 	}
 	else // if it is not an array, it is a string
 	{
-		if ($_SESSION['addedresource']!==$type or $_SESSION['addedresourceid']!==$id)
+		if ($_SESSION['addedresource'] !== $type or $_SESSION['addedresourceid'] !== $id)
 		{
-			if ($from_learnpath) { $lang_add_it_or_resource=get_lang('AddIt'); } else { $lang_add_it_or_resource=get_lang('AddResource'); }
+			if ($from_learnpath) { $lang_add_it_or_resource = get_lang('AddIt'); } else { $lang_add_it_or_resource = get_lang('AddResource'); }
 			echo "<a href='".api_get_self()."?content=".$type."&folder=".$folder."&source_forum=".$_GET['source_forum']."&add=".$id."&source_id=$source_id&action=$action&learnpath_id=$learnpath_id&chapter_id=$chapter_id&originalresource=no&target=$target'>".$lang_add_it_or_resource."</a>";
 		}
 	}

main/resourcelinker/resourcelinker.php

Spacing +39 added lines, -39 removed lines

@@ -17,7 +17,7 @@ 
 use ChamiloSession as Session;
 
 include ('../inc/global.inc.php');
-$this_section=SECTION_COURSES;
+$this_section = SECTION_COURSES;
 
 api_protect_course_script();
 
@@ -110,11 +110,11 @@ 
 	$max_temp2 = $row[0];
 	if ($max_temp2 > $max_temp)
 	{
-		$order = $max_temp2 +1;
+		$order = $max_temp2 + 1;
 	}
 	else
 	{
-		$order = $max_temp +1;
+		$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 )";
@@ -186,21 +186,21 @@ 
 		//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){
+		if (Database::num_rows($result) == 0) {
 			$lastorder_item = 0;
-		}else{
+		} 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){
+		if (Database::num_rows($result) == 0) {
 			$lastorder_chapter = 0;
-		}else{
+		} else {
 			$row = Database::fetch_array($result);
 			$lastorder_chapter = ($row[0]);
 		}
-		$lastorder = ($lastorder_chapter>$lastorder_item?$lastorder_chapter+1:$lastorder_item+1);
+		$lastorder = ($lastorder_chapter > $lastorder_item ? $lastorder_chapter + 1 : $lastorder_item + 1);
 
 		foreach ($addedresource as $addedresource_item)
 		{
@@ -251,8 +251,8 @@ 
 				$addedresourceassigned[$i] = 1;
 				$resource_added = true;
 			}
-			$i ++;
-			$lastorder ++;
+			$i++;
+			$lastorder++;
 		}
 		//$_SESSION['addedresource']=null;
 		//$_SESSION['addedresourceid']=null;
@@ -294,34 +294,34 @@ 
 				$url = "../calendar/agenda.php?action=add";
 			}
 			$originaltoolname = get_lang("Agenda");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+			$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);
+			$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);
+			$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);
+			$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);
+			Session::write('from_learnpath', $from_learnpath);
 			break;
 			/*************************************** end add Frederik.Vermeire@pandora.be *********************************/
 
@@ -329,7 +329,7 @@ 
 	// 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"])
+		if (!$_SESSION["origintoolurl"] OR $_SESSION["origintoolurl"] <> $interbreadcrumb["url"])
 		{
 			$_SESSION["origintoolurl"] = $breadcrumbelement["url"];
 			$_SESSION["origintoolname"] = $breadcrumbelement["name"];
@@ -344,7 +344,7 @@ 
 if ($from_learnpath != 'yes')
 {
 	$nameTools = get_lang('AddResource');
-	$interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
+	$interbreadcrumb[] = array("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
 }
 else
 {
@@ -360,9 +360,9 @@ 
 
 	$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']}");
+	$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']}");
 
 }
 
@@ -387,13 +387,13 @@ 
 // we retrieve the tools that are active.
 // We use this to check which resources a student may add (only the modules that are active)
 // see http://www.dokeos.com/forum/viewtopic.php?t=4858
-$active_modules=array();
+$active_modules = array();
 $tool_table = Database::get_course_table(TABLE_TOOL_LIST);
-$sql_select_active="SELECT * FROM $tool_table WHERE visibility='1'";
-$result_select_active=Database::query($sql_select_active);
-while ($row=Database::fetch_array($result_select_active))
+$sql_select_active = "SELECT * FROM $tool_table WHERE visibility='1'";
+$result_select_active = Database::query($sql_select_active);
+while ($row = Database::fetch_array($result_select_active))
 {
-	$active_modules[]=$row['name'];
+	$active_modules[] = $row['name'];
 }
 
 
@@ -408,7 +408,7 @@ 
           <td width="26%"><b><?php echo get_lang('CourseResources'); ?></b></td>
         </tr>
         <?php
-        if (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT,$active_modules))
+        if (api_is_allowed_to_edit() OR in_array(TOOL_DOCUMENT, $active_modules))
         {
         ?>
         <tr>
@@ -416,7 +416,7 @@ 
         </tr>
         <?php
         }
-        if (api_is_allowed_to_edit() OR in_array(TOOL_CALENDAR_EVENT,$active_modules))
+        if (api_is_allowed_to_edit() OR in_array(TOOL_CALENDAR_EVENT, $active_modules))
         {
         ?>
         <tr>
@@ -424,7 +424,7 @@ 
         </tr>
         <?php
         }
-        if (api_is_allowed_to_edit() OR in_array(TOOL_ANNOUNCEMENT,$active_modules))
+        if (api_is_allowed_to_edit() OR in_array(TOOL_ANNOUNCEMENT, $active_modules))
         {
         ?>
         <tr>
@@ -432,7 +432,7 @@ 
         </tr>
         <?php
         }
-        if (api_is_allowed_to_edit() OR in_array(TOOL_BB_FORUM,$active_modules))
+        if (api_is_allowed_to_edit() OR in_array(TOOL_BB_FORUM, $active_modules))
         {
         ?>
         <tr>
@@ -440,7 +440,7 @@ 
         </tr>
         <?php
         }
-        if (api_is_allowed_to_edit() OR in_array(TOOL_LINK,$active_modules))
+        if (api_is_allowed_to_edit() OR in_array(TOOL_LINK, $active_modules))
         {
         ?>
         <tr>
@@ -448,7 +448,7 @@ 
         </tr>
         <?php
         }
-        if (api_is_allowed_to_edit() OR in_array(TOOL_QUIZ,$active_modules))
+        if (api_is_allowed_to_edit() OR in_array(TOOL_QUIZ, $active_modules))
         {
         ?>
         <tr>
@@ -468,7 +468,7 @@ 
 		<tr>
           <td width="26%"><b><?php echo get_lang('ExportableCourseResources'); ?></b></td>
         </tr>
-<?php if ($multi_level_learnpath === true ) { ?>
+<?php if ($multi_level_learnpath === true) { ?>
         <tr>
           <td><?php echo "<a href=\"".api_get_self()."?content=chapter&action=$action&id=$id&learnpath_id=$learnpath_id&chapter_id=$chapter_id&source_forum=$source_forum&originalresource=no\">".get_lang('Chapter')."</a>"; ?></td>
         </tr>
@@ -589,10 +589,10 @@ 
 // 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."'
@@ -638,7 +638,7 @@ 
 // 2. we come to the resource linker for the first time (documents = default). In this case it can only be shown if
 //  			a. one is a teacher (documents can be shown even if the tool is inactive)
 //				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'])
+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'];
@@ -698,7 +698,7 @@ 
 {
 	$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_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);
 
@@ -883,9 +883,9 @@ 
 ?>
 	</tr>
     <tr>
-      <td><?php if ($is_allowedToEdit) {echo get_lang('AddToLinks');} ?></td>
+      <td><?php if ($is_allowedToEdit) {echo get_lang('AddToLinks'); } ?></td>
       <td>
-  	  <?php if ($is_allowedToEdit){?>
+  	  <?php if ($is_allowedToEdit) {?>
 	  <select name="add_2_links" id="add_2_links">
       <option value="niet toevoegen" selected="selected">-<?php echo get_lang('DontAdd'); ?>-</option>
 	  <option value="0"><?php echo get_lang('MainCategory'); ?></option>

Braces +10 added lines, -18 removed lines

@@ -111,8 +111,7 @@ 
 	if ($max_temp2 > $max_temp)
 	{
 		$order = $max_temp2 +1;
-	}
-	else
+	} else
 	{
 		$order = $max_temp +1;
 	}
@@ -145,8 +144,7 @@ 
 		$addedresourceid[] = Database::insert_id();
 		$_SESSION['addedresource'] = $addedresource;
 		$_SESSION['addedresourceid'] = $addedresourceid;
-	}
-	else
+	} else
 	{
 		// do not add external link to the links table
 		$addedresource[] = "Externallink";
@@ -188,7 +186,7 @@ 
 		$result = Database::query($sql);
 		if(Database::num_rows($result)==0){
 			$lastorder_item = 0;
-		}else{
+		} else{
 			$row = Database::fetch_array($result);
 			$lastorder_item = ($row[0]);
 		}
@@ -196,7 +194,7 @@ 
 		$result = Database::query($sql);
 		if(Database::num_rows($result)==0){
 			$lastorder_chapter = 0;
-		}else{
+		} else{
 			$row = Database::fetch_array($result);
 			$lastorder_chapter = ($row[0]);
 		}
@@ -284,12 +282,10 @@ 
 			if ($action == "edit")
 			{
 				$url = "../calendar/agenda.php?action=edit&id=49&originalresource=$originalresource";
-			}
-			elseif ($action == "add")
+			} elseif ($action == "add")
 		{
 				$url = "../calendar/agenda.php?action=add&originalresource=$originalresource";
-			}
-			else
+			} else
 			{
 				$url = "../calendar/agenda.php?action=add";
 			}
@@ -345,8 +341,7 @@ 
 {
 	$nameTools = get_lang('AddResource');
 	$interbreadcrumb[] = array ("url" => $_SESSION["origintoolurl"], "name" => $_SESSION["origintoolname"]);
-}
-else
+} else
 {
 	$learnpath_select_query = "	SELECT * FROM $tbl_learnpath_main
 		  								WHERE learnpath_id=$learnpath_id";
@@ -458,8 +453,7 @@ 
 		<?php
         }
 
-}
-else
+} else
 {
 ?>
 
@@ -558,8 +552,7 @@ 
 if ($from_learnpath != 'yes')
 {
 	echo "<form method=\"post\" action=\"{$_SESSION['origintoolurl']}\" style=\"margin: 0px;\"><input type=\"submit\" value=\"".get_lang('Ok')."\"></form>";
-}
-else
+} 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>";
 }
@@ -747,8 +740,7 @@ 
 				showorhide_addresourcelink("Thread", $myrow["topic_id"]);
 				echo "</td></tr>";
 			}
-		}
-		else
+		} 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";

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_dir']) && !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);
-			unset($_SESSION['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);
-			unset($_SESSION['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);
-			unset($_SESSION['from_learnpath']);
-			unset ($from_learnpath);
-			break;
-		case "4" : // coming from exercises: edit topic
-			$url = "../exercise/admin.php?modifyAnswers=$modifyAnswers";
-			$originaltoolname = get_lang("ExerciseAnswers");
-			$breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
-			unset($_SESSION['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);
+            unset($_SESSION['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);
+            unset($_SESSION['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);
+            unset($_SESSION['from_learnpath']);
+            unset ($from_learnpath);
+            break;
+        case "4" : // coming from exercises: edit topic
+            $url = "../exercise/admin.php?modifyAnswers=$modifyAnswers";
+            $originaltoolname = get_lang("ExerciseAnswers");
+            $breadcrumbelement = array ("url" => $url, "name" => $originaltoolname);
+            unset($_SESSION['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['from_learnpath'] = $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['from_learnpath'] = $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_dir" 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_dir" value="'.get_lang('AddIt').'"/></td></tr>'."\n";
-	echo '</form></table>'."\n";
-	//echo "<hr>";
+    echo '<table><form name="add_dir" 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_dir" 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($chapter_id);
-	// 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, $chapter_id);
-	//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($chapter_id);
+    // 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, $chapter_id);
+    //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

Spacing +23 added lines, -23 removed lines

@@ -17,7 +17,7 @@ 
 <!-- Actions: The menu with the different options in cathe course management -->
 <div id="actions" class="actions">
     <?php if ($action != 'createcoursecategory') { ?>
-	<a href="<?php echo api_get_self(); ?>?action=createcoursecategory"><?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'),'','32'); ?></a>
+	<a href="<?php echo api_get_self(); ?>?action=createcoursecategory"><?php echo Display::return_icon('new_folder.png', get_lang('CreateCourseCategory'), '', '32'); ?></a>
     <?php } ?>
 </div>
 
@@ -49,26 +49,26 @@ 
             $max_category_key = count($user_course_categories);
             if ($action != 'unsubscribe') { ?>
                 <a href="courses.php?action=sortmycourses&amp;categoryid=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>#category<?php echo $row['id']; ?>">
-                <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
+                <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
                 </a>
 
                 <?php if ($row['id'] != $user_course_categories[0]['id']) { ?>
                         <a href="courses.php?action=<?php echo $action ?>&amp;move=up&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                        <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?>
+                        <?php echo Display::return_icon('up.png', get_lang('Up'), '', 22); ?>
                         </a>
                 <?php } else { ?>
-                    <?php echo Display::return_icon('up_na.png', get_lang('Up'),'',22); ?>
+                    <?php echo Display::return_icon('up_na.png', get_lang('Up'), '', 22); ?>
                <?php } ?>
 
                 <?php if ($row['id'] != $user_course_categories[$max_category_key - 1]['id']) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                    <?php echo Display::return_icon('down.png', get_lang('Down'),'',22); ?>
+                    <?php echo Display::return_icon('down.png', get_lang('Down'), '', 22); ?>
                     </a>
                 <?php } else { ?>
-                    <?php echo Display::return_icon('down_na.png', get_lang('Down'),'',22); ?>
+                    <?php echo Display::return_icon('down_na.png', get_lang('Down'), '', 22); ?>
                 <?php } ?>
                 <a href="courses.php?action=deletecoursecategory&amp;id=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?>
+                <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"), 22) ?>
                 </a>
             <?php }
             echo '<br /><br />';
@@ -122,35 +122,35 @@ 
                     <div style="float:left;width:110px;">
                     <?php
                         if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
-                            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
+                            $icon_title = get_lang('CourseDetails').' - '.$course['title'];
                     ?>
                     <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax">
-                        <?php echo Display::return_icon('info.png', $icon_title,'','22') ?>
+                        <?php echo Display::return_icon('info.png', $icon_title, '', '22') ?>
                        <?php } ?>
                     </a>
 
                     <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) { ?>
-                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
+                          <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?>
                     <?php } else { ?>
                         <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                            <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
+                            <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
                             </a>
                     <?php } ?>
 
                     <?php if ($key > 0) { ?>
                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&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('up.png', get_lang('Up'),'',22); ?>
+                        <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22); ?>
                         </a>
                     <?php } else { ?>
-                        <?php echo Display::display_icon('up_na.png', get_lang('Up'),'',22); ?>
+                        <?php echo Display::display_icon('up_na.png', get_lang('Up'), '', 22); ?>
                     <?php } ?>
 
                     <?php 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); ?>
+                        <?php echo Display::display_icon('down.png', get_lang('Down'), '', 22); ?>
                         </a>
                     <?php } else { ?>
-                        <?php echo Display::display_icon('down_na.png', get_lang('Down'),'',22); ?>
+                        <?php echo Display::display_icon('down_na.png', get_lang('Down'), '', 22); ?>
                     <?php } ?>
 
                   </div>
@@ -221,36 +221,36 @@ 
             <div style="float:left; width:110px">
             <?php
             if (api_get_setting('show_courses_descriptions_in_catalog') == 'true') {
-            $icon_title = get_lang('CourseDetails') . ' - ' . $course['title'];
+            $icon_title = get_lang('CourseDetails').' - '.$course['title'];
             ?>
             <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>inc/ajax/course_home.ajax.php?a=show_course_information&code=<?php echo $course['code'] ?>" data-title="<?php echo $icon_title ?>" title="<?php echo $icon_title ?>" class="ajax">
-                <?php echo Display::return_icon('info.png', $icon_title, '','22'); ?>
+                <?php echo Display::return_icon('info.png', $icon_title, '', '22'); ?>
             </a>
             <?php } ?>
 
              <?php if (isset($_GET['edit']) && $course['code'] == $_GET['edit']) {   ?>
-                    <?php echo Display::display_icon('edit_na.png', get_lang('Edit'),'',22); ?>
+                    <?php echo Display::display_icon('edit_na.png', get_lang('Edit'), '', 22); ?>
                   <?php } else { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                    <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
+                    <?php echo Display::display_icon('edit.png', get_lang('Edit'), '', 22); ?>
                     </a>
              <?php } ?>
 
             <!-- up /down icons-->
             <?php if ($key > 0) { ?>
                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&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('up.png', get_lang('Up'),'',22) ?>
+                    <?php echo Display::display_icon('up.png', get_lang('Up'), '', 22) ?>
                     </a>
             <?php } else {
-                    echo Display::display_icon('up_na.png', get_lang('Up'),'',22);
+                    echo Display::display_icon('up_na.png', get_lang('Up'), '', 22);
                   }
 
                   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); ?>
+                    <?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);
+                    echo Display::display_icon('down_na.png', get_lang('Down'), '', 22);
                   }?>
                 </div>
                  <div style="float:left; margin-right:10px;">

main/template/default/auth/categories_list.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 <!-- Actions: The menu with the different options in cathe course management -->
 <div id="actions" class="actions">
     <a href="<?php echo api_get_self() ?>?action=sortmycourses">
-        <?php echo Display::return_icon('back.png', get_lang('Back'),'','32'); ?>
+        <?php echo Display::return_icon('back.png', get_lang('Back'), '', '32'); ?>
     </a>
 </div>
 

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/group/group_overview.php

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/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 +8 added lines, -8 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);
@@ -81,7 +81,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('user.png', get_lang('GroupSelfRegistration')) . '<span>' . get_lang('GroupSelfRegistration') . '</span>',
+    Display::return_icon('user.png', get_lang('GroupSelfRegistration')).'<span>'.get_lang('GroupSelfRegistration').'</span>',
     null,
     false
 );
@@ -95,7 +95,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('folder.png', get_lang('GroupDocument')) . '<span>' . get_lang('GroupDocument') . '</span>',
+    Display::return_icon('folder.png', get_lang('GroupDocument')).'<span>'.get_lang('GroupDocument').'</span>',
     null,
     false
 );
@@ -109,7 +109,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('works.png', get_lang('GroupWork')) . '<span>' . get_lang('GroupWork') . '</span>',
+    Display::return_icon('works.png', get_lang('GroupWork')).'<span>'.get_lang('GroupWork').'</span>',
     null,
     false
 );
@@ -123,7 +123,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('agenda.png', get_lang('GroupCalendar')) . '<span>' . get_lang('GroupCalendar') . '</span>',
+    Display::return_icon('agenda.png', get_lang('GroupCalendar')).'<span>'.get_lang('GroupCalendar').'</span>',
     null,
     false
 );
@@ -140,7 +140,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('announce.png', get_lang('GroupAnnouncements')) . '<span>' . get_lang('GroupAnnouncements') . '</span>',
+    Display::return_icon('announce.png', get_lang('GroupAnnouncements')).'<span>'.get_lang('GroupAnnouncements').'</span>',
     null,
     false
 );
@@ -154,7 +154,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('forum.png', get_lang('GroupForum')) . '<span>' . get_lang('GroupForum') . '</span>',
+    Display::return_icon('forum.png', get_lang('GroupForum')).'<span>'.get_lang('GroupForum').'</span>',
     null,
     false
 );
@@ -181,7 +181,7 @@ 
 $form->addGroup(
     $group,
     '',
-    Display::return_icon('chat.png', get_lang('Chat')) . '<span>' . get_lang('Chat') . '</span>',
+    Display::return_icon('chat.png', get_lang('Chat')).'<span>'.get_lang('Chat').'</span>',
     null,
     false
 );