spip / SPIP

ecrire/inc/pclzip.php

Doc Comments +31 added lines

@@ -28,6 +28,11 @@ 
     define('PCLZIP_TEMPORARY_DIR', _DIR_TMP);
   }
   if (!function_exists('gzopen') && function_exists('gzopen64')) {
+
+    /**
+     * @param string $filename
+     * @param string $mode
+     */
     function gzopen($filename, $mode, $use_include_path = 0) {
       return gzopen64($filename, $mode, $use_include_path);
     }
@@ -221,6 +226,10 @@ 
   //   Note that no real action is taken, if the archive does not exist it is not
   //   created. Use create() for that.
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_zipname
+   */
   function PclZip($p_zipname)
   {
 
@@ -2344,6 +2353,10 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_mode
+   */
   function privOpenFd($p_mode)
   {
     $v_result=1;
@@ -4160,6 +4173,10 @@ 
   // Parameters :
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_string
+   */
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
     $v_result=1;
@@ -5053,6 +5070,10 @@ 
   // Parameters :
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param PclZip $p_archive_to_add
+   */
   function privMerge(&$p_archive_to_add)
   {
     $v_result=1;
@@ -5560,6 +5581,11 @@ 
   //             3 : src & dest gzip
   // Return Values :
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param integer $p_src
+   * @param integer $p_dest
+   */
   function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
     $v_result = 1;
@@ -5622,6 +5648,11 @@ 
   // Return Values :
   //   1 on success, 0 on failure.
   // --------------------------------------------------------------------------------
+
+  /**
+   * @param string $p_src
+   * @param string $p_dest
+   */
   function PclZipUtilRename($p_src, $p_dest)
   {
     $v_result = 1;

Indentation +2661 added lines, -2661 removed lines

@@ -22,181 +22,181 @@ 
 //   The use of this software is at the risk of the user.
 //
 
-  // personnalisations spip
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
+    // personnalisations spip
+    if (!defined('PCLZIP_TEMPORARY_DIR')) {
     define('PCLZIP_TEMPORARY_DIR', _DIR_TMP);
-  }
-  if (!function_exists('gzopen') && function_exists('gzopen64')) {
+    }
+    if (!function_exists('gzopen') && function_exists('gzopen64')) {
     function gzopen($filename, $mode, $use_include_path = 0) {
-      return gzopen64($filename, $mode, $use_include_path);
+        return gzopen64($filename, $mode, $use_include_path);
+    }
     }
-  }
-  // fin personnalisations spip
+    // fin personnalisations spip
 
-  // ----- 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
+    // ----- 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
+    // ----- 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 );
   define( 'PCLZIP_CB_POST_DELETE', 78008 );
   */
 
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
+    // --------------------------------------------------------------------------------
+    // Class : PclZip
+    // Description :
+    //   PclZip is the class that represent a Zip archive.
+    //   The public methods allow the manipulation of the archive.
+    // Attributes :
+    //   Attributes must not be accessed directly.
+    // Methods :
+    //   PclZip() : Object creator
+    //   create() : Creates the Zip archive
+    //   listContent() : List the content of the Zip archive
+    //   extract() : Extract the content of the archive
+    //   properties() : List the properties of the archive
+    // --------------------------------------------------------------------------------
+    class PclZip
+    {
     // ----- Filename of the zip file
     var $zipname = '';
 
@@ -212,21 +212,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
@@ -236,48 +236,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
@@ -292,53 +292,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
@@ -353,114 +353,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
@@ -475,57 +475,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
@@ -540,116 +540,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
@@ -657,56 +657,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
@@ -714,7 +714,7 @@ 
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      return(0);
+        return(0);
     }
 
     // ----- Set default values
@@ -732,77 +732,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
@@ -813,57 +813,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
@@ -871,7 +871,7 @@ 
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      return(0);
+        return(0);
     }
 
     // ----- Set default values
@@ -889,81 +889,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
@@ -990,29 +990,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
@@ -1020,7 +1020,7 @@ 
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      return(0);
+        return(0);
     }
 
     // ----- Set default values
@@ -1031,18 +1031,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
@@ -1051,9 +1051,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
@@ -1061,41 +1061,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();
@@ -1105,8 +1105,8 @@ 
 
     // ----- Check archive
     if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
+        $this->privSwapBackMagicQuotes();
+        return(0);
     }
 
     // ----- Default properties
@@ -1118,9 +1118,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
@@ -1128,23 +1128,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
@@ -1152,23 +1152,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
@@ -1178,56 +1178,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
@@ -1235,125 +1235,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."]");
-      }
+        }
     }
-  }
-  // --------------------------------------------------------------------------------
+    }
+    // --------------------------------------------------------------------------------
 
 
 // --------------------------------------------------------------------------------
@@ -1364,25 +1364,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
@@ -1390,16 +1390,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
@@ -1413,43 +1413,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 :
@@ -1461,11 +1461,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 :
@@ -1473,24 +1473,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 :
@@ -1498,9 +1498,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 :
@@ -1508,14 +1508,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 :
@@ -1526,16 +1526,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
@@ -1547,23 +1547,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
@@ -1580,20 +1580,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
@@ -1604,29 +1604,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
@@ -1638,87 +1638,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);
+            // ----- 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 ...
+                // ----- 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'];
-          }
+                // ----- 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
@@ -1740,11 +1740,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
@@ -1765,54 +1765,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
@@ -1822,22 +1822,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
@@ -1859,52 +1859,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;
 
@@ -1912,28 +1912,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
@@ -1941,18 +1941,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 :
@@ -1962,50 +1962,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
@@ -2014,58 +2014,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 == '..')) {
@@ -2080,39 +2080,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
@@ -2120,17 +2120,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();
     
@@ -2140,8 +2140,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
@@ -2155,17 +2155,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();
 
@@ -2173,11 +2173,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();
@@ -2185,20 +2185,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
@@ -2210,13 +2210,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
@@ -2224,10 +2224,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
@@ -2241,13 +2241,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
@@ -2257,43 +2257,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
@@ -2302,12 +2302,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
@@ -2335,85 +2335,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
@@ -2422,23 +2422,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
@@ -2447,29 +2447,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();
 
@@ -2478,60 +2478,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
@@ -2539,11 +2539,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 
@@ -2578,94 +2578,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
@@ -2673,8 +2673,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
@@ -2688,25 +2688,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
@@ -2714,10 +2714,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'];
 
@@ -2726,36 +2726,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
@@ -2766,45 +2766,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
@@ -2813,26 +2813,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
@@ -2841,14 +2841,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
@@ -2874,14 +2874,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
@@ -2889,11 +2889,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
@@ -2904,112 +2904,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)
@@ -3018,17 +3018,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
@@ -3041,12 +3041,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);
@@ -3054,26 +3054,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
@@ -3088,14 +3088,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);
@@ -3103,36 +3103,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);
@@ -3140,22 +3140,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
@@ -3164,51 +3164,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
@@ -3219,30 +3219,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
@@ -3261,27 +3261,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
@@ -3289,44 +3289,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
@@ -3337,10 +3337,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();
@@ -3350,54 +3350,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] != "")) {
 
@@ -3407,199 +3407,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++) {
-
-              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;
-              }
-          }
-      }
+            // ----- 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 ($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'].") ");
-
-              return PclZip::errorCode();
-		  }
-	  }
+                PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
+                                    "Filename '".$v_header['stored_filename']."' is "
+                                        ."compressed by an unsupported compression "
+                                        ."method (".$v_header['compression'].") ");
+
+                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
@@ -3608,28 +3608,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
@@ -3654,74 +3654,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'];
     }
 
 
@@ -3732,9 +3732,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";
@@ -3743,18 +3743,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";
@@ -3763,90 +3763,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
@@ -3855,38 +3855,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)
@@ -3897,20 +3897,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
@@ -3920,67 +3920,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();
     }
 
 
@@ -3992,11 +3992,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
@@ -4008,27 +4008,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);
@@ -4038,22 +4038,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;
     }
 
 
@@ -4065,31 +4065,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
@@ -4097,78 +4097,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;
     }
 
 
@@ -4180,110 +4180,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
@@ -4294,11 +4294,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
@@ -4307,14 +4307,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
@@ -4325,10 +4325,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
@@ -4345,23 +4345,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
@@ -4376,17 +4376,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
@@ -4397,11 +4397,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
@@ -4410,14 +4410,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
@@ -4425,21 +4425,21 @@ 
 
     // ----- Get filename
     if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+        $p_header['filename'] = 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
 
@@ -4448,23 +4448,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
@@ -4475,63 +4475,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']) {
-  	}
+        // ----- 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'];
-  	}
+        // ----- 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
@@ -4539,59 +4539,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);
 
@@ -4604,23 +4604,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
@@ -4630,11 +4630,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
@@ -4643,27 +4643,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'];
@@ -4678,33 +4678,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
@@ -4716,14 +4716,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
@@ -4732,53 +4732,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] != "")) {
 
@@ -4788,47 +4788,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
@@ -4880,7 +4880,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);
@@ -4931,7 +4931,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
@@ -4971,11 +4971,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();
@@ -4983,35 +4983,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
@@ -5020,77 +5020,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
@@ -5099,20 +5099,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
@@ -5124,13 +5124,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
@@ -5138,20 +5138,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
@@ -5161,20 +5161,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
@@ -5193,16 +5193,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
@@ -5228,46 +5228,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
@@ -5275,10 +5275,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
@@ -5289,211 +5289,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
@@ -5507,196 +5507,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;
-  }
-  // --------------------------------------------------------------------------------
+    }
+    // --------------------------------------------------------------------------------
 
 
 ?>

Spacing +282 added lines, -282 removed lines

@@ -35,7 +35,7 @@ 
 
   // ----- Constants
   if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+    define('PCLZIP_READ_BLOCK_SIZE', 2048);
   }
   
   // ----- File list separator
@@ -49,7 +49,7 @@ 
   //define( 'PCLZIP_SEPARATOR', ' ' );
   // Recommanded values for smart separation of filenames.
   if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
+    define('PCLZIP_SEPARATOR', ',');
   }
 
   // ----- Error configuration
@@ -58,7 +58,7 @@ 
   //     you must ensure that you have included PclError library.
   // [2,...] : reserved for futur use
   if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+    define('PCLZIP_ERROR_EXTERNAL', 0);
   }
 
   // ----- Optional static temporary directory
@@ -71,7 +71,7 @@ 
   // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
   // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
   if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', '' );
+    define('PCLZIP_TEMPORARY_DIR', '');
   }
 
   // ----- Optional threshold ratio for use of temporary files
@@ -83,7 +83,7 @@ 
   //       Samples :
   // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
   if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+    define('PCLZIP_TEMPORARY_FILE_RATIO', 0.47);
   }
 
 // --------------------------------------------------------------------------------
@@ -108,72 +108,72 @@ 
   //  -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 );
+  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 );
+  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
+  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 );
+  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 );
+  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 );
@@ -278,7 +278,7 @@ 
   // --------------------------------------------------------------------------------
   function create($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -304,7 +304,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -390,7 +390,7 @@ 
     
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = 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'
@@ -461,7 +461,7 @@ 
   // --------------------------------------------------------------------------------
   function add($p_filelist)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -487,7 +487,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                            array(PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
                                                    PCLZIP_CB_PRE_ADD => 'optional',
@@ -573,7 +573,7 @@ 
     
     // ----- For each file in the list check the attributes
     $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+    = 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'
@@ -650,7 +650,7 @@ 
   // --------------------------------------------------------------------------------
   function listContent()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -707,7 +707,7 @@ 
   // --------------------------------------------------------------------------------
   function extract()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -740,7 +740,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_ADD_PATH => 'optional',
@@ -864,7 +864,7 @@ 
   //function extractByIndex($p_index, options...)
   function extractByIndex($p_index)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -901,7 +901,7 @@ 
 
         // ----- Parse the options
         $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
+                                            array(PCLZIP_OPT_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_PATH => 'optional',
                                                    PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
                                                    PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
@@ -971,10 +971,10 @@ 
     // ----- Trick
     // Here I want to reuse extractByRule(), so I need to parse the $p_index
     // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+    $v_arg_trick = array(PCLZIP_OPT_BY_INDEX, $p_index);
     $v_options_trick = array();
     $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                        array(PCLZIP_OPT_BY_INDEX => 'optional'));
     if ($v_result != 1) {
         return 0;
     }
@@ -1013,7 +1013,7 @@ 
   // --------------------------------------------------------------------------------
   function delete()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Reset the error handler
     $this->privErrorReset();
@@ -1036,10 +1036,10 @@ 
 
       // ----- Parse the options
       $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
+                                        array(PCLZIP_OPT_BY_NAME => 'optional',
                                                PCLZIP_OPT_BY_EREG => 'optional',
                                                PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
+                                               PCLZIP_OPT_BY_INDEX => 'optional'));
       if ($v_result != 1) {
           return 0;
       }
@@ -1293,9 +1293,9 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
+  function errorName($p_with_code = false)
   {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+    $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',
@@ -1339,7 +1339,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
+  function errorInfo($p_full = false)
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
@@ -1378,7 +1378,7 @@ 
   //   true on success,
   //   false on error, the error code is set.
   // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
+  function privCheckFormat($p_level = 0)
   {
     $v_result = true;
 
@@ -1431,13 +1431,13 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
+  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
+    $i = 0;
+    while ($i < $p_size) {
 
       // ----- Check if the option is supported
       if (!isset($v_requested_options[$p_options_list[$i]])) {
@@ -1455,7 +1455,7 @@ 
         case PCLZIP_OPT_REMOVE_PATH :
         case PCLZIP_OPT_ADD_PATH :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1464,13 +1464,13 @@ 
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i + 1], FALSE);
           $i++;
         break;
 
         case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          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();
           }
@@ -1482,14 +1482,14 @@ 
           }
           
           // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
+          $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;
+          $v_result_list[$p_options_list[$i]] = $v_value * 1048576;
           $i++;
         break;
 
@@ -1520,7 +1520,7 @@ 
 
         case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1529,9 +1529,9 @@ 
           }
 
           // ----- 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);
+          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 {
@@ -1541,7 +1541,7 @@ 
         // ----- Look for options that request an array of string for value
         case PCLZIP_OPT_BY_NAME :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1550,11 +1550,11 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+          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 if (is_array($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1574,7 +1574,7 @@ 
         case PCLZIP_OPT_BY_PREG :
         //case PCLZIP_OPT_CRYPT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1583,8 +1583,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1601,7 +1601,7 @@ 
         case PCLZIP_OPT_ADD_COMMENT :
         case PCLZIP_OPT_PREPEND_COMMENT :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
 			                     "Missing parameter value for option '"
@@ -1613,8 +1613,8 @@ 
           }
 
           // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          if (is_string($p_options_list[$i + 1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1632,7 +1632,7 @@ 
         // ----- Look for options that request an array of index
         case PCLZIP_OPT_BY_INDEX :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1642,19 +1642,19 @@ 
 
           // ----- Get the value
           $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
+          if (is_string($p_options_list[$i + 1])) {
 
               // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+              $p_options_list[$i + 1] = strtr($p_options_list[$i + 1], ' ', '');
 
               // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
+              $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_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 if (is_array($p_options_list[$i + 1])) {
+              $v_work_list = $p_options_list[$i + 1];
           }
           else {
             // ----- Error log
@@ -1668,9 +1668,9 @@ 
           // 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++) {
+          $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);
@@ -1700,7 +1700,7 @@ 
 
               // ----- Look for list sort
               if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
+                  $v_sort_flag = true;
 
                   // ----- TBC : An automatic sort should be writen ...
                   // ----- Error log
@@ -1734,7 +1734,7 @@ 
         // ----- Look for options that request an octal value
         case PCLZIP_OPT_SET_CHMOD :
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1743,7 +1743,7 @@ 
           }
 
           // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i + 1];
           $i++;
         break;
 
@@ -1759,7 +1759,7 @@ 
         case PCLZIP_CB_POST_LIST :
         */
           // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
+          if (($i + 1) >= $p_size) {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1768,7 +1768,7 @@ 
           }
 
           // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
+          $v_function_name = $p_options_list[$i + 1];
 
           // ----- Check that the value is a valid existing function
           if (!function_exists($v_function_name)) {
@@ -1800,7 +1800,7 @@ 
 
     // ----- 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
@@ -1833,7 +1833,7 @@ 
   // --------------------------------------------------------------------------------
   function privOptionDefaultThreshold(&$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
@@ -1845,16 +1845,16 @@ 
     $v_memory_limit = trim($v_memory_limit);
     $last = strtolower(substr($v_memory_limit, -1));
  
-    if($last == 'g')
+    if ($last == 'g')
         //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
+        $v_memory_limit = $v_memory_limit * 1073741824;
+    if ($last == 'm')
         //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+        $v_memory_limit = $v_memory_limit * 1048576;
+    if ($last == 'k')
+        $v_memory_limit = $v_memory_limit * 1024;
             
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit * PCLZIP_TEMPORARY_FILE_RATIO);
     
 
     // ----- Sanity check : No threshold if value lower than 1M
@@ -1875,9 +1875,9 @@ 
   //   1 on success.
   //   0 on failure.
   // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
+  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options = false)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- For each file in the list check the attributes
     foreach ($p_file_list as $v_key => $v_value) {
@@ -1970,7 +1970,7 @@ 
 
       // ----- 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
@@ -2006,13 +2006,13 @@ 
   // --------------------------------------------------------------------------------
   function privFileDescrExpand(&$p_filedescr_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Create a result list
     $v_result_list = array();
     
     // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+    for ($i = 0; $i < sizeof($p_filedescr_list); $i++) {
       
       // ----- Get filedescr
       $v_descr = $p_filedescr_list[$i];
@@ -2131,7 +2131,7 @@ 
   // --------------------------------------------------------------------------------
   function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
     
     // ----- Magic quotes trick
@@ -2166,7 +2166,7 @@ 
   // --------------------------------------------------------------------------------
   function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Look if the archive exists or is empty
@@ -2183,7 +2183,7 @@ 
     $this->privDisableMagicQuotes();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Magic quotes trick
       $this->privSwapBackMagicQuotes();
@@ -2264,7 +2264,7 @@ 
     }
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2297,10 +2297,10 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    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);
@@ -2345,7 +2345,7 @@ 
   // --------------------------------------------------------------------------------
   function privOpenFd($p_mode)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if already open
     if ($this->zip_fd != 0)
@@ -2379,7 +2379,7 @@ 
   // --------------------------------------------------------------------------------
   function privCloseFd()
   {
-    $v_result=1;
+    $v_result = 1;
 
     if ($this->zip_fd != 0)
       @fclose($this->zip_fd);
@@ -2406,7 +2406,7 @@ 
 //  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)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Add the files
     $v_header_list = array();
@@ -2420,7 +2420,7 @@ 
     $v_offset = @ftell($this->zip_fd);
 
     // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+    for ($i = 0, $v_count = 0; $i < sizeof($v_header_list); $i++)
     {
       // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
@@ -2442,7 +2442,7 @@ 
     }
 
     // ----- Calculate the size of the central header
-    $v_size = @ftell($this->zip_fd)-$v_offset;
+    $v_size = @ftell($this->zip_fd) - $v_offset;
 
     // ----- Create the central dir footer
     if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
@@ -2470,14 +2470,14 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = sizeof($p_result_list);
 
     // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+    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);
@@ -2490,7 +2490,7 @@ 
       }
 
       // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
+      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();
@@ -2500,10 +2500,10 @@ 
       // 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_filedescr_list[$j]['type'] == 'folder')
+              && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
                   || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
           ) {
 
@@ -2532,7 +2532,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2577,13 +2577,13 @@ 
     $p_header['index'] = -1;
 
     // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
+    if ($p_filedescr['type'] == 'file') {
       $p_header['external'] = 0x00000000;
       $p_header['size'] = filesize($p_filename);
     }
     
     // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
+    else if ($p_filedescr['type'] == 'folder') {
       $p_header['external'] = 0x00000010;
       $p_header['mtime'] = filemtime($p_filename);
       $p_header['size'] = filesize($p_filename);
@@ -2658,10 +2658,10 @@ 
       // ----- 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])) 
+        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'])) ) ) {
+                    && ($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) {
             return $v_result;
@@ -2761,7 +2761,7 @@ 
         // ----- Set the file properties
         $p_header['size'] = 0;
         //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+        $p_header['external'] = 0x00000010; // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
@@ -2805,7 +2805,7 @@ 
   // --------------------------------------------------------------------------------
   function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
   {
-    $v_result=PCLZIP_ERR_NO_ERROR;
+    $v_result = PCLZIP_ERR_NO_ERROR;
     
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2859,7 +2859,7 @@ 
     $v_data_header['os'] = bin2hex($v_data_header['os']);
 
     // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+    @fseek($v_file_compressed, filesize($v_gzip_temp_name) - 8);
     $v_binary_data = @fread($v_file_compressed, 8);
     $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
 
@@ -2867,7 +2867,7 @@ 
     $p_header['compression'] = ord($v_data_header['cm']);
     //$p_header['mtime'] = $v_data_header['mtime'];
     $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+    $p_header['compressed_size'] = filesize($v_gzip_temp_name) - 18;
 
     // ----- Close the file
     @fclose($v_file_compressed);
@@ -2917,7 +2917,7 @@ 
   // --------------------------------------------------------------------------------
   function privCalculateStoredFilename(&$p_filedescr, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     
     // ----- Working variables
     $p_filename = $p_filedescr['filename'];
@@ -2974,14 +2974,14 @@ 
         if (substr($p_remove_dir, -1) != '/')
           $p_remove_dir .= "/";
 
-        if (   (substr($p_filename, 0, 2) == "./")
+        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);
           }
@@ -3029,15 +3029,15 @@ 
   // --------------------------------------------------------------------------------
   function privWriteFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Store the offset position of the file
     $p_header['offset'] = ftell($this->zip_fd);
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
@@ -3074,7 +3074,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -3082,8 +3082,8 @@ 
 
     // ----- Transform UNIX mtime to DOS format mdate/mtime
     $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+    $v_mtime = ($v_date['hours'] << 11) + ($v_date['minutes'] << 5) + $v_date['seconds'] / 2;
+    $v_mdate = (($v_date['year'] - 1980) << 9) + ($v_date['mon'] << 5) + $v_date['mday'];
 
 
     // ----- Packed data
@@ -3127,7 +3127,7 @@ 
   // --------------------------------------------------------------------------------
   function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Packed data
     $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
@@ -3156,7 +3156,7 @@ 
   // --------------------------------------------------------------------------------
   function privList(&$p_list)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
@@ -3196,7 +3196,7 @@ 
     }
 
     // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0; $i < $v_central_dir['entries']; $i++)
     {
       // ----- Read the file header
       if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
@@ -3243,7 +3243,7 @@ 
   // --------------------------------------------------------------------------------
   function privConvertHeader2FileInfo($p_header, &$p_info)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Get the interesting attributes
     $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
@@ -3254,7 +3254,7 @@ 
     $p_info['compressed_size'] = $p_header['compressed_size'];
     $p_info['mtime'] = $p_header['mtime'];
     $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+    $p_info['folder'] = (($p_header['external'] & 0x00000010) == 0x00000010);
     $p_info['index'] = $p_header['index'];
     $p_info['status'] = $p_header['status'];
     $p_info['crc'] = $p_header['crc'];
@@ -3282,16 +3282,16 @@ 
   // --------------------------------------------------------------------------------
   function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
 
     // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
+    if (($p_path == "")
+	    || ((substr($p_path, 0, 1) != "/")
 		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
+			&& (substr($p_path, 1, 2) != ":/")))
       $p_path = "./".$p_path;
 
     // ----- Reduce the path last (and duplicated) '/'
@@ -3300,7 +3300,7 @@ 
       // ----- Look for the path end '/'
       while (substr($p_path, -1) == "/")
       {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
+        $p_path = substr($p_path, 0, strlen($p_path) - 1);
       }
     }
 
@@ -3334,7 +3334,7 @@ 
 
     // ----- Read each entry
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read next Central dir entry
@@ -3373,17 +3373,17 @@ 
       $v_extract = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      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++) {
+          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 if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                  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;
                   }
@@ -3408,7 +3408,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      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'])) {
@@ -3417,20 +3417,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      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++) {
+          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'])) {
+              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]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -3442,14 +3442,14 @@ 
       }
 
 	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
+	  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)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
               
@@ -3467,8 +3467,8 @@ 
           $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)) {
+          if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
               $this->privSwapBackMagicQuotes();
 
@@ -3549,7 +3549,7 @@ 
           }
         }
         // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_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);
@@ -3622,7 +3622,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1)
@@ -3640,7 +3640,7 @@ 
     // ----- Look for all path to remove
     if ($p_remove_all_path == true) {
         // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
+        if (($p_entry['external'] & 0x00000010) == 0x00000010) {
 
             $p_entry['status'] = "filtered";
 
@@ -3742,8 +3742,8 @@ 
         // ----- 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)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
 			                     "Filename '".$p_entry['filename']."' is "
@@ -3762,8 +3762,8 @@ 
         // ----- 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)) {
+        if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
             PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
 			                     "Filename '".$p_entry['filename']."' exists "
@@ -3777,8 +3777,8 @@ 
       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)) {
+        if ((isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER] === true)) {
 	  	  }
 		    else {
             $p_entry['status'] = "newer_exist";
@@ -3786,8 +3786,8 @@ 
             // ----- 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)) {
+            if ((isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR] === true)) {
 
                 PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
 			             "Newer version of '".$p_entry['filename']."' exists "
@@ -3803,14 +3803,14 @@ 
 
     // ----- 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'], "/"))
         $v_dir_to_check = "";
       else
         $v_dir_to_check = dirname($p_entry['filename']);
 
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+        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";
@@ -3826,7 +3826,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010))
       {
         // ----- Look for not compressed file
         if ($p_entry['compression'] == 0) {
@@ -3875,10 +3875,10 @@ 
 
 
           // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+          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'])) ) ) {
+                      && ($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;
@@ -3973,7 +3973,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileUsingTempFile(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
         
     // ----- Creates a temporary file
     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
@@ -4049,7 +4049,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileInOutput(&$p_entry, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
@@ -4098,7 +4098,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
         if ($p_entry['compressed_size'] == $p_entry['size']) {
 
@@ -4161,7 +4161,7 @@ 
   // --------------------------------------------------------------------------------
   function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the file header
     $v_header = array();
@@ -4212,7 +4212,7 @@ 
     if ($p_entry['status'] == 'ok') {
 
       // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+      if (!(($p_entry['external'] & 0x00000010) == 0x00000010)) {
         // ----- Look for not compressed file
   //      if ($p_entry['compressed_size'] == $p_entry['size'])
         if ($p_entry['compression'] == 0) {
@@ -4284,7 +4284,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4348,7 +4348,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4387,7 +4387,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadCentralFileHeader(&$p_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->zip_fd, 4);
@@ -4451,7 +4451,7 @@ 
       // ----- Extract time
       $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
       $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+      $v_seconde = ($p_header['mtime'] & 0x001F) * 2;
 
       // ----- Extract date
       $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
@@ -4495,7 +4495,7 @@ 
   // --------------------------------------------------------------------------------
   function privCheckFileHeaders(&$p_local_header, &$p_central_header)
   {
-    $v_result=1;
+    $v_result = 1;
 
   	// ----- Check the static values
   	// TBC
@@ -4532,7 +4532,7 @@ 
   // --------------------------------------------------------------------------------
   function privReadEndCentralDir(&$p_central_dir)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->zipname);
@@ -4550,8 +4550,8 @@ 
     // 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.'\'');
@@ -4577,8 +4577,8 @@ 
       $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.'\'');
@@ -4599,7 +4599,7 @@ 
         //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
         // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
         // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
+        $v_bytes = (($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
 
         // ----- Compare the bytes
         if ($v_bytes == 0x504b0506)
@@ -4689,11 +4689,11 @@ 
   // --------------------------------------------------------------------------------
   function privDeleteByRule(&$p_result_list, &$p_options)
   {
-    $v_result=1;
+    $v_result = 1;
     $v_list_detail = array();
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -4729,7 +4729,7 @@ 
     // ----- Read each entry
     $v_header_list = array();
     $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    for ($i = 0, $v_nb_extracted = 0; $i < $v_central_dir['entries']; $i++)
     {
 
       // ----- Read the file header
@@ -4750,21 +4750,21 @@ 
       $v_found = false;
 
       // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+      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++) {
+          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 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]))
+                  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 */
+                  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;
                   }
@@ -4789,7 +4789,7 @@ 
       */
 
       // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+      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'])) {
@@ -4798,20 +4798,20 @@ 
       }
 
       // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+      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++) {
+          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'])) {
+              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]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -4849,11 +4849,11 @@ 
         }
 
         // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
 
             // ----- Calculate the position of the header
             @rewind($this->zip_fd);
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+            if (@fseek($this->zip_fd, $v_header_list[$i]['offset'])) {
                 // ----- Close the zip file
                 $this->privCloseFd();
                 $v_temp_zip->privCloseFd();
@@ -4912,7 +4912,7 @@ 
         $v_offset = @ftell($v_temp_zip->zip_fd);
 
         // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
+        for ($i = 0; $i < sizeof($v_header_list); $i++) {
             // ----- Create the file header
             if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
                 $v_temp_zip->privCloseFd();
@@ -4935,7 +4935,7 @@ 
         }
 
         // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+        $v_size = @ftell($v_temp_zip->zip_fd) - $v_offset;
 
         // ----- Create the central dir footer
         if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
@@ -4997,15 +4997,15 @@ 
   //    1 : OK
   //   -1 : Unable to create directory
   // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
+  function privDirCheck($p_dir, $p_is_dir = false)
   {
     $v_result = 1;
 
 
     // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    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
@@ -5054,7 +5054,7 @@ 
   // --------------------------------------------------------------------------------
   function privMerge(&$p_archive_to_add)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the archive_to_add exists
     if (!is_file($p_archive_to_add->zipname))
@@ -5079,7 +5079,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
+    if (($v_result = $this->privOpenFd('rb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5097,7 +5097,7 @@ 
     @rewind($this->zip_fd);
 
     // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+    if (($v_result = $p_archive_to_add->privOpenFd('rb')) != 1)
     {
       $this->privCloseFd();
 
@@ -5181,7 +5181,7 @@ 
     $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
 
     // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+    $v_size = @ftell($v_zip_temp_fd) - $v_offset;
 
     // ----- Swap the file descriptor
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
@@ -5191,7 +5191,7 @@ 
     $v_zip_temp_fd = $v_swap;
 
     // ----- 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)
+    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();
@@ -5239,7 +5239,7 @@ 
   // --------------------------------------------------------------------------------
   function privDuplicate($p_archive_filename)
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if the $p_archive_filename exists
     if (!is_file($p_archive_filename))
@@ -5253,7 +5253,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
+    if (($v_result = $this->privOpenFd('wb')) != 1)
     {
       // ----- Return
       return $v_result;
@@ -5297,7 +5297,7 @@ 
   // Description :
   // Parameters :
   // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
+  function privErrorLog($p_error_code = 0, $p_error_string = '')
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
@@ -5334,10 +5334,10 @@ 
   // --------------------------------------------------------------------------------
   function privDisableMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
+    if ((!function_exists("get_magic_quotes_runtime"))
 	    || (!function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
@@ -5368,10 +5368,10 @@ 
   // --------------------------------------------------------------------------------
   function privSwapBackMagicQuotes()
   {
-    $v_result=1;
+    $v_result = 1;
 
     // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
+    if ((!function_exists("get_magic_quotes_runtime"))
 	    || (!function_exists("set_magic_quotes_runtime"))) {
       return $v_result;
 	}
@@ -5412,7 +5412,7 @@ 
 
       // ----- Study directories from last to first
       $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+      for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
         // ----- Look for current path
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
@@ -5433,7 +5433,7 @@ 
 		    }
 		  }
 		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
+		  else if ($i == (sizeof($v_list) - 1)) {
             $v_result = $v_list[$i];
 		  }
 		  // ----- Double '/' inside the path
@@ -5448,7 +5448,7 @@ 
 		    $v_skip--;
 		  }
 		  else {
-            $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
+            $v_result = $v_list[$i].($i != (sizeof($v_list) - 1) ? "/".$v_result : "");
 		  }
         }
       }
@@ -5487,12 +5487,12 @@ 
     $v_result = 1;
     
     // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+    if (($p_dir == '.')
+        || ((strlen($p_dir) >= 2) && (substr($p_dir, 0, 2) == './'))) {
       $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
     }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+    if (($p_path == '.')
+        || ((strlen($p_path) >= 2) && (substr($p_path, 0, 2) == './'))) {
       $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
     }
 
@@ -5518,7 +5518,7 @@ 
       }
 
       // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ($v_list_path[$j] != '')) {
         $v_result = 0;
       }
 
@@ -5559,11 +5559,11 @@ 
   //             3 : src & dest gzip
   // Return Values :
   // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
   {
     $v_result = 1;
 
-    if ($p_mode==0)
+    if ($p_mode == 0)
     {
       while ($p_size != 0)
       {
@@ -5573,7 +5573,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==1)
+    else if ($p_mode == 1)
     {
       while ($p_size != 0)
       {
@@ -5583,7 +5583,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==2)
+    else if ($p_mode == 2)
     {
       while ($p_size != 0)
       {
@@ -5593,7 +5593,7 @@ 
         $p_size -= $v_read_size;
       }
     }
-    else if ($p_mode==3)
+    else if ($p_mode == 3)
     {
       while ($p_size != 0)
       {
@@ -5657,7 +5657,7 @@ 
     $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')
+	    if ((($v_prefix == 'PCLZIP_OPT')
            || ($v_prefix == 'PCLZIP_CB_')
            || ($v_prefix == 'PCLZIP_ATT'))
 	        && ($v_list[$v_key] == $p_option)) {
@@ -5682,15 +5682,15 @@ 
   // Return Values :
   //   The path translated.
   // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
+  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);
+          $p_path = substr($p_path, $v_position + 1);
       }
       // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
           $p_path = strtr($p_path, '\\', '/');
       }
     }

Braces +115 added lines, -158 removed lines

@@ -332,8 +332,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
 		                       "Invalid number / type of arguments");
           return 0;
@@ -382,8 +381,7 @@ 
       foreach ($v_string_list as $v_string) {
         if ($v_string != '') {
           $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
+        } else {
         }
       }
     }
@@ -517,8 +515,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -794,8 +791,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -939,8 +935,7 @@ 
         }
         if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
           $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
+        } else {
         }
       }
 
@@ -955,8 +950,7 @@ 
         // ----- Look for the optional second argument
         if ($v_size == 2) {
           $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
+        } else if ($v_size > 2) {
           // ----- Error log
           PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
 
@@ -1192,8 +1186,7 @@ 
         // ----- 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);
       }
@@ -1281,8 +1274,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorCode());
-    }
-    else {
+    } else {
       return($this->error_code);
     }
   }
@@ -1320,15 +1312,13 @@ 
 
     if (isset($v_name[$this->error_code])) {
       $v_value = $v_name[$this->error_code];
-    }
-    else {
+    } else {
       $v_value = 'NoName';
     }
 
     if ($p_with_code) {
       return($v_value.' ('.$this->error_code.')');
-    }
-    else {
+    } else {
       return($v_value);
     }
   }
@@ -1343,12 +1333,10 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       return(PclErrorString());
-    }
-    else {
+    } else {
       if ($p_full) {
         return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
+      } else {
         return($this->error_string." [code ".$this->error_code."]");
       }
     }
@@ -1533,8 +1521,7 @@ 
               && ($p_options_list[$i+1] != '')) {
             $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
             $i++;
-          }
-          else {
+          } else {
           }
         break;
 
@@ -1552,11 +1539,9 @@ 
           // ----- 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])) {
+          } else if (is_array($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1585,8 +1570,7 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1615,8 +1599,7 @@ 
           // ----- Get the value
           if (is_string($p_options_list[$i+1])) {
               $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
 			                     "Wrong parameter value for option '"
@@ -1649,14 +1632,11 @@ 
 
               // ----- Parse items
               $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($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])) {
+          } else if (is_array($p_options_list[$i+1])) {
               $v_work_list = $p_options_list[$i+1];
-          }
-          else {
+          } else {
             // ----- Error log
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1683,13 +1663,11 @@ 
                   // ----- 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) {
+              } 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 {
+              } else {
                   // ----- Error log
                   PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -1845,14 +1823,17 @@ 
     $v_memory_limit = trim($v_memory_limit);
     $last = strtolower(substr($v_memory_limit, -1));
  
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+    if($last == 'g') {
+            //$v_memory_limit = $v_memory_limit*1024*1024*1024;
         $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
+    }
+    if($last == 'm') {
+            //$v_memory_limit = $v_memory_limit*1024*1024;
         $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
+    }
+    if($last == 'k') {
+            $v_memory_limit = $v_memory_limit*1024;
+    }
             
     $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
     
@@ -2025,15 +2006,12 @@ 
       if (file_exists($v_descr['filename'])) {
         if (@is_file($v_descr['filename'])) {
           $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
+        } else if (@is_dir($v_descr['filename'])) {
           $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
+        } else if (@is_link($v_descr['filename'])) {
           // skip
           continue;
-        }
-        else {
+        } else {
           // skip
           continue;
         }
@@ -2082,8 +2060,7 @@ 
                  && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
               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;
               }
             }
@@ -2092,8 +2069,7 @@ 
           }
           
           @closedir($v_folder_handler);
-        }
-        else {
+        } else {
           // TBC : unable to open folder in read mode
         }
         
@@ -2106,8 +2082,7 @@ 
           
           // ----- Concat the resulting list
           $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
+        } else {
         }
           
         // ----- Free local array
@@ -2381,8 +2356,9 @@ 
   {
     $v_result=1;
 
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
+    if ($this->zip_fd != 0) {
+          @fclose($this->zip_fd);
+    }
     $this->zip_fd = 0;
 
     // ----- Return
@@ -2599,11 +2575,9 @@ 
     // ----- Look for filetime
     if (isset($p_filedescr['mtime'])) {
       $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
+    } else if ($p_filedescr['type'] == 'virtual_file') {
       $p_header['mtime'] = time();
-    }
-    else {
+    } else {
       $p_header['mtime'] = filemtime($p_filename);
     }
 
@@ -2611,8 +2585,7 @@ 
     if (isset($p_filedescr['comment'])) {
       $p_header['comment_len'] = strlen($p_filedescr['comment']);
       $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
+    } else {
       $p_header['comment_len'] = 0;
       $p_header['comment'] = '';
     }
@@ -2923,20 +2896,17 @@ 
     $p_filename = $p_filedescr['filename'];
     if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
       $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
+    } else {
       $p_add_dir = '';
     }
     if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
       $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
+    } else {
       $p_remove_dir = '';
     }
     if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
       $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
+    } else {
       $p_remove_all_dir = 0;
     }
 
@@ -2959,8 +2929,7 @@ 
           $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;
       }
@@ -2971,8 +2940,9 @@ 
       }
       // ----- Look for partial path remove
       else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
+        if (substr($p_remove_dir, -1) != '/') {
+                  $p_remove_dir .= "/";
+        }
 
         if (   (substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
@@ -2992,8 +2962,7 @@ 
         if ($v_compare > 0) {
           if ($v_compare == 2) {
             $v_stored_filename = "";
-          }
-          else {
+          } else {
             $v_stored_filename = substr($v_stored_filename,
                                         strlen($p_remove_dir));
           }
@@ -3005,10 +2974,11 @@ 
       
       // ----- Look for path to add
       if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        if (substr($p_add_dir, -1) == "/") {
+                  $v_stored_filename = $p_add_dir.$v_stored_filename;
+        } else {
+                  $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+        }
       }
     }
 
@@ -3291,8 +3261,9 @@ 
     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,1,2)!=":/"))) {
+          $p_path = "./".$p_path;
+    }
 
     // ----- Reduce the path last (and duplicated) '/'
     if (($p_path != "./") && ($p_path != "/"))
@@ -3779,8 +3750,7 @@ 
         // ----- Change the file status
         if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
 		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
+	  	  } else {
             $p_entry['status'] = "newer_exist";
 
             // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
@@ -3796,19 +3766,19 @@ 
                 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) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
+      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/')) {
+              $v_dir_to_check = $p_entry['filename'];
+      } else if (!strstr($p_entry['filename'], "/")) {
+              $v_dir_to_check = "";
+      } else {
+              $v_dir_to_check = dirname($p_entry['filename']);
+      }
 
         if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
   
@@ -3864,8 +3834,7 @@ 
           touch($p_entry['filename'], $p_entry['mtime']);
           
 
-        }
-        else {
+        } else {
           // ----- TBC
           // Need to be finished
           if (($p_entry['flag'] & 1) == 1) {
@@ -4108,8 +4077,7 @@ 
           // ----- Send the file to the output
           echo $v_buffer;
           unset($v_buffer);
-        }
-        else {
+        } else {
 
           // ----- Read the compressed file in a buffer (one shot)
           $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4219,8 +4187,7 @@ 
   
           // ----- Reading the file
           $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-        }
-        else {
+        } else {
   
           // ----- Reading the file
           $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
@@ -4232,8 +4199,7 @@ 
         }
   
         // ----- Trace
-      }
-      else {
+      } else {
           // TBC : error : can not extract a folder in a string
       }
       
@@ -4326,8 +4292,7 @@ 
     // ----- Get extra_fields
     if ($v_data['extra_len'] != 0) {
       $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-    }
-    else {
+    } else {
       $p_header['extra'] = '';
     }
 
@@ -4358,8 +4323,7 @@ 
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
+    } else
     {
       $p_header['mtime'] = time();
     }
@@ -4424,22 +4388,25 @@ 
     $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
 
     // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
+    if ($p_header['filename_len'] != 0) {
+          $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+    } else {
+          $p_header['filename'] = '';
+    }
 
     // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
+    if ($p_header['extra_len'] != 0) {
+          $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+    } else {
+          $p_header['extra'] = '';
+    }
 
     // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
+    if ($p_header['comment_len'] != 0) {
+          $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+    } else {
+          $p_header['comment'] = '';
+    }
 
     // ----- Extract properties
 
@@ -4461,8 +4428,7 @@ 
       // ----- Get UNIX date format
       $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
 
-    }
-    else
+    } else
     {
       $p_header['mtime'] = time();
     }
@@ -4575,8 +4541,9 @@ 
     // ----- 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 = $v_size;
+      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))
       {
@@ -4661,9 +4628,9 @@ 
     // ----- Get comment
     if ($v_data['comment_size'] != 0) {
       $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+    } else {
+          $p_central_dir['comment'] = '';
     }
-    else
-      $p_central_dir['comment'] = '';
 
     $p_central_dir['entries'] = $v_data['entries'];
     $p_central_dir['disk_entries'] = $v_data['disk_entries'];
@@ -4763,8 +4730,7 @@ 
                   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 */
+                  } 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;
                   }
@@ -4815,8 +4781,7 @@ 
                   break;
               }
           }
-      }
-      else {
+      } else {
       	$v_found = true;
       }
 
@@ -4824,8 +4789,7 @@ 
       if ($v_found)
       {
         unset($v_header_list[$v_nb_extracted]);
-      }
-      else
+      } else
       {
         $v_nb_extracted++;
       }
@@ -5301,8 +5265,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclError($p_error_code, $p_error_string);
-    }
-    else {
+    } else {
       $this->error_code = $p_error_code;
       $this->error_string = $p_error_string;
     }
@@ -5318,8 +5281,7 @@ 
   {
     if (PCLZIP_ERROR_EXTERNAL == 1) {
       PclErrorReset();
-    }
-    else {
+    } else {
       $this->error_code = 0;
       $this->error_string = '';
     }
@@ -5417,11 +5379,9 @@ 
         if ($v_list[$i] == ".") {
           // ----- Ignore this directory
           // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
+        } else if ($v_list[$i] == "..") {
 		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
+        } else if ($v_list[$i] == "") {
 		  // ----- First '/' i.e. root slash
 		  if ($i == 0) {
             $v_result = "/".$v_result;
@@ -5441,13 +5401,11 @@ 
             // ----- Ignore only the double '//' in path,
             // but not the first and last '/'
 		  }
-        }
-        else {
+        } else {
 		  // ----- Look for item to skip
 		  if ($v_skip > 0) {
 		    $v_skip--;
-		  }
-		  else {
+		  } else {
             $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
 		  }
         }
@@ -5530,14 +5488,17 @@ 
     // ----- 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++;
+      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)) {
         // ----- 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;
       }
@@ -5572,8 +5533,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==1)
+    } else if ($p_mode==1)
     {
       while ($p_size != 0)
       {
@@ -5582,8 +5542,7 @@ 
         @fwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==2)
+    } else if ($p_mode==2)
     {
       while ($p_size != 0)
       {
@@ -5592,8 +5551,7 @@ 
         @gzwrite($p_dest, $v_buffer, $v_read_size);
         $p_size -= $v_read_size;
       }
-    }
-    else if ($p_mode==3)
+    } else if ($p_mode==3)
     {
       while ($p_size != 0)
       {
@@ -5631,8 +5589,7 @@ 
       // ----- 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;
       }
     }

ecrire/inc/prepare_recherche.php

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
  * @param string $primary
  * @param array $rows
  * @param string $serveur
- * @return array
+ * @return string[]
  */
 function generer_select_where_explicites($table, $primary, $rows, $serveur){
 	# calculer le {id_article IN()} et le {... as points}

Indentation +94 added lines, -94 removed lines

@@ -41,87 +41,87 @@ 
  * @return array
  */
 function inc_prepare_recherche_dist($recherche, $table='articles', $cond=false, $serveur='', $modificateurs = array(), $primary='') {
-	static $cache = array();
-	$delai_fraicheur = min(_DELAI_CACHE_resultats,time()-$GLOBALS['meta']['derniere_modif']);
+    static $cache = array();
+    $delai_fraicheur = min(_DELAI_CACHE_resultats,time()-$GLOBALS['meta']['derniere_modif']);
 
-	// si recherche n'est pas dans le contexte, on va prendre en globals
-	// ca permet de faire des inclure simple.
-	if (!isset($recherche) AND isset($GLOBALS['recherche']))
-		$recherche = $GLOBALS['recherche'];
+    // si recherche n'est pas dans le contexte, on va prendre en globals
+    // ca permet de faire des inclure simple.
+    if (!isset($recherche) AND isset($GLOBALS['recherche']))
+        $recherche = $GLOBALS['recherche'];
 
-	// traiter le cas {recherche?}
-	if ($cond AND !strlen($recherche))
-		return array("0 as points" /* as points */, /* where */ '');
+    // traiter le cas {recherche?}
+    if ($cond AND !strlen($recherche))
+        return array("0 as points" /* as points */, /* where */ '');
 		
 	
-	$rechercher = false;
-
-	if (!isset($cache[$serveur][$table][$recherche])){
-		$hash_serv = ($serveur?substr(md5($serveur),0,16):'');
-		$hash = substr(md5($recherche . $table),0,16);
-		$where = "(resultats.recherche='$hash' AND resultats.table_objet=".sql_quote($table)." AND resultats.serveur='$hash_serv')";
-		$row = sql_fetsel('UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(resultats.maj) AS fraicheur','spip_resultats AS resultats',$where,'','fraicheur DESC','0,1');
-		if (!$row
-		  OR ($row['fraicheur']>$delai_fraicheur)
-		  OR (defined('_VAR_MODE') AND _VAR_MODE=='recalcul')){
-		 	$rechercher = true;
-		}
-	}
-
-	// si on n'a pas encore traite les donnees dans une boucle precedente
-	if ($rechercher) {
-		//$tables = liste_des_champs();
-		$x = objet_type($table);
-		$points = recherche_en_base($recherche,
-			$x,
-			array(
-				'score' => true,
-				'toutvoir' => true,
-				'jointures' => true
-				),
-			$serveur);
-		// pas de résultat, pas de point
-		$points = isset($points[$x]) ? $points[$x] : array();
-
-		// permettre aux plugins de modifier le resultat
-		$points = pipeline('prepare_recherche',array(
-			'args'=>array('type'=>$x,'recherche'=>$recherche,'serveur'=>$serveur,'modificateurs'=>$modificateurs),
-			'data'=>$points
-		));
-
-		// supprimer les anciens resultats de cette recherche
-		// et les resultats trop vieux avec une marge
-		// pas de AS resultats dans un delete (mysql)
-		$whered = str_replace(array("resultats.recherche","resultats.table_objet","resultats.serveur"),array("recherche","table_objet","serveur"),$where);
-		sql_delete('spip_resultats', 'NOT(' .sql_date_proche('maj', (0-($delai_fraicheur+100)), " SECOND") . ") OR ($whered)");
-
-		// inserer les resultats dans la table de cache des resultats
-		if (count($points)){
-			$tab_couples = array();
-			foreach ($points as $id => $p){
-				$tab_couples[] = array(
-					'recherche' => $hash,
-					'id' => $id,
-					'points' => $p['score'],
-					'table_objet' => $table,
-					'serveur' => $hash_serv,
-				);
-			}
-			sql_insertq_multi('spip_resultats',$tab_couples,array());
-		}
-	}
-
-	if (!isset($cache[$serveur][$table][$recherche])){
-		if (!$serveur)
-			$cache[$serveur][$table][$recherche] = array("resultats.points AS points",$where);
-		else {
-			if (sql_countsel('spip_resultats as resultats',$where))
-			$rows = sql_allfetsel('resultats.id,resultats.points','spip_resultats as resultats',$where);
-			$cache[$serveur][$table][$recherche] = generer_select_where_explicites($table, $primary, $rows, $serveur);
-		}
-	}
-
-	return $cache[$serveur][$table][$recherche];
+    $rechercher = false;
+
+    if (!isset($cache[$serveur][$table][$recherche])){
+        $hash_serv = ($serveur?substr(md5($serveur),0,16):'');
+        $hash = substr(md5($recherche . $table),0,16);
+        $where = "(resultats.recherche='$hash' AND resultats.table_objet=".sql_quote($table)." AND resultats.serveur='$hash_serv')";
+        $row = sql_fetsel('UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(resultats.maj) AS fraicheur','spip_resultats AS resultats',$where,'','fraicheur DESC','0,1');
+        if (!$row
+          OR ($row['fraicheur']>$delai_fraicheur)
+          OR (defined('_VAR_MODE') AND _VAR_MODE=='recalcul')){
+                $rechercher = true;
+        }
+    }
+
+    // si on n'a pas encore traite les donnees dans une boucle precedente
+    if ($rechercher) {
+        //$tables = liste_des_champs();
+        $x = objet_type($table);
+        $points = recherche_en_base($recherche,
+            $x,
+            array(
+                'score' => true,
+                'toutvoir' => true,
+                'jointures' => true
+                ),
+            $serveur);
+        // pas de résultat, pas de point
+        $points = isset($points[$x]) ? $points[$x] : array();
+
+        // permettre aux plugins de modifier le resultat
+        $points = pipeline('prepare_recherche',array(
+            'args'=>array('type'=>$x,'recherche'=>$recherche,'serveur'=>$serveur,'modificateurs'=>$modificateurs),
+            'data'=>$points
+        ));
+
+        // supprimer les anciens resultats de cette recherche
+        // et les resultats trop vieux avec une marge
+        // pas de AS resultats dans un delete (mysql)
+        $whered = str_replace(array("resultats.recherche","resultats.table_objet","resultats.serveur"),array("recherche","table_objet","serveur"),$where);
+        sql_delete('spip_resultats', 'NOT(' .sql_date_proche('maj', (0-($delai_fraicheur+100)), " SECOND") . ") OR ($whered)");
+
+        // inserer les resultats dans la table de cache des resultats
+        if (count($points)){
+            $tab_couples = array();
+            foreach ($points as $id => $p){
+                $tab_couples[] = array(
+                    'recherche' => $hash,
+                    'id' => $id,
+                    'points' => $p['score'],
+                    'table_objet' => $table,
+                    'serveur' => $hash_serv,
+                );
+            }
+            sql_insertq_multi('spip_resultats',$tab_couples,array());
+        }
+    }
+
+    if (!isset($cache[$serveur][$table][$recherche])){
+        if (!$serveur)
+            $cache[$serveur][$table][$recherche] = array("resultats.points AS points",$where);
+        else {
+            if (sql_countsel('spip_resultats as resultats',$where))
+            $rows = sql_allfetsel('resultats.id,resultats.points','spip_resultats as resultats',$where);
+            $cache[$serveur][$table][$recherche] = generer_select_where_explicites($table, $primary, $rows, $serveur);
+        }
+    }
+
+    return $cache[$serveur][$table][$recherche];
 }
 
 
@@ -137,23 +137,23 @@ 
  * @return array
  */
 function generer_select_where_explicites($table, $primary, $rows, $serveur){
-	# calculer le {id_article IN()} et le {... as points}
-	if (!count($rows)){
-		return array("''", "0=1");
-	}
-	else {
-		$listes_ids = array();
-		$select = '0';
-		foreach ($rows as $r)
-			$listes_ids[$r['points']][] = $r['id'];
-
-		foreach ($listes_ids as $p => $ids)
-			$select .= "+$p*(".
-			           sql_in("$table.$primary", $ids,'',$serveur)
-			           .") ";
-
-		return array("$select AS points ",calcul_mysql_in("$table.$primary",array_map('reset',$rows),'',$serveur));
-	}
+    # calculer le {id_article IN()} et le {... as points}
+    if (!count($rows)){
+        return array("''", "0=1");
+    }
+    else {
+        $listes_ids = array();
+        $select = '0';
+        foreach ($rows as $r)
+            $listes_ids[$r['points']][] = $r['id'];
+
+        foreach ($listes_ids as $p => $ids)
+            $select .= "+$p*(".
+                        sql_in("$table.$primary", $ids,'',$serveur)
+                        .") ";
+
+        return array("$select AS points ",calcul_mysql_in("$table.$primary",array_map('reset',$rows),'',$serveur));
+    }
 }
 
 

Braces +25 added lines, -17 removed lines

@@ -11,10 +11,14 @@ 
 \***************************************************************************/
 
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 include_spip('inc/rechercher');
-if (!defined('_DELAI_CACHE_resultats')) define('_DELAI_CACHE_resultats', 600);
+if (!defined('_DELAI_CACHE_resultats')) {
+    define('_DELAI_CACHE_resultats', 600);
+}
 
 /**
  * Preparer les listes id_article IN (...) pour les parties WHERE
@@ -46,12 +50,14 @@ 
 
 	// si recherche n'est pas dans le contexte, on va prendre en globals
 	// ca permet de faire des inclure simple.
-	if (!isset($recherche) AND isset($GLOBALS['recherche']))
-		$recherche = $GLOBALS['recherche'];
+	if (!isset($recherche) AND isset($GLOBALS['recherche'])) {
+			$recherche = $GLOBALS['recherche'];
+	}
 
 	// traiter le cas {recherche?}
-	if ($cond AND !strlen($recherche))
-		return array("0 as points" /* as points */, /* where */ '');
+	if ($cond AND !strlen($recherche)) {
+			return array("0 as points" /* as points */, /* where */ '');
+	}
 		
 	
 	$rechercher = false;
@@ -112,11 +118,12 @@ 
 	}
 
 	if (!isset($cache[$serveur][$table][$recherche])){
-		if (!$serveur)
-			$cache[$serveur][$table][$recherche] = array("resultats.points AS points",$where);
-		else {
-			if (sql_countsel('spip_resultats as resultats',$where))
-			$rows = sql_allfetsel('resultats.id,resultats.points','spip_resultats as resultats',$where);
+		if (!$serveur) {
+					$cache[$serveur][$table][$recherche] = array("resultats.points AS points",$where);
+		} else {
+			if (sql_countsel('spip_resultats as resultats',$where)) {
+						$rows = sql_allfetsel('resultats.id,resultats.points','spip_resultats as resultats',$where);
+			}
 			$cache[$serveur][$table][$recherche] = generer_select_where_explicites($table, $primary, $rows, $serveur);
 		}
 	}
@@ -140,17 +147,18 @@ 
 	# calculer le {id_article IN()} et le {... as points}
 	if (!count($rows)){
 		return array("''", "0=1");
-	}
-	else {
+	} else {
 		$listes_ids = array();
 		$select = '0';
-		foreach ($rows as $r)
-			$listes_ids[$r['points']][] = $r['id'];
+		foreach ($rows as $r) {
+					$listes_ids[$r['points']][] = $r['id'];
+		}
 
-		foreach ($listes_ids as $p => $ids)
-			$select .= "+$p*(".
+		foreach ($listes_ids as $p => $ids) {
+					$select .= "+$p*(".
 			           sql_in("$table.$primary", $ids,'',$serveur)
 			           .") ";
+		}
 
 		return array("$select AS points ",calcul_mysql_in("$table.$primary",array_map('reset',$rows),'',$serveur));
 	}

Spacing +23 added lines, -23 removed lines

@@ -40,9 +40,9 @@ 
  *    cle primaire de la table de recherche
  * @return array
  */
-function inc_prepare_recherche_dist($recherche, $table='articles', $cond=false, $serveur='', $modificateurs = array(), $primary='') {
+function inc_prepare_recherche_dist($recherche, $table = 'articles', $cond = false, $serveur = '', $modificateurs = array(), $primary = '') {
 	static $cache = array();
-	$delai_fraicheur = min(_DELAI_CACHE_resultats,time()-$GLOBALS['meta']['derniere_modif']);
+	$delai_fraicheur = min(_DELAI_CACHE_resultats, time() - $GLOBALS['meta']['derniere_modif']);
 
 	// si recherche n'est pas dans le contexte, on va prendre en globals
 	// ca permet de faire des inclure simple.
@@ -56,14 +56,14 @@ 
 	
 	$rechercher = false;
 
-	if (!isset($cache[$serveur][$table][$recherche])){
-		$hash_serv = ($serveur?substr(md5($serveur),0,16):'');
-		$hash = substr(md5($recherche . $table),0,16);
+	if (!isset($cache[$serveur][$table][$recherche])) {
+		$hash_serv = ($serveur ?substr(md5($serveur), 0, 16) : '');
+		$hash = substr(md5($recherche.$table), 0, 16);
 		$where = "(resultats.recherche='$hash' AND resultats.table_objet=".sql_quote($table)." AND resultats.serveur='$hash_serv')";
-		$row = sql_fetsel('UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(resultats.maj) AS fraicheur','spip_resultats AS resultats',$where,'','fraicheur DESC','0,1');
+		$row = sql_fetsel('UNIX_TIMESTAMP(NOW())-UNIX_TIMESTAMP(resultats.maj) AS fraicheur', 'spip_resultats AS resultats', $where, '', 'fraicheur DESC', '0,1');
 		if (!$row
-		  OR ($row['fraicheur']>$delai_fraicheur)
-		  OR (defined('_VAR_MODE') AND _VAR_MODE=='recalcul')){
+		  OR ($row['fraicheur'] > $delai_fraicheur)
+		  OR (defined('_VAR_MODE') AND _VAR_MODE == 'recalcul')) {
 		 	$rechercher = true;
 		}
 	}
@@ -84,21 +84,21 @@ 
 		$points = isset($points[$x]) ? $points[$x] : array();
 
 		// permettre aux plugins de modifier le resultat
-		$points = pipeline('prepare_recherche',array(
-			'args'=>array('type'=>$x,'recherche'=>$recherche,'serveur'=>$serveur,'modificateurs'=>$modificateurs),
+		$points = pipeline('prepare_recherche', array(
+			'args'=>array('type'=>$x, 'recherche'=>$recherche, 'serveur'=>$serveur, 'modificateurs'=>$modificateurs),
 			'data'=>$points
 		));
 
 		// supprimer les anciens resultats de cette recherche
 		// et les resultats trop vieux avec une marge
 		// pas de AS resultats dans un delete (mysql)
-		$whered = str_replace(array("resultats.recherche","resultats.table_objet","resultats.serveur"),array("recherche","table_objet","serveur"),$where);
-		sql_delete('spip_resultats', 'NOT(' .sql_date_proche('maj', (0-($delai_fraicheur+100)), " SECOND") . ") OR ($whered)");
+		$whered = str_replace(array("resultats.recherche", "resultats.table_objet", "resultats.serveur"), array("recherche", "table_objet", "serveur"), $where);
+		sql_delete('spip_resultats', 'NOT('.sql_date_proche('maj', (0 - ($delai_fraicheur + 100)), " SECOND").") OR ($whered)");
 
 		// inserer les resultats dans la table de cache des resultats
-		if (count($points)){
+		if (count($points)) {
 			$tab_couples = array();
-			foreach ($points as $id => $p){
+			foreach ($points as $id => $p) {
 				$tab_couples[] = array(
 					'recherche' => $hash,
 					'id' => $id,
@@ -107,16 +107,16 @@ 
 					'serveur' => $hash_serv,
 				);
 			}
-			sql_insertq_multi('spip_resultats',$tab_couples,array());
+			sql_insertq_multi('spip_resultats', $tab_couples, array());
 		}
 	}
 
-	if (!isset($cache[$serveur][$table][$recherche])){
+	if (!isset($cache[$serveur][$table][$recherche])) {
 		if (!$serveur)
-			$cache[$serveur][$table][$recherche] = array("resultats.points AS points",$where);
+			$cache[$serveur][$table][$recherche] = array("resultats.points AS points", $where);
 		else {
-			if (sql_countsel('spip_resultats as resultats',$where))
-			$rows = sql_allfetsel('resultats.id,resultats.points','spip_resultats as resultats',$where);
+			if (sql_countsel('spip_resultats as resultats', $where))
+			$rows = sql_allfetsel('resultats.id,resultats.points', 'spip_resultats as resultats', $where);
 			$cache[$serveur][$table][$recherche] = generer_select_where_explicites($table, $primary, $rows, $serveur);
 		}
 	}
@@ -136,9 +136,9 @@ 
  * @param string $serveur
  * @return array
  */
-function generer_select_where_explicites($table, $primary, $rows, $serveur){
+function generer_select_where_explicites($table, $primary, $rows, $serveur) {
 	# calculer le {id_article IN()} et le {... as points}
-	if (!count($rows)){
+	if (!count($rows)) {
 		return array("''", "0=1");
 	}
 	else {
@@ -149,10 +149,10 @@ 
 
 		foreach ($listes_ids as $p => $ids)
 			$select .= "+$p*(".
-			           sql_in("$table.$primary", $ids,'',$serveur)
+			           sql_in("$table.$primary", $ids, '', $serveur)
 			           .") ";
 
-		return array("$select AS points ",calcul_mysql_in("$table.$primary",array_map('reset',$rows),'',$serveur));
+		return array("$select AS points ", calcul_mysql_in("$table.$primary", array_map('reset', $rows), '', $serveur));
 	}
 }
 

ecrire/plugins/afficher_plugin.php

Doc Comments +7 added lines

@@ -101,6 +101,10 @@ 
 // checkbox pour activer ou desactiver
 // si ce n'est pas une extension
 
+/**
+ * @param integer $id_input
+ * @param string $file
+ */
 function plugin_checkbox($id_input, $file, $actif)
 {
 	$name = substr(md5($file),0,16);
@@ -162,6 +166,9 @@ 
 	. "</div>";
 }
 
+/**
+ * @param string $nom
+ */
 function plugin_desintalle($plug_file, $nom, $dir_plugins=null){
 	if (!$dir_plugins)
 		$dir_plugins = _DIR_PLUGINS;

Indentation +225 added lines, -225 removed lines

@@ -18,77 +18,77 @@ 
 // http://doc.spip.org/@ligne_plug
 function plugins_afficher_plugin_dist($url_page, $plug_file, $checked, $actif, $expose=false, $class_li="item", $dir_plugins=_DIR_PLUGINS) {
 
-	static $id_input = 0;
-	static $versions = array();
-
-	$force_reload = (_request('var_mode')=='recalcul');
-	$get_infos = charger_fonction('get_infos','plugins');
-	$info = $get_infos($plug_file, $force_reload, $dir_plugins);
-	$prefix = $info['prefix'];
-	$cfg = "";
-	$checkable = ($dir_plugins!==_DIR_PLUGINS_DIST);
-	$nom = plugin_nom($info,$dir_plugins,$plug_file);
-
-	if (!plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'],'spip')){
-		$info['slogan'] = _T('plugin_info_non_compatible_spip');
-		$erreur = http_img_pack("plugin-dis-32.png",_T('plugin_info_non_compatible_spip')," class='picto_err'",_T('plugin_info_non_compatible_spip'));
-		$class_li .= " disabled";
-		$checkable = false;
-	}
-	elseif (isset($info['erreur'])) {
-		$class_li .= " error";
-		$erreur = http_img_pack("plugin-err-32.png",_T('plugin_info_erreur_xml')," class='picto_err'",_T('plugin_info_erreur_xml'))
-		  . "<div class='erreur'>" . join('<br >', $info['erreur']) . "</div>";
-		$checkable = false;
-	}
-	elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])){
-		$class_li .= " error";
-		$erreur = http_img_pack("plugin-err-32.png",_T('plugin_impossible_activer', array('plugin' => $nom))," class='picto_err'",_T('plugin_impossible_activer', array('plugin' => $nom)))
-		  . "<div class='erreur'>" . implode("<br />",$GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file]) . "</div>";
-	}
-	else
-		$cfg = $actif ? plugin_bouton_config($plug_file,$info,$dir_plugins) : "";
-
-	// numerotons les occurrences d'un meme prefix
-	$versions[$prefix] = $id = isset($versions[$prefix]) ? $versions[$prefix] + 1 : '';
-
-	$class_li .= ($actif?" actif":"") . ($expose?" on":"");
-	return "<li id='$prefix$id' class='$class_li'>"
-	. ((!$checkable AND !$checked)
-	   ? '': plugin_checkbox(++$id_input, $dir_plugins.$plug_file, $checked))
-	.  plugin_resume($info, $dir_plugins, $plug_file, $url_page)
-	. $cfg
-	. $erreur
-	. (($dir_plugins!==_DIR_PLUGINS_DIST AND plugin_est_installe($plug_file))
-	    ? plugin_desintalle($plug_file,$nom,$dir_plugins) : '')
-	. "<div class='details'>" // pour l'ajax de exec/info_plugin
-	. (!$expose ? '' : affiche_bloc_plugin($plug_file, $info, $dir_plugins))
-	. "</div>"
-	."</li>";
+    static $id_input = 0;
+    static $versions = array();
+
+    $force_reload = (_request('var_mode')=='recalcul');
+    $get_infos = charger_fonction('get_infos','plugins');
+    $info = $get_infos($plug_file, $force_reload, $dir_plugins);
+    $prefix = $info['prefix'];
+    $cfg = "";
+    $checkable = ($dir_plugins!==_DIR_PLUGINS_DIST);
+    $nom = plugin_nom($info,$dir_plugins,$plug_file);
+
+    if (!plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'],'spip')){
+        $info['slogan'] = _T('plugin_info_non_compatible_spip');
+        $erreur = http_img_pack("plugin-dis-32.png",_T('plugin_info_non_compatible_spip')," class='picto_err'",_T('plugin_info_non_compatible_spip'));
+        $class_li .= " disabled";
+        $checkable = false;
+    }
+    elseif (isset($info['erreur'])) {
+        $class_li .= " error";
+        $erreur = http_img_pack("plugin-err-32.png",_T('plugin_info_erreur_xml')," class='picto_err'",_T('plugin_info_erreur_xml'))
+            . "<div class='erreur'>" . join('<br >', $info['erreur']) . "</div>";
+        $checkable = false;
+    }
+    elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])){
+        $class_li .= " error";
+        $erreur = http_img_pack("plugin-err-32.png",_T('plugin_impossible_activer', array('plugin' => $nom))," class='picto_err'",_T('plugin_impossible_activer', array('plugin' => $nom)))
+            . "<div class='erreur'>" . implode("<br />",$GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file]) . "</div>";
+    }
+    else
+        $cfg = $actif ? plugin_bouton_config($plug_file,$info,$dir_plugins) : "";
+
+    // numerotons les occurrences d'un meme prefix
+    $versions[$prefix] = $id = isset($versions[$prefix]) ? $versions[$prefix] + 1 : '';
+
+    $class_li .= ($actif?" actif":"") . ($expose?" on":"");
+    return "<li id='$prefix$id' class='$class_li'>"
+    . ((!$checkable AND !$checked)
+       ? '': plugin_checkbox(++$id_input, $dir_plugins.$plug_file, $checked))
+    .  plugin_resume($info, $dir_plugins, $plug_file, $url_page)
+    . $cfg
+    . $erreur
+    . (($dir_plugins!==_DIR_PLUGINS_DIST AND plugin_est_installe($plug_file))
+        ? plugin_desintalle($plug_file,$nom,$dir_plugins) : '')
+    . "<div class='details'>" // pour l'ajax de exec/info_plugin
+    . (!$expose ? '' : affiche_bloc_plugin($plug_file, $info, $dir_plugins))
+    . "</div>"
+    ."</li>";
 }
 
 function plugin_bouton_config($nom, $infos, $dir)
 {
-	// la verification se base sur le filesystem
-	// il faut donc n'utiliser que des minuscules, par convention
-	$prefix = strtolower($infos['prefix']);
-	// si plugin.xml fournit un squelette, le prendre
-	if ($infos['config'])
-		return recuperer_fond("$dir$nom/" . $infos['config'],
-				array('script' => 'configurer_' . $prefix,
-					'nom' => $nom));
-
-	// si le plugin CFG est la, l'essayer
-	if  (defined('_DIR_PLUGIN_CFG')) {
-		if (include_spip('inc/cfg')) // test CFG version >= 1.0.5
-			if ($cfg = icone_lien_cfg("$dir$nom", "cfg"))
-				return "<div class='cfg_link'>$cfg</div>";
-	}
-
-	// sinon prendre le squelette std sur le nom std
-	return recuperer_fond("prive/squelettes/inclure/cfg",
-			array('script' => 'configurer_' . $prefix,
-				'nom' => $nom));
+    // la verification se base sur le filesystem
+    // il faut donc n'utiliser que des minuscules, par convention
+    $prefix = strtolower($infos['prefix']);
+    // si plugin.xml fournit un squelette, le prendre
+    if ($infos['config'])
+        return recuperer_fond("$dir$nom/" . $infos['config'],
+                array('script' => 'configurer_' . $prefix,
+                    'nom' => $nom));
+
+    // si le plugin CFG est la, l'essayer
+    if  (defined('_DIR_PLUGIN_CFG')) {
+        if (include_spip('inc/cfg')) // test CFG version >= 1.0.5
+            if ($cfg = icone_lien_cfg("$dir$nom", "cfg"))
+                return "<div class='cfg_link'>$cfg</div>";
+    }
+
+    // sinon prendre le squelette std sur le nom std
+    return recuperer_fond("prive/squelettes/inclure/cfg",
+            array('script' => 'configurer_' . $prefix,
+                'nom' => $nom));
 }
 
 // checkbox pour activer ou desactiver
@@ -96,193 +96,193 @@ 
 
 function plugin_checkbox($id_input, $file, $actif)
 {
-	$name = substr(md5($file),0,16);
-
-	return "<div class='check'>\n"
-	. "<input type='checkbox' name='s$name' id='label_$id_input'"
-	. ($actif?" checked='checked'":"")
-	. " class='checkbox'  value='O' />"
-	. "\n<label for='label_$id_input'>"._T('activer_plugin')."</label>"
-	. "</div>";
+    $name = substr(md5($file),0,16);
+
+    return "<div class='check'>\n"
+    . "<input type='checkbox' name='s$name' id='label_$id_input'"
+    . ($actif?" checked='checked'":"")
+    . " class='checkbox'  value='O' />"
+    . "\n<label for='label_$id_input'>"._T('activer_plugin')."</label>"
+    . "</div>";
 }
 
 function plugin_nom($info, $dir_plugins, $plug_file){
-	$prefix = $info['prefix'];
-	$dir = "$dir_plugins$plug_file";
-	// Si dtd paquet, on traite le nom soit par son item de langue soit par sa valeur immediate a l'index "nom"
-	if ($info['dtd'] == "paquet") {
-		$nom = PtoBR(plugin_propre("{$prefix}_nom", "$dir/lang/paquet-$prefix"));
-		if (!$nom)
-			$nom = PtoBR(propre($info['nom']));
-	}
-	else
-		$nom = typo(attribut_html($info['nom']));
-
-	return trim($nom);
+    $prefix = $info['prefix'];
+    $dir = "$dir_plugins$plug_file";
+    // Si dtd paquet, on traite le nom soit par son item de langue soit par sa valeur immediate a l'index "nom"
+    if ($info['dtd'] == "paquet") {
+        $nom = PtoBR(plugin_propre("{$prefix}_nom", "$dir/lang/paquet-$prefix"));
+        if (!$nom)
+            $nom = PtoBR(propre($info['nom']));
+    }
+    else
+        $nom = typo(attribut_html($info['nom']));
+
+    return trim($nom);
 }
 
 // Cartouche Resume
 function plugin_resume($info, $dir_plugins, $plug_file, $url_page){
-	$prefix = $info['prefix'];
-	$dir = "$dir_plugins$plug_file";
-	$slogan = PtoBR(plugin_propre($info['slogan'], "$dir/lang/paquet-$prefix"));
-	// une seule ligne dans le slogan : couper si besoin
-	if (($p=strpos($slogan, "<br />"))!==FALSE)
-		$slogan = substr($slogan, 0,$p);
-	// couper par securite
-	$slogan = couper($slogan, 80);
-
-	$nom = plugin_nom($info, $dir_plugins, $plug_file);
-
-	$url = parametre_url($url_page, "plugin", substr($dir,strlen(_DIR_RACINE)));
-
-	if (isset($info['logo']) and $i = trim($info['logo'])) {
-		include_spip("inc/filtres_images_mini");
-		$i = inserer_attribut(image_reduire("$dir/$i", 32),'alt','');
-		$i = "<div class='icon'><a href='$url' rel='info'>$i</a></div>";
-	} else $i = '';
-
-	return "<div class='resume'>"
-	. "<h3><a href='$url' rel='info'>"
-	. $nom
-	. "</a></h3>"
-	. " <span class='version'>".$info['version']."</span>"
-	. " <span class='etat'> - "
-	. plugin_etat_en_clair($info['etat'])
-	. "</span>"
-	. "<div class='short'>".$slogan."</div>"
-	. $i
-	. "</div>";
+    $prefix = $info['prefix'];
+    $dir = "$dir_plugins$plug_file";
+    $slogan = PtoBR(plugin_propre($info['slogan'], "$dir/lang/paquet-$prefix"));
+    // une seule ligne dans le slogan : couper si besoin
+    if (($p=strpos($slogan, "<br />"))!==FALSE)
+        $slogan = substr($slogan, 0,$p);
+    // couper par securite
+    $slogan = couper($slogan, 80);
+
+    $nom = plugin_nom($info, $dir_plugins, $plug_file);
+
+    $url = parametre_url($url_page, "plugin", substr($dir,strlen(_DIR_RACINE)));
+
+    if (isset($info['logo']) and $i = trim($info['logo'])) {
+        include_spip("inc/filtres_images_mini");
+        $i = inserer_attribut(image_reduire("$dir/$i", 32),'alt','');
+        $i = "<div class='icon'><a href='$url' rel='info'>$i</a></div>";
+    } else $i = '';
+
+    return "<div class='resume'>"
+    . "<h3><a href='$url' rel='info'>"
+    . $nom
+    . "</a></h3>"
+    . " <span class='version'>".$info['version']."</span>"
+    . " <span class='etat'> - "
+    . plugin_etat_en_clair($info['etat'])
+    . "</span>"
+    . "<div class='short'>".$slogan."</div>"
+    . $i
+    . "</div>";
 }
 
 function plugin_desintalle($plug_file, $nom, $dir_plugins=null){
-	if (!$dir_plugins)
-		$dir_plugins = _DIR_PLUGINS;
+    if (!$dir_plugins)
+        $dir_plugins = _DIR_PLUGINS;
 
-	$action = redirige_action_auteur('desinstaller_plugin',"$dir_plugins::$plug_file",'admin_plugin');
-	$text = _T('bouton_desinstaller');
-	$text2 = _T('info_desinstaller_plugin');
-	$file = basename($plug_file);
+    $action = redirige_action_auteur('desinstaller_plugin',"$dir_plugins::$plug_file",'admin_plugin');
+    $text = _T('bouton_desinstaller');
+    $text2 = _T('info_desinstaller_plugin');
+    $file = basename($plug_file);
 
-	return "<div class='actions'>[".
-		"<a href='$action'
+    return "<div class='actions'>[".
+        "<a href='$action'
 		onclick='return confirm(\"$text $nom ?\\n$text2\")'>"
-		. $text
-		. "</a>]</div>"	;
+        . $text
+        . "</a>]</div>"	;
 }
 
 function plugin_etat_en_clair($etat){
-	if (!in_array($etat,array('stable','test','experimental')))
-		$etat = 'developpement';
-	return _T('plugin_etat_'.$etat);
+    if (!in_array($etat,array('stable','test','experimental')))
+        $etat = 'developpement';
+    return _T('plugin_etat_'.$etat);
 }
 
 // http://doc.spip.org/@plugin_propre
 function plugin_propre($texte, $module='') {
-	// retirer le retour a la racine du module, car le find_in_path se fait depuis la racine
-	if (_DIR_RACINE AND strncmp($module,_DIR_RACINE,strlen(_DIR_RACINE))==0)
-		$module = substr($module,strlen(_DIR_RACINE));
-	if (preg_match("|^\w+_[\w_]+$|", $texte)) {
-		$texte = _T(($module ? "$module:" : '') . $texte, array(), array('force' => false));
-	}
-	return propre($texte);
+    // retirer le retour a la racine du module, car le find_in_path se fait depuis la racine
+    if (_DIR_RACINE AND strncmp($module,_DIR_RACINE,strlen(_DIR_RACINE))==0)
+        $module = substr($module,strlen(_DIR_RACINE));
+    if (preg_match("|^\w+_[\w_]+$|", $texte)) {
+        $texte = _T(($module ? "$module:" : '') . $texte, array(), array('force' => false));
+    }
+    return propre($texte);
 }
 
 
 
 // http://doc.spip.org/@affiche_bloc_plugin
 function affiche_bloc_plugin($plug_file, $info, $dir_plugins=null) {
-	if (!$dir_plugins)
-		$dir_plugins = _DIR_PLUGINS;
-
-	$prefix = $info['prefix'];
-	$dir = "$dir_plugins$plug_file/lang/paquet-$prefix";
-
-	$s = "";
-	// TODO: le traiter_multi ici n'est pas beau
-	// cf. description du plugin/_stable_/ortho/plugin.xml
-	$description = "";
-	if (isset($info['description']))
-		$description = plugin_propre($info['description'], $dir);
-
-	if (isset($info['documentation'])
-	  AND $lien = $info['documentation']){
-		$description .= "<p><em class='site'><a href='$lien' class='spip_out'>" . _T('en_savoir_plus') .'</a></em></p>';
-	}
-	$s .= "<dd class='desc'>".$description."</dd>\n";
-
-	if (isset($info['auteur'])){
-		if (is_array($info['auteur']))
-			$a = formater_credits($info['auteur'], ', ');
-		// pour compat mais ne doit plus arriver
-		else
-			$a = trim($info['auteur']);
-		if ($a)
-			$s .= "<dt class='auteurs'>" . _T('public:par_auteur') ."</dt><dd class='auteurs'>". PtoBR(propre($a, $dir)) . "</dd>\n";
-	}
-
-	if (isset($info['credit'])){
-		if ($a = formater_credits($info['credit'], ', '))
-			$s .= "<dt class='credits'>" . _T('plugin_info_credit') ."</dt><dd class='credits'>". PtoBR(propre($a, $dir)) . "</dd>\n";
-	}
-
-	if (isset($info['licence'])) {
-		if (is_array($info['licence']))
-			$a = formater_credits($info['licence'], ', ');
-		// pour compat mais ne doit plus arriver
-		else
-			$a = trim($info['licence']);
-	if ($a)
-		$s .= "<dt class='licence'>" . _T('intitule_licence') ."</dt><dd class='licence'>". PtoBR(propre($a, $dir)) . "</dd>\n";
-	}
-
-	$s = "<dl class='description'>$s</dl>";
-
-	//
-	// Ajouter les infos techniques
-	//
-	$infotech = array();
-
-	$version = "<dt>"._T('version')."</dt><dd>".$info['version'];
-	// Version SVN
-	if ($svn_revision = version_svn_courante($dir_plugins.$plug_file))
-		$version .= ($svn_revision<0 ? ' SVN':'').' ['.abs($svn_revision).']';
-	$version .="</dd>";
-	$infotech[] = $version;
-	$infotech[] = "<dt>"._T('repertoire_plugins')."</dt><dd>".joli_repertoire("$dir_plugins$plug_file")."</dd>";
-	// source zip le cas echeant
-	$infotech[] = (lire_fichier($dir_plugins.$plug_file.'/install.log', $log)
-	AND preg_match(',^source:(.*)$,m', $log, $r))
-		? '<dt>'._T('plugin_source').'</dt><dd>'.trim($r[1])."</dd>"
-		:'';
-
-	$infotech[] = !$info['necessite'] ? '' :
-	  ('<dt>' .  _T('plugin_info_necessite') . '</dt><dd>' . join(' ', array_map('array_shift', $info['necessite'])) . '</dd>');
-
-	$s .= "<dl class='tech'>"
-		. join('', $infotech)
-		."</dl>";
-
-
-	return $s;
+    if (!$dir_plugins)
+        $dir_plugins = _DIR_PLUGINS;
+
+    $prefix = $info['prefix'];
+    $dir = "$dir_plugins$plug_file/lang/paquet-$prefix";
+
+    $s = "";
+    // TODO: le traiter_multi ici n'est pas beau
+    // cf. description du plugin/_stable_/ortho/plugin.xml
+    $description = "";
+    if (isset($info['description']))
+        $description = plugin_propre($info['description'], $dir);
+
+    if (isset($info['documentation'])
+      AND $lien = $info['documentation']){
+        $description .= "<p><em class='site'><a href='$lien' class='spip_out'>" . _T('en_savoir_plus') .'</a></em></p>';
+    }
+    $s .= "<dd class='desc'>".$description."</dd>\n";
+
+    if (isset($info['auteur'])){
+        if (is_array($info['auteur']))
+            $a = formater_credits($info['auteur'], ', ');
+        // pour compat mais ne doit plus arriver
+        else
+            $a = trim($info['auteur']);
+        if ($a)
+            $s .= "<dt class='auteurs'>" . _T('public:par_auteur') ."</dt><dd class='auteurs'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+    }
+
+    if (isset($info['credit'])){
+        if ($a = formater_credits($info['credit'], ', '))
+            $s .= "<dt class='credits'>" . _T('plugin_info_credit') ."</dt><dd class='credits'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+    }
+
+    if (isset($info['licence'])) {
+        if (is_array($info['licence']))
+            $a = formater_credits($info['licence'], ', ');
+        // pour compat mais ne doit plus arriver
+        else
+            $a = trim($info['licence']);
+    if ($a)
+        $s .= "<dt class='licence'>" . _T('intitule_licence') ."</dt><dd class='licence'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+    }
+
+    $s = "<dl class='description'>$s</dl>";
+
+    //
+    // Ajouter les infos techniques
+    //
+    $infotech = array();
+
+    $version = "<dt>"._T('version')."</dt><dd>".$info['version'];
+    // Version SVN
+    if ($svn_revision = version_svn_courante($dir_plugins.$plug_file))
+        $version .= ($svn_revision<0 ? ' SVN':'').' ['.abs($svn_revision).']';
+    $version .="</dd>";
+    $infotech[] = $version;
+    $infotech[] = "<dt>"._T('repertoire_plugins')."</dt><dd>".joli_repertoire("$dir_plugins$plug_file")."</dd>";
+    // source zip le cas echeant
+    $infotech[] = (lire_fichier($dir_plugins.$plug_file.'/install.log', $log)
+    AND preg_match(',^source:(.*)$,m', $log, $r))
+        ? '<dt>'._T('plugin_source').'</dt><dd>'.trim($r[1])."</dd>"
+        :'';
+
+    $infotech[] = !$info['necessite'] ? '' :
+      ('<dt>' .  _T('plugin_info_necessite') . '</dt><dd>' . join(' ', array_map('array_shift', $info['necessite'])) . '</dd>');
+
+    $s .= "<dl class='tech'>"
+        . join('', $infotech)
+        ."</dl>";
+
+
+    return $s;
 }
 
 function formater_credits($infos, $sep=', ') {
-	$texte = '';
-
-	foreach ($infos as $_credit) {
-		if ($texte)
-			$texte .= $sep;
-		// Si le credit en cours n'est pas un array c'est donc un copyright
-		$texte .=
-			(!is_array($_credit))
-			? PtoBR(propre($_credit))
-			: ($_credit['url'] ? '<a href="' . $_credit['url'] . '">' : '') .
-			  $_credit['nom'] .
-			  ($_credit['url'] ? '</a>' : '');
-	}
-
-	return $texte;
+    $texte = '';
+
+    foreach ($infos as $_credit) {
+        if ($texte)
+            $texte .= $sep;
+        // Si le credit en cours n'est pas un array c'est donc un copyright
+        $texte .=
+            (!is_array($_credit))
+            ? PtoBR(propre($_credit))
+            : ($_credit['url'] ? '<a href="' . $_credit['url'] . '">' : '') .
+                $_credit['nom'] .
+                ($_credit['url'] ? '</a>' : '');
+    }
+
+    return $texte;
 }
 
 ?>

Spacing +52 added lines, -53 removed lines

@@ -16,51 +16,51 @@ 
 include_spip('inc/plugin'); // pour plugin_est_installe
 
 // http://doc.spip.org/@ligne_plug
-function plugins_afficher_plugin_dist($url_page, $plug_file, $checked, $actif, $expose=false, $class_li="item", $dir_plugins=_DIR_PLUGINS) {
+function plugins_afficher_plugin_dist($url_page, $plug_file, $checked, $actif, $expose = false, $class_li = "item", $dir_plugins = _DIR_PLUGINS) {
 
 	static $id_input = 0;
 	static $versions = array();
 
-	$force_reload = (_request('var_mode')=='recalcul');
-	$get_infos = charger_fonction('get_infos','plugins');
+	$force_reload = (_request('var_mode') == 'recalcul');
+	$get_infos = charger_fonction('get_infos', 'plugins');
 	$info = $get_infos($plug_file, $force_reload, $dir_plugins);
 	$prefix = $info['prefix'];
 	$cfg = "";
-	$checkable = ($dir_plugins!==_DIR_PLUGINS_DIST);
-	$nom = plugin_nom($info,$dir_plugins,$plug_file);
+	$checkable = ($dir_plugins !== _DIR_PLUGINS_DIST);
+	$nom = plugin_nom($info, $dir_plugins, $plug_file);
 
-	if (!plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'],'spip')){
+	if (!plugin_version_compatible($info['compatibilite'], $GLOBALS['spip_version_branche'], 'spip')) {
 		$info['slogan'] = _T('plugin_info_non_compatible_spip');
-		$erreur = http_img_pack("plugin-dis-32.png",_T('plugin_info_non_compatible_spip')," class='picto_err'",_T('plugin_info_non_compatible_spip'));
+		$erreur = http_img_pack("plugin-dis-32.png", _T('plugin_info_non_compatible_spip'), " class='picto_err'", _T('plugin_info_non_compatible_spip'));
 		$class_li .= " disabled";
 		$checkable = false;
 	}
 	elseif (isset($info['erreur'])) {
 		$class_li .= " error";
-		$erreur = http_img_pack("plugin-err-32.png",_T('plugin_info_erreur_xml')," class='picto_err'",_T('plugin_info_erreur_xml'))
-		  . "<div class='erreur'>" . join('<br >', $info['erreur']) . "</div>";
+		$erreur = http_img_pack("plugin-err-32.png", _T('plugin_info_erreur_xml'), " class='picto_err'", _T('plugin_info_erreur_xml'))
+		  . "<div class='erreur'>".join('<br >', $info['erreur'])."</div>";
 		$checkable = false;
 	}
-	elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])){
+	elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])) {
 		$class_li .= " error";
-		$erreur = http_img_pack("plugin-err-32.png",_T('plugin_impossible_activer', array('plugin' => $nom))," class='picto_err'",_T('plugin_impossible_activer', array('plugin' => $nom)))
-		  . "<div class='erreur'>" . implode("<br />",$GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file]) . "</div>";
+		$erreur = http_img_pack("plugin-err-32.png", _T('plugin_impossible_activer', array('plugin' => $nom)), " class='picto_err'", _T('plugin_impossible_activer', array('plugin' => $nom)))
+		  . "<div class='erreur'>".implode("<br />", $GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])."</div>";
 	}
 	else
-		$cfg = $actif ? plugin_bouton_config($plug_file,$info,$dir_plugins) : "";
+		$cfg = $actif ? plugin_bouton_config($plug_file, $info, $dir_plugins) : "";
 
 	// numerotons les occurrences d'un meme prefix
 	$versions[$prefix] = $id = isset($versions[$prefix]) ? $versions[$prefix] + 1 : '';
 
-	$class_li .= ($actif?" actif":"") . ($expose?" on":"");
+	$class_li .= ($actif ? " actif" : "").($expose ? " on" : "");
 	return "<li id='$prefix$id' class='$class_li'>"
 	. ((!$checkable AND !$checked)
-	   ? '': plugin_checkbox(++$id_input, $dir_plugins.$plug_file, $checked))
+	   ? '' : plugin_checkbox(++$id_input, $dir_plugins.$plug_file, $checked))
 	.  plugin_resume($info, $dir_plugins, $plug_file, $url_page)
 	. $cfg
 	. $erreur
-	. (($dir_plugins!==_DIR_PLUGINS_DIST AND plugin_est_installe($plug_file))
-	    ? plugin_desintalle($plug_file,$nom,$dir_plugins) : '')
+	. (($dir_plugins !== _DIR_PLUGINS_DIST AND plugin_est_installe($plug_file))
+	    ? plugin_desintalle($plug_file, $nom, $dir_plugins) : '')
 	. "<div class='details'>" // pour l'ajax de exec/info_plugin
 	. (!$expose ? '' : affiche_bloc_plugin($plug_file, $info, $dir_plugins))
 	. "</div>"
@@ -74,12 +74,12 @@ 
 	$prefix = strtolower($infos['prefix']);
 	// si plugin.xml fournit un squelette, le prendre
 	if ($infos['config'])
-		return recuperer_fond("$dir$nom/" . $infos['config'],
-				array('script' => 'configurer_' . $prefix,
+		return recuperer_fond("$dir$nom/".$infos['config'],
+				array('script' => 'configurer_'.$prefix,
 					'nom' => $nom));
 
 	// si le plugin CFG est la, l'essayer
-	if  (defined('_DIR_PLUGIN_CFG')) {
+	if (defined('_DIR_PLUGIN_CFG')) {
 		if (include_spip('inc/cfg')) // test CFG version >= 1.0.5
 			if ($cfg = icone_lien_cfg("$dir$nom", "cfg"))
 				return "<div class='cfg_link'>$cfg</div>";
@@ -87,7 +87,7 @@ 
 
 	// sinon prendre le squelette std sur le nom std
 	return recuperer_fond("prive/squelettes/inclure/cfg",
-			array('script' => 'configurer_' . $prefix,
+			array('script' => 'configurer_'.$prefix,
 				'nom' => $nom));
 }
 
@@ -96,17 +96,17 @@ 
 
 function plugin_checkbox($id_input, $file, $actif)
 {
-	$name = substr(md5($file),0,16);
+	$name = substr(md5($file), 0, 16);
 
 	return "<div class='check'>\n"
 	. "<input type='checkbox' name='s$name' id='label_$id_input'"
-	. ($actif?" checked='checked'":"")
+	. ($actif ? " checked='checked'" : "")
 	. " class='checkbox'  value='O' />"
 	. "\n<label for='label_$id_input'>"._T('activer_plugin')."</label>"
 	. "</div>";
 }
 
-function plugin_nom($info, $dir_plugins, $plug_file){
+function plugin_nom($info, $dir_plugins, $plug_file) {
 	$prefix = $info['prefix'];
 	$dir = "$dir_plugins$plug_file";
 	// Si dtd paquet, on traite le nom soit par son item de langue soit par sa valeur immediate a l'index "nom"
@@ -122,23 +122,23 @@ 
 }
 
 // Cartouche Resume
-function plugin_resume($info, $dir_plugins, $plug_file, $url_page){
+function plugin_resume($info, $dir_plugins, $plug_file, $url_page) {
 	$prefix = $info['prefix'];
 	$dir = "$dir_plugins$plug_file";
 	$slogan = PtoBR(plugin_propre($info['slogan'], "$dir/lang/paquet-$prefix"));
 	// une seule ligne dans le slogan : couper si besoin
-	if (($p=strpos($slogan, "<br />"))!==FALSE)
-		$slogan = substr($slogan, 0,$p);
+	if (($p = strpos($slogan, "<br />")) !== FALSE)
+		$slogan = substr($slogan, 0, $p);
 	// couper par securite
 	$slogan = couper($slogan, 80);
 
 	$nom = plugin_nom($info, $dir_plugins, $plug_file);
 
-	$url = parametre_url($url_page, "plugin", substr($dir,strlen(_DIR_RACINE)));
+	$url = parametre_url($url_page, "plugin", substr($dir, strlen(_DIR_RACINE)));
 
 	if (isset($info['logo']) and $i = trim($info['logo'])) {
 		include_spip("inc/filtres_images_mini");
-		$i = inserer_attribut(image_reduire("$dir/$i", 32),'alt','');
+		$i = inserer_attribut(image_reduire("$dir/$i", 32), 'alt', '');
 		$i = "<div class='icon'><a href='$url' rel='info'>$i</a></div>";
 	} else $i = '';
 
@@ -155,11 +155,11 @@ 
 	. "</div>";
 }
 
-function plugin_desintalle($plug_file, $nom, $dir_plugins=null){
+function plugin_desintalle($plug_file, $nom, $dir_plugins = null) {
 	if (!$dir_plugins)
 		$dir_plugins = _DIR_PLUGINS;
 
-	$action = redirige_action_auteur('desinstaller_plugin',"$dir_plugins::$plug_file",'admin_plugin');
+	$action = redirige_action_auteur('desinstaller_plugin', "$dir_plugins::$plug_file", 'admin_plugin');
 	$text = _T('bouton_desinstaller');
 	$text2 = _T('info_desinstaller_plugin');
 	$file = basename($plug_file);
@@ -168,22 +168,22 @@ 
 		"<a href='$action'
 		onclick='return confirm(\"$text $nom ?\\n$text2\")'>"
 		. $text
-		. "</a>]</div>"	;
+		. "</a>]</div>";
 }
 
-function plugin_etat_en_clair($etat){
-	if (!in_array($etat,array('stable','test','experimental')))
+function plugin_etat_en_clair($etat) {
+	if (!in_array($etat, array('stable', 'test', 'experimental')))
 		$etat = 'developpement';
 	return _T('plugin_etat_'.$etat);
 }
 
 // http://doc.spip.org/@plugin_propre
-function plugin_propre($texte, $module='') {
+function plugin_propre($texte, $module = '') {
 	// retirer le retour a la racine du module, car le find_in_path se fait depuis la racine
-	if (_DIR_RACINE AND strncmp($module,_DIR_RACINE,strlen(_DIR_RACINE))==0)
-		$module = substr($module,strlen(_DIR_RACINE));
+	if (_DIR_RACINE AND strncmp($module, _DIR_RACINE, strlen(_DIR_RACINE)) == 0)
+		$module = substr($module, strlen(_DIR_RACINE));
 	if (preg_match("|^\w+_[\w_]+$|", $texte)) {
-		$texte = _T(($module ? "$module:" : '') . $texte, array(), array('force' => false));
+		$texte = _T(($module ? "$module:" : '').$texte, array(), array('force' => false));
 	}
 	return propre($texte);
 }
@@ -191,7 +191,7 @@ 
 
 
 // http://doc.spip.org/@affiche_bloc_plugin
-function affiche_bloc_plugin($plug_file, $info, $dir_plugins=null) {
+function affiche_bloc_plugin($plug_file, $info, $dir_plugins = null) {
 	if (!$dir_plugins)
 		$dir_plugins = _DIR_PLUGINS;
 
@@ -206,24 +206,24 @@ 
 		$description = plugin_propre($info['description'], $dir);
 
 	if (isset($info['documentation'])
-	  AND $lien = $info['documentation']){
-		$description .= "<p><em class='site'><a href='$lien' class='spip_out'>" . _T('en_savoir_plus') .'</a></em></p>';
+	  AND $lien = $info['documentation']) {
+		$description .= "<p><em class='site'><a href='$lien' class='spip_out'>"._T('en_savoir_plus').'</a></em></p>';
 	}
 	$s .= "<dd class='desc'>".$description."</dd>\n";
 
-	if (isset($info['auteur'])){
+	if (isset($info['auteur'])) {
 		if (is_array($info['auteur']))
 			$a = formater_credits($info['auteur'], ', ');
 		// pour compat mais ne doit plus arriver
 		else
 			$a = trim($info['auteur']);
 		if ($a)
-			$s .= "<dt class='auteurs'>" . _T('public:par_auteur') ."</dt><dd class='auteurs'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+			$s .= "<dt class='auteurs'>"._T('public:par_auteur')."</dt><dd class='auteurs'>".PtoBR(propre($a, $dir))."</dd>\n";
 	}
 
-	if (isset($info['credit'])){
+	if (isset($info['credit'])) {
 		if ($a = formater_credits($info['credit'], ', '))
-			$s .= "<dt class='credits'>" . _T('plugin_info_credit') ."</dt><dd class='credits'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+			$s .= "<dt class='credits'>"._T('plugin_info_credit')."</dt><dd class='credits'>".PtoBR(propre($a, $dir))."</dd>\n";
 	}
 
 	if (isset($info['licence'])) {
@@ -233,7 +233,7 @@ 
 		else
 			$a = trim($info['licence']);
 	if ($a)
-		$s .= "<dt class='licence'>" . _T('intitule_licence') ."</dt><dd class='licence'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+		$s .= "<dt class='licence'>"._T('intitule_licence')."</dt><dd class='licence'>".PtoBR(propre($a, $dir))."</dd>\n";
 	}
 
 	$s = "<dl class='description'>$s</dl>";
@@ -246,8 +246,8 @@ 
 	$version = "<dt>"._T('version')."</dt><dd>".$info['version'];
 	// Version SVN
 	if ($svn_revision = version_svn_courante($dir_plugins.$plug_file))
-		$version .= ($svn_revision<0 ? ' SVN':'').' ['.abs($svn_revision).']';
-	$version .="</dd>";
+		$version .= ($svn_revision < 0 ? ' SVN' : '').' ['.abs($svn_revision).']';
+	$version .= "</dd>";
 	$infotech[] = $version;
 	$infotech[] = "<dt>"._T('repertoire_plugins')."</dt><dd>".joli_repertoire("$dir_plugins$plug_file")."</dd>";
 	// source zip le cas echeant
@@ -256,8 +256,7 @@ 
 		? '<dt>'._T('plugin_source').'</dt><dd>'.trim($r[1])."</dd>"
 		:'';
 
-	$infotech[] = !$info['necessite'] ? '' :
-	  ('<dt>' .  _T('plugin_info_necessite') . '</dt><dd>' . join(' ', array_map('array_shift', $info['necessite'])) . '</dd>');
+	$infotech[] = !$info['necessite'] ? '' : ('<dt>'._T('plugin_info_necessite').'</dt><dd>'.join(' ', array_map('array_shift', $info['necessite'])).'</dd>');
 
 	$s .= "<dl class='tech'>"
 		. join('', $infotech)
@@ -267,7 +266,7 @@ 
 	return $s;
 }
 
-function formater_credits($infos, $sep=', ') {
+function formater_credits($infos, $sep = ', ') {
 	$texte = '';
 
 	foreach ($infos as $_credit) {
@@ -277,8 +276,8 @@ 
 		$texte .=
 			(!is_array($_credit))
 			? PtoBR(propre($_credit))
-			: ($_credit['url'] ? '<a href="' . $_credit['url'] . '">' : '') .
-			  $_credit['nom'] .
+			: ($_credit['url'] ? '<a href="'.$_credit['url'].'">' : '').
+			  $_credit['nom'].
 			  ($_credit['url'] ? '</a>' : '');
 	}
 

Braces +66 added lines, -45 removed lines

@@ -10,7 +10,9 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 include_spip('inc/charsets');
 include_spip('inc/texte');
 include_spip('inc/plugin'); // pour plugin_est_installe
@@ -34,20 +36,18 @@ 
 		$erreur = http_img_pack("plugin-dis-32.png",_T('plugin_info_non_compatible_spip')," class='picto_err'",_T('plugin_info_non_compatible_spip'));
 		$class_li .= " disabled";
 		$checkable = false;
-	}
-	elseif (isset($info['erreur'])) {
+	} elseif (isset($info['erreur'])) {
 		$class_li .= " error";
 		$erreur = http_img_pack("plugin-err-32.png",_T('plugin_info_erreur_xml')," class='picto_err'",_T('plugin_info_erreur_xml'))
 		  . "<div class='erreur'>" . join('<br >', $info['erreur']) . "</div>";
 		$checkable = false;
-	}
-	elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])){
+	} elseif (isset($GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file])){
 		$class_li .= " error";
 		$erreur = http_img_pack("plugin-err-32.png",_T('plugin_impossible_activer', array('plugin' => $nom))," class='picto_err'",_T('plugin_impossible_activer', array('plugin' => $nom)))
 		  . "<div class='erreur'>" . implode("<br />",$GLOBALS['erreurs_activation_raw'][$dir_plugins.$plug_file]) . "</div>";
+	} else {
+			$cfg = $actif ? plugin_bouton_config($plug_file,$info,$dir_plugins) : "";
 	}
-	else
-		$cfg = $actif ? plugin_bouton_config($plug_file,$info,$dir_plugins) : "";
 
 	// numerotons les occurrences d'un meme prefix
 	$versions[$prefix] = $id = isset($versions[$prefix]) ? $versions[$prefix] + 1 : '';
@@ -73,16 +73,19 @@ 
 	// il faut donc n'utiliser que des minuscules, par convention
 	$prefix = strtolower($infos['prefix']);
 	// si plugin.xml fournit un squelette, le prendre
-	if ($infos['config'])
-		return recuperer_fond("$dir$nom/" . $infos['config'],
+	if ($infos['config']) {
+			return recuperer_fond("$dir$nom/" . $infos['config'],
 				array('script' => 'configurer_' . $prefix,
 					'nom' => $nom));
+	}
 
 	// si le plugin CFG est la, l'essayer
 	if  (defined('_DIR_PLUGIN_CFG')) {
-		if (include_spip('inc/cfg')) // test CFG version >= 1.0.5
+		if (include_spip('inc/cfg')) {
+		    // test CFG version >= 1.0.5
 			if ($cfg = icone_lien_cfg("$dir$nom", "cfg"))
 				return "<div class='cfg_link'>$cfg</div>";
+		}
 	}
 
 	// sinon prendre le squelette std sur le nom std
@@ -112,11 +115,12 @@ 
 	// Si dtd paquet, on traite le nom soit par son item de langue soit par sa valeur immediate a l'index "nom"
 	if ($info['dtd'] == "paquet") {
 		$nom = PtoBR(plugin_propre("{$prefix}_nom", "$dir/lang/paquet-$prefix"));
-		if (!$nom)
-			$nom = PtoBR(propre($info['nom']));
+		if (!$nom) {
+					$nom = PtoBR(propre($info['nom']));
+		}
+	} else {
+			$nom = typo(attribut_html($info['nom']));
 	}
-	else
-		$nom = typo(attribut_html($info['nom']));
 
 	return trim($nom);
 }
@@ -127,8 +131,9 @@ 
 	$dir = "$dir_plugins$plug_file";
 	$slogan = PtoBR(plugin_propre($info['slogan'], "$dir/lang/paquet-$prefix"));
 	// une seule ligne dans le slogan : couper si besoin
-	if (($p=strpos($slogan, "<br />"))!==FALSE)
-		$slogan = substr($slogan, 0,$p);
+	if (($p=strpos($slogan, "<br />"))!==FALSE) {
+			$slogan = substr($slogan, 0,$p);
+	}
 	// couper par securite
 	$slogan = couper($slogan, 80);
 
@@ -140,7 +145,9 @@ 
 		include_spip("inc/filtres_images_mini");
 		$i = inserer_attribut(image_reduire("$dir/$i", 32),'alt','');
 		$i = "<div class='icon'><a href='$url' rel='info'>$i</a></div>";
-	} else $i = '';
+	} else {
+	    $i = '';
+	}
 
 	return "<div class='resume'>"
 	. "<h3><a href='$url' rel='info'>"
@@ -156,8 +163,9 @@ 
 }
 
 function plugin_desintalle($plug_file, $nom, $dir_plugins=null){
-	if (!$dir_plugins)
-		$dir_plugins = _DIR_PLUGINS;
+	if (!$dir_plugins) {
+			$dir_plugins = _DIR_PLUGINS;
+	}
 
 	$action = redirige_action_auteur('desinstaller_plugin',"$dir_plugins::$plug_file",'admin_plugin');
 	$text = _T('bouton_desinstaller');
@@ -172,16 +180,18 @@ 
 }
 
 function plugin_etat_en_clair($etat){
-	if (!in_array($etat,array('stable','test','experimental')))
-		$etat = 'developpement';
+	if (!in_array($etat,array('stable','test','experimental'))) {
+			$etat = 'developpement';
+	}
 	return _T('plugin_etat_'.$etat);
 }
 
 // http://doc.spip.org/@plugin_propre
 function plugin_propre($texte, $module='') {
 	// retirer le retour a la racine du module, car le find_in_path se fait depuis la racine
-	if (_DIR_RACINE AND strncmp($module,_DIR_RACINE,strlen(_DIR_RACINE))==0)
-		$module = substr($module,strlen(_DIR_RACINE));
+	if (_DIR_RACINE AND strncmp($module,_DIR_RACINE,strlen(_DIR_RACINE))==0) {
+			$module = substr($module,strlen(_DIR_RACINE));
+	}
 	if (preg_match("|^\w+_[\w_]+$|", $texte)) {
 		$texte = _T(($module ? "$module:" : '') . $texte, array(), array('force' => false));
 	}
@@ -192,8 +202,9 @@ 
 
 // http://doc.spip.org/@affiche_bloc_plugin
 function affiche_bloc_plugin($plug_file, $info, $dir_plugins=null) {
-	if (!$dir_plugins)
-		$dir_plugins = _DIR_PLUGINS;
+	if (!$dir_plugins) {
+			$dir_plugins = _DIR_PLUGINS;
+	}
 
 	$prefix = $info['prefix'];
 	$dir = "$dir_plugins$plug_file/lang/paquet-$prefix";
@@ -202,8 +213,9 @@ 
 	// TODO: le traiter_multi ici n'est pas beau
 	// cf. description du plugin/_stable_/ortho/plugin.xml
 	$description = "";
-	if (isset($info['description']))
-		$description = plugin_propre($info['description'], $dir);
+	if (isset($info['description'])) {
+			$description = plugin_propre($info['description'], $dir);
+	}
 
 	if (isset($info['documentation'])
 	  AND $lien = $info['documentation']){
@@ -212,28 +224,35 @@ 
 	$s .= "<dd class='desc'>".$description."</dd>\n";
 
 	if (isset($info['auteur'])){
-		if (is_array($info['auteur']))
-			$a = formater_credits($info['auteur'], ', ');
+		if (is_array($info['auteur'])) {
+					$a = formater_credits($info['auteur'], ', ');
+		}
 		// pour compat mais ne doit plus arriver
-		else
-			$a = trim($info['auteur']);
-		if ($a)
-			$s .= "<dt class='auteurs'>" . _T('public:par_auteur') ."</dt><dd class='auteurs'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+		else {
+					$a = trim($info['auteur']);
+		}
+		if ($a) {
+					$s .= "<dt class='auteurs'>" . _T('public:par_auteur') ."</dt><dd class='auteurs'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+		}
 	}
 
 	if (isset($info['credit'])){
-		if ($a = formater_credits($info['credit'], ', '))
-			$s .= "<dt class='credits'>" . _T('plugin_info_credit') ."</dt><dd class='credits'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+		if ($a = formater_credits($info['credit'], ', ')) {
+					$s .= "<dt class='credits'>" . _T('plugin_info_credit') ."</dt><dd class='credits'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+		}
 	}
 
 	if (isset($info['licence'])) {
-		if (is_array($info['licence']))
-			$a = formater_credits($info['licence'], ', ');
+		if (is_array($info['licence'])) {
+					$a = formater_credits($info['licence'], ', ');
+		}
 		// pour compat mais ne doit plus arriver
-		else
-			$a = trim($info['licence']);
-	if ($a)
-		$s .= "<dt class='licence'>" . _T('intitule_licence') ."</dt><dd class='licence'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+		else {
+					$a = trim($info['licence']);
+		}
+	if ($a) {
+			$s .= "<dt class='licence'>" . _T('intitule_licence') ."</dt><dd class='licence'>". PtoBR(propre($a, $dir)) . "</dd>\n";
+	}
 	}
 
 	$s = "<dl class='description'>$s</dl>";
@@ -245,8 +264,9 @@ 
 
 	$version = "<dt>"._T('version')."</dt><dd>".$info['version'];
 	// Version SVN
-	if ($svn_revision = version_svn_courante($dir_plugins.$plug_file))
-		$version .= ($svn_revision<0 ? ' SVN':'').' ['.abs($svn_revision).']';
+	if ($svn_revision = version_svn_courante($dir_plugins.$plug_file)) {
+			$version .= ($svn_revision<0 ? ' SVN':'').' ['.abs($svn_revision).']';
+	}
 	$version .="</dd>";
 	$infotech[] = $version;
 	$infotech[] = "<dt>"._T('repertoire_plugins')."</dt><dd>".joli_repertoire("$dir_plugins$plug_file")."</dd>";
@@ -271,8 +291,9 @@ 
 	$texte = '';
 
 	foreach ($infos as $_credit) {
-		if ($texte)
-			$texte .= $sep;
+		if ($texte) {
+					$texte .= $sep;
+		}
 		// Si le credit en cours n'est pas un array c'est donc un copyright
 		$texte .=
 			(!is_array($_credit))

ecrire/public/iterateur.php

Doc Comments +4 added lines

@@ -412,6 +412,10 @@
 	 * aller a la position $n en parcourant
 	 * un par un tous les elements
 	 */
+
+	/**
+	 * @param integer $n
+	 */
 	private function seek_loop($n) {
 		if ($this->pos > $n)
 			$this->rewind();

Indentation +502 added lines, -502 removed lines

@@ -20,537 +20,537 @@
  * 
  */
 class IterFactory{
-	public static function create($iterateur, $command, $info=null){
-
-		// cas des SI {si expression} analises tres tot
-		// pour eviter le chargement de tout iterateur
-		if (isset($command['si'])) {
-			foreach ($command['si'] as $si) {
-				if (!$si) {
-					// $command pour boucle SQL peut generer des erreurs de compilation
-					// s'il est transmis alors qu'on est dans un iterateur vide
-					return new IterDecorator(new EmptyIterator(), array(), $info);
-				}
-			}
-		}
-
-		// chercher un iterateur PHP existant (par exemple dans SPL)
-		// (il faudrait passer l'argument ->sql_serveur
-		// pour etre certain qu'on est sur un "php:")
-		if (class_exists($iterateur)) {
-			$a = isset($command['args']) ? $command['args'] : array() ;
-
-			// permettre de passer un Iterateur directement {args #ITERATEUR} :
-			// si on recoit deja un iterateur en argument, on l'utilise
-			if (count($a)==1 and is_object($a[0]) and is_subclass_of($a[0], 'Iterator')) {
-				$iter = $a[0];
-
-			// sinon, on cree un iterateur du type donne
-			} else {							
-				// arguments de creation de l'iterateur...
-				// (pas glop)
-				try {
-					switch (count($a)) {
-						case 0:    $iter = new $iterateur();  break;
-						case 1:    $iter = new $iterateur($a[0]);  break;
-						case 2:    $iter = new $iterateur($a[0], $a[1]);  break;
-						case 3:    $iter = new $iterateur($a[0], $a[1], $a[2]);  break;
-						case 4:    $iter = new $iterateur($a[0], $a[1], $a[2], $a[3]);  break;
-					}
-				} catch (Exception $e) {
-					spip_log("Erreur de chargement de l'iterateur $iterateur");
-					spip_log($e->getMessage());
-					$iter = new EmptyIterator();
-				}
-			}
-		} else {
-			// chercher la classe d'iterateur
-			// IterateurXXX
-			// definie dans le fichier iterateurs/xxx.php
-			$class = "Iterateur".$iterateur;
-			if (!class_exists($class)){
-				if (!include_spip("iterateur/" . strtolower($iterateur))
-					OR !class_exists($class)) {
-					die("Iterateur $iterateur non trouvé");
-					// si l'iterateur n'existe pas, on se rabat sur le generique
-					# $iter = new EmptyIterator();
-				}
-			}
-			$iter = new $class($command, $info);
-		}
-		return new IterDecorator($iter, $command, $info);
-	}
+    public static function create($iterateur, $command, $info=null){
+
+        // cas des SI {si expression} analises tres tot
+        // pour eviter le chargement de tout iterateur
+        if (isset($command['si'])) {
+            foreach ($command['si'] as $si) {
+                if (!$si) {
+                    // $command pour boucle SQL peut generer des erreurs de compilation
+                    // s'il est transmis alors qu'on est dans un iterateur vide
+                    return new IterDecorator(new EmptyIterator(), array(), $info);
+                }
+            }
+        }
+
+        // chercher un iterateur PHP existant (par exemple dans SPL)
+        // (il faudrait passer l'argument ->sql_serveur
+        // pour etre certain qu'on est sur un "php:")
+        if (class_exists($iterateur)) {
+            $a = isset($command['args']) ? $command['args'] : array() ;
+
+            // permettre de passer un Iterateur directement {args #ITERATEUR} :
+            // si on recoit deja un iterateur en argument, on l'utilise
+            if (count($a)==1 and is_object($a[0]) and is_subclass_of($a[0], 'Iterator')) {
+                $iter = $a[0];
+
+            // sinon, on cree un iterateur du type donne
+            } else {							
+                // arguments de creation de l'iterateur...
+                // (pas glop)
+                try {
+                    switch (count($a)) {
+                        case 0:    $iter = new $iterateur();  break;
+                        case 1:    $iter = new $iterateur($a[0]);  break;
+                        case 2:    $iter = new $iterateur($a[0], $a[1]);  break;
+                        case 3:    $iter = new $iterateur($a[0], $a[1], $a[2]);  break;
+                        case 4:    $iter = new $iterateur($a[0], $a[1], $a[2], $a[3]);  break;
+                    }
+                } catch (Exception $e) {
+                    spip_log("Erreur de chargement de l'iterateur $iterateur");
+                    spip_log($e->getMessage());
+                    $iter = new EmptyIterator();
+                }
+            }
+        } else {
+            // chercher la classe d'iterateur
+            // IterateurXXX
+            // definie dans le fichier iterateurs/xxx.php
+            $class = "Iterateur".$iterateur;
+            if (!class_exists($class)){
+                if (!include_spip("iterateur/" . strtolower($iterateur))
+                    OR !class_exists($class)) {
+                    die("Iterateur $iterateur non trouvé");
+                    // si l'iterateur n'existe pas, on se rabat sur le generique
+                    # $iter = new EmptyIterator();
+                }
+            }
+            $iter = new $class($command, $info);
+        }
+        return new IterDecorator($iter, $command, $info);
+    }
 }
 
 
 
 
 class IterDecorator extends FilterIterator {
-	private $iter;
-
-	/**
-	 * Conditions de filtrage
-	 * ie criteres de selection
-	 * @var array
-	 */
-	protected $filtre = array();
-
-	/**
-	 * Fonction de filtrage compilee a partir des criteres de filtre
-	 * @var string
-	 */
-	protected $func_filtre = null;
-
-	/**
-	 * Critere {offset, limit}
-	 * @var int
-	 * @var int
-	 */
-	protected $offset = null;
-	protected $limit = null;
-
-	/**
-	 * nombre d'elements recuperes depuis la position 0,
-	 * en tenant compte des filtres
-	 * @var int
-	 */
-	protected $fetched=0;
-
-	/**
-	 * Y a t'il une erreur ?
-	 * 
-	 * @var bool
-	**/
-	protected $err = false;
-
-	/**
-	 * Drapeau a activer en cas d'echec
-	 * (select SQL errone, non chargement des DATA, etc)
-	 */
-	public function err() {
-		if (method_exists($this->iter, 'err'))
-			return $this->iter->err();
-		if (property_exists($this->iter, 'err'))
-			return $this->iter->err;
-		return false;
-	}
-
-	public function __construct(Iterator $iter, $command, $info){
-		parent::__construct($iter);
-		parent::rewind(); // remettre a la premiere position (bug? connu de FilterIterator)
+    private $iter;
+
+    /**
+     * Conditions de filtrage
+     * ie criteres de selection
+     * @var array
+     */
+    protected $filtre = array();
+
+    /**
+     * Fonction de filtrage compilee a partir des criteres de filtre
+     * @var string
+     */
+    protected $func_filtre = null;
+
+    /**
+     * Critere {offset, limit}
+     * @var int
+     * @var int
+     */
+    protected $offset = null;
+    protected $limit = null;
+
+    /**
+     * nombre d'elements recuperes depuis la position 0,
+     * en tenant compte des filtres
+     * @var int
+     */
+    protected $fetched=0;
+
+    /**
+     * Y a t'il une erreur ?
+     * 
+     * @var bool
+     **/
+    protected $err = false;
+
+    /**
+     * Drapeau a activer en cas d'echec
+     * (select SQL errone, non chargement des DATA, etc)
+     */
+    public function err() {
+        if (method_exists($this->iter, 'err'))
+            return $this->iter->err();
+        if (property_exists($this->iter, 'err'))
+            return $this->iter->err;
+        return false;
+    }
+
+    public function __construct(Iterator $iter, $command, $info){
+        parent::__construct($iter);
+        parent::rewind(); // remettre a la premiere position (bug? connu de FilterIterator)
 		
-		// recuperer l'iterateur transmis
-		$this->iter = $this->getInnerIterator();
-		$this->command = $command;
-		$this->info = $info;
-		$this->pos = 0;
-		$this->fetched = 0;
-
-		// chercher la liste des champs a retourner par
-		// fetch si l'objet ne les calcule pas tout seul
-		if (!method_exists($this->iter, 'fetch')) {
-			$this->calculer_select();
-			$this->calculer_filtres();
-		}
-
-		// emptyIterator critere {si} faux n'a pas d'erreur !
-		if (isset($this->iter->err)) {
-			$this->err = $this->iter->err;
-		}
-
-		// pas d'init a priori, le calcul ne sera fait qu'en cas de besoin (provoque une double requete souvent inutile en sqlite)
-		//$this->total = $this->count();
-	}
-
-
-	// calcule les elements a retournes par fetch()
-	// enleve les elements inutiles du select()
-	// 
-	private function calculer_select() {
-		if ($select = &$this->command['select']) {
-			foreach($select as $s) {
-				// /!\ $s = '.nom'
-				if ($s[0] == '.') {
-					$s = substr($s, 1);
-				}
-				$this->select[] = $s;
-			}
-		}
-	}
-
-	// recuperer la valeur d'une balise #X
-	// en fonction des methodes 
-	// et proprietes disponibles
-	public function get_select($nom) {
-		if (is_object($this->iter)
-		AND method_exists($this->iter, $nom)) {
-			try {
-				return $this->iter->$nom();
-			} catch(Exception $e) {
-				// #GETCHILDREN sur un fichier de DirectoryIterator ...
-				spip_log("Methode $nom en echec sur " . get_class($this->iter));
-				spip_log("Cela peut être normal : retour d'une ligne de resultat ne pouvant pas calculer cette methode");
-				return '';
-			}
-		}
-		/*
+        // recuperer l'iterateur transmis
+        $this->iter = $this->getInnerIterator();
+        $this->command = $command;
+        $this->info = $info;
+        $this->pos = 0;
+        $this->fetched = 0;
+
+        // chercher la liste des champs a retourner par
+        // fetch si l'objet ne les calcule pas tout seul
+        if (!method_exists($this->iter, 'fetch')) {
+            $this->calculer_select();
+            $this->calculer_filtres();
+        }
+
+        // emptyIterator critere {si} faux n'a pas d'erreur !
+        if (isset($this->iter->err)) {
+            $this->err = $this->iter->err;
+        }
+
+        // pas d'init a priori, le calcul ne sera fait qu'en cas de besoin (provoque une double requete souvent inutile en sqlite)
+        //$this->total = $this->count();
+    }
+
+
+    // calcule les elements a retournes par fetch()
+    // enleve les elements inutiles du select()
+    // 
+    private function calculer_select() {
+        if ($select = &$this->command['select']) {
+            foreach($select as $s) {
+                // /!\ $s = '.nom'
+                if ($s[0] == '.') {
+                    $s = substr($s, 1);
+                }
+                $this->select[] = $s;
+            }
+        }
+    }
+
+    // recuperer la valeur d'une balise #X
+    // en fonction des methodes 
+    // et proprietes disponibles
+    public function get_select($nom) {
+        if (is_object($this->iter)
+        AND method_exists($this->iter, $nom)) {
+            try {
+                return $this->iter->$nom();
+            } catch(Exception $e) {
+                // #GETCHILDREN sur un fichier de DirectoryIterator ...
+                spip_log("Methode $nom en echec sur " . get_class($this->iter));
+                spip_log("Cela peut être normal : retour d'une ligne de resultat ne pouvant pas calculer cette methode");
+                return '';
+            }
+        }
+        /*
 		if (property_exists($this->iter, $nom)) {
 			return $this->iter->$nom;
 		}*/
-		// cle et valeur par defaut
-		// ICI PLANTAGE SI ON NE CONTROLE PAS $nom
-		if (in_array($nom, array('cle', 'valeur'))
-		AND method_exists($this, $nom)) {
-			return $this->$nom();
-		}
+        // cle et valeur par defaut
+        // ICI PLANTAGE SI ON NE CONTROLE PAS $nom
+        if (in_array($nom, array('cle', 'valeur'))
+        AND method_exists($this, $nom)) {
+            return $this->$nom();
+        }
 
-		// Par defaut chercher en xpath dans la valeur()
-		return table_valeur($this->valeur(), $nom, null);
-	}
+        // Par defaut chercher en xpath dans la valeur()
+        return table_valeur($this->valeur(), $nom, null);
+    }
 
 	
-	private function calculer_filtres() {
+    private function calculer_filtres() {
 		
-		// Issu de calculer_select() de public/composer L.519
-		// TODO: externaliser...
-		//
-		// retirer les criteres vides:
-		// {X ?} avec X absent de l'URL
-		// {par #ENV{X}} avec X absent de l'URL
-		// IN sur collection vide (ce dernier devrait pouvoir etre fait a la compil)
-		if ($where = &$this->command['where']) {
-			$menage = false;
-			foreach($where as $k => $v) { 
-				if (is_array($v)){
-					if ((count($v)>=2) && ($v[0]=='REGEXP') && ($v[2]=="'.*'")) $op= false;
-					elseif ((count($v)>=2) && ($v[0]=='LIKE') && ($v[2]=="'%'")) $op= false;
-					else $op = $v[0] ? $v[0] : $v;
-				} else $op = $v;
-				if ((!$op) OR ($op==1) OR ($op=='0=0')) {
-					unset($where[$k]);
-					$menage = true;
-				}
-				// traiter {cle IN a,b} ou {valeur !IN a,b}
-				// prendre en compte le cas particulier de sous-requetes
-				// produites par sql_in quand plus de 255 valeurs passees a IN
-				if (preg_match_all(',\s+IN\s+(\(.*\)),', $op, $s_req)) {
-					$req = '';
-					foreach($s_req[1] as $key => $val) {
-						$req .= trim($val, '(,)') . ',';
-					}
-					$req = '(' . rtrim($req, ',') . ')';
-				}
-				if (preg_match(',^\(\(([\w/]+)(\s+NOT)?\s+IN\s+(\(.*\))\)(?:\s+(AND|OR)\s+\(([\w/]+)(\s+NOT)?\s+IN\s+(\(.*\))\))*\)$,', $op, $regs)) {
-					$this->ajouter_filtre($regs[1], 'IN', strlen($req) ? $req : $regs[3], $regs[2]);
-					unset($op);
-				}
-			}
-			foreach($where as $k => $v) {
-				// 3 possibilites : count($v) =
-				// * 1 : {x y} ; on recoit $v[0] = y
-				// * 2 : {x !op y} ; on recoit $v[0] = 'NOT', $v[1] = array() // array du type {x op y}
-				// * 3 : {x op y} ; on recoit $v[0] = 'op', $v[1] = x, $v[2] = y
-
-				// 1 : forcement traite par un critere, on passe
-				if (count($v) == 1) {
-					continue;
-				}
-				if (count($v) == 2 and is_array($v[1])) {
-					$this->ajouter_filtre($v[1][1], $v[1][0], $v[1][2], 'NOT');
-				}
-				if (count($v) == 3) {
-					$this->ajouter_filtre($v[1], $v[0], $v[2]);
-				}
-			}
-		}
-
-		// critere {2,7}
-		if (isset($this->command['limit']) AND $this->command['limit']) {
-			$limit = explode(',',$this->command['limit']);
-			$this->offset = $limit[0];
-			$this->limit = $limit[1];
-		}
-
-		// Creer la fonction de filtrage sur $this
-		if ($this->filtre) {
-			$this->func_filtre = create_function('$me', $b = 'return ('.join(') AND (', $this->filtre).');');
-		}
-	}
-
-
-
-	protected function ajouter_filtre($cle, $op, $valeur, $not=false) {
-		if (method_exists($this->iter, 'exception_des_criteres')) {
-			if (in_array($cle, $this->iter->exception_des_criteres())) {
-				return;
-			}
-		}
-		// TODO: analyser le filtre pour refuser ce qu'on ne sait pas traiter ?
-		# mais c'est normalement deja opere par calculer_critere_infixe()
-		# qui regarde la description 'desc' (en casse reelle d'ailleurs : {isDir=1}
-		# ne sera pas vu si l'on a defini desc['field']['isdir'] pour que #ISDIR soit present.
-		# il faudrait peut etre definir les 2 champs isDir et isdir... a reflechir...
+        // Issu de calculer_select() de public/composer L.519
+        // TODO: externaliser...
+        //
+        // retirer les criteres vides:
+        // {X ?} avec X absent de l'URL
+        // {par #ENV{X}} avec X absent de l'URL
+        // IN sur collection vide (ce dernier devrait pouvoir etre fait a la compil)
+        if ($where = &$this->command['where']) {
+            $menage = false;
+            foreach($where as $k => $v) { 
+                if (is_array($v)){
+                    if ((count($v)>=2) && ($v[0]=='REGEXP') && ($v[2]=="'.*'")) $op= false;
+                    elseif ((count($v)>=2) && ($v[0]=='LIKE') && ($v[2]=="'%'")) $op= false;
+                    else $op = $v[0] ? $v[0] : $v;
+                } else $op = $v;
+                if ((!$op) OR ($op==1) OR ($op=='0=0')) {
+                    unset($where[$k]);
+                    $menage = true;
+                }
+                // traiter {cle IN a,b} ou {valeur !IN a,b}
+                // prendre en compte le cas particulier de sous-requetes
+                // produites par sql_in quand plus de 255 valeurs passees a IN
+                if (preg_match_all(',\s+IN\s+(\(.*\)),', $op, $s_req)) {
+                    $req = '';
+                    foreach($s_req[1] as $key => $val) {
+                        $req .= trim($val, '(,)') . ',';
+                    }
+                    $req = '(' . rtrim($req, ',') . ')';
+                }
+                if (preg_match(',^\(\(([\w/]+)(\s+NOT)?\s+IN\s+(\(.*\))\)(?:\s+(AND|OR)\s+\(([\w/]+)(\s+NOT)?\s+IN\s+(\(.*\))\))*\)$,', $op, $regs)) {
+                    $this->ajouter_filtre($regs[1], 'IN', strlen($req) ? $req : $regs[3], $regs[2]);
+                    unset($op);
+                }
+            }
+            foreach($where as $k => $v) {
+                // 3 possibilites : count($v) =
+                // * 1 : {x y} ; on recoit $v[0] = y
+                // * 2 : {x !op y} ; on recoit $v[0] = 'NOT', $v[1] = array() // array du type {x op y}
+                // * 3 : {x op y} ; on recoit $v[0] = 'op', $v[1] = x, $v[2] = y
+
+                // 1 : forcement traite par un critere, on passe
+                if (count($v) == 1) {
+                    continue;
+                }
+                if (count($v) == 2 and is_array($v[1])) {
+                    $this->ajouter_filtre($v[1][1], $v[1][0], $v[1][2], 'NOT');
+                }
+                if (count($v) == 3) {
+                    $this->ajouter_filtre($v[1], $v[0], $v[2]);
+                }
+            }
+        }
+
+        // critere {2,7}
+        if (isset($this->command['limit']) AND $this->command['limit']) {
+            $limit = explode(',',$this->command['limit']);
+            $this->offset = $limit[0];
+            $this->limit = $limit[1];
+        }
+
+        // Creer la fonction de filtrage sur $this
+        if ($this->filtre) {
+            $this->func_filtre = create_function('$me', $b = 'return ('.join(') AND (', $this->filtre).');');
+        }
+    }
+
+
+
+    protected function ajouter_filtre($cle, $op, $valeur, $not=false) {
+        if (method_exists($this->iter, 'exception_des_criteres')) {
+            if (in_array($cle, $this->iter->exception_des_criteres())) {
+                return;
+            }
+        }
+        // TODO: analyser le filtre pour refuser ce qu'on ne sait pas traiter ?
+        # mais c'est normalement deja opere par calculer_critere_infixe()
+        # qui regarde la description 'desc' (en casse reelle d'ailleurs : {isDir=1}
+        # ne sera pas vu si l'on a defini desc['field']['isdir'] pour que #ISDIR soit present.
+        # il faudrait peut etre definir les 2 champs isDir et isdir... a reflechir...
 		
-		# if (!in_array($cle, array('cle', 'valeur')))
-		#	return;
+        # if (!in_array($cle, array('cle', 'valeur')))
+        #	return;
 
-		$a = '$me->get_select(\''.$cle.'\')';
+        $a = '$me->get_select(\''.$cle.'\')';
 
-		$filtre = '';
+        $filtre = '';
 		
-		if ($op == 'REGEXP') {
-			$filtre = 'match('.$a.', '.str_replace('\"', '"', $valeur).')';
-			$op = '';
-		} else if ($op == 'LIKE') {
-			$valeur = str_replace(array('\"', '_', '%'), array('"', '.', '.*'), preg_quote($valeur));
-			$filtre = 'match('.$a.', '.$valeur.')';
-			$op = '';
-		} else if ($op == '=') {
-			$op = '==';
-		} else if ($op == 'IN') {
-			$filtre = 'in_array('.$a.', array'.$valeur.')';
-			$op = '';
-		} else if (!in_array($op, array('<','<=', '>', '>='))) {
-			spip_log('operateur non reconnu ' . $op); // [todo] mettre une erreur de squelette
-			$op = '';
-		}
+        if ($op == 'REGEXP') {
+            $filtre = 'match('.$a.', '.str_replace('\"', '"', $valeur).')';
+            $op = '';
+        } else if ($op == 'LIKE') {
+            $valeur = str_replace(array('\"', '_', '%'), array('"', '.', '.*'), preg_quote($valeur));
+            $filtre = 'match('.$a.', '.$valeur.')';
+            $op = '';
+        } else if ($op == '=') {
+            $op = '==';
+        } else if ($op == 'IN') {
+            $filtre = 'in_array('.$a.', array'.$valeur.')';
+            $op = '';
+        } else if (!in_array($op, array('<','<=', '>', '>='))) {
+            spip_log('operateur non reconnu ' . $op); // [todo] mettre une erreur de squelette
+            $op = '';
+        }
 	
-		if ($op)
-			$filtre = $a.$op.str_replace('\"', '"', $valeur);
+        if ($op)
+            $filtre = $a.$op.str_replace('\"', '"', $valeur);
 
-		if ($not)
-			$filtre = "!($filtre)";
+        if ($not)
+            $filtre = "!($filtre)";
 			
-		if ($filtre) {
-			$this->filtre[] = $filtre;
-		}
-	}
+        if ($filtre) {
+            $this->filtre[] = $filtre;
+        }
+    }
 
 	
-	public function next(){
-		$this->pos++;
-		parent::next();
-	}
-
-	/**
-	 * revient au depart
-	 * @return void
-	 */
-	public function rewind() {
-		$this->pos = 0;
-		$this->fetched = 0;
-		parent::rewind();
-	}
-
-
-	# Extension SPIP des iterateurs PHP
-	/**
-	 * type de l'iterateur
-	 * @var string
-	 */
-	protected $type;
-
-	/**
-	 * parametres de l'iterateur
-	 * @var array
-	 */
-	protected $command;
-
-	/**
-	 * infos de compilateur
-	 * @var array
-	 */
-	protected $info;
-
-	/**
-	 * position courante de l'iterateur
-	 * @var int
-	 */
-	protected $pos=null;
-
-	/**
-	 * nombre total resultats dans l'iterateur
-	 * @var int
-	 */
-	protected $total=null;
-
-	/**
-	 * nombre maximal de recherche pour $total
-	 * si l'iterateur n'implemente pas de fonction specifique
-	 */
-	 protected $max=100000;
-
-
-	/**
-	 * Liste des champs a inserer dans les $row
-	 * retournes par ->fetch()
-	 */
-	 protected $select=array();
+    public function next(){
+        $this->pos++;
+        parent::next();
+    }
+
+    /**
+     * revient au depart
+     * @return void
+     */
+    public function rewind() {
+        $this->pos = 0;
+        $this->fetched = 0;
+        parent::rewind();
+    }
+
+
+    # Extension SPIP des iterateurs PHP
+    /**
+     * type de l'iterateur
+     * @var string
+     */
+    protected $type;
+
+    /**
+     * parametres de l'iterateur
+     * @var array
+     */
+    protected $command;
+
+    /**
+     * infos de compilateur
+     * @var array
+     */
+    protected $info;
+
+    /**
+     * position courante de l'iterateur
+     * @var int
+     */
+    protected $pos=null;
+
+    /**
+     * nombre total resultats dans l'iterateur
+     * @var int
+     */
+    protected $total=null;
+
+    /**
+     * nombre maximal de recherche pour $total
+     * si l'iterateur n'implemente pas de fonction specifique
+     */
+        protected $max=100000;
+
+
+    /**
+     * Liste des champs a inserer dans les $row
+     * retournes par ->fetch()
+     */
+        protected $select=array();
 
 	 
-	/**
-	 * aller a la position absolue n,
-	 * comptee depuis le debut
-	 *
-	 * @param int $n
-	 *   absolute pos
-	 * @param string $continue
-	 *   param for sql_ api
-	 * @return bool
-	 *   success or fail if not implemented
-	 */
-	public function seek($n=0, $continue=null) {
-		if ($this->func_filtre OR !method_exists($this->iter, 'seek') OR !$this->iter->seek($n)) {
-			$this->seek_loop($n);
-		}
-		$this->pos = $n;
-		$this->fetched = $n;
-		return true;
-	}
-
-	/*
+    /**
+     * aller a la position absolue n,
+     * comptee depuis le debut
+     *
+     * @param int $n
+     *   absolute pos
+     * @param string $continue
+     *   param for sql_ api
+     * @return bool
+     *   success or fail if not implemented
+     */
+    public function seek($n=0, $continue=null) {
+        if ($this->func_filtre OR !method_exists($this->iter, 'seek') OR !$this->iter->seek($n)) {
+            $this->seek_loop($n);
+        }
+        $this->pos = $n;
+        $this->fetched = $n;
+        return true;
+    }
+
+    /*
 	 * aller a la position $n en parcourant
 	 * un par un tous les elements
 	 */
-	private function seek_loop($n) {
-		if ($this->pos > $n)
-			$this->rewind();
-
-		while ($this->pos < $n AND $this->valid()) {
-			$this->next();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Avancer de $saut pas
-	 * @param  $saut
-	 * @param  $max
-	 * @return int
-	 */
-	public function skip($saut, $max=null){
-		// pas de saut en arriere autorise pour cette fonction
-		if (($saut=intval($saut))<=0) return $this->pos;
-		$seek = $this->pos + $saut;
-		// si le saut fait depasser le maxi, on libere la resource
-		// et on sort
-		if (is_null($max))
-			$max = $this->count();
-
-		if ($seek>=$max OR $seek>=$this->count()) {
-			// sortie plus rapide que de faire next() jusqu'a la fin !
-			$this->free();
-		  return $max;
-		}
-
-	  $this->seek($seek);
-	  return $this->pos;
-	}
-
-	/**
-	 * Renvoyer un tableau des donnees correspondantes
-	 * a la position courante de l'iterateur
-	 * en controlant si on respecte le filtre
-	 * Appliquer aussi le critere {offset,limit}
-	 *
-	 * @return array|bool
-	 */
-	public function fetch() {
-		if (method_exists($this->iter, 'fetch')) {
-			return $this->iter->fetch();
-		} else {
-
-			while ($this->valid()
-			AND (
-				!$this->accept()
-				OR (isset($this->offset) AND $this->fetched++ < $this->offset)
-			))
-				$this->next();
-
-			if (!$this->valid())
-				return false;
-
-			if (isset($this->limit)
-			AND $this->fetched > $this->offset + $this->limit)
-				return false;
-
-			$r = array();
-			foreach ($this->select as $nom) {
-				$r[$nom] = $this->get_select($nom);
-			}
-			$this->next();
-			return $r;
-		}
-	}
-
-	// retourner la cle pour #CLE
-	public function cle() {
-		return $this->key();
-	}
+    private function seek_loop($n) {
+        if ($this->pos > $n)
+            $this->rewind();
+
+        while ($this->pos < $n AND $this->valid()) {
+            $this->next();
+        }
+
+        return true;
+    }
+
+    /**
+     * Avancer de $saut pas
+     * @param  $saut
+     * @param  $max
+     * @return int
+     */
+    public function skip($saut, $max=null){
+        // pas de saut en arriere autorise pour cette fonction
+        if (($saut=intval($saut))<=0) return $this->pos;
+        $seek = $this->pos + $saut;
+        // si le saut fait depasser le maxi, on libere la resource
+        // et on sort
+        if (is_null($max))
+            $max = $this->count();
+
+        if ($seek>=$max OR $seek>=$this->count()) {
+            // sortie plus rapide que de faire next() jusqu'a la fin !
+            $this->free();
+            return $max;
+        }
+
+        $this->seek($seek);
+        return $this->pos;
+    }
+
+    /**
+     * Renvoyer un tableau des donnees correspondantes
+     * a la position courante de l'iterateur
+     * en controlant si on respecte le filtre
+     * Appliquer aussi le critere {offset,limit}
+     *
+     * @return array|bool
+     */
+    public function fetch() {
+        if (method_exists($this->iter, 'fetch')) {
+            return $this->iter->fetch();
+        } else {
+
+            while ($this->valid()
+            AND (
+                !$this->accept()
+                OR (isset($this->offset) AND $this->fetched++ < $this->offset)
+            ))
+                $this->next();
+
+            if (!$this->valid())
+                return false;
+
+            if (isset($this->limit)
+            AND $this->fetched > $this->offset + $this->limit)
+                return false;
+
+            $r = array();
+            foreach ($this->select as $nom) {
+                $r[$nom] = $this->get_select($nom);
+            }
+            $this->next();
+            return $r;
+        }
+    }
+
+    // retourner la cle pour #CLE
+    public function cle() {
+        return $this->key();
+    }
 	
-	// retourner la valeur pour #VALEUR
-	public function valeur() {
-		# attention PHP est mechant avec les objets, parfois il ne les
-		# clone pas proprement (directoryiterator sous php 5.2.2)
-		# on se rabat sur la version __toString()
-		if (is_object($v = $this->current())) {
-			if (method_exists($v, '__toString'))
-				$v = $v->__toString();
-			else
-				$v = (array) $v;
-		}
-		return $v;
-	}
-
-	/**
-	 * Accepte-t-on l'entree courante lue ?
-	 * On execute les filtres pour le savoir. 
-	**/
-	public function accept() {
-		if ($f = $this->func_filtre) {
-			return $f($this);
-		}
-		return true;
-	}
-
-	/**
-	 * liberer la ressource
-	 * @return bool
-	 */
-	public function free() {
-		if (method_exists($this->iter, 'free')) {
-			$this->iter->free();
-		}
-		$this->pos = $this->total = 0;
-		return true;
-	}
-
-	/**
-	 * Compter le nombre total de resultats
-	 * pour #TOTAL_BOUCLE
-	 * @return int
-	 */
-	public function count() {
-		if (is_null($this->total)) {
-			if (method_exists($this->iter, 'count')
-			AND !$this->func_filtre) {
-				return $this->total = $this->iter->count();
-			} else {
-				// compter les lignes et rembobiner
-				$total = 0;
-				$pos = $this->pos; // sauver la position
-				$this->rewind();
-				while ($this->fetch() and $total < $this->max) {
-					$total++;
-				}
-				$this->seek($pos);
-				$this->total = $total;
-			}
-		}
-
-		return $this->total;
-	}
+    // retourner la valeur pour #VALEUR
+    public function valeur() {
+        # attention PHP est mechant avec les objets, parfois il ne les
+        # clone pas proprement (directoryiterator sous php 5.2.2)
+        # on se rabat sur la version __toString()
+        if (is_object($v = $this->current())) {
+            if (method_exists($v, '__toString'))
+                $v = $v->__toString();
+            else
+                $v = (array) $v;
+        }
+        return $v;
+    }
+
+    /**
+     * Accepte-t-on l'entree courante lue ?
+     * On execute les filtres pour le savoir. 
+     **/
+    public function accept() {
+        if ($f = $this->func_filtre) {
+            return $f($this);
+        }
+        return true;
+    }
+
+    /**
+     * liberer la ressource
+     * @return bool
+     */
+    public function free() {
+        if (method_exists($this->iter, 'free')) {
+            $this->iter->free();
+        }
+        $this->pos = $this->total = 0;
+        return true;
+    }
+
+    /**
+     * Compter le nombre total de resultats
+     * pour #TOTAL_BOUCLE
+     * @return int
+     */
+    public function count() {
+        if (is_null($this->total)) {
+            if (method_exists($this->iter, 'count')
+            AND !$this->func_filtre) {
+                return $this->total = $this->iter->count();
+            } else {
+                // compter les lignes et rembobiner
+                $total = 0;
+                $pos = $this->pos; // sauver la position
+                $this->rewind();
+                while ($this->fetch() and $total < $this->max) {
+                    $total++;
+                }
+                $this->seek($pos);
+                $this->total = $total;
+            }
+        }
+
+        return $this->total;
+    }
 	
 }
 

Spacing +38 added lines, -38 removed lines

@@ -19,8 +19,8 @@ 
  * fourni dans le fichier iterateurs/xxx.php
  * 
  */
-class IterFactory{
-	public static function create($iterateur, $command, $info=null){
+class IterFactory {
+	public static function create($iterateur, $command, $info = null) {
 
 		// cas des SI {si expression} analises tres tot
 		// pour eviter le chargement de tout iterateur
@@ -38,11 +38,11 @@ 
 		// (il faudrait passer l'argument ->sql_serveur
 		// pour etre certain qu'on est sur un "php:")
 		if (class_exists($iterateur)) {
-			$a = isset($command['args']) ? $command['args'] : array() ;
+			$a = isset($command['args']) ? $command['args'] : array();
 
 			// permettre de passer un Iterateur directement {args #ITERATEUR} :
 			// si on recoit deja un iterateur en argument, on l'utilise
-			if (count($a)==1 and is_object($a[0]) and is_subclass_of($a[0], 'Iterator')) {
+			if (count($a) == 1 and is_object($a[0]) and is_subclass_of($a[0], 'Iterator')) {
 				$iter = $a[0];
 
 			// sinon, on cree un iterateur du type donne
@@ -51,11 +51,11 @@ 
 				// (pas glop)
 				try {
 					switch (count($a)) {
-						case 0:    $iter = new $iterateur();  break;
-						case 1:    $iter = new $iterateur($a[0]);  break;
-						case 2:    $iter = new $iterateur($a[0], $a[1]);  break;
-						case 3:    $iter = new $iterateur($a[0], $a[1], $a[2]);  break;
-						case 4:    $iter = new $iterateur($a[0], $a[1], $a[2], $a[3]);  break;
+						case 0:    $iter = new $iterateur(); break;
+						case 1:    $iter = new $iterateur($a[0]); break;
+						case 2:    $iter = new $iterateur($a[0], $a[1]); break;
+						case 3:    $iter = new $iterateur($a[0], $a[1], $a[2]); break;
+						case 4:    $iter = new $iterateur($a[0], $a[1], $a[2], $a[3]); break;
 					}
 				} catch (Exception $e) {
 					spip_log("Erreur de chargement de l'iterateur $iterateur");
@@ -68,8 +68,8 @@ 
 			// IterateurXXX
 			// definie dans le fichier iterateurs/xxx.php
 			$class = "Iterateur".$iterateur;
-			if (!class_exists($class)){
-				if (!include_spip("iterateur/" . strtolower($iterateur))
+			if (!class_exists($class)) {
+				if (!include_spip("iterateur/".strtolower($iterateur))
 					OR !class_exists($class)) {
 					die("Iterateur $iterateur non trouvé");
 					// si l'iterateur n'existe pas, on se rabat sur le generique
@@ -114,7 +114,7 @@ 
 	 * en tenant compte des filtres
 	 * @var int
 	 */
-	protected $fetched=0;
+	protected $fetched = 0;
 
 	/**
 	 * Y a t'il une erreur ?
@@ -135,7 +135,7 @@ 
 		return false;
 	}
 
-	public function __construct(Iterator $iter, $command, $info){
+	public function __construct(Iterator $iter, $command, $info) {
 		parent::__construct($iter);
 		parent::rewind(); // remettre a la premiere position (bug? connu de FilterIterator)
 		
@@ -168,7 +168,7 @@ 
 	// 
 	private function calculer_select() {
 		if ($select = &$this->command['select']) {
-			foreach($select as $s) {
+			foreach ($select as $s) {
 				// /!\ $s = '.nom'
 				if ($s[0] == '.') {
 					$s = substr($s, 1);
@@ -186,9 +186,9 @@ 
 		AND method_exists($this->iter, $nom)) {
 			try {
 				return $this->iter->$nom();
-			} catch(Exception $e) {
+			} catch (Exception $e) {
 				// #GETCHILDREN sur un fichier de DirectoryIterator ...
-				spip_log("Methode $nom en echec sur " . get_class($this->iter));
+				spip_log("Methode $nom en echec sur ".get_class($this->iter));
 				spip_log("Cela peut être normal : retour d'une ligne de resultat ne pouvant pas calculer cette methode");
 				return '';
 			}
@@ -220,13 +220,13 @@ 
 		// IN sur collection vide (ce dernier devrait pouvoir etre fait a la compil)
 		if ($where = &$this->command['where']) {
 			$menage = false;
-			foreach($where as $k => $v) { 
-				if (is_array($v)){
-					if ((count($v)>=2) && ($v[0]=='REGEXP') && ($v[2]=="'.*'")) $op= false;
-					elseif ((count($v)>=2) && ($v[0]=='LIKE') && ($v[2]=="'%'")) $op= false;
+			foreach ($where as $k => $v) { 
+				if (is_array($v)) {
+					if ((count($v) >= 2) && ($v[0] == 'REGEXP') && ($v[2] == "'.*'")) $op = false;
+					elseif ((count($v) >= 2) && ($v[0] == 'LIKE') && ($v[2] == "'%'")) $op = false;
 					else $op = $v[0] ? $v[0] : $v;
 				} else $op = $v;
-				if ((!$op) OR ($op==1) OR ($op=='0=0')) {
+				if ((!$op) OR ($op == 1) OR ($op == '0=0')) {
 					unset($where[$k]);
 					$menage = true;
 				}
@@ -235,17 +235,17 @@ 
 				// produites par sql_in quand plus de 255 valeurs passees a IN
 				if (preg_match_all(',\s+IN\s+(\(.*\)),', $op, $s_req)) {
 					$req = '';
-					foreach($s_req[1] as $key => $val) {
-						$req .= trim($val, '(,)') . ',';
+					foreach ($s_req[1] as $key => $val) {
+						$req .= trim($val, '(,)').',';
 					}
-					$req = '(' . rtrim($req, ',') . ')';
+					$req = '('.rtrim($req, ',').')';
 				}
 				if (preg_match(',^\(\(([\w/]+)(\s+NOT)?\s+IN\s+(\(.*\))\)(?:\s+(AND|OR)\s+\(([\w/]+)(\s+NOT)?\s+IN\s+(\(.*\))\))*\)$,', $op, $regs)) {
 					$this->ajouter_filtre($regs[1], 'IN', strlen($req) ? $req : $regs[3], $regs[2]);
 					unset($op);
 				}
 			}
-			foreach($where as $k => $v) {
+			foreach ($where as $k => $v) {
 				// 3 possibilites : count($v) =
 				// * 1 : {x y} ; on recoit $v[0] = y
 				// * 2 : {x !op y} ; on recoit $v[0] = 'NOT', $v[1] = array() // array du type {x op y}
@@ -266,7 +266,7 @@ 
 
 		// critere {2,7}
 		if (isset($this->command['limit']) AND $this->command['limit']) {
-			$limit = explode(',',$this->command['limit']);
+			$limit = explode(',', $this->command['limit']);
 			$this->offset = $limit[0];
 			$this->limit = $limit[1];
 		}
@@ -279,7 +279,7 @@ 
 
 
 
-	protected function ajouter_filtre($cle, $op, $valeur, $not=false) {
+	protected function ajouter_filtre($cle, $op, $valeur, $not = false) {
 		if (method_exists($this->iter, 'exception_des_criteres')) {
 			if (in_array($cle, $this->iter->exception_des_criteres())) {
 				return;
@@ -310,8 +310,8 @@ 
 		} else if ($op == 'IN') {
 			$filtre = 'in_array('.$a.', array'.$valeur.')';
 			$op = '';
-		} else if (!in_array($op, array('<','<=', '>', '>='))) {
-			spip_log('operateur non reconnu ' . $op); // [todo] mettre une erreur de squelette
+		} else if (!in_array($op, array('<', '<=', '>', '>='))) {
+			spip_log('operateur non reconnu '.$op); // [todo] mettre une erreur de squelette
 			$op = '';
 		}
 	
@@ -327,7 +327,7 @@ 
 	}
 
 	
-	public function next(){
+	public function next() {
 		$this->pos++;
 		parent::next();
 	}
@@ -366,26 +366,26 @@ 
 	 * position courante de l'iterateur
 	 * @var int
 	 */
-	protected $pos=null;
+	protected $pos = null;
 
 	/**
 	 * nombre total resultats dans l'iterateur
 	 * @var int
 	 */
-	protected $total=null;
+	protected $total = null;
 
 	/**
 	 * nombre maximal de recherche pour $total
 	 * si l'iterateur n'implemente pas de fonction specifique
 	 */
-	 protected $max=100000;
+	 protected $max = 100000;
 
 
 	/**
 	 * Liste des champs a inserer dans les $row
 	 * retournes par ->fetch()
 	 */
-	 protected $select=array();
+	 protected $select = array();
 
 	 
 	/**
@@ -399,7 +399,7 @@ 
 	 * @return bool
 	 *   success or fail if not implemented
 	 */
-	public function seek($n=0, $continue=null) {
+	public function seek($n = 0, $continue = null) {
 		if ($this->func_filtre OR !method_exists($this->iter, 'seek') OR !$this->iter->seek($n)) {
 			$this->seek_loop($n);
 		}
@@ -429,16 +429,16 @@ 
 	 * @param  $max
 	 * @return int
 	 */
-	public function skip($saut, $max=null){
+	public function skip($saut, $max = null) {
 		// pas de saut en arriere autorise pour cette fonction
-		if (($saut=intval($saut))<=0) return $this->pos;
+		if (($saut = intval($saut)) <= 0) return $this->pos;
 		$seek = $this->pos + $saut;
 		// si le saut fait depasser le maxi, on libere la resource
 		// et on sort
 		if (is_null($max))
 			$max = $this->count();
 
-		if ($seek>=$max OR $seek>=$this->count()) {
+		if ($seek >= $max OR $seek >= $this->count()) {
 			// sortie plus rapide que de faire next() jusqu'a la fin !
 			$this->free();
 		  return $max;

Braces +48 added lines, -28 removed lines

@@ -11,7 +11,9 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 /**
  * Fabrique d'iterateur
@@ -128,10 +130,12 @@ 
 	 * (select SQL errone, non chargement des DATA, etc)
 	 */
 	public function err() {
-		if (method_exists($this->iter, 'err'))
-			return $this->iter->err();
-		if (property_exists($this->iter, 'err'))
-			return $this->iter->err;
+		if (method_exists($this->iter, 'err')) {
+					return $this->iter->err();
+		}
+		if (property_exists($this->iter, 'err')) {
+					return $this->iter->err;
+		}
 		return false;
 	}
 
@@ -222,10 +226,16 @@ 
 			$menage = false;
 			foreach($where as $k => $v) { 
 				if (is_array($v)){
-					if ((count($v)>=2) && ($v[0]=='REGEXP') && ($v[2]=="'.*'")) $op= false;
-					elseif ((count($v)>=2) && ($v[0]=='LIKE') && ($v[2]=="'%'")) $op= false;
-					else $op = $v[0] ? $v[0] : $v;
-				} else $op = $v;
+					if ((count($v)>=2) && ($v[0]=='REGEXP') && ($v[2]=="'.*'")) {
+					    $op= false;
+					} elseif ((count($v)>=2) && ($v[0]=='LIKE') && ($v[2]=="'%'")) {
+					    $op= false;
+					} else {
+					    $op = $v[0] ? $v[0] : $v;
+					}
+				} else {
+				    $op = $v;
+				}
 				if ((!$op) OR ($op==1) OR ($op=='0=0')) {
 					unset($where[$k]);
 					$menage = true;
@@ -315,11 +325,13 @@ 
 			$op = '';
 		}
 	
-		if ($op)
-			$filtre = $a.$op.str_replace('\"', '"', $valeur);
+		if ($op) {
+					$filtre = $a.$op.str_replace('\"', '"', $valeur);
+		}
 
-		if ($not)
-			$filtre = "!($filtre)";
+		if ($not) {
+					$filtre = "!($filtre)";
+		}
 			
 		if ($filtre) {
 			$this->filtre[] = $filtre;
@@ -413,8 +425,9 @@ 
 	 * un par un tous les elements
 	 */
 	private function seek_loop($n) {
-		if ($this->pos > $n)
-			$this->rewind();
+		if ($this->pos > $n) {
+					$this->rewind();
+		}
 
 		while ($this->pos < $n AND $this->valid()) {
 			$this->next();
@@ -431,12 +444,15 @@ 
 	 */
 	public function skip($saut, $max=null){
 		// pas de saut en arriere autorise pour cette fonction
-		if (($saut=intval($saut))<=0) return $this->pos;
+		if (($saut=intval($saut))<=0) {
+		    return $this->pos;
+		}
 		$seek = $this->pos + $saut;
 		// si le saut fait depasser le maxi, on libere la resource
 		// et on sort
-		if (is_null($max))
-			$max = $this->count();
+		if (is_null($max)) {
+					$max = $this->count();
+		}
 
 		if ($seek>=$max OR $seek>=$this->count()) {
 			// sortie plus rapide que de faire next() jusqu'a la fin !
@@ -465,15 +481,18 @@ 
 			AND (
 				!$this->accept()
 				OR (isset($this->offset) AND $this->fetched++ < $this->offset)
-			))
-				$this->next();
+			)) {
+							$this->next();
+			}
 
-			if (!$this->valid())
-				return false;
+			if (!$this->valid()) {
+							return false;
+			}
 
 			if (isset($this->limit)
-			AND $this->fetched > $this->offset + $this->limit)
-				return false;
+			AND $this->fetched > $this->offset + $this->limit) {
+							return false;
+			}
 
 			$r = array();
 			foreach ($this->select as $nom) {
@@ -495,10 +514,11 @@ 
 		# clone pas proprement (directoryiterator sous php 5.2.2)
 		# on se rabat sur la version __toString()
 		if (is_object($v = $this->current())) {
-			if (method_exists($v, '__toString'))
-				$v = $v->__toString();
-			else
-				$v = (array) $v;
+			if (method_exists($v, '__toString')) {
+							$v = $v->__toString();
+			} else {
+							$v = (array) $v;
+			}
 		}
 		return $v;
 	}

ecrire/public/jointures.php

Doc Comments +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
  *
  * @param array $depart
  * @param array $arrivee
- * @param string|array $col
+ * @param string $col
  * @return bool
  */
 function nogroupby_if($depart, $arrivee, $col){

Indentation +299 added lines, -299 removed lines

@@ -30,10 +30,10 @@ 
  * @return array
  */
 function decompose_champ_id_objet($champ){
-	if (($champ!=='id_objet') AND preg_match(',^id_([a-z_]+)$,', $champ, $regs)){
-		return array('id_objet', 'objet', objet_type($regs[1]));
-	}
-	return $champ;
+    if (($champ!=='id_objet') AND preg_match(',^id_([a-z_]+)$,', $champ, $regs)){
+        return array('id_objet', 'objet', objet_type($regs[1]));
+    }
+    return $champ;
 }
 
 /**
@@ -46,16 +46,16 @@ 
  * @return array
  */
 function trouver_champs_decomposes($champ, $desc){
-	if (!is_array($desc) // on ne se risque pas en conjectures si on ne connait pas la table
-	    OR array_key_exists($champ, $desc['field'])
-	)
-		return array($champ);
-	if (is_array($decompose = decompose_champ_id_objet($champ))){
-		array_pop($decompose);
-		if (count(array_intersect($decompose, array_keys($desc['field'])))==count($decompose))
-			return $decompose;
-	}
-	return array($champ);
+    if (!is_array($desc) // on ne se risque pas en conjectures si on ne connait pas la table
+        OR array_key_exists($champ, $desc['field'])
+    )
+        return array($champ);
+    if (is_array($decompose = decompose_champ_id_objet($champ))){
+        array_pop($decompose);
+        if (count(array_intersect($decompose, array_keys($desc['field'])))==count($decompose))
+            return $decompose;
+    }
+    return array($champ);
 }
 
 
@@ -79,21 +79,21 @@ 
  * @return string
  */
 function calculer_jointure(&$boucle, $depart, $arrivee, $col = '', $cond = false, $max_liens=5){
-	// les jointures minimales sont optimales :
-	// on contraint le nombre d'etapes en l'augmentant
-	// jusqu'a ce qu'on trouve une jointure ou qu'on atteigne la limite maxi 
-	$max = 1;
-	$res = false;
-	$milieu_exclus = ($col?$col:array());
-	while ($max<=$max_liens AND !$res){
-		$res = calculer_chaine_jointures($boucle, $depart, $arrivee, array(), $milieu_exclus, $max);
-		$max++;
-	}
-	if (!$res) return "";
-
-	list($nom, $desc) = $depart;
-
-	return fabrique_jointures($boucle, $res, $cond, $desc, $nom, $col);
+    // les jointures minimales sont optimales :
+    // on contraint le nombre d'etapes en l'augmentant
+    // jusqu'a ce qu'on trouve une jointure ou qu'on atteigne la limite maxi 
+    $max = 1;
+    $res = false;
+    $milieu_exclus = ($col?$col:array());
+    while ($max<=$max_liens AND !$res){
+        $res = calculer_chaine_jointures($boucle, $depart, $arrivee, array(), $milieu_exclus, $max);
+        $max++;
+    }
+    if (!$res) return "";
+
+    list($nom, $desc) = $depart;
+
+    return fabrique_jointures($boucle, $res, $cond, $desc, $nom, $col);
 }
 
 /**
@@ -125,66 +125,66 @@ 
  * @return string
  */
 function fabrique_jointures(&$boucle, $res, $cond = false, $desc = array(), $nom = '', $col = '', $echap = true){
-	static $num = array();
-	$id_table = "";
-	$cpt = &$num[$boucle->descr['nom']][$boucle->descr['gram']][$boucle->id_boucle];
-	foreach ($res as $cle => $r){
-		list($d, $a, $j) = $r;
-		if (!$id_table) $id_table = $d;
-		$n = ++$cpt;
-		if (is_array($j)){ // c'est un lien sur un champ du type id_objet,objet,'article'
-			list($j1, $j2, $obj, $type) = $j;
-			// trouver de quel cote est (id_objet,objet)
-			if ($j1=="id_$obj")
-				$obj = "$id_table.$obj";
-			else
-				$obj = "L$n.$obj";
-			// le where complementaire est envoye dans la jointure pour pouvoir etre elimine avec la jointure
-			// en cas d'optimisation
-			//$boucle->where[] = array("'='","'$obj'","sql_quote('$type')");
-			$boucle->join["L$n"] =
-				$echap ?
-					array("'$id_table'", "'$j2'", "'$j1'", "'$obj='.sql_quote('$type')")
-					:
-					array($id_table, $j2, $j1, "$obj=".sql_quote($type));
-		}
-		else
-			$boucle->join["L$n"] = $echap ? array("'$id_table'", "'$j'") : array($id_table, $j);
-		$boucle->from[$id_table = "L$n"] = $a[0];
-	}
-
-
-	// pas besoin de group by
-	// (cf http://article.gmane.org/gmane.comp.web.spip.devel/30555)
-	// si une seule jointure et sur une table avec primary key formee
-	// de l'index principal et de l'index de jointure (non conditionnel! [6031])
-	// et operateur d'egalite (http://trac.rezo.net/trac/spip/ticket/477)
-
-	if ($pk = (isset($a[1]) && (count($boucle->from)==2) && !$cond)){
-		$pk = nogroupby_if($desc, $a[1], $col);
-	}
-
-	// pas de group by 
-	// si une seule jointure
-	// et si l'index de jointure est une primary key a l'arrivee !
-	if (!$pk
-	    AND (count($boucle->from)==2)
-	        AND isset($a[1]['key']['PRIMARY KEY'])
-	            AND ($j==$a[1]['key']['PRIMARY KEY'])
-	)
-		$pk = true;
-
-	// la clause Group by est en conflit avec ORDER BY, a completer
-	$groups = liste_champs_jointures($nom, $desc, true);
-	if (!$pk) foreach ($groups as $id_prim){
-		$id_field = $nom.'.'.$id_prim;
-		if (!in_array($id_field, $boucle->group)){
-			$boucle->group[] = $id_field;
-		}
-	}
-
-	$boucle->modificateur['lien'] = true;
-	return "L$n";
+    static $num = array();
+    $id_table = "";
+    $cpt = &$num[$boucle->descr['nom']][$boucle->descr['gram']][$boucle->id_boucle];
+    foreach ($res as $cle => $r){
+        list($d, $a, $j) = $r;
+        if (!$id_table) $id_table = $d;
+        $n = ++$cpt;
+        if (is_array($j)){ // c'est un lien sur un champ du type id_objet,objet,'article'
+            list($j1, $j2, $obj, $type) = $j;
+            // trouver de quel cote est (id_objet,objet)
+            if ($j1=="id_$obj")
+                $obj = "$id_table.$obj";
+            else
+                $obj = "L$n.$obj";
+            // le where complementaire est envoye dans la jointure pour pouvoir etre elimine avec la jointure
+            // en cas d'optimisation
+            //$boucle->where[] = array("'='","'$obj'","sql_quote('$type')");
+            $boucle->join["L$n"] =
+                $echap ?
+                    array("'$id_table'", "'$j2'", "'$j1'", "'$obj='.sql_quote('$type')")
+                    :
+                    array($id_table, $j2, $j1, "$obj=".sql_quote($type));
+        }
+        else
+            $boucle->join["L$n"] = $echap ? array("'$id_table'", "'$j'") : array($id_table, $j);
+        $boucle->from[$id_table = "L$n"] = $a[0];
+    }
+
+
+    // pas besoin de group by
+    // (cf http://article.gmane.org/gmane.comp.web.spip.devel/30555)
+    // si une seule jointure et sur une table avec primary key formee
+    // de l'index principal et de l'index de jointure (non conditionnel! [6031])
+    // et operateur d'egalite (http://trac.rezo.net/trac/spip/ticket/477)
+
+    if ($pk = (isset($a[1]) && (count($boucle->from)==2) && !$cond)){
+        $pk = nogroupby_if($desc, $a[1], $col);
+    }
+
+    // pas de group by 
+    // si une seule jointure
+    // et si l'index de jointure est une primary key a l'arrivee !
+    if (!$pk
+        AND (count($boucle->from)==2)
+            AND isset($a[1]['key']['PRIMARY KEY'])
+                AND ($j==$a[1]['key']['PRIMARY KEY'])
+    )
+        $pk = true;
+
+    // la clause Group by est en conflit avec ORDER BY, a completer
+    $groups = liste_champs_jointures($nom, $desc, true);
+    if (!$pk) foreach ($groups as $id_prim){
+        $id_field = $nom.'.'.$id_prim;
+        if (!in_array($id_field, $boucle->group)){
+            $boucle->group[] = $id_field;
+        }
+    }
+
+    $boucle->modificateur['lien'] = true;
+    return "L$n";
 }
 
 /**
@@ -200,12 +200,12 @@ 
  * @return bool
  */
 function nogroupby_if($depart, $arrivee, $col){
-	$pk = $arrivee['key']['PRIMARY KEY'];
-	if (!$pk) return false;
-	$id_primary = $depart['key']['PRIMARY KEY'];
-	if (is_array($col)) $col = implode(', *', $col); // cas id_objet, objet
-	return (preg_match("/^$id_primary, *$col$/", $pk) OR
-	        preg_match("/^$col, *$id_primary$/", $pk));
+    $pk = $arrivee['key']['PRIMARY KEY'];
+    if (!$pk) return false;
+    $id_primary = $depart['key']['PRIMARY KEY'];
+    if (is_array($col)) $col = implode(', *', $col); // cas id_objet, objet
+    return (preg_match("/^$id_primary, *$col$/", $pk) OR
+            preg_match("/^$col, *$id_primary$/", $pk));
 }
 
 /**
@@ -224,33 +224,33 @@ 
  */
 function liste_champs_jointures($nom, $desc, $primary = false){
 
-	static $nojoin = array('idx', 'maj', 'date', 'statut');
+    static $nojoin = array('idx', 'maj', 'date', 'statut');
 
-	// si cle primaire demandee, la privilegier
-	if ($primary && isset($desc['key']['PRIMARY KEY']))
-		return split_key($desc['key']['PRIMARY KEY']);
+    // si cle primaire demandee, la privilegier
+    if ($primary && isset($desc['key']['PRIMARY KEY']))
+        return split_key($desc['key']['PRIMARY KEY']);
 
-	// les champs declares explicitement pour les jointures
-	if (isset($desc['join'])) return $desc['join'];
-	/*elseif (isset($GLOBALS['tables_principales'][$nom]['join'])) return $GLOBALS['tables_principales'][$nom]['join'];
+    // les champs declares explicitement pour les jointures
+    if (isset($desc['join'])) return $desc['join'];
+    /*elseif (isset($GLOBALS['tables_principales'][$nom]['join'])) return $GLOBALS['tables_principales'][$nom]['join'];
 	elseif (isset($GLOBALS['tables_auxiliaires'][$nom]['join'])) return $GLOBALS['tables_auxiliaires'][$nom]['join'];*/
 
-	// si pas de cle, c'est fichu
-	if (!isset($desc['key'])) return array();
+    // si pas de cle, c'est fichu
+    if (!isset($desc['key'])) return array();
 
-	// si cle primaire
-	if (isset($desc['key']['PRIMARY KEY']))
-		return split_key($desc['key']['PRIMARY KEY']);
+    // si cle primaire
+    if (isset($desc['key']['PRIMARY KEY']))
+        return split_key($desc['key']['PRIMARY KEY']);
 
-	// ici on se rabat sur les cles secondaires, 
-	// en eliminant celles qui sont pas pertinentes (idx, maj)
-	// si jamais le resultat n'est pas pertinent pour une table donnee,
-	// il faut declarer explicitement le champ 'join' de sa description
+    // ici on se rabat sur les cles secondaires, 
+    // en eliminant celles qui sont pas pertinentes (idx, maj)
+    // si jamais le resultat n'est pas pertinent pour une table donnee,
+    // il faut declarer explicitement le champ 'join' de sa description
 
-	$join = array();
-	foreach ($desc['key'] as $v) $join = split_key($v, $join);
-	foreach ($join as $k) if (in_array($k, $nojoin)) unset($join[$k]);
-	return $join;
+    $join = array();
+    foreach ($desc['key'] as $v) $join = split_key($v, $join);
+    foreach ($join as $k) if (in_array($k, $nojoin)) unset($join[$k]);
+    return $join;
 }
 
 /**
@@ -263,8 +263,8 @@ 
  * @return array
  */
 function split_key($v, $join = array()){
-	foreach (preg_split('/,\s*/', $v) as $k) $join[$k] = $k;
-	return $join;
+    foreach (preg_split('/,\s*/', $v) as $k) $join[$k] = $k;
+    return $join;
 }
 
 /**
@@ -286,112 +286,112 @@ 
  * @return array
  */
 function calculer_chaine_jointures(&$boucle, $depart, $arrivee, $vu = array(), $milieu_exclus = array(), $max_liens = 5){
-	static $trouver_table;
-	if (!$trouver_table)
-		$trouver_table = charger_fonction('trouver_table', 'base');
-
-	if (is_string($milieu_exclus))
-		$milieu_exclus = array($milieu_exclus);
-	// quand on a exclus id_objet comme cle de jointure, il faut aussi exclure objet
-	// faire une jointure sur objet tout seul n'a pas de sens
-	if (in_array('id_objet',$milieu_exclus) AND !in_array('objet',$milieu_exclus))
-		$milieu_exclus[] = 'objet';
-
-	list($dnom, $ddesc) = $depart;
-	list($anom, $adesc) = $arrivee;
-	if (!count($vu)){
-		$vu[] = $dnom; // ne pas oublier la table de depart
-		$vu[] = $anom; // ne pas oublier la table d'arrivee
-	}
-
-	$akeys = array();
-	foreach ($adesc['key'] as $k) {
-		// respecter l'ordre de $adesc['key'] pour ne pas avoir id_trad en premier entre autres...
-		$akeys = array_merge($akeys, preg_split('/,\s*/', $k));
-	}
-
-	// enlever les cles d'arrivee exclues par l'appel
-	$akeys = array_diff($akeys, $milieu_exclus);
-
-	// cles candidates au depart
-	$keys = liste_champs_jointures($dnom, $ddesc);
-	// enlever les cles dde depart exclues par l'appel
-	$keys = array_diff($keys, $milieu_exclus);
-
-	$v = !$keys ? false : array_intersect(array_values($keys), $akeys);
-
-	if ($v)
-		return array(array($dnom, array($adesc['table'], $adesc), array_shift($v)));
-
-	// regarder si l'on a (id_objet,objet) au depart et si on peut le mapper sur un id_xx
-	if (count(array_intersect(array('id_objet', 'objet'), $keys))==2){
-		// regarder si l'une des cles d'arrivee peut se decomposer en 
-		// id_objet,objet
-		// si oui on la prend
-		foreach ($akeys as $key){
-			$v = decompose_champ_id_objet($key);
-			if (is_array($v)){
-				$objet = array_shift($v); // objet,'article'
-				array_unshift($v, $key); // id_article,objet,'article'
-				array_unshift($v, $objet); // id_objet,id_article,objet,'article'
-				return array(array($dnom, array($adesc['table'], $adesc), $v));
-			}
-		}
-	}
-	else {
-		// regarder si l'une des cles de depart peut se decomposer en 
-		// id_objet,objet a l'arrivee
-		// si oui on la prend
-		foreach ($keys as $key){
-			if (count($v = trouver_champs_decomposes($key, $adesc))>1){
-				if (count($v)==count(array_intersect($v, $akeys))){
-					$v = decompose_champ_id_objet($key); // id_objet,objet,'article'
-					array_unshift($v, $key); // id_article,id_objet,objet,'article'
-					return array(array($dnom, array($adesc['table'], $adesc), $v));
-				}
-			}
-		}
-	}
-	// si l'on voulait une jointure direct, c'est rate !
-	if ($max_liens<=1) return array();
-
-	// sinon essayer de passer par une autre table
-	$new = $vu;
-	foreach ($boucle->jointures as $v){
-		if ($v
-		    AND !in_array($v, $vu)
-		    AND $def = $trouver_table($v, $boucle->sql_serveur)
-			  AND !in_array($def['table_sql'], $vu)
-		){
-			// ne pas tester les cles qui sont exclues a l'appel
-			// ie la cle de la jointure precedente
-			$test_cles = $milieu_exclus;
-			$new[] = $v;
-			$max_iter = 50; // securite
-			while (count($jointure_directe_possible = calculer_chaine_jointures($boucle, $depart, array($v, $def), $vu, $test_cles, 1))
-			       AND $max_iter--){
-				$jointure_directe_possible = reset($jointure_directe_possible);
-				$milieu = end($jointure_directe_possible);
-				$exclure_fin = $milieu_exclus;
-				if (is_string($milieu)){
-					$exclure_fin[] = $milieu;
-					$test_cles[] = $milieu;
-				}
-				else{
-					$exclure_fin = array_merge($exclure_fin, $milieu);
-					$test_cles = array_merge($test_cles, $milieu);
-				}
-				// essayer de rejoindre l'arrivee a partir de cette etape intermediaire
-				// sans repasser par la meme cle milieu, ni une cle deja vue !
-				$r = calculer_chaine_jointures($boucle, array($v, $def), $arrivee, $new, $exclure_fin, $max_liens-1);
-				if ($r){
-					array_unshift($r, $jointure_directe_possible);
-					return $r;
-				}
-			}
-		}
-	}
-	return array();
+    static $trouver_table;
+    if (!$trouver_table)
+        $trouver_table = charger_fonction('trouver_table', 'base');
+
+    if (is_string($milieu_exclus))
+        $milieu_exclus = array($milieu_exclus);
+    // quand on a exclus id_objet comme cle de jointure, il faut aussi exclure objet
+    // faire une jointure sur objet tout seul n'a pas de sens
+    if (in_array('id_objet',$milieu_exclus) AND !in_array('objet',$milieu_exclus))
+        $milieu_exclus[] = 'objet';
+
+    list($dnom, $ddesc) = $depart;
+    list($anom, $adesc) = $arrivee;
+    if (!count($vu)){
+        $vu[] = $dnom; // ne pas oublier la table de depart
+        $vu[] = $anom; // ne pas oublier la table d'arrivee
+    }
+
+    $akeys = array();
+    foreach ($adesc['key'] as $k) {
+        // respecter l'ordre de $adesc['key'] pour ne pas avoir id_trad en premier entre autres...
+        $akeys = array_merge($akeys, preg_split('/,\s*/', $k));
+    }
+
+    // enlever les cles d'arrivee exclues par l'appel
+    $akeys = array_diff($akeys, $milieu_exclus);
+
+    // cles candidates au depart
+    $keys = liste_champs_jointures($dnom, $ddesc);
+    // enlever les cles dde depart exclues par l'appel
+    $keys = array_diff($keys, $milieu_exclus);
+
+    $v = !$keys ? false : array_intersect(array_values($keys), $akeys);
+
+    if ($v)
+        return array(array($dnom, array($adesc['table'], $adesc), array_shift($v)));
+
+    // regarder si l'on a (id_objet,objet) au depart et si on peut le mapper sur un id_xx
+    if (count(array_intersect(array('id_objet', 'objet'), $keys))==2){
+        // regarder si l'une des cles d'arrivee peut se decomposer en 
+        // id_objet,objet
+        // si oui on la prend
+        foreach ($akeys as $key){
+            $v = decompose_champ_id_objet($key);
+            if (is_array($v)){
+                $objet = array_shift($v); // objet,'article'
+                array_unshift($v, $key); // id_article,objet,'article'
+                array_unshift($v, $objet); // id_objet,id_article,objet,'article'
+                return array(array($dnom, array($adesc['table'], $adesc), $v));
+            }
+        }
+    }
+    else {
+        // regarder si l'une des cles de depart peut se decomposer en 
+        // id_objet,objet a l'arrivee
+        // si oui on la prend
+        foreach ($keys as $key){
+            if (count($v = trouver_champs_decomposes($key, $adesc))>1){
+                if (count($v)==count(array_intersect($v, $akeys))){
+                    $v = decompose_champ_id_objet($key); // id_objet,objet,'article'
+                    array_unshift($v, $key); // id_article,id_objet,objet,'article'
+                    return array(array($dnom, array($adesc['table'], $adesc), $v));
+                }
+            }
+        }
+    }
+    // si l'on voulait une jointure direct, c'est rate !
+    if ($max_liens<=1) return array();
+
+    // sinon essayer de passer par une autre table
+    $new = $vu;
+    foreach ($boucle->jointures as $v){
+        if ($v
+            AND !in_array($v, $vu)
+            AND $def = $trouver_table($v, $boucle->sql_serveur)
+              AND !in_array($def['table_sql'], $vu)
+        ){
+            // ne pas tester les cles qui sont exclues a l'appel
+            // ie la cle de la jointure precedente
+            $test_cles = $milieu_exclus;
+            $new[] = $v;
+            $max_iter = 50; // securite
+            while (count($jointure_directe_possible = calculer_chaine_jointures($boucle, $depart, array($v, $def), $vu, $test_cles, 1))
+                   AND $max_iter--){
+                $jointure_directe_possible = reset($jointure_directe_possible);
+                $milieu = end($jointure_directe_possible);
+                $exclure_fin = $milieu_exclus;
+                if (is_string($milieu)){
+                    $exclure_fin[] = $milieu;
+                    $test_cles[] = $milieu;
+                }
+                else{
+                    $exclure_fin = array_merge($exclure_fin, $milieu);
+                    $test_cles = array_merge($test_cles, $milieu);
+                }
+                // essayer de rejoindre l'arrivee a partir de cette etape intermediaire
+                // sans repasser par la meme cle milieu, ni une cle deja vue !
+                $r = calculer_chaine_jointures($boucle, array($v, $def), $arrivee, $new, $exclure_fin, $max_liens-1);
+                if ($r){
+                    array_unshift($r, $jointure_directe_possible);
+                    return $r;
+                }
+            }
+        }
+    }
+    return array();
 }
 
 /**
@@ -404,17 +404,17 @@ 
  * @return array
  */
 function trouver_cles_table($keys){
-	$res = array();
-	foreach ($keys as $v){
-		if (!strpos($v, ","))
-			$res[$v] = 1;
-		else {
-			foreach (preg_split("/\s*,\s*/", $v) as $k){
-				$res[$k] = 1;
-			}
-		}
-	}
-	return array_keys($res);
+    $res = array();
+    foreach ($keys as $v){
+        if (!strpos($v, ","))
+            $res[$v] = 1;
+        else {
+            foreach (preg_split("/\s*,\s*/", $v) as $k){
+                $res[$k] = 1;
+            }
+        }
+    }
+    return array_keys($res);
 }
 
 /**
@@ -427,60 +427,60 @@ 
  * @return array|string
  */
 function trouver_champ_exterieur($cle, $joints, &$boucle, $checkarrivee = false){
-	static $trouver_table = '';
-	if (!$trouver_table)
-		$trouver_table = charger_fonction('trouver_table', 'base');
-
-	// support de la recherche multi champ :
-	// si en seconde etape on a decompose le champ id_xx en id_objet,objet
-	// on reentre ici soit en cherchant une table les 2 champs id_objet,objet
-	// soit une table avec les 3 champs id_xx, id_objet, objet
-	if (!is_array($cle))
-		$cle = array($cle);
-
-	foreach ($joints as $k => $join){
-		if ($join && $table = $trouver_table($join, $boucle->sql_serveur)){
-			if (isset($table['field'])
-			    // verifier que toutes les cles cherchees sont la
-			    AND (count(array_intersect($cle, array_keys($table['field'])))==count($cle))
-			        // si on sait ou on veut arriver, il faut que ca colle
-			        AND ($checkarrivee==false || $checkarrivee==$table['table'])
-			)
-				return array($table['table'], $table);
-		}
-	}
-
-	// au premier coup, on essaye de decomposer, si possible
-	if (count($cle)==1
-	    AND $c = reset($cle)
-	        AND is_array($decompose = decompose_champ_id_objet($c))
-	){
-
-		$desc = $boucle->show;
-		// cas 1 : la cle id_xx est dans la table de depart
-		// -> on cherche uniquement id_objet,objet a l'arrivee
-		if (isset($desc['field'][$c])){
-			$cle = array();
-			$cle[] = array_shift($decompose); // id_objet
-			$cle[] = array_shift($decompose); // objet
-			return trouver_champ_exterieur($cle, $joints, $boucle, $checkarrivee);
-		}
-			// cas 2 : la cle id_xx n'est pas dans la table de depart
-			// -> il faut trouver une cle de depart zzz telle que
-			// id_objet,objet,zzz soit a l'arrivee
-		else {
-			$depart = liste_champs_jointures($desc['table'], $desc);
-			foreach ($depart as $d){
-				$cle = array();
-				$cle[] = array_shift($decompose); // id_objet
-				$cle[] = array_shift($decompose); // objet
-				$cle[] = $d;
-				if ($ext = trouver_champ_exterieur($cle, $joints, $boucle, $checkarrivee))
-					return $ext;
-			}
-		}
-	}
-	return "";
+    static $trouver_table = '';
+    if (!$trouver_table)
+        $trouver_table = charger_fonction('trouver_table', 'base');
+
+    // support de la recherche multi champ :
+    // si en seconde etape on a decompose le champ id_xx en id_objet,objet
+    // on reentre ici soit en cherchant une table les 2 champs id_objet,objet
+    // soit une table avec les 3 champs id_xx, id_objet, objet
+    if (!is_array($cle))
+        $cle = array($cle);
+
+    foreach ($joints as $k => $join){
+        if ($join && $table = $trouver_table($join, $boucle->sql_serveur)){
+            if (isset($table['field'])
+                // verifier que toutes les cles cherchees sont la
+                AND (count(array_intersect($cle, array_keys($table['field'])))==count($cle))
+                    // si on sait ou on veut arriver, il faut que ca colle
+                    AND ($checkarrivee==false || $checkarrivee==$table['table'])
+            )
+                return array($table['table'], $table);
+        }
+    }
+
+    // au premier coup, on essaye de decomposer, si possible
+    if (count($cle)==1
+        AND $c = reset($cle)
+            AND is_array($decompose = decompose_champ_id_objet($c))
+    ){
+
+        $desc = $boucle->show;
+        // cas 1 : la cle id_xx est dans la table de depart
+        // -> on cherche uniquement id_objet,objet a l'arrivee
+        if (isset($desc['field'][$c])){
+            $cle = array();
+            $cle[] = array_shift($decompose); // id_objet
+            $cle[] = array_shift($decompose); // objet
+            return trouver_champ_exterieur($cle, $joints, $boucle, $checkarrivee);
+        }
+            // cas 2 : la cle id_xx n'est pas dans la table de depart
+            // -> il faut trouver une cle de depart zzz telle que
+            // id_objet,objet,zzz soit a l'arrivee
+        else {
+            $depart = liste_champs_jointures($desc['table'], $desc);
+            foreach ($depart as $d){
+                $cle = array();
+                $cle[] = array_shift($decompose); // id_objet
+                $cle[] = array_shift($decompose); // objet
+                $cle[] = $d;
+                if ($ext = trouver_champ_exterieur($cle, $joints, $boucle, $checkarrivee))
+                    return $ext;
+            }
+        }
+    }
+    return "";
 }
 
 /**
@@ -506,17 +506,17 @@ 
  * @return string
  */
 function trouver_jointure_champ($champ, &$boucle, $jointures = false, $cond = false) {
-	if ($jointures === false) {
-		$jointures = $boucle->jointures;
-	}
-	$cle = trouver_champ_exterieur($champ, $jointures, $boucle);
-	if ($cle){
-		$desc = $boucle->show;
-		$cle = calculer_jointure($boucle, array($desc['id_table'], $desc), $cle, '', $cond);
-	}
-	if ($cle) return $cle;
-	spip_log("trouver_jointure_champ: $champ inconnu");
-	return '';
+    if ($jointures === false) {
+        $jointures = $boucle->jointures;
+    }
+    $cle = trouver_champ_exterieur($champ, $jointures, $boucle);
+    if ($cle){
+        $desc = $boucle->show;
+        $cle = calculer_jointure($boucle, array($desc['id_table'], $desc), $cle, '', $cond);
+    }
+    if ($cle) return $cle;
+    spip_log("trouver_jointure_champ: $champ inconnu");
+    return '';
 }
 
 ?>

Spacing +50 added lines, -50 removed lines

@@ -29,8 +29,8 @@ 
  * @param string $champ
  * @return array
  */
-function decompose_champ_id_objet($champ){
-	if (($champ!=='id_objet') AND preg_match(',^id_([a-z_]+)$,', $champ, $regs)){
+function decompose_champ_id_objet($champ) {
+	if (($champ !== 'id_objet') AND preg_match(',^id_([a-z_]+)$,', $champ, $regs)) {
 		return array('id_objet', 'objet', objet_type($regs[1]));
 	}
 	return $champ;
@@ -45,14 +45,14 @@ 
  * @param array $desc
  * @return array
  */
-function trouver_champs_decomposes($champ, $desc){
+function trouver_champs_decomposes($champ, $desc) {
 	if (!is_array($desc) // on ne se risque pas en conjectures si on ne connait pas la table
 	    OR array_key_exists($champ, $desc['field'])
 	)
 		return array($champ);
-	if (is_array($decompose = decompose_champ_id_objet($champ))){
+	if (is_array($decompose = decompose_champ_id_objet($champ))) {
 		array_pop($decompose);
-		if (count(array_intersect($decompose, array_keys($desc['field'])))==count($decompose))
+		if (count(array_intersect($decompose, array_keys($desc['field']))) == count($decompose))
 			return $decompose;
 	}
 	return array($champ);
@@ -78,14 +78,14 @@ 
  *     flag pour savoir si le critere est conditionnel ou non
  * @return string
  */
-function calculer_jointure(&$boucle, $depart, $arrivee, $col = '', $cond = false, $max_liens=5){
+function calculer_jointure(&$boucle, $depart, $arrivee, $col = '', $cond = false, $max_liens = 5) {
 	// les jointures minimales sont optimales :
 	// on contraint le nombre d'etapes en l'augmentant
 	// jusqu'a ce qu'on trouve une jointure ou qu'on atteigne la limite maxi 
 	$max = 1;
 	$res = false;
-	$milieu_exclus = ($col?$col:array());
-	while ($max<=$max_liens AND !$res){
+	$milieu_exclus = ($col ? $col : array());
+	while ($max <= $max_liens AND !$res) {
 		$res = calculer_chaine_jointures($boucle, $depart, $arrivee, array(), $milieu_exclus, $max);
 		$max++;
 	}
@@ -124,18 +124,18 @@ 
  * @param bool $echap
  * @return string
  */
-function fabrique_jointures(&$boucle, $res, $cond = false, $desc = array(), $nom = '', $col = '', $echap = true){
+function fabrique_jointures(&$boucle, $res, $cond = false, $desc = array(), $nom = '', $col = '', $echap = true) {
 	static $num = array();
 	$id_table = "";
 	$cpt = &$num[$boucle->descr['nom']][$boucle->descr['gram']][$boucle->id_boucle];
-	foreach ($res as $cle => $r){
+	foreach ($res as $cle => $r) {
 		list($d, $a, $j) = $r;
 		if (!$id_table) $id_table = $d;
 		$n = ++$cpt;
-		if (is_array($j)){ // c'est un lien sur un champ du type id_objet,objet,'article'
+		if (is_array($j)) { // c'est un lien sur un champ du type id_objet,objet,'article'
 			list($j1, $j2, $obj, $type) = $j;
 			// trouver de quel cote est (id_objet,objet)
-			if ($j1=="id_$obj")
+			if ($j1 == "id_$obj")
 				$obj = "$id_table.$obj";
 			else
 				$obj = "L$n.$obj";
@@ -160,7 +160,7 @@ 
 	// de l'index principal et de l'index de jointure (non conditionnel! [6031])
 	// et operateur d'egalite (http://trac.rezo.net/trac/spip/ticket/477)
 
-	if ($pk = (isset($a[1]) && (count($boucle->from)==2) && !$cond)){
+	if ($pk = (isset($a[1]) && (count($boucle->from) == 2) && !$cond)) {
 		$pk = nogroupby_if($desc, $a[1], $col);
 	}
 
@@ -168,17 +168,17 @@ 
 	// si une seule jointure
 	// et si l'index de jointure est une primary key a l'arrivee !
 	if (!$pk
-	    AND (count($boucle->from)==2)
+	    AND (count($boucle->from) == 2)
 	        AND isset($a[1]['key']['PRIMARY KEY'])
-	            AND ($j==$a[1]['key']['PRIMARY KEY'])
+	            AND ($j == $a[1]['key']['PRIMARY KEY'])
 	)
 		$pk = true;
 
 	// la clause Group by est en conflit avec ORDER BY, a completer
 	$groups = liste_champs_jointures($nom, $desc, true);
-	if (!$pk) foreach ($groups as $id_prim){
+	if (!$pk) foreach ($groups as $id_prim) {
 		$id_field = $nom.'.'.$id_prim;
-		if (!in_array($id_field, $boucle->group)){
+		if (!in_array($id_field, $boucle->group)) {
 			$boucle->group[] = $id_field;
 		}
 	}
@@ -199,7 +199,7 @@ 
  * @param string|array $col
  * @return bool
  */
-function nogroupby_if($depart, $arrivee, $col){
+function nogroupby_if($depart, $arrivee, $col) {
 	$pk = $arrivee['key']['PRIMARY KEY'];
 	if (!$pk) return false;
 	$id_primary = $depart['key']['PRIMARY KEY'];
@@ -222,7 +222,7 @@ 
  * @param bool $primary
  * @return array
  */
-function liste_champs_jointures($nom, $desc, $primary = false){
+function liste_champs_jointures($nom, $desc, $primary = false) {
 
 	static $nojoin = array('idx', 'maj', 'date', 'statut');
 
@@ -262,7 +262,7 @@ 
  * @param array $join
  * @return array
  */
-function split_key($v, $join = array()){
+function split_key($v, $join = array()) {
 	foreach (preg_split('/,\s*/', $v) as $k) $join[$k] = $k;
 	return $join;
 }
@@ -285,7 +285,7 @@ 
  *  nombre maxi d'etapes
  * @return array
  */
-function calculer_chaine_jointures(&$boucle, $depart, $arrivee, $vu = array(), $milieu_exclus = array(), $max_liens = 5){
+function calculer_chaine_jointures(&$boucle, $depart, $arrivee, $vu = array(), $milieu_exclus = array(), $max_liens = 5) {
 	static $trouver_table;
 	if (!$trouver_table)
 		$trouver_table = charger_fonction('trouver_table', 'base');
@@ -294,12 +294,12 @@ 
 		$milieu_exclus = array($milieu_exclus);
 	// quand on a exclus id_objet comme cle de jointure, il faut aussi exclure objet
 	// faire une jointure sur objet tout seul n'a pas de sens
-	if (in_array('id_objet',$milieu_exclus) AND !in_array('objet',$milieu_exclus))
+	if (in_array('id_objet', $milieu_exclus) AND !in_array('objet', $milieu_exclus))
 		$milieu_exclus[] = 'objet';
 
 	list($dnom, $ddesc) = $depart;
 	list($anom, $adesc) = $arrivee;
-	if (!count($vu)){
+	if (!count($vu)) {
 		$vu[] = $dnom; // ne pas oublier la table de depart
 		$vu[] = $anom; // ne pas oublier la table d'arrivee
 	}
@@ -324,13 +324,13 @@ 
 		return array(array($dnom, array($adesc['table'], $adesc), array_shift($v)));
 
 	// regarder si l'on a (id_objet,objet) au depart et si on peut le mapper sur un id_xx
-	if (count(array_intersect(array('id_objet', 'objet'), $keys))==2){
+	if (count(array_intersect(array('id_objet', 'objet'), $keys)) == 2) {
 		// regarder si l'une des cles d'arrivee peut se decomposer en 
 		// id_objet,objet
 		// si oui on la prend
-		foreach ($akeys as $key){
+		foreach ($akeys as $key) {
 			$v = decompose_champ_id_objet($key);
-			if (is_array($v)){
+			if (is_array($v)) {
 				$objet = array_shift($v); // objet,'article'
 				array_unshift($v, $key); // id_article,objet,'article'
 				array_unshift($v, $objet); // id_objet,id_article,objet,'article'
@@ -342,9 +342,9 @@ 
 		// regarder si l'une des cles de depart peut se decomposer en 
 		// id_objet,objet a l'arrivee
 		// si oui on la prend
-		foreach ($keys as $key){
-			if (count($v = trouver_champs_decomposes($key, $adesc))>1){
-				if (count($v)==count(array_intersect($v, $akeys))){
+		foreach ($keys as $key) {
+			if (count($v = trouver_champs_decomposes($key, $adesc)) > 1) {
+				if (count($v) == count(array_intersect($v, $akeys))) {
 					$v = decompose_champ_id_objet($key); // id_objet,objet,'article'
 					array_unshift($v, $key); // id_article,id_objet,objet,'article'
 					return array(array($dnom, array($adesc['table'], $adesc), $v));
@@ -353,38 +353,38 @@ 
 		}
 	}
 	// si l'on voulait une jointure direct, c'est rate !
-	if ($max_liens<=1) return array();
+	if ($max_liens <= 1) return array();
 
 	// sinon essayer de passer par une autre table
 	$new = $vu;
-	foreach ($boucle->jointures as $v){
+	foreach ($boucle->jointures as $v) {
 		if ($v
 		    AND !in_array($v, $vu)
 		    AND $def = $trouver_table($v, $boucle->sql_serveur)
 			  AND !in_array($def['table_sql'], $vu)
-		){
+		) {
 			// ne pas tester les cles qui sont exclues a l'appel
 			// ie la cle de la jointure precedente
 			$test_cles = $milieu_exclus;
 			$new[] = $v;
 			$max_iter = 50; // securite
 			while (count($jointure_directe_possible = calculer_chaine_jointures($boucle, $depart, array($v, $def), $vu, $test_cles, 1))
-			       AND $max_iter--){
+			       AND $max_iter--) {
 				$jointure_directe_possible = reset($jointure_directe_possible);
 				$milieu = end($jointure_directe_possible);
 				$exclure_fin = $milieu_exclus;
-				if (is_string($milieu)){
+				if (is_string($milieu)) {
 					$exclure_fin[] = $milieu;
 					$test_cles[] = $milieu;
 				}
-				else{
+				else {
 					$exclure_fin = array_merge($exclure_fin, $milieu);
 					$test_cles = array_merge($test_cles, $milieu);
 				}
 				// essayer de rejoindre l'arrivee a partir de cette etape intermediaire
 				// sans repasser par la meme cle milieu, ni une cle deja vue !
-				$r = calculer_chaine_jointures($boucle, array($v, $def), $arrivee, $new, $exclure_fin, $max_liens-1);
-				if ($r){
+				$r = calculer_chaine_jointures($boucle, array($v, $def), $arrivee, $new, $exclure_fin, $max_liens - 1);
+				if ($r) {
 					array_unshift($r, $jointure_directe_possible);
 					return $r;
 				}
@@ -403,13 +403,13 @@ 
  * @param $keys
  * @return array
  */
-function trouver_cles_table($keys){
+function trouver_cles_table($keys) {
 	$res = array();
-	foreach ($keys as $v){
+	foreach ($keys as $v) {
 		if (!strpos($v, ","))
 			$res[$v] = 1;
 		else {
-			foreach (preg_split("/\s*,\s*/", $v) as $k){
+			foreach (preg_split("/\s*,\s*/", $v) as $k) {
 				$res[$k] = 1;
 			}
 		}
@@ -426,7 +426,7 @@ 
  * @param bool $checkarrivee
  * @return array|string
  */
-function trouver_champ_exterieur($cle, $joints, &$boucle, $checkarrivee = false){
+function trouver_champ_exterieur($cle, $joints, &$boucle, $checkarrivee = false) {
 	static $trouver_table = '';
 	if (!$trouver_table)
 		$trouver_table = charger_fonction('trouver_table', 'base');
@@ -438,28 +438,28 @@ 
 	if (!is_array($cle))
 		$cle = array($cle);
 
-	foreach ($joints as $k => $join){
-		if ($join && $table = $trouver_table($join, $boucle->sql_serveur)){
+	foreach ($joints as $k => $join) {
+		if ($join && $table = $trouver_table($join, $boucle->sql_serveur)) {
 			if (isset($table['field'])
 			    // verifier que toutes les cles cherchees sont la
-			    AND (count(array_intersect($cle, array_keys($table['field'])))==count($cle))
+			    AND (count(array_intersect($cle, array_keys($table['field']))) == count($cle))
 			        // si on sait ou on veut arriver, il faut que ca colle
-			        AND ($checkarrivee==false || $checkarrivee==$table['table'])
+			        AND ($checkarrivee == false || $checkarrivee == $table['table'])
 			)
 				return array($table['table'], $table);
 		}
 	}
 
 	// au premier coup, on essaye de decomposer, si possible
-	if (count($cle)==1
+	if (count($cle) == 1
 	    AND $c = reset($cle)
 	        AND is_array($decompose = decompose_champ_id_objet($c))
-	){
+	) {
 
 		$desc = $boucle->show;
 		// cas 1 : la cle id_xx est dans la table de depart
 		// -> on cherche uniquement id_objet,objet a l'arrivee
-		if (isset($desc['field'][$c])){
+		if (isset($desc['field'][$c])) {
 			$cle = array();
 			$cle[] = array_shift($decompose); // id_objet
 			$cle[] = array_shift($decompose); // objet
@@ -470,7 +470,7 @@ 
 			// id_objet,objet,zzz soit a l'arrivee
 		else {
 			$depart = liste_champs_jointures($desc['table'], $desc);
-			foreach ($depart as $d){
+			foreach ($depart as $d) {
 				$cle = array();
 				$cle[] = array_shift($decompose); // id_objet
 				$cle[] = array_shift($decompose); // objet
@@ -510,7 +510,7 @@ 
 		$jointures = $boucle->jointures;
 	}
 	$cle = trouver_champ_exterieur($champ, $jointures, $boucle);
-	if ($cle){
+	if ($cle) {
 		$desc = $boucle->show;
 		$cle = calculer_jointure($boucle, array($desc['id_table'], $desc), $cle, '', $cond);
 	}

Braces +91 added lines, -52 removed lines

@@ -10,7 +10,9 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 // deduction automatique d'une chaine de jointures 
 
@@ -48,12 +50,14 @@ 
 function trouver_champs_decomposes($champ, $desc){
 	if (!is_array($desc) // on ne se risque pas en conjectures si on ne connait pas la table
 	    OR array_key_exists($champ, $desc['field'])
-	)
-		return array($champ);
+	) {
+			return array($champ);
+	}
 	if (is_array($decompose = decompose_champ_id_objet($champ))){
 		array_pop($decompose);
-		if (count(array_intersect($decompose, array_keys($desc['field'])))==count($decompose))
-			return $decompose;
+		if (count(array_intersect($decompose, array_keys($desc['field'])))==count($decompose)) {
+					return $decompose;
+		}
 	}
 	return array($champ);
 }
@@ -89,7 +93,9 @@ 
 		$res = calculer_chaine_jointures($boucle, $depart, $arrivee, array(), $milieu_exclus, $max);
 		$max++;
 	}
-	if (!$res) return "";
+	if (!$res) {
+	    return "";
+	}
 
 	list($nom, $desc) = $depart;
 
@@ -130,15 +136,18 @@ 
 	$cpt = &$num[$boucle->descr['nom']][$boucle->descr['gram']][$boucle->id_boucle];
 	foreach ($res as $cle => $r){
 		list($d, $a, $j) = $r;
-		if (!$id_table) $id_table = $d;
+		if (!$id_table) {
+		    $id_table = $d;
+		}
 		$n = ++$cpt;
 		if (is_array($j)){ // c'est un lien sur un champ du type id_objet,objet,'article'
 			list($j1, $j2, $obj, $type) = $j;
 			// trouver de quel cote est (id_objet,objet)
-			if ($j1=="id_$obj")
-				$obj = "$id_table.$obj";
-			else
-				$obj = "L$n.$obj";
+			if ($j1=="id_$obj") {
+							$obj = "$id_table.$obj";
+			} else {
+							$obj = "L$n.$obj";
+			}
 			// le where complementaire est envoye dans la jointure pour pouvoir etre elimine avec la jointure
 			// en cas d'optimisation
 			//$boucle->where[] = array("'='","'$obj'","sql_quote('$type')");
@@ -147,9 +156,9 @@ 
 					array("'$id_table'", "'$j2'", "'$j1'", "'$obj='.sql_quote('$type')")
 					:
 					array($id_table, $j2, $j1, "$obj=".sql_quote($type));
+		} else {
+					$boucle->join["L$n"] = $echap ? array("'$id_table'", "'$j'") : array($id_table, $j);
 		}
-		else
-			$boucle->join["L$n"] = $echap ? array("'$id_table'", "'$j'") : array($id_table, $j);
 		$boucle->from[$id_table = "L$n"] = $a[0];
 	}
 
@@ -171,13 +180,16 @@ 
 	    AND (count($boucle->from)==2)
 	        AND isset($a[1]['key']['PRIMARY KEY'])
 	            AND ($j==$a[1]['key']['PRIMARY KEY'])
-	)
-		$pk = true;
+	) {
+			$pk = true;
+	}
 
 	// la clause Group by est en conflit avec ORDER BY, a completer
 	$groups = liste_champs_jointures($nom, $desc, true);
-	if (!$pk) foreach ($groups as $id_prim){
+	if (!$pk) {
+	    foreach ($groups as $id_prim){
 		$id_field = $nom.'.'.$id_prim;
+	}
 		if (!in_array($id_field, $boucle->group)){
 			$boucle->group[] = $id_field;
 		}
@@ -201,9 +213,14 @@ 
  */
 function nogroupby_if($depart, $arrivee, $col){
 	$pk = $arrivee['key']['PRIMARY KEY'];
-	if (!$pk) return false;
+	if (!$pk) {
+	    return false;
+	}
 	$id_primary = $depart['key']['PRIMARY KEY'];
-	if (is_array($col)) $col = implode(', *', $col); // cas id_objet, objet
+	if (is_array($col)) {
+	    $col = implode(', *', $col);
+	}
+	// cas id_objet, objet
 	return (preg_match("/^$id_primary, *$col$/", $pk) OR
 	        preg_match("/^$col, *$id_primary$/", $pk));
 }
@@ -227,20 +244,26 @@ 
 	static $nojoin = array('idx', 'maj', 'date', 'statut');
 
 	// si cle primaire demandee, la privilegier
-	if ($primary && isset($desc['key']['PRIMARY KEY']))
-		return split_key($desc['key']['PRIMARY KEY']);
+	if ($primary && isset($desc['key']['PRIMARY KEY'])) {
+			return split_key($desc['key']['PRIMARY KEY']);
+	}
 
 	// les champs declares explicitement pour les jointures
-	if (isset($desc['join'])) return $desc['join'];
+	if (isset($desc['join'])) {
+	    return $desc['join'];
+	}
 	/*elseif (isset($GLOBALS['tables_principales'][$nom]['join'])) return $GLOBALS['tables_principales'][$nom]['join'];
 	elseif (isset($GLOBALS['tables_auxiliaires'][$nom]['join'])) return $GLOBALS['tables_auxiliaires'][$nom]['join'];*/
 
 	// si pas de cle, c'est fichu
-	if (!isset($desc['key'])) return array();
+	if (!isset($desc['key'])) {
+	    return array();
+	}
 
 	// si cle primaire
-	if (isset($desc['key']['PRIMARY KEY']))
-		return split_key($desc['key']['PRIMARY KEY']);
+	if (isset($desc['key']['PRIMARY KEY'])) {
+			return split_key($desc['key']['PRIMARY KEY']);
+	}
 
 	// ici on se rabat sur les cles secondaires, 
 	// en eliminant celles qui sont pas pertinentes (idx, maj)
@@ -248,8 +271,12 @@ 
 	// il faut declarer explicitement le champ 'join' de sa description
 
 	$join = array();
-	foreach ($desc['key'] as $v) $join = split_key($v, $join);
-	foreach ($join as $k) if (in_array($k, $nojoin)) unset($join[$k]);
+	foreach ($desc['key'] as $v) {
+	    $join = split_key($v, $join);
+	}
+	foreach ($join as $k) {
+	    if (in_array($k, $nojoin)) unset($join[$k]);
+	}
 	return $join;
 }
 
@@ -263,7 +290,9 @@ 
  * @return array
  */
 function split_key($v, $join = array()){
-	foreach (preg_split('/,\s*/', $v) as $k) $join[$k] = $k;
+	foreach (preg_split('/,\s*/', $v) as $k) {
+	    $join[$k] = $k;
+	}
 	return $join;
 }
 
@@ -287,15 +316,18 @@ 
  */
 function calculer_chaine_jointures(&$boucle, $depart, $arrivee, $vu = array(), $milieu_exclus = array(), $max_liens = 5){
 	static $trouver_table;
-	if (!$trouver_table)
-		$trouver_table = charger_fonction('trouver_table', 'base');
+	if (!$trouver_table) {
+			$trouver_table = charger_fonction('trouver_table', 'base');
+	}
 
-	if (is_string($milieu_exclus))
-		$milieu_exclus = array($milieu_exclus);
+	if (is_string($milieu_exclus)) {
+			$milieu_exclus = array($milieu_exclus);
+	}
 	// quand on a exclus id_objet comme cle de jointure, il faut aussi exclure objet
 	// faire une jointure sur objet tout seul n'a pas de sens
-	if (in_array('id_objet',$milieu_exclus) AND !in_array('objet',$milieu_exclus))
-		$milieu_exclus[] = 'objet';
+	if (in_array('id_objet',$milieu_exclus) AND !in_array('objet',$milieu_exclus)) {
+			$milieu_exclus[] = 'objet';
+	}
 
 	list($dnom, $ddesc) = $depart;
 	list($anom, $adesc) = $arrivee;
@@ -320,8 +352,9 @@ 
 
 	$v = !$keys ? false : array_intersect(array_values($keys), $akeys);
 
-	if ($v)
-		return array(array($dnom, array($adesc['table'], $adesc), array_shift($v)));
+	if ($v) {
+			return array(array($dnom, array($adesc['table'], $adesc), array_shift($v)));
+	}
 
 	// regarder si l'on a (id_objet,objet) au depart et si on peut le mapper sur un id_xx
 	if (count(array_intersect(array('id_objet', 'objet'), $keys))==2){
@@ -337,8 +370,7 @@ 
 				return array(array($dnom, array($adesc['table'], $adesc), $v));
 			}
 		}
-	}
-	else {
+	} else {
 		// regarder si l'une des cles de depart peut se decomposer en 
 		// id_objet,objet a l'arrivee
 		// si oui on la prend
@@ -353,7 +385,9 @@ 
 		}
 	}
 	// si l'on voulait une jointure direct, c'est rate !
-	if ($max_liens<=1) return array();
+	if ($max_liens<=1) {
+	    return array();
+	}
 
 	// sinon essayer de passer par une autre table
 	$new = $vu;
@@ -376,8 +410,7 @@ 
 				if (is_string($milieu)){
 					$exclure_fin[] = $milieu;
 					$test_cles[] = $milieu;
-				}
-				else{
+				} else{
 					$exclure_fin = array_merge($exclure_fin, $milieu);
 					$test_cles = array_merge($test_cles, $milieu);
 				}
@@ -406,9 +439,9 @@ 
 function trouver_cles_table($keys){
 	$res = array();
 	foreach ($keys as $v){
-		if (!strpos($v, ","))
-			$res[$v] = 1;
-		else {
+		if (!strpos($v, ",")) {
+					$res[$v] = 1;
+		} else {
 			foreach (preg_split("/\s*,\s*/", $v) as $k){
 				$res[$k] = 1;
 			}
@@ -428,15 +461,17 @@ 
  */
 function trouver_champ_exterieur($cle, $joints, &$boucle, $checkarrivee = false){
 	static $trouver_table = '';
-	if (!$trouver_table)
-		$trouver_table = charger_fonction('trouver_table', 'base');
+	if (!$trouver_table) {
+			$trouver_table = charger_fonction('trouver_table', 'base');
+	}
 
 	// support de la recherche multi champ :
 	// si en seconde etape on a decompose le champ id_xx en id_objet,objet
 	// on reentre ici soit en cherchant une table les 2 champs id_objet,objet
 	// soit une table avec les 3 champs id_xx, id_objet, objet
-	if (!is_array($cle))
-		$cle = array($cle);
+	if (!is_array($cle)) {
+			$cle = array($cle);
+	}
 
 	foreach ($joints as $k => $join){
 		if ($join && $table = $trouver_table($join, $boucle->sql_serveur)){
@@ -445,8 +480,9 @@ 
 			    AND (count(array_intersect($cle, array_keys($table['field'])))==count($cle))
 			        // si on sait ou on veut arriver, il faut que ca colle
 			        AND ($checkarrivee==false || $checkarrivee==$table['table'])
-			)
-				return array($table['table'], $table);
+			) {
+							return array($table['table'], $table);
+			}
 		}
 	}
 
@@ -475,8 +511,9 @@ 
 				$cle[] = array_shift($decompose); // id_objet
 				$cle[] = array_shift($decompose); // objet
 				$cle[] = $d;
-				if ($ext = trouver_champ_exterieur($cle, $joints, $boucle, $checkarrivee))
-					return $ext;
+				if ($ext = trouver_champ_exterieur($cle, $joints, $boucle, $checkarrivee)) {
+									return $ext;
+				}
 			}
 		}
 	}
@@ -514,7 +551,9 @@ 
 		$desc = $boucle->show;
 		$cle = calculer_jointure($boucle, array($desc['id_table'], $desc), $cle, '', $cond);
 	}
-	if ($cle) return $cle;
+	if ($cle) {
+	    return $cle;
+	}
 	spip_log("trouver_jointure_champ: $champ inconnu");
 	return '';
 }

ecrire/action/calculer_taille_cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
  *
  * http://doc.spip.org/@calculer_taille_dossier
  *
- * @param $dir
+ * @param string|null $dir
  * @return int
  */
 function calculer_taille_dossier ($dir) {

Indentation +50 added lines, -50 removed lines

@@ -20,44 +20,44 @@ 
  * @param string|null $arg
  */
 function action_calculer_taille_cache_dist($arg=null){
-	if (is_null($arg)){
-		$securiser_action = charger_fonction('securiser_action', 'inc');
-		$arg = $securiser_action();
-	}
-	include_spip('inc/filtres');
+    if (is_null($arg)){
+        $securiser_action = charger_fonction('securiser_action', 'inc');
+        $arg = $securiser_action();
+    }
+    include_spip('inc/filtres');
 
-	if ($arg=='images'){
-		$taille = calculer_taille_dossier(_DIR_VAR);
-		$res = _T('ecrire:taille_cache_image',
-		array(
-			'dir' => joli_repertoire(_DIR_VAR),
-			'taille' => "<b>".(taille_en_octets($taille) > 0 ? taille_en_octets($taille) : "0 octet")."</b>"
-			)
-		);
-	}
-	else {
-		include_spip('inc/invalideur');
-		$taille =
-			calculer_taille_dossier(_DIR_CACHE_XML)
-			+calculer_taille_dossier(_DIR_CACHE.'skel/')
-			+calculer_taille_dossier(_DIR_CACHE.'wheels/')
-			+calculer_taille_dossier(_DIR_CACHE.'contextes/')
-		;
-		$taille += intval(taille_du_cache());
-		if ($taille<=150000){
-			$res = _T('taille_cache_vide');
-		}
-		elseif ($taille<=1024*1024){
-			$res = _T('taille_cache_moins_de',array('octets'=>taille_en_octets(1024*1024)));
-		}
-		else {
-			$res = _T('taille_cache_octets',array('octets'=>taille_en_octets($taille)));
-		}
-		$res = "<b>$res</b>";
-	}
+    if ($arg=='images'){
+        $taille = calculer_taille_dossier(_DIR_VAR);
+        $res = _T('ecrire:taille_cache_image',
+        array(
+            'dir' => joli_repertoire(_DIR_VAR),
+            'taille' => "<b>".(taille_en_octets($taille) > 0 ? taille_en_octets($taille) : "0 octet")."</b>"
+            )
+        );
+    }
+    else {
+        include_spip('inc/invalideur');
+        $taille =
+            calculer_taille_dossier(_DIR_CACHE_XML)
+            +calculer_taille_dossier(_DIR_CACHE.'skel/')
+            +calculer_taille_dossier(_DIR_CACHE.'wheels/')
+            +calculer_taille_dossier(_DIR_CACHE.'contextes/')
+        ;
+        $taille += intval(taille_du_cache());
+        if ($taille<=150000){
+            $res = _T('taille_cache_vide');
+        }
+        elseif ($taille<=1024*1024){
+            $res = _T('taille_cache_moins_de',array('octets'=>taille_en_octets(1024*1024)));
+        }
+        else {
+            $res = _T('taille_cache_octets',array('octets'=>taille_en_octets($taille)));
+        }
+        $res = "<b>$res</b>";
+    }
 	
-	$res = "<p>$res</p>";
-	ajax_retour($res);
+    $res = "<p>$res</p>";
+    ajax_retour($res);
 }
 
 
@@ -70,20 +70,20 @@ 
  * @return int
  */
 function calculer_taille_dossier ($dir) {
-	$handle = @opendir($dir);
-	if (!$handle) return 0;
-	$taille = 0;
-	while (($fichier = @readdir($handle)) !== false) {
-		// Eviter ".", "..", ".htaccess", etc.
-		if ($fichier[0] == '.') continue;
-		if (is_file($d = "$dir/$fichier")) {
-			$taille += filesize($d);
-		}
-		else if (is_dir($d))
-			$taille += calculer_taille_dossier($d);
-	}
-	closedir($handle);
-	return $taille;
+    $handle = @opendir($dir);
+    if (!$handle) return 0;
+    $taille = 0;
+    while (($fichier = @readdir($handle)) !== false) {
+        // Eviter ".", "..", ".htaccess", etc.
+        if ($fichier[0] == '.') continue;
+        if (is_file($d = "$dir/$fichier")) {
+            $taille += filesize($d);
+        }
+        else if (is_dir($d))
+            $taille += calculer_taille_dossier($d);
+    }
+    closedir($handle);
+    return $taille;
 }
 
 ?>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -19,14 +19,14 @@ 
  *
  * @param string|null $arg
  */
-function action_calculer_taille_cache_dist($arg=null){
-	if (is_null($arg)){
+function action_calculer_taille_cache_dist($arg = null) {
+	if (is_null($arg)) {
 		$securiser_action = charger_fonction('securiser_action', 'inc');
 		$arg = $securiser_action();
 	}
 	include_spip('inc/filtres');
 
-	if ($arg=='images'){
+	if ($arg == 'images') {
 		$taille = calculer_taille_dossier(_DIR_VAR);
 		$res = _T('ecrire:taille_cache_image',
 		array(
@@ -44,14 +44,14 @@ 
 			+calculer_taille_dossier(_DIR_CACHE.'contextes/')
 		;
 		$taille += intval(taille_du_cache());
-		if ($taille<=150000){
+		if ($taille <= 150000) {
 			$res = _T('taille_cache_vide');
 		}
-		elseif ($taille<=1024*1024){
-			$res = _T('taille_cache_moins_de',array('octets'=>taille_en_octets(1024*1024)));
+		elseif ($taille <= 1024 * 1024) {
+			$res = _T('taille_cache_moins_de', array('octets'=>taille_en_octets(1024 * 1024)));
 		}
 		else {
-			$res = _T('taille_cache_octets',array('octets'=>taille_en_octets($taille)));
+			$res = _T('taille_cache_octets', array('octets'=>taille_en_octets($taille)));
 		}
 		$res = "<b>$res</b>";
 	}
@@ -69,7 +69,7 @@ 
  * @param $dir
  * @return int
  */
-function calculer_taille_dossier ($dir) {
+function calculer_taille_dossier($dir) {
 	$handle = @opendir($dir);
 	if (!$handle) return 0;
 	$taille = 0;

Braces +14 added lines, -11 removed lines

@@ -10,7 +10,9 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 
 
@@ -34,8 +36,7 @@ 
 			'taille' => "<b>".(taille_en_octets($taille) > 0 ? taille_en_octets($taille) : "0 octet")."</b>"
 			)
 		);
-	}
-	else {
+	} else {
 		include_spip('inc/invalideur');
 		$taille =
 			calculer_taille_dossier(_DIR_CACHE_XML)
@@ -46,11 +47,9 @@ 
 		$taille += intval(taille_du_cache());
 		if ($taille<=150000){
 			$res = _T('taille_cache_vide');
-		}
-		elseif ($taille<=1024*1024){
+		} elseif ($taille<=1024*1024){
 			$res = _T('taille_cache_moins_de',array('octets'=>taille_en_octets(1024*1024)));
-		}
-		else {
+		} else {
 			$res = _T('taille_cache_octets',array('octets'=>taille_en_octets($taille)));
 		}
 		$res = "<b>$res</b>";
@@ -71,16 +70,20 @@ 
  */
 function calculer_taille_dossier ($dir) {
 	$handle = @opendir($dir);
-	if (!$handle) return 0;
+	if (!$handle) {
+	    return 0;
+	}
 	$taille = 0;
 	while (($fichier = @readdir($handle)) !== false) {
 		// Eviter ".", "..", ".htaccess", etc.
-		if ($fichier[0] == '.') continue;
+		if ($fichier[0] == '.') {
+		    continue;
+		}
 		if (is_file($d = "$dir/$fichier")) {
 			$taille += filesize($d);
+		} else if (is_dir($d)) {
+					$taille += calculer_taille_dossier($d);
 		}
-		else if (is_dir($d))
-			$taille += calculer_taille_dossier($d);
 	}
 	closedir($handle);
 	return $taille;

ecrire/action/converser.php

Doc Comments +3 added lines

@@ -35,6 +35,9 @@
 	redirige_par_entete($redirect, true);
 }
 
+/**
+ * @param boolean $update_session
+ */
 function action_converser_changer_langue($update_session){
 	if ($lang = _request('var_lang'))
 		action_converser_post($lang);

Indentation +37 added lines, -37 removed lines

@@ -20,52 +20,52 @@
 // http://doc.spip.org/@action_converser_dist
 function action_converser_dist()
 {
-	$update_session = false;
-	if ( _request('arg') AND spip_connect()) {
-		$securiser_action = charger_fonction('securiser_action', 'inc');
-		$securiser_action();
-		$update_session = true;
-	}
+    $update_session = false;
+    if ( _request('arg') AND spip_connect()) {
+        $securiser_action = charger_fonction('securiser_action', 'inc');
+        $securiser_action();
+        $update_session = true;
+    }
 
-	$lang = action_converser_changer_langue($update_session);
-	$redirect = rawurldecode(_request('redirect'));
+    $lang = action_converser_changer_langue($update_session);
+    $redirect = rawurldecode(_request('redirect'));
 
-	if (!$redirect) $redirect = _DIR_RESTREINT_ABS;
-	$redirect = parametre_url($redirect,'lang',$lang,'&');
-	redirige_par_entete($redirect, true);
+    if (!$redirect) $redirect = _DIR_RESTREINT_ABS;
+    $redirect = parametre_url($redirect,'lang',$lang,'&');
+    redirige_par_entete($redirect, true);
 }
 
 function action_converser_changer_langue($update_session){
-	if ($lang = _request('var_lang'))
-		action_converser_post($lang);
-	elseif ($lang = _request('var_lang_ecrire')) {
-		if ($update_session) {
-			sql_updateq("spip_auteurs", array("lang" => $lang), "id_auteur = " . $GLOBALS['visiteur_session']['id_auteur']);
-			$GLOBALS['visiteur_session']['lang'] = $lang;
-			$session = charger_fonction('session', 'inc');
-			if ($spip_session = $session($GLOBALS['visiteur_session'])) {
-				spip_setcookie(
-					'spip_session',
-					$spip_session,
-					time() + 3600 * 24 * 14
-				);
-			}
-		}
-		action_converser_post($lang, 'spip_lang_ecrire');
-	}
-	return $lang;
+    if ($lang = _request('var_lang'))
+        action_converser_post($lang);
+    elseif ($lang = _request('var_lang_ecrire')) {
+        if ($update_session) {
+            sql_updateq("spip_auteurs", array("lang" => $lang), "id_auteur = " . $GLOBALS['visiteur_session']['id_auteur']);
+            $GLOBALS['visiteur_session']['lang'] = $lang;
+            $session = charger_fonction('session', 'inc');
+            if ($spip_session = $session($GLOBALS['visiteur_session'])) {
+                spip_setcookie(
+                    'spip_session',
+                    $spip_session,
+                    time() + 3600 * 24 * 14
+                );
+            }
+        }
+        action_converser_post($lang, 'spip_lang_ecrire');
+    }
+    return $lang;
 }
 
 // http://doc.spip.org/@action_converser_post
 function action_converser_post($lang, $ecrire=false)
 {
-	if ($lang) {
-		include_spip('inc/lang');
-		if (changer_langue($lang)) {
-			spip_setcookie('spip_lang', $_COOKIE['spip_lang'] = $lang, time() + 365 * 24 * 3600);
-			if ($ecrire)
-				spip_setcookie('spip_lang_ecrire', $_COOKIE['spip_lang_ecrire'] = $lang, time() + 365 * 24 * 3600);
-		}
-	}
+    if ($lang) {
+        include_spip('inc/lang');
+        if (changer_langue($lang)) {
+            spip_setcookie('spip_lang', $_COOKIE['spip_lang'] = $lang, time() + 365 * 24 * 3600);
+            if ($ecrire)
+                spip_setcookie('spip_lang_ecrire', $_COOKIE['spip_lang_ecrire'] = $lang, time() + 365 * 24 * 3600);
+        }
+    }
 }
 ?>

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 function action_converser_dist()
 {
 	$update_session = false;
-	if ( _request('arg') AND spip_connect()) {
+	if (_request('arg') AND spip_connect()) {
 		$securiser_action = charger_fonction('securiser_action', 'inc');
 		$securiser_action();
 		$update_session = true;
@@ -31,16 +31,16 @@ 
 	$redirect = rawurldecode(_request('redirect'));
 
 	if (!$redirect) $redirect = _DIR_RESTREINT_ABS;
-	$redirect = parametre_url($redirect,'lang',$lang,'&');
+	$redirect = parametre_url($redirect, 'lang', $lang, '&');
 	redirige_par_entete($redirect, true);
 }
 
-function action_converser_changer_langue($update_session){
+function action_converser_changer_langue($update_session) {
 	if ($lang = _request('var_lang'))
 		action_converser_post($lang);
 	elseif ($lang = _request('var_lang_ecrire')) {
 		if ($update_session) {
-			sql_updateq("spip_auteurs", array("lang" => $lang), "id_auteur = " . $GLOBALS['visiteur_session']['id_auteur']);
+			sql_updateq("spip_auteurs", array("lang" => $lang), "id_auteur = ".$GLOBALS['visiteur_session']['id_auteur']);
 			$GLOBALS['visiteur_session']['lang'] = $lang;
 			$session = charger_fonction('session', 'inc');
 			if ($spip_session = $session($GLOBALS['visiteur_session'])) {
@@ -57,7 +57,7 @@ 
 }
 
 // http://doc.spip.org/@action_converser_post
-function action_converser_post($lang, $ecrire=false)
+function action_converser_post($lang, $ecrire = false)
 {
 	if ($lang) {
 		include_spip('inc/lang');

Braces +12 added lines, -7 removed lines

@@ -10,7 +10,9 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 include_spip('inc/cookie');
 
@@ -30,15 +32,17 @@ 
 	$lang = action_converser_changer_langue($update_session);
 	$redirect = rawurldecode(_request('redirect'));
 
-	if (!$redirect) $redirect = _DIR_RESTREINT_ABS;
+	if (!$redirect) {
+	    $redirect = _DIR_RESTREINT_ABS;
+	}
 	$redirect = parametre_url($redirect,'lang',$lang,'&');
 	redirige_par_entete($redirect, true);
 }
 
 function action_converser_changer_langue($update_session){
-	if ($lang = _request('var_lang'))
-		action_converser_post($lang);
-	elseif ($lang = _request('var_lang_ecrire')) {
+	if ($lang = _request('var_lang')) {
+			action_converser_post($lang);
+	} elseif ($lang = _request('var_lang_ecrire')) {
 		if ($update_session) {
 			sql_updateq("spip_auteurs", array("lang" => $lang), "id_auteur = " . $GLOBALS['visiteur_session']['id_auteur']);
 			$GLOBALS['visiteur_session']['lang'] = $lang;
@@ -63,8 +67,9 @@ 
 		include_spip('inc/lang');
 		if (changer_langue($lang)) {
 			spip_setcookie('spip_lang', $_COOKIE['spip_lang'] = $lang, time() + 365 * 24 * 3600);
-			if ($ecrire)
-				spip_setcookie('spip_lang_ecrire', $_COOKIE['spip_lang_ecrire'] = $lang, time() + 365 * 24 * 3600);
+			if ($ecrire) {
+							spip_setcookie('spip_lang_ecrire', $_COOKIE['spip_lang_ecrire'] = $lang, time() + 365 * 24 * 3600);
+			}
 		}
 	}
 }

ecrire/action/editer_auteur.php

Doc Comments +1 added lines, -1 removed lines

@@ -221,7 +221,7 @@
  * @param  $id_auteur
  * @param  $c
  * @param bool $force_webmestre
- * @return bool|string
+ * @return false|string
  */
 function auteur_instituer($id_auteur, $c, $force_webmestre = false) {
 	if (!$id_auteur=intval($id_auteur))

Indentation +224 added lines, -224 removed lines

@@ -15,38 +15,38 @@ 
 // http://doc.spip.org/@action_editer_auteur_dist
 function action_editer_auteur_dist($arg=null) {
 
-	if (is_null($arg)){
-		$securiser_action = charger_fonction('securiser_action', 'inc');
-		$arg = $securiser_action();
-	}
-
-
-	// si id_auteur n'est pas un nombre, c'est une creation
-	if (!$id_auteur = intval($arg)) {
-
-		if (($id_auteur = auteur_inserer()) > 0){
-
-			# cf. GROS HACK
-			# recuperer l'eventuel logo charge avant la creation
-			# ils ont un id = 0-id_auteur de la session
-			$id_hack = 0 - $GLOBALS['visiteur_session']['id_auteur'];
-			$chercher_logo = charger_fonction('chercher_logo', 'inc');
-			if (list($logo) = $chercher_logo($id_hack, 'id_auteur', 'on'))
-				rename($logo, str_replace($id_hack, $id_auteur, $logo));
-			if (list($logo) = $chercher_logo($id_hack, 'id_auteur', 'off'))
-				rename($logo, str_replace($id_hack, $id_auteur, $logo));
-		}
-	}
-
-	// Enregistre l'envoi dans la BD
-	$err = "";
-	if ($id_auteur > 0)
-		$err = auteur_modifier($id_auteur);
-
-	if ($err)
-		spip_log("echec editeur auteur: $err",_LOG_ERREUR);
-
-	return array($id_auteur,$err);
+    if (is_null($arg)){
+        $securiser_action = charger_fonction('securiser_action', 'inc');
+        $arg = $securiser_action();
+    }
+
+
+    // si id_auteur n'est pas un nombre, c'est une creation
+    if (!$id_auteur = intval($arg)) {
+
+        if (($id_auteur = auteur_inserer()) > 0){
+
+            # cf. GROS HACK
+            # recuperer l'eventuel logo charge avant la creation
+            # ils ont un id = 0-id_auteur de la session
+            $id_hack = 0 - $GLOBALS['visiteur_session']['id_auteur'];
+            $chercher_logo = charger_fonction('chercher_logo', 'inc');
+            if (list($logo) = $chercher_logo($id_hack, 'id_auteur', 'on'))
+                rename($logo, str_replace($id_hack, $id_auteur, $logo));
+            if (list($logo) = $chercher_logo($id_hack, 'id_auteur', 'off'))
+                rename($logo, str_replace($id_hack, $id_auteur, $logo));
+        }
+    }
+
+    // Enregistre l'envoi dans la BD
+    $err = "";
+    if ($id_auteur > 0)
+        $err = auteur_modifier($id_auteur);
+
+    if ($err)
+        spip_log("echec editeur auteur: $err",_LOG_ERREUR);
+
+    return array($id_auteur,$err);
 }
 
 /**
@@ -56,34 +56,34 @@ 
  */
 function auteur_inserer($source=null) {
 
-	// Ce qu'on va demander comme modifications
-	$champs = array();
-	$champs['source'] = $source?$source:'spip';
-
-	$champs['login'] = '';
-	$champs['statut'] = '5poubelle';  // inutilisable tant qu'il n'a pas ete renseigne et institue
-	$champs['webmestre'] = 'non';
-
-	// Envoyer aux plugins
-	$champs = pipeline('pre_insertion',
-		array(
-			'args' => array(
-				'table' => 'spip_auteurs',
-			),
-			'data' => $champs
-		)
-	);
-	$id_auteur = sql_insertq("spip_auteurs", $champs);
-	pipeline('post_insertion',
-		array(
-			'args' => array(
-				'table' => 'spip_auteurs',
-				'id_objet' => $id_auteur
-			),
-			'data' => $champs
-		)
-	);
-	return $id_auteur;
+    // Ce qu'on va demander comme modifications
+    $champs = array();
+    $champs['source'] = $source?$source:'spip';
+
+    $champs['login'] = '';
+    $champs['statut'] = '5poubelle';  // inutilisable tant qu'il n'a pas ete renseigne et institue
+    $champs['webmestre'] = 'non';
+
+    // Envoyer aux plugins
+    $champs = pipeline('pre_insertion',
+        array(
+            'args' => array(
+                'table' => 'spip_auteurs',
+            ),
+            'data' => $champs
+        )
+    );
+    $id_auteur = sql_insertq("spip_auteurs", $champs);
+    pipeline('post_insertion',
+        array(
+            'args' => array(
+                'table' => 'spip_auteurs',
+                'id_objet' => $id_auteur
+            ),
+            'data' => $champs
+        )
+    );
+    return $id_auteur;
 }
 
 
@@ -99,55 +99,55 @@ 
  */
 function auteur_modifier($id_auteur, $set = null, $force_update=false) {
 
-	include_spip('inc/modifier');
-	include_spip('inc/filtres');
-	$c = collecter_requests(
-		// white list
-		objet_info('auteur','champs_editables'),
-		// black list
-		$force_update?array():array('webmestre','pass','login'),
-		// donnees eventuellement fournies
-		$set
-	);
-
-	if ($err = objet_modifier_champs('auteur', $id_auteur,
-		array(
-			'data' => $set,
-			'nonvide' => array('nom' => _T('ecrire:item_nouvel_auteur'))
-		),
-		$c))
-		return $err;
-	$session = $c;
-
-	$err = '';
-	if (!$force_update){
-		// Modification de statut, changement de rubrique ?
-		$c = collecter_requests(
-			// white list
-			array(
-			 'statut', 'new_login','new_pass','login','pass','webmestre','restreintes','id_parent'
-			),
-			// black list
-			array(),
-			// donnees eventuellement fournies
-			$set
-		);
-		if (isset($c['new_login']) AND !isset($c['login']))
-			$c['login'] = $c['new_login'];
-		if (isset($c['new_pass']) AND !isset($c['pass']))
-			$c['pass'] = $c['new_pass'];
-		$err = auteur_instituer($id_auteur, $c);
-		$session = array_merge($session,$c);
-	}
-
-	// .. mettre a jour les sessions de cet auteur
-	include_spip('inc/session');
-	$session['id_auteur'] = $id_auteur;
-	unset($session['new_login']);
-	unset($session['new_pass']);
-	actualiser_sessions($session);
-
-	return $err;
+    include_spip('inc/modifier');
+    include_spip('inc/filtres');
+    $c = collecter_requests(
+        // white list
+        objet_info('auteur','champs_editables'),
+        // black list
+        $force_update?array():array('webmestre','pass','login'),
+        // donnees eventuellement fournies
+        $set
+    );
+
+    if ($err = objet_modifier_champs('auteur', $id_auteur,
+        array(
+            'data' => $set,
+            'nonvide' => array('nom' => _T('ecrire:item_nouvel_auteur'))
+        ),
+        $c))
+        return $err;
+    $session = $c;
+
+    $err = '';
+    if (!$force_update){
+        // Modification de statut, changement de rubrique ?
+        $c = collecter_requests(
+            // white list
+            array(
+                'statut', 'new_login','new_pass','login','pass','webmestre','restreintes','id_parent'
+            ),
+            // black list
+            array(),
+            // donnees eventuellement fournies
+            $set
+        );
+        if (isset($c['new_login']) AND !isset($c['login']))
+            $c['login'] = $c['new_login'];
+        if (isset($c['new_pass']) AND !isset($c['pass']))
+            $c['pass'] = $c['new_pass'];
+        $err = auteur_instituer($id_auteur, $c);
+        $session = array_merge($session,$c);
+    }
+
+    // .. mettre a jour les sessions de cet auteur
+    include_spip('inc/session');
+    $session['id_auteur'] = $id_auteur;
+    unset($session['new_login']);
+    unset($session['new_pass']);
+    actualiser_sessions($session);
+
+    return $err;
 }
 
 /**
@@ -165,8 +165,8 @@ 
  * @return string
  */
 function auteur_associer($id_auteur,$objets, $qualif = null){
-	include_spip('action/editer_liens');
-	return objet_associer(array('auteur'=>$id_auteur), $objets, $qualif);
+    include_spip('action/editer_liens');
+    return objet_associer(array('auteur'=>$id_auteur), $objets, $qualif);
 }
 
 
@@ -177,7 +177,7 @@ 
  * @return string
  */
 function auteur_referent($id_auteur,$c){
-	return auteur_associer($id_auteur,$c);
+    return auteur_associer($id_auteur,$c);
 }
 
 /**
@@ -192,8 +192,8 @@ 
  * @return string
  */
 function auteur_dissocier($id_auteur,$objets){
-	include_spip('action/editer_liens');
-	return objet_dissocier(array('auteur'=>$id_auteur), $objets);
+    include_spip('action/editer_liens');
+    return objet_dissocier(array('auteur'=>$id_auteur), $objets);
 }
 
 /**
@@ -210,8 +210,8 @@ 
  * @return bool|int
  */
 function auteur_qualifier($id_auteur,$objets,$qualif){
-	include_spip('action/editer_liens');
-	return objet_qualifier_liens(array('auteur'=>$id_auteur), $objets, $qualif);
+    include_spip('action/editer_liens');
+    return objet_qualifier_liens(array('auteur'=>$id_auteur), $objets, $qualif);
 }
 
 
@@ -224,114 +224,114 @@ 
  * @return bool|string
  */
 function auteur_instituer($id_auteur, $c, $force_webmestre = false) {
-	if (!$id_auteur=intval($id_auteur))
-		return false;
-	$erreurs = array(); // contiendra les differentes erreurs a traduire par _T()
-	$champs = array();
-
-	// les memoriser pour les faire passer dans le pipeline pre_edition
-	if (isset($c['login']) AND strlen($c['login']))
-		$champs['login'] = $c['login'];
-	if (isset($c['pass']) AND strlen($c['pass']))
-		$champs['pass'] = $c['pass'];
-
-	$statut =	$statut_ancien = sql_getfetsel('statut','spip_auteurs','id_auteur='.intval($id_auteur));
+    if (!$id_auteur=intval($id_auteur))
+        return false;
+    $erreurs = array(); // contiendra les differentes erreurs a traduire par _T()
+    $champs = array();
+
+    // les memoriser pour les faire passer dans le pipeline pre_edition
+    if (isset($c['login']) AND strlen($c['login']))
+        $champs['login'] = $c['login'];
+    if (isset($c['pass']) AND strlen($c['pass']))
+        $champs['pass'] = $c['pass'];
+
+    $statut =	$statut_ancien = sql_getfetsel('statut','spip_auteurs','id_auteur='.intval($id_auteur));
 	
-	if (isset($c['statut'])
-	  AND (autoriser('modifier', 'auteur', $id_auteur,null, array('statut' => $c['statut']))))
-		$statut = $champs['statut'] = $c['statut'];
-
-	// Restreindre avant de declarer l'auteur
-	// (section critique sur les droits)
-	if ($c['id_parent']) {
-		if (is_array($c['restreintes']))
-			$c['restreintes'][] = $c['id_parent'];
-		else
-			$c['restreintes'] = array($c['id_parent']);
-	}
-
-	if (isset($c['webmestre'])
-	  AND ($force_webmestre OR autoriser('modifier', 'auteur', $id_auteur,null, array('webmestre' => '?'))))
-		$champs['webmestre'] = $c['webmestre']=='oui'?'oui':'non';
+    if (isset($c['statut'])
+      AND (autoriser('modifier', 'auteur', $id_auteur,null, array('statut' => $c['statut']))))
+        $statut = $champs['statut'] = $c['statut'];
+
+    // Restreindre avant de declarer l'auteur
+    // (section critique sur les droits)
+    if ($c['id_parent']) {
+        if (is_array($c['restreintes']))
+            $c['restreintes'][] = $c['id_parent'];
+        else
+            $c['restreintes'] = array($c['id_parent']);
+    }
+
+    if (isset($c['webmestre'])
+      AND ($force_webmestre OR autoriser('modifier', 'auteur', $id_auteur,null, array('webmestre' => '?'))))
+        $champs['webmestre'] = $c['webmestre']=='oui'?'oui':'non';
 	
-	// Envoyer aux plugins
-	$champs = pipeline('pre_edition',
-		array(
-			'args' => array(
-				'table' => 'spip_auteurs',
-				'id_objet' => $id_auteur,
-				'action' => 'instituer',
-				'statut_ancien' => $statut_ancien,
-			),
-			'data' => $champs
-		)
-	);
+    // Envoyer aux plugins
+    $champs = pipeline('pre_edition',
+        array(
+            'args' => array(
+                'table' => 'spip_auteurs',
+                'id_objet' => $id_auteur,
+                'action' => 'instituer',
+                'statut_ancien' => $statut_ancien,
+            ),
+            'data' => $champs
+        )
+    );
 	
-	if (is_array($c['restreintes'])
-	AND autoriser('modifier', 'auteur', $id_auteur, NULL, array('restreint'=>$c['restreintes']))) {
-		$rubriques = array_map('intval',$c['restreintes']);
-		$rubriques = array_unique($rubriques);
-		$rubriques = array_diff($rubriques,array(0));
-		auteur_dissocier($id_auteur, array('rubrique'=>'*'));
-		auteur_associer($id_auteur,array('rubrique'=>$rubriques));
-	}
-
-	$flag_ecrire_acces = false;
-	// commencer par traiter les cas particuliers des logins et pass
-	// avant les autres ecritures en base
-	if (isset($champs['login']) OR isset($champs['pass'])){
-		$auth_methode = sql_getfetsel('source','spip_auteurs','id_auteur='.intval($id_auteur));
-		include_spip('inc/auth');
-		if (isset($champs['login']) AND strlen($champs['login']))
-			if (!auth_modifier_login($auth_methode, $champs['login'], $id_auteur))
-				$erreurs[] = 'ecrire:impossible_modifier_login_auteur';
-		if (isset($champs['pass']) AND strlen($champs['pass'])){
-			$champs['login'] = sql_getfetsel('login','spip_auteurs','id_auteur='.intval($id_auteur));
-			if (!auth_modifier_pass($auth_methode, $champs['login'], $champs['pass'], $id_auteur))
-				$erreurs[] = 'ecrire:impossible_modifier_pass_auteur';
-		}
-		unset($champs['login']);
-		unset($champs['pass']);
-		$flag_ecrire_acces = true;
-	}
-
-	if (!count($champs)) return implode(' ', array_map('_T', $erreurs));
-	sql_updateq('spip_auteurs', $champs , 'id_auteur='.$id_auteur);
-
-	// .. mettre a jour les fichiers .htpasswd et .htpasswd-admin
-	if ($flag_ecrire_acces
-	  OR isset($champs['statut'])
-	  ) {
-		include_spip('inc/acces');
-		ecrire_acces();
-	}
-
-	// Invalider les caches
-	include_spip('inc/invalideur');
-	suivre_invalideur("id='auteur/$id_auteur'");
+    if (is_array($c['restreintes'])
+    AND autoriser('modifier', 'auteur', $id_auteur, NULL, array('restreint'=>$c['restreintes']))) {
+        $rubriques = array_map('intval',$c['restreintes']);
+        $rubriques = array_unique($rubriques);
+        $rubriques = array_diff($rubriques,array(0));
+        auteur_dissocier($id_auteur, array('rubrique'=>'*'));
+        auteur_associer($id_auteur,array('rubrique'=>$rubriques));
+    }
+
+    $flag_ecrire_acces = false;
+    // commencer par traiter les cas particuliers des logins et pass
+    // avant les autres ecritures en base
+    if (isset($champs['login']) OR isset($champs['pass'])){
+        $auth_methode = sql_getfetsel('source','spip_auteurs','id_auteur='.intval($id_auteur));
+        include_spip('inc/auth');
+        if (isset($champs['login']) AND strlen($champs['login']))
+            if (!auth_modifier_login($auth_methode, $champs['login'], $id_auteur))
+                $erreurs[] = 'ecrire:impossible_modifier_login_auteur';
+        if (isset($champs['pass']) AND strlen($champs['pass'])){
+            $champs['login'] = sql_getfetsel('login','spip_auteurs','id_auteur='.intval($id_auteur));
+            if (!auth_modifier_pass($auth_methode, $champs['login'], $champs['pass'], $id_auteur))
+                $erreurs[] = 'ecrire:impossible_modifier_pass_auteur';
+        }
+        unset($champs['login']);
+        unset($champs['pass']);
+        $flag_ecrire_acces = true;
+    }
+
+    if (!count($champs)) return implode(' ', array_map('_T', $erreurs));
+    sql_updateq('spip_auteurs', $champs , 'id_auteur='.$id_auteur);
+
+    // .. mettre a jour les fichiers .htpasswd et .htpasswd-admin
+    if ($flag_ecrire_acces
+      OR isset($champs['statut'])
+        ) {
+        include_spip('inc/acces');
+        ecrire_acces();
+    }
+
+    // Invalider les caches
+    include_spip('inc/invalideur');
+    suivre_invalideur("id='auteur/$id_auteur'");
 	
-	// Pipeline
-	pipeline('post_edition',
-		array(
-			'args' => array(
-				'table' => 'spip_auteurs',
-				'id_objet' => $id_auteur,
-				'action' => 'instituer',
-				'statut_ancien' => $statut_ancien,
-			),
-			'data' => $champs
-		)
-	);
-
-
-	// Notifications
-	if ($notifications = charger_fonction('notifications', 'inc')) {
-		$notifications('instituerauteur', $id_auteur,
-			array('statut' => $statut, 'statut_ancien' => $statut_ancien)
-		);
-	}
-
-	return implode(' ', array_map('_T', $erreurs));
+    // Pipeline
+    pipeline('post_edition',
+        array(
+            'args' => array(
+                'table' => 'spip_auteurs',
+                'id_objet' => $id_auteur,
+                'action' => 'instituer',
+                'statut_ancien' => $statut_ancien,
+            ),
+            'data' => $champs
+        )
+    );
+
+
+    // Notifications
+    if ($notifications = charger_fonction('notifications', 'inc')) {
+        $notifications('instituerauteur', $id_auteur,
+            array('statut' => $statut, 'statut_ancien' => $statut_ancien)
+        );
+    }
+
+    return implode(' ', array_map('_T', $erreurs));
 
 }
 
@@ -339,17 +339,17 @@ 
 
 
 function insert_auteur($source=null) {
-	return auteur_inserer($source);
+    return auteur_inserer($source);
 }
 function auteurs_set($id_auteur, $set = null) {
-	return auteur_modifier($id_auteur,$set);
+    return auteur_modifier($id_auteur,$set);
 }
 function instituer_auteur($id_auteur, $c, $force_webmestre = false) {
-	return auteur_instituer($id_auteur,$c,$force_webmestre);
+    return auteur_instituer($id_auteur,$c,$force_webmestre);
 }
 // http://doc.spip.org/@revision_auteur
 function revision_auteur($id_auteur, $c=false) {
-	return auteur_modifier($id_auteur,$c);
+    return auteur_modifier($id_auteur,$c);
 }
 
 ?>

Spacing +37 added lines, -37 removed lines

@@ -13,9 +13,9 @@ 
 if (!defined('_ECRIRE_INC_VERSION')) return;
 
 // http://doc.spip.org/@action_editer_auteur_dist
-function action_editer_auteur_dist($arg=null) {
+function action_editer_auteur_dist($arg = null) {
 
-	if (is_null($arg)){
+	if (is_null($arg)) {
 		$securiser_action = charger_fonction('securiser_action', 'inc');
 		$arg = $securiser_action();
 	}
@@ -24,7 +24,7 @@ 
 	// si id_auteur n'est pas un nombre, c'est une creation
 	if (!$id_auteur = intval($arg)) {
 
-		if (($id_auteur = auteur_inserer()) > 0){
+		if (($id_auteur = auteur_inserer()) > 0) {
 
 			# cf. GROS HACK
 			# recuperer l'eventuel logo charge avant la creation
@@ -44,9 +44,9 @@ 
 		$err = auteur_modifier($id_auteur);
 
 	if ($err)
-		spip_log("echec editeur auteur: $err",_LOG_ERREUR);
+		spip_log("echec editeur auteur: $err", _LOG_ERREUR);
 
-	return array($id_auteur,$err);
+	return array($id_auteur, $err);
 }
 
 /**
@@ -54,14 +54,14 @@ 
  * @param string $source
  * @return int
  */
-function auteur_inserer($source=null) {
+function auteur_inserer($source = null) {
 
 	// Ce qu'on va demander comme modifications
 	$champs = array();
-	$champs['source'] = $source?$source:'spip';
+	$champs['source'] = $source ? $source : 'spip';
 
 	$champs['login'] = '';
-	$champs['statut'] = '5poubelle';  // inutilisable tant qu'il n'a pas ete renseigne et institue
+	$champs['statut'] = '5poubelle'; // inutilisable tant qu'il n'a pas ete renseigne et institue
 	$champs['webmestre'] = 'non';
 
 	// Envoyer aux plugins
@@ -97,15 +97,15 @@ 
  *   utilise par auth/spip
  * @return string
  */
-function auteur_modifier($id_auteur, $set = null, $force_update=false) {
+function auteur_modifier($id_auteur, $set = null, $force_update = false) {
 
 	include_spip('inc/modifier');
 	include_spip('inc/filtres');
 	$c = collecter_requests(
 		// white list
-		objet_info('auteur','champs_editables'),
+		objet_info('auteur', 'champs_editables'),
 		// black list
-		$force_update?array():array('webmestre','pass','login'),
+		$force_update ? array() : array('webmestre', 'pass', 'login'),
 		// donnees eventuellement fournies
 		$set
 	);
@@ -120,12 +120,12 @@ 
 	$session = $c;
 
 	$err = '';
-	if (!$force_update){
+	if (!$force_update) {
 		// Modification de statut, changement de rubrique ?
 		$c = collecter_requests(
 			// white list
 			array(
-			 'statut', 'new_login','new_pass','login','pass','webmestre','restreintes','id_parent'
+			 'statut', 'new_login', 'new_pass', 'login', 'pass', 'webmestre', 'restreintes', 'id_parent'
 			),
 			// black list
 			array(),
@@ -137,7 +137,7 @@ 
 		if (isset($c['new_pass']) AND !isset($c['pass']))
 			$c['pass'] = $c['new_pass'];
 		$err = auteur_instituer($id_auteur, $c);
-		$session = array_merge($session,$c);
+		$session = array_merge($session, $c);
 	}
 
 	// .. mettre a jour les sessions de cet auteur
@@ -164,7 +164,7 @@ 
  * @param array $qualif
  * @return string
  */
-function auteur_associer($id_auteur,$objets, $qualif = null){
+function auteur_associer($id_auteur, $objets, $qualif = null) {
 	include_spip('action/editer_liens');
 	return objet_associer(array('auteur'=>$id_auteur), $objets, $qualif);
 }
@@ -176,8 +176,8 @@ 
  * @param array $c
  * @return string
  */
-function auteur_referent($id_auteur,$c){
-	return auteur_associer($id_auteur,$c);
+function auteur_referent($id_auteur, $c) {
+	return auteur_associer($id_auteur, $c);
 }
 
 /**
@@ -191,7 +191,7 @@ 
  * @param array $objets
  * @return string
  */
-function auteur_dissocier($id_auteur,$objets){
+function auteur_dissocier($id_auteur, $objets) {
 	include_spip('action/editer_liens');
 	return objet_dissocier(array('auteur'=>$id_auteur), $objets);
 }
@@ -209,7 +209,7 @@ 
  * @param array $qualif
  * @return bool|int
  */
-function auteur_qualifier($id_auteur,$objets,$qualif){
+function auteur_qualifier($id_auteur, $objets, $qualif) {
 	include_spip('action/editer_liens');
 	return objet_qualifier_liens(array('auteur'=>$id_auteur), $objets, $qualif);
 }
@@ -224,7 +224,7 @@ 
  * @return bool|string
  */
 function auteur_instituer($id_auteur, $c, $force_webmestre = false) {
-	if (!$id_auteur=intval($id_auteur))
+	if (!$id_auteur = intval($id_auteur))
 		return false;
 	$erreurs = array(); // contiendra les differentes erreurs a traduire par _T()
 	$champs = array();
@@ -235,10 +235,10 @@ 
 	if (isset($c['pass']) AND strlen($c['pass']))
 		$champs['pass'] = $c['pass'];
 
-	$statut =	$statut_ancien = sql_getfetsel('statut','spip_auteurs','id_auteur='.intval($id_auteur));
+	$statut = $statut_ancien = sql_getfetsel('statut', 'spip_auteurs', 'id_auteur='.intval($id_auteur));
 	
 	if (isset($c['statut'])
-	  AND (autoriser('modifier', 'auteur', $id_auteur,null, array('statut' => $c['statut']))))
+	  AND (autoriser('modifier', 'auteur', $id_auteur, null, array('statut' => $c['statut']))))
 		$statut = $champs['statut'] = $c['statut'];
 
 	// Restreindre avant de declarer l'auteur
@@ -251,8 +251,8 @@ 
 	}
 
 	if (isset($c['webmestre'])
-	  AND ($force_webmestre OR autoriser('modifier', 'auteur', $id_auteur,null, array('webmestre' => '?'))))
-		$champs['webmestre'] = $c['webmestre']=='oui'?'oui':'non';
+	  AND ($force_webmestre OR autoriser('modifier', 'auteur', $id_auteur, null, array('webmestre' => '?'))))
+		$champs['webmestre'] = $c['webmestre'] == 'oui' ? 'oui' : 'non';
 	
 	// Envoyer aux plugins
 	$champs = pipeline('pre_edition',
@@ -269,24 +269,24 @@ 
 	
 	if (is_array($c['restreintes'])
 	AND autoriser('modifier', 'auteur', $id_auteur, NULL, array('restreint'=>$c['restreintes']))) {
-		$rubriques = array_map('intval',$c['restreintes']);
+		$rubriques = array_map('intval', $c['restreintes']);
 		$rubriques = array_unique($rubriques);
-		$rubriques = array_diff($rubriques,array(0));
+		$rubriques = array_diff($rubriques, array(0));
 		auteur_dissocier($id_auteur, array('rubrique'=>'*'));
-		auteur_associer($id_auteur,array('rubrique'=>$rubriques));
+		auteur_associer($id_auteur, array('rubrique'=>$rubriques));
 	}
 
 	$flag_ecrire_acces = false;
 	// commencer par traiter les cas particuliers des logins et pass
 	// avant les autres ecritures en base
-	if (isset($champs['login']) OR isset($champs['pass'])){
-		$auth_methode = sql_getfetsel('source','spip_auteurs','id_auteur='.intval($id_auteur));
+	if (isset($champs['login']) OR isset($champs['pass'])) {
+		$auth_methode = sql_getfetsel('source', 'spip_auteurs', 'id_auteur='.intval($id_auteur));
 		include_spip('inc/auth');
 		if (isset($champs['login']) AND strlen($champs['login']))
 			if (!auth_modifier_login($auth_methode, $champs['login'], $id_auteur))
 				$erreurs[] = 'ecrire:impossible_modifier_login_auteur';
-		if (isset($champs['pass']) AND strlen($champs['pass'])){
-			$champs['login'] = sql_getfetsel('login','spip_auteurs','id_auteur='.intval($id_auteur));
+		if (isset($champs['pass']) AND strlen($champs['pass'])) {
+			$champs['login'] = sql_getfetsel('login', 'spip_auteurs', 'id_auteur='.intval($id_auteur));
 			if (!auth_modifier_pass($auth_methode, $champs['login'], $champs['pass'], $id_auteur))
 				$erreurs[] = 'ecrire:impossible_modifier_pass_auteur';
 		}
@@ -296,7 +296,7 @@ 
 	}
 
 	if (!count($champs)) return implode(' ', array_map('_T', $erreurs));
-	sql_updateq('spip_auteurs', $champs , 'id_auteur='.$id_auteur);
+	sql_updateq('spip_auteurs', $champs, 'id_auteur='.$id_auteur);
 
 	// .. mettre a jour les fichiers .htpasswd et .htpasswd-admin
 	if ($flag_ecrire_acces
@@ -338,18 +338,18 @@ 
 
 
 
-function insert_auteur($source=null) {
+function insert_auteur($source = null) {
 	return auteur_inserer($source);
 }
 function auteurs_set($id_auteur, $set = null) {
-	return auteur_modifier($id_auteur,$set);
+	return auteur_modifier($id_auteur, $set);
 }
 function instituer_auteur($id_auteur, $c, $force_webmestre = false) {
-	return auteur_instituer($id_auteur,$c,$force_webmestre);
+	return auteur_instituer($id_auteur, $c, $force_webmestre);
 }
 // http://doc.spip.org/@revision_auteur
-function revision_auteur($id_auteur, $c=false) {
-	return auteur_modifier($id_auteur,$c);
+function revision_auteur($id_auteur, $c = false) {
+	return auteur_modifier($id_auteur, $c);
 }
 
 ?>

Braces +53 added lines, -34 removed lines

@@ -10,7 +10,9 @@ 
  *  Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne.   *
 \***************************************************************************/
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 // http://doc.spip.org/@action_editer_auteur_dist
 function action_editer_auteur_dist($arg=null) {
@@ -31,20 +33,24 @@ 
 			# ils ont un id = 0-id_auteur de la session
 			$id_hack = 0 - $GLOBALS['visiteur_session']['id_auteur'];
 			$chercher_logo = charger_fonction('chercher_logo', 'inc');
-			if (list($logo) = $chercher_logo($id_hack, 'id_auteur', 'on'))
-				rename($logo, str_replace($id_hack, $id_auteur, $logo));
-			if (list($logo) = $chercher_logo($id_hack, 'id_auteur', 'off'))
-				rename($logo, str_replace($id_hack, $id_auteur, $logo));
+			if (list($logo) = $chercher_logo($id_hack, 'id_auteur', 'on')) {
+							rename($logo, str_replace($id_hack, $id_auteur, $logo));
+			}
+			if (list($logo) = $chercher_logo($id_hack, 'id_auteur', 'off')) {
+							rename($logo, str_replace($id_hack, $id_auteur, $logo));
+			}
 		}
 	}
 
 	// Enregistre l'envoi dans la BD
 	$err = "";
-	if ($id_auteur > 0)
-		$err = auteur_modifier($id_auteur);
+	if ($id_auteur > 0) {
+			$err = auteur_modifier($id_auteur);
+	}
 
-	if ($err)
-		spip_log("echec editeur auteur: $err",_LOG_ERREUR);
+	if ($err) {
+			spip_log("echec editeur auteur: $err",_LOG_ERREUR);
+	}
 
 	return array($id_auteur,$err);
 }
@@ -115,8 +121,9 @@ 
 			'data' => $set,
 			'nonvide' => array('nom' => _T('ecrire:item_nouvel_auteur'))
 		),
-		$c))
-		return $err;
+		$c)) {
+			return $err;
+	}
 	$session = $c;
 
 	$err = '';
@@ -132,10 +139,12 @@ 
 			// donnees eventuellement fournies
 			$set
 		);
-		if (isset($c['new_login']) AND !isset($c['login']))
-			$c['login'] = $c['new_login'];
-		if (isset($c['new_pass']) AND !isset($c['pass']))
-			$c['pass'] = $c['new_pass'];
+		if (isset($c['new_login']) AND !isset($c['login'])) {
+					$c['login'] = $c['new_login'];
+		}
+		if (isset($c['new_pass']) AND !isset($c['pass'])) {
+					$c['pass'] = $c['new_pass'];
+		}
 		$err = auteur_instituer($id_auteur, $c);
 		$session = array_merge($session,$c);
 	}
@@ -224,35 +233,41 @@ 
  * @return bool|string
  */
 function auteur_instituer($id_auteur, $c, $force_webmestre = false) {
-	if (!$id_auteur=intval($id_auteur))
-		return false;
+	if (!$id_auteur=intval($id_auteur)) {
+			return false;
+	}
 	$erreurs = array(); // contiendra les differentes erreurs a traduire par _T()
 	$champs = array();
 
 	// les memoriser pour les faire passer dans le pipeline pre_edition
-	if (isset($c['login']) AND strlen($c['login']))
-		$champs['login'] = $c['login'];
-	if (isset($c['pass']) AND strlen($c['pass']))
-		$champs['pass'] = $c['pass'];
+	if (isset($c['login']) AND strlen($c['login'])) {
+			$champs['login'] = $c['login'];
+	}
+	if (isset($c['pass']) AND strlen($c['pass'])) {
+			$champs['pass'] = $c['pass'];
+	}
 
 	$statut =	$statut_ancien = sql_getfetsel('statut','spip_auteurs','id_auteur='.intval($id_auteur));
 	
 	if (isset($c['statut'])
-	  AND (autoriser('modifier', 'auteur', $id_auteur,null, array('statut' => $c['statut']))))
-		$statut = $champs['statut'] = $c['statut'];
+	  AND (autoriser('modifier', 'auteur', $id_auteur,null, array('statut' => $c['statut'])))) {
+			$statut = $champs['statut'] = $c['statut'];
+	}
 
 	// Restreindre avant de declarer l'auteur
 	// (section critique sur les droits)
 	if ($c['id_parent']) {
-		if (is_array($c['restreintes']))
-			$c['restreintes'][] = $c['id_parent'];
-		else
-			$c['restreintes'] = array($c['id_parent']);
+		if (is_array($c['restreintes'])) {
+					$c['restreintes'][] = $c['id_parent'];
+		} else {
+					$c['restreintes'] = array($c['id_parent']);
+		}
 	}
 
 	if (isset($c['webmestre'])
-	  AND ($force_webmestre OR autoriser('modifier', 'auteur', $id_auteur,null, array('webmestre' => '?'))))
-		$champs['webmestre'] = $c['webmestre']=='oui'?'oui':'non';
+	  AND ($force_webmestre OR autoriser('modifier', 'auteur', $id_auteur,null, array('webmestre' => '?')))) {
+			$champs['webmestre'] = $c['webmestre']=='oui'?'oui':'non';
+	}
 	
 	// Envoyer aux plugins
 	$champs = pipeline('pre_edition',
@@ -282,20 +297,24 @@ 
 	if (isset($champs['login']) OR isset($champs['pass'])){
 		$auth_methode = sql_getfetsel('source','spip_auteurs','id_auteur='.intval($id_auteur));
 		include_spip('inc/auth');
-		if (isset($champs['login']) AND strlen($champs['login']))
-			if (!auth_modifier_login($auth_methode, $champs['login'], $id_auteur))
+		if (isset($champs['login']) AND strlen($champs['login'])) {
+					if (!auth_modifier_login($auth_methode, $champs['login'], $id_auteur))
 				$erreurs[] = 'ecrire:impossible_modifier_login_auteur';
+		}
 		if (isset($champs['pass']) AND strlen($champs['pass'])){
 			$champs['login'] = sql_getfetsel('login','spip_auteurs','id_auteur='.intval($id_auteur));
-			if (!auth_modifier_pass($auth_methode, $champs['login'], $champs['pass'], $id_auteur))
-				$erreurs[] = 'ecrire:impossible_modifier_pass_auteur';
+			if (!auth_modifier_pass($auth_methode, $champs['login'], $champs['pass'], $id_auteur)) {
+							$erreurs[] = 'ecrire:impossible_modifier_pass_auteur';
+			}
 		}
 		unset($champs['login']);
 		unset($champs['pass']);
 		$flag_ecrire_acces = true;
 	}
 
-	if (!count($champs)) return implode(' ', array_map('_T', $erreurs));
+	if (!count($champs)) {
+	    return implode(' ', array_map('_T', $erreurs));
+	}
 	sql_updateq('spip_auteurs', $champs , 'id_auteur='.$id_auteur);
 
 	// .. mettre a jour les fichiers .htpasswd et .htpasswd-admin

ecrire/base/abstract_sql.php

Doc Comments +38 added lines, -11 removed lines

@@ -208,19 +208,19 @@ 
  * @api
  * @uses sql_select()
  *
- * @param array|string $select
+ * @param string $select
  * 		Liste des champs a recuperer (Select)
- * @param array|string $from
+ * @param string $from
  * 		Tables a consulter (From)
- * @param array|string $where
+ * @param string $where
  * 		Conditions a remplir (Where)
- * @param array|string $groupby
+ * @param string $groupby
  * 		Critere de regroupement (Group by)
- * @param array|string $orderby
+ * @param string $orderby
  * 		Tableau de classement (Order By)
  * @param string $limit
  * 		Critere de limite (Limit)
- * @param array $having
+ * @param string $having
  * 		Tableau des des post-conditions a remplir (Having)
  * @param string $serveur
  * 		Le serveur sollicite (pour retrouver la connexion)
@@ -249,9 +249,9 @@ 
  * 		Tables a consulter (From)
  * @param array|string $where
  * 		Conditions a remplir (Where)
- * @param array|string $groupby
+ * @param string $groupby
  * 		Critere de regroupement (Group by)
- * @param array $having
+ * @param string $having
  * 		Tableau des des post-conditions a remplir (Having)
  * @param string $serveur
  * 		Le serveur sollicite (pour retrouver la connexion)
@@ -507,6 +507,9 @@ 
 }
 
 // http://doc.spip.org/@sql_update
+/**
+ * @param string $table
+ */
 function sql_update($table, $exp, $where='', $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('update', $serveur,  $option==='continue' OR $option===false);
@@ -540,6 +543,9 @@ 
 }
 
 // http://doc.spip.org/@sql_replace
+/**
+ * @param string $table
+ */
 function sql_replace($table, $couples, $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('replace', $serveur,  $option==='continue' OR $option===false);
@@ -663,6 +669,9 @@ 
 }
 
 // http://doc.spip.org/@sql_create
+/**
+ * @param string $nom
+ */
 function sql_create($nom, $champs, $cles=array(), $autoinc=false, $temporary=false, $serveur='', $option=true) {
 	$f = sql_serveur('create', $serveur,  $option==='continue' OR $option===false);
 	if (!is_string($f) OR !$f) return false;
@@ -694,6 +703,9 @@ 
 }
 
 // http://doc.spip.org/@sql_multi
+/**
+ * @param string $sel
+ */
 function sql_multi($sel, $lang, $serveur='', $option=true)
 {
 	$f = sql_serveur('multi', $serveur,  $option==='continue' OR $option===false);
@@ -753,6 +765,9 @@ 
 }
 
 // http://doc.spip.org/@sql_repair
+/**
+ * @return string
+ */
 function sql_repair($table, $serveur='', $option=true) {
 	$f = sql_serveur('repair', $serveur,  $option==='continue' OR $option===false);
 	if (!is_string($f) OR !$f) return false;
@@ -765,6 +780,9 @@ 
 // A n'utiliser qu'en derniere extremite
 
 // http://doc.spip.org/@sql_query
+/**
+ * @param string $ins
+ */
 function sql_query($ins, $serveur='', $option=true) {
 	$f = sql_serveur('query', $serveur,  $option==='continue' OR $option===false);
 	if (!is_string($f) OR !$f) return false;
@@ -852,13 +870,13 @@ 
  * 		Tables a consulter (From)
  * @param array|string $where
  * 		Conditions a remplir (Where)
- * @param array|string $groupby
+ * @param string $groupby
  * 		Critere de regroupement (Group by)
- * @param array|string $orderby
+ * @param string $orderby
  * 		Tableau de classement (Order By)
  * @param string $limit
  * 		Critere de limite (Limit)
- * @param array $having
+ * @param string $having
  * 		Tableau des des post-conditions a remplir (Having)
  * @param string $serveur
  * 		Le serveur sollicite (pour retrouver la connexion)
@@ -1107,6 +1125,11 @@ 
 	return $f($val, $type);
 }
 
+/**
+ * @param string $champ
+ * @param double $interval
+ * @param string $unite
+ */
 function sql_date_proche($champ, $interval, $unite, $serveur='', $option=true)
 {
 	$f = sql_serveur('date_proche', $serveur, true);
@@ -1159,6 +1182,10 @@ 
 // s'il accepte les requetes imbriquees afin d'optimiser ca
 
 // http://doc.spip.org/@sql_in_select
+/**
+ * @param string $in
+ * @param string $select
+ */
 function sql_in_select($in, $select, $from = array(), $where = array(),
 		    $groupby = array(), $orderby = array(), $limit = '', $having = array(), $serveur='')
 {

Indentation +319 added lines, -319 removed lines

@@ -53,13 +53,13 @@ 
  * 
 **/
 function sql_serveur($ins_sql='', $serveur='', $continue=false) {
-	static $sql_serveur = array();
-	if (!isset($sql_serveur[$serveur][$ins_sql])){
-		$f = spip_connect_sql(sql_ABSTRACT_VERSION, $ins_sql, $serveur, $continue);
-		if (!is_string($f) OR !$f) return $f;
-		$sql_serveur[$serveur][$ins_sql] = $f;
-	}
-	return $sql_serveur[$serveur][$ins_sql];
+    static $sql_serveur = array();
+    if (!isset($sql_serveur[$serveur][$ins_sql])){
+        $f = spip_connect_sql(sql_ABSTRACT_VERSION, $ins_sql, $serveur, $continue);
+        if (!is_string($f) OR !$f) return $f;
+        $sql_serveur[$serveur][$ins_sql] = $f;
+    }
+    return $sql_serveur[$serveur][$ins_sql];
 }
 
 /**
@@ -81,16 +81,16 @@ 
  * 		Retourne le nom du charset si effectivement trouve, sinon false.
 **/
 function sql_get_charset($charset, $serveur='', $option=true){
-  // le nom http du charset differe parfois du nom SQL utf-8 ==> utf8 etc.
-	$desc = sql_serveur('', $serveur, true,true);
-	$desc = $desc[sql_ABSTRACT_VERSION];
-	$c = $desc['charsets'][$charset];
-	if ($c) {
-		if (function_exists($f=@$desc['get_charset'])) 
-			if ($f($c, $serveur, $option!==false)) return $c;
-	}
-	spip_log( "SPIP ne connait pas les Charsets disponibles sur le serveur $serveur. Le serveur choisira seul.", _LOG_AVERTISSEMENT);
-	return false;
+    // le nom http du charset differe parfois du nom SQL utf-8 ==> utf8 etc.
+    $desc = sql_serveur('', $serveur, true,true);
+    $desc = $desc[sql_ABSTRACT_VERSION];
+    $c = $desc['charsets'][$charset];
+    if ($c) {
+        if (function_exists($f=@$desc['get_charset'])) 
+            if ($f($c, $serveur, $option!==false)) return $c;
+    }
+    spip_log( "SPIP ne connait pas les Charsets disponibles sur le serveur $serveur. Le serveur choisira seul.", _LOG_AVERTISSEMENT);
+    return false;
 }
 
 
@@ -116,9 +116,9 @@ 
  * 		Retourne true si elle reussie.
 **/
 function sql_set_charset($charset,$serveur='', $option=true){
-	$f = sql_serveur('set_charset', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	return $f($charset, $serveur, $option!==false);
+    $f = sql_serveur('set_charset', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    return $f($charset, $serveur, $option!==false);
 }
 
 
@@ -168,33 +168,33 @@ 
  *
 **/
 function sql_select ($select = array(), $from = array(), $where = array(),
-	$groupby = array(), $orderby = array(), $limit = '', $having = array(),
-	$serveur='', $option=true) {
-	$f = sql_serveur('select', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-
-	$debug = (defined('_VAR_MODE') AND _VAR_MODE == 'debug');
-	if (($option !== false) AND !$debug) {
-		$res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, is_array($option) ? true : $option);
-	} else {
-		$query = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false);
-		if (!$option) return $query;
-		// le debug, c'est pour ce qui a ete produit par le compilateur
-		if (isset($GLOBALS['debug']['aucasou'])) {
-			list($table, $id,) = $GLOBALS['debug']['aucasou'];
-			$nom = $GLOBALS['debug_objets']['courant'] . $id;
-			$GLOBALS['debug_objets']['requete'][$nom] = $query;
-		}
-		$res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, true);
-	}
-
-	// en cas d'erreur
-	if (!is_string($res)) return $res;
-	// denoncer l'erreur SQL dans sa version brute
-	spip_sql_erreur($serveur);
-	// idem dans sa version squelette (prefixe des tables non substitue)
-	erreur_squelette(array(sql_errno($serveur), sql_error($serveur), $res), $option);
-	return false;
+    $groupby = array(), $orderby = array(), $limit = '', $having = array(),
+    $serveur='', $option=true) {
+    $f = sql_serveur('select', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+
+    $debug = (defined('_VAR_MODE') AND _VAR_MODE == 'debug');
+    if (($option !== false) AND !$debug) {
+        $res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, is_array($option) ? true : $option);
+    } else {
+        $query = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false);
+        if (!$option) return $query;
+        // le debug, c'est pour ce qui a ete produit par le compilateur
+        if (isset($GLOBALS['debug']['aucasou'])) {
+            list($table, $id,) = $GLOBALS['debug']['aucasou'];
+            $nom = $GLOBALS['debug_objets']['courant'] . $id;
+            $GLOBALS['debug_objets']['requete'][$nom] = $query;
+        }
+        $res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, true);
+    }
+
+    // en cas d'erreur
+    if (!is_string($res)) return $res;
+    // denoncer l'erreur SQL dans sa version brute
+    spip_sql_erreur($serveur);
+    // idem dans sa version squelette (prefixe des tables non substitue)
+    erreur_squelette(array(sql_errno($serveur), sql_error($serveur), $res), $option);
+    return false;
 }
 
 
@@ -231,9 +231,9 @@ 
  *  
 **/
 function sql_get_select($select = array(), $from = array(), $where = array(),
-	$groupby = array(), $orderby = array(), $limit = '', $having = array(),
-	$serveur='') {
-	return sql_select ($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false);
+    $groupby = array(), $orderby = array(), $limit = '', $having = array(),
+    $serveur='') {
+    return sql_select ($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false);
 }
 
 
@@ -267,13 +267,13 @@ 
  *
 **/
 function sql_countsel($from = array(), $where = array(),
-		      $groupby = array(), $having = array(),
-	$serveur='', $option=true) {
-	$f = sql_serveur('countsel', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($from, $where, $groupby, $having, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
-	return $r;
+                $groupby = array(), $having = array(),
+    $serveur='', $option=true) {
+    $f = sql_serveur('countsel', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($from, $where, $groupby, $having, $serveur, $option!==false);
+    if ($r===false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 /**
@@ -300,11 +300,11 @@ 
  * 		Ce retour n'est pas pertinent pour savoir si l'operation est correctement realisee.
 **/
 function sql_alter($q, $serveur='', $option=true) {
-	$f = sql_serveur('alter', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($q, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('alter', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($q, $serveur, $option!==false);
+    if ($r===false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 /**
@@ -327,9 +327,9 @@ 
  * 		presentant une ligne de resultat d'une selection 
  */
 function sql_fetch($res, $serveur='', $option=true) {
-	$f = sql_serveur('fetch', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	return $f($res, NULL, $serveur, $option!==false);
+    $f = sql_serveur('fetch', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    return $f($res, NULL, $serveur, $option!==false);
 }
 
 
@@ -356,14 +356,14 @@ 
  * 		presentant une ligne de resultat d'une selection 
  */
 function sql_fetch_all($res, $serveur='', $option=true){
-	$rows = array();
-	if (!$res) return $rows;
-	$f = sql_serveur('fetch', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return array();
-	while ($r = $f($res, NULL, $serveur, $option!==false))
-		$rows[] = $r;
-	sql_free($res, $serveur);
-	return $rows;
+    $rows = array();
+    if (!$res) return $rows;
+    $f = sql_serveur('fetch', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return array();
+    while ($r = $f($res, NULL, $serveur, $option!==false))
+        $rows[] = $r;
+    sql_free($res, $serveur);
+    return $rows;
 }
 
 /**
@@ -391,11 +391,11 @@ 
  * 		Operation effectuee (true), sinon false.
 **/
 function sql_seek($res, $row_number, $serveur='', $option=true) {
-	$f = sql_serveur('seek', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($res, $row_number, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('seek', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($res, $row_number, $serveur, $option!==false);
+    if ($r===false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 
@@ -420,11 +420,11 @@ 
  * 		False en cas d'erreur.
 **/
 function sql_listdbs($serveur='', $option=true) {
-	$f = sql_serveur('listdbs', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($serveur);
-	if ($r===false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('listdbs', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($serveur);
+    if ($r===false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 
@@ -447,29 +447,29 @@ 
 **/
 function sql_selectdb($nom, $serveur='', $option=true)
 {
-	$f = sql_serveur('selectdb', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($nom, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('selectdb', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($nom, $serveur, $option!==false);
+    if ($r===false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_count
 function sql_count($res, $serveur='', $option=true)
 {
-	$f = sql_serveur('count', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($res, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('count', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($res, $serveur, $option!==false);
+    if ($r===false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_free
 function sql_free($res, $serveur='', $option=true)
 {
-	$f = sql_serveur('free', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	return $f($res);
+    $f = sql_serveur('free', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    return $f($res);
 }
 
 // Cette fonction ne garantit pas une portabilite totale
@@ -479,41 +479,41 @@ 
 // http://doc.spip.org/@sql_insert
 function sql_insert($table, $noms, $valeurs, $desc=array(), $serveur='', $option=true)
 {
-	$f = sql_serveur('insert', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $noms, $valeurs, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('insert', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $noms, $valeurs, $desc, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_insertq
 function sql_insertq($table, $couples=array(), $desc=array(), $serveur='', $option=true)
 {
-	$f = sql_serveur('insertq', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $couples, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('insertq', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $couples, $desc, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_insertq_multi
 function sql_insertq_multi($table, $couples=array(), $desc=array(), $serveur='', $option=true)
 {
-	$f = sql_serveur('insertq_multi', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $couples, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('insertq_multi', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $couples, $desc, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_update
 function sql_update($table, $exp, $where='', $desc=array(), $serveur='', $option=true)
 {
-	$f = sql_serveur('update', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $exp, $where, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('update', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $exp, $where, $desc, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // Update est presque toujours appelee sur des constantes ou des dates
@@ -522,63 +522,63 @@ 
 // http://doc.spip.org/@sql_updateq
 function sql_updateq($table, $exp, $where='', $desc=array(), $serveur='', $option=true)
 {
-	$f = sql_serveur('updateq', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $exp, $where, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('updateq', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $exp, $where, $desc, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_delete
 function sql_delete($table, $where='', $serveur='', $option=true)
 {
-	$f = sql_serveur('delete', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $where, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('delete', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $where, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_replace
 function sql_replace($table, $couples, $desc=array(), $serveur='', $option=true)
 {
-	$f = sql_serveur('replace', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $couples, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('replace', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $couples, $desc, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 
 // http://doc.spip.org/@sql_replace_multi
 function sql_replace_multi($table, $tab_couples, $desc=array(), $serveur='', $option=true)
 {
-	$f = sql_serveur('replace_multi', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $tab_couples, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('replace_multi', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $tab_couples, $desc, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_drop_table
 function sql_drop_table($table, $exist='', $serveur='', $option=true)
 {
-	$f = sql_serveur('drop_table', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $exist, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('drop_table', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $exist, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // supprimer une vue sql
 // http://doc.spip.org/@sql_drop_view
 function sql_drop_view($table, $exist='', $serveur='', $option=true)
 {
-	$f = sql_serveur('drop_view', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $exist, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('drop_view', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $exist, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 /**
@@ -601,16 +601,16 @@ 
 **/
 function sql_showbase($spip=NULL, $serveur='', $option=true)
 {
-	$f = sql_serveur('showbase', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+    $f = sql_serveur('showbase', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
 
-	// la globale n'est remplie qu'apres l'appel de sql_serveur.
-	if ($spip == NULL){
-		$connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-		$spip = $connexion['prefixe'] . '\_%';
-	}
+    // la globale n'est remplie qu'apres l'appel de sql_serveur.
+    if ($spip == NULL){
+        $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+        $spip = $connexion['prefixe'] . '\_%';
+    }
 
-	return $f($spip, $serveur, $option!==false);
+    return $f($spip, $serveur, $option!==false);
 }
 
 /**
@@ -634,50 +634,50 @@ 
 **/
 function sql_alltable($spip=NULL, $serveur='', $option=true)
 {
-	$q = sql_showbase($spip, $serveur, $option);
-	$r = array();
-	if ($q) while ($t = sql_fetch($q, $serveur)) { $r[] = array_shift($t);}
-	return $r;
+    $q = sql_showbase($spip, $serveur, $option);
+    $r = array();
+    if ($q) while ($t = sql_fetch($q, $serveur)) { $r[] = array_shift($t);}
+    return $r;
 }
 
 // http://doc.spip.org/@sql_showtable
 function sql_showtable($table, $table_spip = false, $serveur='', $option=true)
 {
-	$f = sql_serveur('showtable', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-
-	// la globale n'est remplie qu'apres l'appel de sql_serveur.
-	if ($table_spip){
-		$connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-		$prefixe = $connexion['prefixe'];
-		$vraie_table = preg_replace('/^spip/', $prefixe, $table);
-	} else $vraie_table = $table;
-
-	$f = $f($vraie_table, $serveur, $option!==false);
-	if (!$f) return array();
-	if (isset($GLOBALS['tables_principales'][$table]['join']))
-		$f['join'] = $GLOBALS['tables_principales'][$table]['join'];
-	elseif (isset($GLOBALS['tables_auxiliaires'][$table]['join']))
-		$f['join'] = $GLOBALS['tables_auxiliaires'][$table]['join'];
-	return $f;
+    $f = sql_serveur('showtable', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+
+    // la globale n'est remplie qu'apres l'appel de sql_serveur.
+    if ($table_spip){
+        $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
+        $prefixe = $connexion['prefixe'];
+        $vraie_table = preg_replace('/^spip/', $prefixe, $table);
+    } else $vraie_table = $table;
+
+    $f = $f($vraie_table, $serveur, $option!==false);
+    if (!$f) return array();
+    if (isset($GLOBALS['tables_principales'][$table]['join']))
+        $f['join'] = $GLOBALS['tables_principales'][$table]['join'];
+    elseif (isset($GLOBALS['tables_auxiliaires'][$table]['join']))
+        $f['join'] = $GLOBALS['tables_auxiliaires'][$table]['join'];
+    return $f;
 }
 
 // http://doc.spip.org/@sql_create
 function sql_create($nom, $champs, $cles=array(), $autoinc=false, $temporary=false, $serveur='', $option=true) {
-	$f = sql_serveur('create', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($nom, $champs, $cles, $autoinc, $temporary, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('create', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($nom, $champs, $cles, $autoinc, $temporary, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 function sql_create_base($nom, $serveur='', $option=true)
 {
-	$f = sql_serveur('create_base', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($nom, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('create_base', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($nom, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // Fonction pour creer une vue 
@@ -686,19 +686,19 @@ 
 // (en mettant $option du sql_select a false pour recuperer la requete)
 // http://doc.spip.org/@sql_create_view
 function sql_create_view($nom, $select_query, $serveur='', $option=true) {
-	$f = sql_serveur('create_view', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($nom, $select_query, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('create_view', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($nom, $select_query, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_multi
 function sql_multi($sel, $lang, $serveur='', $option=true)
 {
-	$f = sql_serveur('multi', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	return $f($sel, $lang);
+    $f = sql_serveur('multi', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    return $f($sel, $lang);
 }
 
 
@@ -713,9 +713,9 @@ 
  *      False si le serveur est indisponible
  */
 function sql_error($serveur='') {
-	$f = sql_serveur('error', $serveur, 'continue');
-	if (!is_string($f) OR !$f) return false;
-	return $f('query inconnue', $serveur);
+    $f = sql_serveur('error', $serveur, 'continue');
+    if (!is_string($f) OR !$f) return false;
+    return $f('query inconnue', $serveur);
 }
 
 /**
@@ -729,36 +729,36 @@ 
  *      False si le serveur est indisponible
  */
 function sql_errno($serveur='') {
-	$f = sql_serveur('errno', $serveur, 'continue');
-	if (!is_string($f) OR !$f) return false;
-	return $f($serveur);
+    $f = sql_serveur('errno', $serveur, 'continue');
+    if (!is_string($f) OR !$f) return false;
+    return $f($serveur);
 }
 
 // http://doc.spip.org/@sql_explain
 function sql_explain($q, $serveur='', $option=true) {
-	$f = sql_serveur('explain', $serveur,  'continue');
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($q, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('explain', $serveur,  'continue');
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($q, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_optimize
 function sql_optimize($table, $serveur='', $option=true) {
-	$f = sql_serveur('optimize', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('optimize', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // http://doc.spip.org/@sql_repair
 function sql_repair($table, $serveur='', $option=true) {
-	$f = sql_serveur('repair', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('repair', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($table, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 // Fonction la plus generale ... et la moins portable
@@ -766,11 +766,11 @@ 
 
 // http://doc.spip.org/@sql_query
 function sql_query($ins, $serveur='', $option=true) {
-	$f = sql_serveur('query', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($ins, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('query', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($ins, $serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 }
 
 /**
@@ -819,14 +819,14 @@ 
  *
 **/
 function sql_fetsel($select = array(), $from = array(), $where = array(),
-	$groupby = array(), $orderby = array(), $limit = '',
-	$having = array(), $serveur='', $option=true) {
-	$q = sql_select($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $q;
-	if (!$q) return array();
-	$r = sql_fetch($q, $serveur, $option);
-	sql_free($q, $serveur, $option);
-	return $r;
+    $groupby = array(), $orderby = array(), $limit = '',
+    $having = array(), $serveur='', $option=true) {
+    $q = sql_select($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
+    if ($option===false) return $q;
+    if (!$q) return array();
+    $r = sql_fetch($q, $serveur, $option);
+    sql_free($q, $serveur, $option);
+    return $r;
 }
 
 
@@ -883,11 +883,11 @@ 
  *
 **/
 function sql_allfetsel($select = array(), $from = array(), $where = array(),
-	$groupby = array(), $orderby = array(), $limit = '',
-	$having = array(), $serveur='', $option=true) {
-	$q = sql_select($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $q;
-	return sql_fetch_all($q, $serveur, $option);
+    $groupby = array(), $orderby = array(), $limit = '',
+    $having = array(), $serveur='', $option=true) {
+    $q = sql_select($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
+    if ($option===false) return $q;
+    return sql_fetch_all($q, $serveur, $option);
 }
 
 
@@ -932,14 +932,14 @@ 
  *
 **/
 function sql_getfetsel($select, $from = array(), $where = array(), $groupby = array(), 
-	$orderby = array(), $limit = '', $having = array(), $serveur='', $option=true) {
-	if (preg_match('/\s+as\s+(\w+)$/i', $select, $c)) $id = $c[1];
-	elseif (!preg_match('/\W/', $select)) $id = $select;
-	else {$id = 'n'; $select .= ' AS n';}
-	$r = sql_fetsel($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $r;
-	if (!$r) return NULL;
-	return $r[$id]; 
+    $orderby = array(), $limit = '', $having = array(), $serveur='', $option=true) {
+    if (preg_match('/\s+as\s+(\w+)$/i', $select, $c)) $id = $c[1];
+    elseif (!preg_match('/\W/', $select)) $id = $select;
+    else {$id = 'n'; $select .= ' AS n';}
+    $r = sql_fetsel($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
+    if ($option===false) return $r;
+    if (!$r) return NULL;
+    return $r[$id]; 
 }
 
 /**
@@ -957,8 +957,8 @@ 
  * 		Numero de version du serveur SQL
 **/
 function sql_version($serveur='', $option=true) {
-	$row = sql_fetsel("version() AS n", '','','','','','',$serveur);
-	return ($row['n']);
+    $row = sql_fetsel("version() AS n", '','','','','','',$serveur);
+    return ($row['n']);
 }
 
 /**
@@ -994,11 +994,11 @@ 
  * 		Le serveur SQL prefere t'il des transactions pour les insertions multiples ?
 **/
 function sql_preferer_transaction($serveur='', $option=true) {
-	$f = sql_serveur('preferer_transaction', $serveur,  'continue');
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('preferer_transaction', $serveur,  'continue');
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 };
 
 /**
@@ -1020,11 +1020,11 @@ 
  *      false en cas d'erreur
 **/
 function sql_demarrer_transaction($serveur='', $option=true) {
-	$f = sql_serveur('demarrer_transaction', $serveur,  'continue');
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('demarrer_transaction', $serveur,  'continue');
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 };
 
 /**
@@ -1046,11 +1046,11 @@ 
  *      false en cas d'erreur
 **/
 function sql_terminer_transaction($serveur='', $option=true) {
-	$f = sql_serveur('terminer_transaction', $serveur,  'continue');
-	if (!is_string($f) OR !$f) return false;
-	$r = $f($serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
-	return $r;
+    $f = sql_serveur('terminer_transaction', $serveur,  'continue');
+    if (!is_string($f) OR !$f) return false;
+    $r = $f($serveur, $option!==false);
+    if ($r === false) spip_sql_erreur($serveur);
+    return $r;
 };
 
 
@@ -1075,9 +1075,9 @@ 
 **/
 function sql_hex($val, $serveur='', $option=true)
 {
-	$f = sql_serveur('hex', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	return $f($val);
+    $f = sql_serveur('hex', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    return $f($val);
 }
 
 /**
@@ -1102,16 +1102,16 @@ 
 **/
 function sql_quote($val, $serveur='', $type='')
 {
-	$f = sql_serveur('quote', $serveur, true);
-	if (!is_string($f) OR !$f) $f = '_q';
-	return $f($val, $type);
+    $f = sql_serveur('quote', $serveur, true);
+    if (!is_string($f) OR !$f) $f = '_q';
+    return $f($val, $type);
 }
 
 function sql_date_proche($champ, $interval, $unite, $serveur='', $option=true)
 {
-	$f = sql_serveur('date_proche', $serveur, true);
-	if (!is_string($f) OR !$f) return false;
-	return $f($champ, $interval, $unite);
+    $f = sql_serveur('date_proche', $serveur, true);
+    if (!is_string($f) OR !$f) return false;
+    return $f($champ, $interval, $unite);
 }
 
 /**
@@ -1143,16 +1143,16 @@ 
  *     Expression de requête SQL
 **/
 function sql_in($val, $valeurs, $not='', $serveur='', $option=true) {
-	if (is_array($valeurs)) {
-		$f = sql_serveur('quote', $serveur, true);
-		if (!is_string($f) OR !$f) return false;
-		$valeurs = join(',', array_map($f, array_unique($valeurs)));
-	} elseif (isset($valeurs[0]) AND $valeurs[0]===',') $valeurs = substr($valeurs,1);
-	if (!strlen(trim($valeurs))) return ($not ? "0=0" : '0=1');
-
-	$f = sql_serveur('in', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
-	return $f($val, $valeurs, $not, $serveur, $option!==false);
+    if (is_array($valeurs)) {
+        $f = sql_serveur('quote', $serveur, true);
+        if (!is_string($f) OR !$f) return false;
+        $valeurs = join(',', array_map($f, array_unique($valeurs)));
+    } elseif (isset($valeurs[0]) AND $valeurs[0]===',') $valeurs = substr($valeurs,1);
+    if (!strlen(trim($valeurs))) return ($not ? "0=0" : '0=1');
+
+    $f = sql_serveur('in', $serveur,  $option==='continue' OR $option===false);
+    if (!is_string($f) OR !$f) return false;
+    return $f($val, $valeurs, $not, $serveur, $option!==false);
 }
 
 // Penser a dire dans la description du serveur 
@@ -1160,13 +1160,13 @@ 
 
 // http://doc.spip.org/@sql_in_select
 function sql_in_select($in, $select, $from = array(), $where = array(),
-		    $groupby = array(), $orderby = array(), $limit = '', $having = array(), $serveur='')
+            $groupby = array(), $orderby = array(), $limit = '', $having = array(), $serveur='')
 {
-	$liste = array(); 
-	$res = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur); 
-	while ($r = sql_fetch($res)) {$liste[] = array_shift($r);}
-	sql_free($res);
-	return sql_in($in, $liste);
+    $liste = array(); 
+    $res = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur); 
+    while ($r = sql_fetch($res)) {$liste[] = array_shift($r);}
+    sql_free($res);
+    return sql_in($in, $liste);
 }
 
 /**
@@ -1197,32 +1197,32 @@ 
  *    Position apres le saut.
  */
 function sql_skip($res, $pos, $saut, $count, $serveur='', $option=true){
-	// pas de saut en arriere qu'on ne sait pas faire sans sql_seek
-	if (($saut=intval($saut))<=0) return $pos;
-
-	$seek = $pos + $saut;
-	// si le saut fait depasser le maxi, on libere la resource
-	// et on sort
-	if ($seek>=$count) {sql_free($res, $serveur, $option); return $count;}
-
-	if (sql_seek($res, $seek))
-		$pos = $seek;
-	else
-		while ($pos<$seek AND sql_fetch($res, $serveur, $option))
-			$pos++;
-	return $pos;
+    // pas de saut en arriere qu'on ne sait pas faire sans sql_seek
+    if (($saut=intval($saut))<=0) return $pos;
+
+    $seek = $pos + $saut;
+    // si le saut fait depasser le maxi, on libere la resource
+    // et on sort
+    if ($seek>=$count) {sql_free($res, $serveur, $option); return $count;}
+
+    if (sql_seek($res, $seek))
+        $pos = $seek;
+    else
+        while ($pos<$seek AND sql_fetch($res, $serveur, $option))
+            $pos++;
+    return $pos;
 }
 
 // http://doc.spip.org/@sql_test_int
 function sql_test_int($type, $serveur='', $option=true)
 {
-  return preg_match('/^(TINYINT|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT)/i',trim($type));
+    return preg_match('/^(TINYINT|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT)/i',trim($type));
 }
 
 // http://doc.spip.org/@sql_test_date
 function sql_test_date($type, $serveur='', $option=true)
 {
-  return preg_match('/^(DATE|DATETIME|TIMESTAMP|TIME)/i',trim($type));
+    return preg_match('/^(DATE|DATETIME|TIMESTAMP|TIME)/i',trim($type));
 }
 
 /**
@@ -1245,15 +1245,15 @@ 
  * 		La date formatee
  */
 function sql_format_date($annee=0, $mois=0, $jour=0, $h=0, $m=0, $s=0, $serveur=''){
-	$annee = sprintf("%04s",$annee);
-	$mois = sprintf("%02s",$mois);
+    $annee = sprintf("%04s",$annee);
+    $mois = sprintf("%02s",$mois);
 
-	if ($annee == "0000") $mois = 0;
-	if ($mois == "00") $jour = 0;
+    if ($annee == "0000") $mois = 0;
+    if ($mois == "00") $jour = 0;
 
-	return sprintf("%04u",$annee) . '-' . sprintf("%02u",$mois) . '-'
-		. sprintf("%02u",$jour) . ' ' . sprintf("%02u",$h) . ':'
-		. sprintf("%02u",$m) . ':' . sprintf("%02u",$s);
+    return sprintf("%04u",$annee) . '-' . sprintf("%02u",$mois) . '-'
+        . sprintf("%02u",$jour) . ' ' . sprintf("%02u",$h) . ':'
+        . sprintf("%02u",$m) . ':' . sprintf("%02u",$s);
 }
 
 
@@ -1277,28 +1277,28 @@ 
 **/
 function description_table($nom, $serveur=''){
 
-	global $tables_principales, $tables_auxiliaires;
-	static $trouver_table;
+    global $tables_principales, $tables_auxiliaires;
+    static $trouver_table;
 
-	/* toujours utiliser trouver_table
+    /* toujours utiliser trouver_table
 	 qui renverra la description theorique
 	 car sinon on va se comporter differement selon que la table est declaree
 	 ou non
 	 */
-	if (!$trouver_table) $trouver_table = charger_fonction('trouver_table', 'base');
-	if ($desc = $trouver_table($nom, $serveur))
-		return $desc;
+    if (!$trouver_table) $trouver_table = charger_fonction('trouver_table', 'base');
+    if ($desc = $trouver_table($nom, $serveur))
+        return $desc;
 
-	// sauf a l'installation :
-	include_spip('base/serial');
-	if (isset($tables_principales[$nom]))
-		return $tables_principales[$nom];
+    // sauf a l'installation :
+    include_spip('base/serial');
+    if (isset($tables_principales[$nom]))
+        return $tables_principales[$nom];
 
-	include_spip('base/auxiliaires');
-	if (isset($tables_auxiliaires[$nom]))
-		return $tables_auxiliaires[$nom];
+    include_spip('base/auxiliaires');
+    if (isset($tables_auxiliaires[$nom]))
+        return $tables_auxiliaires[$nom];
 
-	return false;
+    return false;
 }
 
 

Spacing +159 added lines, -159 removed lines

@@ -52,9 +52,9 @@ 
  * 		Si l'instruction demandee n'existe pas, retourne la liste de toutes les instructions du serveur SQL avec $continue a true.
  * 
 **/
-function sql_serveur($ins_sql='', $serveur='', $continue=false) {
+function sql_serveur($ins_sql = '', $serveur = '', $continue = false) {
 	static $sql_serveur = array();
-	if (!isset($sql_serveur[$serveur][$ins_sql])){
+	if (!isset($sql_serveur[$serveur][$ins_sql])) {
 		$f = spip_connect_sql(sql_ABSTRACT_VERSION, $ins_sql, $serveur, $continue);
 		if (!is_string($f) OR !$f) return $f;
 		$sql_serveur[$serveur][$ins_sql] = $f;
@@ -80,16 +80,16 @@ 
  * @return string|bool
  * 		Retourne le nom du charset si effectivement trouve, sinon false.
 **/
-function sql_get_charset($charset, $serveur='', $option=true){
+function sql_get_charset($charset, $serveur = '', $option = true) {
   // le nom http du charset differe parfois du nom SQL utf-8 ==> utf8 etc.
-	$desc = sql_serveur('', $serveur, true,true);
+	$desc = sql_serveur('', $serveur, true, true);
 	$desc = $desc[sql_ABSTRACT_VERSION];
 	$c = $desc['charsets'][$charset];
 	if ($c) {
-		if (function_exists($f=@$desc['get_charset'])) 
-			if ($f($c, $serveur, $option!==false)) return $c;
+		if (function_exists($f = @$desc['get_charset'])) 
+			if ($f($c, $serveur, $option !== false)) return $c;
 	}
-	spip_log( "SPIP ne connait pas les Charsets disponibles sur le serveur $serveur. Le serveur choisira seul.", _LOG_AVERTISSEMENT);
+	spip_log("SPIP ne connait pas les Charsets disponibles sur le serveur $serveur. Le serveur choisira seul.", _LOG_AVERTISSEMENT);
 	return false;
 }
 
@@ -115,10 +115,10 @@ 
  * @return bool
  * 		Retourne true si elle reussie.
 **/
-function sql_set_charset($charset,$serveur='', $option=true){
-	$f = sql_serveur('set_charset', $serveur,  $option==='continue' OR $option===false);
+function sql_set_charset($charset, $serveur = '', $option = true) {
+	$f = sql_serveur('set_charset', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	return $f($charset, $serveur, $option!==false);
+	return $f($charset, $serveur, $option !== false);
 }
 
 
@@ -167,10 +167,10 @@ 
  * afin de disposer du texte brut.
  *
 **/
-function sql_select ($select = array(), $from = array(), $where = array(),
+function sql_select($select = array(), $from = array(), $where = array(),
 	$groupby = array(), $orderby = array(), $limit = '', $having = array(),
-	$serveur='', $option=true) {
-	$f = sql_serveur('select', $serveur,  $option==='continue' OR $option===false);
+	$serveur = '', $option = true) {
+	$f = sql_serveur('select', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
 
 	$debug = (defined('_VAR_MODE') AND _VAR_MODE == 'debug');
@@ -182,7 +182,7 @@ 
 		// le debug, c'est pour ce qui a ete produit par le compilateur
 		if (isset($GLOBALS['debug']['aucasou'])) {
 			list($table, $id,) = $GLOBALS['debug']['aucasou'];
-			$nom = $GLOBALS['debug_objets']['courant'] . $id;
+			$nom = $GLOBALS['debug_objets']['courant'].$id;
 			$GLOBALS['debug_objets']['requete'][$nom] = $query;
 		}
 		$res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, true);
@@ -232,8 +232,8 @@ 
 **/
 function sql_get_select($select = array(), $from = array(), $where = array(),
 	$groupby = array(), $orderby = array(), $limit = '', $having = array(),
-	$serveur='') {
-	return sql_select ($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false);
+	$serveur = '') {
+	return sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false);
 }
 
 
@@ -268,11 +268,11 @@ 
 **/
 function sql_countsel($from = array(), $where = array(),
 		      $groupby = array(), $having = array(),
-	$serveur='', $option=true) {
-	$f = sql_serveur('countsel', $serveur,  $option==='continue' OR $option===false);
+	$serveur = '', $option = true) {
+	$f = sql_serveur('countsel', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($from, $where, $groupby, $having, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	$r = $f($from, $where, $groupby, $having, $serveur, $option !== false);
+	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
@@ -299,11 +299,11 @@ 
  * 		- false en cas de serveur indiponible ou d'erreur
  * 		Ce retour n'est pas pertinent pour savoir si l'operation est correctement realisee.
 **/
-function sql_alter($q, $serveur='', $option=true) {
-	$f = sql_serveur('alter', $serveur,  $option==='continue' OR $option===false);
+function sql_alter($q, $serveur = '', $option = true) {
+	$f = sql_serveur('alter', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($q, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	$r = $f($q, $serveur, $option !== false);
+	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
@@ -326,10 +326,10 @@ 
  * 		Tableau de cles (colonnes SQL ou alias) / valeurs (valeurs dans la colonne de la table ou calculee)
  * 		presentant une ligne de resultat d'une selection 
  */
-function sql_fetch($res, $serveur='', $option=true) {
-	$f = sql_serveur('fetch', $serveur,  $option==='continue' OR $option===false);
+function sql_fetch($res, $serveur = '', $option = true) {
+	$f = sql_serveur('fetch', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	return $f($res, NULL, $serveur, $option!==false);
+	return $f($res, NULL, $serveur, $option !== false);
 }
 
 
@@ -355,12 +355,12 @@ 
  * 		de cles (colonnes SQL ou alias) / valeurs (valeurs dans la colonne de la table ou calculee)
  * 		presentant une ligne de resultat d'une selection 
  */
-function sql_fetch_all($res, $serveur='', $option=true){
+function sql_fetch_all($res, $serveur = '', $option = true) {
 	$rows = array();
 	if (!$res) return $rows;
-	$f = sql_serveur('fetch', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('fetch', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return array();
-	while ($r = $f($res, NULL, $serveur, $option!==false))
+	while ($r = $f($res, NULL, $serveur, $option !== false))
 		$rows[] = $r;
 	sql_free($res, $serveur);
 	return $rows;
@@ -390,11 +390,11 @@ 
  * @return bool
  * 		Operation effectuee (true), sinon false.
 **/
-function sql_seek($res, $row_number, $serveur='', $option=true) {
-	$f = sql_serveur('seek', $serveur,  $option==='continue' OR $option===false);
+function sql_seek($res, $row_number, $serveur = '', $option = true) {
+	$f = sql_serveur('seek', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($res, $row_number, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	$r = $f($res, $row_number, $serveur, $option !== false);
+	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
@@ -419,11 +419,11 @@ 
  * 		Tableau contenant chaque nom de base de donnees.
  * 		False en cas d'erreur.
 **/
-function sql_listdbs($serveur='', $option=true) {
-	$f = sql_serveur('listdbs', $serveur,  $option==='continue' OR $option===false);
+function sql_listdbs($serveur = '', $option = true) {
+	$f = sql_serveur('listdbs', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
 	$r = $f($serveur);
-	if ($r===false) spip_sql_erreur($serveur);
+	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
@@ -445,29 +445,29 @@ 
  * 		True ou nom de la base en cas de success.
  * 		False en cas d'erreur.
 **/
-function sql_selectdb($nom, $serveur='', $option=true)
+function sql_selectdb($nom, $serveur = '', $option = true)
 {
-	$f = sql_serveur('selectdb', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('selectdb', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($nom, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	$r = $f($nom, $serveur, $option !== false);
+	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_count
-function sql_count($res, $serveur='', $option=true)
+function sql_count($res, $serveur = '', $option = true)
 {
-	$f = sql_serveur('count', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('count', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($res, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	$r = $f($res, $serveur, $option !== false);
+	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_free
-function sql_free($res, $serveur='', $option=true)
+function sql_free($res, $serveur = '', $option = true)
 {
-	$f = sql_serveur('free', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('free', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
 	return $f($res);
 }
@@ -477,41 +477,41 @@ 
 // Elle est fournie pour permettre l'actualisation de vieux codes 
 // par un Sed brutal qui peut donner des resultats provisoirement acceptables
 // http://doc.spip.org/@sql_insert
-function sql_insert($table, $noms, $valeurs, $desc=array(), $serveur='', $option=true)
+function sql_insert($table, $noms, $valeurs, $desc = array(), $serveur = '', $option = true)
 {
-	$f = sql_serveur('insert', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('insert', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $noms, $valeurs, $desc, $serveur, $option!==false);
+	$r = $f($table, $noms, $valeurs, $desc, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_insertq
-function sql_insertq($table, $couples=array(), $desc=array(), $serveur='', $option=true)
+function sql_insertq($table, $couples = array(), $desc = array(), $serveur = '', $option = true)
 {
-	$f = sql_serveur('insertq', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('insertq', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $couples, $desc, $serveur, $option!==false);
+	$r = $f($table, $couples, $desc, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_insertq_multi
-function sql_insertq_multi($table, $couples=array(), $desc=array(), $serveur='', $option=true)
+function sql_insertq_multi($table, $couples = array(), $desc = array(), $serveur = '', $option = true)
 {
-	$f = sql_serveur('insertq_multi', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('insertq_multi', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $couples, $desc, $serveur, $option!==false);
+	$r = $f($table, $couples, $desc, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_update
-function sql_update($table, $exp, $where='', $desc=array(), $serveur='', $option=true)
+function sql_update($table, $exp, $where = '', $desc = array(), $serveur = '', $option = true)
 {
-	$f = sql_serveur('update', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('update', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $exp, $where, $desc, $serveur, $option!==false);
+	$r = $f($table, $exp, $where, $desc, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
@@ -520,63 +520,63 @@ 
 // Cette fonction est donc plus utile que la precedente,d'autant qu'elle
 // permet de gerer les differences de representation des constantes.
 // http://doc.spip.org/@sql_updateq
-function sql_updateq($table, $exp, $where='', $desc=array(), $serveur='', $option=true)
+function sql_updateq($table, $exp, $where = '', $desc = array(), $serveur = '', $option = true)
 {
-	$f = sql_serveur('updateq', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('updateq', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $exp, $where, $desc, $serveur, $option!==false);
+	$r = $f($table, $exp, $where, $desc, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_delete
-function sql_delete($table, $where='', $serveur='', $option=true)
+function sql_delete($table, $where = '', $serveur = '', $option = true)
 {
-	$f = sql_serveur('delete', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('delete', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $where, $serveur, $option!==false);
+	$r = $f($table, $where, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_replace
-function sql_replace($table, $couples, $desc=array(), $serveur='', $option=true)
+function sql_replace($table, $couples, $desc = array(), $serveur = '', $option = true)
 {
-	$f = sql_serveur('replace', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('replace', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $couples, $desc, $serveur, $option!==false);
+	$r = $f($table, $couples, $desc, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 
 // http://doc.spip.org/@sql_replace_multi
-function sql_replace_multi($table, $tab_couples, $desc=array(), $serveur='', $option=true)
+function sql_replace_multi($table, $tab_couples, $desc = array(), $serveur = '', $option = true)
 {
-	$f = sql_serveur('replace_multi', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('replace_multi', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $tab_couples, $desc, $serveur, $option!==false);
+	$r = $f($table, $tab_couples, $desc, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_drop_table
-function sql_drop_table($table, $exist='', $serveur='', $option=true)
+function sql_drop_table($table, $exist = '', $serveur = '', $option = true)
 {
-	$f = sql_serveur('drop_table', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('drop_table', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $exist, $serveur, $option!==false);
+	$r = $f($table, $exist, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // supprimer une vue sql
 // http://doc.spip.org/@sql_drop_view
-function sql_drop_view($table, $exist='', $serveur='', $option=true)
+function sql_drop_view($table, $exist = '', $serveur = '', $option = true)
 {
-	$f = sql_serveur('drop_view', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('drop_view', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $exist, $serveur, $option!==false);
+	$r = $f($table, $exist, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
@@ -599,18 +599,18 @@ 
  * @return ressource
  *     Ressource à utiliser avec sql_fetch()
 **/
-function sql_showbase($spip=NULL, $serveur='', $option=true)
+function sql_showbase($spip = NULL, $serveur = '', $option = true)
 {
-	$f = sql_serveur('showbase', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('showbase', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
 
 	// la globale n'est remplie qu'apres l'appel de sql_serveur.
-	if ($spip == NULL){
+	if ($spip == NULL) {
 		$connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
-		$spip = $connexion['prefixe'] . '\_%';
+		$spip = $connexion['prefixe'].'\_%';
 	}
 
-	return $f($spip, $serveur, $option!==false);
+	return $f($spip, $serveur, $option !== false);
 }
 
 /**
@@ -632,28 +632,28 @@ 
  * @return array
  *     Liste des tables SQL
 **/
-function sql_alltable($spip=NULL, $serveur='', $option=true)
+function sql_alltable($spip = NULL, $serveur = '', $option = true)
 {
 	$q = sql_showbase($spip, $serveur, $option);
 	$r = array();
-	if ($q) while ($t = sql_fetch($q, $serveur)) { $r[] = array_shift($t);}
+	if ($q) while ($t = sql_fetch($q, $serveur)) { $r[] = array_shift($t); }
 	return $r;
 }
 
 // http://doc.spip.org/@sql_showtable
-function sql_showtable($table, $table_spip = false, $serveur='', $option=true)
+function sql_showtable($table, $table_spip = false, $serveur = '', $option = true)
 {
-	$f = sql_serveur('showtable', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('showtable', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
 
 	// la globale n'est remplie qu'apres l'appel de sql_serveur.
-	if ($table_spip){
+	if ($table_spip) {
 		$connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
 		$prefixe = $connexion['prefixe'];
 		$vraie_table = preg_replace('/^spip/', $prefixe, $table);
 	} else $vraie_table = $table;
 
-	$f = $f($vraie_table, $serveur, $option!==false);
+	$f = $f($vraie_table, $serveur, $option !== false);
 	if (!$f) return array();
 	if (isset($GLOBALS['tables_principales'][$table]['join']))
 		$f['join'] = $GLOBALS['tables_principales'][$table]['join'];
@@ -663,19 +663,19 @@ 
 }
 
 // http://doc.spip.org/@sql_create
-function sql_create($nom, $champs, $cles=array(), $autoinc=false, $temporary=false, $serveur='', $option=true) {
-	$f = sql_serveur('create', $serveur,  $option==='continue' OR $option===false);
+function sql_create($nom, $champs, $cles = array(), $autoinc = false, $temporary = false, $serveur = '', $option = true) {
+	$f = sql_serveur('create', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($nom, $champs, $cles, $autoinc, $temporary, $serveur, $option!==false);
+	$r = $f($nom, $champs, $cles, $autoinc, $temporary, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
-function sql_create_base($nom, $serveur='', $option=true)
+function sql_create_base($nom, $serveur = '', $option = true)
 {
-	$f = sql_serveur('create_base', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('create_base', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($nom, $serveur, $option!==false);
+	$r = $f($nom, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
@@ -685,18 +685,18 @@ 
 // select_query : une requete select, idealement cree avec $req = sql_select()
 // (en mettant $option du sql_select a false pour recuperer la requete)
 // http://doc.spip.org/@sql_create_view
-function sql_create_view($nom, $select_query, $serveur='', $option=true) {
-	$f = sql_serveur('create_view', $serveur,  $option==='continue' OR $option===false);
+function sql_create_view($nom, $select_query, $serveur = '', $option = true) {
+	$f = sql_serveur('create_view', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($nom, $select_query, $serveur, $option!==false);
+	$r = $f($nom, $select_query, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_multi
-function sql_multi($sel, $lang, $serveur='', $option=true)
+function sql_multi($sel, $lang, $serveur = '', $option = true)
 {
-	$f = sql_serveur('multi', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('multi', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
 	return $f($sel, $lang);
 }
@@ -712,7 +712,7 @@ 
  *      Description de l'erreur
  *      False si le serveur est indisponible
  */
-function sql_error($serveur='') {
+function sql_error($serveur = '') {
 	$f = sql_serveur('error', $serveur, 'continue');
 	if (!is_string($f) OR !$f) return false;
 	return $f('query inconnue', $serveur);
@@ -728,35 +728,35 @@ 
  *      Numéro de l'erreur
  *      False si le serveur est indisponible
  */
-function sql_errno($serveur='') {
+function sql_errno($serveur = '') {
 	$f = sql_serveur('errno', $serveur, 'continue');
 	if (!is_string($f) OR !$f) return false;
 	return $f($serveur);
 }
 
 // http://doc.spip.org/@sql_explain
-function sql_explain($q, $serveur='', $option=true) {
-	$f = sql_serveur('explain', $serveur,  'continue');
+function sql_explain($q, $serveur = '', $option = true) {
+	$f = sql_serveur('explain', $serveur, 'continue');
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($q, $serveur, $option!==false);
+	$r = $f($q, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_optimize
-function sql_optimize($table, $serveur='', $option=true) {
-	$f = sql_serveur('optimize', $serveur,  $option==='continue' OR $option===false);
+function sql_optimize($table, $serveur = '', $option = true) {
+	$f = sql_serveur('optimize', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $serveur, $option!==false);
+	$r = $f($table, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
 
 // http://doc.spip.org/@sql_repair
-function sql_repair($table, $serveur='', $option=true) {
-	$f = sql_serveur('repair', $serveur,  $option==='continue' OR $option===false);
+function sql_repair($table, $serveur = '', $option = true) {
+	$f = sql_serveur('repair', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($table, $serveur, $option!==false);
+	$r = $f($table, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
@@ -765,10 +765,10 @@ 
 // A n'utiliser qu'en derniere extremite
 
 // http://doc.spip.org/@sql_query
-function sql_query($ins, $serveur='', $option=true) {
-	$f = sql_serveur('query', $serveur,  $option==='continue' OR $option===false);
+function sql_query($ins, $serveur = '', $option = true) {
+	$f = sql_serveur('query', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($ins, $serveur, $option!==false);
+	$r = $f($ins, $serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 }
@@ -820,9 +820,9 @@ 
 **/
 function sql_fetsel($select = array(), $from = array(), $where = array(),
 	$groupby = array(), $orderby = array(), $limit = '',
-	$having = array(), $serveur='', $option=true) {
-	$q = sql_select($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $q;
+	$having = array(), $serveur = '', $option = true) {
+	$q = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option);
+	if ($option === false) return $q;
 	if (!$q) return array();
 	$r = sql_fetch($q, $serveur, $option);
 	sql_free($q, $serveur, $option);
@@ -884,9 +884,9 @@ 
 **/
 function sql_allfetsel($select = array(), $from = array(), $where = array(),
 	$groupby = array(), $orderby = array(), $limit = '',
-	$having = array(), $serveur='', $option=true) {
-	$q = sql_select($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $q;
+	$having = array(), $serveur = '', $option = true) {
+	$q = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option);
+	if ($option === false) return $q;
 	return sql_fetch_all($q, $serveur, $option);
 }
 
@@ -932,12 +932,12 @@ 
  *
 **/
 function sql_getfetsel($select, $from = array(), $where = array(), $groupby = array(), 
-	$orderby = array(), $limit = '', $having = array(), $serveur='', $option=true) {
+	$orderby = array(), $limit = '', $having = array(), $serveur = '', $option = true) {
 	if (preg_match('/\s+as\s+(\w+)$/i', $select, $c)) $id = $c[1];
 	elseif (!preg_match('/\W/', $select)) $id = $select;
-	else {$id = 'n'; $select .= ' AS n';}
-	$r = sql_fetsel($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $r;
+	else {$id = 'n'; $select .= ' AS n'; }
+	$r = sql_fetsel($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option);
+	if ($option === false) return $r;
 	if (!$r) return NULL;
 	return $r[$id]; 
 }
@@ -956,8 +956,8 @@ 
  * @return string
  * 		Numero de version du serveur SQL
 **/
-function sql_version($serveur='', $option=true) {
-	$row = sql_fetsel("version() AS n", '','','','','','',$serveur);
+function sql_version($serveur = '', $option = true) {
+	$row = sql_fetsel("version() AS n", '', '', '', '', '', '', $serveur);
 	return ($row['n']);
 }
 
@@ -993,10 +993,10 @@ 
  * @return bool
  * 		Le serveur SQL prefere t'il des transactions pour les insertions multiples ?
 **/
-function sql_preferer_transaction($serveur='', $option=true) {
-	$f = sql_serveur('preferer_transaction', $serveur,  'continue');
+function sql_preferer_transaction($serveur = '', $option = true) {
+	$f = sql_serveur('preferer_transaction', $serveur, 'continue');
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($serveur, $option!==false);
+	$r = $f($serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 };
@@ -1019,10 +1019,10 @@ 
  *      true si la transaction est demarree
  *      false en cas d'erreur
 **/
-function sql_demarrer_transaction($serveur='', $option=true) {
-	$f = sql_serveur('demarrer_transaction', $serveur,  'continue');
+function sql_demarrer_transaction($serveur = '', $option = true) {
+	$f = sql_serveur('demarrer_transaction', $serveur, 'continue');
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($serveur, $option!==false);
+	$r = $f($serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 };
@@ -1045,10 +1045,10 @@ 
  *      true si la transaction est demarree
  *      false en cas d'erreur
 **/
-function sql_terminer_transaction($serveur='', $option=true) {
-	$f = sql_serveur('terminer_transaction', $serveur,  'continue');
+function sql_terminer_transaction($serveur = '', $option = true) {
+	$f = sql_serveur('terminer_transaction', $serveur, 'continue');
 	if (!is_string($f) OR !$f) return false;
-	$r = $f($serveur, $option!==false);
+	$r = $f($serveur, $option !== false);
 	if ($r === false) spip_sql_erreur($serveur);
 	return $r;
 };
@@ -1073,9 +1073,9 @@ 
  * @return string
  * 		Retourne la valeur hexadecimale attendue par le serveur SQL
 **/
-function sql_hex($val, $serveur='', $option=true)
+function sql_hex($val, $serveur = '', $option = true)
 {
-	$f = sql_serveur('hex', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('hex', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
 	return $f($val);
 }
@@ -1100,14 +1100,14 @@ 
  * @return string
  * 		La chaine echappee
 **/
-function sql_quote($val, $serveur='', $type='')
+function sql_quote($val, $serveur = '', $type = '')
 {
 	$f = sql_serveur('quote', $serveur, true);
 	if (!is_string($f) OR !$f) $f = '_q';
 	return $f($val, $type);
 }
 
-function sql_date_proche($champ, $interval, $unite, $serveur='', $option=true)
+function sql_date_proche($champ, $interval, $unite, $serveur = '', $option = true)
 {
 	$f = sql_serveur('date_proche', $serveur, true);
 	if (!is_string($f) OR !$f) return false;
@@ -1142,17 +1142,17 @@ 
  * @return string
  *     Expression de requête SQL
 **/
-function sql_in($val, $valeurs, $not='', $serveur='', $option=true) {
+function sql_in($val, $valeurs, $not = '', $serveur = '', $option = true) {
 	if (is_array($valeurs)) {
 		$f = sql_serveur('quote', $serveur, true);
 		if (!is_string($f) OR !$f) return false;
 		$valeurs = join(',', array_map($f, array_unique($valeurs)));
-	} elseif (isset($valeurs[0]) AND $valeurs[0]===',') $valeurs = substr($valeurs,1);
+	} elseif (isset($valeurs[0]) AND $valeurs[0] === ',') $valeurs = substr($valeurs, 1);
 	if (!strlen(trim($valeurs))) return ($not ? "0=0" : '0=1');
 
-	$f = sql_serveur('in', $serveur,  $option==='continue' OR $option===false);
+	$f = sql_serveur('in', $serveur, $option === 'continue' OR $option === false);
 	if (!is_string($f) OR !$f) return false;
-	return $f($val, $valeurs, $not, $serveur, $option!==false);
+	return $f($val, $valeurs, $not, $serveur, $option !== false);
 }
 
 // Penser a dire dans la description du serveur 
@@ -1160,11 +1160,11 @@ 
 
 // http://doc.spip.org/@sql_in_select
 function sql_in_select($in, $select, $from = array(), $where = array(),
-		    $groupby = array(), $orderby = array(), $limit = '', $having = array(), $serveur='')
+		    $groupby = array(), $orderby = array(), $limit = '', $having = array(), $serveur = '')
 {
 	$liste = array(); 
 	$res = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur); 
-	while ($r = sql_fetch($res)) {$liste[] = array_shift($r);}
+	while ($r = sql_fetch($res)) {$liste[] = array_shift($r); }
 	sql_free($res);
 	return sql_in($in, $liste);
 }
@@ -1196,33 +1196,33 @@ 
  * @return int
  *    Position apres le saut.
  */
-function sql_skip($res, $pos, $saut, $count, $serveur='', $option=true){
+function sql_skip($res, $pos, $saut, $count, $serveur = '', $option = true) {
 	// pas de saut en arriere qu'on ne sait pas faire sans sql_seek
-	if (($saut=intval($saut))<=0) return $pos;
+	if (($saut = intval($saut)) <= 0) return $pos;
 
 	$seek = $pos + $saut;
 	// si le saut fait depasser le maxi, on libere la resource
 	// et on sort
-	if ($seek>=$count) {sql_free($res, $serveur, $option); return $count;}
+	if ($seek >= $count) {sql_free($res, $serveur, $option); return $count; }
 
 	if (sql_seek($res, $seek))
 		$pos = $seek;
 	else
-		while ($pos<$seek AND sql_fetch($res, $serveur, $option))
+		while ($pos < $seek AND sql_fetch($res, $serveur, $option))
 			$pos++;
 	return $pos;
 }
 
 // http://doc.spip.org/@sql_test_int
-function sql_test_int($type, $serveur='', $option=true)
+function sql_test_int($type, $serveur = '', $option = true)
 {
-  return preg_match('/^(TINYINT|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT)/i',trim($type));
+  return preg_match('/^(TINYINT|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT)/i', trim($type));
 }
 
 // http://doc.spip.org/@sql_test_date
-function sql_test_date($type, $serveur='', $option=true)
+function sql_test_date($type, $serveur = '', $option = true)
 {
-  return preg_match('/^(DATE|DATETIME|TIMESTAMP|TIME)/i',trim($type));
+  return preg_match('/^(DATE|DATETIME|TIMESTAMP|TIME)/i', trim($type));
 }
 
 /**
@@ -1244,16 +1244,16 @@ 
  * @return string
  * 		La date formatee
  */
-function sql_format_date($annee=0, $mois=0, $jour=0, $h=0, $m=0, $s=0, $serveur=''){
-	$annee = sprintf("%04s",$annee);
-	$mois = sprintf("%02s",$mois);
+function sql_format_date($annee = 0, $mois = 0, $jour = 0, $h = 0, $m = 0, $s = 0, $serveur = '') {
+	$annee = sprintf("%04s", $annee);
+	$mois = sprintf("%02s", $mois);
 
 	if ($annee == "0000") $mois = 0;
 	if ($mois == "00") $jour = 0;
 
-	return sprintf("%04u",$annee) . '-' . sprintf("%02u",$mois) . '-'
-		. sprintf("%02u",$jour) . ' ' . sprintf("%02u",$h) . ':'
-		. sprintf("%02u",$m) . ':' . sprintf("%02u",$s);
+	return sprintf("%04u", $annee).'-'.sprintf("%02u", $mois).'-'
+		. sprintf("%02u", $jour).' '.sprintf("%02u", $h).':'
+		. sprintf("%02u", $m).':'.sprintf("%02u", $s);
 }
 
 
@@ -1275,7 +1275,7 @@ 
  * @return array|bool
  * 		Description de la table ou false si elle n'est pas trouvee ou declaree.
 **/
-function description_table($nom, $serveur=''){
+function description_table($nom, $serveur = '') {
 
 	global $tables_principales, $tables_auxiliaires;
 	static $trouver_table;

Braces +289 added lines, -107 removed lines

@@ -24,7 +24,9 @@ 
  * @version 1
  */
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+    return;
+}
 
 /** Version de l'API SQL */
 define('sql_ABSTRACT_VERSION', 1);
@@ -56,7 +58,9 @@ 
 	static $sql_serveur = array();
 	if (!isset($sql_serveur[$serveur][$ins_sql])){
 		$f = spip_connect_sql(sql_ABSTRACT_VERSION, $ins_sql, $serveur, $continue);
-		if (!is_string($f) OR !$f) return $f;
+		if (!is_string($f) OR !$f) {
+		    return $f;
+		}
 		$sql_serveur[$serveur][$ins_sql] = $f;
 	}
 	return $sql_serveur[$serveur][$ins_sql];
@@ -86,8 +90,9 @@ 
 	$desc = $desc[sql_ABSTRACT_VERSION];
 	$c = $desc['charsets'][$charset];
 	if ($c) {
-		if (function_exists($f=@$desc['get_charset'])) 
-			if ($f($c, $serveur, $option!==false)) return $c;
+		if (function_exists($f=@$desc['get_charset'])) {
+					if ($f($c, $serveur, $option!==false)) return $c;
+		}
 	}
 	spip_log( "SPIP ne connait pas les Charsets disponibles sur le serveur $serveur. Le serveur choisira seul.", _LOG_AVERTISSEMENT);
 	return false;
@@ -117,7 +122,9 @@ 
 **/
 function sql_set_charset($charset,$serveur='', $option=true){
 	$f = sql_serveur('set_charset', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f($charset, $serveur, $option!==false);
 }
 
@@ -171,14 +178,18 @@ 
 	$groupby = array(), $orderby = array(), $limit = '', $having = array(),
 	$serveur='', $option=true) {
 	$f = sql_serveur('select', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 
 	$debug = (defined('_VAR_MODE') AND _VAR_MODE == 'debug');
 	if (($option !== false) AND !$debug) {
 		$res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, is_array($option) ? true : $option);
 	} else {
 		$query = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false);
-		if (!$option) return $query;
+		if (!$option) {
+		    return $query;
+		}
 		// le debug, c'est pour ce qui a ete produit par le compilateur
 		if (isset($GLOBALS['debug']['aucasou'])) {
 			list($table, $id,) = $GLOBALS['debug']['aucasou'];
@@ -189,7 +200,9 @@ 
 	}
 
 	// en cas d'erreur
-	if (!is_string($res)) return $res;
+	if (!is_string($res)) {
+	    return $res;
+	}
 	// denoncer l'erreur SQL dans sa version brute
 	spip_sql_erreur($serveur);
 	// idem dans sa version squelette (prefixe des tables non substitue)
@@ -270,9 +283,13 @@ 
 		      $groupby = array(), $having = array(),
 	$serveur='', $option=true) {
 	$f = sql_serveur('countsel', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($from, $where, $groupby, $having, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	if ($r===false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -301,9 +318,13 @@ 
 **/
 function sql_alter($q, $serveur='', $option=true) {
 	$f = sql_serveur('alter', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($q, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	if ($r===false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -328,7 +349,9 @@ 
  */
 function sql_fetch($res, $serveur='', $option=true) {
 	$f = sql_serveur('fetch', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f($res, NULL, $serveur, $option!==false);
 }
 
@@ -357,11 +380,16 @@ 
  */
 function sql_fetch_all($res, $serveur='', $option=true){
 	$rows = array();
-	if (!$res) return $rows;
+	if (!$res) {
+	    return $rows;
+	}
 	$f = sql_serveur('fetch', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return array();
-	while ($r = $f($res, NULL, $serveur, $option!==false))
-		$rows[] = $r;
+	if (!is_string($f) OR !$f) {
+	    return array();
+	}
+	while ($r = $f($res, NULL, $serveur, $option!==false)) {
+			$rows[] = $r;
+	}
 	sql_free($res, $serveur);
 	return $rows;
 }
@@ -392,9 +420,13 @@ 
 **/
 function sql_seek($res, $row_number, $serveur='', $option=true) {
 	$f = sql_serveur('seek', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($res, $row_number, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	if ($r===false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -421,9 +453,13 @@ 
 **/
 function sql_listdbs($serveur='', $option=true) {
 	$f = sql_serveur('listdbs', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($serveur);
-	if ($r===false) spip_sql_erreur($serveur);
+	if ($r===false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -448,9 +484,13 @@ 
 function sql_selectdb($nom, $serveur='', $option=true)
 {
 	$f = sql_serveur('selectdb', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($nom, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	if ($r===false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -458,9 +498,13 @@ 
 function sql_count($res, $serveur='', $option=true)
 {
 	$f = sql_serveur('count', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($res, $serveur, $option!==false);
-	if ($r===false) spip_sql_erreur($serveur);
+	if ($r===false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -468,7 +512,9 @@ 
 function sql_free($res, $serveur='', $option=true)
 {
 	$f = sql_serveur('free', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f($res);
 }
 
@@ -480,9 +526,13 @@ 
 function sql_insert($table, $noms, $valeurs, $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('insert', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $noms, $valeurs, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -490,9 +540,13 @@ 
 function sql_insertq($table, $couples=array(), $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('insertq', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $couples, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -500,9 +554,13 @@ 
 function sql_insertq_multi($table, $couples=array(), $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('insertq_multi', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $couples, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -510,9 +568,13 @@ 
 function sql_update($table, $exp, $where='', $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('update', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $exp, $where, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -523,9 +585,13 @@ 
 function sql_updateq($table, $exp, $where='', $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('updateq', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $exp, $where, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -533,9 +599,13 @@ 
 function sql_delete($table, $where='', $serveur='', $option=true)
 {
 	$f = sql_serveur('delete', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $where, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -543,9 +613,13 @@ 
 function sql_replace($table, $couples, $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('replace', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $couples, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -554,9 +628,13 @@ 
 function sql_replace_multi($table, $tab_couples, $desc=array(), $serveur='', $option=true)
 {
 	$f = sql_serveur('replace_multi', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $tab_couples, $desc, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -564,9 +642,13 @@ 
 function sql_drop_table($table, $exist='', $serveur='', $option=true)
 {
 	$f = sql_serveur('drop_table', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $exist, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -575,9 +657,13 @@ 
 function sql_drop_view($table, $exist='', $serveur='', $option=true)
 {
 	$f = sql_serveur('drop_view', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $exist, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -602,7 +688,9 @@ 
 function sql_showbase($spip=NULL, $serveur='', $option=true)
 {
 	$f = sql_serveur('showbase', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 
 	// la globale n'est remplie qu'apres l'appel de sql_serveur.
 	if ($spip == NULL){
@@ -636,7 +724,10 @@ 
 {
 	$q = sql_showbase($spip, $serveur, $option);
 	$r = array();
-	if ($q) while ($t = sql_fetch($q, $serveur)) { $r[] = array_shift($t);}
+	if ($q) {
+	    while ($t = sql_fetch($q, $serveur)) { $r[] = array_shift($t);
+	}
+	}
 	return $r;
 }
 
@@ -644,39 +735,54 @@ 
 function sql_showtable($table, $table_spip = false, $serveur='', $option=true)
 {
 	$f = sql_serveur('showtable', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 
 	// la globale n'est remplie qu'apres l'appel de sql_serveur.
 	if ($table_spip){
 		$connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0];
 		$prefixe = $connexion['prefixe'];
 		$vraie_table = preg_replace('/^spip/', $prefixe, $table);
-	} else $vraie_table = $table;
+	} else {
+	    $vraie_table = $table;
+	}
 
 	$f = $f($vraie_table, $serveur, $option!==false);
-	if (!$f) return array();
-	if (isset($GLOBALS['tables_principales'][$table]['join']))
-		$f['join'] = $GLOBALS['tables_principales'][$table]['join'];
-	elseif (isset($GLOBALS['tables_auxiliaires'][$table]['join']))
-		$f['join'] = $GLOBALS['tables_auxiliaires'][$table]['join'];
+	if (!$f) {
+	    return array();
+	}
+	if (isset($GLOBALS['tables_principales'][$table]['join'])) {
+			$f['join'] = $GLOBALS['tables_principales'][$table]['join'];
+	} elseif (isset($GLOBALS['tables_auxiliaires'][$table]['join'])) {
+			$f['join'] = $GLOBALS['tables_auxiliaires'][$table]['join'];
+	}
 	return $f;
 }
 
 // http://doc.spip.org/@sql_create
 function sql_create($nom, $champs, $cles=array(), $autoinc=false, $temporary=false, $serveur='', $option=true) {
 	$f = sql_serveur('create', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($nom, $champs, $cles, $autoinc, $temporary, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
 function sql_create_base($nom, $serveur='', $option=true)
 {
 	$f = sql_serveur('create_base', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($nom, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -687,9 +793,13 @@ 
 // http://doc.spip.org/@sql_create_view
 function sql_create_view($nom, $select_query, $serveur='', $option=true) {
 	$f = sql_serveur('create_view', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($nom, $select_query, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -697,7 +807,9 @@ 
 function sql_multi($sel, $lang, $serveur='', $option=true)
 {
 	$f = sql_serveur('multi', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f($sel, $lang);
 }
 
@@ -714,7 +826,9 @@ 
  */
 function sql_error($serveur='') {
 	$f = sql_serveur('error', $serveur, 'continue');
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f('query inconnue', $serveur);
 }
 
@@ -730,34 +844,48 @@ 
  */
 function sql_errno($serveur='') {
 	$f = sql_serveur('errno', $serveur, 'continue');
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f($serveur);
 }
 
 // http://doc.spip.org/@sql_explain
 function sql_explain($q, $serveur='', $option=true) {
 	$f = sql_serveur('explain', $serveur,  'continue');
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($q, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
 // http://doc.spip.org/@sql_optimize
 function sql_optimize($table, $serveur='', $option=true) {
 	$f = sql_serveur('optimize', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
 // http://doc.spip.org/@sql_repair
 function sql_repair($table, $serveur='', $option=true) {
 	$f = sql_serveur('repair', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($table, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -767,9 +895,13 @@ 
 // http://doc.spip.org/@sql_query
 function sql_query($ins, $serveur='', $option=true) {
 	$f = sql_serveur('query', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($ins, $serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 }
 
@@ -822,8 +954,12 @@ 
 	$groupby = array(), $orderby = array(), $limit = '',
 	$having = array(), $serveur='', $option=true) {
 	$q = sql_select($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $q;
-	if (!$q) return array();
+	if ($option===false) {
+	    return $q;
+	}
+	if (!$q) {
+	    return array();
+	}
 	$r = sql_fetch($q, $serveur, $option);
 	sql_free($q, $serveur, $option);
 	return $r;
@@ -886,7 +1022,9 @@ 
 	$groupby = array(), $orderby = array(), $limit = '',
 	$having = array(), $serveur='', $option=true) {
 	$q = sql_select($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $q;
+	if ($option===false) {
+	    return $q;
+	}
 	return sql_fetch_all($q, $serveur, $option);
 }
 
@@ -933,12 +1071,18 @@ 
 **/
 function sql_getfetsel($select, $from = array(), $where = array(), $groupby = array(), 
 	$orderby = array(), $limit = '', $having = array(), $serveur='', $option=true) {
-	if (preg_match('/\s+as\s+(\w+)$/i', $select, $c)) $id = $c[1];
-	elseif (!preg_match('/\W/', $select)) $id = $select;
-	else {$id = 'n'; $select .= ' AS n';}
+	if (preg_match('/\s+as\s+(\w+)$/i', $select, $c)) {
+	    $id = $c[1];
+	} elseif (!preg_match('/\W/', $select)) {
+	    $id = $select;
+	} else {$id = 'n'; $select .= ' AS n';}
 	$r = sql_fetsel($select, $from, $where,	$groupby, $orderby, $limit, $having, $serveur, $option);
-	if ($option===false) return $r;
-	if (!$r) return NULL;
+	if ($option===false) {
+	    return $r;
+	}
+	if (!$r) {
+	    return NULL;
+	}
 	return $r[$id]; 
 }
 
@@ -995,9 +1139,13 @@ 
 **/
 function sql_preferer_transaction($serveur='', $option=true) {
 	$f = sql_serveur('preferer_transaction', $serveur,  'continue');
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 };
 
@@ -1021,9 +1169,13 @@ 
 **/
 function sql_demarrer_transaction($serveur='', $option=true) {
 	$f = sql_serveur('demarrer_transaction', $serveur,  'continue');
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 };
 
@@ -1047,9 +1199,13 @@ 
 **/
 function sql_terminer_transaction($serveur='', $option=true) {
 	$f = sql_serveur('terminer_transaction', $serveur,  'continue');
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	$r = $f($serveur, $option!==false);
-	if ($r === false) spip_sql_erreur($serveur);
+	if ($r === false) {
+	    spip_sql_erreur($serveur);
+	}
 	return $r;
 };
 
@@ -1076,7 +1232,9 @@ 
 function sql_hex($val, $serveur='', $option=true)
 {
 	$f = sql_serveur('hex', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f($val);
 }
 
@@ -1103,14 +1261,18 @@ 
 function sql_quote($val, $serveur='', $type='')
 {
 	$f = sql_serveur('quote', $serveur, true);
-	if (!is_string($f) OR !$f) $f = '_q';
+	if (!is_string($f) OR !$f) {
+	    $f = '_q';
+	}
 	return $f($val, $type);
 }
 
 function sql_date_proche($champ, $interval, $unite, $serveur='', $option=true)
 {
 	$f = sql_serveur('date_proche', $serveur, true);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f($champ, $interval, $unite);
 }
 
@@ -1145,13 +1307,21 @@ 
 function sql_in($val, $valeurs, $not='', $serveur='', $option=true) {
 	if (is_array($valeurs)) {
 		$f = sql_serveur('quote', $serveur, true);
-		if (!is_string($f) OR !$f) return false;
+		if (!is_string($f) OR !$f) {
+		    return false;
+		}
 		$valeurs = join(',', array_map($f, array_unique($valeurs)));
-	} elseif (isset($valeurs[0]) AND $valeurs[0]===',') $valeurs = substr($valeurs,1);
-	if (!strlen(trim($valeurs))) return ($not ? "0=0" : '0=1');
+	} elseif (isset($valeurs[0]) AND $valeurs[0]===',') {
+	    $valeurs = substr($valeurs,1);
+	}
+	if (!strlen(trim($valeurs))) {
+	    return ($not ? "0=0" : '0=1');
+	}
 
 	$f = sql_serveur('in', $serveur,  $option==='continue' OR $option===false);
-	if (!is_string($f) OR !$f) return false;
+	if (!is_string($f) OR !$f) {
+	    return false;
+	}
 	return $f($val, $valeurs, $not, $serveur, $option!==false);
 }
 
@@ -1198,18 +1368,21 @@ 
  */
 function sql_skip($res, $pos, $saut, $count, $serveur='', $option=true){
 	// pas de saut en arriere qu'on ne sait pas faire sans sql_seek
-	if (($saut=intval($saut))<=0) return $pos;
+	if (($saut=intval($saut))<=0) {
+	    return $pos;
+	}
 
 	$seek = $pos + $saut;
 	// si le saut fait depasser le maxi, on libere la resource
 	// et on sort
 	if ($seek>=$count) {sql_free($res, $serveur, $option); return $count;}
 
-	if (sql_seek($res, $seek))
-		$pos = $seek;
-	else
-		while ($pos<$seek AND sql_fetch($res, $serveur, $option))
+	if (sql_seek($res, $seek)) {
+			$pos = $seek;
+	} else {
+			while ($pos<$seek AND sql_fetch($res, $serveur, $option))
 			$pos++;
+	}
 	return $pos;
 }
 
@@ -1248,8 +1421,12 @@ 
 	$annee = sprintf("%04s",$annee);
 	$mois = sprintf("%02s",$mois);
 
-	if ($annee == "0000") $mois = 0;
-	if ($mois == "00") $jour = 0;
+	if ($annee == "0000") {
+	    $mois = 0;
+	}
+	if ($mois == "00") {
+	    $jour = 0;
+	}
 
 	return sprintf("%04u",$annee) . '-' . sprintf("%02u",$mois) . '-'
 		. sprintf("%02u",$jour) . ' ' . sprintf("%02u",$h) . ':'
@@ -1285,18 +1462,23 @@ 
 	 car sinon on va se comporter differement selon que la table est declaree
 	 ou non
 	 */
-	if (!$trouver_table) $trouver_table = charger_fonction('trouver_table', 'base');
-	if ($desc = $trouver_table($nom, $serveur))
-		return $desc;
+	if (!$trouver_table) {
+	    $trouver_table = charger_fonction('trouver_table', 'base');
+	}
+	if ($desc = $trouver_table($nom, $serveur)) {
+			return $desc;
+	}
 
 	// sauf a l'installation :
 	include_spip('base/serial');
-	if (isset($tables_principales[$nom]))
-		return $tables_principales[$nom];
+	if (isset($tables_principales[$nom])) {
+			return $tables_principales[$nom];
+	}
 
 	include_spip('base/auxiliaires');
-	if (isset($tables_auxiliaires[$nom]))
-		return $tables_auxiliaires[$nom];
+	if (isset($tables_auxiliaires[$nom])) {
+			return $tables_auxiliaires[$nom];
+	}
 
 	return false;
 }