chamilo / chamilo-lms

src/Chamilo/CourseBundle/Component/CourseCopy/Resources/DummyCourseCreator.php

Indentation +3 added lines, -3 removed lines

@@ -291,16 +291,16 @@
         Duis bibendum elementum justo. Duis posuere. Fusce nulla odio, posuere eget, condimentum nec, venenatis eu, elit. In hac habitasse platea dictumst. Aenean ac sem in enim imperdiet feugiat. Integer tincidunt lectus at elit. Integer magna lacus, vehicula quis, eleifend eget, suscipit vitae, leo. Nunc porta augue nec enim. Curabitur vehicula volutpat enim. Aliquam consequat. Vestibulum rhoncus tellus vitae erat. Integer est. Quisque fermentum leo nec odio. Suspendisse lobortis sollicitudin augue. Nullam urna mi, suscipit eu, sagittis laoreet, ultrices ac, sem. Aliquam enim tortor, hendrerit non, cursus a, tristique sit amet, sapien. Suspendisse potenti. Aenean semper placerat neque.';
         switch($type)
         {
-         case 'description':
+            case 'description':
             $descriptions = explode(".",$dummy_text);
             return $descriptions[rand(0,count($descriptions)-1)];
             break;
-         case 'title':
+            case 'title':
             $dummy_text = str_replace(array("\n",'.',',',"\t"),array(' ','','',' '),$dummy_text);
             $titles = explode(" ",$dummy_text);
             return trim($titles[rand(0,count($titles)-1)]);
             break;
-         case 'text':
+            case 'text':
             $texts = explode("\n",$dummy_text);
             return $texts[rand(0,count($texts)-1)];
             break;

main/inc/lib/blog.lib.php

Indentation +1821 added lines, -1822 removed lines

@@ -6,112 +6,111 @@ 
  *
  * Contains several functions dealing with displaying,
  * editing,... of a blog
-
  * @package chamilo.blogs
  * @author Toon Keppens <toon@vi-host.net>
  * @author Julio Montoya - Cleaning code
  */
 class Blog
 {
-	/**
-	 * Get the title of a blog
-	 * @author Toon Keppens
-	 *
-	 * @param int $blog_id
-	 *
-	 * @return String Blog Title
-	 */
-	public static function get_blog_title ($blog_id)
-	{
-	    $course_id = api_get_course_int_id();
-
-		if (is_numeric($blog_id)) {
-			$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-
-			$sql = "SELECT blog_name
+    /**
+     * Get the title of a blog
+     * @author Toon Keppens
+     *
+     * @param int $blog_id
+     *
+     * @return String Blog Title
+     */
+    public static function get_blog_title ($blog_id)
+    {
+        $course_id = api_get_course_int_id();
+
+        if (is_numeric($blog_id)) {
+            $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+
+            $sql = "SELECT blog_name
 					FROM " . $tbl_blogs . "
 					WHERE c_id = $course_id AND blog_id = " . intval($blog_id);
 
-			$result = Database::query($sql);
-			$blog = Database::fetch_array($result);
-
-			return stripslashes($blog['blog_name']);
-		}
-	}
-
-
-	/**
-	 * Get the description of a blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 *
-	 * @return String Blog description
-	 */
-	public static function get_blog_subtitle($blog_id)
-	{
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-	  	$course_id = api_get_course_int_id();
-		$sql = "SELECT blog_subtitle FROM $tbl_blogs
+            $result = Database::query($sql);
+            $blog = Database::fetch_array($result);
+
+            return stripslashes($blog['blog_name']);
+        }
+    }
+
+
+    /**
+     * Get the description of a blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     *
+     * @return String Blog description
+     */
+    public static function get_blog_subtitle($blog_id)
+    {
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+            $course_id = api_get_course_int_id();
+        $sql = "SELECT blog_subtitle FROM $tbl_blogs
 				WHERE c_id = $course_id AND blog_id ='".intval($blog_id)."'";
-		$result = Database::query($sql);
-		$blog = Database::fetch_array($result);
-
-		return stripslashes($blog['blog_subtitle']);
-	}
-
-	/**
-	 * Get the users of a blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 *
-	 * @return Array Returns an array with [userid]=>[username]
-	 */
-	public static function get_blog_users($blog_id)
-	{
-		// Database table definitions
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-
-		$course_id = api_get_course_int_id();
-
-		// Get blog members
-		$sql = "SELECT user.user_id, user.firstname, user.lastname
+        $result = Database::query($sql);
+        $blog = Database::fetch_array($result);
+
+        return stripslashes($blog['blog_subtitle']);
+    }
+
+    /**
+     * Get the users of a blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     *
+     * @return Array Returns an array with [userid]=>[username]
+     */
+    public static function get_blog_users($blog_id)
+    {
+        // Database table definitions
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+
+        $course_id = api_get_course_int_id();
+
+        // Get blog members
+        $sql = "SELECT user.user_id, user.firstname, user.lastname
 				FROM " . $tbl_blogs_rel_user . " blogs_rel_user
 				INNER JOIN " . $tbl_users . " user
 				ON blogs_rel_user.user_id = user.user_id
 				WHERE
 				    blogs_rel_user.c_id = $course_id AND
 					blogs_rel_user.blog_id = '" . (int)$blog_id."'";
-		$result = Database::query($sql);
-		$blog_members = array ();
-		while($user = Database::fetch_array($result)) {
-			$blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
-		}
-
-		return $blog_members;
-	}
-
-	/**
-	 * Creates a new blog in the given course
-	 * @author Toon Keppens
-	 * @param string $title
-	 */
-	public static function create_blog($title, $subtitle)
-	{
-		$_user = api_get_user_info();
+        $result = Database::query($sql);
+        $blog_members = array ();
+        while($user = Database::fetch_array($result)) {
+            $blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+        }
+
+        return $blog_members;
+    }
+
+    /**
+     * Creates a new blog in the given course
+     * @author Toon Keppens
+     * @param string $title
+     */
+    public static function create_blog($title, $subtitle)
+    {
+        $_user = api_get_user_info();
         $course_id = api_get_course_int_id();
 
-		$current_date=date('Y-m-d H:i:s',time());
-		$session_id = api_get_session_id();
-		// Tabel definitions
+        $current_date=date('Y-m-d H:i:s',time());
+        $session_id = api_get_session_id();
+        // Tabel definitions
         $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
         $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
         $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
 
-		//verified if exist blog
-		$sql = 'SELECT COUNT(*) as count FROM '.$tbl_blogs.'
+        //verified if exist blog
+        $sql = 'SELECT COUNT(*) as count FROM '.$tbl_blogs.'
 			  	WHERE
 			  	    c_id = '.$course_id.' AND
 			  	    blog_name="'.Database::escape_string($title).'" AND
@@ -120,9 +119,9 @@ 
         $info_count = Database::result($res, 0, 0);
 
         if ($info_count == 0) {
-			// Create the blog
+            // Create the blog
             $params = [
-				'blog_id' => 0,
+                'blog_id' => 0,
                 'c_id' => $course_id,
                 'blog_name' => $title,
                 'blog_subtitle' =>  $subtitle,
@@ -130,14 +129,14 @@ 
                 'visibility' => 1 ,
                 'session_id' => $session_id,
             ];
-			$this_blog_id = Database::insert($tbl_blogs, $params);
+            $this_blog_id = Database::insert($tbl_blogs, $params);
 
-			if ($this_blog_id > 0) {
+            if ($this_blog_id > 0) {
 
                 $sql = "UPDATE $tbl_blogs SET blog_id = iid WHERE iid = $this_blog_id";
                 Database::query($sql);
 
-				// insert into item_property
+                // insert into item_property
                 api_item_property_update(
                     api_get_course_info(),
                     TOOL_BLOGS,
@@ -145,12 +144,12 @@ 
                     'BlogAdded',
                     api_get_user_id()
                 );
-			}
+            }
 
-			// Make first post. :)
+            // Make first post. :)
 
             $params = [
-				'post_id' => 0,
+                'post_id' => 0,
                 'c_id' => $course_id,
                 'title' => get_lang("Welcome"),
                 'full_text' => get_lang('FirstPostText'),
@@ -164,10 +163,10 @@ 
                 Database::query($sql);
             }
 
-			// Put it on course homepage
-			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id, target)
+            // Put it on course homepage
+            $sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id, target)
 					VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id', '')";
-			Database::query($sql);
+            Database::query($sql);
 
             $toolId = Database::insert_id();
             if ($toolId) {
@@ -175,35 +174,35 @@ 
                 Database::query($sql);
             }
 
-			// Subscribe the teacher to this blog
-			Blog::set_user_subscribed($this_blog_id, $_user['user_id']);
-		}
-	}
-
-	/**
-	 * Update title and subtitle of a blog in the given course
-	 * @author Toon Keppens
-	 * @param string $title
-	 */
-	public static function edit_blog($blog_id, $title, $subtitle)
-	{
-		// Table definitions
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
+            // Subscribe the teacher to this blog
+            Blog::set_user_subscribed($this_blog_id, $_user['user_id']);
+        }
+    }
+
+    /**
+     * Update title and subtitle of a blog in the given course
+     * @author Toon Keppens
+     * @param string $title
+     */
+    public static function edit_blog($blog_id, $title, $subtitle)
+    {
+        // Table definitions
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+        $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
 
         $course_id = api_get_course_int_id();
 
-		// Update the blog
-		$sql = "UPDATE $tbl_blogs SET
+        // Update the blog
+        $sql = "UPDATE $tbl_blogs SET
 		        blog_name = '".Database::escape_string($title)."',
 		        blog_subtitle = '".Database::escape_string($subtitle)."'
 		        WHERE
 		            c_id = $course_id AND
 		            blog_id ='".Database::escape_string((int)$blog_id)."'
                 LIMIT 1";
-		Database::query($sql);
+        Database::query($sql);
 
-		//update item_property (update)
+        //update item_property (update)
         api_item_property_update(
             api_get_course_info(),
             TOOL_BLOGS,
@@ -212,21 +211,21 @@ 
             api_get_user_id()
         );
 
-		// Update course homepage link
-		$sql = "UPDATE $tbl_tool SET
+        // Update course homepage link
+        $sql = "UPDATE $tbl_tool SET
 		        name = '".Database::escape_string($title)."'
 		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int)$blog_id."' LIMIT 1";
