chamilo / chamilo-lms

main/document/edit_paint.php

Indentation +39 added lines, -39 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- *	This file allows creating new svg and png documents with an online editor.
- *
- *	@package chamilo.document
- *  @todo used the document_id instead of the curdirpath
- *
- * @author Juan Carlos Raña Trabado
- * @since 30/january/2011
+     *	This file allows creating new svg and png documents with an online editor.
+     *
+     *	@package chamilo.document
+     *  @todo used the document_id instead of the curdirpath
+     *
+     * @author Juan Carlos Raña Trabado
+     * @since 30/january/2011
 */
 require_once '../inc/global.inc.php';
 
@@ -61,42 +61,42 @@ 
 /* Please, do not modify this dirname formatting */
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 //groups //TODO:clean
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ('url' => '../group/group_space.php?'.api_get_cidreq(), 'name' => get_lang('GroupSpace'));
-	$group_document = true;
-	$noPHP_SELF = true;
+    $interbreadcrumb[] = array ('url' => '../group/group_space.php?'.api_get_cidreq(), 'name' => get_lang('GroupSpace'));
+    $group_document = true;
+    $noPHP_SELF = true;
 }
 
 
 $is_certificate_mode = DocumentManager::is_certificate_mode($dir);
 
 if (!$is_certificate_mode)
-	$interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.api_get_cidreq(), "name"=> get_lang('Documents'));
+    $interbreadcrumb[]= array("url" => "./document.php?curdirpath=".urlencode($my_cur_dir_path).'&'.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'));
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
@@ -111,10 +111,10 @@ 
 }
 
 $is_allowedToEdit = api_is_allowed_to_edit(null, true) || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
+    DocumentManager::is_my_shared_folder(api_get_user_id(), $dir, $current_session_id);
 
 if (!$is_allowedToEdit) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Event::event_access_tool(TOOL_DOCUMENT);
@@ -146,21 +146,21 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
-	$credentials="true";
+        @file_put_contents($path_and_file, $crossdomain);
+    }
+    $credentials="true";
 }
 else {
-	$credentials="false";
+    $credentials="false";
 }
 
 //make temp images
@@ -173,23 +173,23 @@ 
 $htaccess=api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess';
 if (!file_exists($htaccess)) {
 
-	$htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
+    $htaccess_content="order deny,allow\r\nallow from all\r\nOptions -Indexes";
 
-	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
-	if ($fp) {
-		fwrite($fp, $htaccess_content);
-		fclose($fp);
-	}
+    $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/.htaccess', 'w');
+    if ($fp) {
+        fwrite($fp, $htaccess_content);
+        fclose($fp);
+    }
 }
 
 $html_index=api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html';
 if (!file_exists($html_index)) {
-	$html_index_content="<html><head></head><body></body></html>";
-	$fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
-	if ($fp) {
-		fwrite($fp, $html_index_content);
-		fclose($fp);
-	}
+    $html_index_content="<html><head></head><body></body></html>";
+    $fp = @ fopen(api_get_path(SYS_ARCHIVE_PATH).'temp/images/index.html', 'w');
+    if ($fp) {
+        fwrite($fp, $html_index_content);
+        fclose($fp);
+    }
 }
 
 //encript temp name file

main/document/create_document.php

Indentation +172 added lines, -172 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- *	This file allows creating new html documents with an online WYSIWYG html editor.
- *
- *	@package chamilo.document
- */
+     *	This file allows creating new html documents with an online WYSIWYG html editor.
+     *
+     *	@package chamilo.document
+     */
 
 require_once '../inc/global.inc.php';
 
@@ -77,13 +77,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 */
@@ -136,26 +136,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);
@@ -166,16 +166,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);
@@ -187,11 +187,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) {
@@ -203,36 +203,36 @@ 
 $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()) {
-		$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);
-		}
-	}
-	$interbreadcrumb[] = array("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
+    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);
+        }
+    }
+    $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 ||
     $_SESSION['group_member_with_upload_rights'] ||
     DocumentManager::is_my_shared_folder($userId, $dir, api_get_session_id()))
 ) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 /*	Header */
@@ -240,10 +240,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;
@@ -260,9 +260,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);
     }
 }
 
