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

main/inc/lib/add_courses_to_session_functions.lib.php

Indentation +67 added lines, -67 removed lines

@@ -6,47 +6,47 @@ 
  */
 class AddCourseToSession
 {
-	/**
-	 * Searches a course, given a search string and a type of search box
-	 * @param string $needle Search string
-	 * @param string $type Type of search box ('single' or anything else)
-	 * @return xajaxResponse XajaxResponse
-	 * @assert ('abc', 'single') !== null
-	 * @assert ('abc', 'multiple') !== null
-	 */
-	public static function search_courses($needle, $type)
-	{
-		global $tbl_session_rel_course, $id_session;
+    /**
+     * Searches a course, given a search string and a type of search box
+     * @param string $needle Search string
+     * @param string $type Type of search box ('single' or anything else)
+     * @return xajaxResponse XajaxResponse
+     * @assert ('abc', 'single') !== null
+     * @assert ('abc', 'multiple') !== null
+     */
+    public static function search_courses($needle, $type)
+    {
+        global $tbl_session_rel_course, $id_session;
         $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
-		$course_title = null;
-		$xajax_response = new xajaxResponse();
-		$return = '';
-		if(!empty($needle) && !empty($type)) {
-			// xajax send utf8 datas... datas in db can be non-utf8 datas
-			$charset = api_get_system_encoding();
-			$needle = api_convert_encoding($needle, $charset, 'utf-8');
+        $course_title = null;
+        $xajax_response = new xajaxResponse();
+        $return = '';
+        if(!empty($needle) && !empty($type)) {
+            // xajax send utf8 datas... datas in db can be non-utf8 datas
+            $charset = api_get_system_encoding();
+            $needle = api_convert_encoding($needle, $charset, 'utf-8');
 
-			$cond_course_code = '';
-			if (!empty($id_session)) {
-				$id_session = intval($id_session);
-				// check course_code from session_rel_course table
-				$sql = 'SELECT c_id FROM '.$tbl_session_rel_course.'
+            $cond_course_code = '';
+            if (!empty($id_session)) {
+                $id_session = intval($id_session);
+                // check course_code from session_rel_course table
+                $sql = 'SELECT c_id FROM '.$tbl_session_rel_course.'
 						WHERE session_id = '.$id_session;
-				$res = Database::query($sql);
-				$course_codes = '';
-				if (Database::num_rows($res) > 0) {
-					while ($row = Database::fetch_row($res)) {
-						$course_codes .= '\''.$row[0].'\',';
-					}
-					$course_codes = substr($course_codes,0,(strlen($course_codes)-1));
+                $res = Database::query($sql);
+                $course_codes = '';
+                if (Database::num_rows($res) > 0) {
+                    while ($row = Database::fetch_row($res)) {
+                        $course_codes .= '\''.$row[0].'\',';
+                    }
+                    $course_codes = substr($course_codes,0,(strlen($course_codes)-1));
 
-					$cond_course_code = ' AND course.id NOT IN('.$course_codes.') ';
-				}
-			}
+                    $cond_course_code = ' AND course.id NOT IN('.$course_codes.') ';
+                }
+            }
 
             if ($type == 'single') {
-				// search users where username or firstname or lastname begins likes $needle
-				$sql = 'SELECT
+                // search users where username or firstname or lastname begins likes $needle
+                $sql = 'SELECT
                             course.id,
 						 	course.visual_code,
 						 	course.title,
@@ -58,21 +58,21 @@ 
 						WHERE
 							course.visual_code LIKE "'.$needle.'%" OR
 							course.title LIKE "'.$needle.'%"';
-			} else {
+            } else {
                 $sql = 'SELECT course.id, course.visual_code, course.title
 						FROM '.$tbl_course.' course
 						WHERE
 							course.visual_code LIKE "'.$needle.'%" '.$cond_course_code.'
 						ORDER BY course.code ';
-			}
+            }
 
-			if (api_is_multiple_url_enabled()) {
-				$tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-				$access_url_id = api_get_current_access_url_id();
-				if ($access_url_id != -1){
+            if (api_is_multiple_url_enabled()) {
+                $tbl_course_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
+                $access_url_id = api_get_current_access_url_id();
+                if ($access_url_id != -1){
 
-					if ($type=='single') {
-						$sql = 'SELECT
+                    if ($type=='single') {
+                        $sql = 'SELECT
                                     course.id,
 						            course.visual_code,
 						            course.title,
@@ -87,7 +87,7 @@ 
 									access_url_id = '.$access_url_id.' AND
 									(course.visual_code LIKE "'.$needle.'%" OR
 									course.title LIKE "'.$needle.'%" )';
-					} else {
+                    } else {
                         $sql = 'SELECT course.id, course.visual_code, course.title
 								FROM '.$tbl_course.' course, '.$tbl_course_rel_access_url.' url_course
 								WHERE
@@ -95,32 +95,32 @@ 
 									access_url_id = '.$access_url_id.' AND
 									course.visual_code LIKE "'.$needle.'%" '.$cond_course_code.'
 								ORDER BY course.code ';
-					}
-				}
-			}
+                    }
+                }
+            }
 
-			$rs = Database::query($sql);
-			$course_list = array();
+            $rs = Database::query($sql);
+            $course_list = array();
             if ($type == 'single') {
-				while ($course = Database :: fetch_array($rs)) {
-					$course_list[] = $course['code'];
-					$course_title=str_replace("'","\'",$course_title);
+                while ($course = Database :: fetch_array($rs)) {
+                    $course_list[] = $course['code'];
+                    $course_title=str_replace("'","\'",$course_title);
                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_course_to_session(\''.$course['id'].'\',\''.$course_title.' ('.$course['visual_code'].')'.'\')">'.$course['title'].' ('.$course['visual_code'].')</a><br />';
-				}
-				$xajax_response -> addAssign('ajax_list_courses_single','innerHTML',api_utf8_encode($return));
-			} else {
-				$return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">';
-				while($course = Database :: fetch_array($rs)) {
-					$course_list[] = $course['code'];
-					$course_title=str_replace("'","\'",$course_title);
+                }
+                $xajax_response -> addAssign('ajax_list_courses_single','innerHTML',api_utf8_encode($return));
+            } else {
+                $return .= '<select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:340px;">';
+                while($course = Database :: fetch_array($rs)) {
+                    $course_list[] = $course['code'];
+                    $course_title=str_replace("'","\'",$course_title);
                     $return .= '<option value="'.$course['id'].'" title="'.htmlspecialchars($course['title'].' ('.$course['visual_code'].')',ENT_QUOTES).'">'.$course['title'].' ('.$course['visual_code'].')</option>';
-				}
-				$return .= '</select>';
-				$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-			}
-		}
-		$_SESSION['course_list'] = $course_list;
+                }
+                $return .= '</select>';
+                $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+            }
+        }
+        $_SESSION['course_list'] = $course_list;
 
-		return $xajax_response;
-	}
+        return $xajax_response;
+    }
 }

main/exercise/hotpotatoes_exercise_report.php

Indentation +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 }
 
 if (!$is_allowedToEdit) {
-   // api_not_allowed();
+    // api_not_allowed();
 }
 
 if (!empty($_REQUEST['path'])) {
@@ -189,8 +189,8 @@ 
         get_lang('Actions')
     );
 
-  // Column config
-  // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
+    // Column config
+    // @todo fix search firstname/lastname that doesn't work. rmove search for the moment
     $column_model = array(
         array('name' => 'firstname', 'index' => 'firstname', 'width' => '50', 'align' => 'left', 'search' => 'false'),
         array(

main/admin/sub_language.php

Indentation +164 added lines, -164 removed lines

@@ -66,30 +66,30 @@ 
 $sublanguage_folder_error = false;
 
 if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
-	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
-	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
-	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
+    $language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
+    $sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
+    $all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
+    $all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
+    $sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
 
-	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
-		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
-	}
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
-		$language_id_exist = true;
-	} else {
-		$language_id_exist = false;
-	}
+    if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
+        $sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
+    }
+    if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
+        $language_id_exist = true;
+    } else {
+        $language_id_exist = false;
+    }
 } else {
-	$language_name='';
-	$language_id_exist=false;
+    $language_name='';
+    $language_id_exist=false;
 }
 
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
 
 if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Display :: display_header($language_name);
@@ -114,7 +114,7 @@ 
 echo $html;
 echo '<br /><br /><br />';
 if (!empty($sublanguage_folder_error)) {
-	Display::display_warning_message($sublanguage_folder_error);
+    Display::display_warning_message($sublanguage_folder_error);
 }
 echo '<div id="div_message_information_id">&nbsp;</div>';
 