-		Database::query($sql);
-	}
-
-	/**
-	 * Deletes a blog and it's posts from the course database
-	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 */
-	public static function delete_blog($blog_id)
-	{
-		// Init
+        Database::query($sql);
+    }
+
+    /**
+     * Deletes a blog and it's posts from the course database
+     * @author Toon Keppens
+     * @param Integer $blog_id
+     */
+    public static function delete_blog($blog_id)
+    {
+        // Init
         $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
         $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
         $tbl_blogs_comment = Database::get_course_table(TABLE_BLOGS_COMMENTS);
@@ -237,34 +236,34 @@ 
         $course_id = api_get_course_int_id();
         $blog_id = intval($blog_id);
 
-		// Delete posts from DB and the attachments
-		delete_all_blog_attachment($blog_id);
+        // Delete posts from DB and the attachments
+        delete_all_blog_attachment($blog_id);
 
-		//Delete comments
-		$sql = "DELETE FROM $tbl_blogs_comment WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-   		Database::query($sql);
+        //Delete comments
+        $sql = "DELETE FROM $tbl_blogs_comment WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+            Database::query($sql);
 
-		// Delete posts
-   		$sql = "DELETE FROM $tbl_blogs_posts WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-   		Database::query($sql);
+        // Delete posts
+            $sql = "DELETE FROM $tbl_blogs_posts WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+            Database::query($sql);
 
-		// Delete tasks
-		$sql = "DELETE FROM $tbl_blogs_tasks WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-		Database::query($sql);
+        // Delete tasks
+        $sql = "DELETE FROM $tbl_blogs_tasks WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+        Database::query($sql);
 
-		// Delete ratings
-		$sql = "DELETE FROM $tbl_blogs_rating WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-		Database::query($sql);
+        // Delete ratings
+        $sql = "DELETE FROM $tbl_blogs_rating WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+        Database::query($sql);
 
-		// Delete blog
-		$sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
-		Database::query($sql);
+        // Delete blog
+        $sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+        Database::query($sql);
 
-		// Delete from course homepage
-		$sql = "DELETE FROM $tbl_tool WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".$blog_id."'";
-		Database::query($sql);
+        // Delete from course homepage
+        $sql = "DELETE FROM $tbl_tool WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".$blog_id."'";
+        Database::query($sql);
 
-		//update item_property (delete)
+        //update item_property (delete)
         api_item_property_update(
             api_get_course_info(),
             TOOL_BLOGS,
@@ -272,152 +271,152 @@ 
             'delete',
             api_get_user_id()
         );
-	}
-
-	/**
-	 * Creates a new post in a given blog
-	 * @author Toon Keppens
-	 * @param String $title
-	 * @param String $full_text
-	 * @param Integer $blog_id
-	 */
-	public static function create_post($title, $full_text, $file_comment, $blog_id)
-	{
-		$_user = api_get_user_info();
-		$_course = api_get_course_info();
-		$course_id = $_course['real_id'];
-
-		$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-		$upload_ok=true;
-		$has_attachment=false;
-		$current_date = api_get_utc_datetime();
-
-		if (!empty($_FILES['user_upload']['name'])) {
-			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
-		}
-
-		if ($upload_ok) {
-			// Table Definitions
-			$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-
-			// Create the post
-			$sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
+    }
+
+    /**
+     * Creates a new post in a given blog
+     * @author Toon Keppens
+     * @param String $title
+     * @param String $full_text
+     * @param Integer $blog_id
+     */
+    public static function create_post($title, $full_text, $file_comment, $blog_id)
+    {
+        $_user = api_get_user_info();
+        $_course = api_get_course_info();
+        $course_id = $_course['real_id'];
+
+        $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+        $upload_ok=true;
+        $has_attachment=false;
+        $current_date = api_get_utc_datetime();
+
+        if (!empty($_FILES['user_upload']['name'])) {
+            $upload_ok = process_uploaded_file($_FILES['user_upload']);
+            $has_attachment=true;
+        }
+
+        if ($upload_ok) {
+            // Table Definitions
+            $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+
+            // Create the post
+            $sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
 					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int)$blog_id."', '".(int)$_user['user_id']."');";
 
-			Database::query($sql);
-			$last_post_id = Database::insert_id();
+            Database::query($sql);
+            $last_post_id = Database::insert_id();
 
             if ($last_post_id) {
                 $sql = "UPDATE $tbl_blogs_posts SET post_id = iid WHERE iid = $last_post_id";
                 Database::query($sql);
             }
 
-			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
-				$sys_course_path = api_get_path(SYS_COURSE_PATH);
-				$updir = $sys_course_path.$courseDir;
-
-				// Try to add an extension to the file if it hasn't one
-				$new_file_name = add_ext_on_mime(stripslashes($_FILES['user_upload']['name']), $_FILES['user_upload']['type']);
-
-				// user's file name
-				$file_name = $_FILES['user_upload']['name'];
-
-				if (!filter_extension($new_file_name)) {
-					Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
-				} else {
-					$new_file_name = uniqid('');
-					$new_path = $updir.'/'.$new_file_name;
-					$result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
-					$comment = Database::escape_string($file_comment);
-
-					// Storing the attachments if any
-					if ($result) {
-						$sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size, blog_id,comment_id) '.
-							   "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."',  '".$blog_id."', '0' )";
-						Database::query($sql);
+            if ($has_attachment) {
+                $courseDir   = $_course['path'].'/upload/blog';
+                $sys_course_path = api_get_path(SYS_COURSE_PATH);
+                $updir = $sys_course_path.$courseDir;
+
+                // Try to add an extension to the file if it hasn't one
+                $new_file_name = add_ext_on_mime(stripslashes($_FILES['user_upload']['name']), $_FILES['user_upload']['type']);
+
+                // user's file name
+                $file_name = $_FILES['user_upload']['name'];
+
+                if (!filter_extension($new_file_name)) {
+                    Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+                } else {
+                    $new_file_name = uniqid('');
+                    $new_path = $updir.'/'.$new_file_name;
+                    $result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+                    $comment = Database::escape_string($file_comment);
+
+                    // Storing the attachments if any
+                    if ($result) {
+                        $sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size, blog_id,comment_id) '.
+                                "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$last_post_id."', '".intval($_FILES['user_upload']['size'])."',  '".$blog_id."', '0' )";
+                        Database::query($sql);
                         $id = Database::insert_id();
                         if ($id) {
                             $sql = "UPDATE $blog_table_attachment SET id = iid WHERE iid = $id";
                             Database::query($sql);
                         }
-					}
-				}
-			}
-		} else {
-			Display::display_error_message(get_lang('UplNoFileUploaded'));
-		}
-	}
-
-	/**
-	 * Edits a post in a given blog
-	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 * @param String $title
-	 * @param String $full_text
-	 * @param Integer $blog_id
-	 */
-	public static function edit_post($post_id, $title, $full_text, $blog_id)
-	{
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+                    }
+                }
+            }
+        } else {
+            Display::display_error_message(get_lang('UplNoFileUploaded'));
+        }
+    }
+
+    /**
+     * Edits a post in a given blog
+     * @author Toon Keppens
+     * @param Integer $blog_id
+     * @param String $title
+     * @param String $full_text
+     * @param Integer $blog_id
+     */
+    public static function edit_post($post_id, $title, $full_text, $blog_id)
+    {
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
         $course_id = api_get_course_int_id();
 
-		// Create the post
-		$sql = "UPDATE $tbl_blogs_posts SET
+        // Create the post
+        $sql = "UPDATE $tbl_blogs_posts SET
 		        title = '" . Database::escape_string($title)."',
 		        full_text = '" . Database::escape_string($full_text)."'
 		        WHERE c_id = $course_id AND post_id ='".(int)$post_id."' AND blog_id ='".(int)$blog_id."'
 		        LIMIT 1 ";
-		Database::query($sql);
-	}
-
-	/**
-	 * Deletes an article and it's comments
-	 * @author Toon Keppens
-	 * @param int $blog_id
-	 * @param int $post_id
-	 */
-	public static function delete_post($blog_id, $post_id)
-	{
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        Database::query($sql);
+    }
+
+    /**
+     * Deletes an article and it's comments
+     * @author Toon Keppens
+     * @param int $blog_id
+     * @param int $post_id
+     */
+    public static function delete_post($blog_id, $post_id)
+    {
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
 
         $course_id = api_get_course_int_id();
 
-		// Delete ratings on this comment
-		$sql = "DELETE FROM $tbl_blogs_rating
+        // Delete ratings on this comment
+        $sql = "DELETE FROM $tbl_blogs_rating
 				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND item_id = '".(int)$post_id."' AND rating_type = 'post'";
-		Database::query($sql);
+        Database::query($sql);
 
-		// Delete the post
-		$sql = "DELETE FROM $tbl_blogs_posts
+        // Delete the post
+        $sql = "DELETE FROM $tbl_blogs_posts
 				WHERE c_id = $course_id AND post_id = '".(int)$post_id."'";
-		Database::query($sql);
+        Database::query($sql);
 
-		// Delete the comments
-		$sql = "DELETE FROM $tbl_blogs_comments
+        // Delete the comments
+        $sql = "DELETE FROM $tbl_blogs_comments
 				WHERE c_id = $course_id AND post_id = '".(int)$post_id."' AND blog_id = '".(int)$blog_id."'";
-		Database::query($sql);
-
-		// Delete posts and attachments
-		delete_all_blog_attachment($blog_id,$post_id);
-	}
-
-	/**
-	 * Creates a comment on a post in a given blog
-	 * @author Toon Keppens
-	 * @param String $title
-	 * @param String $full_text
-	 * @param Integer $blog_id
-	 * @param Integer $post_id
-	 * @param Integer $parent_id
-	 */
-	public static function create_comment($title, $full_text, $file_comment, $blog_id, $post_id, $parent_id, $task_id = 'NULL')
-	{
-		$_user = api_get_user_info();
-		$_course = api_get_course_info();
+        Database::query($sql);
+
+        // Delete posts and attachments
+        delete_all_blog_attachment($blog_id,$post_id);
+    }
+
+    /**
+     * Creates a comment on a post in a given blog
+     * @author Toon Keppens
+     * @param String $title
+     * @param String $full_text
+     * @param Integer $blog_id
+     * @param Integer $post_id
+     * @param Integer $parent_id
+     */
+    public static function create_comment($title, $full_text, $file_comment, $blog_id, $post_id, $parent_id, $task_id = 'NULL')
+    {
+        $_user = api_get_user_info();
+        $_course = api_get_course_info();
         $blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
         $upload_ok = true;
@@ -425,55 +424,55 @@ 
         $current_date = api_get_utc_datetime();
         $course_id = api_get_course_int_id();
 
-		if (!empty($_FILES['user_upload']['name'])) {
-			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
-		}
+        if (!empty($_FILES['user_upload']['name'])) {
+            $upload_ok = process_uploaded_file($_FILES['user_upload']);
+            $has_attachment=true;
+        }
 
-		if ($upload_ok) {
-			// Table Definition
-			$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        if ($upload_ok) {
+            // Table Definition
+            $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
 
-			// Create the comment
-			$sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
+            // Create the comment
+            $sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
 					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int)$_user['user_id']."','".$current_date."', '".(int)$blog_id."', '".(int)$post_id."', '".(int)$parent_id."', '".(int)$task_id."')";
-			Database::query($sql);
+            Database::query($sql);
 
-			// Empty post values, or they are shown on the page again
-			$last_id = Database::insert_id();
+            // Empty post values, or they are shown on the page again
+            $last_id = Database::insert_id();
 
             if ($last_id) {
                 $sql = "UPDATE $tbl_blogs_comments SET comment_id = iid WHERE iid = $last_id";
                 Database::query($sql);
             }
 
-			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
-				$sys_course_path = api_get_path(SYS_COURSE_PATH);
-				$updir = $sys_course_path.$courseDir;
-
-				// Try to add an extension to the file if it hasn't one
-				$new_file_name = add_ext_on_mime(
-					stripslashes($_FILES['user_upload']['name']),
-					$_FILES['user_upload']['type']
-				);
-
-				// user's file name
-				$file_name =$_FILES['user_upload']['name'];
-
-				if (!filter_extension($new_file_name)) {
-					Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
-				} else {
-					$new_file_name = uniqid('');
-					$new_path=$updir.'/'.$new_file_name;
-					$result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
-					$comment = Database::escape_string($file_comment);
-
-					// Storing the attachments if any
-					if ($result) {
-						$sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
-							 "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
-						Database::query($sql);
+            if ($has_attachment) {
+                $courseDir   = $_course['path'].'/upload/blog';
+                $sys_course_path = api_get_path(SYS_COURSE_PATH);
+                $updir = $sys_course_path.$courseDir;
+
+                // Try to add an extension to the file if it hasn't one
+                $new_file_name = add_ext_on_mime(
+                    stripslashes($_FILES['user_upload']['name']),
+                    $_FILES['user_upload']['type']
+                );
+
+                // user's file name
+                $file_name =$_FILES['user_upload']['name'];
+
+                if (!filter_extension($new_file_name)) {
+                    Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
+                } else {
+                    $new_file_name = uniqid('');
+                    $new_path=$updir.'/'.$new_file_name;
+                    $result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+                    $comment = Database::escape_string($file_comment);
+
+                    // Storing the attachments if any
+                    if ($result) {
+                        $sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
+                                "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
+                        Database::query($sql);
 
                         $id = Database::insert_id();
 
@@ -481,91 +480,91 @@ 
                             $sql = "UPDATE $blog_table_attachment SET id = iid WHERE iid = $id";
                             Database::query($sql);
                         }
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Deletes a comment from a blogpost
-	 * @author Toon Keppens
-	 * @param int $blog_id
-	 * @param int $comment_id
-	 */
-	public static function delete_comment($blog_id, $post_id, $comment_id)
-	{
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
-		$blog_id = intval($blog_id);
-		$post_id = intval($post_id);
-		$comment_id = intval($comment_id);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Deletes a comment from a blogpost
+     * @author Toon Keppens
+     * @param int $blog_id
+     * @param int $comment_id
+     */
+    public static function delete_comment($blog_id, $post_id, $comment_id)
+    {
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        $blog_id = intval($blog_id);
+        $post_id = intval($post_id);
+        $comment_id = intval($comment_id);
         $course_id = api_get_course_int_id();
 
-		delete_all_blog_attachment($blog_id, $post_id, $comment_id);
+        delete_all_blog_attachment($blog_id, $post_id, $comment_id);
 
-		// Delete ratings on this comment
-		$sql = "DELETE FROM $tbl_blogs_rating
+        // Delete ratings on this comment
+        $sql = "DELETE FROM $tbl_blogs_rating
 				WHERE
 				    c_id = $course_id AND
 				    blog_id = '".$blog_id."' AND
 				    item_id = '".$comment_id."' AND
 				    rating_type = 'comment'";
-		Database::query($sql);
+        Database::query($sql);
 
-		// select comments that have the selected comment as their parent
-		$sql = "SELECT comment_id FROM $tbl_blogs_comments
+        // select comments that have the selected comment as their parent
+        $sql = "SELECT comment_id FROM $tbl_blogs_comments
 				WHERE c_id = $course_id AND parent_comment_id = '".$comment_id."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		// Delete them recursively
-		while ($comment = Database::fetch_array($result)) {
-			Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
-		}
+        // Delete them recursively
+        while ($comment = Database::fetch_array($result)) {
+            Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
+        }
 
-		// Finally, delete the selected comment to
-		$sql = "DELETE FROM $tbl_blogs_comments
+        // Finally, delete the selected comment to
+        $sql = "DELETE FROM $tbl_blogs_comments
 				WHERE c_id = $course_id AND comment_id = '".$comment_id."'";
-		Database::query($sql);
-	}
-
-	/**
-	 * Creates a new task in a blog
-	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 * @param String $title
-	 * @param String $description
-	 * @param String $color
-	 */
-	public static function create_task($blog_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
-	{
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
-
-		$course_id = api_get_course_int_id();
-
-		// Create the task
-		$sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
+        Database::query($sql);
+    }
+
+    /**
+     * Creates a new task in a blog
+     * @author Toon Keppens
+     * @param Integer $blog_id
+     * @param String $title
+     * @param String $description
+     * @param String $color
+     */
+    public static function create_task($blog_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
+    {
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+
+        $course_id = api_get_course_int_id();
+
+        // Create the task
+        $sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
 				VALUES ($course_id , '".(int)$blog_id."', '" . Database::escape_string($title)."', '" . Database::escape_string($description)."', '" . Database::escape_string($color)."', '0');";
-		Database::query($sql);
+        Database::query($sql);
 
-		$task_id = Database::insert_id();
+        $task_id = Database::insert_id();
 
         if ($task_id) {
             $sql = "UPDATE $tbl_blogs_tasks SET task_id = iid WHERE iid = $task_id";
             Database::query($sql);
         }
 
-		$tool = 'BLOG_' . $blog_id;
+        $tool = 'BLOG_' . $blog_id;
 
-		if ($articleDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id,  task_id, tool, action) VALUES (
+        if ($articleDelete == 'on') {
+            $sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id,  task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_delete'
 				)";
-			Database::query($sql);
+            Database::query($sql);
 
             $id = Database::insert_id();
 
@@ -575,171 +574,171 @@ 
             }
         }
 
-		if ($articleEdit == 'on') {
-			$sql = "
+        if ($articleEdit == 'on') {
+            $sql = "
 				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_edit'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
+        }
 
-		if ($commentsDelete == 'on') {
-			$sql = "
+        if ($commentsDelete == 'on') {
+            $sql = "
 				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_comments_delete'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
-	}
-
-	/**
-	 * Edit a task in a blog
-	 * @author Toon Keppens
-	 * @param Integer $task_id
-	 * @param String $title
-	 * @param String $description
-	 * @param String $color
-	 */
-	public static function edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
-	{
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+        }
+    }
+
+    /**
+     * Edit a task in a blog
+     * @author Toon Keppens
+     * @param Integer $task_id
+     * @param String $title
+     * @param String $description
+     * @param String $color
+     */
+    public static function edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
+    {
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 
         $course_id = api_get_course_int_id();
 
-		// Create the task
-		$sql = "UPDATE $tbl_blogs_tasks SET
+        // Create the task
+        $sql = "UPDATE $tbl_blogs_tasks SET
 					title = '".Database::escape_string($title)."',
 					description = '".Database::escape_string($description)."',
 					color = '".Database::escape_string($color)."'
 				WHERE c_id = $course_id AND task_id ='".(int)$task_id."' LIMIT 1";
-		Database::query($sql);
+        Database::query($sql);
 
-		$tool = 'BLOG_' . $blog_id;
+        $tool = 'BLOG_' . $blog_id;
 
-		$sql = "DELETE FROM " . $tbl_tasks_permissions . "
+        $sql = "DELETE FROM " . $tbl_tasks_permissions . "
 				WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
-		Database::query($sql);
+        Database::query($sql);
 
-		if ($articleDelete == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
+        if ($articleDelete == 'on') {
+            $sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_delete'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
+        }
 
-		if ($articleEdit == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
+        if ($articleEdit == 'on') {
+            $sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_edit'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
+        }
 
-		if ($commentsDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
+        if ($commentsDelete == 'on') {
+            $sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
 					'" . Database::escape_string($tool) . "',
 					'article_comments_delete'
 				)";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
-	}
-
-	/**
-	 * Deletes a task from a blog
-	 * @param Integer $blog_id
-	 * @param Integer $task_id
-	 */
-	public static function delete_task($blog_id, $task_id)
-	{
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$course_id = api_get_course_int_id();
-
-		// Delete posts
-		$sql = "DELETE FROM $tbl_blogs_tasks
+        }
+    }
+
+    /**
+     * Deletes a task from a blog
+     * @param Integer $blog_id
+     * @param Integer $task_id
+     */
+    public static function delete_task($blog_id, $task_id)
+    {
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $course_id = api_get_course_int_id();
+
+        // Delete posts
+        $sql = "DELETE FROM $tbl_blogs_tasks
 				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."'";
-		Database::query($sql);
-	}
-
-	/**
-	 * Deletes an assigned task from a blog
-	 * @param Integer $blog_id
-	 */
-	public static function delete_assigned_task($blog_id, $task_id, $user_id)
-	{
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        Database::query($sql);
+    }
+
+    /**
+     * Deletes an assigned task from a blog
+     * @param Integer $blog_id
+     */
+    public static function delete_assigned_task($blog_id, $task_id, $user_id)
+    {
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
         $course_id = api_get_course_int_id();
 
-		// Delete posts
-		$sql = "DELETE FROM $tbl_blogs_tasks_rel_user
+        // Delete posts
+        $sql = "DELETE FROM $tbl_blogs_tasks_rel_user
 				WHERE
 				    c_id = $course_id AND
 				    blog_id = '".(int)$blog_id."' AND
 				    task_id = '".(int)$task_id."' AND
 				    user_id = '".(int)$user_id."'";
-		Database::query($sql);
-	}
-
-	/**
-	 * Get personal task list
-	 * @author Toon Keppens
-	 * @return Returns an unsorted list (<ul></ul>) with the users' tasks
-	 */
-	public static function get_personal_task_list()
-	{
-		$_user = api_get_user_info();
-
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-
-		$course_id = api_get_course_int_id();
-
-		if ($_user['user_id']) {
-			$sql = "SELECT task_rel_user.*, task.title, blog.blog_name
+        Database::query($sql);
+    }
+
+    /**
+     * Get personal task list
+     * @author Toon Keppens
+     * @return Returns an unsorted list (<ul></ul>) with the users' tasks
+     */
+    public static function get_personal_task_list()
+    {
+        $_user = api_get_user_info();
+
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+        $tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+
+        $course_id = api_get_course_int_id();
+
+        if ($_user['user_id']) {
+            $sql = "SELECT task_rel_user.*, task.title, blog.blog_name
                     FROM $tbl_blogs_tasks_rel_user task_rel_user
                     INNER JOIN $tbl_blogs_tasks task
                     ON task_rel_user.task_id = task.task_id
@@ -753,85 +752,85 @@ 
                         task_rel_user.user_id = ".(int)$_user['user_id']."
                     ORDER BY target_date ASC";
 
-			$result = Database::query($sql);
-
-			if (Database::num_rows($result) > 0) {
-				echo '<ul>';
-				while ($mytask = Database::fetch_array($result)) {
-					echo '<li><a href="blog.php?action=execute_task&blog_id=' . $mytask['blog_id'] . '&task_id='.stripslashes($mytask['task_id']) . '" title="[Blog: '.stripslashes($mytask['blog_name']) . '] ' . get_lang('ExecuteThisTask') . '">'.stripslashes($mytask['title']) . '</a></li>';
-				}
-				echo '<ul>';
-			} else {
-				echo get_lang('NoTasks');
-			}
-		} else {
-			echo get_lang('NoTasks');
-		}
-	}
-
-	/**
-	 * Changes the visibility of a blog
-	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 */
-	public static function change_blog_visibility($blog_id)
-	{
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
-		$course_id = api_get_course_int_id();
-
-		// Get blog properties
-		$sql = "SELECT blog_name, visibility FROM $tbl_blogs
+            $result = Database::query($sql);
+
+            if (Database::num_rows($result) > 0) {
+                echo '<ul>';
+                while ($mytask = Database::fetch_array($result)) {
+                    echo '<li><a href="blog.php?action=execute_task&blog_id=' . $mytask['blog_id'] . '&task_id='.stripslashes($mytask['task_id']) . '" title="[Blog: '.stripslashes($mytask['blog_name']) . '] ' . get_lang('ExecuteThisTask') . '">'.stripslashes($mytask['title']) . '</a></li>';
+                }
+                echo '<ul>';
+            } else {
+                echo get_lang('NoTasks');
+            }
+        } else {
+            echo get_lang('NoTasks');
+        }
+    }
+
+    /**
+     * Changes the visibility of a blog
+     * @author Toon Keppens
+     * @param Integer $blog_id
+     */
+    public static function change_blog_visibility($blog_id)
+    {
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+        $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
+        $course_id = api_get_course_int_id();
+
+        // Get blog properties
+        $sql = "SELECT blog_name, visibility FROM $tbl_blogs
 				WHERE c_id = $course_id AND blog_id='".(int)$blog_id."'";
-		$result = Database::query($sql);
-		$blog = Database::fetch_array($result);
-		$visibility = $blog['visibility'];
-		$title = $blog['blog_name'];
-
-		if ($visibility == 1) {
-			// Change visibility state, remove from course home.
-			$sql = "UPDATE $tbl_blogs SET visibility = '0'
+        $result = Database::query($sql);
+        $blog = Database::fetch_array($result);
+        $visibility = $blog['visibility'];
+        $title = $blog['blog_name'];
+
+        if ($visibility == 1) {
+            // Change visibility state, remove from course home.
+            $sql = "UPDATE $tbl_blogs SET visibility = '0'
 					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = "DELETE FROM $tbl_tool
+            $sql = "DELETE FROM $tbl_tool
 					WHERE c_id = $course_id AND name = '".Database::escape_string($title)."' LIMIT 1";
-			Database::query($sql);
-		} else {
-			// Change visibility state, add to course home.
-			$sql = "UPDATE $tbl_blogs SET visibility = '1'
+            Database::query($sql);
+        } else {
+            // Change visibility state, add to course home.
+            $sql = "UPDATE $tbl_blogs SET visibility = '1'
 					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
-			Database::query($sql);
+            Database::query($sql);
 
-			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, target )
+            $sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, target )
 					VALUES ($course_id, '".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int)$blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')";
-			Database::query($sql);
+            Database::query($sql);
             $id = Database::insert_id();
 
             if ($id) {
                 $sql = "UPDATE $tbl_tool SET id = iid WHERE iid = $id";
                 Database::query($sql);
             }
-		}
-	}
-
-	/**
-	 * Shows the posts of a blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_blog_posts($blog_id, $filter = '1=1', $max_number_of_posts = 20)
+        }
+    }
+
+    /**
+     * Shows the posts of a blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_blog_posts($blog_id, $filter = '1=1', $max_number_of_posts = 20)
     {
-		// Init
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        // Init
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Get posts and authors
-		$sql = "SELECT post.*, user.lastname, user.firstname, user.username
+        // Get posts and authors
+        $sql = "SELECT post.*, user.lastname, user.firstname, user.username
 		        FROM $tbl_blogs_posts post
                 INNER JOIN $tbl_users user
                 ON post.author_id = user.user_id
@@ -839,131 +838,131 @@ 
 						post.c_id = $course_id AND
 						$filter
 				ORDER BY post_id DESC LIMIT 0,".(int)$max_number_of_posts;
-		$result = Database::query($sql);
-
-		// Display
-		if(Database::num_rows($result) > 0) {
-		    $limit = 200;
-			while ($blog_post = Database::fetch_array($result)) {
-				// Get number of comments
-				$sql = "SELECT COUNT(1) as number_of_comments
+        $result = Database::query($sql);
+
+        // Display
+        if(Database::num_rows($result) > 0) {
+            $limit = 200;
+            while ($blog_post = Database::fetch_array($result)) {
+                // Get number of comments
+                $sql = "SELECT COUNT(1) as number_of_comments
 						FROM $tbl_blogs_comments
 						WHERE
 						    c_id = $course_id AND
 						    blog_id = '".(int)$blog_id."' AND
 						    post_id = '" . (int)$blog_post['post_id']."'";
-				$tmp = Database::query($sql);
-				$blog_post_comments = Database::fetch_array($tmp);
-
-				// Prepare data
-				$blog_post_id = $blog_post['post_id'];
-				$blog_post_text = make_clickable(stripslashes($blog_post['full_text']));
-				$blog_post_date = api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get());
-
-				// Create an introduction text (but keep FULL sentences)
-				$words = 0;
-				$blog_post_text_cut = cut($blog_post_text, $limit) ;
-				$words = strlen($blog_post_text);
-
-				if ($words >= $limit) {
-					$readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_' . $blog_post_id . '\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_' . $blog_post_id . '\').style.display=\'none\'">' . get_lang('ReadMore') . '</div>';
-					$introduction_text = $blog_post_text_cut;
-				} else {
-				    $introduction_text = $blog_post_text;
-					$readMoreLink = '';
-				}
-
-				$introduction_text = stripslashes($introduction_text);
-
-				echo '<div class="blogpost">';
-				echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-				echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . $blog_post_date . '</a></span>';
-				echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">' . $introduction_text.$readMoreLink.'</div>';
-				echo '<div class="blogpost_text" id="blogpost_text_' . $blog_post_id . '" style="display: none">' . $blog_post_text . '</div>';
-
-				$file_name_array = get_blog_attachment($blog_id,$blog_post_id,0);
-
-				if (!empty($file_name_array)) {
-					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
-					echo '<a href="download.php?file=';
-					echo $file_name_array['path'];
-					echo ' "> '.$file_name_array['filename'].' </a><br />';
-					echo '</span>';
-				}
-				$username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<span class="blogpost_info">' . get_lang('Author') . ': ' . Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)) .' - <a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . '</a></span>';
-				echo '</div>';
-			}
-		} else {
-			if($filter == '1=1') {
-				echo get_lang('NoArticles');
-			} else {
-				echo get_lang('NoArticleMatches');
-			}
-		}
+                $tmp = Database::query($sql);
+                $blog_post_comments = Database::fetch_array($tmp);
+
+                // Prepare data
+                $blog_post_id = $blog_post['post_id'];
+                $blog_post_text = make_clickable(stripslashes($blog_post['full_text']));
+                $blog_post_date = api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get());
+
+                // Create an introduction text (but keep FULL sentences)
+                $words = 0;
+                $blog_post_text_cut = cut($blog_post_text, $limit) ;
+                $words = strlen($blog_post_text);
+
+                if ($words >= $limit) {
+                    $readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_' . $blog_post_id . '\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_' . $blog_post_id . '\').style.display=\'none\'">' . get_lang('ReadMore') . '</div>';
+                    $introduction_text = $blog_post_text_cut;
+                } else {
+                    $introduction_text = $blog_post_text;
+                    $readMoreLink = '';
+                }
+
+                $introduction_text = stripslashes($introduction_text);
+
+                echo '<div class="blogpost">';
+                echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
+                echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . $blog_post_date . '</a></span>';
+                echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">' . $introduction_text.$readMoreLink.'</div>';
+                echo '<div class="blogpost_text" id="blogpost_text_' . $blog_post_id . '" style="display: none">' . $blog_post_text . '</div>';
+
+                $file_name_array = get_blog_attachment($blog_id,$blog_post_id,0);
+
+                if (!empty($file_name_array)) {
+                    echo '<br /><br />';
+                    echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+                    echo '<a href="download.php?file=';
+                    echo $file_name_array['path'];
+                    echo ' "> '.$file_name_array['filename'].' </a><br />';
+                    echo '</span>';
+                }
+                $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
+                echo '<span class="blogpost_info">' . get_lang('Author') . ': ' . Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)) .' - <a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . '</a></span>';
+                echo '</div>';
+            }
+        } else {
+            if($filter == '1=1') {
+                echo get_lang('NoArticles');
+            } else {
+                echo get_lang('NoArticleMatches');
+            }
+        }
 }
 
-	/**
-	 * Display the search results
-	 *
-	 * @param Integer $blog_id
-	 * @param String $query_string
-	 */
-	public static function display_search_results ($blog_id, $query_string)
-	{
-		// Init
-		$query_string = Database::escape_string($query_string);
-		$query_string_parts = explode(' ',$query_string);
-		$query_string = array();
-		foreach ($query_string_parts as $query_part) {
-			$query_string[] = " full_text LIKE '%" . $query_part."%' OR title LIKE '%" . $query_part."%' ";
-		}
-		$query_string = '('.implode('OR',$query_string) . ')';
-
-		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('SearchResults') . '</span>';
-		Blog::display_blog_posts($blog_id, $query_string);
-	}
-
-	/**
-	 * Display posts from a certain date
-	 *
-	 * @param Integer $blog_id
-	 * @param String $query_string
-	 */
-	public static function display_day_results($blog_id, $query_string)
-	{
-		$date_output = $query_string;
-		$date = explode('-',$query_string);
-		$query_string = ' DAYOFMONTH(date_creation) =' . intval($date[2]) . ' AND MONTH(date_creation) =' . intval($date[1]) . ' AND YEAR(date_creation) =' . intval($date[0]);
-
-		// Put date in correct output format
-		$date_output = api_format_date($date_output, DATE_FORMAT_LONG);
-
-		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('PostsOf') . ': ' . $date_output . '</span>';
-		Blog::display_blog_posts($blog_id, $query_string);
-	}
-
-	/**
-	 * Displays a post and his comments
-	 *
-	 * @param Integer $blog_id
-	 * @param Integer $post_id
-	 */
-	public static function display_post($blog_id, $post_id)
-	{
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-
-		global $charset, $dateFormatLong;
-
-		$course_id = api_get_course_int_id();
-
-		// Get posts and author
-		$sql = "SELECT post.*, user.lastname, user.firstname, user.username
+    /**
+     * Display the search results
+     *
+     * @param Integer $blog_id
+     * @param String $query_string
+     */
+    public static function display_search_results ($blog_id, $query_string)
+    {
+        // Init
+        $query_string = Database::escape_string($query_string);
+        $query_string_parts = explode(' ',$query_string);
+        $query_string = array();
+        foreach ($query_string_parts as $query_part) {
+            $query_string[] = " full_text LIKE '%" . $query_part."%' OR title LIKE '%" . $query_part."%' ";
+        }
+        $query_string = '('.implode('OR',$query_string) . ')';
+
+        // Display the posts
+        echo '<span class="blogpost_title">' . get_lang('SearchResults') . '</span>';
+        Blog::display_blog_posts($blog_id, $query_string);
+    }
+
+    /**
+     * Display posts from a certain date
+     *
+     * @param Integer $blog_id
+     * @param String $query_string
+     */
+    public static function display_day_results($blog_id, $query_string)
+    {
+        $date_output = $query_string;
+        $date = explode('-',$query_string);
+        $query_string = ' DAYOFMONTH(date_creation) =' . intval($date[2]) . ' AND MONTH(date_creation) =' . intval($date[1]) . ' AND YEAR(date_creation) =' . intval($date[0]);
+
+        // Put date in correct output format
+        $date_output = api_format_date($date_output, DATE_FORMAT_LONG);
+
+        // Display the posts
+        echo '<span class="blogpost_title">' . get_lang('PostsOf') . ': ' . $date_output . '</span>';
+        Blog::display_blog_posts($blog_id, $query_string);
+    }
+
+    /**
+     * Displays a post and his comments
+     *
+     * @param Integer $blog_id
+     * @param Integer $post_id
+     */
+    public static function display_post($blog_id, $post_id)
+    {
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+
+        global $charset, $dateFormatLong;
+
+        $course_id = api_get_course_int_id();
+
+        // Get posts and author
+        $sql = "SELECT post.*, user.lastname, user.firstname, user.username
 		        FROM $tbl_blogs_posts post
 					INNER JOIN $tbl_users user
 					ON post.author_id = user.user_id
@@ -972,113 +971,113 @@ 
                     post.blog_id = '".(int)$blog_id."' AND
                     post.post_id = '".(int)$post_id."'
                 ORDER BY post_id DESC";
-		$result = Database::query($sql);
-		$blog_post = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $blog_post = Database::fetch_array($result);
 
-		// Get number of comments
-		$sql = "SELECT COUNT(1) as number_of_comments
+        // Get number of comments
+        $sql = "SELECT COUNT(1) as number_of_comments
 		        FROM $tbl_blogs_comments
 				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND post_id = '".(int)$post_id."'";
-		$result = Database::query($sql);
-		$blog_post_comments = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $blog_post_comments = Database::fetch_array($result);
 
-		// Prepare data
-		$blog_post_text = make_clickable(stripslashes($blog_post['full_text']));
-		$blog_post_date = api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get());
-		$blog_post_actions = "";
+        // Prepare data
+        $blog_post_text = make_clickable(stripslashes($blog_post['full_text']));
+        $blog_post_date = api_convert_and_format_date($blog_post['date_creation'], null, date_default_timezone_get());
+        $blog_post_actions = "";
 
-		$task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
+        $task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
-			$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
-			$blog_post_actions .=  Display::return_icon('edit.png');
-			$blog_post_actions .= '</a>';
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
+            $blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
+            $blog_post_actions .=  Display::return_icon('edit.png');
+            $blog_post_actions .= '</a>';
         }
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
-			$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
+            $blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
             $blog_post_actions .= Display::return_icon('delete.png');
             $blog_post_actions .= '</a>';
         }
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
-			$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
+            $rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
 
-		$blog_post_text=stripslashes($blog_post_text);
+        $blog_post_text=stripslashes($blog_post_text);
 
-		// Display post
-		echo '<div class="blogpost">';
-		echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-		echo '<span class="blogpost_date">' . $blog_post_date . '</span>';
-		echo '<span class="blogpost_text">' . $blog_post_text . '</span><br />';
+        // Display post
+        echo '<div class="blogpost">';
+        echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
+        echo '<span class="blogpost_date">' . $blog_post_date . '</span>';
+        echo '<span class="blogpost_text">' . $blog_post_text . '</span><br />';
 
-		$file_name_array = get_blog_attachment($blog_id, $post_id);
+        $file_name_array = get_blog_attachment($blog_id, $post_id);
 
         if (!empty($file_name_array)) {
-			echo ' <br />';
-			echo Display::return_icon('attachment.gif',get_lang('Attachment'));
-			echo '<a href="download.php?file=';
-			echo $file_name_array['path'];
-			echo ' "> '.$file_name_array['filename'].' </a>';
-			echo '</span>';
-			echo '<span class="attachment_comment">';
-			echo $file_name_array['comment'];
-			echo '</span>';
-			echo '<br />';
-		}
+            echo ' <br />';
+            echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+            echo '<a href="download.php?file=';
+            echo $file_name_array['path'];
+            echo ' "> '.$file_name_array['filename'].' </a>';
+            echo '</span>';
+            echo '<span class="attachment_comment">';
+            echo $file_name_array['comment'];
+            echo '</span>';
+            echo '<br />';
+        }
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-		echo '<span class="blogpost_info">'.get_lang('Author').': ' .Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - '.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].' - '.get_lang('Rating').': '.Blog::display_rating('post',$blog_id,$post_id).$rating_select.'</span>';
-		echo '<span class="blogpost_actions">' . $blog_post_actions . '</span>';
-		echo '</div>';
-
-		// Display comments if there are any
-		if($blog_post_comments['number_of_comments'] > 0) {
-			echo '<div class="comments">';
-				echo '<span class="blogpost_title">' . get_lang('Comments') . '</span><br />';
-				Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id);
-			echo '</div>';
-		}
-
-		// Display comment form
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) {
-			Blog::display_new_comment_form($blog_id, $post_id, $blog_post['title']);
-		}
-	}
-
-	/**
-	 * Adds rating to a certain post or comment
-	 * @author Toon Keppens
-	 *
-	 * @param String $type
-	 * @param Integer $blog_id
-	 * @param Integer $item_id
-	 * @param Integer $rating
-	 *
-	 * @return Boolean success
-	 */
-	public static function add_rating($type, $blog_id, $item_id, $rating)
-	{
-		$_user = api_get_user_info();
-
-		// Init
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
-		$course_id = api_get_course_int_id();
-
-		// Check if the user has already rated this post/comment
-		$sql = "SELECT rating_id FROM $tbl_blogs_rating
+        echo '<span class="blogpost_info">'.get_lang('Author').': ' .Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - '.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].' - '.get_lang('Rating').': '.Blog::display_rating('post',$blog_id,$post_id).$rating_select.'</span>';
+        echo '<span class="blogpost_actions">' . $blog_post_actions . '</span>';
+        echo '</div>';
+
+        // Display comments if there are any
+        if($blog_post_comments['number_of_comments'] > 0) {
+            echo '<div class="comments">';
+                echo '<span class="blogpost_title">' . get_lang('Comments') . '</span><br />';
+                Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id);
+            echo '</div>';
+        }
+
+        // Display comment form
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) {
+            Blog::display_new_comment_form($blog_id, $post_id, $blog_post['title']);
+        }
+    }
+
+    /**
+     * Adds rating to a certain post or comment
+     * @author Toon Keppens
+     *
+     * @param String $type
+     * @param Integer $blog_id
+     * @param Integer $item_id
+     * @param Integer $rating
+     *
+     * @return Boolean success
+     */
+    public static function add_rating($type, $blog_id, $item_id, $rating)
+    {
+        $_user = api_get_user_info();
+
+        // Init
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        $course_id = api_get_course_int_id();
+
+        // Check if the user has already rated this post/comment
+        $sql = "SELECT rating_id FROM $tbl_blogs_rating
                 WHERE
                     c_id = $course_id AND
                     blog_id = '".(int)$blog_id."' AND
                     item_id = '".(int)$item_id."' AND
                     rating_type = '".Database::escape_string($type)."' AND
                     user_id = '".(int)$_user['user_id']."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
         // Add rating
-		if (Database::num_rows($result) == 0) {
-			$sql = "INSERT INTO $tbl_blogs_rating (c_id, blog_id, rating_type, item_id, user_id, rating )
+        if (Database::num_rows($result) == 0) {
+            $sql = "INSERT INTO $tbl_blogs_rating (c_id, blog_id, rating_type, item_id, user_id, rating )
 					VALUES ($course_id, '".(int)$blog_id."', '".Database::escape_string($type)."', '".(int)$item_id."', '".(int)$_user['user_id']."', '".Database::escape_string($rating)."')";
-			Database::query($sql);
+            Database::query($sql);
 
             $id = Database::insert_id();
             if ($id) {
@@ -1086,103 +1085,103 @@ 
                 Database::query($sql);
             }
 
-			return true;
+            return true;
         } else {
-			return false;
-		}
-	}
-
-	/**
-	 * Shows the rating of user
-	 * @param String $type
-	 * @param Integer $blog_id
-	 * @param Integer $item_id
-	 * @return array
-	 */
-	public static function display_rating($type, $blog_id, $item_id)
-	{
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
-		$course_id = api_get_course_int_id();
-
-		// Calculate rating
-		$sql = "SELECT AVG(rating) as rating FROM $tbl_blogs_rating
+            return false;
+        }
+    }
+
+    /**
+     * Shows the rating of user
+     * @param String $type
+     * @param Integer $blog_id
+     * @param Integer $item_id
+     * @return array
+     */
+    public static function display_rating($type, $blog_id, $item_id)
+    {
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        $course_id = api_get_course_int_id();
+
+        // Calculate rating
+        $sql = "SELECT AVG(rating) as rating FROM $tbl_blogs_rating
 				WHERE
 				    c_id = $course_id AND
 				    blog_id = '".(int)$blog_id."' AND
 				    item_id = '".(int)$item_id."' AND
 				    rating_type = '".Database::escape_string($type)."' ";
-		$result = Database::query($sql);
-		$result = Database::fetch_array($result);
-		return round($result['rating'], 2);
-	}
-
-	/**
-	 * Shows the rating form if not already rated by that user
-	 * @author Toon Keppens
-	 *
-	 * @param String $type
-	 * @param Integer $blog_id
-	 * @param integer $post_id
-	 */
-	public static function display_rating_form ($type, $blog_id, $post_id, $comment_id = NULL)
-	{
-		$_user = api_get_user_info();
-		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
+        $result = Database::query($sql);
+        $result = Database::fetch_array($result);
+        return round($result['rating'], 2);
+    }
+
+    /**
+     * Shows the rating form if not already rated by that user
+     * @author Toon Keppens
+     *
+     * @param String $type
+     * @param Integer $blog_id
+     * @param integer $post_id
+     */
+    public static function display_rating_form ($type, $blog_id, $post_id, $comment_id = NULL)
+    {
+        $_user = api_get_user_info();
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
         $course_id = api_get_course_int_id();
 
         if ($type == 'post') {
-			// Check if the user has already rated this post
-			$sql = "SELECT rating_id FROM $tbl_blogs_rating
+            // Check if the user has already rated this post
+            $sql = "SELECT rating_id FROM $tbl_blogs_rating
 					WHERE c_id = $course_id AND
 					blog_id = '".(int)$blog_id."'
 					AND item_id = '".(int)$post_id."'
 					AND rating_type = '".Database::escape_string($type)."'
 					AND user_id = '".(int)$_user['user_id']."'";
-			$result = Database::query($sql);
+            $result = Database::query($sql);
             // Add rating
             if (Database::num_rows($result) == 0) {
-				return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $post_id . '" name="frm_rating_' . $type . '_' . $post_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $post_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /></form>';
+                return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $post_id . '" name="frm_rating_' . $type . '_' . $post_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $post_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /></form>';
             } else {
-				return '';
-			}
-		}
+                return '';
+            }
+        }
 
         if ($type = 'comment') {
-			// Check if the user has already rated this comment
-			$sql = "SELECT rating_id FROM $tbl_blogs_rating
+            // Check if the user has already rated this comment
+            $sql = "SELECT rating_id FROM $tbl_blogs_rating
 					WHERE c_id = $course_id AND blog_id = '".(int)$blog_id ."'
 					AND item_id = '".(int)$comment_id."'
 					AND rating_type = '".Database::escape_string($type)."'
 					AND user_id = '".(int)$_user['user_id']."'";
-			$result = Database::query($sql);
+            $result = Database::query($sql);
 
             if (Database::num_rows($result) == 0) {
-				return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $comment_id . '" name="frm_rating_' . $type . '_' . $comment_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $comment_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /><input type="hidden" name="comment_id" value="' . $comment_id . '" /></form>';
+                return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $comment_id . '" name="frm_rating_' . $type . '_' . $comment_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $comment_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /><input type="hidden" name="comment_id" value="' . $comment_id . '" /></form>';
             } else {
-				return '';
-			}
-		}
-	}
-
-	/**
-	 * This functions gets all replys to a post, threaded.
-	 *
-	 * @param Integer $current
-	 * @param Integer $current_level
-	 * @param Integer $blog_id
-	 * @param Integer $post_id
-	 */
-	public static function get_threaded_comments($current = 0, $current_level = 0, $blog_id, $post_id, $task_id = 0)
-	{
-		$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		global $charset;
-
-		$course_id = api_get_course_int_id();
-
-		// Select top level comments
-		$next_level = $current_level + 1;
+                return '';
+            }
+        }
+    }
+
+    /**
+     * This functions gets all replys to a post, threaded.
+     *
+     * @param Integer $current
+     * @param Integer $current_level
+     * @param Integer $blog_id
+     * @param Integer $post_id
+     */
+    public static function get_threaded_comments($current = 0, $current_level = 0, $blog_id, $post_id, $task_id = 0)
+    {
+        $tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        global $charset;
+
+        $course_id = api_get_course_int_id();
+
+        // Select top level comments
+        $next_level = $current_level + 1;
         $sql = "SELECT comments.*, user.lastname, user.firstname, user.username, task.color
                 FROM $tbl_blogs_comments comments
                 INNER JOIN $tbl_users user
@@ -1194,11 +1193,11 @@ 
                     parent_comment_id = $current AND
                     comments.blog_id = '".(int)$blog_id."' AND
                     comments.post_id = '".(int)$post_id."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		while($comment = Database::fetch_array($result)) {
-			// Select the children recursivly
-			$tmp = "SELECT comments.*, user.lastname, user.firstname, user.username
+        while($comment = Database::fetch_array($result)) {
+            // Select the children recursivly
+            $tmp = "SELECT comments.*, user.lastname, user.firstname, user.username
 			        FROM $tbl_blogs_comments comments
 					INNER JOIN $tbl_users user
 					ON comments.author_id = user.user_id
@@ -1207,15 +1206,15 @@ 
 						comment_id = $current
 						AND blog_id = '".(int)$blog_id."'
 						AND post_id = '".(int)$post_id."'";
-			$tmp = Database::query($tmp);
-			$tmp = Database::fetch_array($tmp);
-			$parent_cat = $tmp['parent_comment_id'];
-			$border_color = '';
-
-			// Prepare data
-			$comment_text = make_clickable(stripslashes($comment['comment']));
-			$blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
-			$blog_comment_actions = "";
+            $tmp = Database::query($tmp);
+            $tmp = Database::fetch_array($tmp);
+            $parent_cat = $tmp['parent_comment_id'];
+            $border_color = '';
+
+            // Prepare data
+            $comment_text = make_clickable(stripslashes($comment['comment']));
+            $blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
+            $blog_comment_actions = "";
             if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
                 $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_comment&comment_id='.$comment['comment_id'].'&task_id='.$task_id.'" title="'.get_lang(
                         'DeleteThisComment'
@@ -1230,167 +1229,167 @@ 
                 $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']);
             }
 
-			if (!is_null($comment['task_id'])) {
-				$border_color = ' border-left: 3px solid #' . $comment['color'];
-			}
-
-			$comment_text = stripslashes($comment_text);
-
-			// Output...
-			$margin = $current_level * 30;
-			echo '<div class="blogpost_comment" style="margin-left: ' . $margin . 'px;' . $border_color . '">';
-				echo '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\'' . $comment['comment_id'] . '\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']) . '\'" title="' . get_lang('ReplyToThisComment') . '" >'.stripslashes($comment['title']) . '</a></span>';
-				echo '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
-				echo '<span class="blogpost_text">' . $comment_text . '</span>';
-
-				$file_name_array = get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
-				if (!empty($file_name_array)) {
-					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
-					echo '<a href="download.php?file=';
-					echo $file_name_array['path'];
-					echo ' "> '.$file_name_array['filename'].' </a>';
-					echo '<span class="attachment_comment">';
-					echo $file_name_array['comment'];
-					echo '</span><br />';
-				}
-                $username = api_htmlentities(sprintf(get_lang('LoginX'), $comment['username']), ENT_QUOTES);
-				echo '<span class="blogpost_comment_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($comment['firstname'], $comment['lastname']), array('title'=>$username)).' - '.get_lang('Rating').': '.Blog::display_rating('comment', $blog_id, $comment['comment_id']).$rating_select.'</span>';
-				echo '<span class="blogpost_actions">' . $blog_comment_actions . '</span>';
-			echo '</div>';
-
-			// Go further down the tree.
-			Blog::get_threaded_comments($comment['comment_id'], $next_level, $blog_id, $post_id);
-		}
-	}
-
-	/**
-	 * Displays the form to create a new post
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_form_new_post($blog_id)
-	{
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
-			$form = new FormValidator(
-				'add_post',
-				'post',
-				api_get_path(WEB_CODE_PATH)."blog/blog.php?action=new_post&blog_id=" . $blog_id . "&" . api_get_cidreq(),
-				null,
-				array('enctype' => 'multipart/form-data')
-			);
-			$form->addHidden('post_title_edited', 'false');
-			$form->addHeader(get_lang('NewPost'));
-			$form->addText('title', get_lang('Title'));
-			$config = array();
-			if (!api_is_allowed_to_edit()) {
-				$config['ToolbarSet'] = 'ProjectStudent';
-			} else {
-				$config['ToolbarSet'] = 'Project';
-			}
-			$form->addHtmlEditor('full_text', get_lang('Content'), false, false, $config);
-			$form->addFile('user_upload', get_lang('AddAnAttachment'));
-			$form->addTextarea('post_file_comment', get_lang('FileComment'));
-			$form->addHidden('new_post_submit', 'true');
-			$form->addButton('save', get_lang('Save'));
-
-			$form->display();
-		} else {
-			api_not_allowed();
-		}
-	}
-
-	/**
-	 * Displays the form to edit a post
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_form_edit_post($blog_id, $post_id)
-	{
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-
-		$course_id = api_get_course_int_id();
-
-		// Get posts and author
-		$sql = "SELECT post.*, user.lastname, user.firstname
-				FROM $tbl_blogs_posts post
-				INNER JOIN $tbl_users user ON post.author_id = user.user_id
-				WHERE
-				post.c_id 			= $course_id AND
-				post.blog_id 		= '".(int)$blog_id ."'
-				AND post.post_id	= '".(int)$post_id."'
-				ORDER BY post_id DESC";
-		$result = Database::query($sql);
-		$blog_post = Database::fetch_array($result);
-
-		// Form
-		$form = new FormValidator(
-			'edit_post',
-			'post',
-			api_get_path(WEB_CODE_PATH).'blog/blog.php?action=edit_post&post_id=' . intval($_GET['post_id']) . '&blog_id=' . intval($blog_id) . '&article_id='.intval($_GET['article_id']).'&task_id='.intval($_GET['task_id'])
-		);
-
-		$form->addHeader(get_lang('EditPost'));
-		$form->addText('title', get_lang('Title'));
-
-		if (!api_is_allowed_to_edit()) {
-			$config['ToolbarSet'] = 'ProjectStudent';
-		} else {
-			$config['ToolbarSet'] = 'Project';
-		}
-		$form->addHtmlEditor('full_text', get_lang('Content'), false, false, $config);
-
-		$form->addHidden('action', '');
-		$form->addHidden('edit_post_submit', 'true');
-		$form->addHidden('post_id', intval($_GET['post_id']));
-		$form->addButton('save', get_lang('Save'));
-		$form->setDefaults($blog_post);
-		$form->display();
-	}
-
-	/**
-	 * Displays a list of tasks in this blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_task_list($blog_id)
+            if (!is_null($comment['task_id'])) {
+                $border_color = ' border-left: 3px solid #' . $comment['color'];
+            }
+
+            $comment_text = stripslashes($comment_text);
+
+            // Output...
+            $margin = $current_level * 30;
+            echo '<div class="blogpost_comment" style="margin-left: ' . $margin . 'px;' . $border_color . '">';
+                echo '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\'' . $comment['comment_id'] . '\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']) . '\'" title="' . get_lang('ReplyToThisComment') . '" >'.stripslashes($comment['title']) . '</a></span>';
+                echo '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
+                echo '<span class="blogpost_text">' . $comment_text . '</span>';
+
+                $file_name_array = get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
+                if (!empty($file_name_array)) {
+                    echo '<br /><br />';
+                    echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+                    echo '<a href="download.php?file=';
+                    echo $file_name_array['path'];
+                    echo ' "> '.$file_name_array['filename'].' </a>';
+                    echo '<span class="attachment_comment">';
+                    echo $file_name_array['comment'];
+                    echo '</span><br />';
+                }
+                $username = api_htmlentities(sprintf(get_lang('LoginX'), $comment['username']), ENT_QUOTES);
+                echo '<span class="blogpost_comment_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($comment['firstname'], $comment['lastname']), array('title'=>$username)).' - '.get_lang('Rating').': '.Blog::display_rating('comment', $blog_id, $comment['comment_id']).$rating_select.'</span>';
+                echo '<span class="blogpost_actions">' . $blog_comment_actions . '</span>';
+            echo '</div>';
+
+            // Go further down the tree.
+            Blog::get_threaded_comments($comment['comment_id'], $next_level, $blog_id, $post_id);
+        }
+    }
+
+    /**
+     * Displays the form to create a new post
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_form_new_post($blog_id)
+    {
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+            $form = new FormValidator(
+                'add_post',
+                'post',
+                api_get_path(WEB_CODE_PATH)."blog/blog.php?action=new_post&blog_id=" . $blog_id . "&" . api_get_cidreq(),
+                null,
+                array('enctype' => 'multipart/form-data')
+            );
+            $form->addHidden('post_title_edited', 'false');
+            $form->addHeader(get_lang('NewPost'));
+            $form->addText('title', get_lang('Title'));
+            $config = array();
+            if (!api_is_allowed_to_edit()) {
+                $config['ToolbarSet'] = 'ProjectStudent';
+            } else {
+                $config['ToolbarSet'] = 'Project';
+            }
+            $form->addHtmlEditor('full_text', get_lang('Content'), false, false, $config);
+            $form->addFile('user_upload', get_lang('AddAnAttachment'));
+            $form->addTextarea('post_file_comment', get_lang('FileComment'));
+            $form->addHidden('new_post_submit', 'true');
+            $form->addButton('save', get_lang('Save'));
+
+            $form->display();
+        } else {
+            api_not_allowed();
+        }
+    }
+
+    /**
+     * Displays the form to edit a post
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_form_edit_post($blog_id, $post_id)
+    {
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+
+        $course_id = api_get_course_int_id();
+
+        // Get posts and author
+        $sql = "SELECT post.*, user.lastname, user.firstname
+				FROM $tbl_blogs_posts post
+				INNER JOIN $tbl_users user ON post.author_id = user.user_id
+				WHERE
+				post.c_id 			= $course_id AND
+				post.blog_id 		= '".(int)$blog_id ."'
+				AND post.post_id	= '".(int)$post_id."'
+				ORDER BY post_id DESC";
+        $result = Database::query($sql);
+        $blog_post = Database::fetch_array($result);
+
+        // Form
+        $form = new FormValidator(
+            'edit_post',
+            'post',
+            api_get_path(WEB_CODE_PATH).'blog/blog.php?action=edit_post&post_id=' . intval($_GET['post_id']) . '&blog_id=' . intval($blog_id) . '&article_id='.intval($_GET['article_id']).'&task_id='.intval($_GET['task_id'])
+        );
+
+        $form->addHeader(get_lang('EditPost'));
+        $form->addText('title', get_lang('Title'));
+
+        if (!api_is_allowed_to_edit()) {
+            $config['ToolbarSet'] = 'ProjectStudent';
+        } else {
+            $config['ToolbarSet'] = 'Project';
+        }
+        $form->addHtmlEditor('full_text', get_lang('Content'), false, false, $config);
+
+        $form->addHidden('action', '');
+        $form->addHidden('edit_post_submit', 'true');
+        $form->addHidden('post_id', intval($_GET['post_id']));
+        $form->addButton('save', get_lang('Save'));
+        $form->setDefaults($blog_post);
+        $form->display();
+    }
+
+    /**
+     * Displays a list of tasks in this blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_task_list($blog_id)
     {
-		global $charset;
+        global $charset;
         $course_id = api_get_course_int_id();
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
-			$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-			$counter = 0;
-			global $color2;
+        if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+            $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+            $counter = 0;
+            global $color2;
 
-			echo '<div class="actions">';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add">';
+            echo '<div class="actions">';
+            echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add">';
             echo Display::return_icon('blog_newtasks.gif', get_lang('AddTasks'));
             echo get_lang('AddTasks') . '</a> ';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign">';
+            echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign">';
             echo Display::return_icon('blog_task.gif', get_lang('AssignTasks'));
             echo get_lang('AssignTasks') . '</a>';
-			?>
+            ?>
 				<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>">
                     <?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'),'',ICON_SIZE_SMALL). get_lang('RightsManager') ?></a>
 			<?php
-			echo '</div>';
+            echo '</div>';
 
-			echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
-			echo "<table class=\"data_table\">";
-			echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-					 "<th width='240'><b>",get_lang('Title'),"</b></th>",
-					 "<th><b>",get_lang('Description'),"</b></th>",
-					 "<th><b>",get_lang('Color'),"</b></th>",
-					 "<th width='50'><b>",get_lang('Modify'),"</b></th>",
-				"</tr>";
+            echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
+            echo "<table class=\"data_table\">";
+            echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
+                        "<th width='240'><b>",get_lang('Title'),"</b></th>",
+                        "<th><b>",get_lang('Description'),"</b></th>",
+                        "<th><b>",get_lang('Color'),"</b></th>",
+                        "<th width='50'><b>",get_lang('Modify'),"</b></th>",
+                "</tr>";
 
 
-			$sql = " SELECT
+            $sql = " SELECT
                         blog_id,
                         task_id,
                         blog_id,
@@ -1401,64 +1400,64 @@ 
                     FROM " . $tbl_blogs_tasks . "
                     WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
                     ORDER BY system_task, title";
-			$result = Database::query($sql);
+            $result = Database::query($sql);
 
-			while ($task = Database::fetch_array($result)) {
-				$counter++;
-				$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
-				$delete_icon = ($task['system_task'] == '1') ? "delete_na.png" : "delete.png";
-				$delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-				$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
-				$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+            while ($task = Database::fetch_array($result)) {
+                $counter++;
+                $css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
+                $delete_icon = ($task['system_task'] == '1') ? "delete_na.png" : "delete.png";
+                $delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
+                $delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
+                $delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
 
-				echo '<tr class="' . $css_class . '" valign="top">';
+                echo '<tr class="' . $css_class . '" valign="top">';
                 echo '<td width="240">'.Security::remove_XSS($task['title']).'</td>';
                 echo '<td>'.Security::remove_XSS($task['description']).'</td>';
                 echo '<td><span style="background-color: #'.$task['color'].'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>';
                 echo '<td width="50">';
                 echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=edit&task_id='.$task['task_id'].'">';
                 echo Display::return_icon('edit.png', get_lang('EditTask'));
-                      echo "</a>";
-                      echo '<a href="'.$delete_link.'"';
-                      echo $delete_confirm;
-                       echo '>';
+                        echo "</a>";
+                        echo '<a href="'.$delete_link.'"';
+                        echo $delete_confirm;
+                        echo '>';
                         echo Display::return_icon($delete_icon, $delete_title);
-                       echo "</a>";
-                     echo '</td>';
-                   echo '</tr>';
-			}
-			echo "</table>";
-		}
-	}
-
-	/**
-	 * Displays a list of tasks assigned to a user in this blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_assigned_task_list ($blog_id)
+                        echo "</a>";
+                        echo '</td>';
+                    echo '</tr>';
+            }
+            echo "</table>";
+        }
+    }
+
+    /**
+     * Displays a list of tasks assigned to a user in this blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_assigned_task_list ($blog_id)
     {
-		// Init
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-		$counter = 0;
-		global $charset,$color2;
-
-		echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
-		echo "<table class=\"data_table\">";
-		echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-				 "<th width='240'><b>",get_lang('Member'),"</b></th>",
-				 "<th><b>",get_lang('Task'),"</b></th>",
-				 "<th><b>",get_lang('Description'),"</b></th>",
-				 "<th><b>",get_lang('TargetDate'),"</b></th>",
-				 "<th width='50'><b>",get_lang('Modify'),"</b></th>",
-			"</tr>";
-
-		$course_id = api_get_course_int_id();
-
-		$sql = "SELECT task_rel_user.*, task.title, user.firstname, user.lastname, user.username, task.description, task.system_task, task.blog_id, task.task_id
+        // Init
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $counter = 0;
+        global $charset,$color2;
+
+        echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
+        echo "<table class=\"data_table\">";
+        echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
+                    "<th width='240'><b>",get_lang('Member'),"</b></th>",
+                    "<th><b>",get_lang('Task'),"</b></th>",
+                    "<th><b>",get_lang('Description'),"</b></th>",
+                    "<th><b>",get_lang('TargetDate'),"</b></th>",
+                    "<th width='50'><b>",get_lang('Modify'),"</b></th>",
+            "</tr>";
+
+        $course_id = api_get_course_int_id();
+
+        $sql = "SELECT task_rel_user.*, task.title, user.firstname, user.lastname, user.username, task.description, task.system_task, task.blog_id, task.task_id
 				FROM $tbl_blogs_tasks_rel_user task_rel_user
 				INNER JOIN $tbl_blogs_tasks task ON task_rel_user.task_id = task.task_id
 				INNER JOIN $tbl_users user ON task_rel_user.user_id = user.user_id
@@ -1467,15 +1466,15 @@ 
 					task.c_id = $course_id AND
 					task_rel_user.blog_id = '".(int)$blog_id."'
 				ORDER BY target_date ASC";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		while ($assignment = Database::fetch_array($result)) {
-			$counter++;
-			$css_class = (($counter % 2)==0) ? "row_odd" : "row_even";
-			$delete_icon = ($assignment['system_task'] == '1') ? "delete_na.png" : "delete.png";
-			$delete_title = ($assignment['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-			$delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete&task_id=' . $assignment['task_id'];
-			$delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+        while ($assignment = Database::fetch_array($result)) {
+            $counter++;
+            $css_class = (($counter % 2)==0) ? "row_odd" : "row_even";
+            $delete_icon = ($assignment['system_task'] == '1') ? "delete_na.png" : "delete.png";
+            $delete_title = ($assignment['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
+            $delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete&task_id=' . $assignment['task_id'];
+            $delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
 
             $username = api_htmlentities(sprintf(get_lang('LoginX'), $assignment['username']), ENT_QUOTES);
 
@@ -1490,26 +1489,26 @@ 
             echo '<td>'.$assignment['target_date'].'</td>';
             echo '<td width="50">';
             echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=edit_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'">';
-	            echo Display::return_icon('edit.png', get_lang('EditTask'));
-				echo "</a>";
-				echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=delete_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'" ';
-				echo 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"';
+                echo Display::return_icon('edit.png', get_lang('EditTask'));
+                echo "</a>";
+                echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=delete_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'" ';
+                echo 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"';
                 echo Display::return_icon($delete_icon, $delete_title);
-				echo "</a>";
-				echo '</td>';
-				echo '</tr>';
-		}
-		echo "</table>";
-	}
-
-	/**
-	 * Displays new task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_new_task_form ($blog_id)
-	{
-		// Init
+                echo "</a>";
+                echo '</td>';
+                echo '</tr>';
+        }
+        echo "</table>";
+    }
+
+    /**
+     * Displays new task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_new_task_form ($blog_id)
+    {
+        // Init
         $colors = array(
             'FFFFFF',
             'FFFF99',
@@ -1528,14 +1527,14 @@ 
             '000000'
         );
 
-		// form
-		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">';
+        // form
+        echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">';
 
-		// form title
-		echo '<legend>'.get_lang('AddTask').'</legend>';
+        // form title
+        echo '<legend>'.get_lang('AddTask').'</legend>';
 
-		// task title
-		echo '	<div class="control-group">
+        // task title
+        echo '	<div class="control-group">
 					<label class="control-label">
 						<span class="form_required">*</span>' . get_lang('Title') . '
 					</label>
@@ -1544,8 +1543,8 @@ 
 					</div>
 				</div>';
 
-		// task comment
-		echo '	<div class="control-group">
+        // task comment
+        echo '	<div class="control-group">
 					<label class="control-label">
 						' . get_lang('Description') . '
 					</label>
@@ -1554,8 +1553,8 @@ 
 					</div>
 				</div>';
 
-		// task management
-		echo '	<div class="control-group">
+        // task management
+        echo '	<div class="control-group">
 					<label class="control-label">
 						' . get_lang('TaskManager') . '
 					</label>
@@ -1576,12 +1575,12 @@ 
                         echo '<td style="border:1px dotted #808080; text-align:center;"><input id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
                     echo '</tr>';
                 echo '</table>';
-		echo '		</div>
+        echo '		</div>
 				</div>';
 
 
-		// task color
-		echo '	<div class="control-group">
+        // task color
+        echo '	<div class="control-group">
 					<label class="control-label">
 						' . get_lang('Color') . '
 					</label>
@@ -1592,40 +1591,40 @@ 
                     echo '<option value="' . $color . '" ' . $style . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                 }
         echo '</select>';
-		echo '		</div>
+        echo '		</div>
 				</div>';
 
-		// submit
-		echo '	<div class="control-group">
+        // submit
+        echo '	<div class="control-group">
 					<div class="controls">
 							<input type="hidden" name="action" value="" />
 							<input type="hidden" name="new_task_submit" value="true" />
 						<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button>
 					</div>
 				</div>';
-		echo '</form>';
+        echo '</form>';
 
-		echo '<div style="clear:both; margin-bottom: 10px;"></div>';
-	}
+        echo '<div style="clear:both; margin-bottom: 10px;"></div>';
+    }
 
 
-	/**
-	 * Displays edit task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_edit_task_form ($blog_id, $task_id) {
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+    /**
+     * Displays edit task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_edit_task_form ($blog_id, $task_id) {
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
         $course_id = api_get_course_int_id();
 
-		$colors = array('FFFFFF','FFFF99','FFCC99','FF9933','FF6699','CCFF99','CC9966','66FF00', '9966FF', 'CF3F3F', '990033','669933','0033FF','003366','000000');
+        $colors = array('FFFFFF','FFFF99','FFCC99','FF9933','FF6699','CCFF99','CC9966','66FF00', '9966FF', 'CF3F3F', '990033','669933','0033FF','003366','000000');
 
-		$sql = "SELECT blog_id, task_id, title, description, color FROM $tbl_blogs_tasks WHERE c_id = $course_id AND task_id = '".(int)$task_id."'";
-		$result = Database::query($sql);
-		$task = Database::fetch_array($result);
+        $sql = "SELECT blog_id, task_id, title, description, color FROM $tbl_blogs_tasks WHERE c_id = $course_id AND task_id = '".(int)$task_id."'";
+        $result = Database::query($sql);
+        $task = Database::fetch_array($result);
 
-		// Display
-		echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">
+        // Display
+        echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">
 					<legend>' . get_lang('EditTask') . '</legend>
 					<table width="100%" border="0" cellspacing="2">
 						<tr>
@@ -1637,42 +1636,42 @@ 
 					   <td><textarea name="task_description" cols="45">'.Security::remove_XSS($task['description']).'</textarea></td>
 						</tr>';
 
-						/* edit by Kevin Van Den Haute (kevin@develop-it.be) */
-						$tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
+                        /* edit by Kevin Van Den Haute (kevin@develop-it.be) */
+                        $tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 
-						$sql = " SELECT id, action FROM " . $tbl_tasks_permissions . "
+                        $sql = " SELECT id, action FROM " . $tbl_tasks_permissions . "
 							     WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