@@ -297,12 +297,12 @@ 
 if ($is_certificate_mode) {
     $form->addText('title', get_lang('CertificateName'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
 } else {
-	$form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
+    $form->addText('title', get_lang('Title'), true, array('cols-size' => [2, 10, 0], 'autofocus'));
 }
 
 // Show read-only box only in groups
 if (!empty($groupId)) {
-	$group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
+    $group[]= $form->createElement('checkbox', 'readonly', '', get_lang('ReadOnly'));
 }
 $form->addRule('title', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('title', get_lang('FileExists'), 'callback', 'document_exists');
@@ -317,14 +317,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();
@@ -362,22 +362,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' ||
@@ -387,80 +387,80 @@ 
                         $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 {
-		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 {
+        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(),
@@ -468,14 +468,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);
 	}*/
 
@@ -488,12 +488,12 @@ 
         exit;
     }
 
-	if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
-		$content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $content);
+    if ($fp = @fopen($filepath.$filename.'.'.$extension, 'w')) {
+        $content = str_replace(api_get_path(WEB_COURSE_PATH), $_configuration['url_append'].'/courses/', $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')) {
@@ -511,8 +511,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,
@@ -524,8 +524,8 @@ 
             $readonly
         );
 
-		if ($document_id) {
-			api_item_property_update(
+        if ($document_id) {
+            api_item_property_update(
                 $_course,
                 TOOL_DOCUMENT,
                 $document_id,
@@ -537,13 +537,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;
@@ -558,38 +558,38 @@ 
                         ['c_id = ? AND id = ?' => [$course_id, $document_id]]
                     );
                 }
-			}
-			$dir= substr($dir,0,-1);
-			$selectcat = '';
-			if (isset($_REQUEST['selectcat']))
-				$selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
-			$certificate_condition = '';
-			if ($is_certificate_mode) {
-				$df = DocumentManager::get_default_certificate_id($_course['code']);
+            }
+            $dir= substr($dir,0,-1);
+            $selectcat = '';
+            if (isset($_REQUEST['selectcat']))
+                $selectcat = "&selectcat=".Security::remove_XSS($_REQUEST['selectcat']);
+            $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';
-			}
-
-			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();
-	}
+                }
+                $certificate_condition = '&certificate=true&curdirpath=/certificates';
+            }
+
+            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(
@@ -606,31 +606,31 @@ 
         }
     }
 
-	Display :: display_header($nameTools, "Doc");
-	// actions
+    Display :: display_header($nameTools, "Doc");
+    // actions
 
