chamilo / chamilo-lms

main/inc/lib/blog.lib.php

Indentation +1845 added lines, -1846 removed lines

@@ -6,115 +6,114 @@ 
  *
  * 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)) {
-			// init
-			$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)) {
+            // init
+            $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 Integer $course_id Id
-	 * @param String $title
-	 * @param Text $description
-	 */
-	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 Integer $course_id Id
+     * @param String $title
+     * @param Text $description
+     */
+    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);
         $tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 
-		//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
@@ -123,9 +122,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,
@@ -133,14 +132,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,
@@ -148,12 +147,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'),
@@ -167,10 +166,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)
+            // 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);
+            Database::query($sql);
 
             $toolId = Database::insert_id();
             if ($toolId) {
@@ -178,37 +177,37 @@ 
                 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 Integer $course_id Id
-	 * @param String $title
-	 * @param Text $description
-	 */
-	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 Integer $course_id Id
+     * @param String $title
+     * @param Text $description
+     */
+    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,
@@ -217,60 +216,60 @@ 
             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);
         $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);
+        $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 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,
@@ -278,152 +277,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;
@@ -431,55 +430,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();
 
@@ -487,92 +486,92 @@ 
                             $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)
-	{
-		// Init
-		$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)
+    {
+        // Init
+        $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();
 
@@ -582,172 +581,172 @@ 
             }
         }
 
-		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
-	 * @param Integer $assignment_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
+     * @param Integer $assignment_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
@@ -761,85 +760,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
@@ -847,131 +846,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
@@ -980,107 +979,107 @@ 
                     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') . '"><img src="../img/edit.gif" /></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') . '"><img src="../img/edit.gif" /></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;"><img src="../img/delete.gif" border="0" /></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;"><img src="../img/delete.gif" border="0" /></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) {
@@ -1088,107 +1087,107 @@ 
                 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 $item_id
-	 *
-	 *@return String
-	 */
-	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 $item_id
+     *
+     *@return String
+     */
+    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
@@ -1200,11 +1199,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
@@ -1213,104 +1212,104 @@ 
 						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 = "";
-			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') . '" 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'])) {
-				$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 />';
-				}
+            $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') . '" 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'])) {
+                $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
+                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
@@ -1318,69 +1317,69 @@ 
 				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)
+        $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"><img src="../img/blog_newtasks.gif" border="0" align="middle" alt="'.get_lang('AddTasks').'" />' . get_lang('AddTasks') . '</a> ';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign"><img src="../img/blog_task.gif" border="0" align="middle" alt="'.get_lang('AssignTasks').'" />' . get_lang('AssignTasks') . '</a>';
-			?>
+            echo '<div class="actions">';
+            echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add"><img src="../img/blog_newtasks.gif" border="0" align="middle" alt="'.get_lang('AddTasks').'" />' . get_lang('AddTasks') . '</a> ';
+            echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign"><img src="../img/blog_task.gif" border="0" align="middle" alt="'.get_lang('AssignTasks').'" />' . 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>\n",
-					 "<th><b>",get_lang('Description'),"</b></th>\n",
-					 "<th><b>",get_lang('Color'),"</b></th>\n",
-					 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
-				"</tr>\n";
+            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>\n",
+                        "<th><b>",get_lang('Description'),"</b></th>\n",
+                        "<th><b>",get_lang('Color'),"</b></th>\n",
+                        "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+                "</tr>\n";
 
 
-			$sql = " SELECT
+            $sql = " SELECT
                         blog_id,
                         task_id,
                         blog_id,
@@ -1391,64 +1390,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);
-
-
-			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";
-				$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">',
-							 '<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
-							 '<td>' . Security::remove_XSS($task['description']) . '</td>',
-							 '<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>',
-							 '<td width="50">',
-							 	'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
-								'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
-								"</a>\n",
-								'<a href="' . $delete_link . '"',
-								$delete_confirm,
-								'><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
-								"</a>\n",
-							 '</td>',
-						'</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)
+            $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.gif" : "delete.gif";
+                $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">',
+                                '<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
+                                '<td>' . Security::remove_XSS($task['description']) . '</td>',
+                                '<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>',
+                                '<td width="50">',
+                                    '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
+                                '<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+                                "</a>\n",
+                                '<a href="' . $delete_link . '"',
+                                $delete_confirm,
+                                '><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+                                "</a>\n",
+                                '</td>',
+                        '</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>\n",
-				 "<th><b>",get_lang('Task'),"</b></th>\n",
-				 "<th><b>",get_lang('Description'),"</b></th>\n",
-				 "<th><b>",get_lang('TargetDate'),"</b></th>\n",
-				 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
-			"</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>\n",
+                    "<th><b>",get_lang('Task'),"</b></th>\n",
+                    "<th><b>",get_lang('Description'),"</b></th>\n",
+                    "<th><b>",get_lang('TargetDate'),"</b></th>\n",
+                    "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+            "</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
@@ -1457,45 +1456,45 @@ 
 					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.gif" : "delete.gif";
-			$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.gif" : "delete.gif";
+            $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);
 
-			echo	'<tr class="' . $css_class . '" valign="top">',
-						 '<td width="240">' . Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)) . '</td>',
-						 '<td>'.stripslashes($assignment['title']) . '</td>',
-						 '<td>'.stripslashes($assignment['description']) . '</td>',
-						 '<td>' . $assignment['target_date'] . '</td>',
-						 '<td width="50">',
-						 	'<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'] . '">',
-							'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
-							"</a>\n",
-							'<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'] . '" ',
-							'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
-							'<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
-							"</a>\n",
-						 '</td>',
-					'</tr>';
-		}
-		echo "</table>";
-	}
-
-	/**
-	 * Displays new task form
-	 * @author Toon Keppens
-	 *
-	 */
-	public static function display_new_task_form ($blog_id)
-	{
-		// Init
+            echo	'<tr class="' . $css_class . '" valign="top">',
+                            '<td width="240">' . Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)) . '</td>',
+                            '<td>'.stripslashes($assignment['title']) . '</td>',
+                            '<td>'.stripslashes($assignment['description']) . '</td>',
+                            '<td>' . $assignment['target_date'] . '</td>',
+                            '<td width="50">',
+                                '<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'] . '">',
+                            '<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+                            "</a>\n",
+                            '<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'] . '" ',
+                            'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
+                            '<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+                            "</a>\n",
+                            '</td>',
+                    '</tr>';
+        }
+        echo "</table>";
+    }
+
+    /**
+     * Displays new task form
+     * @author Toon Keppens
+     *
+     */
+    public static function display_new_task_form ($blog_id)
+    {
+        // Init
         $colors = array(
             'FFFFFF',
             'FFFF99',
@@ -1514,14 +1513,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>
@@ -1530,8 +1529,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>
@@ -1540,8 +1539,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>
@@ -1562,12 +1561,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>
@@ -1578,40 +1577,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>
@@ -1623,42 +1622,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">';
@@ -1667,7 +1666,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>
@@ -1680,34 +1679,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,
@@ -1719,97 +1718,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
@@ -1818,11 +1817,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,
@@ -1837,9 +1836,9 @@ 
 					'" . Database::escape_string($target_date) . "'
 				)";
 
-			Database::query($sql);
-		}
-	}
+            Database::query($sql);
+        }
+    }
 
     /**
      * @param $blog_id
@@ -1859,11 +1858,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
@@ -1872,11 +1871,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 . ",
@@ -1889,76 +1888,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) {
@@ -1966,9 +1965,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) {
@@ -1976,197 +1975,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 Html 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 Html 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
@@ -2174,158 +2173,158 @@ 
 							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
+     */
+    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 Array $blogitems an array containing all the blog items for the given month
+     * @param Integer $month: the integer value of the month we are viewing
+     * @param Integer $year: the 4-digit year indication e.g. 2005
+     * @param String $monthName: the language variable for the mont name
+     *
+     * @return html code
+     */
+    public static function display_minimonthcalendar($month, $year, $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
-	 */
-	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 Array $blogitems an array containing all the blog items for the given month
-	 * @param Integer $month: the integer value of the month we are viewing
-	 * @param Integer $year: the 4-digit year indication e.g. 2005
-	 * @param String $monthName: the language variable for the mont name
-	 *
-	 * @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
+        // 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
@@ -2335,20 +2334,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
@@ -2360,84 +2359,84 @@ 
 					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\">\n",
-				"<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>\n",
-				"<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n",
-				"<th width=\"10%\" align=\"right\"><a href=\"", $forewardsURL, "\">&raquo;</a></th>\n", "</tr>";
-
-		echo "<tr>\n";
-
-		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') . '">
+            $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\">\n",
+                "<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>\n",
+                "<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n",
+                "<th width=\"10%\" align=\"right\"><a href=\"", $forewardsURL, "\">&raquo;</a></th>\n", "</tr>";
+
+        echo "<tr>\n";
+
+        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') . '">
 								<img src="../img/blog_task.gif" alt="Task" title="' . get_lang('ExecuteThisTask') . '" /></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'));
@@ -2447,34 +2446,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'));
@@ -2490,82 +2489,82 @@ 
         $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_session = api_get_session_condition($session_id, false);
+        //condition for the session
+        $session_id = api_get_session_id();
+        $condition_session = api_get_session_condition($session_id, false);
 
-		$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>\n";
-				$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>\n";
+                $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>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=visibility&blog_id=' . $info_log[3] . '">';
+                $my_image.= "</a>\n";
+                $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>\n";
+                $my_image.= "</a>\n";
 
-				$list_body_blog[]=$my_image;
+                $list_body_blog[]=$my_image;
 
-				$list_content_blog[]=$list_body_blog;
-				$list_body_blog = array();
+                $list_content_blog[]=$list_body_blog;
+                $list_body_blog = array();
 
-			}
-			$parameters='';
-			//$parameters=array('action'=>Security::remove_XSS($_GET['action']));
-			$table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
-			//$table->set_additional_parameters($parameters);
-			$table->set_header(0, get_lang('Title'));
-			$table->set_header(1, get_lang('SubTitle'));
-			$table->set_header(2, get_lang('Modify'));
-			$table->display();
-		}
-	}
+            }
+            $parameters='';
+            //$parameters=array('action'=>Security::remove_XSS($_GET['action']));
+            $table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
+            //$table->set_additional_parameters($parameters);
+            $table->set_header(0, get_lang('Title'));
+            $table->set_header(1, get_lang('SubTitle'));
+            $table->set_header(2, get_lang('Modify'));
+            $table->display();
+        }
+    }
 }
 
 /**
@@ -2585,34 +2584,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;
 }
 
 /**
@@ -2626,16 +2625,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.'" ';
     }
@@ -2647,25 +2646,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);
 }
 
 /**
@@ -2675,12 +2674,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)
@@ -2689,19 +2688,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;
 }
 
 /**
@@ -2718,7 +2717,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
@@ -2726,18 +2725,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;
 }
 

main/inc/lib/plugin.class.php

Indentation +7 added lines, -7 removed lines

@@ -591,13 +591,13 @@
 
     }
 
-   /**
-    * Add a tab to platform
-    * @param string   $tabName
-    * @param string   $url
-    *
-    * @return boolean
-    */
+    /**
+     * Add a tab to platform
+     * @param string   $tabName
+     * @param string   $url
+     *
+     * @return boolean
+     */
     public function addTab($tabName, $url)
     {
         $sql = "SELECT * FROM settings_current

main/inc/lib/course.lib.php

Indentation +2 added lines, -2 removed lines

@@ -1679,7 +1679,7 @@ 
 
         // We get the coach for the given course in a given session.
         $sql = 'SELECT user_id FROM ' . Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER) .
-               ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
+                ' WHERE session_id ="' . $session_id . '" AND c_id="' . $courseId . '" AND status = 2';
         $rs = Database::query($sql);
         while ($user = Database::fetch_array($rs)) {
             $user_info = api_get_user_info($user['user_id']);
@@ -3972,7 +3972,7 @@ 
         }
 
         $session_title .= isset($course['special_course']) ? ' ' .
-                          Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
+                            Display::return_icon('klipper.png', get_lang('CourseAutoRegister')) : '';
 
         $params['title'] = $session_title;
         $params['extra'] = '';

main/inc/lib/access_url_edit_courses_to_url_functions.lib.php

Indentation +9 added lines, -9 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /* For licensing terms, see /license.txt */
 /**
- * Definition of the Accessurleditcoursestourl class
- * @package chamilo.library
- */
+     * Definition of the Accessurleditcoursestourl class
+     * @package chamilo.library
+     */
 
 /**
  * Access_url_edit_courses_to_url class
@@ -38,17 +38,17 @@ 
             $needle = Database::escape_string($needle);
             // search courses where username or firstname or lastname begins likes $needle
             $sql = 'SELECT code, title FROM '.$tbl_course.' u '.
-                   ' WHERE (title LIKE "'.$needle.'%" '.
-                   ' OR code LIKE "'.$needle.'%" '.
-                   ' ) '.
-                   ' ORDER BY title, code '.
-                   ' LIMIT 11';
+                    ' WHERE (title LIKE "'.$needle.'%" '.
+                    ' OR code LIKE "'.$needle.'%" '.
+                    ' ) '.
+                    ' ORDER BY title, code '.
+                    ' LIMIT 11';
             $rs = Database::query($sql);
             $i=0;
             while ($course = Database :: fetch_array($rs)) {
                 $i++;
                 if ($i<=10) {
-                     $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
+                        $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
                 } else {
                     $return .= '...<br />';
                 }

main/inc/lib/social.lib.php

Indentation +6 added lines, -6 removed lines

@@ -510,7 +510,7 @@ 
         if ($course_visibility != COURSE_VISIBILITY_HIDDEN &&
             ($course_visibility != COURSE_VISIBILITY_CLOSED || $user_in_course_status == COURSEMANAGER)
         ) {
-           $result .= '<span class="title">' . $course_title . '<span>';
+            $result .= '<span class="title">' . $course_title . '<span>';
         } else {
             $result .= $course_title." "." ".get_lang('CourseClosed')."";
         }
@@ -1414,7 +1414,7 @@ 
             }
             $media .= '<div class="user-image">';
             $media .= '<a href="'.$url.'" ><img src="'. $users[$userIdLoop]['avatar'] .
-                       '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>';
+                        '" alt="'.$users[$userIdLoop]['complete_name'].'" class="avatar-thumb"></a>';
             $media .= '</div>';
             $media .= '<div class="user-data">';
             $media .= '<div class="username">' . '<a href="'.$url.'">'.$nameComplete.'</a></div>';
@@ -1645,10 +1645,10 @@ 
         return $name;
     }
     /**
-    * Delete messages delete logic
-    * @param int $id id message to delete.
-    * @return bool status query
-    */
+     * Delete messages delete logic
+     * @param int $id id message to delete.
+     * @return bool status query
+     */
     public static function deleteMessage($id)
     {
         $id = intval($id);

main/inc/lib/message.lib.php

Indentation +1 added lines, -1 removed lines

@@ -1532,7 +1532,7 @@
 
         if (isset($_REQUEST['action'])) {
             switch ($_REQUEST['action']) {
-                 case 'mark_as_unread' :
+                    case 'mark_as_unread' :
                     $number_of_selected_messages = count($_POST['id']);
                     if (is_array($_POST['id'])) {
                         foreach ($_POST['id'] as $index => $message_id) {

main/inc/lib/skill.lib.php

Indentation +8 added lines, -8 removed lines

@@ -33,11 +33,11 @@ 
     }
 
     /**
-    * This function is for editing profile info from profile_id.
-    * @param int    $profileId
-    * @param string $name
-    * @param string $description
-    */
+     * This function is for editing profile info from profile_id.
+     * @param int    $profileId
+     * @param string $name
+     * @param string $description
+     */
     public function updateProfileInfo($profileId, $name, $description)
     {
         $profileId = intval($profileId);
@@ -128,9 +128,9 @@ 
     }
 
     /**
-    * This function is for getting profile info from profile_id.
-    * @param int $profileId
-    */
+     * This function is for getting profile info from profile_id.
+     * @param int $profileId
+     */
 
     public function getProfileInfo($profileId)
     {

main/inc/lib/baker.lib.php

Indentation +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
                 $data = substr($png,$ipos,$chunk['size']);
                 $sections = explode("\0", $data);
                 if ($sections[0] == $key) {
-                   return $sections;
+                    return $sections;
                 }
             }
             // Extract the data and the CRC

main/inc/lib/pclzip/pclzip.lib.php

Indentation +2654 added lines, -2654 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * @package chamilo.include

- */

+     * @package chamilo.include

+     */

 /**

- * Code

- */

+     * Code

+     */

 // --------------------------------------------------------------------------------

 // PhpConcept Library - Zip Module 2.8.2

 // --------------------------------------------------------------------------------

@@ -39,154 +39,154 @@ 
 // http://php.net/manual/en/function.gzopen.php

 // --------------------------------------------------------------------------------

 if (!function_exists('gzopen') && function_exists('gzopen64')) {

-	function gzopen($filename, $mode, $use_include_path = 0) {

-		return gzopen64($filename, $mode, $use_include_path);

-	}

+    function gzopen($filename, $mode, $use_include_path = 0) {

+        return gzopen64($filename, $mode, $use_include_path);

+    }

 }

 // --------------------------------------------------------------------------------

 

-  // ----- Constants

-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {

+    // ----- Constants

+    if (!defined('PCLZIP_READ_BLOCK_SIZE')) {

     define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );

-  }

-

-  // ----- File list separator

-  // In version 1.x of PclZip, the separator for file list is a space

-  // (which is not a very smart choice, specifically for windows paths !).

-  // A better separator should be a comma (,). This constant gives you the

-  // abilty to change that.

-  // However notice that changing this value, may have impact on existing

-  // scripts, using space separated filenames.

-  // Recommanded values for compatibility with older versions :

-  //define( 'PCLZIP_SEPARATOR', ' ' );

-  // Recommanded values for smart separation of filenames.

-  if (!defined('PCLZIP_SEPARATOR')) {

+    }

+

+    // ----- File list separator

+    // In version 1.x of PclZip, the separator for file list is a space

+    // (which is not a very smart choice, specifically for windows paths !).

+    // A better separator should be a comma (,). This constant gives you the

+    // abilty to change that.

+    // However notice that changing this value, may have impact on existing

+    // scripts, using space separated filenames.

+    // Recommanded values for compatibility with older versions :

+    //define( 'PCLZIP_SEPARATOR', ' ' );

+    // Recommanded values for smart separation of filenames.

+    if (!defined('PCLZIP_SEPARATOR')) {

     define( 'PCLZIP_SEPARATOR', '|' );

-  }

-

-  // ----- Error configuration

-  // 0 : PclZip Class integrated error handling

-  // 1 : PclError external library error handling. By enabling this

-  //     you must ensure that you have included PclError library.

-  // [2,...] : reserved for futur use

-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {

+    }

+

+    // ----- Error configuration

+    // 0 : PclZip Class integrated error handling

+    // 1 : PclError external library error handling. By enabling this

+    //     you must ensure that you have included PclError library.

+    // [2,...] : reserved for futur use

+    if (!defined('PCLZIP_ERROR_EXTERNAL')) {

     define( 'PCLZIP_ERROR_EXTERNAL', 0 );

-  }

-

-  // ----- Optional static temporary directory

-  //       By default temporary files are generated in the script current

-  //       path.

-  //       If defined :

-  //       - MUST BE terminated by a '/'.

-  //       - MUST be a valid, already created directory

-  //       Samples :

-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );

-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );

-  if (!defined('PCLZIP_TEMPORARY_DIR')) {

+    }

+

+    // ----- Optional static temporary directory

+    //       By default temporary files are generated in the script current

+    //       path.

+    //       If defined :

+    //       - MUST BE terminated by a '/'.

+    //       - MUST be a valid, already created directory

+    //       Samples :

+    // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );

+    // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );

+    if (!defined('PCLZIP_TEMPORARY_DIR')) {

     define( 'PCLZIP_TEMPORARY_DIR', '' );

-  }

-

-  // ----- Optional threshold ratio for use of temporary files

-  //       Pclzip sense the size of the file to add/extract and decide to

-  //       use or not temporary file. The algorythm is looking for

-  //       memory_limit of PHP and apply a ratio.

-  //       threshold = memory_limit * ratio.

-  //       Recommended values are under 0.5. Default 0.47.

-  //       Samples :

-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );

-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {

+    }

+

+    // ----- Optional threshold ratio for use of temporary files

+    //       Pclzip sense the size of the file to add/extract and decide to

+    //       use or not temporary file. The algorythm is looking for

+    //       memory_limit of PHP and apply a ratio.

+    //       threshold = memory_limit * ratio.

+    //       Recommended values are under 0.5. Default 0.47.

+    //       Samples :

+    // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );

+    if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {

     define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );

-  }

+    }

 

 // --------------------------------------------------------------------------------

 // ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****

 // --------------------------------------------------------------------------------

 

-  // ----- Global variables

-  $g_pclzip_version = "2.8.2";

-

-  // ----- Error codes

-  //   -1 : Unable to open file in binary write mode

-  //   -2 : Unable to open file in binary read mode

-  //   -3 : Invalid parameters

-  //   -4 : File does not exist

-  //   -5 : Filename is too long (max. 255)

-  //   -6 : Not a valid zip file

-  //   -7 : Invalid extracted file size

-  //   -8 : Unable to create directory

-  //   -9 : Invalid archive extension

-  //  -10 : Invalid archive format

-  //  -11 : Unable to delete file (unlink)

-  //  -12 : Unable to rename file (rename)

-  //  -13 : Invalid header checksum

-  //  -14 : Invalid archive size

-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );

-  define( 'PCLZIP_ERR_NO_ERROR', 0 );

-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );

-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );

-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );

-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );

-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );

-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );

-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );

-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );

-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );

-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );

-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );

-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );

-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );

-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );

-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );

-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );

-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );

-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );

-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );

-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );

-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );

-

-  // ----- Options values

-  define( 'PCLZIP_OPT_PATH', 77001 );

-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );

-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );

-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );

-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );

-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );

-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );

-  define( 'PCLZIP_OPT_BY_NAME', 77008 );

-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );

-  define( 'PCLZIP_OPT_BY_EREG', 77010 );

-  define( 'PCLZIP_OPT_BY_PREG', 77011 );

-  define( 'PCLZIP_OPT_COMMENT', 77012 );

-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );

-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );

-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );

-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );

-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );

-  // Having big trouble with crypt. Need to multiply 2 long int

-  // which is not correctly supported by PHP ...

-  //define( 'PCLZIP_OPT_CRYPT', 77018 );

-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );

-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );

-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias

-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );

-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias

-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );

-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias

-

-  // ----- File description attributes

-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );

-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );

-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );

-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );

-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );

-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );

-

-  // ----- Call backs values

-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );

-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );

-  define( 'PCLZIP_CB_PRE_ADD', 78003 );

-  define( 'PCLZIP_CB_POST_ADD', 78004 );