-						$result = Database::query($sql);
-
-						$arrPermissions = array();
-
-						while ($row = Database::fetch_array($result))
-							$arrPermissions[] = $row['action'];
-
-						    echo '<tr>';
-							echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
-							echo '<td>';
-								echo '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
-									echo '<tr>';
-										echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
-										echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
-									echo '</tr>';
-									echo '<tr>';
-										echo '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>';
-										echo '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>';
-										echo '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>';
-									echo '</tr>';
-									echo '<tr>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
-									echo '</tr>';
-								echo '</table>';
-							echo '</td>';
-						echo '</tr>';
-						/* end of edit */
-
-						echo '<tr>
+                        $result = Database::query($sql);
+
+                        $arrPermissions = array();
+
+                        while ($row = Database::fetch_array($result))
+                            $arrPermissions[] = $row['action'];
+
+                            echo '<tr>';
+                            echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
+                            echo '<td>';
+                                echo '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
+                                    echo '<tr>';
+                                        echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
+                                        echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
+                                    echo '</tr>';
+                                    echo '<tr>';
+                                        echo '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>';
+                                        echo '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>';
+                                        echo '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>';
+                                    echo '</tr>';
+                                    echo '<tr>';
+                                        echo '<td style="text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
+                                        echo '<td style="text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
+                                        echo '<td style="text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
+                                    echo '</tr>';
+                                echo '</table>';
+                            echo '</td>';
+                        echo '</tr>';
+                        /* end of edit */
+
+                        echo '<tr>
 					   <td align="right">' . get_lang('Color') . ':&nbsp;&nbsp;</td>
 					   <td>
 					   	<select name="task_color" id="color" style="width: 150px; background-color: #' . $task['color'] . '" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
