chamilo / chamilo-lms

main/resourcelinker/resourcelinker.inc.php

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="../exercice/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="../phpbb/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="../exercice/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="../phpbb/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="../phpbb/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="../phpbb/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=\"../exercice/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=\"../exercice/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=\"../exercice/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=\"../exercice/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 .= "../exercice/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 .= "../exercice/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 .= "../exercice/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 .= "../exercice/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=\"../exercice/exercise_submit.php?origin=$origin&exerciseId=".$myrow["id"]."\" class='$completed' target='_blank'>".shorten($myrow["title"],($length-3*$level))."</a>";
+				echo "<a href=\"../exercice/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=\"../exercice/showinframes.php?file=$path&cid=$cid&uid=".$_user['user_id']."\" class='$completed' target='_blank'>".shorten($name,($length-3*$level))."</a>";
+				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>";
 			}
 			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/admin/ldap_users_list.php

Indentation +132 added lines, -132 removed lines

@@ -20,7 +20,7 @@ 
 // Login as ...
 if ($action == "login_as" && !empty ($login_as_user_id))
 {
-	login_user($login_as_user_id);
+    login_user($login_as_user_id);
 }
 
 //if we already have a session id and a user...
@@ -37,150 +37,150 @@ 
 
 if (isset ($_GET['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_GET['action'])
-		{
-			case 'show_message' :
-				Display :: display_header($tool_name);
-				Display :: display_normal_message($_GET['message']);
-				break;
-			case 'delete_user' :
-				Display :: display_header($tool_name);
-				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
-				{
-					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('CannotDeleteUser'));
-				}
-				break;
-			case 'lock' :
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'unlock';
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
-				$userid_match_login = array();
-				foreach ($id as $user_id) {
-					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
-					$userid_match_login[$tmp] = $user_id;
-				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
-					ldap_add_user_to_session($UserList, $_GET['id_session']);
-					header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
-				} else {
-					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
-					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
-						{
-							$message .= '- '.$login.'<br />';
-						}
-					}
-					else
-					{
-						$message=get_lang('NoUserAdded');
-					}
-					Display :: display_normal_message($message,false);
-				}
-				break;
-			default :
-				Display :: display_header($tool_name);
-		}
-		Security::clear_token();
-	}
-	else
-	{
-		Display::display_header($tool_name);
-	}
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_GET['action'])
+        {
+            case 'show_message' :
+                Display :: display_header($tool_name);
+                Display :: display_normal_message($_GET['message']);
+                break;
+            case 'delete_user' :
+                Display :: display_header($tool_name);
+                if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
+                {
+                    Display :: display_normal_message(get_lang('UserDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('CannotDeleteUser'));
+                }
+                break;
+            case 'lock' :
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('lock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'unlock';
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('unlock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'add_user';
+                $id=$_GET['id'];
+                $UserList=array();
+                $userid_match_login = array();
+                foreach ($id as $user_id) {
+                    $tmp = ldap_add_user($user_id);
+                    $UserList[]= $tmp;
+                    $userid_match_login[$tmp] = $user_id;
+                }
+                if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+                    ldap_add_user_to_session($UserList, $_GET['id_session']);
+                    header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
+                } else {
+                    Display :: display_header($tool_name);
+                    if(count($userid_match_login)>0)
+                    {
+                        $message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
+                        foreach($userid_match_login as $user_id => $login)
+                        {
+                            $message .= '- '.$login.'<br />';
+                        }
+                    }
+                    else
+                    {
+                        $message=get_lang('NoUserAdded');
+                    }
+                    Display :: display_normal_message($message,false);
+                }
+                break;
+            default :
+                Display :: display_header($tool_name);
+        }
+        Security::clear_token();
+    }
+    else
+    {
+        Display::display_header($tool_name);
+    }
 }
 else
 {
-	Display::display_header($tool_name);
+    Display::display_header($tool_name);
 }
 if (isset ($_POST['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_POST['action'])
-		{
-			case 'delete' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_deleted_users = 0;
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						if(UserManager :: delete_user($user_id))
-						{
-							$number_of_deleted_users++;
-						}
-					}
-				}
-				if($number_of_selected_users == $number_of_deleted_users)
-				{
-					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
-				}
-				break;
-			case 'add_user' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_added_users = 0;
-				$UserList=array();
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						$UserList[] = ldap_add_user($user_id);
-					}
-				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
-				{
-					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
-				{
-					Display :: display_normal_message(get_lang('NoUserAdded'));
-				}
-				break;
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_POST['action'])
+        {
+            case 'delete' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_deleted_users = 0;
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        if(UserManager :: delete_user($user_id))
+                        {
+                            $number_of_deleted_users++;
+                        }
+                    }
+                }
+                if($number_of_selected_users == $number_of_deleted_users)
+                {
+                    Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
+                }
+                break;
+            case 'add_user' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_added_users = 0;
+                $UserList=array();
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        $UserList[] = ldap_add_user($user_id);
+                    }
+                }
+                if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+                    addUserToSession($UserList, $_GET['id_session']);
+                if(count($UserList)>0)
+                {
+                    Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
+                }
+                else
+                {
+                    Display :: display_normal_message(get_lang('NoUserAdded'));
+                }
+                break;
 