-  /* For futur use

+    // ----- Global variables

+    $g_pclzip_version = "2.8.2";

+

+    // ----- Error codes

+    //   -1 : Unable to open file in binary write mode

+    //   -2 : Unable to open file in binary read mode

+    //   -3 : Invalid parameters

+    //   -4 : File does not exist

+    //   -5 : Filename is too long (max. 255)

+    //   -6 : Not a valid zip file

+    //   -7 : Invalid extracted file size

+    //   -8 : Unable to create directory

+    //   -9 : Invalid archive extension

+    //  -10 : Invalid archive format

+    //  -11 : Unable to delete file (unlink)

+    //  -12 : Unable to rename file (rename)

+    //  -13 : Invalid header checksum

+    //  -14 : Invalid archive size

+    define( 'PCLZIP_ERR_USER_ABORTED', 2 );

+    define( 'PCLZIP_ERR_NO_ERROR', 0 );

+    define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );

+    define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );

+    define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );

+    define( 'PCLZIP_ERR_MISSING_FILE', -4 );

+    define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );

+    define( 'PCLZIP_ERR_INVALID_ZIP', -6 );

+    define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );

+    define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );

+    define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );

+    define( 'PCLZIP_ERR_BAD_FORMAT', -10 );

+    define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );

+    define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );

+    define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );

+    define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );

+    define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );

+    define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );

+    define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );

+    define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );

+    define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );

+    define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );

+    define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );

+

+    // ----- Options values

+    define( 'PCLZIP_OPT_PATH', 77001 );

+    define( 'PCLZIP_OPT_ADD_PATH', 77002 );

+    define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );

+    define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );

+    define( 'PCLZIP_OPT_SET_CHMOD', 77005 );

+    define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );

+    define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );

+    define( 'PCLZIP_OPT_BY_NAME', 77008 );

+    define( 'PCLZIP_OPT_BY_INDEX', 77009 );

+    define( 'PCLZIP_OPT_BY_EREG', 77010 );

+    define( 'PCLZIP_OPT_BY_PREG', 77011 );

+    define( 'PCLZIP_OPT_COMMENT', 77012 );

+    define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );

+    define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );

+    define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );

+    define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );

+    define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );

+    // Having big trouble with crypt. Need to multiply 2 long int

+    // which is not correctly supported by PHP ...

+    //define( 'PCLZIP_OPT_CRYPT', 77018 );

+    define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );

+    define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );

+    define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias

+    define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );

+    define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias

+    define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );

+    define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias

+

+    // ----- File description attributes

+    define( 'PCLZIP_ATT_FILE_NAME', 79001 );

+    define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );

+    define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );

+    define( 'PCLZIP_ATT_FILE_MTIME', 79004 );

+    define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );

+    define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );

+

+    // ----- Call backs values

+    define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );

+    define( 'PCLZIP_CB_POST_EXTRACT', 78002 );

+    define( 'PCLZIP_CB_PRE_ADD', 78003 );

+    define( 'PCLZIP_CB_POST_ADD', 78004 );

+    /* For futur use

   define( 'PCLZIP_CB_PRE_LIST', 78005 );

   define( 'PCLZIP_CB_POST_LIST', 78006 );

   define( 'PCLZIP_CB_PRE_DELETE', 78007 );

@@ -224,21 +224,21 @@ 
     // The class can then disable the magic_quotes and reset it after

     var $magic_quotes_status;

 

-  // --------------------------------------------------------------------------------

-  // Function : PclZip()

-  // Description :

-  //   Creates a PclZip object and set the name of the associated Zip archive

-  //   filename.

-  //   Note that no real action is taken, if the archive does not exist it is not

-  //   created. Use create() for that.

-  // --------------------------------------------------------------------------------

-  function PclZip($p_zipname)

-  {

+    // --------------------------------------------------------------------------------

+    // Function : PclZip()

+    // Description :

+    //   Creates a PclZip object and set the name of the associated Zip archive

+    //   filename.

+    //   Note that no real action is taken, if the archive does not exist it is not

+    //   created. Use create() for that.

+    // --------------------------------------------------------------------------------

+    function PclZip($p_zipname)

+    {

 

     // ----- Tests the zlib

     if (!function_exists('gzopen'))

     {

-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');

+        die('Abort '.basename(__FILE__).' : Missing zlib extensions');

     }

 

     // ----- Set the attributes

@@ -248,48 +248,48 @@ 
 

     // ----- Return

     return;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function :

-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")

-  //   create($p_filelist, $p_option, $p_option_value, ...)

-  // Description :

-  //   This method supports two different synopsis. The first one is historical.

-  //   This method creates a Zip Archive. The Zip file is created in the

-  //   filesystem. The files and directories indicated in $p_filelist

-  //   are added in the archive. See the parameters description for the

-  //   supported format of $p_filelist.

-  //   When a directory is in the list, the directory and its content is added

-  //   in the archive.

-  //   In this synopsis, the function takes an optional variable list of

-  //   options. See bellow the supported options.

-  // Parameters :

-  //   $p_filelist : An array containing file or directory names, or

-  //                 a string containing one filename or one directory name, or

-  //                 a string containing a list of filenames and/or directory

-  //                 names separated by spaces.

-  //   $p_add_dir : A path to add before the real path of the archived file,

-  //                in order to have it memorized in the archive.

-  //   $p_remove_dir : A path to remove from the real path of the file to archive,

-  //                   in order to have a shorter path memorized in the archive.

-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir

-  //                   is removed first, before $p_add_dir is added.

-  // Options :

-  //   PCLZIP_OPT_ADD_PATH :

-  //   PCLZIP_OPT_REMOVE_PATH :

-  //   PCLZIP_OPT_REMOVE_ALL_PATH :

-  //   PCLZIP_OPT_COMMENT :

-  //   PCLZIP_CB_PRE_ADD :

-  //   PCLZIP_CB_POST_ADD :

-  // Return Values :

-  //   0 on failure,

-  //   The list of the added files, with a status of the add action.

-  //   (see PclZip::listContent() for list entry format)

-  // --------------------------------------------------------------------------------

-  function create($p_filelist)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function :

+    //   create($p_filelist, $p_add_dir="", $p_remove_dir="")

+    //   create($p_filelist, $p_option, $p_option_value, ...)

+    // Description :

+    //   This method supports two different synopsis. The first one is historical.

+    //   This method creates a Zip Archive. The Zip file is created in the

+    //   filesystem. The files and directories indicated in $p_filelist

+    //   are added in the archive. See the parameters description for the

+    //   supported format of $p_filelist.

+    //   When a directory is in the list, the directory and its content is added

+    //   in the archive.

+    //   In this synopsis, the function takes an optional variable list of

+    //   options. See bellow the supported options.

+    // Parameters :

+    //   $p_filelist : An array containing file or directory names, or

+    //                 a string containing one filename or one directory name, or

+    //                 a string containing a list of filenames and/or directory

+    //                 names separated by spaces.

+    //   $p_add_dir : A path to add before the real path of the archived file,

+    //                in order to have it memorized in the archive.

+    //   $p_remove_dir : A path to remove from the real path of the file to archive,

+    //                   in order to have a shorter path memorized in the archive.

+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir

+    //                   is removed first, before $p_add_dir is added.

+    // Options :

+    //   PCLZIP_OPT_ADD_PATH :

+    //   PCLZIP_OPT_REMOVE_PATH :

+    //   PCLZIP_OPT_REMOVE_ALL_PATH :

+    //   PCLZIP_OPT_COMMENT :

+    //   PCLZIP_CB_PRE_ADD :

+    //   PCLZIP_CB_POST_ADD :

+    // Return Values :

+    //   0 on failure,

+    //   The list of the added files, with a status of the add action.

+    //   (see PclZip::listContent() for list entry format)

+    // --------------------------------------------------------------------------------

+    function create($p_filelist)

+    {

     $v_result=1;

 

     // ----- Reset the error handler

@@ -304,53 +304,53 @@ 
 

     // ----- Look for arguments

     if ($v_size > 1) {

-      // ----- Get the arguments

-      $v_arg_list = func_get_args();

+        // ----- Get the arguments

+        $v_arg_list = func_get_args();

 

-      // ----- Remove from the options list the first argument

-      array_shift($v_arg_list);

-      $v_size--;

+        // ----- Remove from the options list the first argument

+        array_shift($v_arg_list);

+        $v_size--;

 

-      // ----- Look for first arg

-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {

+        // ----- Look for first arg

+        if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {

 

         // ----- Parse the options

         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

                                             array (PCLZIP_OPT_REMOVE_PATH => 'optional',

-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

-                                                   PCLZIP_OPT_ADD_PATH => 'optional',

-                                                   PCLZIP_CB_PRE_ADD => 'optional',

-                                                   PCLZIP_CB_POST_ADD => 'optional',

-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',

-                                                   PCLZIP_OPT_COMMENT => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'

-                                                   //, PCLZIP_OPT_CRYPT => 'optional'

-                                             ));

+                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

+                                                    PCLZIP_OPT_ADD_PATH => 'optional',

+                                                    PCLZIP_CB_PRE_ADD => 'optional',

+                                                    PCLZIP_CB_POST_ADD => 'optional',

+                                                    PCLZIP_OPT_NO_COMPRESSION => 'optional',

+                                                    PCLZIP_OPT_COMMENT => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'

+                                                    //, PCLZIP_OPT_CRYPT => 'optional'

+                                                ));

         if ($v_result != 1) {

-          return 0;

+            return 0;

+        }

         }

-      }

 

-      // ----- Look for 2 args

-      // Here we need to support the first historic synopsis of the

-      // method.

-      else {

+        // ----- Look for 2 args

+        // Here we need to support the first historic synopsis of the

+        // method.

+        else {

 

         // ----- Get the first argument

         $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];

 

         // ----- Look for the optional second argument

         if ($v_size == 2) {

-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];

+            $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];

         }

         else if ($v_size > 2) {

-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,

-		                       "Invalid number / type of arguments");

-          return 0;

+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,

+                                "Invalid number / type of arguments");

+            return 0;

+        }

         }

-      }

     }

 

     // ----- Look for default option values

@@ -365,114 +365,114 @@ 
     // ----- Look if the $p_filelist is really an array

     if (is_array($p_filelist)) {

 

-      // ----- Look if the first element is also an array

-      //       This will mean that this is a file description entry

-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {

+        // ----- Look if the first element is also an array

+        //       This will mean that this is a file description entry

+        if (isset($p_filelist[0]) && is_array($p_filelist[0])) {

         $v_att_list = $p_filelist;

-      }

+        }

 

-      // ----- The list is a list of string names

-      else {

+        // ----- The list is a list of string names

+        else {

         $v_string_list = $p_filelist;

-      }

+        }

     }

 

     // ----- Look if the $p_filelist is a string

     else if (is_string($p_filelist)) {

-      // ----- Create a list from the string

-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);

+        // ----- Create a list from the string

+        $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);

     }

 

     // ----- Invalid variable type for $p_filelist

     else {

-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");

-      return 0;

+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");

+        return 0;

     }

 

     // ----- Reformat the string list

     if (sizeof($v_string_list) != 0) {

-      foreach ($v_string_list as $v_string) {

+        foreach ($v_string_list as $v_string) {

         if ($v_string != '') {

-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;

+            $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;

         }

         else {

         }

-      }

+        }

     }

 

     // ----- For each file in the list check the attributes

     $v_supported_attributes

     = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'

-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'

-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'

-             ,PCLZIP_ATT_FILE_MTIME => 'optional'

-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'

-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'

-						);

+                ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'

+                ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'

+                ,PCLZIP_ATT_FILE_MTIME => 'optional'

+                ,PCLZIP_ATT_FILE_CONTENT => 'optional'

+                ,PCLZIP_ATT_FILE_COMMENT => 'optional'

+                        );

     foreach ($v_att_list as $v_entry) {

-      $v_result = $this->privFileDescrParseAtt($v_entry,

-                                               $v_filedescr_list[],

-                                               $v_options,

-                                               $v_supported_attributes);

-      if ($v_result != 1) {

+        $v_result = $this->privFileDescrParseAtt($v_entry,

+                                                $v_filedescr_list[],

+                                                $v_options,

+                                                $v_supported_attributes);

+        if ($v_result != 1) {

         return 0;

-      }

+        }

     }

 

     // ----- Expand the filelist (expand directories)

     $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);

     if ($v_result != 1) {

-      return 0;

+        return 0;

     }

 

     // ----- Call the create fct

     $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);

     if ($v_result != 1) {

-      return 0;

+        return 0;

     }

 

     // ----- Return

     return $p_result_list;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function :

-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")

-  //   add($p_filelist, $p_option, $p_option_value, ...)

-  // Description :

-  //   This method supports two synopsis. The first one is historical.

-  //   This methods add the list of files in an existing archive.

-  //   If a file with the same name already exists, it is added at the end of the

-  //   archive, the first one is still present.

-  //   If the archive does not exist, it is created.

-  // Parameters :

-  //   $p_filelist : An array containing file or directory names, or

-  //                 a string containing one filename or one directory name, or

-  //                 a string containing a list of filenames and/or directory

-  //                 names separated by spaces.

-  //   $p_add_dir : A path to add before the real path of the archived file,

-  //                in order to have it memorized in the archive.

-  //   $p_remove_dir : A path to remove from the real path of the file to archive,

-  //                   in order to have a shorter path memorized in the archive.

-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir

-  //                   is removed first, before $p_add_dir is added.

-  // Options :

-  //   PCLZIP_OPT_ADD_PATH :

-  //   PCLZIP_OPT_REMOVE_PATH :

-  //   PCLZIP_OPT_REMOVE_ALL_PATH :

-  //   PCLZIP_OPT_COMMENT :

-  //   PCLZIP_OPT_ADD_COMMENT :

-  //   PCLZIP_OPT_PREPEND_COMMENT :

-  //   PCLZIP_CB_PRE_ADD :

-  //   PCLZIP_CB_POST_ADD :

-  // Return Values :

-  //   0 on failure,

-  //   The list of the added files, with a status of the add action.

-  //   (see PclZip::listContent() for list entry format)

-  // --------------------------------------------------------------------------------

-  function add($p_filelist)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function :

+    //   add($p_filelist, $p_add_dir="", $p_remove_dir="")

+    //   add($p_filelist, $p_option, $p_option_value, ...)

+    // Description :

+    //   This method supports two synopsis. The first one is historical.

+    //   This methods add the list of files in an existing archive.

+    //   If a file with the same name already exists, it is added at the end of the

+    //   archive, the first one is still present.

+    //   If the archive does not exist, it is created.

+    // Parameters :

+    //   $p_filelist : An array containing file or directory names, or

+    //                 a string containing one filename or one directory name, or

+    //                 a string containing a list of filenames and/or directory

+    //                 names separated by spaces.

+    //   $p_add_dir : A path to add before the real path of the archived file,

+    //                in order to have it memorized in the archive.

+    //   $p_remove_dir : A path to remove from the real path of the file to archive,

+    //                   in order to have a shorter path memorized in the archive.

+    //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir

+    //                   is removed first, before $p_add_dir is added.

+    // Options :

+    //   PCLZIP_OPT_ADD_PATH :

+    //   PCLZIP_OPT_REMOVE_PATH :

+    //   PCLZIP_OPT_REMOVE_ALL_PATH :

+    //   PCLZIP_OPT_COMMENT :

+    //   PCLZIP_OPT_ADD_COMMENT :

+    //   PCLZIP_OPT_PREPEND_COMMENT :

+    //   PCLZIP_CB_PRE_ADD :

+    //   PCLZIP_CB_POST_ADD :

+    // Return Values :

+    //   0 on failure,

+    //   The list of the added files, with a status of the add action.

+    //   (see PclZip::listContent() for list entry format)

+    // --------------------------------------------------------------------------------

+    function add($p_filelist)

+    {

     $v_result=1;

 

     // ----- Reset the error handler

@@ -487,57 +487,57 @@ 
 

     // ----- Look for arguments

     if ($v_size > 1) {

-      // ----- Get the arguments

-      $v_arg_list = func_get_args();

+        // ----- Get the arguments

+        $v_arg_list = func_get_args();

 

-      // ----- Remove form the options list the first argument

-      array_shift($v_arg_list);

-      $v_size--;

+        // ----- Remove form the options list the first argument

+        array_shift($v_arg_list);

+        $v_size--;

 

-      // ----- Look for first arg

-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {

+        // ----- Look for first arg

+        if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {

 

         // ----- Parse the options

         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

                                             array (PCLZIP_OPT_REMOVE_PATH => 'optional',

-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

-                                                   PCLZIP_OPT_ADD_PATH => 'optional',

-                                                   PCLZIP_CB_PRE_ADD => 'optional',

-                                                   PCLZIP_CB_POST_ADD => 'optional',

-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',

-                                                   PCLZIP_OPT_COMMENT => 'optional',

-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',

-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'

-                                                   //, PCLZIP_OPT_CRYPT => 'optional'

-												   ));

+                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

+                                                    PCLZIP_OPT_ADD_PATH => 'optional',

+                                                    PCLZIP_CB_PRE_ADD => 'optional',

+                                                    PCLZIP_CB_POST_ADD => 'optional',

+                                                    PCLZIP_OPT_NO_COMPRESSION => 'optional',

+                                                    PCLZIP_OPT_COMMENT => 'optional',

+                                                    PCLZIP_OPT_ADD_COMMENT => 'optional',

+                                                    PCLZIP_OPT_PREPEND_COMMENT => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'

+                                                    //, PCLZIP_OPT_CRYPT => 'optional'

+                                                    ));

         if ($v_result != 1) {

-          return 0;

+            return 0;

+        }

         }

-      }

 

-      // ----- Look for 2 args

-      // Here we need to support the first historic synopsis of the

-      // method.

-      else {

+        // ----- Look for 2 args

+        // Here we need to support the first historic synopsis of the

+        // method.

+        else {

 

         // ----- Get the first argument

         $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];

 

         // ----- Look for the optional second argument

         if ($v_size == 2) {

-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];

+            $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];

         }

         else if ($v_size > 2) {

-          // ----- Error log

-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

+            // ----- Error log

+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

 

-          // ----- Return

-          return 0;

+            // ----- Return

+            return 0;

+        }

         }

-      }

     }

 

     // ----- Look for default option values

@@ -552,116 +552,116 @@ 
     // ----- Look if the $p_filelist is really an array

     if (is_array($p_filelist)) {

 

-      // ----- Look if the first element is also an array

-      //       This will mean that this is a file description entry

-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {

+        // ----- Look if the first element is also an array

+        //       This will mean that this is a file description entry

+        if (isset($p_filelist[0]) && is_array($p_filelist[0])) {

         $v_att_list = $p_filelist;

-      }

+        }

 

-      // ----- The list is a list of string names

-      else {

+        // ----- The list is a list of string names

+        else {

         $v_string_list = $p_filelist;

-      }

+        }

     }

 

     // ----- Look if the $p_filelist is a string

     else if (is_string($p_filelist)) {

-      // ----- Create a list from the string

-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);

+        // ----- Create a list from the string

+        $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);

     }

 

     // ----- Invalid variable type for $p_filelist

     else {

-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");

-      return 0;

+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");

+        return 0;

     }

 

     // ----- Reformat the string list

     if (sizeof($v_string_list) != 0) {

-      foreach ($v_string_list as $v_string) {

+        foreach ($v_string_list as $v_string) {

         $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;

-      }

+        }

     }

 

     // ----- For each file in the list check the attributes

     $v_supported_attributes

     = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'

-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'

-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'

-             ,PCLZIP_ATT_FILE_MTIME => 'optional'

-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'

-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'

-						);

+                ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'

+                ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'

+                ,PCLZIP_ATT_FILE_MTIME => 'optional'

+                ,PCLZIP_ATT_FILE_CONTENT => 'optional'

+                ,PCLZIP_ATT_FILE_COMMENT => 'optional'

+                        );

     foreach ($v_att_list as $v_entry) {

-      $v_result = $this->privFileDescrParseAtt($v_entry,

-                                               $v_filedescr_list[],

-                                               $v_options,

-                                               $v_supported_attributes);

-      if ($v_result != 1) {

+        $v_result = $this->privFileDescrParseAtt($v_entry,

+                                                $v_filedescr_list[],

+                                                $v_options,

+                                                $v_supported_attributes);

+        if ($v_result != 1) {

         return 0;

-      }

+        }

     }

 

     // ----- Expand the filelist (expand directories)

     $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);

     if ($v_result != 1) {

-      return 0;

+        return 0;

     }

 

     // ----- Call the create fct

     $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);

     if ($v_result != 1) {

-      return 0;

+        return 0;

     }

 

     // ----- Return

     return $p_result_list;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : listContent()

-  // Description :

-  //   This public method, gives the list of the files and directories, with their

-  //   properties.

-  //   The properties of each entries in the list are (used also in other functions) :

-  //     filename : Name of the file. For a create or add action it is the filename

-  //                given by the user. For an extract function it is the filename

-  //                of the extracted file.

-  //     stored_filename : Name of the file / directory stored in the archive.

-  //     size : Size of the stored file.

-  //     compressed_size : Size of the file's data compressed in the archive

-  //                       (without the headers overhead)

-  //     mtime : Last known modification date of the file (UNIX timestamp)

-  //     comment : Comment associated with the file

-  //     folder : true | false

-  //     index : index of the file in the archive

-  //     status : status of the action (depending of the action) :

-  //              Values are :

-  //                ok : OK !

-  //                filtered : the file / dir is not extracted (filtered by user)

-  //                already_a_directory : the file can not be extracted because a

-  //                                      directory with the same name already exists

-  //                write_protected : the file can not be extracted because a file

-  //                                  with the same name already exists and is

-  //                                  write protected

-  //                newer_exist : the file was not extracted because a newer file exists

-  //                path_creation_fail : the file is not extracted because the folder

-  //                                     does not exist and can not be created

-  //                write_error : the file was not extracted because there was a

-  //                              error while writing the file

-  //                read_error : the file was not extracted because there was a error

-  //                             while reading the file

-  //                invalid_header : the file was not extracted because of an archive

-  //                                 format error (bad file header)

-  //   Note that each time a method can continue operating when there

-  //   is an action error on a file, the error is only logged in the file status.

-  // Return Values :

-  //   0 on an unrecoverable failure,

-  //   The list of the files in the archive.

-  // --------------------------------------------------------------------------------

-  function listContent()

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : listContent()

+    // Description :

+    //   This public method, gives the list of the files and directories, with their

+    //   properties.

+    //   The properties of each entries in the list are (used also in other functions) :

+    //     filename : Name of the file. For a create or add action it is the filename

+    //                given by the user. For an extract function it is the filename

+    //                of the extracted file.

+    //     stored_filename : Name of the file / directory stored in the archive.

+    //     size : Size of the stored file.

+    //     compressed_size : Size of the file's data compressed in the archive

+    //                       (without the headers overhead)

+    //     mtime : Last known modification date of the file (UNIX timestamp)

+    //     comment : Comment associated with the file

+    //     folder : true | false

+    //     index : index of the file in the archive

+    //     status : status of the action (depending of the action) :

+    //              Values are :

+    //                ok : OK !

+    //                filtered : the file / dir is not extracted (filtered by user)

+    //                already_a_directory : the file can not be extracted because a

+    //                                      directory with the same name already exists

+    //                write_protected : the file can not be extracted because a file

+    //                                  with the same name already exists and is

+    //                                  write protected

+    //                newer_exist : the file was not extracted because a newer file exists

+    //                path_creation_fail : the file is not extracted because the folder

+    //                                     does not exist and can not be created

+    //                write_error : the file was not extracted because there was a

+    //                              error while writing the file

+    //                read_error : the file was not extracted because there was a error

+    //                             while reading the file

+    //                invalid_header : the file was not extracted because of an archive

+    //                                 format error (bad file header)

+    //   Note that each time a method can continue operating when there

+    //   is an action error on a file, the error is only logged in the file status.

+    // Return Values :

+    //   0 on an unrecoverable failure,

+    //   The list of the files in the archive.

+    // --------------------------------------------------------------------------------

+    function listContent()

+    {

     $v_result=1;

 

     // ----- Reset the error handler

@@ -669,56 +669,56 @@ 
 

     // ----- Check archive

     if (!$this->privCheckFormat()) {

-      return(0);

+        return(0);

     }

 

     // ----- Call the extracting fct

     $p_list = array();

     if (($v_result = $this->privList($p_list)) != 1)

     {

-      unset($p_list);

-      return(0);

+        unset($p_list);

+        return(0);

     }

 

     // ----- Return

     return $p_list;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function :

-  //   extract($p_path="./", $p_remove_path="")

-  //   extract([$p_option, $p_option_value, ...])

-  // Description :

-  //   This method supports two synopsis. The first one is historical.

-  //   This method extract all the files / directories from the archive to the

-  //   folder indicated in $p_path.

-  //   If you want to ignore the 'root' part of path of the memorized files

-  //   you can indicate this in the optional $p_remove_path parameter.

-  //   By default, if a newer file with the same name already exists, the

-  //   file is not extracted.

-  //

-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions

-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append

-  //   at the end of the path value of PCLZIP_OPT_PATH.

-  // Parameters :

-  //   $p_path : Path where the files and directories are to be extracted

-  //   $p_remove_path : First part ('root' part) of the memorized path

-  //                    (if any similar) to remove while extracting.

-  // Options :

-  //   PCLZIP_OPT_PATH :

-  //   PCLZIP_OPT_ADD_PATH :

-  //   PCLZIP_OPT_REMOVE_PATH :

-  //   PCLZIP_OPT_REMOVE_ALL_PATH :

-  //   PCLZIP_CB_PRE_EXTRACT :

-  //   PCLZIP_CB_POST_EXTRACT :

-  // Return Values :

-  //   0 or a negative value on failure,

-  //   The list of the extracted files, with a status of the action.

-  //   (see PclZip::listContent() for list entry format)

-  // --------------------------------------------------------------------------------

-  function extract()

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function :

+    //   extract($p_path="./", $p_remove_path="")

+    //   extract([$p_option, $p_option_value, ...])

+    // Description :

+    //   This method supports two synopsis. The first one is historical.

+    //   This method extract all the files / directories from the archive to the

+    //   folder indicated in $p_path.

+    //   If you want to ignore the 'root' part of path of the memorized files

+    //   you can indicate this in the optional $p_remove_path parameter.

+    //   By default, if a newer file with the same name already exists, the

+    //   file is not extracted.

+    //

+    //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions

+    //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append

+    //   at the end of the path value of PCLZIP_OPT_PATH.

+    // Parameters :

+    //   $p_path : Path where the files and directories are to be extracted

+    //   $p_remove_path : First part ('root' part) of the memorized path

+    //                    (if any similar) to remove while extracting.

+    // Options :

+    //   PCLZIP_OPT_PATH :

+    //   PCLZIP_OPT_ADD_PATH :

+    //   PCLZIP_OPT_REMOVE_PATH :

+    //   PCLZIP_OPT_REMOVE_ALL_PATH :

+    //   PCLZIP_CB_PRE_EXTRACT :

+    //   PCLZIP_CB_POST_EXTRACT :

+    // Return Values :

+    //   0 or a negative value on failure,

+    //   The list of the extracted files, with a status of the action.

+    //   (see PclZip::listContent() for list entry format)

+    // --------------------------------------------------------------------------------

+    function extract()

+    {

     $v_result=1;

 

     // ----- Reset the error handler

@@ -726,7 +726,7 @@ 
 

     // ----- Check archive

     if (!$this->privCheckFormat()) {

-      return(0);

+        return(0);

     }

 

     // ----- Set default values

@@ -744,77 +744,77 @@ 
 

     // ----- Look for arguments

     if ($v_size > 0) {

-      // ----- Get the arguments

-      $v_arg_list = func_get_args();

+        // ----- Get the arguments

+        $v_arg_list = func_get_args();

 

-      // ----- Look for first arg

-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {

+        // ----- Look for first arg

+        if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {

 

         // ----- Parse the options

         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

                                             array (PCLZIP_OPT_PATH => 'optional',

-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',

-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

-                                                   PCLZIP_OPT_ADD_PATH => 'optional',

-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',

-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',

-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',

-                                                   PCLZIP_OPT_BY_NAME => 'optional',

-                                                   PCLZIP_OPT_BY_EREG => 'optional',

-                                                   PCLZIP_OPT_BY_PREG => 'optional',

-                                                   PCLZIP_OPT_BY_INDEX => 'optional',

-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',

-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',

-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'

-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'

-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'

-												    ));

+                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',

+                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

+                                                    PCLZIP_OPT_ADD_PATH => 'optional',

+                                                    PCLZIP_CB_PRE_EXTRACT => 'optional',

+                                                    PCLZIP_CB_POST_EXTRACT => 'optional',

+                                                    PCLZIP_OPT_SET_CHMOD => 'optional',

+                                                    PCLZIP_OPT_BY_NAME => 'optional',

+                                                    PCLZIP_OPT_BY_EREG => 'optional',

+                                                    PCLZIP_OPT_BY_PREG => 'optional',

+                                                    PCLZIP_OPT_BY_INDEX => 'optional',

+                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',

+                                                    PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',

+                                                    PCLZIP_OPT_REPLACE_NEWER => 'optional'

+                                                    ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'

+                                                    ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'

+                                                    ));

         if ($v_result != 1) {

-          return 0;

+            return 0;

         }

 

         // ----- Set the arguments

         if (isset($v_options[PCLZIP_OPT_PATH])) {

-          $v_path = $v_options[PCLZIP_OPT_PATH];

+            $v_path = $v_options[PCLZIP_OPT_PATH];

         }

         if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {

-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];

+            $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];

         }

         if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {

-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];

+            $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];

         }

         if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {

-          // ----- Check for '/' in last path char

-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {

+            // ----- Check for '/' in last path char

+            if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {

             $v_path .= '/';

-          }

-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];

+            }

+            $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];

+        }

         }

-      }

 

-      // ----- Look for 2 args

-      // Here we need to support the first historic synopsis of the

-      // method.

-      else {

+        // ----- Look for 2 args

+        // Here we need to support the first historic synopsis of the

+        // method.

+        else {

 

         // ----- Get the first argument

         $v_path = $v_arg_list[0];

 

         // ----- Look for the optional second argument

         if ($v_size == 2) {

-          $v_remove_path = $v_arg_list[1];

+            $v_remove_path = $v_arg_list[1];

         }

         else if ($v_size > 2) {

-          // ----- Error log

-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

+            // ----- Error log

+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

 

-          // ----- Return

-          return 0;

+            // ----- Return

+            return 0;

+        }

         }

-      }

     }

 

     // ----- Look for default option values

@@ -825,57 +825,57 @@ 
     // ----- Call the extracting fct

     $p_list = array();

     $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,

-	                                     $v_remove_all_path, $v_options);

+                                            $v_remove_all_path, $v_options);

     if ($v_result < 1) {

-      unset($p_list);

-      return(0);

+        unset($p_list);

+        return(0);

     }

 

     // ----- Return

     return $p_list;

-  }

-  // --------------------------------------------------------------------------------

-

-

-  // --------------------------------------------------------------------------------

-  // Function :

-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")

-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])

-  // Description :

-  //   This method supports two synopsis. The first one is historical.

-  //   This method is doing a partial extract of the archive.

-  //   The extracted files or folders are identified by their index in the

-  //   archive (from 0 to n).

-  //   Note that if the index identify a folder, only the folder entry is

-  //   extracted, not all the files included in the archive.

-  // Parameters :

-  //   $p_index : A single index (integer) or a string of indexes of files to

-  //              extract. The form of the string is "0,4-6,8-12" with only numbers

-  //              and '-' for range or ',' to separate ranges. No spaces or ';'

-  //              are allowed.

-  //   $p_path : Path where the files and directories are to be extracted

-  //   $p_remove_path : First part ('root' part) of the memorized path

-  //                    (if any similar) to remove while extracting.

-  // Options :

-  //   PCLZIP_OPT_PATH :

-  //   PCLZIP_OPT_ADD_PATH :

-  //   PCLZIP_OPT_REMOVE_PATH :

-  //   PCLZIP_OPT_REMOVE_ALL_PATH :

-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and

-  //     not as files.

-  //     The resulting content is in a new field 'content' in the file

-  //     structure.

-  //     This option must be used alone (any other options are ignored).

-  //   PCLZIP_CB_PRE_EXTRACT :

-  //   PCLZIP_CB_POST_EXTRACT :

-  // Return Values :

-  //   0 on failure,

-  //   The list of the extracted files, with a status of the action.

-  //   (see PclZip::listContent() for list entry format)

-  // --------------------------------------------------------------------------------

-  //function extractByIndex($p_index, options...)

-  function extractByIndex($p_index)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+

+    // --------------------------------------------------------------------------------

+    // Function :

+    //   extractByIndex($p_index, $p_path="./", $p_remove_path="")

+    //   extractByIndex($p_index, [$p_option, $p_option_value, ...])

+    // Description :

+    //   This method supports two synopsis. The first one is historical.

+    //   This method is doing a partial extract of the archive.

+    //   The extracted files or folders are identified by their index in the

+    //   archive (from 0 to n).

+    //   Note that if the index identify a folder, only the folder entry is

+    //   extracted, not all the files included in the archive.

+    // Parameters :

+    //   $p_index : A single index (integer) or a string of indexes of files to

+    //              extract. The form of the string is "0,4-6,8-12" with only numbers

+    //              and '-' for range or ',' to separate ranges. No spaces or ';'

+    //              are allowed.

+    //   $p_path : Path where the files and directories are to be extracted

+    //   $p_remove_path : First part ('root' part) of the memorized path

+    //                    (if any similar) to remove while extracting.

+    // Options :

+    //   PCLZIP_OPT_PATH :

+    //   PCLZIP_OPT_ADD_PATH :

+    //   PCLZIP_OPT_REMOVE_PATH :

+    //   PCLZIP_OPT_REMOVE_ALL_PATH :

+    //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and

+    //     not as files.

+    //     The resulting content is in a new field 'content' in the file

+    //     structure.

+    //     This option must be used alone (any other options are ignored).

+    //   PCLZIP_CB_PRE_EXTRACT :

+    //   PCLZIP_CB_POST_EXTRACT :

+    // Return Values :

+    //   0 on failure,

+    //   The list of the extracted files, with a status of the action.

+    //   (see PclZip::listContent() for list entry format)

+    // --------------------------------------------------------------------------------

+    //function extractByIndex($p_index, options...)

+    function extractByIndex($p_index)

+    {

     $v_result=1;

 

     // ----- Reset the error handler

@@ -883,7 +883,7 @@ 
 

     // ----- Check archive

     if (!$this->privCheckFormat()) {

-      return(0);

+        return(0);

     }

 

     // ----- Set default values

@@ -901,81 +901,81 @@ 
 

     // ----- Look for arguments

     if ($v_size > 1) {

-      // ----- Get the arguments

-      $v_arg_list = func_get_args();

+        // ----- Get the arguments

+        $v_arg_list = func_get_args();

 

-      // ----- Remove form the options list the first argument

-      array_shift($v_arg_list);

-      $v_size--;

+        // ----- Remove form the options list the first argument

+        array_shift($v_arg_list);

+        $v_size--;

 

-      // ----- Look for first arg

-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {

+        // ----- Look for first arg

+        if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {

 

         // ----- Parse the options

         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

                                             array (PCLZIP_OPT_PATH => 'optional',

-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',

-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',

-                                                   PCLZIP_OPT_ADD_PATH => 'optional',

-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',

-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',

-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',

-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'

-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'

-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',

-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'

-												   ));

+                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',

+                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',

+                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',

+                                                    PCLZIP_OPT_ADD_PATH => 'optional',

+                                                    PCLZIP_CB_PRE_EXTRACT => 'optional',

+                                                    PCLZIP_CB_POST_EXTRACT => 'optional',

+                                                    PCLZIP_OPT_SET_CHMOD => 'optional',

+                                                    PCLZIP_OPT_REPLACE_NEWER => 'optional'

+                                                    ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'

+                                                    ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_ON => 'optional',

+                                                    PCLZIP_OPT_TEMP_FILE_OFF => 'optional'

+                                                    ));

         if ($v_result != 1) {

-          return 0;

+            return 0;

         }

 

         // ----- Set the arguments

         if (isset($v_options[PCLZIP_OPT_PATH])) {

-          $v_path = $v_options[PCLZIP_OPT_PATH];

+            $v_path = $v_options[PCLZIP_OPT_PATH];

         }

         if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {

-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];

+            $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];

         }

         if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {

-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];

+            $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];

         }

         if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {

-          // ----- Check for '/' in last path char

-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {

+            // ----- Check for '/' in last path char

+            if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {

             $v_path .= '/';

-          }

-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];

+            }

+            $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];

         }

         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {

-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;

+            $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;

         }

         else {

         }

-      }

+        }

 

-      // ----- Look for 2 args

-      // Here we need to support the first historic synopsis of the

-      // method.

-      else {

+        // ----- Look for 2 args

+        // Here we need to support the first historic synopsis of the

+        // method.

+        else {

 

         // ----- Get the first argument

         $v_path = $v_arg_list[0];

 

         // ----- Look for the optional second argument

         if ($v_size == 2) {

-          $v_remove_path = $v_arg_list[1];

+            $v_remove_path = $v_arg_list[1];

         }

         else if ($v_size > 2) {

-          // ----- Error log

-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

+            // ----- Error log

+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");

 

-          // ----- Return

-          return 0;

+            // ----- Return

+            return 0;

+        }

         }

-      }

     }

 

     // ----- Trace

@@ -1002,29 +1002,29 @@ 
 

     // ----- Return

     return $p_list;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function :

-  //   delete([$p_option, $p_option_value, ...])

-  // Description :

-  //   This method removes files from the archive.

-  //   If no parameters are given, then all the archive is emptied.

-  // Parameters :

-  //   None or optional arguments.

-  // Options :

-  //   PCLZIP_OPT_BY_INDEX :

-  //   PCLZIP_OPT_BY_NAME :

-  //   PCLZIP_OPT_BY_EREG :

-  //   PCLZIP_OPT_BY_PREG :

-  // Return Values :

-  //   0 on failure,

-  //   The list of the files which are still present in the archive.

-  //   (see PclZip::listContent() for list entry format)

-  // --------------------------------------------------------------------------------

-  function delete()

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function :

+    //   delete([$p_option, $p_option_value, ...])

+    // Description :

+    //   This method removes files from the archive.

+    //   If no parameters are given, then all the archive is emptied.

+    // Parameters :

+    //   None or optional arguments.

+    // Options :

+    //   PCLZIP_OPT_BY_INDEX :

+    //   PCLZIP_OPT_BY_NAME :

+    //   PCLZIP_OPT_BY_EREG :

+    //   PCLZIP_OPT_BY_PREG :

+    // Return Values :

+    //   0 on failure,

+    //   The list of the files which are still present in the archive.

+    //   (see PclZip::listContent() for list entry format)

+    // --------------------------------------------------------------------------------

+    function delete()

+    {

     $v_result=1;

 

     // ----- Reset the error handler

@@ -1032,7 +1032,7 @@ 
 

     // ----- Check archive

     if (!$this->privCheckFormat()) {

-      return(0);

+        return(0);

     }

 

     // ----- Set default values

@@ -1043,18 +1043,18 @@ 
 

     // ----- Look for arguments

     if ($v_size > 0) {

-      // ----- Get the arguments

-      $v_arg_list = func_get_args();

+        // ----- Get the arguments

+        $v_arg_list = func_get_args();

 

-      // ----- Parse the options

-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

+        // ----- Parse the options

+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,

                                         array (PCLZIP_OPT_BY_NAME => 'optional',

-                                               PCLZIP_OPT_BY_EREG => 'optional',

-                                               PCLZIP_OPT_BY_PREG => 'optional',

-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));

-      if ($v_result != 1) {

-          return 0;

-      }

+                                                PCLZIP_OPT_BY_EREG => 'optional',

+                                                PCLZIP_OPT_BY_PREG => 'optional',

+                                                PCLZIP_OPT_BY_INDEX => 'optional' ));

+        if ($v_result != 1) {

+            return 0;

+        }

     }

 

     // ----- Magic quotes trick

@@ -1063,9 +1063,9 @@ 
     // ----- Call the delete fct

     $v_list = array();

     if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {

-      $this->privSwapBackMagicQuotes();

-      unset($v_list);

-      return(0);

+        $this->privSwapBackMagicQuotes();

+        unset($v_list);

+        return(0);

     }

 

     // ----- Magic quotes trick

@@ -1073,41 +1073,41 @@ 
 

     // ----- Return

     return $v_list;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : deleteByIndex()

-  // Description :

-  //   ***** Deprecated *****

-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.

-  // --------------------------------------------------------------------------------

-  function deleteByIndex($p_index)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : deleteByIndex()

+    // Description :

+    //   ***** Deprecated *****

+    //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.

+    // --------------------------------------------------------------------------------

+    function deleteByIndex($p_index)

+    {

 

     $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);

 

     // ----- Return

     return $p_list;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : properties()

-  // Description :

-  //   This method gives the properties of the archive.

-  //   The properties are :

-  //     nb : Number of files in the archive

-  //     comment : Comment associated with the archive file

-  //     status : not_exist, ok

-  // Parameters :

-  //   None

-  // Return Values :

-  //   0 on failure,

-  //   An array with the archive properties.

-  // --------------------------------------------------------------------------------

-  function properties()

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : properties()

+    // Description :

+    //   This method gives the properties of the archive.

+    //   The properties are :

+    //     nb : Number of files in the archive

+    //     comment : Comment associated with the archive file

+    //     status : not_exist, ok

+    // Parameters :

+    //   None

+    // Return Values :

+    //   0 on failure,

+    //   An array with the archive properties.

+    // --------------------------------------------------------------------------------

+    function properties()

+    {

 

     // ----- Reset the error handler

     $this->privErrorReset();

@@ -1117,8 +1117,8 @@ 
 

     // ----- Check archive

     if (!$this->privCheckFormat()) {

-      $this->privSwapBackMagicQuotes();

-      return(0);

+        $this->privSwapBackMagicQuotes();

+        return(0);

     }

 

     // ----- Default properties

@@ -1130,9 +1130,9 @@ 
     // ----- Look if file exists

     if (@is_file($this->zipname))

     {

-      // ----- Open the zip file

-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)

-      {

+        // ----- Open the zip file

+        if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)

+        {

         $this->privSwapBackMagicQuotes();

 

         // ----- Error log

@@ -1140,23 +1140,23 @@ 
 

         // ----- Return

         return 0;

-      }

+        }

 

-      // ----- Read the central directory informations

-      $v_central_dir = array();

-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)

-      {

+        // ----- Read the central directory informations

+        $v_central_dir = array();

+        if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)

+        {

         $this->privSwapBackMagicQuotes();

         return 0;

-      }

+        }

 

-      // ----- Close the zip file

-      $this->privCloseFd();

+        // ----- Close the zip file

+        $this->privCloseFd();

 

-      // ----- Set the user attributes

-      $v_prop['comment'] = $v_central_dir['comment'];

-      $v_prop['nb'] = $v_central_dir['entries'];

-      $v_prop['status'] = 'ok';

+        // ----- Set the user attributes

+        $v_prop['comment'] = $v_central_dir['comment'];

+        $v_prop['nb'] = $v_central_dir['entries'];

+        $v_prop['status'] = 'ok';

     }

 

     // ----- Magic quotes trick

@@ -1164,23 +1164,23 @@ 
 

     // ----- Return

     return $v_prop;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : duplicate()

-  // Description :

-  //   This method creates an archive by copying the content of an other one. If

-  //   the archive already exist, it is replaced by the new one without any warning.

-  // Parameters :

-  //   $p_archive : The filename of a valid archive, or

-  //                a valid PclZip object.

-  // Return Values :

-  //   1 on success.

-  //   0 or a negative value on error (error code).

-  // --------------------------------------------------------------------------------

-  function duplicate($p_archive)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : duplicate()

+    // Description :

+    //   This method creates an archive by copying the content of an other one. If

+    //   the archive already exist, it is replaced by the new one without any warning.

+    // Parameters :

+    //   $p_archive : The filename of a valid archive, or

+    //                a valid PclZip object.

+    // Return Values :

+    //   1 on success.

+    //   0 or a negative value on error (error code).

+    // --------------------------------------------------------------------------------

+    function duplicate($p_archive)

+    {

     $v_result = 1;

 

     // ----- Reset the error handler

@@ -1190,56 +1190,56 @@ 
     if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))

     {

 

-      // ----- Duplicate the archive

-      $v_result = $this->privDuplicate($p_archive->zipname);

+        // ----- Duplicate the archive

+        $v_result = $this->privDuplicate($p_archive->zipname);

     }

 

     // ----- Look if the $p_archive is a string (so a filename)

     else if (is_string($p_archive))

     {

 

-      // ----- Check that $p_archive is a valid zip file

-      // TBC : Should also check the archive format

-      if (!is_file($p_archive)) {

+        // ----- Check that $p_archive is a valid zip file

+        // TBC : Should also check the archive format

+        if (!is_file($p_archive)) {

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");

         $v_result = PCLZIP_ERR_MISSING_FILE;

-      }

-      else {

+        }

+        else {

         // ----- Duplicate the archive

         $v_result = $this->privDuplicate($p_archive);

-      }

+        }

     }

 

     // ----- Invalid variable

     else

     {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");

-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");

+        $v_result = PCLZIP_ERR_INVALID_PARAMETER;

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : merge()

-  // Description :

-  //   This method merge the $p_archive_to_add archive at the end of the current

-  //   one ($this).

-  //   If the archive ($this) does not exist, the merge becomes a duplicate.

-  //   If the $p_archive_to_add archive does not exist, the merge is a success.

-  // Parameters :

-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,

-  //                       or a PclZip object archive.

-  // Return Values :

-  //   1 on success,

-  //   0 or negative values on error (see below).

-  // --------------------------------------------------------------------------------

-  function merge($p_archive_to_add)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : merge()

+    // Description :

+    //   This method merge the $p_archive_to_add archive at the end of the current

+    //   one ($this).

+    //   If the archive ($this) does not exist, the merge becomes a duplicate.

+    //   If the $p_archive_to_add archive does not exist, the merge is a success.

+    // Parameters :

+    //   $p_archive_to_add : It can be directly the filename of a valid zip archive,

+    //                       or a PclZip object archive.

+    // Return Values :

+    //   1 on success,

+    //   0 or negative values on error (see below).

+    // --------------------------------------------------------------------------------

+    function merge($p_archive_to_add)

+    {

     $v_result = 1;

 

     // ----- Reset the error handler

@@ -1247,125 +1247,125 @@ 
 

     // ----- Check archive

     if (!$this->privCheckFormat()) {

-      return(0);

+        return(0);

     }

 

     // ----- Look if the $p_archive_to_add is a PclZip object

     if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))

     {

 

-      // ----- Merge the archive

-      $v_result = $this->privMerge($p_archive_to_add);

+        // ----- Merge the archive

+        $v_result = $this->privMerge($p_archive_to_add);

     }

 

     // ----- Look if the $p_archive_to_add is a string (so a filename)

     else if (is_string($p_archive_to_add))

     {

 

-      // ----- Create a temporary archive

-      $v_object_archive = new PclZip($p_archive_to_add);

+        // ----- Create a temporary archive

+        $v_object_archive = new PclZip($p_archive_to_add);

 

-      // ----- Merge the archive

-      $v_result = $this->privMerge($v_object_archive);

+        // ----- Merge the archive

+        $v_result = $this->privMerge($v_object_archive);

     }

 

     // ----- Invalid variable

     else

     {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");

-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");

+        $v_result = PCLZIP_ERR_INVALID_PARAMETER;

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

+    }

+    // --------------------------------------------------------------------------------

 

 

 

-  // --------------------------------------------------------------------------------

-  // Function : errorCode()

-  // Description :

-  // Parameters :

-  // --------------------------------------------------------------------------------

-  function errorCode()

-  {

+    // --------------------------------------------------------------------------------

+    // Function : errorCode()

+    // Description :

+    // Parameters :

+    // --------------------------------------------------------------------------------

+    function errorCode()

+    {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

-      return(PclErrorCode());

+        return(PclErrorCode());

     }

     else {

-      return($this->error_code);

-    }

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : errorName()

-  // Description :

-  // Parameters :

-  // --------------------------------------------------------------------------------

-  function errorName($p_with_code=false)

-  {

+        return($this->error_code);

+    }

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : errorName()

+    // Description :

+    // Parameters :

+    // --------------------------------------------------------------------------------

+    function errorName($p_with_code=false)

+    {

     $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',

-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',

-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',

-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',

-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',

-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',

-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',

-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',

-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',

-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',

-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',

-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',

-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',

-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',

-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',

-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',

-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',

-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',

-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'

-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'

-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'

+                        PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',

+                        PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',

+                        PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',

+                        PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',

+                        PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',

+                        PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',

+                        PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',

+                        PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',

+                        PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',

+                        PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',

+                        PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',

+                        PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',

+                        PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',

+                        PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',

+                        PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',

+                        PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',

+                        PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',

+                        PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'

+                        ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'

+                        ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'

                     );

 

     if (isset($v_name[$this->error_code])) {

-      $v_value = $v_name[$this->error_code];

+        $v_value = $v_name[$this->error_code];

     }

     else {

-      $v_value = 'NoName';

+        $v_value = 'NoName';

     }

 

     if ($p_with_code) {

-      return($v_value.' ('.$this->error_code.')');

+        return($v_value.' ('.$this->error_code.')');

     }

     else {

-      return($v_value);

-    }

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : errorInfo()

-  // Description :

-  // Parameters :

-  // --------------------------------------------------------------------------------

-  function errorInfo($p_full=false)

-  {

+        return($v_value);

+    }

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : errorInfo()

+    // Description :

+    // Parameters :

+    // --------------------------------------------------------------------------------

+    function errorInfo($p_full=false)

+    {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

-      return(PclErrorString());

+        return(PclErrorString());

     }

     else {

-      if ($p_full) {

+        if ($p_full) {

         return($this->errorName(true)." : ".$this->error_string);

-      }

-      else {

+        }

+        else {

         return($this->error_string." [code ".$this->error_code."]");

-      }

+        }

+    }

     }

-  }

-  // --------------------------------------------------------------------------------

+    // --------------------------------------------------------------------------------

 

 

 // --------------------------------------------------------------------------------

@@ -1376,25 +1376,25 @@ 
 

 

 

-  // --------------------------------------------------------------------------------

-  // Function : privCheckFormat()

-  // Description :

-  //   This method check that the archive exists and is a valid zip archive.

-  //   Several level of check exists. (futur)

-  // Parameters :

-  //   $p_level : Level of check. Default 0.

-  //              0 : Check the first bytes (magic codes) (default value))

-  //              1 : 0 + Check the central directory (futur)

-  //              2 : 1 + Check each file header (futur)

-  // Return Values :

-  //   true on success,

-  //   false on error, the error code is set.

-  // --------------------------------------------------------------------------------

-  function privCheckFormat($p_level=0)

-  {

+    // --------------------------------------------------------------------------------

+    // Function : privCheckFormat()

+    // Description :

+    //   This method check that the archive exists and is a valid zip archive.

+    //   Several level of check exists. (futur)

+    // Parameters :

+    //   $p_level : Level of check. Default 0.

+    //              0 : Check the first bytes (magic codes) (default value))

+    //              1 : 0 + Check the central directory (futur)

+    //              2 : 1 + Check each file header (futur)

+    // Return Values :

+    //   true on success,

+    //   false on error, the error code is set.

+    // --------------------------------------------------------------------------------

+    function privCheckFormat($p_level=0)

+    {

     $v_result = true;

 

-	// ----- Reset the file system cache

+    // ----- Reset the file system cache

     clearstatcache();

 

     // ----- Reset the error handler

@@ -1402,16 +1402,16 @@ 
 

     // ----- Look if the file exits

     if (!is_file($this->zipname)) {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");

-      return(false);

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");

+        return(false);

     }

 

     // ----- Check that the file is readeable

     if (!is_readable($this->zipname)) {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");

-      return(false);

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");

+        return(false);

     }

 

     // ----- Check the magic code

@@ -1425,43 +1425,43 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privParseOptions()

-  // Description :

-  //   This internal methods reads the variable list of arguments ($p_options_list,

-  //   $p_size) and generate an array with the options and values ($v_result_list).

-  //   $v_requested_options contains the options that can be present and those that

-  //   must be present.

-  //   $v_requested_options is an array, with the option value as key, and 'optional',

-  //   or 'mandatory' as value.

-  // Parameters :

-  //   See above.

-  // Return Values :

-  //   1 on success.

-  //   0 on failure.

-  // --------------------------------------------------------------------------------

-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privParseOptions()

+    // Description :

+    //   This internal methods reads the variable list of arguments ($p_options_list,

+    //   $p_size) and generate an array with the options and values ($v_result_list).

+    //   $v_requested_options contains the options that can be present and those that

+    //   must be present.

+    //   $v_requested_options is an array, with the option value as key, and 'optional',

+    //   or 'mandatory' as value.

+    // Parameters :

+    //   See above.

+    // Return Values :

+    //   1 on success.

+    //   0 on failure.

+    // --------------------------------------------------------------------------------

+    function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)

+    {

     $v_result=1;

 

     // ----- Read the options

     $i=0;

     while ($i<$p_size) {

 

-      // ----- Check if the option is supported

-      if (!isset($v_requested_options[$p_options_list[$i]])) {

+        // ----- Check if the option is supported

+        if (!isset($v_requested_options[$p_options_list[$i]])) {

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");

 

         // ----- Return

         return PclZip::errorCode();

-      }

+        }

 

-      // ----- Look for next option

-      switch ($p_options_list[$i]) {

+        // ----- Look for next option

+        switch ($p_options_list[$i]) {

         // ----- Look for options that request a path value

         case PCLZIP_OPT_PATH :

         case PCLZIP_OPT_REMOVE_PATH :

@@ -1473,11 +1473,11 @@ 
 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value

-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);

-          $i++;

+            // ----- Get the value

+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);

+            $i++;

         break;

 

         case PCLZIP_OPT_TEMP_FILE_THRESHOLD :

@@ -1485,24 +1485,24 @@ 
           if (($i+1) >= $p_size) {

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Check for incompatible options

-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {

+            // ----- Check for incompatible options

+            if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Check the value

-          $v_value = $p_options_list[$i+1];

-          if ((!is_integer($v_value)) || ($v_value<0)) {

+            // ----- Check the value

+            $v_value = $p_options_list[$i+1];

+            if ((!is_integer($v_value)) || ($v_value<0)) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value (and convert it in bytes)

-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;

-          $i++;

+            // ----- Get the value (and convert it in bytes)

+            $v_result_list[$p_options_list[$i]] = $v_value*1048576;

+            $i++;

         break;

 

         case PCLZIP_OPT_TEMP_FILE_ON :

@@ -1510,9 +1510,9 @@ 
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");

             return PclZip::errorCode();

-          }

+            }

 

-          $v_result_list[$p_options_list[$i]] = true;

+            $v_result_list[$p_options_list[$i]] = true;

         break;

 

         case PCLZIP_OPT_TEMP_FILE_OFF :

@@ -1520,14 +1520,14 @@ 
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");

             return PclZip::errorCode();

-          }

-          // ----- Check for incompatible options

-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {

+            }

+            // ----- Check for incompatible options

+            if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");

             return PclZip::errorCode();

-          }

+            }

 

-          $v_result_list[$p_options_list[$i]] = true;

+            $v_result_list[$p_options_list[$i]] = true;

         break;

 

         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :

@@ -1538,16 +1538,16 @@ 
 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value

-          if (   is_string($p_options_list[$i+1])

+            // ----- Get the value

+            if (   is_string($p_options_list[$i+1])

               && ($p_options_list[$i+1] != '')) {

             $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);

             $i++;

-          }

-          else {

-          }

+            }

+            else {

+            }

         break;

 

         // ----- Look for options that request an array of string for value

@@ -1559,23 +1559,23 @@ 
 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value

-          if (is_string($p_options_list[$i+1])) {

-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];

-          }

-          else if (is_array($p_options_list[$i+1])) {

-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

-          }

-          else {

+            // ----- Get the value

+            if (is_string($p_options_list[$i+1])) {

+                $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];

+            }

+            else if (is_array($p_options_list[$i+1])) {

+                $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

+            }

+            else {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

             // ----- Return

             return PclZip::errorCode();

-          }

-          $i++;

+            }

+            $i++;

         break;

 

         // ----- Look for options that request an EREG or PREG expression

@@ -1592,20 +1592,20 @@ 
 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value

-          if (is_string($p_options_list[$i+1])) {

-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

-          }

-          else {

+            // ----- Get the value

+            if (is_string($p_options_list[$i+1])) {

+                $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

+            }

+            else {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

             // ----- Return

             return PclZip::errorCode();

-          }

-          $i++;

+            }

+            $i++;

         break;

 

         // ----- Look for options that takes a string

@@ -1616,29 +1616,29 @@ 
           if (($i+1) >= $p_size) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,

-			                     "Missing parameter value for option '"

-								 .PclZipUtilOptionText($p_options_list[$i])

-								 ."'");

+                                    "Missing parameter value for option '"

+                                    .PclZipUtilOptionText($p_options_list[$i])

+                                    ."'");

 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value

-          if (is_string($p_options_list[$i+1])) {

-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

-          }

-          else {

+            // ----- Get the value

+            if (is_string($p_options_list[$i+1])) {

+                $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

+            }

+            else {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,

-			                     "Wrong parameter value for option '"

-								 .PclZipUtilOptionText($p_options_list[$i])

-								 ."'");

+                                    "Wrong parameter value for option '"

+                                    .PclZipUtilOptionText($p_options_list[$i])

+                                    ."'");

 

             // ----- Return

             return PclZip::errorCode();

-          }

-          $i++;

+            }

+            $i++;

         break;

 

         // ----- Look for options that request an array of index

@@ -1650,87 +1650,87 @@ 
 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value

-          $v_work_list = array();

-          if (is_string($p_options_list[$i+1])) {

+            // ----- Get the value

+            $v_work_list = array();

+            if (is_string($p_options_list[$i+1])) {

 

-              // ----- Remove spaces

-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');

+                // ----- Remove spaces

+                $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');

 

-              // ----- Parse items

-              $v_work_list = explode(",", $p_options_list[$i+1]);

-          }

-          else if (is_integer($p_options_list[$i+1])) {

-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];

-          }

-          else if (is_array($p_options_list[$i+1])) {

-              $v_work_list = $p_options_list[$i+1];

-          }

-          else {

+                // ----- Parse items

+                $v_work_list = explode(",", $p_options_list[$i+1]);

+            }

+            else if (is_integer($p_options_list[$i+1])) {

+                $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];

+            }

+            else if (is_array($p_options_list[$i+1])) {

+                $v_work_list = $p_options_list[$i+1];

+            }

+            else {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Reduce the index list

-          // each index item in the list must be a couple with a start and

-          // an end value : [0,3], [5-5], [8-10], ...

-          // ----- Check the format of each item

-          $v_sort_flag=false;

-          $v_sort_value=0;

-          for ($j=0; $j<sizeof($v_work_list); $j++) {

-              // ----- Explode the item

-              $v_item_list = explode("-", $v_work_list[$j]);

-              $v_size_item_list = sizeof($v_item_list);

-

-              // ----- TBC : Here we might check that each item is a

-              // real integer ...

-

-              // ----- Look for single value

-              if ($v_size_item_list == 1) {

-                  // ----- Set the option value

-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];

-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];

-              }

-              elseif ($v_size_item_list == 2) {

-                  // ----- Set the option value

-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];

-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];

-              }

-              else {

-                  // ----- Error log

-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");

-

-                  // ----- Return

-                  return PclZip::errorCode();

-              }

-

-

-              // ----- Look for list sort

-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {

-                  $v_sort_flag=true;

-

-                  // ----- TBC : An automatic sort should be writen ...

-                  // ----- Error log

-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");

-

-                  // ----- Return

-                  return PclZip::errorCode();

-              }

-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];

-          }

+            // ----- Reduce the index list

+            // each index item in the list must be a couple with a start and

+            // an end value : [0,3], [5-5], [8-10], ...

+            // ----- Check the format of each item

+            $v_sort_flag=false;

+            $v_sort_value=0;

+            for ($j=0; $j<sizeof($v_work_list); $j++) {

+                // ----- Explode the item

+                $v_item_list = explode("-", $v_work_list[$j]);

+                $v_size_item_list = sizeof($v_item_list);

+

+                // ----- TBC : Here we might check that each item is a

+                // real integer ...

+

+                // ----- Look for single value

+                if ($v_size_item_list == 1) {

+                    // ----- Set the option value

+                    $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];

+                    $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];

+                }

+                elseif ($v_size_item_list == 2) {

+                    // ----- Set the option value

+                    $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];

+                    $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];

+                }

+                else {

+                    // ----- Error log

+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");

+

+                    // ----- Return

+                    return PclZip::errorCode();

+                }

+

+

+                // ----- Look for list sort

+                if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {

+                    $v_sort_flag=true;

+

+                    // ----- TBC : An automatic sort should be writen ...

+                    // ----- Error log

+                    PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");

+

+                    // ----- Return

+                    return PclZip::errorCode();

+                }

+                $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];

+            }

 

-          // ----- Sort the items

-          if ($v_sort_flag) {

-              // TBC : To Be Completed

-          }

+            // ----- Sort the items

+            if ($v_sort_flag) {

+                // TBC : To Be Completed

+            }

 

-          // ----- Next option

-          $i++;

+            // ----- Next option

+            $i++;

         break;

 

         // ----- Look for options that request no value

@@ -1752,11 +1752,11 @@ 
 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value

-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

-          $i++;

+            // ----- Get the value

+            $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];

+            $i++;

         break;

 

         // ----- Look for options that request a call-back

@@ -1777,54 +1777,54 @@ 
 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Get the value

-          $v_function_name = $p_options_list[$i+1];

+            // ----- Get the value

+            $v_function_name = $p_options_list[$i+1];

 

-          // ----- Check that the value is a valid existing function

-          if (!function_exists($v_function_name)) {

+            // ----- Check that the value is a valid existing function

+            if (!function_exists($v_function_name)) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");

 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

 

-          // ----- Set the attribute

-          $v_result_list[$p_options_list[$i]] = $v_function_name;

-          $i++;

+            // ----- Set the attribute

+            $v_result_list[$p_options_list[$i]] = $v_function_name;

+            $i++;

         break;

 

         default :

           // ----- Error log

           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,

-		                       "Unknown parameter '"

-							   .$p_options_list[$i]."'");

+                                "Unknown parameter '"

+                                .$p_options_list[$i]."'");

 

-          // ----- Return

-          return PclZip::errorCode();

-      }

+            // ----- Return

+            return PclZip::errorCode();

+        }

 

-      // ----- Next options

-      $i++;

+        // ----- Next options

+        $i++;

     }

 

     // ----- Look for mandatory options

     if ($v_requested_options !== false) {

-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {

+        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {

         // ----- Look for mandatory option

         if ($v_requested_options[$key] == 'mandatory') {

-          // ----- Look if present

-          if (!isset($v_result_list[$key])) {

+            // ----- Look if present

+            if (!isset($v_result_list[$key])) {

             // ----- Error log

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");

 

             // ----- Return

             return PclZip::errorCode();

-          }

+            }

+        }

         }

-      }

     }

 

     // ----- Look for default values

@@ -1834,22 +1834,22 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privOptionDefaultThreshold()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privOptionDefaultThreshold(&$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privOptionDefaultThreshold()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privOptionDefaultThreshold(&$p_options)

+    {

     $v_result=1;

 

     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])

         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {

-      return $v_result;

+        return $v_result;

     }

 

     // ----- Get 'memory_limit' configuration value

@@ -1871,52 +1871,52 @@ 
 

     // ----- Sanity check : No threshold if value lower than 1M

     if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {

-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);

+        unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privFileDescrParseAtt()

-  // Description :

-  // Parameters :

-  // Return Values :

-  //   1 on success.

-  //   0 on failure.

-  // --------------------------------------------------------------------------------

-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privFileDescrParseAtt()

+    // Description :

+    // Parameters :

+    // Return Values :

+    //   1 on success.

+    //   0 on failure.

+    // --------------------------------------------------------------------------------

+    function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)

+    {

     $v_result=1;

 

     // ----- For each file in the list check the attributes

     foreach ($p_file_list as $v_key => $v_value) {

 

-      // ----- Check if the option is supported

-      if (!isset($v_requested_options[$v_key])) {

+        // ----- Check if the option is supported

+        if (!isset($v_requested_options[$v_key])) {

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");

 

         // ----- Return

         return PclZip::errorCode();

-      }

+        }

 

-      // ----- Look for attribute

-      switch ($v_key) {

+        // ----- Look for attribute

+        switch ($v_key) {

         case PCLZIP_ATT_FILE_NAME :

           if (!is_string($v_value)) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");

             return PclZip::errorCode();

-          }

+            }

 

-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);

+            $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);

 

-          if ($p_filedescr['filename'] == '') {

+            if ($p_filedescr['filename'] == '') {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");

             return PclZip::errorCode();

-          }

+            }

 

         break;

 

@@ -1924,28 +1924,28 @@ 
           if (!is_string($v_value)) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");

             return PclZip::errorCode();

-          }

+            }

 

-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);

+            $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);

 

-          if ($p_filedescr['new_short_name'] == '') {

+            if ($p_filedescr['new_short_name'] == '') {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");

             return PclZip::errorCode();

-          }

+            }

         break;

 

         case PCLZIP_ATT_FILE_NEW_FULL_NAME :

           if (!is_string($v_value)) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");

             return PclZip::errorCode();

-          }

+            }

 

-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);

+            $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);

 

-          if ($p_filedescr['new_full_name'] == '') {

+            if ($p_filedescr['new_full_name'] == '') {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");

             return PclZip::errorCode();

-          }

+            }

         break;

 

         // ----- Look for options that takes a string

@@ -1953,18 +1953,18 @@ 
           if (!is_string($v_value)) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");

             return PclZip::errorCode();

-          }

+            }

 

-          $p_filedescr['comment'] = $v_value;

+            $p_filedescr['comment'] = $v_value;

         break;

 

         case PCLZIP_ATT_FILE_MTIME :

           if (!is_integer($v_value)) {

             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");

             return PclZip::errorCode();

-          }

+            }

 

-          $p_filedescr['mtime'] = $v_value;

+            $p_filedescr['mtime'] = $v_value;

         break;

 

         case PCLZIP_ATT_FILE_CONTENT :

@@ -1974,50 +1974,50 @@ 
         default :

           // ----- Error log

           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,

-		                           "Unknown parameter '".$v_key."'");

+                                    "Unknown parameter '".$v_key."'");

 

-          // ----- Return

-          return PclZip::errorCode();

-      }

+            // ----- Return

+            return PclZip::errorCode();

+        }

 

-      // ----- Look for mandatory options

-      if ($v_requested_options !== false) {

+        // ----- Look for mandatory options

+        if ($v_requested_options !== false) {

         for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {

-          // ----- Look for mandatory option

-          if ($v_requested_options[$key] == 'mandatory') {

+            // ----- Look for mandatory option

+            if ($v_requested_options[$key] == 'mandatory') {

             // ----- Look if present

             if (!isset($p_file_list[$key])) {

-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");

-              return PclZip::errorCode();

+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");

+                return PclZip::errorCode();

+            }

             }

-          }

         }

-      }

+        }

 

     // end foreach

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privFileDescrExpand()

-  // Description :

-  //   This method look for each item of the list to see if its a file, a folder

-  //   or a string to be added as file. For any other type of files (link, other)

-  //   just ignore the item.

-  //   Then prepare the information that will be stored for that file.

-  //   When its a folder, expand the folder with all the files that are in that

-  //   folder (recursively).

-  // Parameters :

-  // Return Values :

-  //   1 on success.

-  //   0 on failure.

-  // --------------------------------------------------------------------------------

-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privFileDescrExpand()

+    // Description :

+    //   This method look for each item of the list to see if its a file, a folder

+    //   or a string to be added as file. For any other type of files (link, other)

+    //   just ignore the item.

+    //   Then prepare the information that will be stored for that file.

+    //   When its a folder, expand the folder with all the files that are in that

+    //   folder (recursively).

+    // Parameters :

+    // Return Values :

+    //   1 on success.

+    //   0 on failure.

+    // --------------------------------------------------------------------------------

+    function privFileDescrExpand(&$p_filedescr_list, &$p_options)

+    {

     $v_result=1;

 

     // ----- Create a result list

@@ -2026,58 +2026,58 @@ 
     // ----- Look each entry

     for ($i=0; $i<sizeof($p_filedescr_list); $i++) {

 

-      // ----- Get filedescr

-      $v_descr = $p_filedescr_list[$i];

+        // ----- Get filedescr

+        $v_descr = $p_filedescr_list[$i];

 

-      // ----- Reduce the filename

-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);

-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);

+        // ----- Reduce the filename

+        $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);

+        $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);

 

-      // ----- Look for real file or folder

-      if (file_exists($v_descr['filename'])) {

+        // ----- Look for real file or folder

+        if (file_exists($v_descr['filename'])) {

         if (@is_file($v_descr['filename'])) {

-          $v_descr['type'] = 'file';

+            $v_descr['type'] = 'file';

         }

         else if (@is_dir($v_descr['filename'])) {

-          $v_descr['type'] = 'folder';

+            $v_descr['type'] = 'folder';

         }

         else if (@is_link($v_descr['filename'])) {

-          // skip

-          continue;

+            // skip

+            continue;

         }

         else {

-          // skip

-          continue;

+            // skip

+            continue;

+        }

         }

-      }

 

-      // ----- Look for string added as file

-      else if (isset($v_descr['content'])) {

+        // ----- Look for string added as file

+        else if (isset($v_descr['content'])) {

         $v_descr['type'] = 'virtual_file';

-      }

+        }

 

-      // ----- Missing file

-      else {

+        // ----- Missing file

+        else {

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");

 

         // ----- Return

         return PclZip::errorCode();

-      }

+        }

 

-      // ----- Calculate the stored filename

-      $this->privCalculateStoredFilename($v_descr, $p_options);

+        // ----- Calculate the stored filename

+        $this->privCalculateStoredFilename($v_descr, $p_options);

 

-      // ----- Add the descriptor in result list

-      $v_result_list[sizeof($v_result_list)] = $v_descr;

+        // ----- Add the descriptor in result list

+        $v_result_list[sizeof($v_result_list)] = $v_descr;

 

-      // ----- Look for folder

-      if ($v_descr['type'] == 'folder') {

+        // ----- Look for folder

+        if ($v_descr['type'] == 'folder') {

         // ----- List of items in folder

         $v_dirlist_descr = array();

         $v_dirlist_nb = 0;

         if ($v_folder_handler = @opendir($v_descr['filename'])) {

-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {

+            while (($v_item_handler = @readdir($v_folder_handler)) !== false) {

 

             // ----- Skip '.' and '..'

             if (($v_item_handler == '.') || ($v_item_handler == '..')) {

@@ -2092,39 +2092,39 @@ 
             // files/sub-folders also change

             if (($v_descr['stored_filename'] != $v_descr['filename'])

                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {

-              if ($v_descr['stored_filename'] != '') {

+                if ($v_descr['stored_filename'] != '') {

                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;

-              }

-              else {

+                }

+                else {

                 $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;

-              }

+                }

             }

 

             $v_dirlist_nb++;

-          }

+            }

 

-          @closedir($v_folder_handler);

+            @closedir($v_folder_handler);

         }

         else {

-          // TBC : unable to open folder in read mode

+            // TBC : unable to open folder in read mode

         }

 

         // ----- Expand each element of the list

         if ($v_dirlist_nb != 0) {

-          // ----- Expand

-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {

+            // ----- Expand

+            if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {

             return $v_result;

-          }

+            }

 

-          // ----- Concat the resulting list

-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);

+            // ----- Concat the resulting list

+            $v_result_list = array_merge($v_result_list, $v_dirlist_descr);

         }

         else {

         }

 

         // ----- Free local array

         unset($v_dirlist_descr);

-      }

+        }

     }

 

     // ----- Get the result list

@@ -2132,17 +2132,17 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privCreate()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privCreate()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privCreate($p_filedescr_list, &$p_result_list, &$p_options)

+    {

     $v_result=1;

     $v_list_detail = array();

 

@@ -2152,8 +2152,8 @@ 
     // ----- Open the file in write mode

     if (($v_result = $this->privOpenFd('wb')) != 1)

     {

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Add the list of files

@@ -2167,17 +2167,17 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privAdd()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privAdd()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privAdd($p_filedescr_list, &$p_result_list, &$p_options)

+    {

     $v_result=1;

     $v_list_detail = array();

 

@@ -2185,11 +2185,11 @@ 
     if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))

     {

 

-      // ----- Do a create

-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);

+        // ----- Do a create

+        $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

     // ----- Magic quotes trick

     $this->privDisableMagicQuotes();

@@ -2197,20 +2197,20 @@ 
     // ----- Open the zip file

     if (($v_result=$this->privOpenFd('rb')) != 1)

     {

-      // ----- Magic quotes trick

-      $this->privSwapBackMagicQuotes();

+        // ----- Magic quotes trick

+        $this->privSwapBackMagicQuotes();

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Read the central directory informations

     $v_central_dir = array();

     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)

     {

-      $this->privCloseFd();

-      $this->privSwapBackMagicQuotes();

-      return $v_result;

+        $this->privCloseFd();

+        $this->privSwapBackMagicQuotes();

+        return $v_result;

     }

 

     // ----- Go to beginning of File

@@ -2222,13 +2222,13 @@ 
     // ----- Open the temporary file in write mode

     if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)

     {

-      $this->privCloseFd();

-      $this->privSwapBackMagicQuotes();

+        $this->privCloseFd();

+        $this->privSwapBackMagicQuotes();

 

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Copy the files from the archive to the temporary file

@@ -2236,10 +2236,10 @@ 
     $v_size = $v_central_dir['offset'];

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = fread($this->zip_fd, $v_read_size);

-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = fread($this->zip_fd, $v_read_size);

+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Swap the file descriptor

@@ -2253,13 +2253,13 @@ 
     $v_header_list = array();

     if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)

     {

-      fclose($v_zip_temp_fd);

-      $this->privCloseFd();

-      @unlink($v_zip_temp_name);

-      $this->privSwapBackMagicQuotes();

+        fclose($v_zip_temp_fd);

+        $this->privCloseFd();

+        @unlink($v_zip_temp_name);

+        $this->privSwapBackMagicQuotes();

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Store the offset of the central dir

@@ -2269,43 +2269,43 @@ 
     $v_size = $v_central_dir['size'];

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);

-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = @fread($v_zip_temp_fd, $v_read_size);

+        @fwrite($this->zip_fd, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Create the Central Dir files header

     for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)

     {

-      // ----- Create the file header

-      if ($v_header_list[$i]['status'] == 'ok') {

+        // ----- Create the file header

+        if ($v_header_list[$i]['status'] == 'ok') {

         if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {

-          fclose($v_zip_temp_fd);

-          $this->privCloseFd();

-          @unlink($v_zip_temp_name);

-          $this->privSwapBackMagicQuotes();

+            fclose($v_zip_temp_fd);

+            $this->privCloseFd();

+            @unlink($v_zip_temp_name);

+            $this->privSwapBackMagicQuotes();

 

-          // ----- Return

-          return $v_result;

+            // ----- Return

+            return $v_result;

         }

         $v_count++;

-      }

+        }

 

-      // ----- Transform the header to a 'usable' info

-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);

+        // ----- Transform the header to a 'usable' info

+        $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);

     }

 

     // ----- Zip file comment

     $v_comment = $v_central_dir['comment'];

     if (isset($p_options[PCLZIP_OPT_COMMENT])) {

-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];

+        $v_comment = $p_options[PCLZIP_OPT_COMMENT];

     }

     if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {

-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];

+        $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];

     }

     if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {

-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;

+        $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;

     }

 

     // ----- Calculate the size of the central header

@@ -2314,12 +2314,12 @@ 
     // ----- Create the central dir footer

     if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)

     {

-      // ----- Reset the file list

-      unset($v_header_list);

-      $this->privSwapBackMagicQuotes();

+        // ----- Reset the file list

+        unset($v_header_list);

+        $this->privSwapBackMagicQuotes();

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Swap back the file descriptor

@@ -2347,85 +2347,85 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privOpenFd()

-  // Description :

-  // Parameters :

-  // --------------------------------------------------------------------------------

-  function privOpenFd($p_mode)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privOpenFd()

+    // Description :

+    // Parameters :

+    // --------------------------------------------------------------------------------

+    function privOpenFd($p_mode)

+    {

     $v_result=1;

 

     // ----- Look if already open

     if ($this->zip_fd != 0)

     {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Open the zip file

     if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)

     {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privCloseFd()

-  // Description :

-  // Parameters :

-  // --------------------------------------------------------------------------------

-  function privCloseFd()

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privCloseFd()

+    // Description :

+    // Parameters :

+    // --------------------------------------------------------------------------------

+    function privCloseFd()

+    {

     $v_result=1;

 

     if ($this->zip_fd != 0)

-      @fclose($this->zip_fd);

+        @fclose($this->zip_fd);

     $this->zip_fd = 0;

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privAddList()

-  // Description :

-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is

-  //   different from the real path of the file. This is usefull if you want to have PclTar

-  //   running in any directory, and memorize relative path from an other directory.

-  // Parameters :

-  //   $p_list : An array containing the file or directory names to add in the tar

-  //   $p_result_list : list of added files with their properties (specially the status field)

-  //   $p_add_dir : Path to add in the filename path archived

-  //   $p_remove_dir : Path to remove in the filename path archived

-  // Return Values :

-  // --------------------------------------------------------------------------------

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privAddList()

+    // Description :

+    //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is

+    //   different from the real path of the file. This is usefull if you want to have PclTar

+    //   running in any directory, and memorize relative path from an other directory.

+    // Parameters :

+    //   $p_list : An array containing the file or directory names to add in the tar

+    //   $p_result_list : list of added files with their properties (specially the status field)

+    //   $p_add_dir : Path to add in the filename path archived

+    //   $p_remove_dir : Path to remove in the filename path archived

+    // Return Values :

+    // --------------------------------------------------------------------------------

 //  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)

-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)

-  {

+    function privAddList($p_filedescr_list, &$p_result_list, &$p_options)

+    {

     $v_result=1;

 

     // ----- Add the files

     $v_header_list = array();

     if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)

     {

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Store the offset of the central dir

@@ -2434,23 +2434,23 @@ 
     // ----- Create the Central Dir files header

     for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)

     {

-      // ----- Create the file header

-      if ($v_header_list[$i]['status'] == 'ok') {

+        // ----- Create the file header

+        if ($v_header_list[$i]['status'] == 'ok') {

         if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {

-          // ----- Return

-          return $v_result;

+            // ----- Return

+            return $v_result;

         }

         $v_count++;

-      }

+        }

 

-      // ----- Transform the header to a 'usable' info

-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);

+        // ----- Transform the header to a 'usable' info

+        $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);

     }

 

     // ----- Zip file comment

     $v_comment = '';

     if (isset($p_options[PCLZIP_OPT_COMMENT])) {

-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];

+        $v_comment = $p_options[PCLZIP_OPT_COMMENT];

     }

 

     // ----- Calculate the size of the central header

@@ -2459,29 +2459,29 @@ 
     // ----- Create the central dir footer

     if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)

     {

-      // ----- Reset the file list

-      unset($v_header_list);

+        // ----- Reset the file list

+        unset($v_header_list);

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privAddFileList()

-  // Description :

-  // Parameters :

-  //   $p_filedescr_list : An array containing the file description

-  //                      or directory names to add in the zip

-  //   $p_result_list : list of added files with their properties (specially the status field)

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privAddFileList()

+    // Description :

+    // Parameters :

+    //   $p_filedescr_list : An array containing the file description

+    //                      or directory names to add in the zip

+    //   $p_result_list : list of added files with their properties (specially the status field)

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)

+    {

     $v_result=1;

     $v_header = array();

 

@@ -2490,60 +2490,60 @@ 
 

     // ----- Loop on the files

     for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {

-      // ----- Format the filename

-      $p_filedescr_list[$j]['filename']

-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);

+        // ----- Format the filename

+        $p_filedescr_list[$j]['filename']

+        = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);

 

 

-      // ----- Skip empty file names

-      // TBC : Can this be possible ? not checked in DescrParseAtt ?

-      if ($p_filedescr_list[$j]['filename'] == "") {

+        // ----- Skip empty file names

+        // TBC : Can this be possible ? not checked in DescrParseAtt ?

+        if ($p_filedescr_list[$j]['filename'] == "") {

         continue;

-      }

+        }

 

-      // ----- Check the filename

-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')

+        // ----- Check the filename

+        if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')

           && (!file_exists($p_filedescr_list[$j]['filename']))) {

         PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");

         return PclZip::errorCode();

-      }

+        }

 

-      // ----- Look if it is a file or a dir with no all path remove option

-      // or a dir with all its path removed

+        // ----- Look if it is a file or a dir with no all path remove option

+        // or a dir with all its path removed

 //      if (   (is_file($p_filedescr_list[$j]['filename']))

 //          || (   is_dir($p_filedescr_list[$j]['filename'])

-      if (   ($p_filedescr_list[$j]['type'] == 'file')

+        if (   ($p_filedescr_list[$j]['type'] == 'file')

           || ($p_filedescr_list[$j]['type'] == 'virtual_file')

           || (   ($p_filedescr_list[$j]['type'] == 'folder')

               && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])

                   || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))

-          ) {

+            ) {

 

         // ----- Add the file

         $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,

-                                       $p_options);

+                                        $p_options);

         if ($v_result != 1) {

-          return $v_result;

+            return $v_result;

         }

 

         // ----- Store the file infos

         $p_result_list[$v_nb++] = $v_header;

-      }

+        }

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privAddFile()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privAddFile($p_filedescr, &$p_header, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privAddFile()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privAddFile($p_filedescr, &$p_header, &$p_options)

+    {

     $v_result=1;

 

     // ----- Working variable

@@ -2551,11 +2551,11 @@ 
 

     // TBC : Already done in the fileAtt check ... ?

     if ($p_filename == "") {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Look for a stored different filename

@@ -2590,94 +2590,94 @@ 
 

     // ----- Look for regular file

     if ($p_filedescr['type']=='file') {

-      $p_header['external'] = 0x00000000;

-      $p_header['size'] = filesize($p_filename);

+        $p_header['external'] = 0x00000000;

+        $p_header['size'] = filesize($p_filename);

     }

 

     // ----- Look for regular folder

     else if ($p_filedescr['type']=='folder') {

-      $p_header['external'] = 0x00000010;

-      $p_header['mtime'] = filemtime($p_filename);

-      $p_header['size'] = filesize($p_filename);

+        $p_header['external'] = 0x00000010;

+        $p_header['mtime'] = filemtime($p_filename);

+        $p_header['size'] = filesize($p_filename);

     }

 

     // ----- Look for virtual file

     else if ($p_filedescr['type'] == 'virtual_file') {

-      $p_header['external'] = 0x00000000;

-      $p_header['size'] = strlen($p_filedescr['content']);

+        $p_header['external'] = 0x00000000;

+        $p_header['size'] = strlen($p_filedescr['content']);

     }

 

 

     // ----- Look for filetime

     if (isset($p_filedescr['mtime'])) {

-      $p_header['mtime'] = $p_filedescr['mtime'];

+        $p_header['mtime'] = $p_filedescr['mtime'];

     }

     else if ($p_filedescr['type'] == 'virtual_file') {

-      $p_header['mtime'] = time();

+        $p_header['mtime'] = time();

     }

     else {

-      $p_header['mtime'] = filemtime($p_filename);

+        $p_header['mtime'] = filemtime($p_filename);

     }

 

     // ------ Look for file comment

     if (isset($p_filedescr['comment'])) {

-      $p_header['comment_len'] = strlen($p_filedescr['comment']);

-      $p_header['comment'] = $p_filedescr['comment'];

+        $p_header['comment_len'] = strlen($p_filedescr['comment']);

+        $p_header['comment'] = $p_filedescr['comment'];

     }

     else {

-      $p_header['comment_len'] = 0;

-      $p_header['comment'] = '';

+        $p_header['comment_len'] = 0;

+        $p_header['comment'] = '';

     }

 

     // ----- Look for pre-add callback

     if (isset($p_options[PCLZIP_CB_PRE_ADD])) {

 

-      // ----- Generate a local information

-      $v_local_header = array();

-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);

+        // ----- Generate a local information

+        $v_local_header = array();

+        $this->privConvertHeader2FileInfo($p_header, $v_local_header);

 

-      // ----- Call the callback

-      // Here I do not use call_user_func() because I need to send a reference to the

-      // header.

+        // ----- Call the callback

+        // Here I do not use call_user_func() because I need to send a reference to the

+        // header.

 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');

-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);

-      if ($v_result == 0) {

+        $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);

+        if ($v_result == 0) {

         // ----- Change the file status

         $p_header['status'] = "skipped";

         $v_result = 1;

-      }

+        }

 

-      // ----- Update the informations

-      // Only some fields can be modified

-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {

+        // ----- Update the informations

+        // Only some fields can be modified

+        if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {

         $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);

-      }

+        }

     }

 

     // ----- Look for empty stored filename

     if ($p_header['stored_filename'] == "") {

-      $p_header['status'] = "filtered";

+        $p_header['status'] = "filtered";

     }

 

     // ----- Check the path length

     if (strlen($p_header['stored_filename']) > 0xFF) {

-      $p_header['status'] = 'filename_too_long';

+        $p_header['status'] = 'filename_too_long';

     }

 

     // ----- Look if no error, or file not skipped

     if ($p_header['status'] == 'ok') {

 

-      // ----- Look for a file

-      if ($p_filedescr['type'] == 'file') {

+        // ----- Look for a file

+        if ($p_filedescr['type'] == 'file') {

         // ----- Look for using temporary file to zip

         if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))

             && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])

                 || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])

                     && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {

-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);

-          if ($v_result < PCLZIP_ERR_NO_ERROR) {

+            $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);

+            if ($v_result < PCLZIP_ERR_NO_ERROR) {

             return $v_result;

-          }

+            }

         }

 

         // ----- Use "in memory" zip algo

@@ -2685,8 +2685,8 @@ 
 

         // ----- Open the source file

         if (($v_file = @fopen($p_filename, "rb")) == 0) {

-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");

-          return PclZip::errorCode();

+            PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");

+            return PclZip::errorCode();

         }

 

         // ----- Read the file content

@@ -2700,25 +2700,25 @@ 
 

         // ----- Look for no compression

         if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {

-          // ----- Set header parameters

-          $p_header['compressed_size'] = $p_header['size'];

-          $p_header['compression'] = 0;

+            // ----- Set header parameters

+            $p_header['compressed_size'] = $p_header['size'];

+            $p_header['compression'] = 0;

         }

 

         // ----- Look for normal compression

         else {

-          // ----- Compress the content

-          $v_content = @gzdeflate($v_content);

+            // ----- Compress the content

+            $v_content = @gzdeflate($v_content);

 

-          // ----- Set header parameters

-          $p_header['compressed_size'] = strlen($v_content);

-          $p_header['compression'] = 8;

+            // ----- Set header parameters

+            $p_header['compressed_size'] = strlen($v_content);

+            $p_header['compression'] = 8;

         }

 

         // ----- Call the header generation

         if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {

-          @fclose($v_file);

-          return $v_result;

+            @fclose($v_file);

+            return $v_result;

         }

 

         // ----- Write the compressed (or not) content

@@ -2726,10 +2726,10 @@ 
 

         }

 

-      }

+        }

 

-      // ----- Look for a virtual file (a file from string)

-      else if ($p_filedescr['type'] == 'virtual_file') {

+        // ----- Look for a virtual file (a file from string)

+        else if ($p_filedescr['type'] == 'virtual_file') {

 

         $v_content = $p_filedescr['content'];

 

@@ -2738,36 +2738,36 @@ 
 

         // ----- Look for no compression

         if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {

-          // ----- Set header parameters

-          $p_header['compressed_size'] = $p_header['size'];

-          $p_header['compression'] = 0;

+            // ----- Set header parameters

+            $p_header['compressed_size'] = $p_header['size'];

+            $p_header['compression'] = 0;

         }

 

         // ----- Look for normal compression

         else {

-          // ----- Compress the content

-          $v_content = @gzdeflate($v_content);

+            // ----- Compress the content

+            $v_content = @gzdeflate($v_content);

 

-          // ----- Set header parameters

-          $p_header['compressed_size'] = strlen($v_content);

-          $p_header['compression'] = 8;

+            // ----- Set header parameters

+            $p_header['compressed_size'] = strlen($v_content);

+            $p_header['compression'] = 8;

         }

 

         // ----- Call the header generation

         if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {

-          @fclose($v_file);

-          return $v_result;

+            @fclose($v_file);

+            return $v_result;

         }

 

         // ----- Write the compressed (or not) content

         @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);

-      }

+        }

 

-      // ----- Look for a directory

-      else if ($p_filedescr['type'] == 'folder') {

+        // ----- Look for a directory

+        else if ($p_filedescr['type'] == 'folder') {

         // ----- Look for directory last '/'

         if (@substr($p_header['stored_filename'], -1) != '/') {

-          $p_header['stored_filename'] .= '/';

+            $p_header['stored_filename'] .= '/';

         }

 

         // ----- Set the file properties

@@ -2778,45 +2778,45 @@ 
         // ----- Call the header generation

         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)

         {

-          return $v_result;

+            return $v_result;

+        }

         }

-      }

     }

 

     // ----- Look for post-add callback

     if (isset($p_options[PCLZIP_CB_POST_ADD])) {

 

-      // ----- Generate a local information

-      $v_local_header = array();

-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);

+        // ----- Generate a local information

+        $v_local_header = array();

+        $this->privConvertHeader2FileInfo($p_header, $v_local_header);

 

-      // ----- Call the callback

-      // Here I do not use call_user_func() because I need to send a reference to the

-      // header.

+        // ----- Call the callback

+        // Here I do not use call_user_func() because I need to send a reference to the

+        // header.

 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');

-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);

-      if ($v_result == 0) {

+        $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);

+        if ($v_result == 0) {

         // ----- Ignored

         $v_result = 1;

-      }

+        }

 

-      // ----- Update the informations

-      // Nothing can be modified

+        // ----- Update the informations

+        // Nothing can be modified

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privAddFileUsingTempFile()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privAddFileUsingTempFile()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)

+    {

     $v_result=PCLZIP_ERR_NO_ERROR;

 

     // ----- Working variable

@@ -2825,26 +2825,26 @@ 
 

     // ----- Open the source file

     if (($v_file = @fopen($p_filename, "rb")) == 0) {

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");

-      return PclZip::errorCode();

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");

+        return PclZip::errorCode();

     }

 

     // ----- Creates a compressed temporary file

     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';

     if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {

-      fclose($v_file);

-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');

-      return PclZip::errorCode();

+        fclose($v_file);

+        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');

+        return PclZip::errorCode();

     }

 

     // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks

     $v_size = filesize($p_filename);

     while ($v_size != 0) {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = @fread($v_file, $v_read_size);

-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);

-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = @fread($v_file, $v_read_size);

+        //$v_binary_data = pack('a'.$v_read_size, $v_buffer);

+        @gzputs($v_file_compressed, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Close the file

@@ -2853,14 +2853,14 @@ 
 

     // ----- Check the minimum file size

     if (filesize($v_gzip_temp_name) < 18) {

-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');

-      return PclZip::errorCode();

+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');

+        return PclZip::errorCode();

     }

 

     // ----- Extract the compressed attributes

     if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');

-      return PclZip::errorCode();

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');

+        return PclZip::errorCode();

     }

 

     // ----- Read the gzip file header

@@ -2886,14 +2886,14 @@ 
 

     // ----- Call the header generation

     if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {

-      return $v_result;

+        return $v_result;

     }

 

     // ----- Add the compressed data

     if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)

     {

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');

-      return PclZip::errorCode();

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');

+        return PclZip::errorCode();

     }

 

     // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks

@@ -2901,11 +2901,11 @@ 
     $v_size = $p_header['compressed_size'];

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = @fread($v_file_compressed, $v_read_size);

-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);

-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = @fread($v_file_compressed, $v_read_size);

+        //$v_binary_data = pack('a'.$v_read_size, $v_buffer);

+        @fwrite($this->zip_fd, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Close the file

@@ -2916,112 +2916,112 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privCalculateStoredFilename()

-  // Description :

-  //   Based on file descriptor properties and global options, this method

-  //   calculate the filename that will be stored in the archive.

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privCalculateStoredFilename()

+    // Description :

+    //   Based on file descriptor properties and global options, this method

+    //   calculate the filename that will be stored in the archive.

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privCalculateStoredFilename(&$p_filedescr, &$p_options)

+    {

     $v_result=1;

 

     // ----- Working variables

     $p_filename = $p_filedescr['filename'];

     if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {

-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];

+        $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];

     }

     else {

-      $p_add_dir = '';

+        $p_add_dir = '';

     }

     if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {

-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];

+        $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];

     }

     else {

-      $p_remove_dir = '';

+        $p_remove_dir = '';

     }

     if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {

-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];

+        $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];

     }

     else {

-      $p_remove_all_dir = 0;

+        $p_remove_all_dir = 0;

     }

 

 

     // ----- Look for full name change

     if (isset($p_filedescr['new_full_name'])) {

-      // ----- Remove drive letter if any

-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);

+        // ----- Remove drive letter if any

+        $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);

     }

 

     // ----- Look for path and/or short name change

     else {

 

-      // ----- Look for short name change

-      // Its when we cahnge just the filename but not the path

-      if (isset($p_filedescr['new_short_name'])) {

+        // ----- Look for short name change

+        // Its when we cahnge just the filename but not the path

+        if (isset($p_filedescr['new_short_name'])) {

         $v_path_info = pathinfo($p_filename);

         $v_dir = '';

         if ($v_path_info['dirname'] != '') {

-          $v_dir = $v_path_info['dirname'].'/';

+            $v_dir = $v_path_info['dirname'].'/';

         }

         $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];

-      }

-      else {

+        }

+        else {

         // ----- Calculate the stored filename

         $v_stored_filename = $p_filename;

-      }

+        }

 

-      // ----- Look for all path to remove

-      if ($p_remove_all_dir) {

+        // ----- Look for all path to remove

+        if ($p_remove_all_dir) {

         $v_stored_filename = basename($p_filename);

-      }

-      // ----- Look for partial path remove

-      else if ($p_remove_dir != "") {

+        }

+        // ----- Look for partial path remove

+        else if ($p_remove_dir != "") {

         if (substr($p_remove_dir, -1) != '/')

-          $p_remove_dir .= "/";

+            $p_remove_dir .= "/";

 

         if (   (substr($p_filename, 0, 2) == "./")

             || (substr($p_remove_dir, 0, 2) == "./")) {

 

-          if (   (substr($p_filename, 0, 2) == "./")

+            if (   (substr($p_filename, 0, 2) == "./")

               && (substr($p_remove_dir, 0, 2) != "./")) {

             $p_remove_dir = "./".$p_remove_dir;

-          }

-          if (   (substr($p_filename, 0, 2) != "./")

+            }

+            if (   (substr($p_filename, 0, 2) != "./")

               && (substr($p_remove_dir, 0, 2) == "./")) {

             $p_remove_dir = substr($p_remove_dir, 2);

-          }

+            }

         }

 

         $v_compare = PclZipUtilPathInclusion($p_remove_dir,

-                                             $v_stored_filename);

+                                                $v_stored_filename);

         if ($v_compare > 0) {

-          if ($v_compare == 2) {

+            if ($v_compare == 2) {

             $v_stored_filename = "";

-          }

-          else {

+            }

+            else {

             $v_stored_filename = substr($v_stored_filename,

                                         strlen($p_remove_dir));

-          }

+            }

+        }

         }

-      }

 

-      // ----- Remove drive letter if any

-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);

+        // ----- Remove drive letter if any

+        $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);

 

-      // ----- Look for path to add

-      if ($p_add_dir != "") {

+        // ----- Look for path to add

+        if ($p_add_dir != "") {

         if (substr($p_add_dir, -1) == "/")

-          $v_stored_filename = $p_add_dir.$v_stored_filename;

+            $v_stored_filename = $p_add_dir.$v_stored_filename;

         else

-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;

-      }

+            $v_stored_filename = $p_add_dir."/".$v_stored_filename;

+        }

     }

 

     // ----- Filename (reduce the path of stored name)

@@ -3030,17 +3030,17 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privWriteFileHeader()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privWriteFileHeader(&$p_header)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privWriteFileHeader()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privWriteFileHeader(&$p_header)

+    {

     $v_result=1;

 

     // ----- Store the offset position of the file

@@ -3053,12 +3053,12 @@ 
 

     // ----- Packed data

     $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,

-	                      $p_header['version_extracted'], $p_header['flag'],

-                          $p_header['compression'], $v_mtime, $v_mdate,

-                          $p_header['crc'], $p_header['compressed_size'],

-						  $p_header['size'],

-                          strlen($p_header['stored_filename']),

-						  $p_header['extra_len']);

+                            $p_header['version_extracted'], $p_header['flag'],

+                            $p_header['compression'], $v_mtime, $v_mdate,

+                            $p_header['crc'], $p_header['compressed_size'],

+                            $p_header['size'],

+                            strlen($p_header['stored_filename']),

+                            $p_header['extra_len']);

 

     // ----- Write the first 148 bytes of the header in the archive

     fputs($this->zip_fd, $v_binary_data, 30);

@@ -3066,26 +3066,26 @@ 
     // ----- Write the variable fields

     if (strlen($p_header['stored_filename']) != 0)

     {

-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));

+        fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));

     }

     if ($p_header['extra_len'] != 0)

     {

-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);

+        fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privWriteCentralFileHeader()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privWriteCentralFileHeader(&$p_header)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privWriteCentralFileHeader()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privWriteCentralFileHeader(&$p_header)

+    {

     $v_result=1;

 

     // TBC

@@ -3100,14 +3100,14 @@ 
 

     // ----- Packed data

     $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,

-	                      $p_header['version'], $p_header['version_extracted'],

-                          $p_header['flag'], $p_header['compression'],

-						  $v_mtime, $v_mdate, $p_header['crc'],

-                          $p_header['compressed_size'], $p_header['size'],

-                          strlen($p_header['stored_filename']),

-						  $p_header['extra_len'], $p_header['comment_len'],

-                          $p_header['disk'], $p_header['internal'],

-						  $p_header['external'], $p_header['offset']);

+                            $p_header['version'], $p_header['version_extracted'],

+                            $p_header['flag'], $p_header['compression'],

+                            $v_mtime, $v_mdate, $p_header['crc'],

+                            $p_header['compressed_size'], $p_header['size'],

+                            strlen($p_header['stored_filename']),

+                            $p_header['extra_len'], $p_header['comment_len'],

+                            $p_header['disk'], $p_header['internal'],

+                            $p_header['external'], $p_header['offset']);

 

     // ----- Write the 42 bytes of the header in the zip file

     fputs($this->zip_fd, $v_binary_data, 46);

@@ -3115,36 +3115,36 @@ 
     // ----- Write the variable fields

     if (strlen($p_header['stored_filename']) != 0)

     {

-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));

+        fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));

     }

     if ($p_header['extra_len'] != 0)

     {

-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);

+        fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);

     }

     if ($p_header['comment_len'] != 0)

     {

-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);

+        fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privWriteCentralHeader()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privWriteCentralHeader()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)

+    {

     $v_result=1;

 

     // ----- Packed data

     $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,

-	                      $p_nb_entries, $p_size,

-						  $p_offset, strlen($p_comment));

+                            $p_nb_entries, $p_size,

+                            $p_offset, strlen($p_comment));

 

     // ----- Write the 22 bytes of the header in the zip file

     fputs($this->zip_fd, $v_binary_data, 22);

@@ -3152,22 +3152,22 @@ 
     // ----- Write the variable fields

     if (strlen($p_comment) != 0)

     {

-      fputs($this->zip_fd, $p_comment, strlen($p_comment));

+        fputs($this->zip_fd, $p_comment, strlen($p_comment));

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privList()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privList(&$p_list)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privList()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privList(&$p_list)

+    {

     $v_result=1;

 

     // ----- Magic quotes trick

@@ -3176,51 +3176,51 @@ 
     // ----- Open the zip file

     if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)

     {

-      // ----- Magic quotes trick

-      $this->privSwapBackMagicQuotes();

+        // ----- Magic quotes trick

+        $this->privSwapBackMagicQuotes();

 

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Read the central directory informations

     $v_central_dir = array();

     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)

     {

-      $this->privSwapBackMagicQuotes();

-      return $v_result;

+        $this->privSwapBackMagicQuotes();

+        return $v_result;

     }

 

     // ----- Go to beginning of Central Dir

     @rewind($this->zip_fd);

     if (@fseek($this->zip_fd, $v_central_dir['offset']))

     {

-      $this->privSwapBackMagicQuotes();

+        $this->privSwapBackMagicQuotes();

 

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Read each entry

     for ($i=0; $i<$v_central_dir['entries']; $i++)

     {

-      // ----- Read the file header

-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)

-      {

+        // ----- Read the file header

+        if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)

+        {

         $this->privSwapBackMagicQuotes();

         return $v_result;

-      }

-      $v_header['index'] = $i;

+        }

+        $v_header['index'] = $i;

 

-      // ----- Get the only interesting attributes

-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);

-      unset($v_header);

+        // ----- Get the only interesting attributes

+        $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);

+        unset($v_header);

     }

 

     // ----- Close the zip file

@@ -3231,30 +3231,30 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privConvertHeader2FileInfo()

-  // Description :

-  //   This function takes the file informations from the central directory

-  //   entries and extract the interesting parameters that will be given back.

-  //   The resulting file infos are set in the array $p_info

-  //     $p_info['filename'] : Filename with full path. Given by user (add),

-  //                           extracted in the filesystem (extract).

-  //     $p_info['stored_filename'] : Stored filename in the archive.

-  //     $p_info['size'] = Size of the file.

-  //     $p_info['compressed_size'] = Compressed size of the file.

-  //     $p_info['mtime'] = Last modification date of the file.

-  //     $p_info['comment'] = Comment associated with the file.

-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.

-  //     $p_info['status'] = status of the action on the file.

-  //     $p_info['crc'] = CRC of the file content.

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privConvertHeader2FileInfo($p_header, &$p_info)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privConvertHeader2FileInfo()

+    // Description :

+    //   This function takes the file informations from the central directory

+    //   entries and extract the interesting parameters that will be given back.

+    //   The resulting file infos are set in the array $p_info

+    //     $p_info['filename'] : Filename with full path. Given by user (add),

+    //                           extracted in the filesystem (extract).

+    //     $p_info['stored_filename'] : Stored filename in the archive.

+    //     $p_info['size'] = Size of the file.

+    //     $p_info['compressed_size'] = Compressed size of the file.

+    //     $p_info['mtime'] = Last modification date of the file.

+    //     $p_info['comment'] = Comment associated with the file.

+    //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.

+    //     $p_info['status'] = status of the action on the file.

+    //     $p_info['crc'] = CRC of the file content.

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privConvertHeader2FileInfo($p_header, &$p_info)

+    {

     $v_result=1;

 

     // ----- Get the interesting attributes

@@ -3273,27 +3273,27 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privExtractByRule()

-  // Description :

-  //   Extract a file or directory depending of rules (by index, by name, ...)

-  // Parameters :

-  //   $p_file_list : An array where will be placed the properties of each

-  //                  extracted file

-  //   $p_path : Path to add while writing the extracted files

-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the

-  //                    extracted files. If the path does not match the file path,

-  //                    the file is extracted with its memorized path.

-  //                    $p_remove_path does not apply to 'list' mode.

-  //                    $p_path and $p_remove_path are commulative.

-  // Return Values :

-  //   1 on success,0 or less on error (see error code list)

-  // --------------------------------------------------------------------------------

-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privExtractByRule()

+    // Description :

+    //   Extract a file or directory depending of rules (by index, by name, ...)

+    // Parameters :

+    //   $p_file_list : An array where will be placed the properties of each

+    //                  extracted file

+    //   $p_path : Path to add while writing the extracted files

+    //   $p_remove_path : Path to remove (from the file memorized path) while writing the

+    //                    extracted files. If the path does not match the file path,

+    //                    the file is extracted with its memorized path.

+    //                    $p_remove_path does not apply to 'list' mode.

+    //                    $p_path and $p_remove_path are commulative.

+    // Return Values :

+    //   1 on success,0 or less on error (see error code list)

+    // --------------------------------------------------------------------------------

+    function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)

+    {

     $v_result=1;

 

     // ----- Magic quotes trick

@@ -3301,44 +3301,44 @@ 
 

     // ----- Check the path

     if (   ($p_path == "")

-	    || (   (substr($p_path, 0, 1) != "/")

-		    && (substr($p_path, 0, 3) != "../")

-			&& (substr($p_path,1,2)!=":/")))

-      $p_path = "./".$p_path;

+        || (   (substr($p_path, 0, 1) != "/")

+            && (substr($p_path, 0, 3) != "../")

+            && (substr($p_path,1,2)!=":/")))

+        $p_path = "./".$p_path;

 

     // ----- Reduce the path last (and duplicated) '/'

     if (($p_path != "./") && ($p_path != "/"))

     {

-      // ----- Look for the path end '/'

-      while (substr($p_path, -1) == "/")

-      {

+        // ----- Look for the path end '/'

+        while (substr($p_path, -1) == "/")

+        {

         $p_path = substr($p_path, 0, strlen($p_path)-1);

-      }

+        }

     }

 

     // ----- Look for path to remove format (should end by /)

     if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))

     {

-      $p_remove_path .= '/';

+        $p_remove_path .= '/';

     }

     $p_remove_path_size = strlen($p_remove_path);

 

     // ----- Open the zip file

     if (($v_result = $this->privOpenFd('rb')) != 1)

     {

-      $this->privSwapBackMagicQuotes();

-      return $v_result;

+        $this->privSwapBackMagicQuotes();

+        return $v_result;

     }

 

     // ----- Read the central directory informations

     $v_central_dir = array();

     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)

     {

-      // ----- Close the zip file

-      $this->privCloseFd();

-      $this->privSwapBackMagicQuotes();

+        // ----- Close the zip file

+        $this->privCloseFd();

+        $this->privSwapBackMagicQuotes();

 

-      return $v_result;

+        return $v_result;

     }

 

     // ----- Start at beginning of Central Dir

@@ -3349,10 +3349,10 @@ 
     for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)

     {

 

-      // ----- Read next Central dir entry

-      @rewind($this->zip_fd);

-      if (@fseek($this->zip_fd, $v_pos_entry))

-      {

+        // ----- Read next Central dir entry

+        @rewind($this->zip_fd);

+        if (@fseek($this->zip_fd, $v_pos_entry))

+        {

         // ----- Close the zip file

         $this->privCloseFd();

         $this->privSwapBackMagicQuotes();

@@ -3362,54 +3362,54 @@ 
 

         // ----- Return

         return PclZip::errorCode();

-      }

+        }

 

-      // ----- Read the file header

-      $v_header = array();

-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)

-      {

+        // ----- Read the file header

+        $v_header = array();

+        if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)

+        {

         // ----- Close the zip file

         $this->privCloseFd();

         $this->privSwapBackMagicQuotes();

 

         return $v_result;

-      }

+        }

 

-      // ----- Store the index

-      $v_header['index'] = $i;

+        // ----- Store the index

+        $v_header['index'] = $i;

 

-      // ----- Store the file position

-      $v_pos_entry = ftell($this->zip_fd);

+        // ----- Store the file position

+        $v_pos_entry = ftell($this->zip_fd);

 

-      // ----- Look for the specific extract rules

-      $v_extract = false;

+        // ----- Look for the specific extract rules

+        $v_extract = false;

 

-      // ----- Look for extract by name rule

-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))

+        // ----- Look for extract by name rule

+        if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))

           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {

 

-          // ----- Look if the filename is in the list

-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {

+            // ----- Look if the filename is in the list

+            for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {

 

-              // ----- Look for a directory

-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {

+                // ----- Look for a directory

+                if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {

 

-                  // ----- Look if the directory is in the filename path

-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))

+                    // ----- Look if the directory is in the filename path

+                    if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))

                       && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {

-                      $v_extract = true;

-                  }

-              }

-              // ----- Look for a filename

-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {

-                  $v_extract = true;

-              }

-          }

-      }

+                        $v_extract = true;

+                    }

+                }

+                // ----- Look for a filename

+                elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {

+                    $v_extract = true;

+                }

+            }

+        }

 

-      // ----- Look for extract by ereg rule

-      // ereg() is deprecated with PHP 5.3

-      /*

+        // ----- Look for extract by ereg rule

+        // ereg() is deprecated with PHP 5.3

+        /*

       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))

                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {

 

@@ -3419,199 +3419,199 @@ 
       }

       */

 