@@ -1681,7 +1680,7 @@ 
                                 $style = 'style="background-color: #' . $color . '"';
                                 echo '<option value="' . $color . '" ' . $style . ' ' . $selected . ' >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                             }
-		echo '			   </select>
+        echo '			   </select>
 						  </td>
 						</tr>
 						<tr>
@@ -1694,34 +1693,34 @@ 
 						</tr>
 					</table>
 				</form>';
-	}
-
-	/**
-	 * @param $blog_id
-	 * @return FormValidator
-	 */
-	public static function getTaskForm($blog_id)
-	{
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$course_id = api_get_course_int_id();
-
-		// Get users in this blog / make select list of it
-		$sql = "SELECT user.user_id, user.firstname, user.lastname, user.username
+    }
+
+    /**
+     * @param $blog_id
+     * @return FormValidator
+     */
+    public static function getTaskForm($blog_id)
+    {
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $course_id = api_get_course_int_id();
+
+        // Get users in this blog / make select list of it
+        $sql = "SELECT user.user_id, user.firstname, user.lastname, user.username
 				FROM $tbl_users user
 				INNER JOIN $tbl_blogs_rel_user blogs_rel_user
 				ON user.user_id = blogs_rel_user.user_id
 				WHERE blogs_rel_user.c_id = $course_id AND blogs_rel_user.blog_id = '".(int)$blog_id."'";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		$options = array();
-		while ($user = Database::fetch_array($result)) {
-			$options[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
-		}
+        $options = array();
+        while ($user = Database::fetch_array($result)) {
+            $options[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
+        }
 
-		// Get tasks in this blog / make select list of it
-		$sql = "
+        // Get tasks in this blog / make select list of it
+        $sql = "
 			SELECT
 				blog_id,
 				task_id,
@@ -1733,97 +1732,97 @@ 
 			FROM $tbl_blogs_tasks
 			WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
 			ORDER BY system_task, title";
-		$result = Database::query($sql);
-
-		$taskOptions = array();
-		while ($task = Database::fetch_array($result)) {
-			$taskOptions[$task['task_id']] = stripslashes($task['title']);
-		}
-
-		$form = new FormValidator(
-			'assign_task',
-			'post',
-			api_get_path(
-				WEB_CODE_PATH
-			).'blog/blog.php?action=manage_tasks&blog_id='.$blog_id
-		);
-
-		$form->addHeader(get_lang('AssignTask'));
-		$form->addSelect('task_user_id', get_lang('SelectUser'), $options);
-		$form->addSelect('task_task_id', get_lang('SelectTask'), $taskOptions);
-		$form->addDatePicker('task_day', get_lang('SelectTargetDate'));
-
-		$form->addHidden('action', '');
-		$form->addButtonSave(get_lang('Ok'));
-
-		return $form;
-	}
-
-	/**
-	 * Displays assign task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_assign_task_form($blog_id)
-	{
-		$form = self::getTaskForm($blog_id);
-		$form->addHidden('assign_task_submit', 'true');
-		$form->display();
-		echo '<div style="clear: both; margin-bottom:10px;"></div>';
-	}
-
-	/**
-	 * Displays assign task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_edit_assigned_task_form($blog_id, $task_id, $user_id)
-	{
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-
-		$course_id = api_get_course_int_id();
-
-		// Get assignd date;
-		$sql = "
+        $result = Database::query($sql);
+
+        $taskOptions = array();
+        while ($task = Database::fetch_array($result)) {
+            $taskOptions[$task['task_id']] = stripslashes($task['title']);
+        }
+
+        $form = new FormValidator(
+            'assign_task',
+            'post',
+            api_get_path(
+                WEB_CODE_PATH
+            ).'blog/blog.php?action=manage_tasks&blog_id='.$blog_id
+        );
+
+        $form->addHeader(get_lang('AssignTask'));
+        $form->addSelect('task_user_id', get_lang('SelectUser'), $options);
+        $form->addSelect('task_task_id', get_lang('SelectTask'), $taskOptions);
+        $form->addDatePicker('task_day', get_lang('SelectTargetDate'));
+
+        $form->addHidden('action', '');
+        $form->addButtonSave(get_lang('Ok'));
+
+        return $form;
+    }
+
+    /**
+     * Displays assign task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_assign_task_form($blog_id)
+    {
+        $form = self::getTaskForm($blog_id);
+        $form->addHidden('assign_task_submit', 'true');
+        $form->display();
+        echo '<div style="clear: both; margin-bottom:10px;"></div>';
+    }
+
+    /**
+     * Displays assign task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_edit_assigned_task_form($blog_id, $task_id, $user_id)
+    {
+        $tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+
+        $course_id = api_get_course_int_id();
+
+        // Get assignd date;
+        $sql = "
 			SELECT target_date
 			FROM $tbl_blogs_tasks_rel_user
 			WHERE c_id = $course_id AND
 			      blog_id = '".(int)$blog_id."' AND
 			      user_id = '".(int)$user_id."' AND
 			      task_id = '".(int)$task_id."'";
-		$result = Database::query($sql);
-		$row = Database::fetch_assoc($result);
-
-		$date = $row['target_date'];
-
-		$defaults = [
-			'task_user_id' => $user_id,
-			'task_task_id' => $task_id,
-			'task_day' => $date
-		];
-		$form = self::getTaskForm($blog_id);
-		$form->addHidden('old_task_id', $task_id);
-		$form->addHidden('old_user_id', $user_id);
-		$form->addHidden('old_target_date', $date);
-		$form->addHidden('assign_task_edit_submit', 'true');
-		$form->setDefaults($defaults);
-		$form->display();
-	}
-
-	/**
-	 * Assigns a task to a user in a blog
-	 *
-	 * @param Integer $blog_id
-	 * @param Integer $user_id
-	 * @param Integer $task_id
-	 * @param Date $target_date
-	 */
-	public static function assign_task($blog_id, $user_id, $task_id, $target_date)
-	{
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-		$course_id = api_get_course_int_id();
-
-		$sql = "
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
+
+        $date = $row['target_date'];
+
+        $defaults = [
+            'task_user_id' => $user_id,
+            'task_task_id' => $task_id,
+            'task_day' => $date
+        ];
+        $form = self::getTaskForm($blog_id);
+        $form->addHidden('old_task_id', $task_id);
+        $form->addHidden('old_user_id', $user_id);
+        $form->addHidden('old_target_date', $date);
+        $form->addHidden('assign_task_edit_submit', 'true');
+        $form->setDefaults($defaults);
+        $form->display();
+    }
+
+    /**
+     * Assigns a task to a user in a blog
+     *
+     * @param Integer $blog_id
+     * @param Integer $user_id
+     * @param Integer $task_id
+     * @param Date $target_date
+     */
+    public static function assign_task($blog_id, $user_id, $task_id, $target_date)
+    {
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $course_id = api_get_course_int_id();
+
+        $sql = "
 			SELECT COUNT(*) as 'number'
 			FROM " . $tbl_blogs_tasks_rel_user . "
 			WHERE c_id = $course_id AND
@@ -1832,11 +1831,11 @@ 
 			AND	task_id = " . (int)$task_id . "
 		";
 
-		$result = Database::query($sql);
-		$row = Database::fetch_assoc($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
 
-		if ($row['number'] == 0) {
-			$sql = "
+        if ($row['number'] == 0) {
+            $sql = "
 				INSERT INTO " . $tbl_blogs_tasks_rel_user . " (
 					c_id,
 					blog_id,
@@ -1851,9 +1850,9 @@ 
 					'" . Database::escape_string($target_date) . "'
 				)";
 
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 
     /**
      * @param $blog_id
@@ -1873,11 +1872,11 @@ 
         $old_task_id,
         $old_target_date
     ) {
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		$sql = "SELECT COUNT(*) as 'number'
+        $sql = "SELECT COUNT(*) as 'number'
                 FROM " . $tbl_blogs_tasks_rel_user . "
                 WHERE
                     c_id = $course_id AND
@@ -1886,11 +1885,11 @@ 
                     task_id = " . (int)$task_id . "
             ";
 
-		$result = Database::query($sql);
-		$row = Database::fetch_assoc($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
 
-		if ($row['number'] == 0 || ($row['number'] != 0 && $task_id == $old_task_id && $user_id == $old_user_id)) {
-			$sql = "
+        if ($row['number'] == 0 || ($row['number'] != 0 && $task_id == $old_task_id && $user_id == $old_user_id)) {
+            $sql = "
 				UPDATE " . $tbl_blogs_tasks_rel_user . "
 				SET
 					user_id = " . (int)$user_id . ",
@@ -1903,76 +1902,76 @@ 
 					task_id = " . (int)$old_task_id . " AND
 					target_date = '" . Database::escape_string($old_target_date) . "'
 			";
-			Database::query($sql);
-		}
-	}
-
-	/**
-	 * Displays a list with posts a user can select to execute his task.
-	 *
-	 * @param Integer $blog_id
-	 * @param unknown_type $task_id
-	 */
-	public static function display_select_task_post($blog_id, $task_id)
+            Database::query($sql);
+        }
+    }
+
+    /**
+     * Displays a list with posts a user can select to execute his task.
+     *
+     * @param Integer $blog_id
+     * @param unknown_type $task_id
+     */
+    public static function display_select_task_post($blog_id, $task_id)
     {
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$course_id = api_get_course_int_id();
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $course_id = api_get_course_int_id();
 
 
-		$sql = "SELECT title, description FROM $tbl_blogs_tasks
+        $sql = "SELECT title, description FROM $tbl_blogs_tasks
 				WHERE task_id = '".(int)$task_id."'
 				AND c_id = $course_id";
-		$result = Database::query($sql);
-		$row = Database::fetch_assoc($result);
-		// Get posts and authors
-		$sql = "SELECT post.*, user.lastname, user.firstname, user.username
+        $result = Database::query($sql);
+        $row = Database::fetch_assoc($result);
+        // Get posts and authors
+        $sql = "SELECT post.*, user.lastname, user.firstname, user.username
 				FROM $tbl_blogs_posts post
 				INNER JOIN $tbl_users user ON post.author_id = user.user_id
 				WHERE post.blog_id = '".(int)$blog_id."' AND post.c_id = $course_id
 				ORDER BY post_id DESC
 				LIMIT 0, 100";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		// Display
-		echo '<span class="blogpost_title">' . get_lang('SelectTaskArticle') . ' "' . stripslashes($row['title']) . '"</span>';
-		echo '<span style="font-style: italic;"">'.stripslashes($row['description']) . '</span><br><br>';
+        // Display
+        echo '<span class="blogpost_title">' . get_lang('SelectTaskArticle') . ' "' . stripslashes($row['title']) . '"</span>';
+        echo '<span style="font-style: italic;"">'.stripslashes($row['description']) . '</span><br><br>';
 
-		if (Database::num_rows($result) > 0) {
-			while($blog_post = Database::fetch_array($result)) {
-			    $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<a href="blog.php?action=execute_task&blog_id=' . $blog_id . '&task_id=' . $task_id . '&post_id=' . $blog_post['post_id'] . '#add_comment">'.stripslashes($blog_post['title']) . '</a>, ' . get_lang('WrittenBy') . ' ' . stripslashes(Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username))) . '<br />';
-			}
+        if (Database::num_rows($result) > 0) {
+            while($blog_post = Database::fetch_array($result)) {
+                $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
+                echo '<a href="blog.php?action=execute_task&blog_id=' . $blog_id . '&task_id=' . $task_id . '&post_id=' . $blog_post['post_id'] . '#add_comment">'.stripslashes($blog_post['title']) . '</a>, ' . get_lang('WrittenBy') . ' ' . stripslashes(Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username))) . '<br />';
+            }
         } else {
             echo get_lang('NoArticles');
         }
-	}
-
-	/**
-	 * Subscribes a user to a given blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 * @param Integer $user_id
-	 */
-	public static function set_user_subscribed($blog_id, $user_id)
+    }
+
+    /**
+     * Subscribes a user to a given blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     * @param Integer $user_id
+     */
+    public static function set_user_subscribed($blog_id, $user_id)
     {
-		// Init
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-		$tbl_user_permissions = Database::get_course_table(TABLE_PERMISSION_USER);
+        // Init
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+        $tbl_user_permissions = Database::get_course_table(TABLE_PERMISSION_USER);
 
-		$course_id = api_get_course_int_id();
+        $course_id = api_get_course_int_id();
 
-		// Subscribe the user
-		$sql = "INSERT INTO $tbl_blogs_rel_user (c_id, blog_id, user_id )
+        // Subscribe the user
+        $sql = "INSERT INTO $tbl_blogs_rel_user (c_id, blog_id, user_id )
 		        VALUES ($course_id, '".(int)$blog_id."', '".(int)$user_id."');";
-		Database::query($sql);
+        Database::query($sql);
 
-		// Give this user basic rights
-		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
+        // Give this user basic rights
+        $sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
 		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_add')";
-		Database::query($sql);
+        Database::query($sql);
 
         $id = Database::insert_id();
         if ($id) {
@@ -1980,9 +1979,9 @@ 
             Database::query($sql);
         }
 
-		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
+        $sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
 		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_comments_add')";
-		Database::query($sql);
+        Database::query($sql);
 
         $id = Database::insert_id();
         if ($id) {
@@ -1990,197 +1989,197 @@ 
             Database::query($sql);
         }
 
-	}
+    }
 
-	/**
-	 * Unsubscribe a user from a given blog
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 * @param Integer $user_id
-	 */
-	public static function set_user_unsubscribed($blog_id, $user_id)
+    /**
+     * Unsubscribe a user from a given blog
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     * @param Integer $user_id
+     */
+    public static function set_user_unsubscribed($blog_id, $user_id)
     {
-		// Init
+        // Init
         $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
         $tbl_user_permissions = Database::get_course_table(TABLE_PERMISSION_USER);
 
-		// Unsubscribe the user
-		$sql = "DELETE FROM $tbl_blogs_rel_user
+        // Unsubscribe the user
+        $sql = "DELETE FROM $tbl_blogs_rel_user
 		        WHERE blog_id = '".(int)$blog_id."' AND user_id = '".(int)$user_id."'";
-		Database::query($sql);
+        Database::query($sql);
 
-		// Remove this user's permissions.
-		$sql = "DELETE FROM $tbl_user_permissions
+        // Remove this user's permissions.
+        $sql = "DELETE FROM $tbl_user_permissions
 		        WHERE user_id = '".(int)$user_id."'";
-		Database::query($sql);
-	}
-
-	/**
-	 * Displays the form to register users in a blog (in a course)
-	 * The listed users are users subcribed in the course.
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 *
-	 * @return Html Form with sortable table with users to subcribe in a blog, in a course.
-	 */
-	public static function display_form_user_subscribe($blog_id)
-	{
-		$_course = api_get_course_info();
-		$is_western_name_order = api_is_western_name_order();
-		$session_id = api_get_session_id();
-		$course_id = $_course['real_id'];
-
-		$currentCourse = $_course['code'];
-		$tbl_users 			= Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-
-		echo '<legend>'.get_lang('SubscribeMembers').'</legend>';
-
-		$properties["width"] = "100%";
-
-		// Get blog members' id.
-		$sql = "SELECT user.user_id FROM $tbl_users user
+        Database::query($sql);
+    }
+
+    /**
+     * Displays the form to register users in a blog (in a course)
+     * The listed users are users subcribed in the course.
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     *
+     * @return Html Form with sortable table with users to subcribe in a blog, in a course.
+     */
+    public static function display_form_user_subscribe($blog_id)
+    {
+        $_course = api_get_course_info();
+        $is_western_name_order = api_is_western_name_order();
+        $session_id = api_get_session_id();
+        $course_id = $_course['real_id'];
+
+        $currentCourse = $_course['code'];
+        $tbl_users 			= Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+
+        echo '<legend>'.get_lang('SubscribeMembers').'</legend>';
+
+        $properties["width"] = "100%";
+
+        // Get blog members' id.
+        $sql = "SELECT user.user_id FROM $tbl_users user
 				INNER JOIN $tbl_blogs_rel_user blogs_rel_user
 				ON user.user_id = blogs_rel_user.user_id
 				WHERE blogs_rel_user.c_id = $course_id AND blogs_rel_user.blog_id = '".intval($blog_id)."'";
-		$result = Database::query($sql);
-
-		$blog_member_ids = array();
-		while($user = Database::fetch_array($result)) {
-			$blog_member_ids[] = $user['user_id'];
-		}
-
-		// Set table headers
-		$column_header[] = array ('', false, '');
-		if ($is_western_name_order) {
-			$column_header[] = array(get_lang('FirstName'), true, '');
-			$column_header[] = array(get_lang('LastName'), true, '');
-		} else {
-			$column_header[] = array(get_lang('LastName'), true, '');
-			$column_header[] = array(get_lang('FirstName'), true, '');
-		}
-		$column_header[] = array(get_lang('Email'), false, '');
-		$column_header[] = array(get_lang('Register'), false, '');
+        $result = Database::query($sql);
+
+        $blog_member_ids = array();
+        while($user = Database::fetch_array($result)) {
+            $blog_member_ids[] = $user['user_id'];
+        }
+
+        // Set table headers
+        $column_header[] = array ('', false, '');
+        if ($is_western_name_order) {
+            $column_header[] = array(get_lang('FirstName'), true, '');
+            $column_header[] = array(get_lang('LastName'), true, '');
+        } else {
+            $column_header[] = array(get_lang('LastName'), true, '');
+            $column_header[] = array(get_lang('FirstName'), true, '');
+        }
+        $column_header[] = array(get_lang('Email'), false, '');
+        $column_header[] = array(get_lang('Register'), false, '');
 
         $student_list = CourseManager:: get_student_list_from_course_code(
             $currentCourse,
             false,
             $session_id
         );
-		$user_data = array();
-
-		// Add users that are not in this blog to the list.
-		foreach ($student_list as $key=>$user) {
-			if(isset($user['id_user'])) {
-				$user['user_id'] = $user['id_user'];
-			}
-			if(!in_array($user['user_id'],$blog_member_ids)) {
-				$a_infosUser = api_get_user_info($user['user_id']);
-				$row = array ();
-				$row[] = '<input type="checkbox" name="user[]" value="' . $a_infosUser['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "subscribe") ? ' checked="checked" ' : '') . '/>';
-				$username = api_htmlentities(sprintf(get_lang('LoginX'), $a_infosUser["username"]), ENT_QUOTES);
-				if ($is_western_name_order) {
-					$row[] = $a_infosUser["firstname"];
-					$row[] = Display::tag('span', $a_infosUser["lastname"], array('title'=>$username));
-				} else {
-					$row[] = Display::tag('span', $a_infosUser["lastname"], array('title'=>$username));
-					$row[] = $a_infosUser["firstname"];
-				}
-				$row[] = Display::icon_mailto_link($a_infosUser["email"]);
-
-				//Link to register users
-				if ($a_infosUser["user_id"] != $_SESSION['_user']['user_id']){
-					$row[] = "<a class=\"btn btn-primary \" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&register=yes&user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
-				} else {
-					$row[] = '';
-				}
-				$user_data[] = $row;
-			}
-		}
-
-		// Display
-		$query_vars['action'] = 'manage_members';
-		$query_vars['blog_id'] = $blog_id;
-		echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
-			Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
-			$link = '';
-			$link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']) . '&' : '';
-			$link .= "blog_id=$blog_id&";
-
-			echo '<a href="blog.php?' . $link . 'selectall=subscribe">' . get_lang('SelectAll') . '</a> - ';
-			echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
-			echo get_lang('WithSelected') . ' : ';
-			echo '<select name="action">';
-			echo '<option value="select_subscribe">' . get_lang('Register') . '</option>';
-			echo '</select>';
-			echo '<input type="hidden" name="register" value="true" />';
-			echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
-		echo '</form>';
-	}
-
-	/**
-	 * Displays the form to register users in a blog (in a course)
-	 * The listed users are users subcribed in the course.
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 *
-	 * @return false|null Form with sortable table with users to unsubcribe from a blog.
-	 */
-	public static function display_form_user_unsubscribe ($blog_id)
-	{
-		$_user = api_get_user_info();
-		$is_western_name_order = api_is_western_name_order();
-
-		// Init
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
-
-		echo '<legend>'.get_lang('UnsubscribeMembers').'</legend>';
-
-		$properties["width"] = "100%";
-		//table column titles
-		$column_header[] = array ('', false, '');
-		if ($is_western_name_order) {
-			$column_header[] = array (get_lang('FirstName'), true, '');
-			$column_header[] = array (get_lang('LastName'), true, '');
-		} else {
-			$column_header[] = array (get_lang('LastName'), true, '');
-			$column_header[] = array (get_lang('FirstName'), true, '');
-		}
-		$column_header[] = array (get_lang('Email'), false, '');
-		$column_header[] = array (get_lang('TaskManager'), true, '');
-		$column_header[] = array (get_lang('UnRegister'), false, '');
-
-		$course_id = api_get_course_int_id();
-
-		$sql = "SELECT user.user_id, user.lastname, user.firstname, user.email, user.username
+        $user_data = array();
+
+        // Add users that are not in this blog to the list.
+        foreach ($student_list as $key=>$user) {
+            if(isset($user['id_user'])) {
+                $user['user_id'] = $user['id_user'];
+            }
+            if(!in_array($user['user_id'],$blog_member_ids)) {
+                $a_infosUser = api_get_user_info($user['user_id']);
+                $row = array ();
+                $row[] = '<input type="checkbox" name="user[]" value="' . $a_infosUser['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "subscribe") ? ' checked="checked" ' : '') . '/>';
+                $username = api_htmlentities(sprintf(get_lang('LoginX'), $a_infosUser["username"]), ENT_QUOTES);
+                if ($is_western_name_order) {
+                    $row[] = $a_infosUser["firstname"];
+                    $row[] = Display::tag('span', $a_infosUser["lastname"], array('title'=>$username));
+                } else {
+                    $row[] = Display::tag('span', $a_infosUser["lastname"], array('title'=>$username));
+                    $row[] = $a_infosUser["firstname"];
+                }
+                $row[] = Display::icon_mailto_link($a_infosUser["email"]);
+
+                //Link to register users
+                if ($a_infosUser["user_id"] != $_SESSION['_user']['user_id']){
+                    $row[] = "<a class=\"btn btn-primary \" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&register=yes&user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
+                } else {
+                    $row[] = '';
+                }
+                $user_data[] = $row;
+            }
+        }
+
+        // Display
+        $query_vars['action'] = 'manage_members';
+        $query_vars['blog_id'] = $blog_id;
+        echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
+            Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
+            $link = '';
+            $link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']) . '&' : '';
+            $link .= "blog_id=$blog_id&";
+
+            echo '<a href="blog.php?' . $link . 'selectall=subscribe">' . get_lang('SelectAll') . '</a> - ';
+            echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
+            echo get_lang('WithSelected') . ' : ';
+            echo '<select name="action">';
+            echo '<option value="select_subscribe">' . get_lang('Register') . '</option>';
+            echo '</select>';
+            echo '<input type="hidden" name="register" value="true" />';
+            echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
+        echo '</form>';
+    }
+
+    /**
+     * Displays the form to register users in a blog (in a course)
+     * The listed users are users subcribed in the course.
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     *
+     * @return false|null Form with sortable table with users to unsubcribe from a blog.
+     */
+    public static function display_form_user_unsubscribe ($blog_id)
+    {
+        $_user = api_get_user_info();
+        $is_western_name_order = api_is_western_name_order();
+
+        // Init
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
+
+        echo '<legend>'.get_lang('UnsubscribeMembers').'</legend>';
+
+        $properties["width"] = "100%";
+        //table column titles
+        $column_header[] = array ('', false, '');
+        if ($is_western_name_order) {
+            $column_header[] = array (get_lang('FirstName'), true, '');
+            $column_header[] = array (get_lang('LastName'), true, '');
+        } else {
+            $column_header[] = array (get_lang('LastName'), true, '');
+            $column_header[] = array (get_lang('FirstName'), true, '');
+        }
+        $column_header[] = array (get_lang('Email'), false, '');
+        $column_header[] = array (get_lang('TaskManager'), true, '');
+        $column_header[] = array (get_lang('UnRegister'), false, '');
+
+        $course_id = api_get_course_int_id();
+
+        $sql = "SELECT user.user_id, user.lastname, user.firstname, user.email, user.username
                 FROM $tbl_users user INNER JOIN $tbl_blogs_rel_user blogs_rel_user
                 ON user.user_id = blogs_rel_user.user_id
                 WHERE blogs_rel_user.c_id = $course_id AND  blogs_rel_user.blog_id = '".(int)$blog_id."'";
 
-		if (!($sql_result = Database::query($sql))) {
-			return false;
-		}
-
-		$user_data = array ();
-
-		while ($myrow = Database::fetch_array($sql_result)) {
-			$row = array ();
-			$row[] = '<input type="checkbox" name="user[]" value="' . $myrow['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "unsubscribe") ? ' checked="checked" ' : '') . '/>';
-			$username = api_htmlentities(sprintf(get_lang('LoginX'), $myrow["username"]), ENT_QUOTES);
-			if ($is_western_name_order) {
-				$row[] = $myrow["firstname"];
-				$row[] = Display::tag('span', $myrow["lastname"], array('title'=>$username));
-			} else {
-				$row[] = Display::tag('span', $myrow["lastname"], array('title'=>$username));
-				$row[] = $myrow["firstname"];
-			}
-			$row[] = Display::icon_mailto_link($myrow["email"]);
-
-			$sql = "SELECT bt.title task
+        if (!($sql_result = Database::query($sql))) {
+            return false;
+        }
+
+        $user_data = array ();
+
+        while ($myrow = Database::fetch_array($sql_result)) {
+            $row = array ();
+            $row[] = '<input type="checkbox" name="user[]" value="' . $myrow['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "unsubscribe") ? ' checked="checked" ' : '') . '/>';
+            $username = api_htmlentities(sprintf(get_lang('LoginX'), $myrow["username"]), ENT_QUOTES);
+            if ($is_western_name_order) {
+                $row[] = $myrow["firstname"];
+                $row[] = Display::tag('span', $myrow["lastname"], array('title'=>$username));
+            } else {
+                $row[] = Display::tag('span', $myrow["lastname"], array('title'=>$username));
+                $row[] = $myrow["firstname"];
+            }
+            $row[] = Display::icon_mailto_link($myrow["email"]);
+
+            $sql = "SELECT bt.title task
 					FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER) . " btu
 					INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS) . " bt
 					ON btu.task_id = bt.task_id
@@ -2188,157 +2187,157 @@ 
 							bt.c_id 	= $course_id  AND
 							btu.blog_id = $blog_id AND
 							btu.user_id = " . $myrow['user_id'];
-			$sql_res = Database::query($sql);
-
-			$task = '';
-
-			while($r = Database::fetch_array($sql_res)) {
-				$task .= stripslashes($r['task']) . ', ';
-			}
-			//echo $task;
-			$task = (api_strlen(trim($task)) != 0) ? api_substr($task, 0, api_strlen($task) - 2) : get_lang('Reader');
-			$row[] = $task;
-			//Link to register users
-
-			if ($myrow["user_id"] != $_user['user_id']) {
-				$row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&unregister=yes&user_id=" . $myrow['user_id']."\">" . get_lang('UnRegister')."</a>";
-			} else {
-				$row[] = '';
-			}
-
-			$user_data[] = $row;
-		}
-
-		$query_vars['action'] = 'manage_members';
-		$query_vars['blog_id'] = $blog_id;
-		echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
-		Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
-		$link = '';
-		$link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']). '&' : '';
-		$link .= "blog_id=$blog_id&";
-
-		echo '<a href="blog.php?' . $link . 'selectall=unsubscribe">' . get_lang('SelectAll') . '</a> - ';
-		echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
-		echo get_lang('WithSelected') . ' : ';
-		echo '<select name="action">';
-		echo '<option value="select_unsubscribe">' . get_lang('UnRegister') . '</option>';
-		echo '</select>';
-		echo '<input type="hidden" name="unregister" value="true" />';
-		echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
-		echo '</form>';
-	}
-
-	/**
-	 * Displays a matrix with selectboxes. On the left: users, on top: possible rights.
-	 * The blog admin can thus select what a certain user can do in the current blog
-	 *
-	 * @param Integer $blog_id
-	 */
-	public static function display_form_user_rights ($blog_id)
+            $sql_res = Database::query($sql);
+
+            $task = '';
+
+            while($r = Database::fetch_array($sql_res)) {
+                $task .= stripslashes($r['task']) . ', ';
+            }
+            //echo $task;
+            $task = (api_strlen(trim($task)) != 0) ? api_substr($task, 0, api_strlen($task) - 2) : get_lang('Reader');
+            $row[] = $task;
+            //Link to register users
+
+            if ($myrow["user_id"] != $_user['user_id']) {
+                $row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&unregister=yes&user_id=" . $myrow['user_id']."\">" . get_lang('UnRegister')."</a>";
+            } else {
+                $row[] = '';
+            }
+
+            $user_data[] = $row;
+        }
+
+        $query_vars['action'] = 'manage_members';
+        $query_vars['blog_id'] = $blog_id;
+        echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
+        Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
+        $link = '';
+        $link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']). '&' : '';
+        $link .= "blog_id=$blog_id&";
+
+        echo '<a href="blog.php?' . $link . 'selectall=unsubscribe">' . get_lang('SelectAll') . '</a> - ';
+        echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
+        echo get_lang('WithSelected') . ' : ';
+        echo '<select name="action">';
+        echo '<option value="select_unsubscribe">' . get_lang('UnRegister') . '</option>';
+        echo '</select>';
+        echo '<input type="hidden" name="unregister" value="true" />';
+        echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
+        echo '</form>';
+    }
+
+    /**
+     * Displays a matrix with selectboxes. On the left: users, on top: possible rights.
+     * The blog admin can thus select what a certain user can do in the current blog
+     *
+     * @param Integer $blog_id
+     */
+    public static function display_form_user_rights ($blog_id)
+    {
+        echo '<legend>'.get_lang('RightsManager').'</legend>';
+        echo '<br />';
+
+        // Integration of patricks permissions system.
+        require_once api_get_path(SYS_CODE_PATH).'permissions/blog_permissions.inc.php';
+    }
+
+    /**
+     * Displays the form to create a new post
+     * @author Toon Keppens
+     *
+     * @param Integer $blog_id
+     * @param integer $post_id
+     */
+    public static function display_new_comment_form($blog_id, $post_id, $title)
     {
-		echo '<legend>'.get_lang('RightsManager').'</legend>';
-		echo '<br />';
-
-		// Integration of patricks permissions system.
-		require_once api_get_path(SYS_CODE_PATH).'permissions/blog_permissions.inc.php';
-	}
-
-	/**
-	 * Displays the form to create a new post
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $blog_id
-	 * @param integer $post_id
-	 */
-	public static function display_new_comment_form($blog_id, $post_id, $title)
-	{
-		$form = new FormValidator(
-			'add_post',
-			'post',
-			api_get_path(WEB_CODE_PATH)."blog/blog.php?action=view_post&blog_id=" . intval($blog_id)  . "&post_id=".intval($post_id)."&".api_get_cidreq(),
-			null,
-			array('enctype' => 'multipart/form-data')
-		);
-
-		$header = get_lang('AddNewComment');
-		if (isset($_GET['task_id'])) {
-			$header = get_lang('ExecuteThisTask');
-		}
-		$form->addHeader($header);
-		$form->addText('title', get_lang('Title'));
-
-		$config = array();
-		if (!api_is_allowed_to_edit()) {
-			$config['ToolbarSet'] = 'ProjectComment';
-		} else {
-			$config['ToolbarSet'] = 'ProjectCommentStudent';
-		}
-		$form->addHtmlEditor('comment', get_lang('Comment'), false, false, $config);
-		$form->addFile('user_upload', get_lang('AddAnAttachment'));
-
-		$form->addTextarea('post_file_comment', get_lang('FileComment'));
-
-		$form->addHidden('action', null);
-		$form->addHidden('comment_parent_id', 0);
-
-		if (isset($_GET['task_id'])) {
-			$form->addHidden('new_task_execution_submit', 'true');
-			$form->addHidden('task_id', intval($_GET['task_id']));
-		} else {
-			$form->addHidden('new_comment_submit', 'true');
-		}
-		$form->addButton('save', get_lang('Save'));
-		$form->display();
-	}
-
-
-	/**
-	 * show the calender of the given month
-	 * @author Patrick Cool
-	 * @author Toon Keppens
-	 *
-	 * @param Integer $month: the integer value of the month we are viewing
-	 * @param Integer $year: the 4-digit year indication e.g. 2005
-	 *
-	 * @return html code
-	*/
-	public static function display_minimonthcalendar($month, $year, $blog_id)
-	{
-		// Init
-		$_user = api_get_user_info();
-		global $DaysShort;
-		global $MonthsLong;
-
-		$posts = array();
-		$tasks = array();
-
-		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
-		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
-		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-
-		$course_id = api_get_course_int_id();
-
-		//Handle leap year
-		$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-
-		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
-			$numberofdays[2] = 29;
-
-		//Get the first day of the month
-		$dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
-		$monthName = $MonthsLong[$month-1];
-
-		//Start the week on monday
-		$startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
-		$blogId = isset($_GET['blog_id']) ? intval($_GET['blog_id']) : null;
-		$filter = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
-		$backwardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year);
-		$forewardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year);
-
-		// Get posts for this month
-		$sql = "SELECT post.*, DAYOFMONTH(date_creation) as post_day, user.lastname, user.firstname
+        $form = new FormValidator(
+            'add_post',
+            'post',
+            api_get_path(WEB_CODE_PATH)."blog/blog.php?action=view_post&blog_id=" . intval($blog_id)  . "&post_id=".intval($post_id)."&".api_get_cidreq(),
+            null,
+            array('enctype' => 'multipart/form-data')
+        );
+
+        $header = get_lang('AddNewComment');
+        if (isset($_GET['task_id'])) {
+            $header = get_lang('ExecuteThisTask');
+        }
+        $form->addHeader($header);
+        $form->addText('title', get_lang('Title'));
+
+        $config = array();
+        if (!api_is_allowed_to_edit()) {
+            $config['ToolbarSet'] = 'ProjectComment';
+        } else {
+            $config['ToolbarSet'] = 'ProjectCommentStudent';
+        }
+        $form->addHtmlEditor('comment', get_lang('Comment'), false, false, $config);
+        $form->addFile('user_upload', get_lang('AddAnAttachment'));
+
+        $form->addTextarea('post_file_comment', get_lang('FileComment'));
+
+        $form->addHidden('action', null);
+        $form->addHidden('comment_parent_id', 0);
+
+        if (isset($_GET['task_id'])) {
+            $form->addHidden('new_task_execution_submit', 'true');
+            $form->addHidden('task_id', intval($_GET['task_id']));
+        } else {
+            $form->addHidden('new_comment_submit', 'true');
+        }
+        $form->addButton('save', get_lang('Save'));
+        $form->display();
+    }
+
+
+    /**
+     * show the calender of the given month
+     * @author Patrick Cool
+     * @author Toon Keppens
+     *
+     * @param Integer $month: the integer value of the month we are viewing
+     * @param Integer $year: the 4-digit year indication e.g. 2005
+     *
+     * @return html code
+     */
+    public static function display_minimonthcalendar($month, $year, $blog_id)
+    {
+        // Init
+        $_user = api_get_user_info();
+        global $DaysShort;
+        global $MonthsLong;
+
+        $posts = array();
+        $tasks = array();
+
+        $tbl_users = Database::get_main_table(TABLE_MAIN_USER);
+        $tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+
+        $course_id = api_get_course_int_id();
+
+        //Handle leap year
+        $numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+
+        if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
+            $numberofdays[2] = 29;
+
+        //Get the first day of the month
+        $dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
+        $monthName = $MonthsLong[$month-1];
+
+        //Start the week on monday
+        $startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
+        $blogId = isset($_GET['blog_id']) ? intval($_GET['blog_id']) : null;
+        $filter = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
+        $backwardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year);
+        $forewardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year);
+
+        // Get posts for this month
+        $sql = "SELECT post.*, DAYOFMONTH(date_creation) as post_day, user.lastname, user.firstname
 				FROM $tbl_blogs_posts post
 				INNER JOIN $tbl_users user
 				ON post.author_id = user.user_id