@@ -128,186 +128,186 @@ 
  * @return array
  */
 function search_language_term(
-	$term,
-	$search_in_variable = true,
-	$search_in_english = true,
-	$search_in_parent = true,
-	$search_in_sub_language = true
+    $term,
+    $search_in_variable = true,
+    $search_in_english = true,
+    $search_in_parent = true,
+    $search_in_sub_language = true
 ) {
-	//These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
-	/*
+    //These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
+    /*
 		These 4 arrays are set in global.inc.php with the condition that will be load from sub_language.php or sub_language_ajax.inc.php
 		$english_language_array
 		$parent_language_array
 		$sub_language_array
 		$language_files_to_load
 	*/
-	global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
-	$language_files_to_load_keys = array_flip($language_files_to_load);
-	$array_to_search = $parent_language_array;
-	$list_info = array();
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
-	//@todo optimize this foreach
-	foreach ($language_files_to_load as $lang_file) {
-		//searching in parent language of the sub language
-		if ($search_in_parent) {
-			$variables = $parent_language_array[$lang_file];
-			foreach ($variables as $parent_name_variable =>$parent_variable_value) {
-				//arrays are avoided
-				if (is_array($parent_variable_value)) {
-					continue;
-				}
-				$founded = false;
-				// searching the item in the parent tool
-				if (preg_match($term,$parent_variable_value)!==0) {
-					$founded = true;
-				}
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
+    global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
+    $language_files_to_load_keys = array_flip($language_files_to_load);
+    $array_to_search = $parent_language_array;
+    $list_info = array();
+    $term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
+    //@todo optimize this foreach
+    foreach ($language_files_to_load as $lang_file) {
+        //searching in parent language of the sub language
+        if ($search_in_parent) {
+            $variables = $parent_language_array[$lang_file];
+            foreach ($variables as $parent_name_variable =>$parent_variable_value) {
+                //arrays are avoided
+                if (is_array($parent_variable_value)) {
+                    continue;
+                }
+                $founded = false;
+                // searching the item in the parent tool
+                if (preg_match($term,$parent_variable_value)!==0) {
+                    $founded = true;
+                }
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
 
-					//config buttons
-					/*if (strlen($english_name_variable)>1500) {
+                    //config buttons
+                    /*if (strlen($english_name_variable)>1500) {
 						$size =20;
 					} else {
 						$size =4;
 					}*/
 
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
 
-					$list_info[] = array(
-						$lang_file . '.inc.php',
-						$parent_name_variable,
-						$english_name_variable,
-						$parent_variable_value,
-						$obj_text,
-						$obj_button
-					);
-				}
-			}
-		}
+                    $list_info[] = array(
+                        $lang_file . '.inc.php',
+                        $parent_name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,
+                        $obj_text,
+                        $obj_button
+                    );
+                }
+            }
+        }
 
-		//search in english
-		if ($search_in_english || $search_in_variable) {
-			$variables = $english_language_array[$lang_file];
-			foreach ($variables as $name_variable =>$variable_value) {
-				if (is_array($variable_value)) {
-					continue;
-				}
+        //search in english
+        if ($search_in_english || $search_in_variable) {
+            $variables = $english_language_array[$lang_file];
+            foreach ($variables as $name_variable =>$variable_value) {
+                if (is_array($variable_value)) {
+                    continue;
+                }
 
-				if (is_array($variable_value))
-					echo $lang_file;
-				$founded = false;
-				if ($search_in_english && $search_in_variable) {
-					// searching the item in the parent tool
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
-						$founded = true;
-					}
-				} else {
-					if ($search_in_english) {
-						if (preg_match($term,$variable_value)!==0) {
-							$founded = true;
-						}
-					} else {
-						if (preg_match($term,$name_variable)!==0) {
-							$founded = true;
-						}
-					}
-				}
+                if (is_array($variable_value))
+                    echo $lang_file;
+                $founded = false;
+                if ($search_in_english && $search_in_variable) {
+                    // searching the item in the parent tool
+                    if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
+                        $founded = true;
+                    }
+                } else {
+                    if ($search_in_english) {
+                        if (preg_match($term,$variable_value)!==0) {
+                            $founded = true;
+                        }
+                    } else {
+                        if (preg_match($term,$name_variable)!==0) {
+                            $founded = true;
+                        }
+                    }
+                }
 
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = null;
-					if (isset($sub_language_array[$lang_file][$name_variable])) {
-						$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
-					}
-					$parent_variable_value = null;
-					if (isset($parent_language_array[$lang_file][$name_variable])) {
-						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
-					}
-					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
-						$sub_language_name_variable.'
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = null;
+                    if (isset($sub_language_array[$lang_file][$name_variable])) {
+                        $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
+                    }
+                    $parent_variable_value = null;
+                    if (isset($parent_language_array[$lang_file][$name_variable])) {
+                        $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
+                    }
+                    //config buttons
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
+                        $sub_language_name_variable.'
 						</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
 
-					$list_info[] = array(
-						$lang_file . '.inc.php',
-						$name_variable,
-						$english_name_variable,
-						$parent_variable_value,
-						$obj_text,
-						$obj_button
-					);
-				}
-			}
-		}
+                    $list_info[] = array(
+                        $lang_file . '.inc.php',
+                        $name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,
+                        $obj_text,
+                        $obj_button
+                    );
+                }
+            }
+        }
 
-		// Search in sub language
-		if ($search_in_sub_language) {
-			$variables = $sub_language_array[$lang_file];
-			foreach ($variables as $name_variable =>$variable_value) {
-				if (is_array($parent_variable_value)) {
-					continue;
-				}
+        // Search in sub language
+        if ($search_in_sub_language) {
+            $variables = $sub_language_array[$lang_file];
+            foreach ($variables as $name_variable =>$variable_value) {
+                if (is_array($parent_variable_value)) {
+                    continue;
+                }
 
-				if (is_array($variable_value)) {
-					continue;
-				}
+                if (is_array($variable_value)) {
+                    continue;
+                }
 
-				$founded = false;
-				// searching the item in the parent tool
-				if (preg_match($term,$variable_value)!==0) {
-					$founded = true;
-				}
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
-					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
-					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+                $founded = false;
+                // searching the item in the parent tool
+                if (preg_match($term,$variable_value)!==0) {
+                    $founded = true;
+                }
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
+                    $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
+                    //config buttons
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
-					$list_info[]=array($lang_file.'.inc.php',
-						$name_variable,
-						$english_name_variable,
-						$parent_variable_value,$obj_text,$obj_button);
-				}
-			}
-		}
-	}
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
+                    $list_info[]=array($lang_file.'.inc.php',
+                        $name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,$obj_text,$obj_button);
+                }
+            }
+        }
+    }
 
-	$list_info = array_unique_dimensional($list_info);
-	return $list_info;
+    $list_info = array_unique_dimensional($list_info);
+    return $list_info;
 }
 
 // Allow see data in sort table
 $list_info = array();
 if (isset($_REQUEST['txt_search_word'])) {
-	//@todo fix to accept a char with 1 char
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
-		$list_info = search_language_term(
-			$_REQUEST['txt_search_word'],
-			true,
-			true,
-			true,
-			true
-		);
-	}
+    //@todo fix to accept a char with 1 char
+    if (strlen(trim($_REQUEST['txt_search_word']))>2) {
+        $list_info = search_language_term(
+            $_REQUEST['txt_search_word'],
+            true,
+            true,
+            true,
+            true
+        );
+    }
 }
 
 $parameters = array(
-	'id' => intval($_GET['id']),
-	'sub_language_id' => intval($_GET['sub_language_id']),
-	'txt_search_word' => $txt_search_word
+    'id' => intval($_GET['id']),
+    'sub_language_id' => intval($_GET['sub_language_id']),
+    'txt_search_word' => $txt_search_word
 );
 $table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
 $table->set_additional_parameters($parameters);

main/admin/user_add.php

Indentation +60 added lines, -60 removed lines

@@ -99,27 +99,27 @@ 
 $form = new FormValidator('user_add');
 $form->addElement('header', '', $tool_name);
 if (api_is_western_name_order()) {
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 } else {
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 }
 // Official code
 $form->addElement('text', 'official_code', get_lang('OfficialCode'), array('size' => '40'));
@@ -163,7 +163,7 @@ 
 $auth_sources = 0; //make available wider as we need it in case of form reset (see below)
 $nb_ext_auth_source_added = 0;
 if (isset($extAuthSource) && count($extAuthSource) > 0) {
-	$auth_sources = array();
+    $auth_sources = array();
     foreach ($extAuthSource as $key => $info) {
         // @todo : make uniform external authentification configuration (ex : cas and external_login ldap)
         // Special case for CAS. CAS is activated from Chamilo > Administration > Configuration > CAS
@@ -174,10 +174,10 @@ 
             $nb_ext_auth_source_added++;
         }
     }