-	// 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']).'">'.
+    // 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>';
         } else {
-		$actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
+        $actionsLeft = '<a href="document.php?curdirpath='.Security::remove_XSS($dir).'">'.
             Display::return_icon('back.png',get_lang('Back').' '.get_lang('To').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
         }
         
         echo $toolbar = Display::toolbarAction('actions-documents', array(0 => $actionsLeft, 1 => ''));
                 
 
-	if ($is_certificate_mode) {
-		$all_information_by_create_certificate = DocumentManager::get_all_info_to_certificate(api_get_user_id(), api_get_course_id());
+    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="row" style="overflow:hidden">
             <div id="template_col" class="col-md-2">
@@ -647,5 +647,5 @@ 
                 '.$form->returnForm().'
             </div>
           </div>';
-	Display :: display_footer();
+    Display :: display_footer();
 }

main/document/slideshowoptions.php

Indentation +12 added lines, -12 removed lines

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

main/document/record_audio.php

Indentation +40 added lines, -40 removed lines

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

main/document/exit_pixlr.php

Indentation +7 added lines, -7 removed lines

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

main/document/remote.php

Indentation +10 added lines, -10 removed lines

@@ -1,17 +1,17 @@
 <?php
 /* See license terms in /license.txt */
 /**
- * Script that allows download of a specific file from external applications
- * @author Arnaud Ligot <arnaud@cblue.be>, Based on work done for old videoconference application (I have about 30 minutes to write this peace of code so if somebody has more time, feel free to rewrite it...)
- * @package chamilo.document
- */
+     * Script that allows download of a specific file from external applications
+     * @author Arnaud Ligot <arnaud@cblue.be>, Based on work done for old videoconference application (I have about 30 minutes to write this peace of code so if somebody has more time, feel free to rewrite it...)
+     * @package chamilo.document
+     */
 /**
- * Script that allows remote download of a file
- * @param string Action parameter (action=...)
- * @param string Course code (cidReq=...)
- * @param string Current working directory (cwd=...)
- * @return string JSON output
- */
+     * Script that allows remote download of a file
+     * @param string Action parameter (action=...)
+     * @param string Course code (cidReq=...)
+     * @param string Current working directory (cwd=...)
+     * @return string JSON output
+     */
 /* FIX for IE cache when using https */
 session_cache_limiter('none');
 /*==== DEBUG ====*/

main/document/slideshow.inc.php

Indentation +11 added lines, -13 removed lines

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

main/document/create_paint.php

Indentation +33 added lines, -33 removed lines

@@ -20,7 +20,7 @@ 
 api_protect_course_script();
 api_block_anonymous_users();
 if (api_get_setting('enabled_support_paint') == 'false') {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $document_data = DocumentManager::get_document_data_by_id($_GET['id'], api_get_course_id(), true);
@@ -41,75 +41,75 @@ 
 //path for pixlr save
 $_SESSION['paint_dir']=Security::remove_XSS($dir);
 if ($_SESSION['paint_dir']=='/'){
-	$_SESSION['paint_dir']='';
+    $_SESSION['paint_dir']='';
 }
 $_SESSION['paint_file']=get_lang('NewImage');
 
 // Please, do not modify this dirname formatting
 
 if (strstr($dir, '..')) {
-	$dir = '/';
+    $dir = '/';
 }
 
 if ($dir[0] == '.') {
-	$dir = substr($dir, 1);
+    $dir = substr($dir, 1);
 }
 
 if ($dir[0] != '/') {
-	$dir = '/'.$dir;
+    $dir = '/'.$dir;
 }
 
 if ($dir[strlen($dir) - 1] != '/') {
-	$dir .= '/';
+    $dir .= '/';
 }
 
 $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'.$dir;
 
 if (!is_dir($filepath)) {
-	$filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
-	$dir = '/';
+    $filepath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
+    $dir = '/';
 }
 
 $groupId = api_get_group_id();
 
 if (!empty($groupId)) {
-	$interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
-	$noPHP_SELF = true;
-	$group = GroupManager::get_group_properties($groupId);
-	$path = explode('/', $dir);
-	if ('/'.$path[1] != $group['directory']) {
-		api_not_allowed(true);
-	}
+    $interbreadcrumb[] = array ("url" => "../group/group_space.php?".api_get_cidreq(), "name" => get_lang('GroupSpace'));
+    $noPHP_SELF = true;
+    $group = GroupManager::get_group_properties($groupId);
+    $path = explode('/', $dir);
+    if ('/'.$path[1] != $group['directory']) {
+        api_not_allowed(true);
+    }
 }
 
 $interbreadcrumb[] = array ("url" => "./document.php?curdirpath=".urlencode($dir)."&".api_get_cidreq(), "name" => get_lang('Documents'));
 
 if (!$is_allowed_in_course) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] ||
-	DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir),api_get_session_id()))) {
-	api_not_allowed(true);
+    DocumentManager::is_my_shared_folder($_user['user_id'], Security::remove_XSS($dir),api_get_session_id()))) {
+    api_not_allowed(true);
 }
 
 /*	Header */
 Event::event_access_tool(TOOL_DOCUMENT);
 $display_dir = $dir;
 if (isset ($group)) {
-	$display_dir = explode('/', $dir);
-	unset ($display_dir[0]);
-	unset ($display_dir[1]);
-	$display_dir = implode('/', $display_dir);
+    $display_dir = explode('/', $dir);
+    unset ($display_dir[0]);
+    unset ($display_dir[1]);
+    $display_dir = implode('/', $display_dir);
 }
 
 // Interbreadcrumb for the current directory root path
 if (empty($document_data['parents'])) {
-	$interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
+    $interbreadcrumb[] = array('url' => '#', 'name' => $document_data['title']);
 } else {
-	foreach($document_data['parents'] as $document_sub_data) {
-		$interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
-	}
+    foreach($document_data['parents'] as $document_sub_data) {
+        $interbreadcrumb[] = array('url' => $document_sub_data['document_url'], 'name' => $document_sub_data['title']);
+    }
 }
 Display :: display_header($nameTools, 'Doc');
 
@@ -138,20 +138,20 @@ 
 $locktitle="false";
 
 if ($_SERVER['HTTP_HOST']=="localhost") {
-	$path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
-	if (!file_exists($path_and_file)) {
-		$crossdomain='<?xml version="1.0"?>
+    $path_and_file= api_get_path(SYS_SERVER_ROOT_PATH).'/crossdomain.xml';
+    if (!file_exists($path_and_file)) {
+        $crossdomain='<?xml version="1.0"?>
 			<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 			<cross-domain-policy>
 				<allow-access-from domain="cdn.pixlr.com" />
 				<site-control permitted-cross-domain-policies="master-only"/>
 				<allow-http-request-headers-from domain="cnd.pixlr.com" headers="*" secure="true"/>
 			</cross-domain-policy>';//more open domain="*"
-		@file_put_contents($path_and_file, $crossdomain);
-	}
-	$credentials="true";
+        @file_put_contents($path_and_file, $crossdomain);
+    }
+    $credentials="true";
 } else {
-	$credentials="false";
+    $credentials="false";
 }
 $pixlr_url = api_get_protocol().'://pixlr.com/editor/?title='.$title.'&image='.$image.'&loc='.$loc.'&referrer='.$referrer.'&target='.$target.'&exit='.$exit_path.'&locktarget='.$locktarget.'&locktitle='.$locktitle.'&credentials='.$credentials;
 ?>

main/resourcelinker/resourcelinker.inc.php

Indentation +1396 added lines, -1396 removed lines

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