@@ -2348,20 +2347,20 @@ 
 					MONTH(date_creation) = '".(int)$month."' AND
 					YEAR(date_creation) = '".(int)$year."'
 				ORDER BY date_creation";
-		$result = Database::query($sql);
-
-		// We will create an array of days on which there are posts.
-		if( Database::num_rows($result) > 0) {
-			while($blog_post = Database::fetch_array($result)) {
-				// If the day of this post is not yet in the array, add it.
-				if (!in_array($blog_post['post_day'], $posts))
-					$posts[] = $blog_post['post_day'];
-			}
-		}
-
-		// Get tasks for this month
-		if ($_user['user_id']) {
-			$sql = " SELECT task_rel_user.*,  DAYOFMONTH(target_date) as task_day, task.title, blog.blog_name
+        $result = Database::query($sql);
+
+        // We will create an array of days on which there are posts.
+        if( Database::num_rows($result) > 0) {
+            while($blog_post = Database::fetch_array($result)) {
+                // If the day of this post is not yet in the array, add it.
+                if (!in_array($blog_post['post_day'], $posts))
+                    $posts[] = $blog_post['post_day'];
+            }
+        }
+
+        // Get tasks for this month
+        if ($_user['user_id']) {
+            $sql = " SELECT task_rel_user.*,  DAYOFMONTH(target_date) as task_day, task.title, blog.blog_name
 				FROM $tbl_blogs_tasks_rel_user task_rel_user
 				INNER JOIN $tbl_blogs_tasks task ON task_rel_user.task_id = task.task_id
 				INNER JOIN $tbl_blogs blog ON task_rel_user.blog_id = blog.blog_id
@@ -2373,85 +2372,85 @@ 
 					MONTH(target_date) = '".(int)$month."' AND
 					YEAR(target_date) = '".(int)$year."'
 				ORDER BY target_date ASC";
-			$result = Database::query($sql);
-
-			if (Database::num_rows($result) > 0) {
-				while ($mytask = Database::fetch_array($result)) {
-					$tasks[$mytask['task_day']][$mytask['task_id']]['task_id'] = $mytask['task_id'];
-					$tasks[$mytask['task_day']][$mytask['task_id']]['title'] = $mytask['title'];
-					$tasks[$mytask['task_day']][$mytask['task_id']]['blog_id'] = $mytask['blog_id'];
-					$tasks[$mytask['task_day']][$mytask['task_id']]['blog_name'] = $mytask['blog_name'];
-					$tasks[$mytask['task_day']][$mytask['task_id']]['day'] = $mytask['task_day'];
-				}
-			}
-		}
-
-		echo 	'<table id="smallcalendar" class="table table-responsive">',
-				"<tr id=\"title\">",
-				"<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>",
-				"<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>",
-				"<th width=\"10%\" align=\"right\"><a href=\"", $forewardsURL, "\">&raquo;</a></th>", "</tr>";
-
-		echo "<tr>";
-
-		for($ii = 1; $ii < 8; $ii ++)
-			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
-
-		echo "</tr>";
-
-		$curday = -1;
-		$today = getdate();
-
-		while ($curday <= $numberofdays[$month]) {
-			echo "<tr>";
-			for ($ii = 0; $ii < 7; $ii ++) {
-				if (($curday == -1) && ($ii == $startdayofweek))
-					$curday = 1;
-
-			 	if (($curday > 0) && ($curday <= $numberofdays[$month])) {
-					$bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
-					$dayheader = "$curday";
-
-					if(($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
-						$dayheader = "$curday";
-						$class = "class=\"days_today\"";
-					}
-
-					echo "<td " . $class.">";
-
-					// If there are posts on this day, create a filter link.
-					if(in_array($curday, $posts))
-						echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
-					else
-						echo $dayheader;
-
-					if (count($tasks) > 0) {
-						if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
-							// Add tasks to calendar
-							foreach ($tasks[$curday] as $task) {
-								echo '<a href="blog.php?action=execute_task&blog_id=' . $task['blog_id'] . '&task_id='.stripslashes($task['task_id']) . '" title="' . $task['title'] . ' : ' . get_lang('InBlog') . ' : ' . $task['blog_name'] . ' - ' . get_lang('ExecuteThisTask') . '">';
-								echo Display::return_icon('blog_task.gif', get_lang('ExecuteThisTask'));
+            $result = Database::query($sql);
+
+            if (Database::num_rows($result) > 0) {
+                while ($mytask = Database::fetch_array($result)) {
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['task_id'] = $mytask['task_id'];
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['title'] = $mytask['title'];
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['blog_id'] = $mytask['blog_id'];
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['blog_name'] = $mytask['blog_name'];
+                    $tasks[$mytask['task_day']][$mytask['task_id']]['day'] = $mytask['task_day'];
+                }
+            }
+        }
+
+        echo 	'<table id="smallcalendar" class="table table-responsive">',
+                "<tr id=\"title\">",
+                "<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>",
+                "<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>",
+                "<th width=\"10%\" align=\"right\"><a href=\"", $forewardsURL, "\">&raquo;</a></th>", "</tr>";
+
+        echo "<tr>";
+
+        for($ii = 1; $ii < 8; $ii ++)
+            echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
+
+        echo "</tr>";
+
+        $curday = -1;
+        $today = getdate();
+
+        while ($curday <= $numberofdays[$month]) {
+            echo "<tr>";
+            for ($ii = 0; $ii < 7; $ii ++) {
+                if (($curday == -1) && ($ii == $startdayofweek))
+                    $curday = 1;
+
+                    if (($curday > 0) && ($curday <= $numberofdays[$month])) {
+                    $bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
+                    $dayheader = "$curday";
+
+                    if(($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
+                        $dayheader = "$curday";
+                        $class = "class=\"days_today\"";
+                    }
+
+                    echo "<td " . $class.">";
+
+                    // If there are posts on this day, create a filter link.
+                    if(in_array($curday, $posts))
+                        echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
+                    else
+                        echo $dayheader;
+
+                    if (count($tasks) > 0) {
+                        if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
+                            // Add tasks to calendar
+                            foreach ($tasks[$curday] as $task) {
+                                echo '<a href="blog.php?action=execute_task&blog_id=' . $task['blog_id'] . '&task_id='.stripslashes($task['task_id']) . '" title="' . $task['title'] . ' : ' . get_lang('InBlog') . ' : ' . $task['blog_name'] . ' - ' . get_lang('ExecuteThisTask') . '">';
+                                echo Display::return_icon('blog_task.gif', get_lang('ExecuteThisTask'));
                                 echo '</a>';
-							}
-						}
-					}
-
-					echo "</td>";
-					$curday ++;
-				} else
-					echo "<td>&nbsp;</td>";
-			}
-			echo "</tr>";
-		}
-		echo "</table>";
-	}
-
-	/**
-	 * Blog admin | Display the form to add a new blog.
-	 *
-	 */
-	public static function display_new_blog_form()
-	{
+                            }
+                        }
+                    }
+
+                    echo "</td>";
+                    $curday ++;
+                } else
+                    echo "<td>&nbsp;</td>";
+            }
+            echo "</tr>";
+        }
+        echo "</table>";
+    }
+
+    /**
+     * Blog admin | Display the form to add a new blog.
+     *
+     */
+    public static function display_new_blog_form()
+    {
         $form = new FormValidator('add_blog', 'post', 'blog_admin.php?action=add');
         $form->addElement('header', get_lang('AddBlog'));
         $form->addElement('text', 'blog_name', get_lang('Title'));
@@ -2461,34 +2460,34 @@ 
         $form->addButtonSave(get_lang('SaveProject'));
 
         $defaults = array(
-			'blog_name' => isset($_POST['blog_name']) ? Security::remove_XSS($_POST['blog_name']) : null,
-        	'blog_subtitle' => isset($_POST['blog_subtitle']) ? Security::remove_XSS($_POST['blog_subtitle']) : null
-		);
+            'blog_name' => isset($_POST['blog_name']) ? Security::remove_XSS($_POST['blog_name']) : null,
+            'blog_subtitle' => isset($_POST['blog_subtitle']) ? Security::remove_XSS($_POST['blog_subtitle']) : null
+        );
         $form->setDefaults($defaults);
         $form->display();