-	if ($nb_ext_auth_source_added > 0) {
-    	$group[] = $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
-    	$group[] = $form->createElement('select', 'auth_source', null, $auth_sources);
-    	$group[] = $form->createElement('static', '', '', '<br />');
+    if ($nb_ext_auth_source_added > 0) {
+        $group[] = $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
+        $group[] = $form->createElement('select', 'auth_source', null, $auth_sources);
+        $group[] = $form->createElement('static', '', '', '<br />');
     }
 }
 
@@ -246,12 +246,12 @@ 
 $form->addElement('html', '<div id="drh_list" style="display:'.$display.';">');
 
 if (isset($drh_list) && is_array($drh_list)) {
-	foreach ($drh_list as $drh) {
+    foreach ($drh_list as $drh) {
         $drh_select->addOption(
             api_get_person_name($drh['firstname'], $drh['lastname']),
             $drh['user_id']
         );
-	}
+    }
 }
 $form->addElement('html', '</div>');
 
@@ -325,7 +325,7 @@ 
 
 // Validate form
 if ($form->validate()) {
-	$check = Security::check_token('post');
+    $check = Security::check_token('post');
     if ($check) {
         $user = $form->exportValues();
         $lastname = $user['lastname'];
@@ -341,15 +341,15 @@ 
         $send_mail = intval($user['mail']['send_mail']);
         $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : 0;
 
-		if (isset($extAuthSource) && count($extAuthSource) > 0 &&
+        if (isset($extAuthSource) && count($extAuthSource) > 0 &&
             $user['password']['password_auto'] == '2'
         ) {
-			$auth_source = $user['password']['auth_source'];
-			$password = 'PLACEHOLDER';
-		} else {
-			$auth_source = PLATFORM_AUTH_SOURCE;
-			$password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
-		}
+            $auth_source = $user['password']['auth_source'];
+            $password = 'PLACEHOLDER';
+        } else {
+            $auth_source = PLATFORM_AUTH_SOURCE;
+            $password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
+        }
 
         if ($user['radio_expiration_date'] == '1') {
             $expiration_date = $user['expiration_date'];
@@ -357,7 +357,7 @@ 
             $expiration_date = null;
         }
 
-		$active = intval($user['active']);
+        $active = intval($user['active']);
 
         if (api_get_setting('login_is_email') == 'true') {
             $username = $email;
@@ -388,12 +388,12 @@ 
             $extra,
             null,
             $send_mail,
-			$platform_admin
+            $platform_admin
         );
 
-		Security::clear_token();
-		$tok = Security::get_token();
-		if (!empty($user_id)) {
+        Security::clear_token();
+        $tok = Security::get_token();
+        if (!empty($user_id)) {
             if (!empty($picture['name'])) {
                 $picture_uri = UserManager::update_user_picture(
                     $user_id,
@@ -420,37 +420,37 @@ 
                     null,
                     $language
                 );
-			}
+            }
 
             $extraFieldValues = new ExtraFieldValue('user');
             $user['item_id'] = $user_id;
             $extraFieldValues->saveFieldValues($user);
-			$message = get_lang('UserAdded');
-		}
+            $message = get_lang('UserAdded');
+        }
 
-		if (isset($user['submit_plus'])) {
-			//we want to add more. Prepare report message and redirect to the same page (to clean the form)
+        if (isset($user['submit_plus'])) {
+            //we want to add more. Prepare report message and redirect to the same page (to clean the form)
             Display::addFlash(Display::return_message($message));
-			header('Location: user_add.php?sec_token='.$tok);
-			exit;
-		} else {
-			$tok = Security::get_token();
+            header('Location: user_add.php?sec_token='.$tok);
+            exit;
+        } else {
+            $tok = Security::get_token();
             Display::addFlash(Display::return_message($message));
-			header('Location: user_list.php?sec_token='.$tok);
-			exit;
-		}
-	}
+            header('Location: user_list.php?sec_token='.$tok);
+            exit;
+        }
+    }
 } else {
-	if (isset($_POST['submit'])) {
-		Security::clear_token();
-	}
-	$token = Security::get_token();
-	$form->addElement('hidden', 'sec_token');
-	$form->setConstants(array('sec_token' => $token));
+    if (isset($_POST['submit'])) {
+        Security::clear_token();
+    }
+    $token = Security::get_token();
+    $form->addElement('hidden', 'sec_token');
+    $form->setConstants(array('sec_token' => $token));
 }
 
 if (!empty($message)){
-	$message = Display::return_message(stripslashes($message));
+    $message = Display::return_message(stripslashes($message));
 }
 $content = $form->returnForm();
 

main/admin/user_edit.php

Indentation +97 added lines, -97 removed lines