-      // ----- Look for extract by preg rule

-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))

+        // ----- Look for extract by preg rule

+        else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))

                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {

 

-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {

-              $v_extract = true;

-          }

-      }

+            if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {

+                $v_extract = true;

+            }

+        }

 

-      // ----- Look for extract by index rule

-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))

+        // ----- Look for extract by index rule

+        else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))

                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {

 

-          // ----- Look if the index is in the list

-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {

+            // ----- Look if the index is in the list

+            for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {

 

-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {

-                  $v_extract = true;

-              }

-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {

-                  $j_start = $j+1;

-              }

+                if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {

+                    $v_extract = true;

+                }

+                if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {

+                    $j_start = $j+1;

+                }

 

-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {

-                  break;

-              }

-          }

-      }

+                if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {

+                    break;

+                }

+            }

+        }

 

-      // ----- Look for no rule, which means extract all the archive

-      else {

-          $v_extract = true;

-      }

+        // ----- Look for no rule, which means extract all the archive

+        else {

+            $v_extract = true;

+        }

 

-	  // ----- Check compression method

-	  if (   ($v_extract)

-	      && (   ($v_header['compression'] != 8)

-		      && ($v_header['compression'] != 0))) {

-          $v_header['status'] = 'unsupported_compression';

+        // ----- Check compression method

+        if (   ($v_extract)

+          && (   ($v_header['compression'] != 8)

+              && ($v_header['compression'] != 0))) {

+            $v_header['status'] = 'unsupported_compression';

 

-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

+            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

+              && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

 

-              $this->privSwapBackMagicQuotes();

+                $this->privSwapBackMagicQuotes();

 

-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,

-			                       "Filename '".$v_header['stored_filename']."' is "

-				  	    	  	   ."compressed by an unsupported compression "

-				  	    	  	   ."method (".$v_header['compression'].") ");

+                PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,

+                                    "Filename '".$v_header['stored_filename']."' is "

+                                        ."compressed by an unsupported compression "

+                                        ."method (".$v_header['compression'].") ");

 