-	}
-
-	/**
-	 * Blog admin | Display the form to edit a blog.
-	 *
-	 */
-	public static function display_edit_blog_form($blog_id)
-	{
-	    $course_id = api_get_course_int_id();
-		$blog_id= intval($blog_id);
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-
-		$sql = "SELECT blog_id, blog_name, blog_subtitle
+    }
+
+    /**
+     * Blog admin | Display the form to edit a blog.
+     *
+     */
+    public static function display_edit_blog_form($blog_id)
+    {
+        $course_id = api_get_course_int_id();
+        $blog_id= intval($blog_id);
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+
+        $sql = "SELECT blog_id, blog_name, blog_subtitle
 		        FROM $tbl_blogs
 		        WHERE c_id = $course_id AND blog_id = '".$blog_id."'";
-		$result = Database::query($sql);
-		$blog = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $blog = Database::fetch_array($result);
 
-		// the form contained errors but we do not want to lose the changes the user already did
-		if ($_POST) {
-			$blog['blog_name'] = Security::remove_XSS($_POST['blog_name']);
-			$blog['blog_subtitle'] = Security::remove_XSS($_POST['blog_subtitle']);
-		}
+        // the form contained errors but we do not want to lose the changes the user already did
+        if ($_POST) {
+            $blog['blog_name'] = Security::remove_XSS($_POST['blog_name']);
+            $blog['blog_subtitle'] = Security::remove_XSS($_POST['blog_subtitle']);
+        }
 
         $form = new FormValidator('edit_blog', 'post','blog_admin.php?action=edit&blog_id='.intval($_GET['blog_id']));
         $form->addElement('header', get_lang('EditBlog'));
@@ -2504,76 +2503,76 @@ 
         $defaults['blog_subtitle'] = $blog['blog_subtitle'];
         $form->setDefaults($defaults);
         $form->display();
-	}
+    }
 
-	/**
-	 * Blog admin | Returns table with blogs in this course
-	 */
-	public static function display_blog_list()
+    /**
+     * Blog admin | Returns table with blogs in this course
+     */
+    public static function display_blog_list()
     {
-		global $charset;
-		$_user = api_get_user_info();
+        global $charset;
+        $_user = api_get_user_info();
         $course_id = api_get_course_int_id();
 
-		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
+        $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 
-		//condition for the session
-		$session_id = api_get_session_id();
+        //condition for the session
+        $session_id = api_get_session_id();
 
-		$sql = "SELECT blog_name, blog_subtitle, visibility, blog_id, session_id
+        $sql = "SELECT blog_name, blog_subtitle, visibility, blog_id, session_id
 				FROM $tbl_blogs WHERE c_id = $course_id
 				ORDER BY date_creation DESC";
-		$result = Database::query($sql);
-		$list_info = array();
-		if (Database::num_rows($result)) {
-			while ($row_project=Database::fetch_row($result)) {
-				$list_info[]=$row_project;
-			}
-		}
-
-		$list_content_blog = array();
-		$list_body_blog = array();
-
-		if (is_array($list_info)) {
-			foreach ($list_info as $key => $info_log) {
-				// Validation when belongs to a session
-				$session_img = api_get_session_image($info_log[4], $_user['status']);
-
-				$url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&".api_get_cidreq();
-				$title = $info_log[0];
+        $result = Database::query($sql);
+        $list_info = array();
+        if (Database::num_rows($result)) {
+            while ($row_project=Database::fetch_row($result)) {
+                $list_info[]=$row_project;
+            }
+        }
+
+        $list_content_blog = array();
+        $list_body_blog = array();
+
+        if (is_array($list_info)) {
+            foreach ($list_info as $key => $info_log) {
+                // Validation when belongs to a session
+                $session_img = api_get_session_image($info_log[4], $_user['status']);
+
+                $url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&".api_get_cidreq();
+                $title = $info_log[0];
                         $image = Display::return_icon('blog.png', $title);
-    			$list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">' . $image . '</a></div><a href="'.$url_start_blog.'">' .$title. '</a>' . $session_img;
+                $list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">' . $image . '</a></div><a href="'.$url_start_blog.'">' .$title. '</a>' . $session_img;
 
-				$list_body_blog[] = $list_name;
-				$list_body_blog[] = $info_log[1];
+                $list_body_blog[] = $list_name;
+                $list_body_blog[] = $info_log[1];
 
-				$visibility_icon=($info_log[2]==0) ? 'invisible' : 'visible';
-				$visibility_info=($info_log[2]==0) ? 'Visible' : 'Invisible';
-			 	$my_image = '<a href="' .api_get_self(). '?action=edit&blog_id=' . $info_log[3] . '">';
+                $visibility_icon=($info_log[2]==0) ? 'invisible' : 'visible';
+                $visibility_info=($info_log[2]==0) ? 'Visible' : 'Invisible';
+                    $my_image = '<a href="' .api_get_self(). '?action=edit&blog_id=' . $info_log[3] . '">';
                                 $my_image.= Display::return_icon('edit.png', get_lang('EditBlog'));
 
-				$my_image.= "</a>";
-				$my_image.= '<a href="' .api_get_self(). '?action=delete&blog_id=' . $info_log[3] . '" ';
-				$my_image.= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;" >';
+                $my_image.= "</a>";
+                $my_image.= '<a href="' .api_get_self(). '?action=delete&blog_id=' . $info_log[3] . '" ';
+                $my_image.= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;" >';
                                 $my_image.= Display::return_icon('delete.png', get_lang('DeleteBlog'));
 
-				$my_image.= "</a>";
-				$my_image.= '<a href="' .api_get_self(). '?action=visibility&blog_id=' . $info_log[3] . '">';
+                $my_image.= "</a>";
+                $my_image.= '<a href="' .api_get_self(). '?action=visibility&blog_id=' . $info_log[3] . '">';
                                 $my_image.= Display::return_icon($visibility_icon . '.gif', get_lang($visibility_info));
 
-				$my_image.= "</a>";
-				$list_body_blog[]=$my_image;
-				$list_content_blog[]=$list_body_blog;
-				$list_body_blog = array();
-			}
-
-			$table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
-			$table->set_header(0, get_lang('Title'));
-			$table->set_header(1, get_lang('SubTitle'));
-			$table->set_header(2, get_lang('Modify'));
-			$table->display();
-		}
-	}
+                $my_image.= "</a>";
+                $list_body_blog[]=$my_image;
+                $list_content_blog[]=$list_body_blog;
+                $list_body_blog = array();
+            }
+
+            $table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
+            $table->set_header(0, get_lang('Title'));
+            $table->set_header(1, get_lang('SubTitle'));
+            $table->set_header(2, get_lang('Modify'));
+            $table->display();
+        }
+    }
 }
 
 /**
@@ -2594,34 +2593,34 @@ 
  */
 function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
 {
-	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-
-	$blog_id = intval($blog_id);
-	$comment_id = intval($comment_id);
-	$post_id = intval($post_id);
-	$row=array();
-	$where='';
-	if (!empty ($post_id) && is_numeric($post_id)) {
-		$where.=' AND post_id ="'.$post_id.'" ';
-	}
-
-	if (!empty ($comment_id) && is_numeric($comment_id)) {
-		if (!empty ($post_id)) {
-			$where.= ' AND ';
-		}
-		$where.=' comment_id ="'.$comment_id.'" ';
-	}
+    $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+
+    $blog_id = intval($blog_id);
+    $comment_id = intval($comment_id);
+    $post_id = intval($post_id);
+    $row=array();
+    $where='';
+    if (!empty ($post_id) && is_numeric($post_id)) {
+        $where.=' AND post_id ="'.$post_id.'" ';
+    }
+
+    if (!empty ($comment_id) && is_numeric($comment_id)) {
+        if (!empty ($post_id)) {
+            $where.= ' AND ';
+        }
+        $where.=' comment_id ="'.$comment_id.'" ';
+    }
 
     $course_id = api_get_course_int_id();
 
-	$sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
+    $sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
 
-	$result=Database::query($sql);
-	if (Database::num_rows($result)!=0) {
-		$row=Database::fetch_array($result);
-	}
-	return $row;
+    $result=Database::query($sql);
+    if (Database::num_rows($result)!=0) {
+        $row=Database::fetch_array($result);
+    }
+    return $row;
 }
 
 /**
@@ -2638,16 +2637,16 @@ 
 
 function delete_all_blog_attachment($blog_id,$post_id=null,$comment_id=null)
 {
-	$_course = api_get_course_info();
-	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-	$blog_id = intval($blog_id);
-	$comment_id = intval($comment_id);
-	$post_id = intval($post_id);
+    $_course = api_get_course_info();
+    $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+    $blog_id = intval($blog_id);
+    $comment_id = intval($comment_id);
+    $post_id = intval($post_id);
 
     $course_id = api_get_course_int_id();
-	$where = null;
+    $where = null;
 
-	// delete files in DB
+    // delete files in DB
     if (!empty ($post_id) && is_numeric($post_id)) {
         $where .= ' AND post_id ="'.$post_id.'" ';
     }
@@ -2659,25 +2658,25 @@ 
         $where .= ' comment_id ="'.$comment_id.'" ';
     }
 
-	// delete all files in directory
-	$courseDir   = $_course['path'].'/upload/blog';
-	$sys_course_path = api_get_path(SYS_COURSE_PATH);
-	$updir = $sys_course_path.$courseDir;
+    // delete all files in directory
+    $courseDir   = $_course['path'].'/upload/blog';
+    $sys_course_path = api_get_path(SYS_COURSE_PATH);
+    $updir = $sys_course_path.$courseDir;
 
-	$sql = 'SELECT path FROM '.$blog_table_attachment.'
+    $sql = 'SELECT path FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
-	$result=Database::query($sql);
-
-	while ($row=Database::fetch_row($result)) {
-		$file=$updir.'/'.$row[0];
-		if (Security::check_abs_path($file,$updir) )
-		{
-			@ unlink($file);
-		}
-	}
-	$sql = 'DELETE FROM '. $blog_table_attachment.'
+    $result=Database::query($sql);
+
+    while ($row=Database::fetch_row($result)) {
+        $file=$updir.'/'.$row[0];
+        if (Security::check_abs_path($file,$updir) )
+        {
+            @ unlink($file);
+        }
+    }
+    $sql = 'DELETE FROM '. $blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND  blog_id ="'.intval($blog_id).'"  '.$where;
-	Database::query($sql);
+    Database::query($sql);
 }
 
 /**
@@ -2687,12 +2686,12 @@ 
  */
 function get_blog_post_from_user($course_code, $user_id)
 {
-	$tbl_blogs 		= Database::get_course_table(TABLE_BLOGS);
-	$tbl_blog_post 	= Database::get_course_table(TABLE_BLOGS_POSTS);
-	$course_info 	= api_get_course_info($course_code);
-	$course_id 		= $course_info['real_id'];
+    $tbl_blogs 		= Database::get_course_table(TABLE_BLOGS);
+    $tbl_blog_post 	= Database::get_course_table(TABLE_BLOGS_POSTS);
+    $course_info 	= api_get_course_info($course_code);
+    $course_id 		= $course_info['real_id'];
 
-	$sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
+    $sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
 			FROM $tbl_blogs blog
 			INNER JOIN  $tbl_blog_post post
 			ON (blog.blog_id = post.blog_id)
@@ -2701,19 +2700,19 @@ 
 				post.c_id = $course_id AND
 				author_id =  $user_id AND visibility = 1
 			ORDER BY post.date_creation DESC ";
-	$result = Database::query($sql);
-	$return_data = '';
-
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			$return_data.= $row['full_text'];
-			$return_data.= '<br /><br />';
-		}
-	}
-	return $return_data;
+    $result = Database::query($sql);
+    $return_data = '';
+
+    if (Database::num_rows($result)!=0) {
+        while ($row=Database::fetch_array($result)) {
+            $return_data.=  '<div class="clear"></div><br />';
+            $return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
+            $return_data.=  '<br / >';
+            $return_data.= $row['full_text'];
+            $return_data.= '<br /><br />';
+        }
+    }
+    return $return_data;
 }
 
 /**
@@ -2730,7 +2729,7 @@ 
     $course_info = api_get_course_info($course_code);
     $course_id = $course_info['real_id'];
 
-	$sql = "SELECT DISTINCT blog.blog_id, comment_id, title, comment, comment.date_creation
+    $sql = "SELECT DISTINCT blog.blog_id, comment_id, title, comment, comment.date_creation
 			FROM $tbl_blogs blog INNER JOIN  $tbl_blog_comment comment
 			ON (blog.blog_id = comment.blog_id)
 			WHERE 	blog.c_id = $course_id AND
@@ -2738,18 +2737,18 @@ 
 					author_id =  $user_id AND
 					visibility = 1
 			ORDER BY blog_name";
-	$result = Database::query($sql);
-	$return_data = '';
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			//$return_data.=  '<strong>'.$row['title'].'</strong>'; echo '<br>';*/
-			$return_data.=  $row['comment'];
-			$return_data.=  '<br />';
-		}
-	}
-	return $return_data;
+    $result = Database::query($sql);
+    $return_data = '';
+    if (Database::num_rows($result)!=0) {
+        while ($row=Database::fetch_array($result)) {
+            $return_data.=  '<div class="clear"></div><br />';
+            $return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
+            $return_data.=  '<br / >';
+            //$return_data.=  '<strong>'.$row['title'].'</strong>'; echo '<br>';*/
+            $return_data.=  $row['comment'];
+            $return_data.=  '<br />';
+        }
+    }
+    return $return_data;
 }
 

