diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index bd963e7a1e..af9b366bec 100755
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -25,7 +25,7 @@ class Blog
 	{
 	    $course_id = api_get_course_int_id();
 
-		if(is_numeric($blog_id)) {
+		if (is_numeric($blog_id)) {
 			// init
 			$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 
@@ -48,7 +48,7 @@ class Blog
 	 *
 	 * @return String Blog description
 	 */
-	public static function get_blog_subtitle ($blog_id)
+	public static function get_blog_subtitle($blog_id)
 	{
 		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 	  	$course_id = api_get_course_int_id();
@@ -56,10 +56,10 @@ class Blog
 				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
@@ -68,7 +68,8 @@ class Blog
 	 *
 	 * @return Array Returns an array with [userid]=>[username]
 	 */
-	public static function get_blog_users ($blog_id) {
+	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);
@@ -78,9 +79,11 @@ class Blog
 		// 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."'";
+				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)) {
@@ -97,26 +100,29 @@ class Blog
 	 * @param String $title
 	 * @param Text $description
 	 */
-	public static function create_blog ($title, $subtitle) {
-		global $_user;
-
+	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
-		$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);
-		$tbl_blogs_tasks 	= Database::get_course_table(TABLE_BLOGS_TASKS);
+        $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);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 
 		//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 blog_subtitle="'.Database::escape_string($subtitle).'";';
-		$res=Database::query($sql);
-		$info_count=Database::result($res,0,0);
-
-		if ($info_count==0) {
+			  	WHERE
+			  	    c_id = '.$course_id.' AND
+			  	    blog_name="'.Database::escape_string($title).'" AND
+			  	    blog_subtitle="'.Database::escape_string($subtitle).'"';
+        $res = Database::query($sql);
+        $info_count = Database::result($res, 0, 0);
+
+        if ($info_count == 0) {
 			// Create the blog
 			$sql = "INSERT INTO $tbl_blogs (c_id, blog_name, blog_subtitle, date_creation, visibility, session_id )
 					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($subtitle)."', '".$current_date."', '1', '$session_id');";
@@ -124,22 +130,44 @@ class Blog
 			$this_blog_id = Database::insert_id();
 
 			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
-				api_item_property_update(api_get_course_info(), TOOL_BLOGS, $this_blog_id, 'BlogAdded', api_get_user_id());
+                api_item_property_update(
+                    api_get_course_info(),
+                    TOOL_BLOGS,
+                    $this_blog_id,
+                    'BlogAdded',
+                    api_get_user_id()
+                );
 			}
 
 			// Make first post. :)
-			$sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
+			$sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id)
 					VALUES ($course_id, '".get_lang("Welcome")."', '" . get_lang('FirstPostText')."','".$current_date."', '".Database::escape_string((int)$this_blog_id)."', '".Database::escape_string((int)$_user['user_id'])."');";
 			Database::query($sql);
+            $postId = Database::insert_id();
+            if ($postId) {
+                $sql = "UPDATE $tbl_blogs_posts SET post_id = iid WHERE iid = $postId";
+                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)
 					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);
 
+            $toolId = Database::insert_id();
+            if ($toolId) {
+                $sql = "UPDATE $tbl_tool SET id = iid WHERE iid = $toolId";
+                Database::query($sql);
+            }
+
+
 			// Subscribe the teacher to this blog
-			Blog::set_user_subscribed((int)$this_blog_id,(int)$_user['user_id']);
+			Blog::set_user_subscribed($this_blog_id, $_user['user_id']);
 		}
 	}
 
@@ -161,16 +189,29 @@ class Blog
         $course_id = api_get_course_int_id();
 
 		// 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";
+		$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);
 		$this_blog_id = Database::insert_id();
 
 		//update item_property (update)
-		api_item_property_update(api_get_course_info(), TOOL_BLOGS, intval($blog_id), 'BlogUpdated', api_get_user_id());
+        api_item_property_update(
+            api_get_course_info(),
+            TOOL_BLOGS,
+            intval($blog_id),
+            'BlogUpdated',
+            api_get_user_id()
+        );
 
 		// 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=".Database::escape_string((int)$blog_id)."' LIMIT 1";