-              return PclZip::errorCode();

-		  }

-	  }

+                return PclZip::errorCode();

+            }

+        }

 

-	  // ----- Check encrypted files

-	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {

-          $v_header['status'] = 'unsupported_encryption';

+        // ----- Check encrypted files

+        if (($v_extract) && (($v_header['flag'] & 1) == 1)) {

+            $v_header['status'] = 'unsupported_encryption';

 

-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

+            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

+              && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

 

-              $this->privSwapBackMagicQuotes();

+                $this->privSwapBackMagicQuotes();

 

-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,

-			                       "Unsupported encryption for "

-				  	    	  	   ." filename '".$v_header['stored_filename']

-								   ."'");

+                PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,

+                                    "Unsupported encryption for "

+                                        ." filename '".$v_header['stored_filename']

+                                    ."'");

 

-              return PclZip::errorCode();

-		  }

+                return PclZip::errorCode();

+            }

     }

 

-      // ----- Look for real extraction

-      if (($v_extract) && ($v_header['status'] != 'ok')) {

-          $v_result = $this->privConvertHeader2FileInfo($v_header,

-		                                        $p_file_list[$v_nb_extracted++]);

-          if ($v_result != 1) {

-              $this->privCloseFd();

-              $this->privSwapBackMagicQuotes();

-              return $v_result;

-          }

+        // ----- Look for real extraction

+        if (($v_extract) && ($v_header['status'] != 'ok')) {

+            $v_result = $this->privConvertHeader2FileInfo($v_header,

+                                                $p_file_list[$v_nb_extracted++]);

+            if ($v_result != 1) {

+                $this->privCloseFd();

+                $this->privSwapBackMagicQuotes();

+                return $v_result;

+            }

 

-          $v_extract = false;

-      }

+            $v_extract = false;

+        }

 