@@ -102,7 +102,7 @@ 
 unset($user_data['password']);
 
 if ($userGeolocalization) {
-	$htmlHeadXtra[] = '<script>
+    $htmlHeadXtra[] = '<script>
     $(document).ready(function() {
 
         var address = "' . $user_data['address'] . '";
@@ -212,27 +212,27 @@ 
 $form->addElement('hidden', 'user_id', $user_id);
 
 if (api_is_western_name_order()) {
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 } else {
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 }
 
 // Official code
@@ -254,16 +254,16 @@ 
 
 // OpenID
 if (api_get_setting('openid_authentication') == 'true') {
-	$form->addElement('text', 'openid', get_lang('OpenIDURL'));
+    $form->addElement('text', 'openid', get_lang('OpenIDURL'));
 }
 
 // Phone
 $form->addElement('text', 'phone', get_lang('PhoneNumber'));
 
 if ($userGeolocalization) {
-	// Geolocation
-	$form->addElement('text', 'address', get_lang('AddressField'), ['id' => 'address']);
-	$form->addHtml('
+    // Geolocation
+    $form->addElement('text', 'address', get_lang('AddressField'), ['id' => 'address']);
+    $form->addHtml('
         <div class="form-group">
             <label for="geolocalization" class="col-sm-2 control-label"></label>
             <div class="col-sm-8">
@@ -273,7 +273,7 @@ 
         </div>
     ');
 
-	$form->addHtml('
+    $form->addHtml('
         <div class="form-group">
             <label for="map" class="col-sm-2 control-label">
                 '.get_lang('Map').'
@@ -295,18 +295,18 @@ 
 $allowed_picture_types = api_get_supported_image_extensions(false);
 
 $form->addRule(
-	'picture',
-	get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
-	'filetype',
-	$allowed_picture_types
+    'picture',
+    get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
+    'filetype',
+    $allowed_picture_types
 );
 if (strlen($user_data['picture_uri']) > 0) {
-	$form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
+    $form->addElement('checkbox', 'delete_picture', '', get_lang('DelImage'));
 }
 
 // Username
 if (api_get_setting('login_is_email') != 'true') {
-	$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
+    $form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
     $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
     $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
     $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
@@ -378,15 +378,15 @@ 
 
 // Platform admin
 if (api_is_platform_admin()) {
-	$group = array();
-	$group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1);
-	$group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0);
+    $group = array();
+    $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('Yes'), 1);
+    $group[] =$form->createElement('radio', 'platform_admin', null, get_lang('No'), 0);
 
-	$user_data['status'] == 1 ? $display = 'block':$display = 'none';
+    $user_data['status'] == 1 ? $display = 'block':$display = 'none';
 
-	$form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">');
-	$form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false);
-	$form->addElement('html', '</div>');
+    $form->addElement('html', '<div id="id_platform_admin" style="display:'.$display.'">');
+    $form->addGroup($group, 'admin', get_lang('PlatformAdmin'), null, false);
+    $form->addElement('html', '</div>');
 }
 
 //Language
@@ -404,16 +404,16 @@ 
 $form->addElement('label', get_lang('RegistrationDate'), $date);
 
 if (!$user_data['platform_admin']) {
-	// Expiration Date
-	$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
-	$group = array ();
-	$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
-	$group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
-	$form->addGroup($group, 'max_member_group', null, null, false);
-
-	// Active account or inactive account
-	$form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
-	$form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
+    // Expiration Date
+    $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
+    $group = array ();
+    $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
+    $group[] = $form->createElement('DateTimePicker', 'expiration_date', null, array('onchange' => 'javascript: enable_expiration_date();'));
+    $form->addGroup($group, 'max_member_group', null, null, false);
+
+    // Active account or inactive account
+    $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
+    $form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
 }
 $studentBossList = UserManager::getStudentBossList($user_data['user_id']);
 
@@ -455,18 +455,18 @@ 
 $expiration_date = $user_data['expiration_date'];
 
 if (empty($expiration_date)) {
-	$user_data['radio_expiration_date'] = 0;
-	$user_data['expiration_date'] = api_get_local_time();
+    $user_data['radio_expiration_date'] = 0;
+    $user_data['expiration_date'] = api_get_local_time();
 } else {
-	$user_data['radio_expiration_date'] = 1;
-	$user_data['expiration_date'] = api_get_local_time($expiration_date);
+    $user_data['radio_expiration_date'] = 1;
+    $user_data['expiration_date'] = api_get_local_time($expiration_date);
 }
 $form->setDefaults($user_data);
 
 $error_drh = false;
 // Validate form
 if ($form->validate()) {
-	$user = $form->getSubmitValues(1);
+    $user = $form->getSubmitValues(1);
     $reset_password = intval($user['reset_password']);
     if ($reset_password == 2 && empty($user['password'])) {
         Display::addFlash(Display::return_message(get_lang('PasswordIsTooShort')));
@@ -474,18 +474,18 @@ 
         exit();
     }
 
-	$is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
+    $is_user_subscribed_in_course = CourseManager::is_user_subscribed_in_course($user['user_id']);
 
-	if ($user['status'] == DRH && $is_user_subscribed_in_course) {
-		$error_drh = true;
-	} else {
-		$picture_element = $form->getElement('picture');
-		$picture = $picture_element->getValue();
+    if ($user['status'] == DRH && $is_user_subscribed_in_course) {
+        $error_drh = true;
+    } else {
+        $picture_element = $form->getElement('picture');
+        $picture = $picture_element->getValue();
 
-		$picture_uri = $user_data['picture_uri'];
-		if (isset($user['delete_picture']) && $user['delete_picture']) {
-			$picture_uri = UserManager::delete_user_picture($user_id);
-		} elseif (!empty($picture['name'])) {
+        $picture_uri = $user_data['picture_uri'];
+        if (isset($user['delete_picture']) && $user['delete_picture']) {
+            $picture_uri = UserManager::delete_user_picture($user_id);
+        } elseif (!empty($picture['name'])) {
             $picture_uri = UserManager::update_user_picture(
                 $user_id,
                 $_FILES['picture']['name'],
@@ -493,30 +493,30 @@ 
                 $user['picture_crop_result']
 
             );
-		}
+        }
 
-		$lastname = $user['lastname'];
-		$firstname = $user['firstname'];
+        $lastname = $user['lastname'];
+        $firstname = $user['firstname'];
         $password = $user['password'];
         $auth_source = isset($user['auth_source']) ? $user['auth_source'] : $userInfo['auth_source'];
-		$official_code = $user['official_code'];
-		$email = $user['email'];
-		$phone = $user['phone'];
-		$username = isset($user['username']) ? $user['username'] : $userInfo['username'];
-		$status = intval($user['status']);
-		$platform_admin = intval($user['platform_admin']);
-		$send_mail = intval($user['send_mail']);
-		$reset_password = intval($user['reset_password']);
-		$hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null;
-		$language = $user['language'];
-
-		if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) {
+        $official_code = $user['official_code'];
+        $email = $user['email'];
+        $phone = $user['phone'];
+        $username = isset($user['username']) ? $user['username'] : $userInfo['username'];
+        $status = intval($user['status']);
+        $platform_admin = intval($user['platform_admin']);
+        $send_mail = intval($user['send_mail']);
+        $reset_password = intval($user['reset_password']);
+        $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : null;
+        $language = $user['language'];
+
+        if ($user['radio_expiration_date'] == '1' && !$user_data['platform_admin']) {
             $expiration_date = $user['expiration_date'];
-		} else {
-			$expiration_date = null;
-		}
+        } else {
+            $expiration_date = null;
+        }
 
-		$active = $user_data['platform_admin'] ? 1 : intval($user['active']);
+        $active = $user_data['platform_admin'] ? 1 : intval($user['active']);
 
         //If the user is set to admin the status will be overwrite by COURSEMANAGER = 1
         if ($platform_admin == 1) {
@@ -548,40 +548,40 @@ 
             null,
             $send_mail,
             $reset_password,
-			$user['address']
+            $user['address']
         );
 
         if (isset($user['student_boss'])) {
             UserManager::subscribeUserToBossList($user_id, $user['student_boss']);
         }
 
-		if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) {
-			$up = UserManager::update_openid($user_id, $user['openid']);
-		}
+        if (api_get_setting('openid_authentication') == 'true' && !empty($user['openid'])) {
+            $up = UserManager::update_openid($user_id, $user['openid']);
+        }
         $currentUserId = api_get_user_id();
 
         $userObj = api_get_user_entity($user_id);
 
         UserManager::add_user_as_admin($userObj);
 
-		if ($user_id != $currentUserId) {
-			if ($platform_admin == 1) {
-				$userObj = api_get_user_entity($user_id);
+        if ($user_id != $currentUserId) {
+            if ($platform_admin == 1) {
+                $userObj = api_get_user_entity($user_id);
                 UserManager::add_user_as_admin($userObj);
-			} else {
+            } else {
                 UserManager::remove_user_admin($user_id);
-			}
-		}
+            }
+        }
 
         $extraFieldValue = new ExtraFieldValue('user');
         $extraFieldValue->saveFieldValues($user);
 
-		$tok = Security::get_token();
+        $tok = Security::get_token();
 
         Display::addFlash(Display::return_message(get_lang('UserUpdated')));
-		header('Location: user_list.php?sec_token='.$tok);
-		exit();
-	}
+        header('Location: user_list.php?sec_token='.$tok);
+        exit();
+    }
 }
 
 if ($error_drh) {

main/webservices/webservice_user.php

Indentation +416 added lines, -416 removed lines

@@ -11,232 +11,232 @@ 
  */
 class WSUser extends WS {
 
-	/**
-	 * Enables or disables a user
-	 *
-	 * @param string User id field name
-	 * @param string User id value
-	 * @param int Set to 1 to enable and to 0 to disable
-	 */
-	protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if($state == 0) {
-				UserManager::disable($user_id);
-			} else if($state == 1) {
-				UserManager::enable($user_id);
-			}
-		}
-	}
+    /**
+     * Enables or disables a user
+     *
+     * @param string User id field name
+     * @param string User id value
+     * @param int Set to 1 to enable and to 0 to disable
+     */
+    protected function changeUserActiveState($user_id_field_name, $user_id_value, $state) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if($state == 0) {
+                UserManager::disable($user_id);
+            } else if($state == 1) {
+                UserManager::enable($user_id);
+            }
+        }
+    }
 
-	/**
-	 * Enables or disables multiple users
-	 *
-	 * @param array Users
-	 * @param int Set to 1 to enable and to 0 to disable
-	 * @return array Array of results
-	 */
-	protected function changeUsersActiveState($users, $state) {
-		$results = array();
-		foreach($users as $user) {
-			$result_tmp = array();
-			$result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
-			$result_tmp['user_id_value'] = $user['user_id_value'];
-			if($result_op instanceof WSError) {
-				// Return the error in the results
-				$result_tmp['result'] = $result_op->toArray();
-			} else {
-				$result_tmp['result'] = $this->getSuccessfulResult();
-			}
-			$results[] = $result_tmp;
-		}
-		return $results;
-	}
+    /**
+     * Enables or disables multiple users
+     *
+     * @param array Users
+     * @param int Set to 1 to enable and to 0 to disable
+     * @return array Array of results
+     */
+    protected function changeUsersActiveState($users, $state) {
+        $results = array();
+        foreach($users as $user) {
+            $result_tmp = array();
+            $result_op = $this->changeUserActiveState($user['user_id_field_name'], $user['user_id_value'], $state);
+            $result_tmp['user_id_value'] = $user['user_id_value'];
+            if($result_op instanceof WSError) {
+                // Return the error in the results
+                $result_tmp['result'] = $result_op->toArray();
+            } else {
+                $result_tmp['result'] = $this->getSuccessfulResult();
+            }
+            $results[] = $result_tmp;
+        }
+        return $results;
+    }
 
-	/**
-	 * Disables a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Disables a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function DisableUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 0);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Disables multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DisableUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			return $this->changeUsersActiveState($users, 0);
-		}
-	}
+    /**
+     * Disables multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DisableUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            return $this->changeUsersActiveState($users, 0);
+        }
+    }
 
-	/**
-	 * Enables a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Enables a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function EnableUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->changeUserActiveState($user_id_field_name, $user_id_value, 1);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Enables multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function EnableUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			// Let the implementation handle it
-			$this->handleError($verifKey);
-		} else {
-			return $this->changeUsersActiveState($users, 1);
-		}
-	}
+    /**
+     * Enables multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function EnableUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            // Let the implementation handle it
+            $this->handleError($verifKey);
+        } else {
+            return $this->changeUsersActiveState($users, 1);
+        }
+    }
 
-	/**
-	 * Deletes a user (helper method)
-	 *
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 * @return mixed True if user was successfully deleted, WSError otherwise
-	 */
-	protected function deleteUserHelper($user_id_field_name, $user_id_value) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if(!UserManager::delete_user($user_id)) {
-				return new WSError(101, "There was a problem while deleting this user");
-			} else {
-				return true;
-			}
-		}
-	}
+    /**
+     * Deletes a user (helper method)
+     *
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     * @return mixed True if user was successfully deleted, WSError otherwise
+     */
+    protected function deleteUserHelper($user_id_field_name, $user_id_value) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if(!UserManager::delete_user($user_id)) {
+                return new WSError(101, "There was a problem while deleting this user");
+            } else {
+                return true;
+            }
+        }
+    }
 