-		}
-		Security::clear_token();
-	}
+        }
+        Security::clear_token();
+    }
 }
 
 $form = new FormValidator('advanced_search','get');
 $form->addText('keyword_username',get_lang('LoginName'),false);
 if (api_is_western_name_order())
 {
-	$form->addText('keyword_firstname', get_lang('FirstName'), false);
-	$form->addText('keyword_lastname', get_lang('LastName'), false);
+    $form->addText('keyword_firstname', get_lang('FirstName'), false);
+    $form->addText('keyword_lastname', get_lang('LastName'), false);
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+    $form->addText('keyword_lastname',get_lang('LastName'),false);
+    $form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+    $form->addElement('hidden','id_session',$_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -202,7 +202,7 @@ 
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
 if (isset($_GET['id_session']))
-	$parameters['id_session'] = $_GET['id_session'];
+    $parameters['id_session'] = $_GET['id_session'];
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -212,13 +212,13 @@ 
 $table->set_header(1, get_lang('LoginName'));
 if (api_is_western_name_order())
 {
-	$table->set_header(2, get_lang('FirstName'));
-	$table->set_header(3, get_lang('LastName'));
+    $table->set_header(2, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
 }
 else
 {
-	$table->set_header(2, get_lang('LastName'));
-	$table->set_header(3, get_lang('FirstName'));
+    $table->set_header(2, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
 }
 $table->set_header(4, get_lang('Email'));
 $table->set_header(5, get_lang('Actions'));

main/gradebook/index.php

Spacing +107 added lines, -107 removed lines

@@ -11,7 +11,7 @@ 
 //$cidReset = false;
 $_in_course = true;
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_GRADEBOOK;
+$current_course_tool = TOOL_GRADEBOOK;
 
 api_protect_course_script(true);
 
@@ -75,9 +75,9 @@ 
 });
 </script>';
 api_block_anonymous_users();
-$htmlHeadXtra[]= '<script type="text/javascript">
+$htmlHeadXtra[] = '<script type="text/javascript">
 function confirmation() {
-	if (confirm("' . get_lang('DeleteAll') . '?")) {
+	if (confirm("' . get_lang('DeleteAll').'?")) {
 		return true;
 	} else {
 		return false;
@@ -112,25 +112,25 @@ 
     }
 }
 
-if ((isset($_GET['selectcat']) && $_GET['selectcat']>0) &&
-    (isset($_SESSION['studentview']) && $_SESSION['studentview']=='true')
+if ((isset($_GET['selectcat']) && $_GET['selectcat'] > 0) &&
+    (isset($_SESSION['studentview']) && $_SESSION['studentview'] == 'true')
 ) {
 
 } else {
     if (!isset($_GET['selectcat']) &&
-        ($_SESSION['studentview']=='studentview') ||
-        (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true')
+        ($_SESSION['studentview'] == 'studentview') ||
+        (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true')
     ) {
         Display :: display_header(get_lang('Gradebook'));
 
         //Introduction tool: student view
         Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
-        $addparams=array();
-        $cats = Category :: load (0, null, null, null, null, null, false);
-        $allcat= $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-        $alleval= $cats[0]->get_evaluations($stud_id);
-        $alllink= $cats[0]->get_links($stud_id);
-        $gradebooktable= new GradebookTable($cats[0], $allcat, $alleval,$alllink, $addparams);
+        $addparams = array();
+        $cats = Category :: load(0, null, null, null, null, null, false);
+        $allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
+        $alleval = $cats[0]->get_evaluations($stud_id);
+        $alllink = $cats[0]->get_links($stud_id);
+        $gradebooktable = new GradebookTable($cats[0], $allcat, $alleval, $alllink, $addparams);
         $gradebooktable->display();
         Display :: display_footer();
         exit;
@@ -141,10 +141,10 @@ 
 //this is called when there is no data for the course admin
 if (isset($_GET['createallcategories'])) {
     GradebookUtils::block_students();
-    $coursecat= Category :: get_not_created_course_categories($stud_id);
+    $coursecat = Category :: get_not_created_course_categories($stud_id);
     if (!count($coursecat) == 0) {
         foreach ($coursecat as $row) {
-            $cat= new Category();
+            $cat = new Category();
             $cat->set_name($row[1]);
             $cat->set_course_code($row[0]);
             $cat->set_description(null);
@@ -162,25 +162,25 @@ 
 
 //show logs evaluations
 if (isset($_GET['visiblelog'])) {
-    header('Location: ' . api_get_self().'/gradebook_showlog_eval.php');
+    header('Location: '.api_get_self().'/gradebook_showlog_eval.php');
     exit;
 }
 
 //move a category
 if (isset($_GET['movecat'])) {
     GradebookUtils::block_students();
-    $cats= Category :: load($_GET['movecat']);
+    $cats = Category :: load($_GET['movecat']);
     if (!isset ($_GET['targetcat'])) {
-        $move_form= new CatForm(CatForm :: TYPE_MOVE,
+        $move_form = new CatForm(CatForm :: TYPE_MOVE,
             $cats[0],
             'move_cat_form',
             null,
-            api_get_self() . '?movecat=' . Security::remove_XSS($_GET['movecat'])
-            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            api_get_self().'?movecat='.Security::remove_XSS($_GET['movecat'])
+            . '&selectcat='.Security::remove_XSS($_GET['selectcat']));
         if ($move_form->validate()) {
-            header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                . '&movecat=' . Security::remove_XSS($_GET['movecat'])
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                . '&movecat='.Security::remove_XSS($_GET['movecat'])
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
@@ -189,7 +189,7 @@ 
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $cats[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?categorymoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            header('Location: '.api_get_self().'?categorymoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
             exit;
         }
         unset ($targetcat);
@@ -200,30 +200,30 @@ 
 //move an evaluation
 if (isset($_GET['moveeval'])) {
     GradebookUtils::block_students();
-    $evals= Evaluation :: load($_GET['moveeval']);
+    $evals = Evaluation :: load($_GET['moveeval']);
     if (!isset ($_GET['targetcat'])) {
 
-        $move_form= new EvalForm(EvalForm :: TYPE_MOVE,
+        $move_form = new EvalForm(EvalForm :: TYPE_MOVE,
             $evals[0],
             null,
             'move_eval_form',
             null,
-            api_get_self() . '?moveeval=' . Security::remove_XSS($_GET['moveeval'])
-            . '&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            api_get_self().'?moveeval='.Security::remove_XSS($_GET['moveeval'])
+            . '&selectcat='.Security::remove_XSS($_GET['selectcat']));
 
         if ($move_form->validate()) {
-            header('Location: ' .api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
-                . '&moveeval=' . Security::remove_XSS($_GET['moveeval'])
-                . '&targetcat=' . $move_form->exportValue('move_cat'));
+            header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
+                . '&moveeval='.Security::remove_XSS($_GET['moveeval'])
+                . '&targetcat='.$move_form->exportValue('move_cat'));
             exit;
         }
     } else {
-        $targetcat= Category :: load($_GET['targetcat']);
+        $targetcat = Category :: load($_GET['targetcat']);
         $course_to_crsind = ($evals[0]->get_course_code() != null && $targetcat[0]->get_course_code() == null);
 
         if (!($course_to_crsind && !isset($_GET['confirm']))) {
             $evals[0]->move_to_cat($targetcat[0]);
-            header('Location: ' . api_get_self() . '?evaluationmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+            header('Location: '.api_get_self().'?evaluationmoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
             exit;
         }
         unset ($targetcat);
@@ -234,21 +234,21 @@ 
 //move a link
 if (isset($_GET['movelink'])) {
     GradebookUtils::block_students();
-    $link= LinkFactory :: load($_GET['movelink']);
+    $link = LinkFactory :: load($_GET['movelink']);
     $move_form = new LinkForm(
         LinkForm :: TYPE_MOVE,
         null,
         $link[0],
         'move_link_form',
         null,
-        api_get_self() . '?movelink=' . $_GET['movelink'] . '&selectcat=' . Security::remove_XSS($_GET['selectcat'])
+        api_get_self().'?movelink='.$_GET['movelink'].'&selectcat='.Security::remove_XSS($_GET['selectcat'])
     );
 
     if ($move_form->validate()) {
-        $targetcat= Category :: load($move_form->exportValue('move_cat'));
+        $targetcat = Category :: load($move_form->exportValue('move_cat'));
         $link[0]->move_to_cat($targetcat[0]);
         unset ($link);
-        header('Location: ' . api_get_self(). '?linkmoved=&selectcat=' . Security::remove_XSS($_GET['selectcat']));
+        header('Location: '.api_get_self().'?linkmoved=&selectcat='.Security::remove_XSS($_GET['selectcat']));
         exit;
     }
 }
@@ -258,9 +258,9 @@ 
     GradebookUtils::block_students();
 
     if (isset($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
     $cats = Category :: load($_GET['visiblecat']);
     $cats[0]->set_visible($visibility_command);
@@ -295,11 +295,11 @@ 
 if (isset($_GET['visibleeval'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
-    $eval= Evaluation :: load($_GET['visibleeval']);
+    $eval = Evaluation :: load($_GET['visibleeval']);
     $eval[0]->set_visible($visibility_command);
     $eval[0]->save();
     unset ($eval);
@@ -316,7 +316,7 @@ 
 if (isset($_GET['lockedeval'])) {
     GradebookUtils::block_students();
     $locked = Security::remove_XSS($_GET['lockedeval']);
-    if (isset($_GET['typelocked']) && api_is_platform_admin()){
+    if (isset($_GET['typelocked']) && api_is_platform_admin()) {
         $type_locked = 0;
         $confirmation_message = get_lang('EvaluationHasBeenUnLocked');
     } else {
@@ -333,7 +333,7 @@ 
 
 if (isset($_GET['deleteeval'])) {
     GradebookUtils::block_students();
-    $eval= Evaluation :: load($_GET['deleteeval']);
+    $eval = Evaluation :: load($_GET['deleteeval']);
     if ($eval[0] != null) {
         $eval[0]->delete_with_results();
     }
@@ -345,11 +345,11 @@ 
 if (isset($_GET['visiblelink'])) {
     GradebookUtils::block_students();
     if (isset ($_GET['set_visible'])) {
-        $visibility_command= 1;
+        $visibility_command = 1;
     } else {
-        $visibility_command= 0;
+        $visibility_command = 0;
     }
-    $link= LinkFactory :: load($_GET['visiblelink']);
+    $link = LinkFactory :: load($_GET['visiblelink']);
     if (isset($link) && isset($link[0])) {
         $link[0]->set_visible($visibility_command);
         $link[0]->save();
@@ -371,7 +371,7 @@ 
     $get_delete_link = intval($_GET['deletelink']);
     //fixing #5229
     if (!empty($get_delete_link)) {
-        $link= LinkFactory :: load($get_delete_link);
+        $link = LinkFactory :: load($get_delete_link);
         if ($link[0] != null) {
             // Clean forum qualify
             $sql = 'UPDATE '.$tbl_forum_thread.' SET
@@ -406,11 +406,11 @@ 
     if (!isset($_GET['movecat']) && !isset($_GET['moveeval'])) {
         die ('Error: movecat or moveeval not defined');
     }
-    $button = '<form name="confirm" method="post" action="'.api_get_self() .'?confirm='
-        .(isset($_GET['movecat']) ? '&movecat=' . Security::remove_XSS($_GET['movecat'])
-            : '&moveeval=' . Security::remove_XSS($_GET['moveeval']) )
-        .'&selectcat=' . Security::remove_XSS($_GET['selectcat'])
-        .'&targetcat=' . Security::remove_XSS($_GET['targetcat']).'">
+    $button = '<form name="confirm" method="post" action="'.api_get_self().'?confirm='
+        .(isset($_GET['movecat']) ? '&movecat='.Security::remove_XSS($_GET['movecat'])
+            : '&moveeval='.Security::remove_XSS($_GET['moveeval']))
+        .'&selectcat='.Security::remove_XSS($_GET['selectcat'])
+        .'&targetcat='.Security::remove_XSS($_GET['targetcat']).'">
 			   <input type="submit" value="'.get_lang('Ok').'">
 			   </form>';
     $warning_message = get_lang('MoveWarning').'<br><br>'.$button;
@@ -441,7 +441,7 @@ 
 //actions on the sortabletable
 if (isset($_POST['action'])) {
     GradebookUtils::block_students();
-    $number_of_selected_items= count($_POST['id']);
+    $number_of_selected_items = count($_POST['id']);
 
     if ($number_of_selected_items == '0') {
         $warning_message = get_lang('NoItemsSelected');
@@ -449,19 +449,19 @@ 
     } else {
         switch ($_POST['action']) {
             case 'deleted':
-                $number_of_deleted_categories= 0;
-                $number_of_deleted_evaluations= 0;
-                $number_of_deleted_links= 0;
+                $number_of_deleted_categories = 0;
+                $number_of_deleted_evaluations = 0;
+                $number_of_deleted_links = 0;
                 foreach ($_POST['id'] as $indexstr) {
                     if (substr($indexstr, 0, 4) == 'CATE') {
-                        $cats= Category :: load(substr($indexstr, 4));
+                        $cats = Category :: load(substr($indexstr, 4));
                         if ($cats[0] != null) {
                             $cats[0]->delete_all();
                         }
                         $number_of_deleted_categories++;
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         if ($eval[0] != null) {
                             $eval[0]->delete_with_results();
                         }
@@ -472,7 +472,7 @@ 
                         //fixing #5229
                         $id = substr($indexstr, 4);
                         if (!empty($id)) {
-                            $link= LinkFactory :: load($id);
+                            $link = LinkFactory :: load($id);
                             if ($link[0] != null) {
                                 $link[0]->delete();
                             }
@@ -480,7 +480,7 @@ 
                         }
                     }
                 }
-                $confirmation_message = get_lang('DeletedCategories') . ' : <b>' . $number_of_deleted_categories . '</b><br />' . get_lang('DeletedEvaluations') . ' : <b>' . $number_of_deleted_evaluations . '</b><br />' . get_lang('DeletedLinks') . ' : <b>' . $number_of_deleted_links . '</b><br /><br />' . get_lang('TotalItems') . ' : <b>' . $number_of_selected_items . '</b>';
+                $confirmation_message = get_lang('DeletedCategories').' : <b>'.$number_of_deleted_categories.'</b><br />'.get_lang('DeletedEvaluations').' : <b>'.$number_of_deleted_evaluations.'</b><br />'.get_lang('DeletedLinks').' : <b>'.$number_of_deleted_links.'</b><br /><br />'.get_lang('TotalItems').' : <b>'.$number_of_selected_items.'</b>';
                 $filter_confirm_msg = false;
                 break;
             case 'setvisible':
@@ -492,12 +492,12 @@ 
                         $cats[0]->apply_visibility_to_children();
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         $eval[0]->set_visible(1);
                         $eval[0]->save();
                     }
                     if (substr($indexstr, 0, 4) == 'LINK') {
-                        $link= LinkFactory :: load(substr($indexstr, 4));
+                        $link = LinkFactory :: load(substr($indexstr, 4));
                         $link[0]->set_visible(1);
                         $link[0]->save();
                     }
@@ -514,12 +514,12 @@ 
                         $cats[0]->apply_visibility_to_children();
                     }
                     if (substr($indexstr, 0, 4) == 'EVAL') {
-                        $eval= Evaluation :: load(substr($indexstr, 4));
+                        $eval = Evaluation :: load(substr($indexstr, 4));
                         $eval[0]->set_visible(0);
                         $eval[0]->save();
                     }
                     if (substr($indexstr, 0, 4) == 'LINK') {
-                        $link= LinkFactory :: load(substr($indexstr, 4));
+                        $link = LinkFactory :: load(substr($indexstr, 4));
                         $link[0]->set_visible(0);
                         $link[0]->save();
                     }
@@ -532,7 +532,7 @@ 
 }
 
 if (isset ($_POST['submit']) && isset ($_POST['keyword'])) {
-    header('Location: ' . api_get_self() . '?selectcat=' . Security::remove_XSS($_GET['selectcat'])
+    header('Location: '.api_get_self().'?selectcat='.Security::remove_XSS($_GET['selectcat'])
         . '&search='.Security::remove_XSS($_POST['keyword']));
     exit;
 }
@@ -540,13 +540,13 @@ 
 // DISPLAY HEADERS AND MESSAGES
 if (!isset($_GET['exportpdf'])) {
     if (isset ($_GET['studentoverview'])) {
-        $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
+        $interbreadcrumb[] = array('url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('ToolGradebook'));
         Display :: display_header(get_lang('FlatView'));
     } elseif (isset ($_GET['search'])) {
-        $interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('ToolGradebook'));
+        $interbreadcrumb[] = array('url' => $_SESSION['gradebook_dest'].'?selectcat='.Security::remove_XSS($_GET['selectcat']), 'name' => get_lang('ToolGradebook'));
         Display :: display_header(get_lang('SearchResults'));
-    } elseif(isset ($_GET['selectcat'])) {
-        $interbreadcrumb[]= array (	'url' =>'#','name' => get_lang('ToolGradebook'));
+    } elseif (isset ($_GET['selectcat'])) {
+        $interbreadcrumb[] = array('url' =>'#', 'name' => get_lang('ToolGradebook'));
         if (!isset($_GET['gradebooklist_direction'])) {
             //$interbreadcrumb[]= array ('url' => $_SESSION['gradebook_dest'].'?selectcat=' . Security::remove_XSS($_GET['selectcat']),'name' => get_lang('Details'));
         }
@@ -557,46 +557,46 @@ 
 }
 
 if (isset ($_GET['categorymoved'])) {
-    Display :: display_confirmation_message(get_lang('CategoryMoved'),false);
+    Display :: display_confirmation_message(get_lang('CategoryMoved'), false);
 }
 if (isset ($_GET['evaluationmoved'])) {
-    Display :: display_confirmation_message(get_lang('EvaluationMoved'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationMoved'), false);
 }
 if (isset ($_GET['linkmoved'])) {
-    Display :: display_confirmation_message(get_lang('LinkMoved'),false);
+    Display :: display_confirmation_message(get_lang('LinkMoved'), false);
 }
 if (isset ($_GET['addcat'])) {
-    Display :: display_confirmation_message(get_lang('CategoryAdded'),false);
+    Display :: display_confirmation_message(get_lang('CategoryAdded'), false);
 }
 if (isset ($_GET['linkadded'])) {
-    Display :: display_confirmation_message(get_lang('LinkAdded'),false);
+    Display :: display_confirmation_message(get_lang('LinkAdded'), false);
 }
 if (isset ($_GET['addresult'])) {
-    Display :: display_confirmation_message(get_lang('ResultAdded'),false);
+    Display :: display_confirmation_message(get_lang('ResultAdded'), false);
 }
 if (isset ($_GET['editcat'])) {
-    Display :: display_confirmation_message(get_lang('CategoryEdited'),false);
+    Display :: display_confirmation_message(get_lang('CategoryEdited'), false);
 }
 if (isset ($_GET['editeval'])) {
-    Display :: display_confirmation_message(get_lang('EvaluationEdited'),false);
+    Display :: display_confirmation_message(get_lang('EvaluationEdited'), false);
 }
 if (isset ($_GET['linkedited'])) {
-    Display :: display_confirmation_message(get_lang('LinkEdited'),false);
+    Display :: display_confirmation_message(get_lang('LinkEdited'), false);
 }
-if (isset ($_GET['nolinkitems'])){
-    Display :: display_warning_message(get_lang('NoLinkItems'),false);
+if (isset ($_GET['nolinkitems'])) {
+    Display :: display_warning_message(get_lang('NoLinkItems'), false);
 }
-if (isset ($_GET['addallcat'])){
-    Display :: display_normal_message(get_lang('AddAllCat'),false);
+if (isset ($_GET['addallcat'])) {
+    Display :: display_normal_message(get_lang('AddAllCat'), false);
 }
-if (isset ($confirmation_message)){
-    Display :: display_confirmation_message($confirmation_message,$filter_confirm_msg);
+if (isset ($confirmation_message)) {
+    Display :: display_confirmation_message($confirmation_message, $filter_confirm_msg);
 }
-if (isset ($warning_message)){
-    Display :: display_warning_message($warning_message,$filter_warning_msg);
+if (isset ($warning_message)) {
+    Display :: display_warning_message($warning_message, $filter_warning_msg);
 }
-if (isset ($move_form)){
-    Display :: display_normal_message($move_form->toHtml(),false);
+if (isset ($move_form)) {
+    Display :: display_normal_message($move_form->toHtml(), false);
 }
 
 // LOAD DATA & DISPLAY TABLE
@@ -610,17 +610,17 @@ 
 } else {
     $category = $_GET['selectcat'];
 }
-$simple_search_form='';
+$simple_search_form = '';
 
 if (isset($_GET['studentoverview'])) {
     //@todo this code also seems to be deprecated ...
     $cats = Category :: load($category);
-    $stud_id= (api_is_allowed_to_edit() ? null : $stud_id);
+    $stud_id = (api_is_allowed_to_edit() ? null : $stud_id);
     $allcat = $cats[0]->get_subcategories($stud_id, $course_code, $session_id);
-    $alleval= $cats[0]->get_evaluations($stud_id, true);
-    $alllink= $cats[0]->get_links($stud_id, true);
+    $alleval = $cats[0]->get_evaluations($stud_id, true);
+    $alllink = $cats[0]->get_links($stud_id, true);
     if (isset ($_GET['exportpdf'])) {
-        $datagen = new GradebookDataGenerator($allcat,$alleval, $alllink);
+        $datagen = new GradebookDataGenerator($allcat, $alleval, $alllink);
         $header_names = array(
             get_lang('Name'),
             get_lang('Description'),
@@ -628,18 +628,18 @@ 
             get_lang('Date'),
             get_lang('Results'),
         );
-        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME,0,null,true);
+        $data_array = $datagen->get_data(GradebookDataGenerator :: GDG_SORT_NAME, 0, null, true);
         $newarray = array();
         foreach ($data_array as $data) {
             $newarray[] = array_slice($data, 1);
         }
-        $pdf= new Cezpdf();
+        $pdf = new Cezpdf();
         $pdf->selectFont(api_get_path(LIBRARY_PATH).'ezpdf/fonts/Courier.afm');
         $pdf->ezSetMargins(30, 30, 50, 30);
         $pdf->ezSetY(810);
-        $pdf->ezText(get_lang('FlatView').' ('. api_convert_and_format_date(null, DATE_FORMAT_SHORT). ' ' . api_convert_and_format_date(null, TIME_NO_SEC_FORMAT) .')',12,array('justification'=>'center'));
-        $pdf->line(50,790,550,790);
-        $pdf->line(50,40,550,40);
+        $pdf->ezText(get_lang('FlatView').' ('.api_convert_and_format_date(null, DATE_FORMAT_SHORT).' '.api_convert_and_format_date(null, TIME_NO_SEC_FORMAT).')', 12, array('justification'=>'center'));
+        $pdf->line(50, 790, 550, 790);
+        $pdf->line(50, 40, 550, 40);
         $pdf->ezSetY(750);
         $pdf->ezTable(
             $newarray,
@@ -730,10 +730,10 @@ 
     $addparams['studentoverview'] = '';
 }
 //$addparams['cidReq']='';
-if (isset($_GET['cidReq']) && $_GET['cidReq']!='') {
+if (isset($_GET['cidReq']) && $_GET['cidReq'] != '') {
     $addparams['cidReq'] = Security::remove_XSS($_GET['cidReq']);
 } else {
-    $addparams['cidReq']='';
+    $addparams['cidReq'] = '';
 }
 
 $no_qualification = false;
@@ -757,7 +757,7 @@ 
                 $stud_id
             );
             if (isset($certificate['pdf_url'])) {
-                $actionsLeft .= Display::url(Display::returnFontAwesomeIcon('file-pdf-o') .
+                $actionsLeft .= Display::url(Display::returnFontAwesomeIcon('file-pdf-o').
                     get_lang('DownloadCertificatePdf'),
                     $certificate['pdf_url'],
                     ['class' => 'btn btn-default']
@@ -772,7 +772,7 @@ 
 
 if (!api_is_allowed_to_edit(null, true)) {
     $actionsLeft .= Display::url(
-            Display::returnFontAwesomeIcon('file-pdf-o') . get_lang('DownloadReportPdf'),
+            Display::returnFontAwesomeIcon('file-pdf-o').get_lang('DownloadReportPdf'),
             api_get_self()."?".api_get_self()."&action=export_table",
             ['class' => 'btn btn-default']
     );
@@ -784,7 +784,7 @@ 
     // Tool introduction
     Display::display_introduction_section(TOOL_GRADEBOOK, array('ToolbarSet' => 'AssessmentsIntroduction'));
 
-    if ((isset ($_GET['selectcat']) && $_GET['selectcat']<>0)) {
+    if ((isset ($_GET['selectcat']) && $_GET['selectcat'] <> 0)) {
         //
     } else {
         if ((
@@ -806,7 +806,7 @@ 
     }
 }
 
-if (isset($first_time) && $first_time==1 && api_is_allowed_to_edit(null,true)) {
+if (isset($first_time) && $first_time == 1 && api_is_allowed_to_edit(null, true)) {
     echo '<meta http-equiv="refresh" content="0;url='.api_get_self().'?cidReq='.$course_code.'" />';
 } else {
     $cats = Category::load(null, null, $course_code, null, null, $session_id, false);
@@ -843,7 +843,7 @@ 
                         $components = $obj->get_components($value);
 
                         foreach ($components as $component) {
-                            $gradebook =  new Gradebook();
+                            $gradebook = new Gradebook();
                             $params = array();
 
                             $params['name'] = $component['acronym'];
@@ -891,7 +891,7 @@ 
                     $certificate
                 );
 
-                if (api_is_allowed_to_edit(null,true) &&
+                if (api_is_allowed_to_edit(null, true) &&
                     api_get_setting('gradebook_enable_grade_model') == 'true'
                 ) {
                     //Showing the grading system

main/mySpace/student.php

Spacing +9 added lines, -9 removed lines

@@ -19,14 +19,14 @@ 
 
 $this_section = SECTION_TRACKING;
 
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
 
 if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"])) {
-    $interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers'));
+    $interbreadcrumb[] = array("url" => "teachers.php", "name" => get_lang('Teachers'));
 }
 
-if (isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"] == "coach") {
-    $interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors'));
+if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && isset($_GET["type"]) && $_GET["type"] == "coach") {
+    $interbreadcrumb[] = array("url" => "coaches.php", "name" => get_lang('Tutors'));
 }
 
 function get_count_users()
@@ -162,7 +162,7 @@ 
             $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
 				            '.Display::return_icon('2rightarrow.png').'</a>';
         } else {
-            $detailsLink =  '<a href="myStudents.php?student='.$student_id.'">
+            $detailsLink = '<a href="myStudents.php?student='.$student_id.'">
 				             '.Display::return_icon('2rightarrow.png').'</a>';
         }
 
@@ -191,7 +191,7 @@ 
 
 if (api_is_drh()) {
     $menu_items = array(
-        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php" ),
+        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php"),
         Display::url(Display::return_icon('user_na.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), '#'),
         Display::url(Display::return_icon('teacher.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php'),
         Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php'),
@@ -219,7 +219,7 @@ 
     );
     $actionsLeft .= Display::url(
         Display::return_icon("statistics.png", get_lang("CompanyReport"), array(), ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH) . "mySpace/company_reports.php"
+        api_get_path(WEB_CODE_PATH)."mySpace/company_reports.php"
     );
     $actionsLeft .= Display::url(
         Display::return_icon(
@@ -228,7 +228,7 @@ 
             [],
             ICON_SIZE_MEDIUM
         ),
-        api_get_path(WEB_CODE_PATH) . "gradebook/certificate_report.php"
+        api_get_path(WEB_CODE_PATH)."gradebook/certificate_report.php"
     );
 }
 
@@ -243,7 +243,7 @@ 
 );
 
 
-$toolbar = Display::toolbarAction('toolbar-student', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+$toolbar = Display::toolbarAction('toolbar-student', $content = array(0 => $actionsLeft, 1 => $actionsRight));
 
 $table = new SortableTable(
     'tracking_student',