-      // ----- Look for real extraction

-      if ($v_extract)

-      {

+        // ----- Look for real extraction

+        if ($v_extract)

+        {

 

         // ----- Go to the file position

         @rewind($this->zip_fd);

         if (@fseek($this->zip_fd, $v_header['offset']))

         {

-          // ----- Close the zip file

-          $this->privCloseFd();

+            // ----- Close the zip file

+            $this->privCloseFd();

 

-          $this->privSwapBackMagicQuotes();

+            $this->privSwapBackMagicQuotes();

 

-          // ----- Error log

-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');

+            // ----- Error log

+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');

 

-          // ----- Return

-          return PclZip::errorCode();

+            // ----- Return

+            return PclZip::errorCode();

         }

 

         // ----- Look for extraction as string

         if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {

 

-          $v_string = '';

+            $v_string = '';

 

-          // ----- Extracting the file

-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);

-          if ($v_result1 < 1) {

+            // ----- Extracting the file

+            $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);

+            if ($v_result1 < 1) {

             $this->privCloseFd();

             $this->privSwapBackMagicQuotes();

             return $v_result1;

-          }

+            }

 

-          // ----- Get the only interesting attributes

-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)

-          {

+            // ----- Get the only interesting attributes

+            if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)

+            {

             // ----- Close the zip file

             $this->privCloseFd();

             $this->privSwapBackMagicQuotes();

 

             return $v_result;

-          }