custompages/language.inc.php

Indentation +5 added lines, -5 removed lines

@@ -29,11 +29,11 @@
     krsort($langs, SORT_NUMERIC);
     // Choosing the best match
     foreach($langs as $weight => $codes) {
-		foreach ($codes as $code) {
-        	if (in_array($code, $available_langs)) {
-            	return $code;
-        	}
-		}
+        foreach ($codes as $code) {
+            if (in_array($code, $available_langs)) {
+                return $code;
+            }
+        }
     }
     // No match
     return null;

custompages/language.php

Indentation +3 added lines, -3 removed lines

@@ -24,15 +24,15 @@
 $lang_match = $chamilo_langs[get_preferred_language($available_langs)];
 // recover previous value ...
 if (isset($_SESSION['user_language_choice']))
-	$lang_match = $_SESSION['user_language_choice'];
+    $lang_match = $_SESSION['user_language_choice'];
 
 // Chamilo parameter, on logout
 if (isset($_REQUEST['language']) && !empty($_REQUEST['language']) && in_array($_REQUEST['language'], $chamilo_langs)) {
-	$lang_match = $_REQUEST['language'];
+    $lang_match = $_REQUEST['language'];
 }
 // Incoming link parameter
 if (isset($_REQUEST['lang']) && !empty($_REQUEST['lang']) && in_array($_REQUEST['lang'], $available_langs)) {
-	$lang_match = $chamilo_langs[$_REQUEST['lang']];
+    $lang_match = $chamilo_langs[$_REQUEST['lang']];
 }
 
 $detect = api_get_setting('auto_detect_language_custom_pages');

main/inc/lib/nusoap/class.soap_parser.php

Indentation +546 added lines, -546 removed lines

@@ -11,235 +11,235 @@ 
 */

 class nusoap_parser extends nusoap_base

 {

-	var $xml = '';

-	var $xml_encoding = '';

-	var $method = '';

-	var $root_struct = '';

-	var $root_struct_name = '';

-	var $root_struct_namespace = '';

-	var $root_header = '';

+    var $xml = '';

+    var $xml_encoding = '';

+    var $method = '';

+    var $root_struct = '';

+    var $root_struct_name = '';

+    var $root_struct_namespace = '';

+    var $root_header = '';

     var $document = '';			// incoming SOAP body (text)

-	// determines where in the message we are (envelope,header,body,method)

-	var $status = '';

-	var $position = 0;

-	var $depth = 0;

-	var $default_namespace = '';

-	var $namespaces = array();

-	var $message = array();

+    // determines where in the message we are (envelope,header,body,method)

+    var $status = '';

+    var $position = 0;

+    var $depth = 0;

+    var $default_namespace = '';

+    var $namespaces = array();

+    var $message = array();

     var $parent;

-	var $fault = false;

-	var $fault_code = '';

-	var $fault_str = '';

-	var $fault_detail = '';

-	var $depth_array = array();

-	var $debug_flag = true;

-	var $soapresponse = NULL;	// parsed SOAP Body

-	var $soapheader = NULL;		// parsed SOAP Header

-	var $responseHeaders = '';	// incoming SOAP headers (text)

-	var $body_position = 0;

-	// for multiref parsing:

-	// array of id => pos

-	var $ids = array();

-	// array of id => hrefs => pos

-	var $multirefs = array();

-	// toggle for auto-decoding element content

-	var $decode_utf8 = true;

+    var $fault = false;

+    var $fault_code = '';

+    var $fault_str = '';

+    var $fault_detail = '';

+    var $depth_array = array();

+    var $debug_flag = true;

+    var $soapresponse = NULL;	// parsed SOAP Body

+    var $soapheader = NULL;		// parsed SOAP Header

+    var $responseHeaders = '';	// incoming SOAP headers (text)

+    var $body_position = 0;

+    // for multiref parsing:

+    // array of id => pos

+    var $ids = array();

+    // array of id => hrefs => pos

+    var $multirefs = array();

+    // toggle for auto-decoding element content

+    var $decode_utf8 = true;

 

-	/**

-	* constructor that actually does the parsing

-	*

-	* @param    string $xml SOAP message

-	* @param    string $encoding character encoding scheme of message

-	* @param    string $method method for which XML is parsed (unused?)

-	* @param    bool $decode_utf8 whether to decode UTF-8 to ISO-8859-1

-	* @return void|bool

-	* @access   public

-	*/

-	function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){

-		parent::nusoap_base();

-		$this->xml = $xml;

-		$this->xml_encoding = $encoding;

-		$this->method = $method;

-		$this->decode_utf8 = $decode_utf8;

+    /**

+     * constructor that actually does the parsing

+     *

+     * @param    string $xml SOAP message

+     * @param    string $encoding character encoding scheme of message

+     * @param    string $method method for which XML is parsed (unused?)

+     * @param    bool $decode_utf8 whether to decode UTF-8 to ISO-8859-1

+     * @return void|bool

+     * @access   public

+     */

+    function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){

+        parent::nusoap_base();

+        $this->xml = $xml;

+        $this->xml_encoding = $encoding;

+        $this->method = $method;

+        $this->decode_utf8 = $decode_utf8;

 

-		// Check whether content has been read.

-		if(!empty($this->xml)){

-			// Check XML encoding

-			$pos_xml = strpos($xml, '<?xml');

-			if ($pos_xml !== FALSE) {

-				$xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);

-				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

-					$xml_encoding = $res[1];

-					if (strtoupper($xml_encoding) != $encoding) {

-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

-						$this->debug($err);

-						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

-							$this->setError($err);

-							return false;

-						}

-						// when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed

-					} else {

-						$this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');

-					}

-				} else {

-					$this->debug('No encoding specified in XML declaration');

-				}

-			} else {

-				$this->debug('No XML declaration');

-			}

-			$this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);

-			// Create an XML parser - why not xml_parser_create_ns?

-			$this->parser = xml_parser_create($this->xml_encoding);

-			// Set the options for parsing the XML data.

-			//xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);

-			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);

-			xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);

-			// Set the object for the parser.

-			xml_set_object($this->parser, $this);

-			// Set the element handlers for the parser.

-			xml_set_element_handler($this->parser, 'start_element','end_element');

-			xml_set_character_data_handler($this->parser,'character_data');

+        // Check whether content has been read.

+        if(!empty($this->xml)){

+            // Check XML encoding

+            $pos_xml = strpos($xml, '<?xml');

+            if ($pos_xml !== FALSE) {

+                $xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);

+                if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {

+                    $xml_encoding = $res[1];

+                    if (strtoupper($xml_encoding) != $encoding) {

+                        $err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";

+                        $this->debug($err);

+                        if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {

+                            $this->setError($err);

+                            return false;

+                        }

+                        // when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed

+                    } else {

+                        $this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');

+                    }

+                } else {

+                    $this->debug('No encoding specified in XML declaration');

+                }

+            } else {

+                $this->debug('No XML declaration');

+            }

+            $this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);

+            // Create an XML parser - why not xml_parser_create_ns?

+            $this->parser = xml_parser_create($this->xml_encoding);

+            // Set the options for parsing the XML data.

+            //xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);

+            xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);

+            xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);

+            // Set the object for the parser.

+            xml_set_object($this->parser, $this);

+            // Set the element handlers for the parser.

+            xml_set_element_handler($this->parser, 'start_element','end_element');

+            xml_set_character_data_handler($this->parser,'character_data');

 

-			xml_parse($this->parser, $this->xml);

+            xml_parse($this->parser, $this->xml);

 

-			// Parse the XML file.

-			//if (!xml_parse($this->parser,$xml,true)){

-			if (false) {

-			    // Display an error message.

-			    $err = sprintf('XML error parsing SOAP payload on line %d: %s',

-			    xml_get_current_line_number($this->parser),

-			    xml_error_string(xml_get_error_code($this->parser)));

-				$this->debug($err);

-				$this->debug("XML payload:\n" . $xml);

-				$this->setError($err);

-			} else {

-				$this->debug('in nusoap_parser ctor, message:');

-				$this->appendDebug($this->varDump($this->message));

-				$this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);

-				// get final value

-				$this->soapresponse = $this->message[$this->root_struct]['result'];

-				// get header value

-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

-					$this->soapheader = $this->message[$this->root_header]['result'];

-				}

-				// resolve hrefs/ids

-				if(sizeof($this->multirefs) > 0){

-					foreach($this->multirefs as $id => $hrefs){

-						$this->debug('resolving multirefs for id: '.$id);

-						$idVal = $this->buildVal($this->ids[$id]);

-						if (is_array($idVal) && isset($idVal['!id'])) {

-							unset($idVal['!id']);

-						}

-						foreach($hrefs as $refPos => $ref){

-							$this->debug('resolving href at pos '.$refPos);

-							$this->multirefs[$id][$refPos] = $idVal;

-						}

-					}

-				}

-			}

-			xml_parser_free($this->parser);

-		} else {

-			$this->debug('xml was empty, didn\'t parse!');

-			$this->setError('xml was empty, didn\'t parse!');

-		}

-	}

+            // Parse the XML file.

+            //if (!xml_parse($this->parser,$xml,true)){

+            if (false) {

+                // Display an error message.

+                $err = sprintf('XML error parsing SOAP payload on line %d: %s',

+                xml_get_current_line_number($this->parser),

+                xml_error_string(xml_get_error_code($this->parser)));

+                $this->debug($err);

+                $this->debug("XML payload:\n" . $xml);

+                $this->setError($err);

+            } else {

+                $this->debug('in nusoap_parser ctor, message:');

+                $this->appendDebug($this->varDump($this->message));

+                $this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);

+                // get final value

+                $this->soapresponse = $this->message[$this->root_struct]['result'];

+                // get header value

+                if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){

+                    $this->soapheader = $this->message[$this->root_header]['result'];

+                }

+                // resolve hrefs/ids

+                if(sizeof($this->multirefs) > 0){

+                    foreach($this->multirefs as $id => $hrefs){

+                        $this->debug('resolving multirefs for id: '.$id);

+                        $idVal = $this->buildVal($this->ids[$id]);

+                        if (is_array($idVal) && isset($idVal['!id'])) {

+                            unset($idVal['!id']);

+                        }

+                        foreach($hrefs as $refPos => $ref){

+                            $this->debug('resolving href at pos '.$refPos);

+                            $this->multirefs[$id][$refPos] = $idVal;

+                        }

+                    }

+                }

+            }

+            xml_parser_free($this->parser);

+        } else {

+            $this->debug('xml was empty, didn\'t parse!');

+            $this->setError('xml was empty, didn\'t parse!');

+        }

+    }

 

-	/**

-	* start-element handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $name element name

-	* @param    array $attrs associative array of attributes

-	* @access   private

-	*/

-	function start_element($parser, $name, $attrs) {

+    /**

+     * start-element handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $name element name

+     * @param    array $attrs associative array of attributes

+     * @access   private

+     */

+    function start_element($parser, $name, $attrs) {

 

-		// position in a total number of elements, starting from 0

-		// update class level pos

-		$pos = $this->position++;

-		// and set mine

-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');

-		// depth = how many levels removed from root?

-		// set mine as current global depth and increment global depth value

-		$this->message[$pos]['depth'] = $this->depth++;

+        // position in a total number of elements, starting from 0

+        // update class level pos

+        $pos = $this->position++;

+        // and set mine

+        $this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');

+        // depth = how many levels removed from root?

+        // set mine as current global depth and increment global depth value

+        $this->message[$pos]['depth'] = $this->depth++;

 

-		// else add self as child to whoever the current parent is

-		if($pos != 0){

-			$this->message[$this->parent]['children'] .= '|'.$pos;

-		}

-		// set my parent

-		$this->message[$pos]['parent'] = $this->parent;

-		// set self as current parent

-		$this->parent = $pos;

-		// set self as current value for this depth

-		$this->depth_array[$this->depth] = $pos;

-		// get element prefix

-		if(strpos($name,':')){

-			// get ns prefix

-			$prefix = substr($name,0,strpos($name,':'));

-			// get unqualified name

-			$name = substr(strstr($name,':'),1);

-		}

-		// set status

-		if ($name == 'Envelope' && $this->status == '') {

-			$this->status = 'envelope';

-		} elseif ($name == 'Header' && $this->status == 'envelope') {

-			$this->root_header = $pos;

-			$this->status = 'header';

-		} elseif ($name == 'Body' && $this->status == 'envelope'){

-			$this->status = 'body';

-			$this->body_position = $pos;

-		// set method

-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

-			$this->status = 'method';

-			$this->root_struct_name = $name;

-			$this->root_struct = $pos;

-			$this->message[$pos]['type'] = 'struct';

-			$this->debug("found root struct $this->root_struct_name, pos $this->root_struct");

-		}

-		// set my status

-		$this->message[$pos]['status'] = $this->status;

-		// set name

-		$this->message[$pos]['name'] = htmlspecialchars($name);

-		// set attrs

-		$this->message[$pos]['attrs'] = $attrs;

+        // else add self as child to whoever the current parent is

+        if($pos != 0){

+            $this->message[$this->parent]['children'] .= '|'.$pos;

+        }

+        // set my parent

+        $this->message[$pos]['parent'] = $this->parent;

+        // set self as current parent

+        $this->parent = $pos;

+        // set self as current value for this depth

+        $this->depth_array[$this->depth] = $pos;

+        // get element prefix

+        if(strpos($name,':')){

+            // get ns prefix

+            $prefix = substr($name,0,strpos($name,':'));

+            // get unqualified name

+            $name = substr(strstr($name,':'),1);

+        }

+        // set status

+        if ($name == 'Envelope' && $this->status == '') {

+            $this->status = 'envelope';

+        } elseif ($name == 'Header' && $this->status == 'envelope') {

+            $this->root_header = $pos;

+            $this->status = 'header';

+        } elseif ($name == 'Body' && $this->status == 'envelope'){

+            $this->status = 'body';

+            $this->body_position = $pos;

+        // set method

+        } elseif($this->status == 'body' && $pos == ($this->body_position+1)) {

+            $this->status = 'method';

+            $this->root_struct_name = $name;

+            $this->root_struct = $pos;

+            $this->message[$pos]['type'] = 'struct';

+            $this->debug("found root struct $this->root_struct_name, pos $this->root_struct");

+        }

+        // set my status

+        $this->message[$pos]['status'] = $this->status;

+        // set name

+        $this->message[$pos]['name'] = htmlspecialchars($name);

+        // set attrs

+        $this->message[$pos]['attrs'] = $attrs;

 

-		// loop through atts, logging ns and type declarations

+        // loop through atts, logging ns and type declarations

         $attstr = '';

-		foreach($attrs as $key => $value){

-        	$key_prefix = $this->getPrefix($key);

-			$key_localpart = $this->getLocalPart($key);

-			// if ns declarations, add to class level array of valid namespaces

+        foreach($attrs as $key => $value){

+            $key_prefix = $this->getPrefix($key);

+            $key_localpart = $this->getLocalPart($key);

+            // if ns declarations, add to class level array of valid namespaces

             if($key_prefix == 'xmlns'){

-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

-					$this->XMLSchemaVersion = $value;

-					$this->namespaces['xsd'] = $this->XMLSchemaVersion;

-					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';

-				}

+                if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){

+                    $this->XMLSchemaVersion = $value;

+                    $this->namespaces['xsd'] = $this->XMLSchemaVersion;

+                    $this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';

+                }

                 $this->namespaces[$key_localpart] = $value;

-				// set method namespace

-				if($name == $this->root_struct_name){

-					$this->methodNamespace = $value;

-				}

-			// if it's a type declaration, set type

+                // set method namespace

+                if($name == $this->root_struct_name){

+                    $this->methodNamespace = $value;

+                }

+            // if it's a type declaration, set type

         } elseif($key_localpart == 'type'){

-        		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

-        			// do nothing: already processed arrayType

-        		} else {

-	            	$value_prefix = $this->getPrefix($value);

-	                $value_localpart = $this->getLocalPart($value);

-					$this->message[$pos]['type'] = $value_localpart;

-					$this->message[$pos]['typePrefix'] = $value_prefix;

-	                if(isset($this->namespaces[$value_prefix])){

-	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {

-						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

-	                }

-					// should do something here with the namespace of specified type?

-				}

-			} elseif($key_localpart == 'arrayType'){

-				$this->message[$pos]['type'] = 'array';

-				/* do arrayType ereg here

+                if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {

+                    // do nothing: already processed arrayType

+                } else {

+                    $value_prefix = $this->getPrefix($value);

+                    $value_localpart = $this->getLocalPart($value);

+                    $this->message[$pos]['type'] = $value_localpart;

+                    $this->message[$pos]['typePrefix'] = $value_prefix;

+                    if(isset($this->namespaces[$value_prefix])){

+                        $this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];

+                    } else if(isset($attrs['xmlns:'.$value_prefix])) {

+                        $this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];

+                    }

+                    // should do something here with the namespace of specified type?

+                }

+            } elseif($key_localpart == 'arrayType'){

+                $this->message[$pos]['type'] = 'array';

+                /* do arrayType ereg here

 				[1]    arrayTypeValue    ::=    atype asize

 				[2]    atype    ::=    QName rank*

 				[3]    rank    ::=    '[' (',')* ']'

@@ -247,129 +247,129 @@ 
 				[5]    length    ::=    nextDimension* Digit+

 				[6]    nextDimension    ::=    Digit+ ','

 				*/

-				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

-				if(preg_match($expr,$value,$regs)){

-					$this->message[$pos]['typePrefix'] = $regs[1];

-					$this->message[$pos]['arrayTypePrefix'] = $regs[1];

-	                if (isset($this->namespaces[$regs[1]])) {

-	                	$this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];

-	                } else if (isset($attrs['xmlns:'.$regs[1]])) {

-						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];

-	                }

-					$this->message[$pos]['arrayType'] = $regs[2];

-					$this->message[$pos]['arraySize'] = $regs[3];

-					$this->message[$pos]['arrayCols'] = $regs[4];

-				}

-			// specifies nil value (or not)

-			} elseif ($key_localpart == 'nil'){

-				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

-			// some other attribute

-			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

-				$this->message[$pos]['xattrs']['!' . $key] = $value;

-			}

+                $expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';