-	/**
-	 * Deletes a user
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value
-	 */
-	public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+    /**
+     * Deletes a user
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value
+     */
+    public function DeleteUser($secret_key, $user_id_field_name, $user_id_value) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->deleteUserHelper($user_id_field_name, $user_id_value);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Deletes multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function DeleteUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
-				$result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
-				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+    /**
+     * Deletes multiple users
+     *
+     * @param string API secret key
+     * @param array Array of users with elements of the form array('user_id_field_name' => 'name_of_field', 'user_id_value' => 'value')
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function DeleteUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
+                $result_op = $this->deleteUserHelper($user['user_id_field_name'], $user['user_id_value']);
+                $result_tmp['user_id_value'] = $user['user_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Creates a user (helper method)
-	 *
-	 * @param string User first name
-	 * @param string User last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password (encrypted or not)
-	 * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
-	 * to include the salt in the extra fields if you are encrypting the password
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value. Leave blank if you are using the internal user_id
-	 * @param int Visibility.
-	 * @param string User email.
-	 * @param string Language.
-	 * @param string Phone.
-	 * @param string Expiration date
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field').
-	 * @return mixed New user id generated by the system, WSError otherwise
-	 */
-	protected function createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras = array()) {
+    /**
+     * Creates a user (helper method)
+     *
+     * @param string User first name
+     * @param string User last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password (encrypted or not)
+     * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
+     * to include the salt in the extra fields if you are encrypting the password
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value. Leave blank if you are using the internal user_id
+     * @param int Visibility.
+     * @param string User email.
+     * @param string Language.
+     * @param string Phone.
+     * @param string Expiration date
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field').
+     * @return mixed New user id generated by the system, WSError otherwise
+     */
+    protected function createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras = array()) {
 
-		// Add the original user id field name and value to the extra fields if needed
-		$extras_associative = array();
-		if($user_id_field_name != "chamilo_user_id") {
-			$extras_associative[$user_id_field_name] = $user_id_value;
-		}
+        // Add the original user id field name and value to the extra fields if needed
+        $extras_associative = array();
+        if($user_id_field_name != "chamilo_user_id") {
+            $extras_associative[$user_id_field_name] = $user_id_value;
+        }
                 if (!empty($extras)) {
                     foreach($extras as $extra) {
                         $extras_associative[$extra['field_name']] = $extra['field_value'];
                     }
                 }
-		$result = UserManager::create_user($firstname, $lastname, $status, $email, $login, $password, '', $language, $phone, '', PLATFORM_AUTH_SOURCE, $expiration_date, $visibility, 0, $extras_associative, $encrypt_method);
-		if (!$result) {
+        $result = UserManager::create_user($firstname, $lastname, $status, $email, $login, $password, '', $language, $phone, '', PLATFORM_AUTH_SOURCE, $expiration_date, $visibility, 0, $extras_associative, $encrypt_method);
+        if (!$result) {
 
-		    return new WSError(104, 'There was an error creating the user');
+            return new WSError(104, 'There was an error creating the user');
 
-			/*$failure = $api_failureList[0];
+            /*$failure = $api_failureList[0];
 			if($failure == 'login-pass already taken') {
 				return new WSError(102, 'This username is already taken');
 			} else if($failure == 'encrypt_method invalid') {
@@ -244,227 +244,227 @@ 
 			} else {
 				return new WSError(104, 'There was an error creating the user');
 			}*/
-		} else {
-			return $result;
-		}
-	}
+        } else {
+            return $result;
+        }
+    }
 