+            }

 

-          // ----- Set the file content

-          $p_file_list[$v_nb_extracted]['content'] = $v_string;

+            // ----- Set the file content

+            $p_file_list[$v_nb_extracted]['content'] = $v_string;

 

-          // ----- Next extracted file

-          $v_nb_extracted++;

+            // ----- Next extracted file

+            $v_nb_extracted++;

 

-          // ----- Look for user callback abort

-          if ($v_result1 == 2) {

-          	break;

-          }

+            // ----- Look for user callback abort

+            if ($v_result1 == 2) {

+                break;

+            }

         }

         // ----- Look for extraction in standard output

         elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))

-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {

-          // ----- Extracting the file in standard output

-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);

-          if ($v_result1 < 1) {

+                && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {

+            // ----- Extracting the file in standard output

+            $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);

+            if ($v_result1 < 1) {

             $this->privCloseFd();

             $this->privSwapBackMagicQuotes();

             return $v_result1;

-          }

+            }

 

-          // ----- Get the only interesting attributes

-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {

+            // ----- Get the only interesting attributes

+            if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {

             $this->privCloseFd();

             $this->privSwapBackMagicQuotes();

             return $v_result;

-          }

+            }

 

-          // ----- Look for user callback abort

-          if ($v_result1 == 2) {

-          	break;

-          }

+            // ----- Look for user callback abort

+            if ($v_result1 == 2) {

+                break;

+            }

         }

         // ----- Look for normal extraction

         else {

-          // ----- Extracting the file

-          $v_result1 = $this->privExtractFile($v_header,

-		                                      $p_path, $p_remove_path,

-											  $p_remove_all_path,

-											  $p_options);

-          if ($v_result1 < 1) {

+            // ----- Extracting the file

+            $v_result1 = $this->privExtractFile($v_header,

+                                                $p_path, $p_remove_path,

+                                                $p_remove_all_path,

+                                                $p_options);

+            if ($v_result1 < 1) {

             $this->privCloseFd();

             $this->privSwapBackMagicQuotes();

             return $v_result1;

-          }

+            }

 

-          // ----- Get the only interesting attributes

-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)

-          {

+            // ----- Get the only interesting attributes

+            if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)

+            {

             // ----- Close the zip file

             $this->privCloseFd();

             $this->privSwapBackMagicQuotes();

 

             return $v_result;

-          }

+            }

 

-          // ----- Look for user callback abort

-          if ($v_result1 == 2) {

-          	break;

-          }

+            // ----- Look for user callback abort

+            if ($v_result1 == 2) {

+                break;

+            }

+        }

         }

-      }

     }

 

     // ----- Close the zip file

@@ -3620,28 +3620,28 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privExtractFile()

-  // Description :

-  // Parameters :

-  // Return Values :

-  //

-  // 1 : ... ?

-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback

-  // --------------------------------------------------------------------------------

-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privExtractFile()

+    // Description :

+    // Parameters :

+    // Return Values :

+    //

+    // 1 : ... ?

+    // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback

+    // --------------------------------------------------------------------------------

+    function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)

+    {

     $v_result=1;

 

     // ----- Read the file header

     if (($v_result = $this->privReadFileHeader($v_header)) != 1)

     {

-      // ----- Return

-      return $v_result;

-    }

+        // ----- Return

+        return $v_result;

+    }

 

 

     // ----- Check that the file header is coherent with $p_entry info

@@ -3666,74 +3666,74 @@ 
     // ----- Look for path to remove

     else if ($p_remove_path != "")

     {

-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)

-      {

+        if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)

+        {

 

         // ----- Change the file status

         $p_entry['status'] = "filtered";

 

         // ----- Return

         return $v_result;

-      }

+        }

 

-      $p_remove_path_size = strlen($p_remove_path);

-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)

-      {

+        $p_remove_path_size = strlen($p_remove_path);

+        if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)

+        {

 

         // ----- Remove the path

         $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);

 

-      }

+        }

     }

 

     // ----- Add the path

     if ($p_path != '') {

-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];

+        $p_entry['filename'] = $p_path."/".$p_entry['filename'];

     }

 

     // ----- Check a base_dir_restriction

     if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {

-      $v_inclusion

-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],

+        $v_inclusion

+        = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],

                                 $p_entry['filename']);

-      if ($v_inclusion == 0) {

+        if ($v_inclusion == 0) {

 

         PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,

-			                     "Filename '".$p_entry['filename']."' is "

-								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");

+                                    "Filename '".$p_entry['filename']."' is "

+                                    ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");

 

         return PclZip::errorCode();

-      }

+        }

     }

 

     // ----- Look for pre-extract callback

     if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {

 

-      // ----- Generate a local information

-      $v_local_header = array();

-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

+        // ----- Generate a local information

+        $v_local_header = array();

+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

 

-      // ----- Call the callback

-      // Here I do not use call_user_func() because I need to send a reference to the

-      // header.

+        // ----- Call the callback

+        // Here I do not use call_user_func() because I need to send a reference to the

+        // header.

 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');

-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);

-      if ($v_result == 0) {

+        $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);

+        if ($v_result == 0) {

         // ----- Change the file status

         $p_entry['status'] = "skipped";

         $v_result = 1;

-      }

+        }

 

-      // ----- Look for abort result

-      if ($v_result == 2) {

+        // ----- Look for abort result

+        if ($v_result == 2) {

         // ----- This status is internal and will be changed in 'skipped'

         $p_entry['status'] = "aborted";

-      	$v_result = PCLZIP_ERR_USER_ABORTED;

-      }

+            $v_result = PCLZIP_ERR_USER_ABORTED;

+        }

 

-      // ----- Update the informations

-      // Only some fields can be modified

-      $p_entry['filename'] = $v_local_header['filename'];

+        // ----- Update the informations

+        // Only some fields can be modified

+        $p_entry['filename'] = $v_local_header['filename'];

     }

 

 

@@ -3744,9 +3744,9 @@ 
     if (file_exists($p_entry['filename']))

     {

 

-      // ----- Look if file is a directory

-      if (is_dir($p_entry['filename']))

-      {

+        // ----- Look if file is a directory

+        if (is_dir($p_entry['filename']))

+        {

 

         // ----- Change the file status

         $p_entry['status'] = "already_a_directory";

@@ -3755,18 +3755,18 @@ 
         // For historical reason first PclZip implementation does not stop

         // when this kind of error occurs.

         if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+            && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

 

             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,

-			                     "Filename '".$p_entry['filename']."' is "

-								 ."already used by an existing directory");

+                                    "Filename '".$p_entry['filename']."' is "

+                                    ."already used by an existing directory");

 

             return PclZip::errorCode();

-		    }

-      }

-      // ----- Look if file is write protected

-      else if (!is_writeable($p_entry['filename']))

-      {

+            }

+        }

+        // ----- Look if file is write protected

+        else if (!is_writeable($p_entry['filename']))

+        {

 

         // ----- Change the file status

         $p_entry['status'] = "write_protected";

@@ -3775,90 +3775,90 @@ 
         // For historical reason first PclZip implementation does not stop

         // when this kind of error occurs.

         if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+            && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

 

             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,

-			                     "Filename '".$p_entry['filename']."' exists "

-								 ."and is write protected");

+                                    "Filename '".$p_entry['filename']."' exists "

+                                    ."and is write protected");

 

             return PclZip::errorCode();

-		    }

-      }

+            }

+        }

 

-      // ----- Look if the extracted file is older

-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])

-      {

+        // ----- Look if the extracted file is older

+        else if (filemtime($p_entry['filename']) > $p_entry['mtime'])

+        {

         // ----- Change the file status

         if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))

-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {

-	  	  }

-		    else {

+            && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {

+            }

+            else {

             $p_entry['status'] = "newer_exist";

 

             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR

             // For historical reason first PclZip implementation does not stop

             // when this kind of error occurs.

             if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))

-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

+                && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {

 

                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,

-			             "Newer version of '".$p_entry['filename']."' exists "

-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");

+                            "Newer version of '".$p_entry['filename']."' exists "

+                        ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");

 

                 return PclZip::errorCode();

-		      }

-		    }

-      }

-      else {

-      }

+                }

+            }

+        }

+        else {

+        }

     }

 

     // ----- Check the directory availability and create it if necessary

     else {

-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))

+        if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))

         $v_dir_to_check = $p_entry['filename'];

-      else if (!strstr($p_entry['filename'], "/"))

+        else if (!strstr($p_entry['filename'], "/"))

         $v_dir_to_check = "";

-      else

+        else

         $v_dir_to_check = dirname($p_entry['filename']);

 

         if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {

 

-          // ----- Change the file status

-          $p_entry['status'] = "path_creation_fail";

+            // ----- Change the file status

+            $p_entry['status'] = "path_creation_fail";

 

-          // ----- Return

-          //return $v_result;

-          $v_result = 1;

+            // ----- Return

+            //return $v_result;

+            $v_result = 1;

+        }

         }

-      }

     }

 

     // ----- Look if extraction should be done

     if ($p_entry['status'] == 'ok') {

 

-      // ----- Do the extraction (if not a folder)

-      if (!(($p_entry['external']&0x00000010)==0x00000010))

-      {

+        // ----- Do the extraction (if not a folder)

+        if (!(($p_entry['external']&0x00000010)==0x00000010))

+        {

         // ----- Look for not compressed file

         if ($p_entry['compression'] == 0) {

 

-    		  // ----- Opening destination file

-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)

-          {

+                // ----- Opening destination file

+            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)

+            {

 

             // ----- Change the file status

             $p_entry['status'] = "write_error";

 

             // ----- Return

             return $v_result;

-          }

+            }

 

 

-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks

-          $v_size = $p_entry['compressed_size'];

-          while ($v_size != 0)

-          {

+            // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks

+            $v_size = $p_entry['compressed_size'];

+            while ($v_size != 0)

+            {

             $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

             $v_buffer = @fread($this->zip_fd, $v_read_size);

             /* Try to speed up the code

@@ -3867,38 +3867,38 @@ 
             */

             @fwrite($v_dest_file, $v_buffer, $v_read_size);

             $v_size -= $v_read_size;

-          }

+            }

 

-          // ----- Closing the destination file

-          fclose($v_dest_file);

+            // ----- Closing the destination file

+            fclose($v_dest_file);

 

-          // ----- Change the file mtime

-          touch($p_entry['filename'], $p_entry['mtime']);

+            // ----- Change the file mtime

+            touch($p_entry['filename'], $p_entry['mtime']);

 

 

         }

         else {

-          // ----- TBC

-          // Need to be finished

-          if (($p_entry['flag'] & 1) == 1) {

+            // ----- TBC

+            // Need to be finished

+            if (($p_entry['flag'] & 1) == 1) {

             PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');

             return PclZip::errorCode();

-          }

+            }

 

 

-          // ----- Look for using temporary file to unzip

-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))

+            // ----- Look for using temporary file to unzip

+            if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))

               && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])

                   || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])

                       && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {

             $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);

             if ($v_result < PCLZIP_ERR_NO_ERROR) {

-              return $v_result;

+                return $v_result;

+            }

             }

-          }

 

-          // ----- Look for extract in memory

-          else {

+            // ----- Look for extract in memory

+            else {

 

 

             // ----- Read the compressed file in a buffer (one shot)

@@ -3909,20 +3909,20 @@ 
             unset($v_buffer);

             if ($v_file_content === FALSE) {

 

-              // ----- Change the file status

-              // TBC

-              $p_entry['status'] = "error";

+                // ----- Change the file status

+                // TBC

+                $p_entry['status'] = "error";

 

-              return $v_result;

+                return $v_result;

             }

 

             // ----- Opening destination file

             if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {

 

-              // ----- Change the file status

-              $p_entry['status'] = "write_error";

+                // ----- Change the file status

+                $p_entry['status'] = "write_error";

 

-              return $v_result;

+                return $v_result;

             }

 

             // ----- Write the uncompressed data

@@ -3932,67 +3932,67 @@ 
             // ----- Closing the destination file

             @fclose($v_dest_file);

 

-          }

+            }

 

-          // ----- Change the file mtime

-          @touch($p_entry['filename'], $p_entry['mtime']);

+            // ----- Change the file mtime