+		$sql = "UPDATE $tbl_tool SET
+		        name = '".Database::escape_string($title)."'
+		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".Database::escape_string((int)$blog_id)."' LIMIT 1";
 		Database::query($sql);
 	}
 
@@ -179,48 +220,55 @@ class Blog
 	 * @author Toon Keppens
 	 * @param Integer $blog_id
 	 */
-	public static function delete_blog ($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);
-		$tbl_blogs_tasks 	= Database::get_course_table(TABLE_BLOGS_TASKS);
-		$tbl_tool 			= Database::get_course_table(TABLE_TOOL_LIST);
-		$tbl_blogs_rating 	= Database::get_course_table(TABLE_BLOGS_RATING);
+        $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);
+        $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
+        $tbl_tool = Database::get_course_table(TABLE_TOOL_LIST);
+        $tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
 		$tbl_blogs_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
         $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 comments
-		$sql = "DELETE FROM $tbl_blogs_comment WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."'";
+		$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 ='".(int)$blog_id."'";
+   		$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 ='".(int)$blog_id."'";
+		$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 ='".(int)$blog_id."'";
+		$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 ='".(int)$blog_id."'";
+		$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=".(int)$blog_id."'";
+		$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)
-		api_item_property_update(api_get_course_info(), TOOL_BLOGS, intval($blog_id), 'delete', api_get_user_id());
+        api_item_property_update(
+            api_get_course_info(),
+            TOOL_BLOGS,
+            $blog_id,
+            'delete',
+            api_get_user_id()
+        );
 	}
 
 	/**
@@ -255,7 +303,12 @@ class Blog
 					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();
+			$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';
@@ -266,14 +319,14 @@ class Blog
 				$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'];
+				$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);
+					$result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
 					$comment = Database::escape_string($file_comment);
 
 					// Storing the attachments if any
@@ -281,6 +334,11 @@ class Blog
 						$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);
+                        }
 					}
 				}
 			}
@@ -297,15 +355,18 @@ class Blog
 	 * @param String $full_text
 	 * @param Integer $blog_id
 	 */
-	public static function edit_post ($post_id, $title, $full_text, $blog_id)
+	public static function edit_post($post_id, $title, $full_text, $blog_id)
 	{
 		// Init
 		$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 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 ;";
+		$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);
 	}
 
@@ -355,12 +416,12 @@ class Blog
 	{
 		$_user = api_get_user_info();
 		$_course = api_get_course_info();
-		global $blog_table_attachment;
+        $blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
-		$upload_ok			= true;
-		$has_attachment		= false;
-		$current_date		= date('Y-m-d H:i:s',time());
-		$course_id 			= api_get_course_int_id();
+        $upload_ok = true;
+        $has_attachment = false;
+        $current_date = date('Y-m-d H:i:s', time());
+        $course_id = api_get_course_int_id();
 
 		if (!empty($_FILES['user_upload']['name'])) {
 			$upload_ok = process_uploaded_file($_FILES['user_upload']);
@@ -379,6 +440,11 @@ class Blog
 			// 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);
@@ -406,6 +472,13 @@ class Blog
 						$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();
+
+                        if ($id) {
+                            $sql = "UPDATE $blog_table_attachment SET id = iid WHERE iid = $id";
+                            Database::query($sql);
+                        }
 					}
 				}
 			}
@@ -415,10 +488,10 @@ class Blog
 	/**
 	 * Deletes a comment from a blogpost
 	 * @author Toon Keppens
-	 * @param Integer $blog_id
-	 * @param Integer $comment_id
+	 * @param int $blog_id
+	 * @param int $comment_id
 	 */
-	public static function delete_comment ($blog_id, $post_id, $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);
@@ -431,7 +504,11 @@ class Blog
 
 		// 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'";
+				WHERE
+				    c_id = $course_id AND
+				    blog_id = '".$blog_id."' AND
+				    item_id = '".$comment_id."' AND
+				    rating_type = 'comment'";
 		Database::query($sql);
 
 		// select comments that have the selected comment as their parent