-	/**
-	 * Creates a user
-	 *
-	 * @param string API secret key
-	 * @param string User first name
-	 * @param string User last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password (encrypted or not)
-	 * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
-	 * to include the salt in the extra fields if you are encrypting the password
-	 * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
-	 * @param string User id value. Leave blank if you are using the internal user_id
-	 * @param int Visibility. Set by default to 1
-	 * @param string User email. Set by default to an empty string
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Set to an empty array by default
-	 * @return int New user id generated by the system
-	 */
-	public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			} else {
-				return $result;
-			}
-		}
-	}
+    /**
+     * Creates a user
+     *
+     * @param string API secret key
+     * @param string User first name
+     * @param string User last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password (encrypted or not)
+     * @param string Encrypt method. Leave blank if you are passing the password in clear text, set to the encrypt method used to encrypt the password otherwise. Remember
+     * to include the salt in the extra fields if you are encrypting the password
+     * @param string User id field name. Use "chamilo_user_id" as the field name if you want to use the internal user_id
+     * @param string User id value. Leave blank if you are using the internal user_id
+     * @param int Visibility. Set by default to 1
+     * @param string User email. Set by default to an empty string
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Set to an empty array by default
+     * @return int New user id generated by the system
+     */
+    public function CreateUser($secret_key, $firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility = 1, $email = '', $language = 'english', $phone = '', $expiration_date = '0000-00-00 00:00:00', $extras = array()) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Creates multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Users array. Each member of this array must follow the structure imposed by the CreateUser method
-	 * @return array Array with elements of the form array('user_id_value' => 'original value sent', 'user_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
-	 */
-	public function CreateUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
+    /**
+     * Creates multiple users
+     *
+     * @param string API secret key
+     * @param array Users array. Each member of this array must follow the structure imposed by the CreateUser method
+     * @return array Array with elements of the form array('user_id_value' => 'original value sent', 'user_id_generated' => 'value_generated', 'result' => array('code' => 0, 'message' => 'Operation was successful'))
+     */
+    public function CreateUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $firstname = $lastname = $status = $login = $password = $encrypt_method = $user_id_field_name = $user_id_value = $visibility = $email = $language = $phone = $expiration_date = $extras = null;
-				extract($user);
-				$result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
-				if($result instanceof WSError) {
-					$result_tmp['result'] = $result->toArray();
-					$result_tmp['user_id_value'] = $user_id_value;
-					$result_tmp['user_id_generated'] = 0;
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-					$result_tmp['user_id_value'] = $user_id_value;
-					$result_tmp['user_id_generated'] = $result;
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($user);
+                $result = $this->createUserHelper($firstname, $lastname, $status, $login, $password, $encrypt_method, $user_id_field_name, $user_id_value, $visibility, $email, $language, $phone, $expiration_date, $extras);
+                if($result instanceof WSError) {
+                    $result_tmp['result'] = $result->toArray();
+                    $result_tmp['user_id_value'] = $user_id_value;
+                    $result_tmp['user_id_generated'] = 0;
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                    $result_tmp['user_id_value'] = $user_id_value;
+                    $result_tmp['user_id_generated'] = $result;
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 
-	/**
-	 * Edits user info (helper method)
-	 *
-	 * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
-	 * @param string User id value
-	 * @param string First name
-	 * @param string Last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password. Leave blank if you don't want to update it
-	 * @param string Encrypt method
-	 * @param string User email
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
-	 * @return mixed True if user was successfully updated, WSError otherwise
-	 */
-	protected function editUserHelper(
-		$user_id_field_name,
-		$user_id_value,
-		$firstname,
-		$lastname,
-		$status,
-		$loginname,
-		$password,
-		$encrypt_method,
-		$email,
-		$language,
-		$phone,
-		$expiration_date,
-		$extras
-	) {
-		$user_id = $this->getUserId($user_id_field_name, $user_id_value);
-		if($user_id instanceof WSError) {
-			return $user_id;
-		} else {
-			if($password == '') {
-				$password = null;
-			}
-			$user_info = api_get_user_info($user_id);
-			if (count($extras) == 0) {
-				$extras = null;
-			}
+    /**
+     * Edits user info (helper method)
+     *
+     * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
+     * @param string User id value
+     * @param string First name
+     * @param string Last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password. Leave blank if you don't want to update it
+     * @param string Encrypt method
+     * @param string User email
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
+     * @return mixed True if user was successfully updated, WSError otherwise
+     */
+    protected function editUserHelper(
+        $user_id_field_name,
+        $user_id_value,
+        $firstname,
+        $lastname,
+        $status,
+        $loginname,
+        $password,
+        $encrypt_method,
+        $email,
+        $language,
+        $phone,
+        $expiration_date,
+        $extras
+    ) {
+        $user_id = $this->getUserId($user_id_field_name, $user_id_value);
+        if($user_id instanceof WSError) {
+            return $user_id;
+        } else {
+            if($password == '') {
+                $password = null;
+            }
+            $user_info = api_get_user_info($user_id);
+            if (count($extras) == 0) {
+                $extras = null;
+            }
 
-			$result = UserManager::update_user(
-				$user_id,
-				$firstname,
-				$lastname,
-				$loginname,
-				$password,
-				PLATFORM_AUTH_SOURCE,
-				$email,
-				$status,
-				'',
-				$phone,
-				$user_info['picture_uri'],
-				$expiration_date,
-				$user_info['active'],
-				null,
-				$user_info['hr_dept_id'],
-				$extras,
-				$encrypt_method
-			);
-			if (!$result) {
-				/*if($failure == 'encrypt_method invalid') {
+            $result = UserManager::update_user(
+                $user_id,
+                $firstname,
+                $lastname,
+                $loginname,
+                $password,
+                PLATFORM_AUTH_SOURCE,
+                $email,
+                $status,
+                '',
+                $phone,
+                $user_info['picture_uri'],
+                $expiration_date,
+                $user_info['active'],
+                null,
+                $user_info['hr_dept_id'],
+                $extras,
+                $encrypt_method
+            );
+            if (!$result) {
+                /*if($failure == 'encrypt_method invalid') {
 					return new WSError(103, 'The encryption of the password is invalid');
 				} else {
 					return new WSError(105, 'There was an error updating the user');
 				}*/
-				return new WSError(105, 'There was an error updating the user');
-			} else {
-				return $result;
-			}
-		}
-	}
+                return new WSError(105, 'There was an error updating the user');
+            } else {
+                return $result;
+            }
+        }
+    }
 
-	/**
-	 * Edits user info
-	 *
-	 * @param string API secret key
-	 * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
-	 * @param string User id value
-	 * @param string First name
-	 * @param string Last name
-	 * @param int User status
-	 * @param string Login name
-	 * @param string Password. Leave blank if you don't want to update it
-	 * @param string Encrypt method
-	 * @param string User email
-	 * @param string Language. Set by default to english
-	 * @param string Phone. Set by default to an empty string
-	 * @param string Expiration date. Set to null by default
-	 * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
-	 */
-	public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
-		// First, verify the secret key
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
+    /**
+     * Edits user info
+     *
+     * @param string API secret key
+     * @param string User id field name. Use "chamilo_user_id" in order to use internal system id
+     * @param string User id value
+     * @param string First name
+     * @param string Last name
+     * @param int User status
+     * @param string Login name
+     * @param string Password. Leave blank if you don't want to update it
+     * @param string Encrypt method
+     * @param string User email
+     * @param string Language. Set by default to english
+     * @param string Phone. Set by default to an empty string
+     * @param string Expiration date. Set to null by default
+     * @param array Extra fields. An array with elements of the form ('field_name' => 'name_of_the_field', 'field_value' => 'value_of_the_field'). Leave empty if you don't want to update
+     */
+    public function EditUser($secret_key, $user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras) {
+        // First, verify the secret key
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
 
-			$extras_associative = array();
-			if (!empty($extras)) {
-				foreach($extras as $extra) {
-					$extras_associative[$extra['field_name']] = $extra['field_value'];
-				}
-			}
+            $extras_associative = array();
+            if (!empty($extras)) {
+                foreach($extras as $extra) {
+                    $extras_associative[$extra['field_name']] = $extra['field_value'];
+                }
+            }
 
-			$result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
-			if($result instanceof WSError) {
-				$this->handleError($result);
-			}
-		}
-	}
+            $result = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras_associative);
+            if($result instanceof WSError) {
+                $this->handleError($result);
+            }
+        }
+    }
 
-	/**
-	 * Edits multiple users
-	 *
-	 * @param string API secret key
-	 * @param array Users array. Each member of this array must follow the structure imposed by the EditUser method
-	 * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
-	 * than 0, an error occured
-	 */
-	public function EditUsers($secret_key, $users) {
-		$verifKey = $this->verifyKey($secret_key);
-		if($verifKey instanceof WSError) {
-			$this->handleError($verifKey);
-		} else {
-			$results = array();
-			foreach($users as $user) {
-				$result_tmp = array();
+    /**
+     * Edits multiple users
+     *
+     * @param string API secret key
+     * @param array Users array. Each member of this array must follow the structure imposed by the EditUser method
+     * @return array Array with elements like array('user_id_value' => 'value', 'result' => array('code' => 0, 'message' => 'Operation was successful')). Note that if the result array contains a code different
+     * than 0, an error occured
+     */
+    public function EditUsers($secret_key, $users) {
+        $verifKey = $this->verifyKey($secret_key);
+        if($verifKey instanceof WSError) {
+            $this->handleError($verifKey);
+        } else {
+            $results = array();
+            foreach($users as $user) {
+                $result_tmp = array();
                 // re-initialize variables just in case
                 $user_id_field_name = $user_id_value = $firstname = $lastname = $status = $loginname = $password = $encrypt_method = $email = $language = $phone = $expiration_date = $extras = null;
-				extract($user);
-				$result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
-				$result_tmp['user_id_value'] = $user['user_id_value'];
-				if($result_op instanceof WSError) {
-					// Return the error in the results
-					$result_tmp['result'] = $result_op->toArray();
-				} else {
-					$result_tmp['result'] = $this->getSuccessfulResult();
-				}
-				$results[] = $result_tmp;
-			}
-			return $results;
-		}
-	}
+                extract($user);
+                $result_op = $this->editUserHelper($user_id_field_name, $user_id_value, $firstname, $lastname, $status, $loginname, $password, $encrypt_method, $email, $language, $phone, $expiration_date, $extras);
+                $result_tmp['user_id_value'] = $user['user_id_value'];
+                if($result_op instanceof WSError) {
+                    // Return the error in the results
+                    $result_tmp['result'] = $result_op->toArray();
+                } else {
+                    $result_tmp['result'] = $this->getSuccessfulResult();
+                }
+                $results[] = $result_tmp;
+            }
+            return $results;
+        }
+    }
 }

main/document/create_document.php

Indentation +161 added lines, -161 removed lines

@@ -61,13 +61,13 @@ 
 $is_certificate_mode = false;
 
 if (isset($_REQUEST['certificate']) && $_REQUEST['certificate'] == 'true') {
-	$is_certificate_mode = true;
+    $is_certificate_mode = true;
 }
 
 if ($is_certificate_mode) {
-	$nameTools = get_lang('CreateCertificate');
+    $nameTools = get_lang('CreateCertificate');
 } else {
-	$nameTools = get_lang('CreateDocument');
+    $nameTools = get_lang('CreateDocument');
 }
 
 /*	Constants and variables */
@@ -119,26 +119,26 @@ 
 
 // Please, do not modify this dirname formatting
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 if ($is_certificate_mode) {
-	$document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates');
-	$document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
-	$folder_id = $document_data['id'];
-	$dir = '/certificates/';
+    $document_id = DocumentManager::get_document_id(api_get_course_info(), '/certificates');
+    $document_data = DocumentManager::get_document_data_by_id($document_id, api_get_course_id(), true);
+    $folder_id = $document_data['id'];
+    $dir = '/certificates/';
 }
 
 $doc_tree  = explode('/', $dir);
@@ -149,16 +149,16 @@ 
 
     // Level correction for group documents.
     if (!empty($group_properties['directory'])) {
-    	$count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
+        $count_dir = $count_dir > 0 ? $count_dir - 1 : 0;
     }
 }
 $relative_url = '';
 for ($i = 0; $i < ($count_dir); $i++) {
-	$relative_url .= '../';
+    $relative_url .= '../';
 }
 
 if ($relative_url== '') {
-	$relative_url = '/';
+    $relative_url = '/';
 }
 
 $is_allowed_to_edit = api_is_allowed_to_edit(null, true);