+            @touch($p_entry['filename'], $p_entry['mtime']);

         }

 

         // ----- Look for chmod option

         if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {

 

-          // ----- Change the mode of the file

-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);

+            // ----- Change the mode of the file

+            @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);

         }

 

-      }

+        }

     }

 

-  	// ----- Change abort status

-  	if ($p_entry['status'] == "aborted") {

+        // ----- Change abort status

+        if ($p_entry['status'] == "aborted") {

         $p_entry['status'] = "skipped";

-  	}

+        }

 

     // ----- Look for post-extract callback

     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {

 

-      // ----- Generate a local information

-      $v_local_header = array();

-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

+        // ----- Generate a local information

+        $v_local_header = array();

+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

 

-      // ----- Call the callback

-      // Here I do not use call_user_func() because I need to send a reference to the

-      // header.

+        // ----- Call the callback

+        // Here I do not use call_user_func() because I need to send a reference to the

+        // header.

 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');

-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);

+        $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);

 

-      // ----- Look for abort result

-      if ($v_result == 2) {

-      	$v_result = PCLZIP_ERR_USER_ABORTED;

-      }

+        // ----- Look for abort result

+        if ($v_result == 2) {

+            $v_result = PCLZIP_ERR_USER_ABORTED;

+        }

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privExtractFileUsingTempFile()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privExtractFileUsingTempFile()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privExtractFileUsingTempFile(&$p_entry, &$p_options)

+    {

     $v_result=1;

 

     // ----- Creates a temporary file

     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';

     if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {

-      fclose($v_file);

-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');

-      return PclZip::errorCode();

+        fclose($v_file);

+        PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');

+        return PclZip::errorCode();

     }

 

 

@@ -4004,11 +4004,11 @@ 
     $v_size = $p_entry['compressed_size'];

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = @fread($this->zip_fd, $v_read_size);

-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);

-      @fwrite($v_dest_file, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = @fread($this->zip_fd, $v_read_size);

+        //$v_binary_data = pack('a'.$v_read_size, $v_buffer);

+        @fwrite($v_dest_file, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Write gz file format footer

@@ -4020,27 +4020,27 @@ 
 

     // ----- Opening destination file

     if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {

-      $p_entry['status'] = "write_error";

-      return $v_result;

+        $p_entry['status'] = "write_error";

+        return $v_result;

     }

 

     // ----- Open the temporary gz file

     if (($v_src_file = @gzopen($v_gzip_temp_name, 'rb')) == 0) {

-      @fclose($v_dest_file);

-      $p_entry['status'] = "read_error";

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');

-      return PclZip::errorCode();

+        @fclose($v_dest_file);

+        $p_entry['status'] = "read_error";

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');

+        return PclZip::errorCode();

     }

 

 

     // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks

     $v_size = $p_entry['size'];

     while ($v_size != 0) {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = @gzread($v_src_file, $v_read_size);

-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);

-      @fwrite($v_dest_file, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = @gzread($v_src_file, $v_read_size);

+        //$v_binary_data = pack('a'.$v_read_size, $v_buffer);

+        @fwrite($v_dest_file, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

     @fclose($v_dest_file);

     @gzclose($v_src_file);

@@ -4050,22 +4050,22 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privExtractFileInOutput()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privExtractFileInOutput(&$p_entry, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privExtractFileInOutput()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privExtractFileInOutput(&$p_entry, &$p_options)

+    {

     $v_result=1;

 

     // ----- Read the file header

     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {

-      return $v_result;

+        return $v_result;

     }

 

 

@@ -4077,31 +4077,31 @@ 
     // ----- Look for pre-extract callback

     if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {

 

-      // ----- Generate a local information

-      $v_local_header = array();

-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

+        // ----- Generate a local information

+        $v_local_header = array();

+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

 

-      // ----- Call the callback

-      // Here I do not use call_user_func() because I need to send a reference to the

-      // header.

+        // ----- Call the callback

+        // Here I do not use call_user_func() because I need to send a reference to the

+        // header.

 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');

-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);

-      if ($v_result == 0) {

+        $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);

+        if ($v_result == 0) {

         // ----- Change the file status

         $p_entry['status'] = "skipped";

         $v_result = 1;

-      }

+        }

 

-      // ----- Look for abort result

-      if ($v_result == 2) {

+        // ----- Look for abort result

+        if ($v_result == 2) {

         // ----- This status is internal and will be changed in 'skipped'

         $p_entry['status'] = "aborted";

-      	$v_result = PCLZIP_ERR_USER_ABORTED;

-      }

+            $v_result = PCLZIP_ERR_USER_ABORTED;

+        }

 

-      // ----- Update the informations

-      // Only some fields can be modified

-      $p_entry['filename'] = $v_local_header['filename'];

+        // ----- Update the informations

+        // Only some fields can be modified

+        $p_entry['filename'] = $v_local_header['filename'];

     }

 

     // ----- Trace

@@ -4109,78 +4109,78 @@ 
     // ----- Look if extraction should be done

     if ($p_entry['status'] == 'ok') {

 

-      // ----- Do the extraction (if not a folder)

-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {

+        // ----- Do the extraction (if not a folder)

+        if (!(($p_entry['external']&0x00000010)==0x00000010)) {

         // ----- Look for not compressed file

         if ($p_entry['compressed_size'] == $p_entry['size']) {

 

-          // ----- Read the file in a buffer (one shot)

-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);

+            // ----- Read the file in a buffer (one shot)

+            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);

 

-          // ----- Send the file to the output

-          echo $v_buffer;

-          unset($v_buffer);

+            // ----- Send the file to the output

+            echo $v_buffer;

+            unset($v_buffer);

         }

         else {

 

-          // ----- Read the compressed file in a buffer (one shot)

-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);

+            // ----- Read the compressed file in a buffer (one shot)

+            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);

 

-          // ----- Decompress the file

-          $v_file_content = gzinflate($v_buffer);

-          unset($v_buffer);

+            // ----- Decompress the file

+            $v_file_content = gzinflate($v_buffer);

+            unset($v_buffer);

 

-          // ----- Send the file to the output

-          echo $v_file_content;

-          unset($v_file_content);

+            // ----- Send the file to the output

+            echo $v_file_content;

+            unset($v_file_content);

+        }

         }

-      }

     }

 

-	// ----- Change abort status

-	if ($p_entry['status'] == "aborted") {

-      $p_entry['status'] = "skipped";

-	}

+    // ----- Change abort status

+    if ($p_entry['status'] == "aborted") {

+        $p_entry['status'] = "skipped";

+    }

 

     // ----- Look for post-extract callback

     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {

 

-      // ----- Generate a local information

-      $v_local_header = array();

-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

+        // ----- Generate a local information

+        $v_local_header = array();

+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

 

-      // ----- Call the callback

-      // Here I do not use call_user_func() because I need to send a reference to the

-      // header.

+        // ----- Call the callback

+        // Here I do not use call_user_func() because I need to send a reference to the

+        // header.

 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');

-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);

+        $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);

 

-      // ----- Look for abort result

-      if ($v_result == 2) {

-      	$v_result = PCLZIP_ERR_USER_ABORTED;

-      }

+        // ----- Look for abort result

+        if ($v_result == 2) {

+            $v_result = PCLZIP_ERR_USER_ABORTED;

+        }

     }

 

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privExtractFileAsString()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privExtractFileAsString()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)

+    {

     $v_result=1;

 

     // ----- Read the file header

     $v_header = array();

     if (($v_result = $this->privReadFileHeader($v_header)) != 1)

     {

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

 

@@ -4192,110 +4192,110 @@ 
     // ----- Look for pre-extract callback

     if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {

 

-      // ----- Generate a local information

-      $v_local_header = array();

-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

+        // ----- Generate a local information

+        $v_local_header = array();

+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

 

-      // ----- Call the callback

-      // Here I do not use call_user_func() because I need to send a reference to the

-      // header.

+        // ----- Call the callback

+        // Here I do not use call_user_func() because I need to send a reference to the

+        // header.

 //      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');

-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);

-      if ($v_result == 0) {

+        $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);

+        if ($v_result == 0) {

         // ----- Change the file status

         $p_entry['status'] = "skipped";

         $v_result = 1;

-      }

+        }

 

-      // ----- Look for abort result

-      if ($v_result == 2) {

+        // ----- Look for abort result

+        if ($v_result == 2) {

         // ----- This status is internal and will be changed in 'skipped'

         $p_entry['status'] = "aborted";

-      	$v_result = PCLZIP_ERR_USER_ABORTED;

-      }

+            $v_result = PCLZIP_ERR_USER_ABORTED;

+        }

 

-      // ----- Update the informations

-      // Only some fields can be modified

-      $p_entry['filename'] = $v_local_header['filename'];

+        // ----- Update the informations

+        // Only some fields can be modified

+        $p_entry['filename'] = $v_local_header['filename'];

     }

 

 

     // ----- Look if extraction should be done

     if ($p_entry['status'] == 'ok') {

 

-      // ----- Do the extraction (if not a folder)

-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {

+        // ----- Do the extraction (if not a folder)

+        if (!(($p_entry['external']&0x00000010)==0x00000010)) {

         // ----- Look for not compressed file

-  //      if ($p_entry['compressed_size'] == $p_entry['size'])

+    //      if ($p_entry['compressed_size'] == $p_entry['size'])

         if ($p_entry['compression'] == 0) {

 

-          // ----- Reading the file

-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);

+            // ----- Reading the file

+            $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);

         }

         else {

 

-          // ----- Reading the file

-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);

+            // ----- Reading the file

+            $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);

 

-          // ----- Decompress the file

-          if (($p_string = @gzinflate($v_data)) === FALSE) {

-              // TBC

-          }

+            // ----- Decompress the file

+            if (($p_string = @gzinflate($v_data)) === FALSE) {

+                // TBC

+            }

         }

 

         // ----- Trace

-      }

-      else {

-          // TBC : error : can not extract a folder in a string

-      }

+        }

+        else {

+            // TBC : error : can not extract a folder in a string

+        }

 

     }

 

-  	// ----- Change abort status

-  	if ($p_entry['status'] == "aborted") {

+        // ----- Change abort status

+        if ($p_entry['status'] == "aborted") {

         $p_entry['status'] = "skipped";

-  	}

+        }

 

     // ----- Look for post-extract callback

     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {

 

-      // ----- Generate a local information

-      $v_local_header = array();

-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

+        // ----- Generate a local information

+        $v_local_header = array();

+        $this->privConvertHeader2FileInfo($p_entry, $v_local_header);

 

-      // ----- Swap the content to header

-      $v_local_header['content'] = $p_string;

-      $p_string = '';

+        // ----- Swap the content to header

+        $v_local_header['content'] = $p_string;

+        $p_string = '';

 

-      // ----- Call the callback

-      // Here I do not use call_user_func() because I need to send a reference to the

-      // header.

+        // ----- Call the callback

+        // Here I do not use call_user_func() because I need to send a reference to the

+        // header.

 //      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');

-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);

+        $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);

 

-      // ----- Swap back the content to header

-      $p_string = $v_local_header['content'];

-      unset($v_local_header['content']);

+        // ----- Swap back the content to header

+        $p_string = $v_local_header['content'];

+        unset($v_local_header['content']);

 

-      // ----- Look for abort result

-      if ($v_result == 2) {

-      	$v_result = PCLZIP_ERR_USER_ABORTED;

-      }

+        // ----- Look for abort result

+        if ($v_result == 2) {

+            $v_result = PCLZIP_ERR_USER_ABORTED;

+        }

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privReadFileHeader()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privReadFileHeader(&$p_header)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privReadFileHeader()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privReadFileHeader(&$p_header)

+    {

     $v_result=1;

 

     // ----- Read the 4 bytes signature

@@ -4306,11 +4306,11 @@ 
     if ($v_data['id'] != 0x04034b50)

     {

 

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Read the first 42 bytes of the header

@@ -4319,14 +4319,14 @@ 
     // ----- Look for invalid block size

     if (strlen($v_binary_data) != 26)

     {

-      $p_header['filename'] = "";

-      $p_header['status'] = "invalid_header";

+        $p_header['filename'] = "";

+        $p_header['status'] = "invalid_header";

 

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Extract the values

@@ -4337,10 +4337,10 @@ 
 

     // ----- Get extra_fields

     if ($v_data['extra_len'] != 0) {

-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);

+        $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);

     }

     else {

-      $p_header['extra'] = '';

+        $p_header['extra'] = '';

     }

 

     // ----- Extract properties

@@ -4357,23 +4357,23 @@ 
     $p_header['mtime'] = $v_data['mtime'];

     if ($p_header['mdate'] && $p_header['mtime'])

     {

-      // ----- Extract time

-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;

-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;

-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;

+        // ----- Extract time

+        $v_hour = ($p_header['mtime'] & 0xF800) >> 11;

+        $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;

+        $v_seconde = ($p_header['mtime'] & 0x001F)*2;

 

-      // ----- Extract date

-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;

-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;

-      $v_day = $p_header['mdate'] & 0x001F;

+        // ----- Extract date

+        $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;

+        $v_month = ($p_header['mdate'] & 0x01E0) >> 5;

+        $v_day = $p_header['mdate'] & 0x001F;

 

-      // ----- Get UNIX date format

-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);

+        // ----- Get UNIX date format

+        $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);

 

     }

     else

     {

-      $p_header['mtime'] = time();

+        $p_header['mtime'] = time();

     }

 

     // TBC

@@ -4388,17 +4388,17 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privReadCentralFileHeader()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privReadCentralFileHeader(&$p_header)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privReadCentralFileHeader()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privReadCentralFileHeader(&$p_header)

+    {

     $v_result=1;

 

     // ----- Read the 4 bytes signature

@@ -4409,11 +4409,11 @@ 
     if ($v_data['id'] != 0x02014b50)

     {

 

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Read the first 42 bytes of the header

@@ -4422,14 +4422,14 @@ 
     // ----- Look for invalid block size

     if (strlen($v_binary_data) != 42)

     {

-      $p_header['filename'] = "";

-      $p_header['status'] = "invalid_header";

+        $p_header['filename'] = "";

+        $p_header['status'] = "invalid_header";

 

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Extract the values

@@ -4437,28 +4437,28 @@ 
 

     // ----- Get filename

     if ($p_header['filename_len'] != 0)

-      //

-      // --------------------------------------------------------------------------------

-      // A patch about stored filenames with backslash directory separator (Windows style).

-      // Archives created by the utility IZArc 3.81 (possibly new versions too) need this patch.

-      //$p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);

-      $p_header['filename'] = str_replace("\\", '/', fread($this->zip_fd, $p_header['filename_len']));

-      // --------------------------------------------------------------------------------

-      //

+        //

+        // --------------------------------------------------------------------------------

+        // A patch about stored filenames with backslash directory separator (Windows style).

+        // Archives created by the utility IZArc 3.81 (possibly new versions too) need this patch.

+        //$p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);

+        $p_header['filename'] = str_replace("\\", '/', fread($this->zip_fd, $p_header['filename_len']));

+        // --------------------------------------------------------------------------------

+        //

     else

-      $p_header['filename'] = '';

+        $p_header['filename'] = '';

 

     // ----- Get extra

     if ($p_header['extra_len'] != 0)

-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);

+        $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);

     else

-      $p_header['extra'] = '';

+        $p_header['extra'] = '';

 

     // ----- Get comment

     if ($p_header['comment_len'] != 0)

-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);

+        $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);

     else

-      $p_header['comment'] = '';

+        $p_header['comment'] = '';

 

     // ----- Extract properties

 

@@ -4467,23 +4467,23 @@ 
     // TBC : bug : this was ignoring time with 0/0/0

     if (1)

     {

-      // ----- Extract time

-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;

-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;

-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;

+        // ----- Extract time

+        $v_hour = ($p_header['mtime'] & 0xF800) >> 11;

+        $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;

+        $v_seconde = ($p_header['mtime'] & 0x001F)*2;

 

-      // ----- Extract date

-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;

-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;

-      $v_day = $p_header['mdate'] & 0x001F;

+        // ----- Extract date

+        $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;

+        $v_month = ($p_header['mdate'] & 0x01E0) >> 5;

+        $v_day = $p_header['mdate'] & 0x001F;

 

-      // ----- Get UNIX date format

-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);

+        // ----- Get UNIX date format

+        $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);

 

     }

     else

     {

-      $p_header['mtime'] = time();

+        $p_header['mtime'] = time();

     }

 

     // ----- Set the stored filename

@@ -4494,63 +4494,63 @@ 
 

     // ----- Look if it is a directory

     if (substr($p_header['filename'], -1) == '/') {

-      //$p_header['external'] = 0x41FF0010;

-      $p_header['external'] = 0x00000010;

+        //$p_header['external'] = 0x41FF0010;

+        $p_header['external'] = 0x00000010;

     }

 

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privCheckFileHeaders()

-  // Description :

-  // Parameters :

-  // Return Values :

-  //   1 on success,

-  //   0 on error;

-  // --------------------------------------------------------------------------------

-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privCheckFileHeaders()

+    // Description :

+    // Parameters :

+    // Return Values :

+    //   1 on success,

+    //   0 on error;

+    // --------------------------------------------------------------------------------

+    function privCheckFileHeaders(&$p_local_header, &$p_central_header)

+    {

     $v_result=1;

 

-  	// ----- Check the static values

-  	// TBC

-  	if ($p_local_header['filename'] != $p_central_header['filename']) {

-  	}

-  	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {

-  	}

-  	if ($p_local_header['flag'] != $p_central_header['flag']) {

-  	}

-  	if ($p_local_header['compression'] != $p_central_header['compression']) {

-  	}

-  	if ($p_local_header['mtime'] != $p_central_header['mtime']) {

-  	}

-  	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {

-  	}

-

-  	// ----- Look for flag bit 3

-  	if (($p_local_header['flag'] & 8) == 8) {

-          $p_local_header['size'] = $p_central_header['size'];

-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];

-          $p_local_header['crc'] = $p_central_header['crc'];

-  	}

+        // ----- Check the static values

+        // TBC

+        if ($p_local_header['filename'] != $p_central_header['filename']) {

+        }

+        if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {

+        }

+        if ($p_local_header['flag'] != $p_central_header['flag']) {

+        }

+        if ($p_local_header['compression'] != $p_central_header['compression']) {

+        }

+        if ($p_local_header['mtime'] != $p_central_header['mtime']) {

+        }

+        if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {

+        }

+

+        // ----- Look for flag bit 3

+        if (($p_local_header['flag'] & 8) == 8) {

+            $p_local_header['size'] = $p_central_header['size'];

+            $p_local_header['compressed_size'] = $p_central_header['compressed_size'];

+            $p_local_header['crc'] = $p_central_header['crc'];

+        }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privReadEndCentralDir()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privReadEndCentralDir(&$p_central_dir)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privReadEndCentralDir()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privReadEndCentralDir(&$p_central_dir)

+    {

     $v_result=1;

 

     // ----- Go to the end of the zip file

@@ -4558,59 +4558,59 @@ 
     @fseek($this->zip_fd, $v_size);

     if (@ftell($this->zip_fd) != $v_size)

     {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- First try : look if this is an archive with no commentaries (most of the time)

     // in this case the end of central dir is at 22 bytes of the file end

     $v_found = 0;

     if ($v_size > 26) {

-      @fseek($this->zip_fd, $v_size-22);

-      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))

-      {

+        @fseek($this->zip_fd, $v_size-22);

+        if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))

+        {

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');

 

         // ----- Return

         return PclZip::errorCode();

-      }

+        }

 

-      // ----- Read for bytes

-      $v_binary_data = @fread($this->zip_fd, 4);

-      $v_data = @unpack('Vid', $v_binary_data);

+        // ----- Read for bytes

+        $v_binary_data = @fread($this->zip_fd, 4);

+        $v_data = @unpack('Vid', $v_binary_data);

 

-      // ----- Check signature

-      if ($v_data['id'] == 0x06054b50) {

+        // ----- Check signature

+        if ($v_data['id'] == 0x06054b50) {

         $v_found = 1;

-      }

+        }

 

-      $v_pos = ftell($this->zip_fd);

+        $v_pos = ftell($this->zip_fd);

     }

 

     // ----- Go back to the maximum possible size of the Central Dir End Record

     if (!$v_found) {

-      $v_maximum_size = 65557; // 0xFFFF + 22;

-      if ($v_maximum_size > $v_size)

+        $v_maximum_size = 65557; // 0xFFFF + 22;

+        if ($v_maximum_size > $v_size)

         $v_maximum_size = $v_size;

-      @fseek($this->zip_fd, $v_size-$v_maximum_size);

-      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))

-      {

+        @fseek($this->zip_fd, $v_size-$v_maximum_size);

+        if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))

+        {

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');

 

         // ----- Return

         return PclZip::errorCode();

-      }

+        }

 

-      // ----- Read byte per byte in order to find the signature

-      $v_pos = ftell($this->zip_fd);

-      $v_bytes = 0x00000000;

-      while ($v_pos < $v_size)

-      {

+        // ----- Read byte per byte in order to find the signature

+        $v_pos = ftell($this->zip_fd);

+        $v_bytes = 0x00000000;

+        while ($v_pos < $v_size)

+        {

         // ----- Read a byte

         $v_byte = @fread($this->zip_fd, 1);

 

@@ -4623,23 +4623,23 @@ 
         // ----- Compare the bytes

         if ($v_bytes == 0x504b0506)

         {

-          $v_pos++;

-          break;

+            $v_pos++;

+            break;

         }

 

         $v_pos++;

-      }

+        }

 

-      // ----- Look if not found end of central dir

-      if ($v_pos == $v_size)

-      {

+        // ----- Look if not found end of central dir

+        if ($v_pos == $v_size)

+        {

 

         // ----- Error log

         PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");

 

         // ----- Return

         return PclZip::errorCode();

-      }

+        }

     }

 

     // ----- Read the first 18 bytes of the header

@@ -4649,11 +4649,11 @@ 
     if (strlen($v_binary_data) != 18)

     {

 

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Extract the values

@@ -4662,27 +4662,27 @@ 
     // ----- Check the global size

     if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {

 

-	  // ----- Removed in release 2.2 see readme file

-	  // The check of the file size is a little too strict.

-	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.

-	  // While decrypted, zip has training 0 bytes

-	  if (0) {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,

-	                       'The central dir is not at the end of the archive.'

-						   .' Some trailing bytes exists after the archive.');

+        // ----- Removed in release 2.2 see readme file

+        // The check of the file size is a little too strict.

+        // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.

+        // While decrypted, zip has training 0 bytes

+        if (0) {

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,

+                            'The central dir is not at the end of the archive.'

+                            .' Some trailing bytes exists after the archive.');

 

-      // ----- Return

-      return PclZip::errorCode();

-	  }

+        // ----- Return

+        return PclZip::errorCode();

+        }

     }

 

     // ----- Get comment

     if ($v_data['comment_size'] != 0) {

-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);

+        $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);

     }

     else

-      $p_central_dir['comment'] = '';

+        $p_central_dir['comment'] = '';

 

     $p_central_dir['entries'] = $v_data['entries'];

     $p_central_dir['disk_entries'] = $v_data['disk_entries'];

@@ -4697,33 +4697,33 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privDeleteByRule()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privDeleteByRule(&$p_result_list, &$p_options)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privDeleteByRule()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privDeleteByRule(&$p_result_list, &$p_options)

+    {

     $v_result=1;

     $v_list_detail = array();

 

     // ----- Open the zip file

     if (($v_result=$this->privOpenFd('rb')) != 1)

     {

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Read the central directory informations

     $v_central_dir = array();

     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)

     {

-      $this->privCloseFd();

-      return $v_result;

+        $this->privCloseFd();

+        return $v_result;

     }

 

     // ----- Go to beginning of File

@@ -4735,14 +4735,14 @@ 
     @rewind($this->zip_fd);

     if (@fseek($this->zip_fd, $v_pos_entry))

     {

-      // ----- Close the zip file

-      $this->privCloseFd();

+        // ----- Close the zip file

+        $this->privCloseFd();

 

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Read each entry

@@ -4751,53 +4751,53 @@ 
     for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)

     {

 

-      // ----- Read the file header

-      $v_header_list[$v_nb_extracted] = array();

-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)

-      {

+        // ----- Read the file header

+        $v_header_list[$v_nb_extracted] = array();

+        if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)

+        {

         // ----- Close the zip file

         $this->privCloseFd();

 

         return $v_result;

-      }

+        }

 

 

-      // ----- Store the index

-      $v_header_list[$v_nb_extracted]['index'] = $i;

+        // ----- Store the index

+        $v_header_list[$v_nb_extracted]['index'] = $i;

 

-      // ----- Look for the specific extract rules

-      $v_found = false;

+        // ----- Look for the specific extract rules

+        $v_found = false;

 

-      // ----- Look for extract by name rule

-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))

+        // ----- Look for extract by name rule