@@ -440,7 +517,7 @@ class Blog
 		$result = Database::query($sql);
 
 		// Delete them recursively
-		while($comment = Database::fetch_array($result)) {
+		while ($comment = Database::fetch_array($result)) {
 			Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
 		}
 
@@ -458,7 +535,7 @@ class Blog
 	 * @param String $description
 	 * @param String $color
 	 */
-	public static function create_task ($blog_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
+	public static function create_task($blog_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)
 	{
 		// Init
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
@@ -467,11 +544,17 @@ class Blog
 		$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 )
+		$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);
 
 		$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;
 
 		if ($articleDelete == 'on') {
@@ -482,9 +565,16 @@ class Blog
 					'article_delete'
 				)";
 			Database::query($sql);
-		}
 
-		if($articleEdit == 'on') {
+            $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 (
 					'" . (int)$course_id . "',
@@ -493,6 +583,12 @@ class Blog
 					'article_edit'
 				)";
 			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') {
@@ -503,8 +599,13 @@ class Blog
 					'" . Database::escape_string($tool) . "',
 					'article_comments_delete'
 				)";
-
 			Database::query($sql);
+            $id = Database::insert_id();
+
+            if ($id) {
+                $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
+                Database::query($sql);
+            }
 		}
 	}
 
@@ -518,7 +619,7 @@ class Blog
 	 */
 	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_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();
@@ -544,11 +645,16 @@ class Blog
 					'" . Database::escape_string($tool) . "',
 					'article_delete'
 				)";
-
 			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') {
+		if ($articleEdit == 'on') {
 			$sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
@@ -556,9 +662,15 @@ class Blog
 					'article_edit'
 				)";
 			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') {
+		if ($commentsDelete == 'on') {
 			$sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
 					'" . (int)$course_id . "',
 					'" . (int)$task_id . "',
@@ -566,6 +678,12 @@ class Blog
 					'article_comments_delete'
 				)";
 			Database::query($sql);
+            $id = Database::insert_id();
+
+            if ($id) {
+                $sql = "UPDATE $tbl_tasks_permissions SET id = iid WHERE iid = $id";
+                Database::query($sql);
+            }
 		}
 	}
 
@@ -597,7 +715,11 @@ class Blog
 
 		// 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."'";
+				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);
 	}
 
@@ -611,9 +733,9 @@ class Blog
 		$_user = api_get_user_info();
 
 		// Init
-		$tbl_blogs 					= Database::get_course_table(TABLE_BLOGS);
+		$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);
+		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 
 		$course_id = api_get_course_int_id();
 
@@ -634,7 +756,7 @@ class Blog
 
 			if (Database::num_rows($result) > 0) {
 				echo '<ul>';
-				while($mytask = Database::fetch_array($result)) {
+				while ($mytask = Database::fetch_array($result)) {
 					echo '<li><a href="blog.php?action=execute_task&amp;blog_id=' . $mytask['blog_id'] . '&amp;task_id='.stripslashes($mytask['task_id']) . '" title="[Blog: '.stripslashes($mytask['blog_name']) . '] ' . get_lang('ExecuteThisTask') . '">'.stripslashes($mytask['title']) . '</a></li>';
 				}
 				echo '<ul>';
@@ -665,8 +787,7 @@ class Blog
 		$visibility = $blog['visibility'];
 		$title = $blog['blog_name'];
 
-		if($visibility == 1)
-		{
+		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";
@@ -675,9 +796,7 @@ class Blog
 			$sql = "DELETE FROM $tbl_tool
 					WHERE c_id = $course_id AND name = '".Database::escape_string($title)."' LIMIT 1";
 			$result = Database::query($sql);
-		}
-		else
-		{
+		} 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";
@@ -686,6 +805,12 @@ class Blog
 			$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);
+            $id = Database::insert_id();
+
+            if ($id) {
+                $sql = "UPDATE $tbl_tool SET id = iid WHERE iid = $id";
+                Database::query($sql);
+            }
 		}
 	}
 
@@ -695,7 +820,8 @@ class Blog
 	 *
 	 * @param Integer $blog_id
 	 */