@@ -170,11 +170,11 @@ 
     'cols-size' => [2, 10, 0],
     'FullPage' => true,
     'InDocument' => true,
-	'CreateDocumentDir' => $relative_url,
-	'CreateDocumentWebDir' => (empty($group_properties['directory']))
-                        		? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
-                        		: api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
-	'BaseHref' => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
+    'CreateDocumentDir' => $relative_url,
+    'CreateDocumentWebDir' => (empty($group_properties['directory']))
+                                ? api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'
+                                : api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document'.$group_properties['directory'].'/',
+    'BaseHref' => api_get_path(WEB_COURSE_PATH).$_course['path'].'/document'.$dir
 );
 
 if ($is_certificate_mode) {
@@ -186,42 +186,42 @@ 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $to_group_id = 0;
 
 if (!$is_certificate_mode) {
-	if (api_is_in_group()) {
+    if (api_is_in_group()) {
         $interbreadcrumb[] = array(
             "url" => "../group/group_space.php?".api_get_cidreq(),
             "name" => get_lang('GroupSpace'),
         );
-		$noPHP_SELF = true;
-		$to_group_id = api_get_group_id();
-		$path = explode('/', $dir);
-		if ('/'.$path[1] != $group_properties['directory']) {
-			api_not_allowed(true);
-		}
-	}
+        $noPHP_SELF = true;
+        $to_group_id = api_get_group_id();
+        $path = explode('/', $dir);
+        if ('/'.$path[1] != $group_properties['directory']) {
+            api_not_allowed(true);
+        }
+    }
     $interbreadcrumb[] = array(
         "url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(),
         "name" => get_lang('Documents'),
     );
 } else {
-	$interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
+    $interbreadcrumb[]= array('url' => '../gradebook/'.$_SESSION['gradebook_dest'], 'name' => get_lang('Gradebook'));
 }
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit ||
     $groupRights ||
     DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id()))
 ) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -229,10 +229,10 @@ 
 
 $display_dir = $dir;
 if (isset($group_properties)) {
-	$display_dir = explode('/', $dir);
-	unset($display_dir[0]);
-	unset($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset($display_dir[0]);
+    unset($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 $select_cat = isset($_GET['selectcat']) ? intval($_GET['selectcat']) : null;
@@ -249,9 +249,9 @@ 
 $form->addElement('header', $nameTools);
 
 if ($is_certificate_mode) {//added condition for certicate in gradebook
-	$form->addElement('hidden','certificate','true',array('id'=>'certificate'));
-	if (isset($_GET['selectcat'])) {
-		$form->addElement('hidden','selectcat', $select_cat);
+    $form->addElement('hidden','certificate','true',array('id'=>'certificate'));
+    if (isset($_GET['selectcat'])) {
+        $form->addElement('hidden','selectcat', $select_cat);
     }
 }
 
@@ -306,14 +306,14 @@ 
 // new document created
 
 if (!$is_certificate_mode &&
-	!DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
+    !DocumentManager::is_my_shared_folder($userId, $dir, $current_session_id)
 ) {
-	$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
+    $folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit);
 
-	//$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
+    //$parent_select = $form->addElement('select', 'curdirpath', array(null, get_lang('DestinationDirectory')));
         $parent_select = $form->addSelect('curdirpath', get_lang('DestinationDirectory'),null, array('cols-size' => [2, 10, 0]) );
-	// Following two conditions copied from document.inc.php::build_directory_selector()
-	$folder_titles = array();
+    // Following two conditions copied from document.inc.php::build_directory_selector()
+    $folder_titles = array();
 
     if (is_array($folders)) {
         $escaped_folders = array();
@@ -351,22 +351,22 @@ 
         }
     }
 
-	if (empty($group_dir)) {
-		$parent_select -> addOption(get_lang('HomeDirectory'), '/');
-		if (is_array($folders)) {
-			foreach ($folders as & $folder) {
-				//Hide some folders
-				if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
+    if (empty($group_dir)) {
+        $parent_select -> addOption(get_lang('HomeDirectory'), '/');
+        if (is_array($folders)) {
+            foreach ($folders as & $folder) {
+                //Hide some folders
+                if ($folder=='/HotPotatoes_files' || $folder=='/certificates' || basename($folder)=='css') {
                     continue;
-				}
-				//Admin setting for Hide/Show the folders of all users
-				if (api_get_setting('show_users_folders') == 'false' &&
+                }
+                //Admin setting for Hide/Show the folders of all users
+                if (api_get_setting('show_users_folders') == 'false' &&
                     (strstr($folder, '/shared_folder') || strstr($folder, 'shared_folder_session_'))
                 ){
-					continue;
-				}
-				//Admin setting for Hide/Show Default folders to all users
-				if (api_get_setting('show_default_folders') == 'false' &&
+                    continue;
+                }
+                //Admin setting for Hide/Show Default folders to all users
+                if (api_get_setting('show_default_folders') == 'false' &&
                     (
                         $folder == '/images' ||
                         $folder == '/flash' ||
@@ -376,82 +376,82 @@ 
                         $folder == '/video/flv'
                     )
                 ){
-					continue;
-				}
-				//Admin setting for Hide/Show chat history folder
-				if (api_get_setting('show_chat_folder') == 'false' &&
+                    continue;
+                }
+                //Admin setting for Hide/Show chat history folder
+                if (api_get_setting('show_chat_folder') == 'false' &&
                     $folder=='/chat_files'
                 ){
-					continue;
-				}
+                    continue;
+                }
 
-				$selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
-				$path_parts = explode('/', $folder);
-				$folder_titles[$folder] = cut($folder_titles[$folder], 80);
+                $selected = (substr($dir,0,-1) == $folder) ? ' selected="selected"' : '';
+                $path_parts = explode('/', $folder);
+                $folder_titles[$folder] = cut($folder_titles[$folder], 80);
                 $space_counter =count($path_parts) - 2;
                 if ($space_counter > 0) {
                     $label = str_repeat('&nbsp;&nbsp;&nbsp;', $space_counter).' &mdash; '.$folder_titles[$folder];
                 } else {
                     $label = ' &mdash; '.$folder_titles[$folder];
                 }
-				$parent_select -> addOption($label, $folder);
-				if ($selected != '') {
-					$parent_select->setSelected($folder);
-				}
-			}
-		}
-	} else {
-		if (is_array($folders) && !empty($folders)) {
-			foreach ($folders as & $folder) {
-				$selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
-				$label = $folder_titles[$folder];
-				if ($folder == $group_dir) {
-					$label = '/ (' . get_lang('HomeDirectory') . ')';
-				} else {
-					$path_parts = explode('/', str_replace($group_dir, '', $folder));
-					$label = cut($label, 80);
-					$label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2) . ' &mdash; ' . $label;
-				}
-				$parent_select->addOption($label, $folder);
-				if ($selected != '') {
-					$parent_select->setSelected($folder);
-				}
-			}
-		}
-	}
+                $parent_select -> addOption($label, $folder);
+                if ($selected != '') {
+                    $parent_select->setSelected($folder);
+                }
+            }
+        }
+    } else {
+        if (is_array($folders) && !empty($folders)) {
+            foreach ($folders as & $folder) {
+                $selected = (substr($dir, 0, -1) == $folder) ? ' selected="selected"' : '';
+                $label = $folder_titles[$folder];
+                if ($folder == $group_dir) {
+                    $label = '/ (' . get_lang('HomeDirectory') . ')';
+                } else {
+                    $path_parts = explode('/', str_replace($group_dir, '', $folder));
+                    $label = cut($label, 80);
+                    $label = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_parts) - 2) . ' &mdash; ' . $label;
+                }
+                $parent_select->addOption($label, $folder);
+                if ($selected != '') {
+                    $parent_select->setSelected($folder);
+                }
+            }
+        }
+    }
 }
 
 $form->addHidden('dirValue', '');
 
 if ($is_certificate_mode) {
-	$form->addButtonCreate(get_lang('CreateCertificate'));
+    $form->addButtonCreate(get_lang('CreateCertificate'));
 } else {
-	$form->addButtonCreate(get_lang('CreateDoc'));
+    $form->addButtonCreate(get_lang('CreateDoc'));
 }
 
 $form->setDefaults($defaults);
 
 // If form validates -> save the new document
 if ($form->validate()) {
-	$values = $form->exportValues();
-	$readonly = isset($values['readonly']) ? 1 : 0;
-	$values['title'] = trim($values['title']);
+    $values = $form->exportValues();
+    $readonly = isset($values['readonly']) ? 1 : 0;
+    $values['title'] = trim($values['title']);
 
     if (!empty($values['dirValue'])) {
         $dir = $values['dirValue'];
     }
 
     if ($dir[strlen($dir) - 1] != '/') {
-		$dir .= '/';
-	}
+        $dir .= '/';
+    }
     $filepath = $filepath.$dir;
 
     // Setting the filename