+                if(preg_match($expr,$value,$regs)){

+                    $this->message[$pos]['typePrefix'] = $regs[1];

+                    $this->message[$pos]['arrayTypePrefix'] = $regs[1];

+                    if (isset($this->namespaces[$regs[1]])) {

+                        $this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];

+                    } else if (isset($attrs['xmlns:'.$regs[1]])) {

+                        $this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];

+                    }

+                    $this->message[$pos]['arrayType'] = $regs[2];

+                    $this->message[$pos]['arraySize'] = $regs[3];

+                    $this->message[$pos]['arrayCols'] = $regs[4];

+                }

+            // specifies nil value (or not)

+            } elseif ($key_localpart == 'nil'){

+                $this->message[$pos]['nil'] = ($value == 'true' || $value == '1');

+            // some other attribute

+            } elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {

+                $this->message[$pos]['xattrs']['!' . $key] = $value;

+            }

 

-			if ($key == 'xmlns') {

-				$this->default_namespace = $value;

-			}

-			// log id

-			if($key == 'id'){

-				$this->ids[$value] = $pos;

-			}

-			// root

-			if($key_localpart == 'root' && $value == 1){

-				$this->status = 'method';

-				$this->root_struct_name = $name;

-				$this->root_struct = $pos;

-				$this->debug("found root struct $this->root_struct_name, pos $pos");

-			}

+            if ($key == 'xmlns') {

+                $this->default_namespace = $value;

+            }

+            // log id

+            if($key == 'id'){

+                $this->ids[$value] = $pos;

+            }

+            // root

+            if($key_localpart == 'root' && $value == 1){

+                $this->status = 'method';

+                $this->root_struct_name = $name;

+                $this->root_struct = $pos;

+                $this->debug("found root struct $this->root_struct_name, pos $pos");

+            }

             // for doclit

             $attstr .= " $key=\"$value\"";

-		}

+        }

         // get namespace - must be done after namespace atts are processed

-		if(isset($prefix)){

-			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];

-			$this->default_namespace = $this->namespaces[$prefix];

-		} else {

-			$this->message[$pos]['namespace'] = $this->default_namespace;

-		}

+        if(isset($prefix)){

+            $this->message[$pos]['namespace'] = $this->namespaces[$prefix];

+            $this->default_namespace = $this->namespaces[$prefix];

+        } else {

+            $this->message[$pos]['namespace'] = $this->default_namespace;

+        }

         if($this->status == 'header'){

-        	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

-	        }

+            if ($this->root_header != $pos) {

+                $this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+            }

         } elseif($this->root_struct_name != ''){

-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

+            $this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";

         }

-	}

+    }

 

-	/**

-	* end-element handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $name element name

-	* @access   private

-	*/

-	function end_element($parser, $name) {

-		// position of current element is equal to the last value left in depth_array for my depth

-		$pos = $this->depth_array[$this->depth--];

+    /**

+     * end-element handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $name element name

+     * @access   private

+     */

+    function end_element($parser, $name) {

+        // position of current element is equal to the last value left in depth_array for my depth

+        $pos = $this->depth_array[$this->depth--];

 

         // get element prefix

-		if(strpos($name,':')){

-			// get ns prefix

-			$prefix = substr($name,0,strpos($name,':'));

-			// get unqualified name

-			$name = substr(strstr($name,':'),1);

-		}

+        if(strpos($name,':')){

+            // get ns prefix

+            $prefix = substr($name,0,strpos($name,':'));

+            // get unqualified name

+            $name = substr(strstr($name,':'),1);

+        }

 		

-		// build to native type

-		if(isset($this->body_position) && $pos > $this->body_position){

-			// deal w/ multirefs

-			if(isset($this->message[$pos]['attrs']['href'])){

-				// get id

-				$id = substr($this->message[$pos]['attrs']['href'],1);

-				// add placeholder to href array

-				$this->multirefs[$id][$pos] = 'placeholder';

-				// add set a reference to it as the result value

-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

+        // build to native type

+        if(isset($this->body_position) && $pos > $this->body_position){

+            // deal w/ multirefs

+            if(isset($this->message[$pos]['attrs']['href'])){

+                // get id

+                $id = substr($this->message[$pos]['attrs']['href'],1);

+                // add placeholder to href array

+                $this->multirefs[$id][$pos] = 'placeholder';

+                // add set a reference to it as the result value

+                $this->message[$pos]['result'] =& $this->multirefs[$id][$pos];

             // build complexType values

-			} elseif($this->message[$pos]['children'] != ''){

-				// if result has already been generated (struct/array)

-				if(!isset($this->message[$pos]['result'])){

-					$this->message[$pos]['result'] = $this->buildVal($pos);

-				}

-			// build complexType values of attributes and possibly simpleContent

-			} elseif (isset($this->message[$pos]['xattrs'])) {

-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {

-					$this->message[$pos]['xattrs']['!'] = null;

-				} elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

-	            	if (isset($this->message[$pos]['type'])) {

-						$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-					} else {

-						$parent = $this->message[$pos]['parent'];

-						if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-							$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-						} else {

-							$this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];

-						}

-					}

-				}

-				$this->message[$pos]['result'] = $this->message[$pos]['xattrs'];

-			// set value of simpleType (or nil complexType)

-			} else {

-            	//$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);

-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {

-					$this->message[$pos]['xattrs']['!'] = null;

-				} elseif (isset($this->message[$pos]['type'])) {

-					$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				} else {

-					$parent = $this->message[$pos]['parent'];

-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-						$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-					} else {

-						$this->message[$pos]['result'] = $this->message[$pos]['cdata'];

-					}

-				}

+            } elseif($this->message[$pos]['children'] != ''){

+                // if result has already been generated (struct/array)

+                if(!isset($this->message[$pos]['result'])){

+                    $this->message[$pos]['result'] = $this->buildVal($pos);

+                }

+            // build complexType values of attributes and possibly simpleContent

+            } elseif (isset($this->message[$pos]['xattrs'])) {

+                if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {

+                    $this->message[$pos]['xattrs']['!'] = null;

+                } elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

+                    if (isset($this->message[$pos]['type'])) {

+                        $this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                    } else {

+                        $parent = $this->message[$pos]['parent'];

+                        if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                            $this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                        } else {

+                            $this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];

+                        }

+                    }

+                }

+                $this->message[$pos]['result'] = $this->message[$pos]['xattrs'];

+            // set value of simpleType (or nil complexType)

+            } else {

+                //$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);

+                if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {

+                    $this->message[$pos]['xattrs']['!'] = null;

+                } elseif (isset($this->message[$pos]['type'])) {

+                    $this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                } else {

+                    $parent = $this->message[$pos]['parent'];

+                    if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                        $this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                    } else {

+                        $this->message[$pos]['result'] = $this->message[$pos]['cdata'];

+                    }

+                }

 

-				/* add value to parent's result, if parent is struct/array

+                /* add value to parent's result, if parent is struct/array

 				$parent = $this->message[$pos]['parent'];

 				if($this->message[$parent]['type'] != 'map'){

 					if(strtolower($this->message[$parent]['type']) == 'array'){

@@ -379,261 +379,261 @@ 
 					}

 				}

 				*/

-			}

-		}

+            }

+        }

 		

         // for doclit

         if($this->status == 'header'){

-        	if ($this->root_header != $pos) {

-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

-	        }

+            if ($this->root_header != $pos) {

+                $this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+            }

         } elseif($pos >= $this->root_struct){

-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

+            $this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";

         }

-		// switch status

-		if ($pos == $this->root_struct){

-			$this->status = 'body';

-			$this->root_struct_namespace = $this->message[$pos]['namespace'];

-		} elseif ($pos == $this->root_header) {

-			$this->status = 'envelope';

-		} elseif ($name == 'Body' && $this->status == 'body') {

-			$this->status = 'envelope';

-		} elseif ($name == 'Header' && $this->status == 'header') { // will never happen

-			$this->status = 'envelope';

-		} elseif ($name == 'Envelope' && $this->status == 'envelope') {

-			$this->status = '';

-		}

-		// set parent back to my parent

-		$this->parent = $this->message[$pos]['parent'];

-	}

+        // switch status

+        if ($pos == $this->root_struct){

+            $this->status = 'body';

+            $this->root_struct_namespace = $this->message[$pos]['namespace'];

+        } elseif ($pos == $this->root_header) {

+            $this->status = 'envelope';

+        } elseif ($name == 'Body' && $this->status == 'body') {

+            $this->status = 'envelope';

+        } elseif ($name == 'Header' && $this->status == 'header') { // will never happen

+            $this->status = 'envelope';

+        } elseif ($name == 'Envelope' && $this->status == 'envelope') {

+            $this->status = '';

+        }

+        // set parent back to my parent

+        $this->parent = $this->message[$pos]['parent'];

+    }

 

-	/**

-	* element content handler

-	*

-	* @param    resource $parser XML parser object

-	* @param    string $data element content

-	* @access   private

-	*/

-	function character_data($parser, $data)

+    /**

+     * element content handler

+     *

+     * @param    resource $parser XML parser object

+     * @param    string $data element content

+     * @access   private

+     */

+    function character_data($parser, $data)

     {

-		$pos = $this->depth_array[$this->depth];

-		if ($this->xml_encoding == 'UTF-8'){

-			// TODO: add an option to disable this for folks who want

-			// raw UTF-8 that, e.g., might not map to iso-8859-1

-			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

-			if($this->decode_utf8){

-				$data = utf8_decode($data);

-			}

-		}

+        $pos = $this->depth_array[$this->depth];

+        if ($this->xml_encoding == 'UTF-8'){

+            // TODO: add an option to disable this for folks who want

+            // raw UTF-8 that, e.g., might not map to iso-8859-1

+            // TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");

+            if($this->decode_utf8){

+                $data = utf8_decode($data);

+            }

+        }

         $this->message[$pos]['cdata'] .= $data;

         // for doclit

         if($this->status == 'header'){

-        	$this->responseHeaders .= $data;

+            $this->responseHeaders .= $data;

         } else {

-        	$this->document .= $data;

+            $this->document .= $data;

         }

-	}

+    }

 

-	/**

-	* get the parsed message (SOAP Body)

-	*

-	* @return	mixed

-	* @access   public

-	* @deprecated	use get_soapbody instead

-	*/

-	function get_response(){

-		return $this->soapresponse;

-	}

+    /**

+     * get the parsed message (SOAP Body)

+     *

+     * @return	mixed

+     * @access   public

+     * @deprecated	use get_soapbody instead

+     */

+    function get_response(){

+        return $this->soapresponse;

+    }

 

-	/**

-	* get the parsed SOAP Body (NULL if there was none)

-	*

-	* @return	mixed

-	* @access   public

-	*/

-	function get_soapbody(){

-		return $this->soapresponse;

-	}

+    /**

+     * get the parsed SOAP Body (NULL if there was none)

+     *

+     * @return	mixed

+     * @access   public

+     */

+    function get_soapbody(){

+        return $this->soapresponse;

+    }

 

-	/**

-	* get the parsed SOAP Header (NULL if there was none)

-	*

-	* @return	mixed

-	* @access   public

-	*/

-	function get_soapheader(){

-		return $this->soapheader;

-	}

+    /**

+     * get the parsed SOAP Header (NULL if there was none)

+     *

+     * @return	mixed

+     * @access   public

+     */

+    function get_soapheader(){

+        return $this->soapheader;

+    }

 

-	/**

-	* get the unparsed SOAP Header

-	*

-	* @return	string XML or empty if no Header

-	* @access   public

-	*/

-	function getHeaders(){

-	    return $this->responseHeaders;

-	}

+    /**

+     * get the unparsed SOAP Header

+     *

+     * @return	string XML or empty if no Header

+     * @access   public

+     */

+    function getHeaders(){

+        return $this->responseHeaders;

+    }

 

-	/**

-	* decodes simple types into PHP variables

-	*

-	* @param    string $value value to decode

-	* @param    string $type XML type to decode

-	* @param    string $typens XML type namespace to decode

-	* @return	mixed PHP value

-	* @access   private

-	*/

-	function decodeSimple($value, $type, $typens) {

-		// TODO: use the namespace!

-		if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {

-			return (string) $value;

-		}

-		if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {

-			return (int) $value;

-		}

-		if ($type == 'float' || $type == 'double' || $type == 'decimal') {

-			return (double) $value;

-		}

-		if ($type == 'boolean') {

-			if (strtolower($value) == 'false' || strtolower($value) == 'f') {

-				return false;

-			}

-			return (boolean) $value;

-		}

-		if ($type == 'base64' || $type == 'base64Binary') {

-			$this->debug('Decode base64 value');

-			return base64_decode($value);

-		}

-		// obscure numeric types

-		if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'

-			|| $type == 'nonNegativeInteger' || $type == 'positiveInteger'

-			|| $type == 'unsignedInt'

-			|| $type == 'unsignedShort' || $type == 'unsignedByte') {

-			return (int) $value;

-		}

-		// bogus: parser treats array with no elements as a simple type

-		if ($type == 'array') {

-			return array();

-		}

-		// everything else

-		return (string) $value;

-	}

+    /**

+     * decodes simple types into PHP variables

+     *

+     * @param    string $value value to decode

+     * @param    string $type XML type to decode

+     * @param    string $typens XML type namespace to decode

+     * @return	mixed PHP value

+     * @access   private

+     */

+    function decodeSimple($value, $type, $typens) {

+        // TODO: use the namespace!

+        if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {

+            return (string) $value;

+        }

+        if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {

+            return (int) $value;

+        }

+        if ($type == 'float' || $type == 'double' || $type == 'decimal') {

+            return (double) $value;

+        }

+        if ($type == 'boolean') {

+            if (strtolower($value) == 'false' || strtolower($value) == 'f') {

+                return false;

+            }

+            return (boolean) $value;

+        }

+        if ($type == 'base64' || $type == 'base64Binary') {

+            $this->debug('Decode base64 value');

+            return base64_decode($value);

+        }

+        // obscure numeric types

+        if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'

+            || $type == 'nonNegativeInteger' || $type == 'positiveInteger'

+            || $type == 'unsignedInt'

+            || $type == 'unsignedShort' || $type == 'unsignedByte') {

+            return (int) $value;

+        }

+        // bogus: parser treats array with no elements as a simple type

+        if ($type == 'array') {

+            return array();

+        }

+        // everything else

+        return (string) $value;

+    }

 

-	/**

-	* builds response structures for compound values (arrays/structs)

-	* and scalars

-	*

-	* @param    integer $pos position in node tree

-	* @return	mixed	PHP value

-	* @access   private

-	*/

-	function buildVal($pos){

-		if(!isset($this->message[$pos]['type'])){

-			$this->message[$pos]['type'] = '';

-		}

-		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

-		// if there are children...

-		if($this->message[$pos]['children'] != ''){

-			$this->debug('in buildVal, there are children');

-			$children = explode('|',$this->message[$pos]['children']);

-			array_shift($children); // knock off empty

-			// md array

-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

-            	$r=0; // rowcount

-            	$c=0; // colcount

-            	foreach($children as $child_pos){

-					$this->debug("in buildVal, got an MD array element: $r, $c");

-					$params[$r][] = $this->message[$child_pos]['result'];

-				    $c++;

-				    if($c == $this->message[$pos]['arrayCols']){

-				    	$c = 0;

-						$r++;

-				    }

+    /**

+     * builds response structures for compound values (arrays/structs)

+     * and scalars

+     *

+     * @param    integer $pos position in node tree

+     * @return	mixed	PHP value

+     * @access   private

+     */

+    function buildVal($pos){

+        if(!isset($this->message[$pos]['type'])){

+            $this->message[$pos]['type'] = '';

+        }

+        $this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);

+        // if there are children...

+        if($this->message[$pos]['children'] != ''){

+            $this->debug('in buildVal, there are children');

+            $children = explode('|',$this->message[$pos]['children']);

+            array_shift($children); // knock off empty

+            // md array

+            if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){

+                $r=0; // rowcount

+                $c=0; // colcount

+                foreach($children as $child_pos){

+                    $this->debug("in buildVal, got an MD array element: $r, $c");

+                    $params[$r][] = $this->message[$child_pos]['result'];

+                    $c++;

+                    if($c == $this->message[$pos]['arrayCols']){

+                        $c = 0;

+                        $r++;

+                    }

                 }

             // array

-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

+            } elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){

                 $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);

                 foreach($children as $child_pos){

-                	$params[] = &$this->message[$child_pos]['result'];

+                    $params[] = &$this->message[$child_pos]['result'];

                 }

             // apache Map type: java hashtable

             } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){

                 $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);

                 foreach($children as $child_pos){

-                	$kv = explode("|",$this->message[$child_pos]['children']);

-                   	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

+                    $kv = explode("|",$this->message[$child_pos]['children']);

+                        $params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];

                 }

             // generic compound type

             //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {

-		    } else {

-	    		// Apache Vector type: treat as an array

+            } else {

+                // Apache Vector type: treat as an array

                 $this->debug('in buildVal, adding Java Vector or generic compound type '.$this->message[$pos]['name']);

-				if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

-					$notstruct = 1;

-				} else {

-					$notstruct = 0;

-	            }

-            	//

-            	foreach($children as $child_pos){

-            		if($notstruct){

-            			$params[] = &$this->message[$child_pos]['result'];

-            		} else {

-            			if (isset($params[$this->message[$child_pos]['name']])) {

-            				// de-serialize repeated element name into an array

-            				if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {

-            					$params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);

-            				}

-            				$params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];

-            			} else {

-					    	$params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];

-					    }

-                	}

+                if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {

+                    $notstruct = 1;

+                } else {

+                    $notstruct = 0;

                 }

-			}

-			if (isset($this->message[$pos]['xattrs'])) {

+                //

+                foreach($children as $child_pos){

+                    if($notstruct){

+                        $params[] = &$this->message[$child_pos]['result'];

+                    } else {

+                        if (isset($params[$this->message[$child_pos]['name']])) {

+                            // de-serialize repeated element name into an array

+                            if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {

+                                $params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);

+                            }

+                            $params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];

+                        } else {

+                            $params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];

+                        }

+                    }

+                }

+            }

+            if (isset($this->message[$pos]['xattrs'])) {

                 $this->debug('in buildVal, handling attributes');

-				foreach ($this->message[$pos]['xattrs'] as $n => $v) {

-					$params[$n] = $v;

-				}

-			}

-			// handle simpleContent

-			if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

+                foreach ($this->message[$pos]['xattrs'] as $n => $v) {

+                    $params[$n] = $v;

+                }

+            }

+            // handle simpleContent

+            if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {

                 $this->debug('in buildVal, handling simpleContent');

-            	if (isset($this->message[$pos]['type'])) {

-					$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				} else {

-					$parent = $this->message[$pos]['parent'];

-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-						$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-					} else {

-						$params['!'] = $this->message[$pos]['cdata'];

-					}

-				}

-			}

-			$ret = is_array($params) ? $params : array();

-			$this->debug('in buildVal, return:');

-			//$this->appendDebug($this->varDump($ret));

-			return $ret;

-		} else {

-        	$this->debug('in buildVal, no children, building scalar');

-			$cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';

-        	if (isset($this->message[$pos]['type'])) {

-				$ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

-				$this->debug("in buildVal, return: $ret");

-				return $ret;

-			}

-			$parent = $this->message[$pos]['parent'];

-			if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

-				$ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

-				$this->debug("in buildVal, return: $ret");

-				return $ret;

-			}

-           	$ret = $this->message[$pos]['cdata'];

-			$this->debug("in buildVal, return: $ret");

-           	return $ret;

-		}

-	}

+                if (isset($this->message[$pos]['type'])) {

+                    $params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                } else {

+                    $parent = $this->message[$pos]['parent'];

+                    if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                        $params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                    } else {

+                        $params['!'] = $this->message[$pos]['cdata'];

+                    }

+                }

+            }

+            $ret = is_array($params) ? $params : array();

+            $this->debug('in buildVal, return:');

+            //$this->appendDebug($this->varDump($ret));

+            return $ret;

+        } else {

+            $this->debug('in buildVal, no children, building scalar');

+            $cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';

+            if (isset($this->message[$pos]['type'])) {

+                $ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');

+                $this->debug("in buildVal, return: $ret");

+                return $ret;

+            }

+            $parent = $this->message[$pos]['parent'];

+            if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {

+                $ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');

+                $this->debug("in buildVal, return: $ret");

+                return $ret;

+            }

+                $ret = $this->message[$pos]['cdata'];

+            $this->debug("in buildVal, return: $ret");

+                return $ret;

+        }

+    }

 }

 

 /**

main/admin/add_sessions_to_usergroup.php

Indentation +12 added lines, -12 removed lines

@@ -197,7 +197,7 @@ 
       <option value = "%">--</option>
       <?php
         echo Display :: get_alphabet_options();
-      ?>
+        ?>
      </select>
 </td>
 <td align="center">&nbsp;</td>
@@ -207,31 +207,31 @@ 
   <td align="center">
   <div id="content_source">
       <?php
-      if (!($add_type=='multiple')) {
+        if (!($add_type=='multiple')) {
         ?>
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
         <div id="ajax_list_users_single"></div>
         <?php
-      } else {
-      ?>
+        } else {
+        ?>
       <div id="ajax_list_multiple">
         <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?>
       </div>
     <?php
-      }
-     ?>
+        }
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-  ?>
+    if ($ajax_search) {
+    ?>
     <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" >
         <em class="fa fa-arrow-left"></em>
     </button>
   <?php
-  } else {
-  ?>
+    } else {
+    ?>
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))">
         <em class="fa fa-arrow-right"></em>
     </button>
@@ -240,8 +240,8 @@ 
         <em class="fa fa-arrow-left"></em>
     </button>
     <?php
-  }
-  ?>
+    }
+    ?>
     <br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">

main/resourcelinker/resourcelinker.inc.php

Indentation +1390 added lines, -1390 removed lines

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

main/exercise/live_stats.php

Indentation +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 $result = $objExercise->read($exercise_id);
 
 if (!$result) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $interbreadcrumb[] = array(

main/exercise/multiple_answer_combination.class.php

Indentation +4 added lines, -4 removed lines

@@ -178,9 +178,9 @@ 
     }
 
     /**
-	 * abstract function which creates the form to create/edit the answers of the question
-	 * @param FormValidator $form
-	 */
+     * abstract function which creates the form to create/edit the answers of the question
+     * @param FormValidator $form
+     */
     public function processAnswersCreation($form)
     {
         $questionWeighting = $nbrGoodAnswers = 0;
@@ -221,7 +221,7 @@ 
         // sets the total weighting of the question
         $this->updateWeighting($questionWeighting);
         $this->save();
-	}
+    }
 
     function return_header($feedback_type = null, $counter = null, $score = null)
     {