-	public static function display_blog_posts($blog_id, $filter = '1=1', $max_number_of_posts = 20) {
+	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);
@@ -705,8 +831,10 @@ class Blog
 		$course_id = api_get_course_int_id();
 
 		// 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
+		$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 AND
 						$filter
@@ -761,7 +889,7 @@ class Blog
 					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&amp;blog_id=' . $blog_id . '&amp;post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . '</a></span>'."\n";
+				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&amp;blog_id=' . $blog_id . '&amp;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 {
@@ -858,10 +986,10 @@ class Blog
 
 		$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))
+		if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id))
 			$blog_post_actions .= '<a href="blog.php?action=edit_post&amp;blog_id=' . $blog_id . '&amp;post_id=' . $post_id . '&amp;article_id=' . $blog_post['post_id'] . '&amp;task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '"><img src="../img/edit.gif" /></a>';
 
-		if(api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id))
+		if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id))
 			$blog_post_actions .= '<a href="blog.php?action=view_post&amp;blog_id=' . $blog_id . '&amp;post_id=' . $post_id . '&amp;do=delete_article&amp;article_id=' . $blog_post['post_id'] . '&amp;task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>';
 
 		if(api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
@@ -875,10 +1003,9 @@ class Blog
 		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))
-		{
+        if (!empty($file_name_array)) {
 			echo ' <br />';
 			echo Display::return_icon('attachment.gif',get_lang('Attachment'));
 			echo '<a href="download.php?file=';
@@ -904,8 +1031,7 @@ class Blog
 		}
 
 		// Display comment form
-		if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_add'))
-		{
+		if (api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) {
 			Blog::display_new_comment_form($blog_id, $post_id, $blog_post['title']);
 		}
 	}
@@ -938,15 +1064,20 @@ class Blog
 					AND user_id = '".(int)$_user['user_id']."'";
 		$result = Database::query($sql);
 
-		if(Database::num_rows($result) == 0) // Add rating
-		{
+        // 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 )
 					VALUES ($course_id, '".(int)$blog_id."', '".Database::escape_string($type)."', '".(int)$item_id."', '".(int)$_user['user_id']."', '".Database::escape_string($rating)."')";
 			$result = Database::query($sql);
+
+            $id = Database::insert_id();
+            if ($id) {
+                $sql = "UPDATE $tbl_blogs_rating SET rating_id = iid WHERE iid = $id";
+                Database::query($sql);
+            }
+
 			return true;
-		}
-		else // Return
-		{
+        } else {
 			return false;
 		}
 	}
@@ -960,14 +1091,18 @@ class Blog
 	 *
 	 * @return array()
 	 */
-	public static function display_rating ($type, $blog_id, $item_id)
+	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)."' ";
+				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);
@@ -989,8 +1124,7 @@ class Blog
 		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
         $course_id = api_get_course_int_id();
 
-		if($type == 'post')
-		{
+        if ($type == 'post') {
 			// Check if the user has already rated this post
 			$sql = "SELECT rating_id FROM $tbl_blogs_rating
 					WHERE c_id = $course_id AND
@@ -999,18 +1133,15 @@ class Blog
 					AND rating_type = '".Database::escape_string($type)."'
 					AND user_id = '".(int)$_user['user_id']."'";
 			$result = Database::query($sql);
-
-			if(Database::num_rows($result) == 0) // Add rating
-			{
+            // 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>';
-			}
-			else // Return
-			{
+            } else {
 				return '';
 			}
 		}
-		if($type = 'comment')
-		{
+
+        if ($type = 'comment') {
 			// 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 ."'
@@ -1019,12 +1150,9 @@ class Blog
 					AND user_id = '".(int)$_user['user_id']."'";
 			$result = Database::query($sql);
 
-			if(Database::num_rows($result) == 0) // 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 . '_' . $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
-			{
+            } else {
 				return '';
 			}
 		}
@@ -1038,7 +1166,7 @@ class Blog
 	 * @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)
+	public static function get_threaded_comments($current = 0, $current_level = 0, $blog_id, $post_id, $task_id = 0)
 	{
 		// Init
 		$tbl_blogs_comments 	= Database::get_course_table(TABLE_BLOGS_COMMENTS);
@@ -1081,7 +1209,7 @@ class Blog
 			if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&amp;blog_id=' . $blog_id . '&amp;post_id=' . $post_id . '&amp;do=delete_comment&amp;comment_id=' . $comment['comment_id'] . '&amp;task_id=' . $task_id . '" title="' . get_lang('DeleteThisComment') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
 			if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); }
 