-	$filename = $values['title'];
-	$filename = addslashes(trim($filename));
-	$filename = Security::remove_XSS($filename);
-	$filename = api_replace_dangerous_char($filename);
-	$filename = disable_dangerous_file($filename);
+    $filename = $values['title'];
+    $filename = addslashes(trim($filename));
+    $filename = Security::remove_XSS($filename);
+    $filename = api_replace_dangerous_char($filename);
+    $filename = disable_dangerous_file($filename);
     $filename .= DocumentManager::getDocumentSuffix(
         $_course,
         api_get_session_id(),
@@ -459,14 +459,14 @@ 
     );
 
     // Setting the title
-	$title = $values['title'];
+    $title = $values['title'];
 
     // Setting the extension
-	$extension = 'html';
+    $extension = 'html';
 
-	$content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
+    $content = Security::remove_XSS($values['content'], COURSEMANAGERLOWSECURITY);
 
-	/*if (strpos($content, '/css/frames.css') == false) {
+    /*if (strpos($content, '/css/frames.css') == false) {
 		$content = str_replace('</head>', '<link rel="stylesheet" href="./css/frames.css" type="text/css" /><style> body{margin:50px;}</style></head>', $content);
 	}*/
 
@@ -479,13 +479,13 @@ 
         exit;
     }
 
-	if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
-		//$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
-		$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].api_get_path(REL_COURSE_PATH), $content);
+    if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
+        //$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
+        $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].api_get_path(REL_COURSE_PATH), $content);
 
-		fputs($fp, $content);
-		fclose($fp);
-		chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
+        fputs($fp, $content);
+        fclose($fp);
+        chmod($filepath.$filename.'.'.$extension, api_get_permissions_for_new_files());
 
         /*
 		if (!is_dir($filepath.'css')) {
@@ -503,8 +503,8 @@ 
 			api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $userId, null, null, null, null, $current_session_id);
 		}*/
 
-		$file_size = filesize($filepath.$filename.'.'.$extension);
-		$save_file_path = $dir.$filename.'.'.$extension;
+        $file_size = filesize($filepath.$filename.'.'.$extension);
+        $save_file_path = $dir.$filename.'.'.$extension;
 
         $document_id = add_document(
             $_course,
@@ -516,8 +516,8 @@ 
             $readonly
         );
 
-		if ($document_id) {
-			api_item_property_update(
+        if ($document_id) {
+            api_item_property_update(
                 $_course,
                 TOOL_DOCUMENT,
                 $document_id,
@@ -529,13 +529,13 @@ 
                 null,
                 $current_session_id
             );
-			// Update parent folders
-			item_property_update_on_folder($_course, $dir, $userId);
-			$new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
-			$new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
+            // Update parent folders
+            item_property_update_on_folder($_course, $dir, $userId);
+            $new_comment = isset($_POST['comment']) ? trim($_POST['comment']) : '';
+            $new_title = isset($_POST['title']) ? trim($_POST['title']) : '';
             $new_title = htmlspecialchars($new_title);
-			if ($new_comment || $new_title) {
-				$ct = '';
+            if ($new_comment || $new_title) {
+                $ct = '';
                 $params = [];
                 if ($new_comment) {
                     $params['comment'] = $new_comment;
@@ -550,39 +550,39 @@ 
                         ['c_id = ? AND id = ?' => [$course_id, $document_id]]
                     );
                 }
-			}
-			$dir= substr($dir,0,-1);
-			$selectcat = '';
+            }
+            $dir= substr($dir,0,-1);
+            $selectcat = '';
             if (isset($_REQUEST['selectcat'])) {
                 $selectcat = "&selectcat=".intval($_REQUEST['selectcat']);
             }
-			$certificate_condition = '';
-			if ($is_certificate_mode) {
-				$df = DocumentManager::get_default_certificate_id($_course['code']);
+            $certificate_condition = '';
+            if ($is_certificate_mode) {
+                $df = DocumentManager::get_default_certificate_id($_course['code']);
                 if (!isset($df)) {
                     DocumentManager::attach_gradebook_certificate($_course['code'],$document_id);
-				}
-				$certificate_condition = '&certificate=true&curdirpath=/certificates';
-			}
+                }
+                $certificate_condition = '&certificate=true&curdirpath=/certificates';
+            }
             Display::addFlash(Display::return_message(get_lang('ItemAdded')));
-			header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
-			exit();
-		} else {
-			Display :: display_header($nameTools, 'Doc');
-			Display :: display_error_message(get_lang('Impossible'));
-			Display :: display_footer();
-		}
-	} else {
-		Display :: display_header($nameTools, 'Doc');
-		Display :: display_error_message(get_lang('Impossible'));
-		Display :: display_footer();
-	}
+            header('Location: document.php?'.api_get_cidreq().'&id='.$folder_id.$selectcat.$certificate_condition);
+            exit();
+        } else {
+            Display :: display_header($nameTools, 'Doc');
+            Display :: display_error_message(get_lang('Impossible'));
+            Display :: display_footer();
+        }
+    } else {
+        Display :: display_header($nameTools, 'Doc');
+        Display :: display_error_message(get_lang('Impossible'));
+        Display :: display_footer();
+    }
 } else {
-	// Copied from document.php
-	$dir_array = explode('/', $dir);
-	$array_len = count($dir_array);
+    // Copied from document.php
+    $dir_array = explode('/', $dir);
+    $array_len = count($dir_array);
 
-	// Breadcrumb for the current directory root path
+    // Breadcrumb for the current directory root path
     if (!empty($document_data)) {
         if (empty($document_data['parents'])) {
             $interbreadcrumb[] = array(
@@ -599,11 +599,11 @@ 
         }
     }
 
-	Display :: display_header($nameTools, "Doc");
-	// actions
+    Display :: display_header($nameTools, "Doc");
+    // actions
 
-	// link back to the documents overview
-	if ($is_certificate_mode) {
+    // link back to the documents overview
+    if ($is_certificate_mode) {
             $actionsLeft =  '<a href="document.php?certificate=true&id='.$folder_id.'&selectcat=' . Security::remove_XSS($_GET['selectcat']).'">'.
                 Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('CertificateOverview'),'',ICON_SIZE_MEDIUM).'</a>';
             $actionsLeft .= '<a id="hide_bar_template" href="#" role="button">'.
@@ -618,19 +618,19 @@ 
 
     echo $toolbar = Display::toolbarAction('actions-documents', array($actionsLeft));
 
-	if ($is_certificate_mode) {
+    if ($is_certificate_mode) {
         $all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(
             api_get_user_id(),
             api_get_course_id()
         );
 
-		$str_info = '';
-		foreach ($all_information_by_create_certificate[0] as $info_value) {
-			$str_info.=$info_value.'<br/>';
-		}
-		$create_certificate = get_lang('CreateCertificateWithTags');
-		Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
-	}
+        $str_info = '';
+        foreach ($all_information_by_create_certificate[0] as $info_value) {
+            $str_info.=$info_value.'<br/>';
+        }
+        $create_certificate = get_lang('CreateCertificateWithTags');
+        Display::display_normal_message($create_certificate.': <br /><br/>'.$str_info,false);
+    }
 
     // HTML-editor
     echo '<div class="page-create">
@@ -646,5 +646,5 @@ 
                 '.$form->returnForm().'
             </div>
           </div></div>';
-	Display :: display_footer();
+    Display :: display_footer();
 }

main/admin/access_url_edit_course_category_to_url.php

Indentation +9 added lines, -9 removed lines

@@ -120,12 +120,12 @@ 
 }
 
 if ($add_type == 'multiple') {
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.
         get_lang('SessionAddTypeUnique').'</a>';
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
 } else {
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.
         get_lang('SessionAddTypeMultiple').'</a>';
 }
 
@@ -223,11 +223,11 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
-			echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
-		else
-			echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';
-		?>
+        if(isset($_GET['add']))
+            echo '<button class="save" onclick="valide()" >'.get_lang('Add').'</button>';
+        else
+            echo '<button class="save" onclick="valide()" >'.get_lang('Edit').'</button>';
+        ?>
 	</td>
 </tr>
 </table>