+        if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))

           && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {

 

-          // ----- Look if the filename is in the list

-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {

+            // ----- Look if the filename is in the list

+            for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {

 

-              // ----- Look for a directory

-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {

+                // ----- Look for a directory

+                if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {

 

-                  // ----- Look if the directory is in the filename path

-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))

+                    // ----- Look if the directory is in the filename path

+                    if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))

                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {

-                      $v_found = true;

-                  }

-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */

+                        $v_found = true;

+                    }

+                    elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */

                           && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {

-                      $v_found = true;

-                  }

-              }

-              // ----- Look for a filename

-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {

-                  $v_found = true;

-              }

-          }

-      }

+                        $v_found = true;

+                    }

+                }

+                // ----- Look for a filename

+                elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {

+                    $v_found = true;

+                }

+            }

+        }

 

-      // ----- Look for extract by ereg rule

-      // ereg() is deprecated with PHP 5.3

-      /*

+        // ----- Look for extract by ereg rule

+        // ereg() is deprecated with PHP 5.3

+        /*

       else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))

                && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {

 

@@ -4807,47 +4807,47 @@ 
       }

       */

 

-      // ----- Look for extract by preg rule

-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))

+        // ----- Look for extract by preg rule

+        else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))

                && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {

 

-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {

-              $v_found = true;

-          }

-      }

+            if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {

+                $v_found = true;

+            }

+        }

 

-      // ----- Look for extract by index rule

-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))

+        // ----- Look for extract by index rule

+        else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))

                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {

 

-          // ----- Look if the index is in the list

-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {

+            // ----- Look if the index is in the list

+            for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {

 

-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {

-                  $v_found = true;

-              }

-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {

-                  $j_start = $j+1;

-              }

+                if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {

+                    $v_found = true;

+                }

+                if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {

+                    $j_start = $j+1;

+                }

 

-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {

-                  break;

-              }

-          }

-      }

-      else {

-      	$v_found = true;

-      }

+                if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {

+                    break;

+                }

+            }

+        }

+        else {

+            $v_found = true;

+        }

 

-      // ----- Look for deletion

-      if ($v_found)

-      {

+        // ----- Look for deletion

+        if ($v_found)

+        {

         unset($v_header_list[$v_nb_extracted]);

-      }

-      else

-      {

+        }

+        else

+        {

         $v_nb_extracted++;

-      }

+        }

     }

 

     // ----- Look if something need to be deleted

@@ -4899,7 +4899,7 @@ 
 

             // ----- Check that local file header is same as central file header

             if ($this->privCheckFileHeaders($v_local_header,

-			                                $v_header_list[$i]) != 1) {

+                                            $v_header_list[$i]) != 1) {

                 // TBC

             }

             unset($v_local_header);

@@ -4950,7 +4950,7 @@ 
         // ----- Zip file comment

         $v_comment = '';

         if (isset($p_options[PCLZIP_OPT_COMMENT])) {

-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];

+            $v_comment = $p_options[PCLZIP_OPT_COMMENT];

         }

 

         // ----- Calculate the size of the central header

@@ -4990,11 +4990,11 @@ 
         $this->privCloseFd();

 

         if (($v_result = $this->privOpenFd('wb')) != 1) {

-          return $v_result;

+            return $v_result;

         }

 

         if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {

-          return $v_result;

+            return $v_result;

         }

 

         $this->privCloseFd();

@@ -5002,35 +5002,35 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privDirCheck()

-  // Description :

-  //   Check if a directory exists, if not it creates it and all the parents directory

-  //   which may be useful.

-  // Parameters :

-  //   $p_dir : Directory path to check.

-  // Return Values :

-  //    1 : OK

-  //   -1 : Unable to create directory

-  // --------------------------------------------------------------------------------

-  function privDirCheck($p_dir, $p_is_dir=false)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privDirCheck()

+    // Description :

+    //   Check if a directory exists, if not it creates it and all the parents directory

+    //   which may be useful.

+    // Parameters :

+    //   $p_dir : Directory path to check.

+    // Return Values :

+    //    1 : OK

+    //   -1 : Unable to create directory

+    // --------------------------------------------------------------------------------

+    function privDirCheck($p_dir, $p_is_dir=false)

+    {

     $v_result = 1;

 

 

     // ----- Remove the final '/'

     if (($p_is_dir) && (substr($p_dir, -1)=='/'))

     {

-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);

+        $p_dir = substr($p_dir, 0, strlen($p_dir)-1);

     }

 

     // ----- Check the directory availability

     if ((is_dir($p_dir)) || ($p_dir == ""))

     {

-      return 1;

+        return 1;

     }

 

     // ----- Extract parent directory

@@ -5039,77 +5039,77 @@ 
     // ----- Just a check

     if ($p_parent_dir != $p_dir)

     {

-      // ----- Look for parent directory

-      if ($p_parent_dir != "")

-      {

+        // ----- Look for parent directory

+        if ($p_parent_dir != "")

+        {

         if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)

         {

-          return $v_result;

+            return $v_result;

+        }

         }

-      }

     }

 

     // ----- Create the directory

     if (!@mkdir($p_dir, 0777))

     {

-      // ----- Error log

-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");

+        // ----- Error log

+        PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privMerge()

-  // Description :

-  //   If $p_archive_to_add does not exist, the function exit with a success result.

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privMerge(&$p_archive_to_add)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privMerge()

+    // Description :

+    //   If $p_archive_to_add does not exist, the function exit with a success result.

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privMerge(&$p_archive_to_add)

+    {

     $v_result=1;

 

     // ----- Look if the archive_to_add exists

     if (!is_file($p_archive_to_add->zipname))

     {

 

-      // ----- Nothing to merge, so merge is a success

-      $v_result = 1;

+        // ----- Nothing to merge, so merge is a success

+        $v_result = 1;

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Look if the archive exists

     if (!is_file($this->zipname))

     {

 

-      // ----- Do a duplicate

-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);

+        // ----- Do a duplicate

+        $v_result = $this->privDuplicate($p_archive_to_add->zipname);

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Open the zip file

     if (($v_result=$this->privOpenFd('rb')) != 1)

     {

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Read the central directory informations

     $v_central_dir = array();

     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)

     {

-      $this->privCloseFd();

-      return $v_result;

+        $this->privCloseFd();

+        return $v_result;

     }

 

     // ----- Go to beginning of File

@@ -5118,20 +5118,20 @@ 
     // ----- Open the archive_to_add file

     if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)

     {

-      $this->privCloseFd();

+        $this->privCloseFd();

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Read the central directory informations

     $v_central_dir_to_add = array();

     if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)

     {

-      $this->privCloseFd();

-      $p_archive_to_add->privCloseFd();

+        $this->privCloseFd();

+        $p_archive_to_add->privCloseFd();

 

-      return $v_result;

+        return $v_result;

     }

 

     // ----- Go to beginning of File

@@ -5143,13 +5143,13 @@ 
     // ----- Open the temporary file in write mode

     if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)

     {

-      $this->privCloseFd();

-      $p_archive_to_add->privCloseFd();

+        $this->privCloseFd();

+        $p_archive_to_add->privCloseFd();

 

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Copy the files from the archive to the temporary file

@@ -5157,20 +5157,20 @@ 
     $v_size = $v_central_dir['offset'];

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = fread($this->zip_fd, $v_read_size);

-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = fread($this->zip_fd, $v_read_size);

+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Copy the files from the archive_to_add into the temporary file

     $v_size = $v_central_dir_to_add['offset'];

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);

-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);

+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Store the offset of the central dir

@@ -5180,20 +5180,20 @@ 
     $v_size = $v_central_dir['size'];

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = @fread($this->zip_fd, $v_read_size);

-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = @fread($this->zip_fd, $v_read_size);

+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Copy the block of file headers from the archive_to_add

     $v_size = $v_central_dir_to_add['size'];

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);

-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);

+        @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Merge the file comments

@@ -5212,16 +5212,16 @@ 
     // ----- Create the central dir footer

     if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)

     {

-      $this->privCloseFd();

-      $p_archive_to_add->privCloseFd();

-      @fclose($v_zip_temp_fd);

-      $this->zip_fd = null;

+        $this->privCloseFd();

+        $p_archive_to_add->privCloseFd();

+        @fclose($v_zip_temp_fd);

+        $this->zip_fd = null;

 

-      // ----- Reset the file list

-      unset($v_header_list);

+        // ----- Reset the file list

+        unset($v_header_list);

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Swap back the file descriptor

@@ -5247,46 +5247,46 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privDuplicate()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privDuplicate($p_archive_filename)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privDuplicate()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privDuplicate($p_archive_filename)

+    {

     $v_result=1;

 

     // ----- Look if the $p_archive_filename exists

     if (!is_file($p_archive_filename))

     {

 

-      // ----- Nothing to duplicate, so duplicate is a success.

-      $v_result = 1;

+        // ----- Nothing to duplicate, so duplicate is a success.

+        $v_result = 1;

 

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Open the zip file

     if (($v_result=$this->privOpenFd('wb')) != 1)

     {

-      // ----- Return

-      return $v_result;

+        // ----- Return

+        return $v_result;

     }

 

     // ----- Open the temporary file in write mode

     if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)

     {

-      $this->privCloseFd();

+        $this->privCloseFd();

 

-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');

+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');

 

-      // ----- Return

-      return PclZip::errorCode();

+        // ----- Return

+        return PclZip::errorCode();

     }

 

     // ----- Copy the files from the archive to the temporary file

@@ -5294,10 +5294,10 @@ 
     $v_size = filesize($p_archive_filename);

     while ($v_size != 0)

     {

-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);

-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);

-      $v_size -= $v_read_size;

+        $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

+        $v_buffer = fread($v_zip_temp_fd, $v_read_size);

+        @fwrite($this->zip_fd, $v_buffer, $v_read_size);

+        $v_size -= $v_read_size;

     }

 

     // ----- Close

@@ -5308,211 +5308,211 @@ 
 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privErrorLog()

-  // Description :

-  // Parameters :

-  // --------------------------------------------------------------------------------

-  function privErrorLog($p_error_code=0, $p_error_string='')

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privErrorLog()

+    // Description :

+    // Parameters :

+    // --------------------------------------------------------------------------------

+    function privErrorLog($p_error_code=0, $p_error_string='')

+    {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

-      PclError($p_error_code, $p_error_string);

+        PclError($p_error_code, $p_error_string);

     }

     else {

-      $this->error_code = $p_error_code;

-      $this->error_string = $p_error_string;

-    }

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privErrorReset()

-  // Description :

-  // Parameters :

-  // --------------------------------------------------------------------------------

-  function privErrorReset()

-  {

+        $this->error_code = $p_error_code;

+        $this->error_string = $p_error_string;

+    }

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privErrorReset()

+    // Description :

+    // Parameters :

+    // --------------------------------------------------------------------------------

+    function privErrorReset()

+    {

     if (PCLZIP_ERROR_EXTERNAL == 1) {

-      PclErrorReset();

+        PclErrorReset();

     }

     else {

-      $this->error_code = 0;

-      $this->error_string = '';

-    }

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privDisableMagicQuotes()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privDisableMagicQuotes()

-  {

+        $this->error_code = 0;

+        $this->error_string = '';

+    }

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privDisableMagicQuotes()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privDisableMagicQuotes()

+    {

     $v_result=1;

 

     // ----- Look if function exists

     if (   (!function_exists("get_magic_quotes_runtime"))

-	    || (!function_exists("set_magic_quotes_runtime"))) {

-      return $v_result;

-	}

+        || (!function_exists("set_magic_quotes_runtime"))) {

+        return $v_result;

+    }

 

     // ----- Look if already done

     if ($this->magic_quotes_status != -1) {

-      return $v_result;

-	}

+        return $v_result;

+    }

 

-	// ----- Get and memorize the magic_quote value

-	$this->magic_quotes_status = @get_magic_quotes_runtime();

+    // ----- Get and memorize the magic_quote value

+    $this->magic_quotes_status = @get_magic_quotes_runtime();

 

-	// ----- Disable magic_quotes

-	if ($this->magic_quotes_status == 1) {

-	  @set_magic_quotes_runtime(0);

-	}

+    // ----- Disable magic_quotes

+    if ($this->magic_quotes_status == 1) {

+        @set_magic_quotes_runtime(0);

+    }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : privSwapBackMagicQuotes()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function privSwapBackMagicQuotes()

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : privSwapBackMagicQuotes()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function privSwapBackMagicQuotes()

+    {

     $v_result=1;

 

     // ----- Look if function exists

     if (   (!function_exists("get_magic_quotes_runtime"))

-	    || (!function_exists("set_magic_quotes_runtime"))) {

-      return $v_result;

-	}

+        || (!function_exists("set_magic_quotes_runtime"))) {

+        return $v_result;

+    }

 

     // ----- Look if something to do

     if ($this->magic_quotes_status != -1) {

-      return $v_result;

-	}

+        return $v_result;

+    }

 

-	// ----- Swap back magic_quotes

-	if ($this->magic_quotes_status == 1) {

-  	  @set_magic_quotes_runtime($this->magic_quotes_status);

-	}

+    // ----- Swap back magic_quotes

+    if ($this->magic_quotes_status == 1) {

+        @set_magic_quotes_runtime($this->magic_quotes_status);

+    }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  }

-  // End of class

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : PclZipUtilPathReduction()

-  // Description :

-  // Parameters :

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function PclZipUtilPathReduction($p_dir)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    }

+    // End of class

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : PclZipUtilPathReduction()

+    // Description :

+    // Parameters :

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function PclZipUtilPathReduction($p_dir)

+    {

     $v_result = "";

 

     // ----- Look for not empty path

     if ($p_dir != "") {

-      // ----- Explode path by directory names

-      $v_list = explode("/", $p_dir);

+        // ----- Explode path by directory names

+        $v_list = explode("/", $p_dir);

 

-      // ----- Study directories from last to first

-      $v_skip = 0;

-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {

+        // ----- Study directories from last to first

+        $v_skip = 0;

+        for ($i=sizeof($v_list)-1; $i>=0; $i--) {

         // ----- Look for current path

         if ($v_list[$i] == ".") {

-          // ----- Ignore this directory

-          // Should be the first $i=0, but no check is done

+            // ----- Ignore this directory

+            // Should be the first $i=0, but no check is done

         }

         else if ($v_list[$i] == "..") {

-		  $v_skip++;

+            $v_skip++;

         }

         else if ($v_list[$i] == "") {

-		  // ----- First '/' i.e. root slash

-		  if ($i == 0) {

+            // ----- First '/' i.e. root slash

+            if ($i == 0) {

             $v_result = "/".$v_result;

-		    if ($v_skip > 0) {

-		        // ----- It is an invalid path, so the path is not modified

-		        // TBC

-		        $v_result = $p_dir;

+            if ($v_skip > 0) {

+                // ----- It is an invalid path, so the path is not modified

+                // TBC

+                $v_result = $p_dir;

                 $v_skip = 0;

-		    }

-		  }

-		  // ----- Last '/' i.e. indicates a directory

-		  else if ($i == (sizeof($v_list)-1)) {

+            }

+            }

+            // ----- Last '/' i.e. indicates a directory

+            else if ($i == (sizeof($v_list)-1)) {

             $v_result = $v_list[$i];

-		  }

-		  // ----- Double '/' inside the path

-		  else {

+            }

+            // ----- Double '/' inside the path

+            else {

             // ----- Ignore only the double '//' in path,

             // but not the first and last '/'

-		  }

+            }

         }

         else {

-		  // ----- Look for item to skip

-		  if ($v_skip > 0) {

-		    $v_skip--;

-		  }

-		  else {

+            // ----- Look for item to skip

+            if ($v_skip > 0) {

+            $v_skip--;

+            }

+            else {

             $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");

-		  }

+            }

+        }

         }

-      }

 

-      // ----- Look for skip

-      if ($v_skip > 0) {

+        // ----- Look for skip

+        if ($v_skip > 0) {

         while ($v_skip > 0) {

             $v_result = '../'.$v_result;

             $v_skip--;

         }

-      }

+        }

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : PclZipUtilPathInclusion()

-  // Description :

-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,

-  //   said in an other way, if the file or sub-dir $p_path is inside the dir

-  //   $p_dir.

-  //   The function indicates also if the path is exactly the same as the dir.

-  //   This function supports path with duplicated '/' like '//', but does not

-  //   support '.' or '..' statements.

-  // Parameters :

-  // Return Values :

-  //   0 if $p_path is not inside directory $p_dir

-  //   1 if $p_path is inside directory $p_dir

-  //   2 if $p_path is exactly the same as $p_dir

-  // --------------------------------------------------------------------------------

-  function PclZipUtilPathInclusion($p_dir, $p_path)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : PclZipUtilPathInclusion()

+    // Description :

+    //   This function indicates if the path $p_path is under the $p_dir tree. Or,

+    //   said in an other way, if the file or sub-dir $p_path is inside the dir

+    //   $p_dir.

+    //   The function indicates also if the path is exactly the same as the dir.

+    //   This function supports path with duplicated '/' like '//', but does not

+    //   support '.' or '..' statements.

+    // Parameters :

+    // Return Values :

+    //   0 if $p_path is not inside directory $p_dir

+    //   1 if $p_path is inside directory $p_dir

+    //   2 if $p_path is exactly the same as $p_dir

+    // --------------------------------------------------------------------------------

+    function PclZipUtilPathInclusion($p_dir, $p_path)

+    {

     $v_result = 1;

 

     // ----- Look for path beginning by ./

     if (   ($p_dir == '.')

         || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {

-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);

+        $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);

     }

     if (   ($p_path == '.')

         || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {

-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);

+        $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);

     }

 

     // ----- Explode dir and path by directory separator

@@ -5526,196 +5526,196 @@ 
     $j = 0;

     while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {

 

-      // ----- Look for empty dir (path reduction)

-      if ($v_list_dir[$i] == '') {

+        // ----- Look for empty dir (path reduction)

+        if ($v_list_dir[$i] == '') {

         $i++;

         continue;

-      }

-      if ($v_list_path[$j] == '') {

+        }

+        if ($v_list_path[$j] == '') {

         $j++;

         continue;

-      }

+        }

 

-      // ----- Compare the items

-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {

+        // ----- Compare the items

+        if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {

         $v_result = 0;

-      }

+        }

 

-      // ----- Next items

-      $i++;

-      $j++;

+        // ----- Next items

+        $i++;

+        $j++;

     }

 

     // ----- Look if everything seems to be the same

     if ($v_result) {

-      // ----- Skip all the empty items

-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;

-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;

+        // ----- Skip all the empty items

+        while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;

+        while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;

 

-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {

+        if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {

         // ----- There are exactly the same

         $v_result = 2;

-      }

-      else if ($i < $v_list_dir_size) {

+        }

+        else if ($i < $v_list_dir_size) {

         // ----- The path is shorter than the dir

         $v_result = 0;

-      }

+        }

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : PclZipUtilCopyBlock()

-  // Description :

-  // Parameters :

-  //   $p_mode : read/write compression mode

-  //             0 : src & dest normal

-  //             1 : src gzip, dest normal

-  //             2 : src normal, dest gzip

-  //             3 : src & dest gzip

-  // Return Values :

-  // --------------------------------------------------------------------------------

-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : PclZipUtilCopyBlock()

+    // Description :

+    // Parameters :

+    //   $p_mode : read/write compression mode

+    //             0 : src & dest normal

+    //             1 : src gzip, dest normal

+    //             2 : src normal, dest gzip

+    //             3 : src & dest gzip

+    // Return Values :

+    // --------------------------------------------------------------------------------

+    function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)

+    {

     $v_result = 1;

 

     if ($p_mode==0)

     {

-      while ($p_size != 0)

-      {

+        while ($p_size != 0)

+        {

         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);

         $v_buffer = @fread($p_src, $v_read_size);

         @fwrite($p_dest, $v_buffer, $v_read_size);

         $p_size -= $v_read_size;

-      }

+        }

     }

     else if ($p_mode==1)

     {

-      while ($p_size != 0)

-      {

+        while ($p_size != 0)

+        {

         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);

         $v_buffer = @gzread($p_src, $v_read_size);

         @fwrite($p_dest, $v_buffer, $v_read_size);

         $p_size -= $v_read_size;

-      }

+        }

     }

     else if ($p_mode==2)

     {

-      while ($p_size != 0)

-      {

+        while ($p_size != 0)

+        {

         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);

         $v_buffer = @fread($p_src, $v_read_size);

         @gzwrite($p_dest, $v_buffer, $v_read_size);

         $p_size -= $v_read_size;

-      }

+        }

     }

     else if ($p_mode==3)

     {

-      while ($p_size != 0)

-      {

+        while ($p_size != 0)

+        {

         $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);

         $v_buffer = @gzread($p_src, $v_read_size);

         @gzwrite($p_dest, $v_buffer, $v_read_size);

         $p_size -= $v_read_size;

-      }

+        }

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : PclZipUtilRename()

-  // Description :

-  //   This function tries to do a simple rename() function. If it fails, it

-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the

-  //   first one.

-  // Parameters :

-  //   $p_src : Old filename

-  //   $p_dest : New filename

-  // Return Values :

-  //   1 on success, 0 on failure.

-  // --------------------------------------------------------------------------------

-  function PclZipUtilRename($p_src, $p_dest)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : PclZipUtilRename()

+    // Description :

+    //   This function tries to do a simple rename() function. If it fails, it

+    //   tries to copy the $p_src file in a new $p_dest file and then unlink the

+    //   first one.

+    // Parameters :

+    //   $p_src : Old filename

+    //   $p_dest : New filename

+    // Return Values :

+    //   1 on success, 0 on failure.

+    // --------------------------------------------------------------------------------

+    function PclZipUtilRename($p_src, $p_dest)

+    {

     $v_result = 1;

 

     // ----- Try to rename the files

     if (!@rename($p_src, $p_dest)) {

 

-      // ----- Try to copy & unlink the src

-      if (!@copy($p_src, $p_dest)) {

+        // ----- Try to copy & unlink the src

+        if (!@copy($p_src, $p_dest)) {

         $v_result = 0;

-      }

-      else if (!@unlink($p_src)) {

+        }

+        else if (!@unlink($p_src)) {

         $v_result = 0;

-      }

+        }

     }

 

     // ----- Return

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : PclZipUtilOptionText()

-  // Description :

-  //   Translate option value in text. Mainly for debug purpose.

-  // Parameters :

-  //   $p_option : the option value.

-  // Return Values :

-  //   The option text value.

-  // --------------------------------------------------------------------------------

-  function PclZipUtilOptionText($p_option)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : PclZipUtilOptionText()

+    // Description :

+    //   Translate option value in text. Mainly for debug purpose.

+    // Parameters :

+    //   $p_option : the option value.

+    // Return Values :

+    //   The option text value.

+    // --------------------------------------------------------------------------------

+    function PclZipUtilOptionText($p_option)

+    {

 

     $v_list = get_defined_constants();

     for (reset($v_list); $v_key = key($v_list); next($v_list)) {

-	    $v_prefix = substr($v_key, 0, 10);

-	    if ((   ($v_prefix == 'PCLZIP_OPT')

+        $v_prefix = substr($v_key, 0, 10);

+        if ((   ($v_prefix == 'PCLZIP_OPT')

            || ($v_prefix == 'PCLZIP_CB_')

            || ($v_prefix == 'PCLZIP_ATT'))

-	        && ($v_list[$v_key] == $p_option)) {

+            && ($v_list[$v_key] == $p_option)) {

         return $v_key;

-	    }

+        }

     }

 

     $v_result = 'Unknown';

 

     return $v_result;

-  }

-  // --------------------------------------------------------------------------------

-

-  // --------------------------------------------------------------------------------

-  // Function : PclZipUtilTranslateWinPath()

-  // Description :

-  //   Translate windows path by replacing '\' by '/' and optionally removing

-  //   drive letter.

-  // Parameters :

-  //   $p_path : path to translate.

-  //   $p_remove_disk_letter : true | false

-  // Return Values :

-  //   The path translated.

-  // --------------------------------------------------------------------------------

-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)

-  {

+    }

+    // --------------------------------------------------------------------------------

+

+    // --------------------------------------------------------------------------------

+    // Function : PclZipUtilTranslateWinPath()

+    // Description :

+    //   Translate windows path by replacing '\' by '/' and optionally removing

+    //   drive letter.

+    // Parameters :

+    //   $p_path : path to translate.

+    //   $p_remove_disk_letter : true | false

+    // Return Values :

+    //   The path translated.

+    // --------------------------------------------------------------------------------

+    function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)

+    {

     if (stristr(php_uname(), 'windows')) {

-      // ----- Look for potential disk letter

-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {

-          $p_path = substr($p_path, $v_position+1);

-      }

-      // ----- Change potential windows directory separator

-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {

-          $p_path = strtr($p_path, '\\', '/');

-      }

+        // ----- Look for potential disk letter

+        if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {

+            $p_path = substr($p_path, $v_position+1);

+        }

+        // ----- Change potential windows directory separator

+        if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {

+            $p_path = strtr($p_path, '\\', '/');

+        }

     }

     return $p_path;

-  }

-  // --------------------------------------------------------------------------------

+    }

+    // --------------------------------------------------------------------------------

 

 

 ?>