-			if(!is_null($comment['task_id'])) {
+			if (!is_null($comment['task_id'])) {
 				$border_color = ' border-left: 3px solid #' . $comment['color'];
 			}
 
@@ -1095,8 +1223,7 @@ class Blog
 				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))
-				{
+				if (!empty($file_name_array)) {
 					echo '<br /><br />';
 					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
 					echo '<a href="download.php?file=';
@@ -1112,7 +1239,7 @@ class Blog
 			echo '</div>';
 
 			// Go further down the tree.
-			Blog::get_threaded_comments( $comment['comment_id'], $next_level, $blog_id, $post_id);
+			Blog::get_threaded_comments($comment['comment_id'], $next_level, $blog_id, $post_id);
 		}
 	}
 
@@ -1210,11 +1337,12 @@ class Blog
 	 *
 	 * @param Integer $blog_id
 	 */
-	public static function display_task_list ($blog_id) {
+	public static function display_task_list($blog_id)
+    {
 		global $charset;
         $course_id = api_get_course_int_id();
 
-		if(api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
 			// Init
 			$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 			$counter = 0;
@@ -1252,8 +1380,7 @@ class Blog
 			$result = Database::query($sql);
 
 
-			while($task = Database::fetch_array($result))
-			{
+			while($task = Database::fetch_array($result)) {
 				$counter++;
 				$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
 				$delete_icon = ($task['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
@@ -1286,7 +1413,8 @@ class Blog
 	 *
 	 * @param Integer $blog_id
 	 */
-	public static function display_assigned_task_list ($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);
@@ -1316,7 +1444,7 @@ class Blog
 				ORDER BY target_date ASC";
 		$result = Database::query($sql);
 
-		while($assignment = Database::fetch_array($result)) {
+		while ($assignment = Database::fetch_array($result)) {
 			$counter++;
 			$css_class = (($counter % 2)==0) ? "row_odd" : "row_even";
 			$delete_icon = ($assignment['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
@@ -1353,7 +1481,23 @@ class Blog
 	public static function display_new_task_form ($blog_id)
 	{
 		// Init
-		$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'
+        );
 
 		// form
 		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&amp;blog_id=' . $blog_id . '">';
@@ -1388,21 +1532,21 @@ class Blog
 					</label>
 					<div class="controls">';
 								echo "\t\t\t" . '<table class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
-									echo "\t\t\t\t" . '<tr>' . "\n";
-										echo "\t\t\t\t\t" . '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>' . "\n";
-										echo "\t\t\t\t\t" . '<th width:223px;>' . get_lang('CommentManager') . '</th>' . "\n";
-									echo "\t\t\t\t" . '</tr>' . "\n";
-									echo "\t\t\t\t" . '<tr>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>' . "\n";
-									echo "\t\t\t\t" . '</tr>' . "\n";
-									echo "\t\t\t\t" . '<tr>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="border:1px dotted #808080; text-align:center;"><input id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>' . "\n";
-									echo "\t\t\t\t" . '</tr>' . "\n";
-								echo "\t\t\t" . '</table>' . "\n";
+									echo "\t\t\t\t" . '<tr>';
+										echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
+										echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
+									echo "\t\t\t\t" . '</tr>';
+									echo "\t\t\t\t" . '<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 "\t\t\t\t" . '</tr>';
+									echo "\t\t\t\t" . '<tr>';
+										echo '<td style="text-align:center;"><input id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
+										echo '<td style="text-align:center;"><input id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
+										echo '<td style="border:1px dotted #808080; text-align:center;"><input id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
+									echo "\t\t\t\t" . '</tr>';
+								echo "\t\t\t" . '</table>';
 		echo '		</div>
 				</div>';
 
@@ -1478,27 +1622,27 @@ class Blog
 						while ($row = Database::fetch_array($result))
 							$arrPermissions[] = $row['action'];
 
-						echo "\t" . '<tr>' . "\n";
-							echo "\t\t" . '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>' . "\n";
-							echo "\t\t" . '<td>' . "\n";
+						    echo "\t" . '<tr>';
+							echo "\t\t" . '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
+							echo "\t\t" . '<td>';
 								echo "\t\t\t" . '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
-									echo "\t\t\t\t" . '<tr>' . "\n";
-										echo "\t\t\t\t\t" . '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>' . "\n";
-										echo "\t\t\t\t\t" . '<th width:223px;>' . get_lang('CommentManager') . '</th>' . "\n";
-									echo "\t\t\t\t" . '</tr>' . "\n";
-									echo "\t\t\t\t" . '<tr>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>' . "\n";
-									echo "\t\t\t\t" . '</tr>' . "\n";
-									echo "\t\t\t\t" . '<tr>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>' . "\n";
-									echo "\t\t\t\t" . '</tr>' . "\n";
-								echo "\t\t\t" . '</table>' . "\n";
-							echo "\t\t" . '</td>' . "\n";
-						echo "\t" . '</tr>' . "\n";
+									echo "\t\t\t\t" . '<tr>';
+										echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
+										echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
+									echo "\t\t\t\t" . '</tr>';
+									echo "\t\t\t\t" . '<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 "\t\t\t\t" . '</tr>';
+									echo "\t\t\t\t" . '<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 "\t\t\t\t" . '</tr>';
+								echo "\t\t\t" . '</table>';
+							echo "\t\t" . '</td>';
+						echo "\t" . '</tr>';
 						/* end of edit */
 
 						echo '<tr>
@@ -1689,26 +1833,41 @@ class Blog
 		}
 	}
 
-	public static function edit_assigned_task ($blog_id, $user_id, $task_id, $target_date, $old_user_id, $old_task_id, $old_target_date)
-	{
-
+    /**
+     * @param $blog_id
+     * @param $user_id
+     * @param $task_id
+     * @param $target_date
+     * @param $old_user_id
+     * @param $old_task_id
+     * @param $old_target_date
+     */
+    public static function edit_assigned_task(
+        $blog_id,
+        $user_id,
+        $task_id,
+        $target_date,
+        $old_user_id,
+        $old_task_id,
+        $old_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
-				blog_id = " . (int)$blog_id . " AND
-				user_id = " . (int)$user_id . " AND
-				task_id = " . (int)$task_id . "
-		";
+                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);
+		$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)) {
+		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
@@ -1733,7 +1892,8 @@ class Blog
 	 * @param Integer $blog_id
 	 * @param unknown_type $task_id
 	 */
-	public static function display_select_task_post ($blog_id, $task_id) {
+	public static function display_select_task_post($blog_id, $task_id)
+    {
 		// Init
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 		$tbl_blogs_posts = Database::get_course_table(TABLE_BLOGS_POSTS);
@@ -1759,13 +1919,14 @@ class Blog
 		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) {
+		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&amp;blog_id=' . $blog_id . '&amp;task_id=' . $task_id . '&amp;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');
+        } else {
+            echo get_lang('NoArticles');
+        }
 	}
 
 	/**
@@ -1775,22 +1936,40 @@ class Blog
 	 * @param Integer $blog_id
 	 * @param Integer $user_id
 	 */
-	public static function set_user_subscribed ($blog_id,$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);
+		$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();
 
 		// 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."');";
+		$sql = "INSERT INTO $tbl_blogs_rel_user (c_id, blog_id, user_id )
+		        VALUES ($course_id, '".(int)$blog_id."', '".(int)$user_id."');";
 		$result = Database::query($sql);
 
 		// 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')";
+		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
+		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_add')";
 		$result = Database::query($sql);
-		$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')";
+
+        $id = Database::insert_id();
+        if ($id) {
+            $sql = "UPDATE $tbl_user_permissions SET id = iid WHERE iid = $id";
+            Database::query($sql);
+        }
+
+		$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')";
 		$result = Database::query($sql);
+
+        $id = Database::insert_id();
+        if ($id) {
+            $sql = "UPDATE $tbl_user_permissions SET id = iid WHERE iid = $id";
+            Database::query($sql);
+        }
+
 	}
 
 	/**
@@ -1800,17 +1979,20 @@ class Blog
 	 * @param Integer $blog_id
 	 * @param Integer $user_id
 	 */
-	public static function set_user_unsubscribed ($blog_id, $user_id) {
+	public static function set_user_unsubscribed($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);
+        $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 WHERE blog_id = '".(int)$blog_id."' AND user_id = '".(int)$user_id."'";
-		$result = @Database::query($sql);
+		$sql = "DELETE FROM $tbl_blogs_rel_user
+		        WHERE blog_id = '".(int)$blog_id."' AND user_id = '".(int)$user_id."'";
+		$result = Database::query($sql);
 
 		// Remove this user's permissions.
-		$sql = "DELETE FROM $tbl_user_permissions WHERE user_id = '".(int)$user_id."'";
+		$sql = "DELETE FROM $tbl_user_permissions
+		        WHERE user_id = '".(int)$user_id."'";
 		$result = Database::query($sql);
 	}
 
@@ -1853,16 +2035,20 @@ class Blog
 		// 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, '');
+			$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('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);
+		$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.
@@ -1950,18 +2136,18 @@ class Blog
 
 		$course_id = api_get_course_int_id();
 
-		$sql_query = "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."'";
+		$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_query))) {
+		if (!($sql_result = Database::query($sql))) {
 			return false;
 		}
 
 		$user_data = array ();
 
-		while($myrow = Database::fetch_array($sql_result)) {
+		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);
@@ -1994,7 +2180,7 @@ class Blog
 			$row[] = $task;
 			//Link to register users
 
-			if($myrow["user_id"] != $_user['user_id']) {
+			if ($myrow["user_id"] != $_user['user_id']) {
 				$row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&amp;blog_id=$blog_id&amp;unregister=yes&amp;user_id=" . $myrow['user_id']."\">" . get_lang('UnRegister')."</a>";
 			} else {
 				$row[] = '';
@@ -2339,8 +2525,8 @@ class Blog
 
 				$url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&amp;".api_get_cidreq();
 				$title = $info_log[0];
-    			$image = '<img src="../img/blog.gif" border="0" align="absmiddle" alt="' . $title . '">'."\n";
-    			$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 . "\n";
+    			$image = '<img src="../img/blog.gif" border="0" align="absmiddle" alt="' . $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_body_blog[] = $list_name;
 				$list_body_blog[] = $info_log[1];
@@ -2462,11 +2648,11 @@ function delete_all_blog_attachment($blog_id,$post_id=null,$comment_id=null)
 	$sys_course_path = api_get_path(SYS_COURSE_PATH);
 	$updir = $sys_course_path.$courseDir;
 
-	$sql= 'SELECT path FROM '.$blog_table_attachment.' WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
+	$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))
-	{
+	while ($row=Database::fetch_row($result)) {
 		$file=$updir.'/'.$row[0];
 		if (Security::check_abs_path($file,$updir) )
 		{
@@ -2517,7 +2703,8 @@ function get_blog_post_from_user($course_code, $user_id)
  * @param string db course name
  * @param int user id
  */
-function get_blog_comment_from_user($course_code, $user_id) {
+function get_blog_comment_from_user($course_code, $user_id)
+{
 	$tbl_blogs 			= Database::get_course_table(TABLE_BLOGS);
 	$tbl_blog_comment 	= Database::get_course_table(TABLE_BLOGS_COMMENTS);
 	$user_id 			= intval($user_id);
diff --git a/src/Chamilo/CourseBundle/Entity/CBlog.php b/src/Chamilo/CourseBundle/Entity/CBlog.php
index d0425a92b0..6fabe715de 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlog.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlog.php
@@ -33,8 +33,6 @@ class CBlog
      * @var integer
      *
      * @ORM\Column(name="blog_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="NONE")
      */
     private $blogId;