mambax7 / altsys

xoops_trust_path/libs/altsys/include/Archive_Zip.php

Indentation +1705 added lines, -1705 removed lines

@@ -27,63 +27,63 @@ 
 
 //  require_once 'PEAR.php'; // GIJ
 
-  // ----- Constants
-  define('ARCHIVE_ZIP_READ_BLOCK_SIZE', 2048);
-
-  // ----- File list separator
-  define('ARCHIVE_ZIP_SEPARATOR', ',');
-
-  // ----- 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( 'ARCHIVE_ZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  define('ARCHIVE_ZIP_TEMPORARY_DIR', '');
-
-  // ----- Error codes
-  define('ARCHIVE_ZIP_ERR_NO_ERROR', 0);
-  define('ARCHIVE_ZIP_ERR_WRITE_OPEN_FAIL', -1);
-  define('ARCHIVE_ZIP_ERR_READ_OPEN_FAIL', -2);
-  define('ARCHIVE_ZIP_ERR_INVALID_PARAMETER', -3);
-  define('ARCHIVE_ZIP_ERR_MISSING_FILE', -4);
-  define('ARCHIVE_ZIP_ERR_FILENAME_TOO_LONG', -5);
-  define('ARCHIVE_ZIP_ERR_INVALID_ZIP', -6);
-  define('ARCHIVE_ZIP_ERR_BAD_EXTRACTED_FILE', -7);
-  define('ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL', -8);
-  define('ARCHIVE_ZIP_ERR_BAD_EXTENSION', -9);
-  define('ARCHIVE_ZIP_ERR_BAD_FORMAT', -10);
-  define('ARCHIVE_ZIP_ERR_DELETE_FILE_FAIL', -11);
-  define('ARCHIVE_ZIP_ERR_RENAME_FILE_FAIL', -12);
-  define('ARCHIVE_ZIP_ERR_BAD_CHECKSUM', -13);
-  define('ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
-  define('ARCHIVE_ZIP_ERR_MISSING_OPTION_VALUE', -15);
-  define('ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE', -16);
-
-  // ----- Warning codes
-  define('ARCHIVE_ZIP_WARN_NO_WARNING', 0);
-  define('ARCHIVE_ZIP_WARN_FILE_EXIST', 1);
-
-  // ----- Methods parameters
-  define('ARCHIVE_ZIP_PARAM_PATH', 'path');
-  define('ARCHIVE_ZIP_PARAM_ADD_PATH', 'add_path');
-  define('ARCHIVE_ZIP_PARAM_REMOVE_PATH', 'remove_path');
-  define('ARCHIVE_ZIP_PARAM_REMOVE_ALL_PATH', 'remove_all_path');
-  define('ARCHIVE_ZIP_PARAM_SET_CHMOD', 'set_chmod');
-  define('ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING', 'extract_as_string');
-  define('ARCHIVE_ZIP_PARAM_NO_COMPRESSION', 'no_compression');
-  define('ARCHIVE_ZIP_PARAM_BY_NAME', 'by_name');
-  define('ARCHIVE_ZIP_PARAM_BY_INDEX', 'by_index');
-  define('ARCHIVE_ZIP_PARAM_BY_EREG', 'by_ereg');
-  define('ARCHIVE_ZIP_PARAM_BY_PREG', 'by_preg');
-
-  define('ARCHIVE_ZIP_PARAM_PRE_EXTRACT', 'callback_pre_extract');
-  define('ARCHIVE_ZIP_PARAM_POST_EXTRACT', 'callback_post_extract');
-  define('ARCHIVE_ZIP_PARAM_PRE_ADD', 'callback_pre_add');
-  define('ARCHIVE_ZIP_PARAM_POST_ADD', 'callback_post_add');
+    // ----- Constants
+    define('ARCHIVE_ZIP_READ_BLOCK_SIZE', 2048);
+
+    // ----- File list separator
+    define('ARCHIVE_ZIP_SEPARATOR', ',');
+
+    // ----- 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( 'ARCHIVE_ZIP_TEMPORARY_DIR', '/temp/' );
+    // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', 'C:/Temp/' );
+    define('ARCHIVE_ZIP_TEMPORARY_DIR', '');
+
+    // ----- Error codes
+    define('ARCHIVE_ZIP_ERR_NO_ERROR', 0);
+    define('ARCHIVE_ZIP_ERR_WRITE_OPEN_FAIL', -1);
+    define('ARCHIVE_ZIP_ERR_READ_OPEN_FAIL', -2);
+    define('ARCHIVE_ZIP_ERR_INVALID_PARAMETER', -3);
+    define('ARCHIVE_ZIP_ERR_MISSING_FILE', -4);
+    define('ARCHIVE_ZIP_ERR_FILENAME_TOO_LONG', -5);
+    define('ARCHIVE_ZIP_ERR_INVALID_ZIP', -6);
+    define('ARCHIVE_ZIP_ERR_BAD_EXTRACTED_FILE', -7);
+    define('ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL', -8);
+    define('ARCHIVE_ZIP_ERR_BAD_EXTENSION', -9);
+    define('ARCHIVE_ZIP_ERR_BAD_FORMAT', -10);
+    define('ARCHIVE_ZIP_ERR_DELETE_FILE_FAIL', -11);
+    define('ARCHIVE_ZIP_ERR_RENAME_FILE_FAIL', -12);
+    define('ARCHIVE_ZIP_ERR_BAD_CHECKSUM', -13);
+    define('ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP', -14);
+    define('ARCHIVE_ZIP_ERR_MISSING_OPTION_VALUE', -15);
+    define('ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE', -16);
+
+    // ----- Warning codes
+    define('ARCHIVE_ZIP_WARN_NO_WARNING', 0);
+    define('ARCHIVE_ZIP_WARN_FILE_EXIST', 1);
+
+    // ----- Methods parameters
+    define('ARCHIVE_ZIP_PARAM_PATH', 'path');
+    define('ARCHIVE_ZIP_PARAM_ADD_PATH', 'add_path');
+    define('ARCHIVE_ZIP_PARAM_REMOVE_PATH', 'remove_path');
+    define('ARCHIVE_ZIP_PARAM_REMOVE_ALL_PATH', 'remove_all_path');
+    define('ARCHIVE_ZIP_PARAM_SET_CHMOD', 'set_chmod');
+    define('ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING', 'extract_as_string');
+    define('ARCHIVE_ZIP_PARAM_NO_COMPRESSION', 'no_compression');
+    define('ARCHIVE_ZIP_PARAM_BY_NAME', 'by_name');
+    define('ARCHIVE_ZIP_PARAM_BY_INDEX', 'by_index');
+    define('ARCHIVE_ZIP_PARAM_BY_EREG', 'by_ereg');
+    define('ARCHIVE_ZIP_PARAM_BY_PREG', 'by_preg');
+
+    define('ARCHIVE_ZIP_PARAM_PRE_EXTRACT', 'callback_pre_extract');
+    define('ARCHIVE_ZIP_PARAM_POST_EXTRACT', 'callback_post_extract');
+    define('ARCHIVE_ZIP_PARAM_PRE_ADD', 'callback_pre_add');
+    define('ARCHIVE_ZIP_PARAM_POST_ADD', 'callback_post_add');
 
 
 
@@ -102,55 +102,55 @@ 
 class Archive_Zip
 {
     /**
-    * The filename of the zip archive.
-    *
-    * @var string Name of the Zip file
-    */
+     * The filename of the zip archive.
+     *
+     * @var string Name of the Zip file
+     */
     public $_zipname='';
 
     /**
-    * File descriptor of the opened Zip file.
-    *
-    * @var int Internal zip file descriptor
-    */
+     * File descriptor of the opened Zip file.
+     *
+     * @var int Internal zip file descriptor
+     */
     public $_zip_fd=0;
 
     /**
-    * @var int last error code
-    */
+     * @var int last error code
+     */
     public $_error_code=1;
 
     /**
-    * @var string Last error description
-    */
+     * @var string Last error description
+     */
     public $_error_string='';
 
     // {{{ constructor
     /**
-    * Archive_Zip Class constructor. This flavour of the constructor only
-    * declare a new Archive_Zip object, identifying it by the name of the
-    * zip file.
-    *
-    * @param    string  $p_zipname  The name of the zip archive to create
-    * @access public
-    */
+     * Archive_Zip Class constructor. This flavour of the constructor only
+     * declare a new Archive_Zip object, identifying it by the name of the
+     * zip file.
+     *
+     * @param    string  $p_zipname  The name of the zip archive to create
+     * @access public
+     */
 //HACK by domifara
 //  function Archive_Zip($p_zipname)
     public function __construct($p_zipname)
     {
 
-      // ----- Check the zlib
+        // ----- Check the zlib
 /*      if (!extension_loaded('zlib')) {
           PEAR::loadExtension('zlib');
       }*/ // GIJ
-      if (!extension_loaded('zlib')) {
-          die("The extension 'zlib' couldn't be found.\n". 'Please make sure your version of PHP was built ' .
-              "with 'zlib' support.\n");
-          return false;
-      }
-
-      // ----- Set the attributes
-      $this->_zipname = $p_zipname;
+        if (!extension_loaded('zlib')) {
+            die("The extension 'zlib' couldn't be found.\n". 'Please make sure your version of PHP was built ' .
+                "with 'zlib' support.\n");
+            return false;
+        }
+
+        // ----- Set the attributes
+        $this->_zipname = $p_zipname;
         $this->_zip_fd = 0;
 
         return;
@@ -159,27 +159,27 @@ 
 
     // {{{ create()
     /**
-    * This method creates a Zip Archive with the filename set with
-    * the constructor.
-    * The files and directories indicated in $p_filelist
-    * are added in the archive.
-    * When a directory is in the list, the directory and its content is added
-    * in the archive.
-    * The methods takes a variable list of parameters in $p_params.
-    * The supported parameters for this method are :
-    *   'add_path' : Add a path to the archived files.
-    *   'remove_path' : Remove the specified 'root' path of the archived files.
-    *   'remove_all_path' : Remove all the path of the archived files.
-    *   'no_compression' : The archived files will not be compressed.
-    *
-    * @access public
-    * @param  mixed  $p_filelist  The list of the files or folders to add.
-    *                             It can be a string with filenames separated
-    *                             by a comma, or an array of filenames.
-    * @param  mixed  $p_params  An array of variable parameters and values.
-    * @return mixed An array of file description on success,
-    *               an error code on error
-    */
+     * This method creates a Zip Archive with the filename set with
+     * the constructor.
+     * The files and directories indicated in $p_filelist
+     * are added in the archive.
+     * When a directory is in the list, the directory and its content is added
+     * in the archive.
+     * The methods takes a variable list of parameters in $p_params.
+     * The supported parameters for this method are :
+     *   'add_path' : Add a path to the archived files.
+     *   'remove_path' : Remove the specified 'root' path of the archived files.
+     *   'remove_all_path' : Remove all the path of the archived files.
+     *   'no_compression' : The archived files will not be compressed.
+     *
+     * @access public
+     * @param  mixed  $p_filelist  The list of the files or folders to add.
+     *                             It can be a string with filenames separated
+     *                             by a comma, or an array of filenames.
+     * @param  mixed  $p_params  An array of variable parameters and values.
+     * @return mixed An array of file description on success,
+     *               an error code on error
+     */
     public function create($p_filelist, $p_params=0)
     {
         $this->_errorReset();
@@ -189,10 +189,10 @@ 
             $p_params = array();
         }
         if ($this->_check_parameters($p_params,
-                                     array('no_compression' => false,
-                                           'add_path' => '',
-                                           'remove_path' => '',
-                                           'remove_all_path' => false)) != 1) {
+                                        array('no_compression' => false,
+                                            'add_path' => '',
+                                            'remove_path' => '',
+                                            'remove_all_path' => false)) != 1) {
             return 0;
         }
 
@@ -213,7 +213,7 @@ 
         // ----- Invalid variable
         else {
             $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-                             'Invalid variable type p_filelist');
+                                'Invalid variable type p_filelist');
             $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER;
         }
 
@@ -227,30 +227,30 @@ 
 
     // {{{ add()
     /**
-    * This method add files or directory in an existing Zip Archive.
-    * If the Zip Archive does not exist it is created.
-    * The files and directories to add are indicated in $p_filelist.
-    * When a directory is in the list, the directory and its content is added
-    * in the archive.
-    * The methods takes a variable list of parameters in $p_params.
-    * The supported parameters for this method are :
-    *   'add_path' : Add a path to the archived files.
-    *   'remove_path' : Remove the specified 'root' path of the archived files.
-    *   'remove_all_path' : Remove all the path of the archived files.
-    *   'no_compression' : The archived files will not be compressed.
-    *   'callback_pre_add' : A callback function that will be called before
-    *                        each entry archiving.
-    *   'callback_post_add' : A callback function that will be called after
-    *                         each entry archiving.
-    *
-    * @access public
-    * @param    mixed  $p_filelist  The list of the files or folders to add.
-    *                               It can be a string with filenames separated
-    *                               by a comma, or an array of filenames.
-    * @param    mixed  $p_params  An array of variable parameters and values.
-    * @return mixed An array of file description on success,
-    *               0 on an unrecoverable failure, an error code is logged.
-    */
+     * This method add files or directory in an existing Zip Archive.
+     * If the Zip Archive does not exist it is created.
+     * The files and directories to add are indicated in $p_filelist.
+     * When a directory is in the list, the directory and its content is added
+     * in the archive.
+     * The methods takes a variable list of parameters in $p_params.
+     * The supported parameters for this method are :
+     *   'add_path' : Add a path to the archived files.
+     *   'remove_path' : Remove the specified 'root' path of the archived files.
+     *   'remove_all_path' : Remove all the path of the archived files.
+     *   'no_compression' : The archived files will not be compressed.
+     *   'callback_pre_add' : A callback function that will be called before
+     *                        each entry archiving.
+     *   'callback_post_add' : A callback function that will be called after
+     *                         each entry archiving.
+     *
+     * @access public
+     * @param    mixed  $p_filelist  The list of the files or folders to add.
+     *                               It can be a string with filenames separated
+     *                               by a comma, or an array of filenames.
+     * @param    mixed  $p_params  An array of variable parameters and values.
+     * @return mixed An array of file description on success,
+     *               0 on an unrecoverable failure, an error code is logged.
+     */
     public function add($p_filelist, $p_params=0)
     {
         $this->_errorReset();
@@ -260,11 +260,11 @@ 
             $p_params = array();
         }
         if ($this->_check_parameters($p_params,
-                                     array('no_compression' => false,
+                                        array('no_compression' => false,
                                             'add_path' => '',
                                             'remove_path' => '',
                                             'remove_all_path' => false,
-                                             'callback_pre_add' => '',
+                                                'callback_pre_add' => '',
                                             'callback_post_add' => '')) != 1) {
             return 0;
         }
@@ -302,48 +302,48 @@ 
 
     // {{{ listContent()
     /**
-    * This method gives the names and properties of the files and directories
-    * which are present in the zip archive.
-    * The properties of each entries in the list are :
-    *   filename : Name of the file.
-    *              For create() or add() it's the filename given by the user.
-    *              For an extract() it's 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 zip headers overhead)
-    *   mtime : Last known modification date of the file (UNIX timestamp)
-    *   comment : Comment associated with the file
-    *   folder : true | false (indicates if the entry is a folder)
-    *   index : index of the file in the archive (-1 when not available)
-    *   status : status of the action on the entry (depending of the action) :
-    *            Values are :
-    *              ok : OK !
-    *              filtered : the file/dir was not extracted (filtered by user)
-    *              already_a_directory : the file can't be extracted because a
-    *                                    directory with the same name already
-    *                                    exists
-    *              write_protected : the file can't 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 already exists
-    *              path_creation_fail : the file is not extracted because the
-    *                                   folder does not exists and can't 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 error on a single file, the error is only logged in the file status.
-    *
-    * @access public
-    * @return mixed An array of file description on success,
-    *               0 on an unrecoverable failure, an error code is logged.
-    */
+     * This method gives the names and properties of the files and directories
+     * which are present in the zip archive.
+     * The properties of each entries in the list are :
+     *   filename : Name of the file.
+     *              For create() or add() it's the filename given by the user.
+     *              For an extract() it's 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 zip headers overhead)
+     *   mtime : Last known modification date of the file (UNIX timestamp)
+     *   comment : Comment associated with the file
+     *   folder : true | false (indicates if the entry is a folder)
+     *   index : index of the file in the archive (-1 when not available)
+     *   status : status of the action on the entry (depending of the action) :
+     *            Values are :
+     *              ok : OK !
+     *              filtered : the file/dir was not extracted (filtered by user)
+     *              already_a_directory : the file can't be extracted because a
+     *                                    directory with the same name already
+     *                                    exists
+     *              write_protected : the file can't 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 already exists
+     *              path_creation_fail : the file is not extracted because the
+     *                                   folder does not exists and can't 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 error on a single file, the error is only logged in the file status.
+     *
+     * @access public
+     * @return mixed An array of file description on success,
+     *               0 on an unrecoverable failure, an error code is logged.
+     */
     public function listContent()
     {
         $this->_errorReset();
@@ -365,42 +365,42 @@ 
 
     // {{{ extract()
     /**
-    * This method extract the files and folders which are in the zip archive.
-    * It can extract all the archive or a part of the archive by using filter
-    * feature (extract by name, by index, by ereg, by preg). The extraction
-    * can occur in the current path or an other path.
-    * All the advanced features are activated by the use of variable
-    * parameters.
-    * The return value is an array of entry descriptions which gives
-    * information on extracted files (See listContent()).
-    * The method may return a success value (an array) even if some files
-    * are not correctly extracted (see the file status in listContent()).
-    * The supported variable parameters for this method are :
-    *   'add_path' : Path where the files and directories are to be extracted
-    *   'remove_path' : First part ('root' part) of the memorized path
-    *                   (if similar) to remove while extracting.
-    *   'remove_all_path' : Remove all the memorized path while extracting.
-    *   'extract_as_string' :
-    *   'set_chmod' : After the extraction of the file the indicated mode
-    *                 will be set.
-    *   'by_name' : It can be a string with file/dir names separated by ',',
-    *               or an array of file/dir names to extract from the archive.
-    *   'by_index' : A string with range of indexes separated by ',',
-    *                (sample "1,3-5,12").
-    *   'by_ereg' : A regular expression (ereg) that must match the extracted
-    *               filename.
-    *   'by_preg' : A regular expression (preg) that must match the extracted
-    *               filename.
-    *   'callback_pre_extract' : A callback function that will be called before
-    *                            each entry extraction.
-    *   'callback_post_extract' : A callback function that will be called after
-    *                            each entry extraction.
-    *
-    * @access public
-    * @param    mixed  $p_params  An array of variable parameters and values.
-    * @return mixed An array of file description on success,
-    *               0 on an unrecoverable failure, an error code is logged.
-    */
+     * This method extract the files and folders which are in the zip archive.
+     * It can extract all the archive or a part of the archive by using filter
+     * feature (extract by name, by index, by ereg, by preg). The extraction
+     * can occur in the current path or an other path.
+     * All the advanced features are activated by the use of variable
+     * parameters.
+     * The return value is an array of entry descriptions which gives
+     * information on extracted files (See listContent()).
+     * The method may return a success value (an array) even if some files
+     * are not correctly extracted (see the file status in listContent()).
+     * The supported variable parameters for this method are :
+     *   'add_path' : Path where the files and directories are to be extracted
+     *   'remove_path' : First part ('root' part) of the memorized path
+     *                   (if similar) to remove while extracting.
+     *   'remove_all_path' : Remove all the memorized path while extracting.
+     *   'extract_as_string' :
+     *   'set_chmod' : After the extraction of the file the indicated mode
+     *                 will be set.
+     *   'by_name' : It can be a string with file/dir names separated by ',',
+     *               or an array of file/dir names to extract from the archive.
+     *   'by_index' : A string with range of indexes separated by ',',
+     *                (sample "1,3-5,12").
+     *   'by_ereg' : A regular expression (ereg) that must match the extracted
+     *               filename.
+     *   'by_preg' : A regular expression (preg) that must match the extracted
+     *               filename.
+     *   'callback_pre_extract' : A callback function that will be called before
+     *                            each entry extraction.
+     *   'callback_post_extract' : A callback function that will be called after
+     *                            each entry extraction.
+     *
+     * @access public
+     * @param    mixed  $p_params  An array of variable parameters and values.
+     * @return mixed An array of file description on success,
+     *               0 on an unrecoverable failure, an error code is logged.
+     */
     public function extract($p_params=0)
     {
         $this->_errorReset();
@@ -415,11 +415,11 @@ 
             $p_params = array();
         }
         if ($this->_check_parameters($p_params,
-                                     array('extract_as_string' => false,
+                                        array('extract_as_string' => false,
                                             'add_path' => '',
                                             'remove_path' => '',
                                             'remove_all_path' => false,
-                                             'callback_pre_extract' => '',
+                                                'callback_pre_extract' => '',
                                             'callback_post_extract' => '',
                                             'set_chmod' => 0,
                                             'by_name' => '',
@@ -443,26 +443,26 @@ 
 
     // {{{ delete()
     /**
-    * This methods delete archive entries in the zip archive.
-    * Notice that at least one filtering rule (set by the variable parameter
-    * list) must be set.
-    * Also notice that if you delete a folder entry, only the folder entry
-    * is deleted, not all the files bellonging to this folder.
-    * The supported variable parameters for this method are :
-    *   'by_name' : It can be a string with file/dir names separated by ',',
-    *               or an array of file/dir names to delete from the archive.
-    *   'by_index' : A string with range of indexes separated by ',',
-    *                (sample "1,3-5,12").
-    *   'by_ereg' : A regular expression (ereg) that must match the extracted
-    *               filename.
-    *   'by_preg' : A regular expression (preg) that must match the extracted
-    *               filename.
-    *
-    * @access public
-    * @param    mixed  $p_params  An array of variable parameters and values.
-    * @return mixed An array of file description on success,
-    *               0 on an unrecoverable failure, an error code is logged.
-    */
+     * This methods delete archive entries in the zip archive.
+     * Notice that at least one filtering rule (set by the variable parameter
+     * list) must be set.
+     * Also notice that if you delete a folder entry, only the folder entry
+     * is deleted, not all the files bellonging to this folder.
+     * The supported variable parameters for this method are :
+     *   'by_name' : It can be a string with file/dir names separated by ',',
+     *               or an array of file/dir names to delete from the archive.
+     *   'by_index' : A string with range of indexes separated by ',',
+     *                (sample "1,3-5,12").
+     *   'by_ereg' : A regular expression (ereg) that must match the extracted
+     *               filename.
+     *   'by_preg' : A regular expression (preg) that must match the extracted
+     *               filename.
+     *
+     * @access public
+     * @param    mixed  $p_params  An array of variable parameters and values.
+     * @return mixed An array of file description on success,
+     *               0 on an unrecoverable failure, an error code is logged.
+     */
     public function delete($p_params)
     {
         $this->_errorReset();
@@ -474,7 +474,7 @@ 
 
         // ----- Set default values
         if ($this->_check_parameters($p_params,
-                                     array('by_name' => '',
+                                        array('by_name' => '',
                                             'by_index' => '',
                                             'by_ereg' => '',
                                             'by_preg' => '')) != 1) {
@@ -487,8 +487,8 @@ 
             && ($p_params['by_ereg'] == '')
             && ($p_params['by_preg'] == '')) {
             $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-                             'At least one filtering rule must'
-                             .' be set as parameter');
+                                'At least one filtering rule must'
+                                .' be set as parameter');
             return 0;
         }
 
@@ -505,16 +505,16 @@ 
 
     // {{{ properties()
     /**
-    * This method gives the global 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
-    *
-    * @access public
-    * @param    mixed  $p_params  {Description}
-    * @return mixed An array with the global properties or 0 on error.
-    */
+     * This method gives the global 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
+     *
+     * @access public
+     * @param    mixed  $p_params  {Description}
+     * @return mixed An array with the global properties or 0 on error.
+     */
     public function properties()
     {
         $this->_errorReset();
@@ -535,8 +535,8 @@ 
             // ----- Open the zip file
             if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) {
                 $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                                 'Unable to open archive \''.$this->_zipname
-                                 .'\' in binary read mode');
+                                    'Unable to open archive \''.$this->_zipname
+                                    .'\' in binary read mode');
                 return 0;
             }
 
@@ -561,15 +561,15 @@ 
 
     // {{{ duplicate()
     /**
-    * 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.
-    *
-    * @access public
-    * @param  mixed  $p_archive  It can be a valid Archive_Zip object or
-    *                            the filename of a valid zip archive.
-    * @return integer 1 on success, 0 on failure.
-    */
+     * 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.
+     *
+     * @access public
+     * @param  mixed  $p_archive  It can be a valid Archive_Zip object or
+     *                            the filename of a valid zip archive.
+     * @return integer 1 on success, 0 on failure.
+     */
     public function duplicate($p_archive)
     {
         $this->_errorReset();
@@ -586,7 +586,7 @@ 
             // TBC : Should also check the archive format
             if (!is_file($p_archive)) {
                 $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
-                                 "No file with filename '".$p_archive."'");
+                                    "No file with filename '".$p_archive."'");
                 $v_result = ARCHIVE_ZIP_ERR_MISSING_FILE;
             } else {
                 $v_result = $this->_duplicate($p_archive);
@@ -605,16 +605,16 @@ 
 
     // {{{ merge()
     /**
-    *  This method merge a valid zip archive at the end of the
-    *  archive identified by the Archive_Zip object.
-    *  If the archive ($this) does not exist, the merge becomes a duplicate.
-    *  If the archive to add does not exist, the merge is a success.
-    *
-    * @access public
-    * @param mixed $p_archive_to_add  It can be a valid Archive_Zip object or
-    *                                 the filename of a valid zip archive.
-    * @return integer 1 on success, 0 on failure.
-    */
+     *  This method merge a valid zip archive at the end of the
+     *  archive identified by the Archive_Zip object.
+     *  If the archive ($this) does not exist, the merge becomes a duplicate.
+     *  If the archive to add does not exist, the merge is a success.
+     *
+     * @access public
+     * @param mixed $p_archive_to_add  It can be a valid Archive_Zip object or
+     *                                 the filename of a valid zip archive.
+     * @return integer 1 on success, 0 on failure.
+     */
     public function merge($p_archive_to_add)
     {
         $v_result = 1;
@@ -652,11 +652,11 @@ 
 
     // {{{ errorCode()
     /**
-    * Method that gives the lastest error code.
-    *
-    * @access public
-    * @return integer The error code value.
-    */
+     * Method that gives the lastest error code.
+     *
+     * @access public
+     * @return integer The error code value.
+     */
     public function errorCode()
     {
         return $this->_error_code;
@@ -665,19 +665,19 @@ 
 
     // {{{ errorName()
     /**
-    * This method gives the latest error code name.
-    *
-    * @access public
-    * @param  boolean $p_with_code  If true, gives the name and the int value.
-    * @return string The error name.
-    */
+     * This method gives the latest error code name.
+     *
+     * @access public
+     * @param  boolean $p_with_code  If true, gives the name and the int value.
+     * @return string The error name.
+     */
     public function errorName($p_with_code=false)
     {
         $v_const_list = get_defined_constants();
 
-          // ----- Extract error constants from all const.
+            // ----- Extract error constants from all const.
         for (reset($v_const_list);
-             list($v_key, $v_value) = each($v_const_list);) {
+                list($v_key, $v_value) = each($v_const_list);) {
             if (substr($v_key, 0, strlen('ARCHIVE_ZIP_ERR_'))
                 =='ARCHIVE_ZIP_ERR_') {
                 $v_error_list[$v_key] = $v_value;
@@ -702,15 +702,15 @@ 
 
     // {{{ errorInfo()
     /**
-    * This method returns the description associated with the latest error.
-    *
-    * @access public
-    * @param  boolean $p_full If set to true gives the description with the
-    *                         error code, the name and the description.
-    *                         If set to false gives only the description
-    *                         and the error code.
-    * @return string The error description.
-    */
+     * This method returns the description associated with the latest error.
+     *
+     * @access public
+     * @param  boolean $p_full If set to true gives the description with the
+     *                         error code, the name and the description.
+     *                         If set to false gives only the description
+     *                         and the error code.
+     * @return string The error description.
+     */
     public function errorInfo($p_full=false)
     {
         if ($p_full) {
@@ -728,30 +728,30 @@ 
 // *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
 // -----------------------------------------------------------------------------
 
-  // ---------------------------------------------------------------------------
-  // Function : _checkFormat()
-  // 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.
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_checkFormat()
-  *
-  * { Description }
-  *
-  * @param integer $p_level
-  */
-  public function _checkFormat($p_level=0)
-  {
-      $v_result = true;
+    // ---------------------------------------------------------------------------
+    // Function : _checkFormat()
+    // 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.
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_checkFormat()
+     *
+     * { Description }
+     *
+     * @param integer $p_level
+     */
+    public function _checkFormat($p_level=0)
+    {
+        $v_result = true;
 
     // ----- Reset the error handler
     $this->_errorReset();
@@ -759,16 +759,16 @@ 
     // ----- Look if the file exits
     if (!is_file($this->_zipname)) {
         // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
-                       "Missing archive file '".$this->_zipname."'");
+        $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
+                        "Missing archive file '".$this->_zipname."'");
         return false;
     }
 
     // ----- Check that the file is readeable
     if (!is_readable($this->_zipname)) {
         // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       "Unable to read archive '".$this->_zipname."'");
+        $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
+                        "Unable to read archive '".$this->_zipname."'");
         return false;
     }
 
@@ -783,34 +783,34 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _create()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_create()
-  *
-  * { Description }
-  *
-  */
-  public function _create($p_list, &$p_result_list, &$p_params)
-  {
-      $v_result=1;
-      $v_list_detail = array();
-
-      $p_add_dir = $p_params['add_path'];
-      $p_remove_dir = $p_params['remove_path'];
-      $p_remove_all_dir = $p_params['remove_all_path'];
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _create()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_create()
+     *
+     * { Description }
+     *
+     */
+    public function _create($p_list, &$p_result_list, &$p_params)
+    {
+        $v_result=1;
+        $v_list_detail = array();
+
+        $p_add_dir = $p_params['add_path'];
+        $p_remove_dir = $p_params['remove_path'];
+        $p_remove_all_dir = $p_params['remove_all_path'];
 
     // ----- Open the file in write mode
     if (($v_result = $this->_openFd('wb')) != 1) {
         // ----- Return
-      return $v_result;
+        return $v_result;
     }
 
     // ----- Add the list of files
@@ -821,29 +821,29 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _add()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_add()
-  *
-  * { Description }
-  *
-  */
-  public function _add($p_list, &$p_result_list, &$p_params)
-  {
-      $v_result=1;
-      $v_list_detail = array();
-
-      $p_add_dir = $p_params['add_path'];
-      $p_remove_dir = $p_params['remove_path'];
-      $p_remove_all_dir = $p_params['remove_all_path'];
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _add()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_add()
+     *
+     * { Description }
+     *
+     */
+    public function _add($p_list, &$p_result_list, &$p_params)
+    {
+        $v_result=1;
+        $v_list_detail = array();
+
+        $p_add_dir = $p_params['add_path'];
+        $p_remove_dir = $p_params['remove_path'];
+        $p_remove_all_dir = $p_params['remove_all_path'];
 
     // ----- Look if the archive exists or is empty and need to be created
     if ((!is_file($this->_zipname)) || (filesize($this->_zipname) == 0)) {
@@ -858,10 +858,10 @@ 
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          $this->_closeFd();
-          return $v_result;
-      }
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            $this->_closeFd();
+            return $v_result;
+        }
 
     // ----- Go to beginning of File
     @rewind($this->_zip_fd);
@@ -874,8 +874,8 @@ 
         $this->_closeFd();
 
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Unable to open temporary file \''
-                       .$v_zip_temp_name.'\' in binary write mode');
+                        'Unable to open temporary file \''
+                        .$v_zip_temp_name.'\' in binary write mode');
         return Archive_Zip::errorCode();
     }
 
@@ -883,64 +883,64 @@ 
     // TBC : Here I should better append the file and go back to erase the
     // central dir
     $v_size = $v_central_dir['offset'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_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_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
     // Here is a trick : I swap the temporary fd with the zip fd, in order to
     // use the following methods on the temporary fil and not the real archive
     $v_swap = $this->_zip_fd;
-      $this->_zip_fd = $v_zip_temp_fd;
-      $v_zip_temp_fd = $v_swap;
+        $this->_zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
 
     // ----- Add the files
     $v_header_list = array();
-      if (($v_result = $this->_addFileList($p_list, $v_header_list,
-                                         $p_add_dir, $p_remove_dir,
-                                         $p_remove_all_dir, $p_params)) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->_closeFd();
-          @unlink($v_zip_temp_name);
+        if (($v_result = $this->_addFileList($p_list, $v_header_list,
+                                            $p_add_dir, $p_remove_dir,
+                                            $p_remove_all_dir, $p_params)) != 1) {
+            fclose($v_zip_temp_fd);
+            $this->_closeFd();
+            @unlink($v_zip_temp_name);
 
-      // ----- Return
-      return $v_result;
-      }
+        // ----- Return
+        return $v_result;
+        }
 
     // ----- Store the offset of the central dir
     $v_offset = @ftell($this->_zip_fd);
 
     // ----- Copy the block of file headers from the old archive
     $v_size = $v_central_dir['size'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_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_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 < count($v_header_list); $i++) {
         // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-          if (($v_result=$this->_writeCentralFileHeader($v_header_list[$i]))!=1) {
-              fclose($v_zip_temp_fd);
-              $this->_closeFd();
-              @unlink($v_zip_temp_name);
+        if ($v_header_list[$i]['status'] == 'ok') {
+            if (($v_result=$this->_writeCentralFileHeader($v_header_list[$i]))!=1) {
+                fclose($v_zip_temp_fd);
+                $this->_closeFd();
+                @unlink($v_zip_temp_name);
 
-          // ----- Return
-          return $v_result;
-          }
-          $v_count++;
-      }
+            // ----- Return
+            return $v_result;
+            }
+            $v_count++;
+        }
 
-      // ----- Transform the header to a 'usable' info
-      $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        // ----- Transform the header to a 'usable' info
+        $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
     }
 
     // ----- Zip file comment
@@ -955,16 +955,16 @@ 
                                                 $v_size, $v_offset,
                                                 $v_comment)) != 1) {
         // ----- Reset the file list
-      unset($v_header_list);
+        unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
+        // ----- Return
+        return $v_result;
     }
 
     // ----- Swap back the file descriptor
     $v_swap = $this->_zip_fd;
-      $this->_zip_fd = $v_zip_temp_fd;
-      $v_zip_temp_fd = $v_swap;
+        $this->_zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
 
     // ----- Close
     $this->_closeFd();
@@ -983,100 +983,100 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _openFd()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_openFd()
-  *
-  * { Description }
-  *
-  */
-  public function _openFd($p_mode)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _openFd()
+    // Description :
+    // Parameters :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_openFd()
+     *
+     * { Description }
+     *
+     */
+    public function _openFd($p_mode)
+    {
+        $v_result=1;
 
     // ----- Look if already open
     if ($this->_zip_fd != 0) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Zip file \''.$this->_zipname.'\' already open');
+                        'Zip file \''.$this->_zipname.'\' already open');
         return Archive_Zip::errorCode();
     }
 
     // ----- Open the zip file
     if (($this->_zip_fd = @fopen($this->_zipname, $p_mode)) == 0) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Unable to open archive \''.$this->_zipname
-                       .'\' in '.$p_mode.' mode');
+                        'Unable to open archive \''.$this->_zipname
+                        .'\' in '.$p_mode.' mode');
         return Archive_Zip::errorCode();
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _closeFd()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_closeFd()
-  *
-  * { Description }
-  *
-  */
-  public function _closeFd()
-  {
-      $v_result=1;
-
-      if ($this->_zip_fd != 0) {
-          @fclose($this->_zip_fd);
-      }
-      $this->_zip_fd = 0;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _closeFd()
+    // Description :
+    // Parameters :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_closeFd()
+     *
+     * { Description }
+     *
+     */
+    public function _closeFd()
+    {
+        $v_result=1;
+
+        if ($this->_zip_fd != 0) {
+            @fclose($this->_zip_fd);
+        }
+        $this->_zip_fd = 0;
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addList()
-  // 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 :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addList()
-  *
-  * { Description }
-  *
-  */
-  public function _addList($p_list, &$p_result_list,
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _addList()
+    // 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 :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_addList()
+     *
+     * { Description }
+     *
+     */
+    public function _addList($p_list, &$p_result_list,
                     $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
-  {
-      $v_result=1;
+    {
+        $v_result=1;
 
     // ----- Add the files
     $v_header_list = array();
-      if (($v_result = $this->_addFileList($p_list, $v_header_list,
-                                         $p_add_dir, $p_remove_dir,
-                                         $p_remove_all_dir, $p_params)) != 1) {
-          return $v_result;
-      }
+        if (($v_result = $this->_addFileList($p_list, $v_header_list,
+                                            $p_add_dir, $p_remove_dir,
+                                            $p_remove_all_dir, $p_params)) != 1) {
+            return $v_result;
+        }
 
     // ----- Store the offset of the central dir
     $v_offset = @ftell($this->_zip_fd);
@@ -1084,15 +1084,15 @@ 
     // ----- Create the Central Dir files header
     for ($i=0, $v_count=0; $i < count($v_header_list); $i++) {
         // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-          if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
-              return $v_result;
-          }
-          $v_count++;
-      }
+        if ($v_header_list[$i]['status'] == 'ok') {
+            if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
+                return $v_result;
+            }
+            $v_count++;
+        }
 
-      // ----- Transform the header to a 'usable' info
-      $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        // ----- Transform the header to a 'usable' info
+        $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
     }
 
     // ----- Zip file comment
@@ -1105,42 +1105,42 @@ 
     if (($v_result = $this->_writeCentralHeader($v_count, $v_size, $v_offset,
                                                 $v_comment)) != 1) {
         // ----- Reset the file list
-      unset($v_header_list);
+        unset($v_header_list);
 
-      // ----- Return
-      return $v_result;
+        // ----- Return
+        return $v_result;
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addFileList()
-  // 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
-  //   run the lib 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 :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addFileList()
-  *
-  * { Description }
-  *
-  */
-  public function _addFileList($p_list, &$p_result_list,
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _addFileList()
+    // 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
+    //   run the lib 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 :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_addFileList()
+     *
+     * { Description }
+     *
+     */
+    public function _addFileList($p_list, &$p_result_list,
                         $p_add_dir, $p_remove_dir, $p_remove_all_dir,
                         &$p_params)
-  {
-      $v_result=1;
-      $v_header = array();
+    {
+        $v_result=1;
+        $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = count($p_result_list);
@@ -1148,34 +1148,34 @@ 
     // ----- Loop on the files
     for ($j=0; ($j<count($p_list)) && ($v_result==1); $j++) {
         // ----- Recuperate the filename
-      $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false);
-
-      // ----- Skip empty file names
-      if ($p_filename == '') {
-          continue;
-      }
-
-      // ----- Check the filename
-      if (!file_exists($p_filename)) {
-          $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
-                         "File '$p_filename' does not exists");
-          return Archive_Zip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all pathnre move
-      if (is_file($p_filename) || (is_dir($p_filename) && !$p_remove_all_dir)) {
-          // ----- Add the file
+        $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false);
+
+        // ----- Skip empty file names
+        if ($p_filename == '') {
+            continue;
+        }
+
+        // ----- Check the filename
+        if (!file_exists($p_filename)) {
+            $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
+                            "File '$p_filename' does not exists");
+            return Archive_Zip::errorCode();
+        }
+
+        // ----- Look if it is a file or a dir with no all pathnre move
+        if (is_file($p_filename) || (is_dir($p_filename) && !$p_remove_all_dir)) {
+            // ----- Add the file
         if (($v_result = $this->_addFile($p_filename, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params)) != 1) {
             // ----- Return status
-          return $v_result;
+            return $v_result;
         }
 
         // ----- Store the file infos
         $p_result_list[$v_nb++] = $v_header;
-      }
+        }
 
-      // ----- Look for directory
-      if (is_dir($p_filename)) {
+        // ----- Look for directory
+        if (is_dir($p_filename)) {
 
         // ----- Look for path
         if ($p_filename != '.') {
@@ -1186,67 +1186,67 @@ 
 
         // ----- Read the directory for files and sub-directories
         $p_hdir = opendir($p_filename);
-          $p_hitem = readdir($p_hdir); // '.' directory
+            $p_hitem = readdir($p_hdir); // '.' directory
         $p_hitem = readdir($p_hdir); // '..' directory
         while ($p_hitem = readdir($p_hdir)) {
 
-          // ----- Look for a file
-          if (is_file($v_path.$p_hitem)) {
+            // ----- Look for a file
+            if (is_file($v_path.$p_hitem)) {
 
             // ----- Add the file
             if (($v_result = $this->_addFile($v_path.$p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params)) != 1) {
                 // ----- Return status
-              return $v_result;
+                return $v_result;
             }
 
             // ----- Store the file infos
             $p_result_list[$v_nb++] = $v_header;
-          }
+            }
 
-          // ----- Recursive call to _addFileList()
-          else {
+            // ----- Recursive call to _addFileList()
+            else {
 
             // ----- Need an array as parameter
             $p_temp_list[0] = $v_path.$p_hitem;
-              $v_result = $this->_addFileList($p_temp_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params);
+                $v_result = $this->_addFileList($p_temp_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params);
 
             // ----- Update the number of elements of the list
             $v_nb = count($p_result_list);
-          }
+            }
         }
 
         // ----- Free memory for the recursive loop
         unset($p_temp_list, $p_hdir, $p_hitem);
-      }
-    }
-
-      return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addFile()
-  *
-  * { Description }
-  *
-  */
-  public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
-  {
-      $v_result=1;
-
-      if ($p_filename == '') {
-          // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'Invalid file list parameter (invalid or empty list)');
+        }
+    }
 
-      // ----- Return
-      return Archive_Zip::errorCode();
-      }
+        return $v_result;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _addFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_addFile()
+     *
+     * { Description }
+     *
+     */
+    public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
+    {
+        $v_result=1;
+
+        if ($p_filename == '') {
+            // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, 'Invalid file list parameter (invalid or empty list)');
+
+        // ----- Return
+        return Archive_Zip::errorCode();
+        }
 
     // ----- Calculate the stored filename
     $v_stored_filename = $p_filename;
@@ -1309,51 +1309,51 @@ 
 
     // ----- Set the file properties
     clearstatcache();
-      $p_header['version'] = 20;
-      $p_header['version_extracted'] = 10;
-      $p_header['flag'] = 0;
-      $p_header['compression'] = 0;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['crc'] = 0;
-      $p_header['compressed_size'] = 0;
-      $p_header['size'] = filesize($p_filename);
-      $p_header['filename_len'] = strlen($p_filename);
-      $p_header['extra_len'] = 0;
-      $p_header['comment_len'] = 0;
-      $p_header['disk'] = 0;
-      $p_header['internal'] = 0;
-      $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010);
-      $p_header['offset'] = 0;
-      $p_header['filename'] = $p_filename;
-      $p_header['stored_filename'] = $v_stored_filename;
-      $p_header['extra'] = '';
-      $p_header['comment'] = '';
-      $p_header['status'] = 'ok';
-      $p_header['index'] = -1;
+        $p_header['version'] = 20;
+        $p_header['version_extracted'] = 10;
+        $p_header['flag'] = 0;
+        $p_header['compression'] = 0;
+        $p_header['mtime'] = filemtime($p_filename);
+        $p_header['crc'] = 0;
+        $p_header['compressed_size'] = 0;
+        $p_header['size'] = filesize($p_filename);
+        $p_header['filename_len'] = strlen($p_filename);
+        $p_header['extra_len'] = 0;
+        $p_header['comment_len'] = 0;
+        $p_header['disk'] = 0;
+        $p_header['internal'] = 0;
+        $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010);
+        $p_header['offset'] = 0;
+        $p_header['filename'] = $p_filename;
+        $p_header['stored_filename'] = $v_stored_filename;
+        $p_header['extra'] = '';
+        $p_header['comment'] = '';
+        $p_header['status'] = 'ok';
+        $p_header['index'] = -1;
 
     // ----- Look for pre-add callback
     if (isset($p_params[ARCHIVE_ZIP_PARAM_PRE_ADD])
         && ($p_params[ARCHIVE_ZIP_PARAM_PRE_ADD] != '')) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
+        // ----- Generate a local information
+        $v_local_header = array();
         $this->_convertHeader2FileInfo($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.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_ADD].'(ARCHIVE_ZIP_PARAM_PRE_ADD, $v_local_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_params[ARCHIVE_ZIP_PARAM_PRE_ADD].'(ARCHIVE_ZIP_PARAM_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']) {
-          $p_header['stored_filename'] = $this->_tool_PathReduction($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'] = $this->_tool_PathReduction($v_local_header['stored_filename']);
+        }
     }
 
     // ----- Look for empty stored filename
@@ -1369,34 +1369,34 @@ 
     // ----- Look if no error, or file not skipped
     if ($p_header['status'] == 'ok') {
 
-      // ----- Look for a file
-      if (is_file($p_filename)) {
-          // ----- Open the source file
+        // ----- Look for a file
+        if (is_file($p_filename)) {
+            // ----- Open the source file
         if (($v_file = @fopen($p_filename, 'rb')) == 0) {
             $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
             return Archive_Zip::errorCode();
         }
 
-          if ($p_params['no_compression']) {
-              // ----- Read the file content
-          $v_content_compressed = @fread($v_file, $p_header['size']);
+            if ($p_params['no_compression']) {
+                // ----- Read the file content
+            $v_content_compressed = @fread($v_file, $p_header['size']);
 
-          // ----- Calculate the CRC
-          $p_header['crc'] = crc32($v_content_compressed);
-          } else {
-              // ----- Read the file content
-          $v_content = @fread($v_file, $p_header['size']);
+            // ----- Calculate the CRC
+            $p_header['crc'] = crc32($v_content_compressed);
+            } else {
+                // ----- Read the file content
+            $v_content = @fread($v_file, $p_header['size']);
 
-          // ----- Calculate the CRC
-          $p_header['crc'] = crc32($v_content);
+            // ----- Calculate the CRC
+            $p_header['crc'] = crc32($v_content);
 
-          // ----- Compress the file
-          $v_content_compressed = gzdeflate($v_content);
-          }
+            // ----- Compress the file
+            $v_content_compressed = gzdeflate($v_content);
+            }
 
         // ----- Set header parameters
         $p_header['compressed_size'] = strlen($v_content_compressed);
-          $p_header['compression'] = 8;
+            $p_header['compression'] = 8;
 
         // ----- Call the header generation
         if (($v_result = $this->_writeFileHeader($p_header)) != 1) {
@@ -1406,68 +1406,68 @@ 
 
         // ----- Write the compressed content
         $v_binary_data = pack('a'.$p_header['compressed_size'], $v_content_compressed);
-          @fwrite($this->_zip_fd, $v_binary_data, $p_header['compressed_size']);
+            @fwrite($this->_zip_fd, $v_binary_data, $p_header['compressed_size']);
 
         // ----- Close the file
         @fclose($v_file);
-      }
+        }
 
-      // ----- Look for a directory
-      else {
-          // ----- Set the file properties
+        // ----- Look for a directory
+        else {
+            // ----- Set the file properties
         $p_header['filename'] .= '/';
-          $p_header['filename_len']++;
-          $p_header['size'] = 0;
-          $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+            $p_header['filename_len']++;
+            $p_header['size'] = 0;
+            $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->_writeFileHeader($p_header)) != 1) {
             return $v_result;
         }
-      }
+        }
     }
 
     // ----- Look for pre-add callback
     if (isset($p_params[ARCHIVE_ZIP_PARAM_POST_ADD])
         && ($p_params[ARCHIVE_ZIP_PARAM_POST_ADD] != '')) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
+        // ----- Generate a local information
+        $v_local_header = array();
         $this->_convertHeader2FileInfo($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.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_ADD].'(ARCHIVE_ZIP_PARAM_POST_ADD, $v_local_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_params[ARCHIVE_ZIP_PARAM_POST_ADD].'(ARCHIVE_ZIP_PARAM_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 : _writeFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeFileHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _writeFileHeader(&$p_header)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _writeFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_writeFileHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _writeFileHeader(&$p_header)
+    {
+        $v_result=1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1478,14 +1478,14 @@ 
 
     // ----- 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, $p_header['version'], $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['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
     fwrite($this->_zip_fd, $v_binary_data, 30);
@@ -1494,30 +1494,30 @@ 
     if (strlen($p_header['stored_filename']) != 0) {
         fwrite($this->_zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
     }
-      if ($p_header['extra_len'] != 0) {
-          fwrite($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
-      }
+        if ($p_header['extra_len'] != 0) {
+            fwrite($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _writeCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeCentralFileHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _writeCentralFileHeader(&$p_header)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _writeCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_writeCentralFileHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _writeCentralFileHeader(&$p_header)
+    {
+        $v_result=1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1525,15 +1525,15 @@ 
 
     // ----- 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('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['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
     fwrite($this->_zip_fd, $v_binary_data, 46);
@@ -1542,33 +1542,33 @@ 
     if (strlen($p_header['stored_filename']) != 0) {
         fwrite($this->_zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
     }
-      if ($p_header['extra_len'] != 0) {
-          fwrite($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
-      }
-      if ($p_header['comment_len'] != 0) {
-          fwrite($this->_zip_fd, $p_header['comment'], $p_header['comment_len']);
-      }
+        if ($p_header['extra_len'] != 0) {
+            fwrite($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
+        }
+        if ($p_header['comment_len'] != 0) {
+            fwrite($this->_zip_fd, $p_header['comment'], $p_header['comment_len']);
+        }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _writeCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeCentralHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _writeCentralHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_writeCentralHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _writeCentralHeader($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));
@@ -1583,60 +1583,60 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _list()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_list()
-  *
-  * { Description }
-  *
-  */
-  public function _list(&$p_list)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _list()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_list()
+     *
+     * { Description }
+     *
+     */
+    public function _list(&$p_list)
+    {
+        $v_result=1;
 
     // ----- Open the zip file
     if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) {
         // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in binary read mode');
+        $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in binary read mode');
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          return $v_result;
-      }
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            return $v_result;
+        }
 
     // ----- Go to beginning of Central Dir
     @rewind($this->_zip_fd);
-      if (@fseek($this->_zip_fd, $v_central_dir['offset'])) {
-          // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+        if (@fseek($this->_zip_fd, $v_central_dir['offset'])) {
+            // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-      // ----- Return
-      return Archive_Zip::errorCode();
-      }
+        // ----- Return
+        return Archive_Zip::errorCode();
+        }
 
     // ----- Read each entry
     for ($i=0; $i<$v_central_dir['entries']; $i++) {
         // ----- Read the file header
-      if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
-          return $v_result;
-      }
+        if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
+            return $v_result;
+        }
         $v_header['index'] = $i;
 
-      // ----- Get the only interesting attributes
-      $this->_convertHeader2FileInfo($v_header, $p_list[$i]);
+        // ----- Get the only interesting attributes
+        $this->_convertHeader2FileInfo($v_header, $p_list[$i]);
         unset($v_header);
     }
 
@@ -1645,82 +1645,82 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _convertHeader2FileInfo()
-  // 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.
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_convertHeader2FileInfo()
-  *
-  * { Description }
-  *
-  */
-  public function _convertHeader2FileInfo($p_header, &$p_info)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _convertHeader2FileInfo()
+    // 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.
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_convertHeader2FileInfo()
+     *
+     * { Description }
+     *
+     */
+    public function _convertHeader2FileInfo($p_header, &$p_info)
+    {
+        $v_result=1;
 
     // ----- Get the interesting attributes
     $p_info['filename'] = $p_header['filename'];
-      $p_info['stored_filename'] = $p_header['stored_filename'];
-      $p_info['size'] = $p_header['size'];
-      $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['index'] = $p_header['index'];
-      $p_info['status'] = $p_header['status'];
+        $p_info['stored_filename'] = $p_header['stored_filename'];
+        $p_info['size'] = $p_header['size'];
+        $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['index'] = $p_header['index'];
+        $p_info['status'] = $p_header['status'];
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractByRule()
-  // 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)
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractByRule()
-  *
-  * { Description }
-  *
-  */
-  public function _extractByRule(&$p_file_list, &$p_params)
-  {
-      $v_result=1;
-
-      $p_path = $p_params['add_path'];
-      $p_remove_path = $p_params['remove_path'];
-      $p_remove_all_path = $p_params['remove_all_path'];
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _extractByRule()
+    // 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)
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_extractByRule()
+     *
+     * { Description }
+     *
+     */
+    public function _extractByRule(&$p_file_list, &$p_params)
+    {
+        $v_result=1;
+
+        $p_path = $p_params['add_path'];
+        $p_remove_path = $p_params['remove_path'];
+        $p_remove_all_path = $p_params['remove_all_path'];
 
     // ----- Check the path
     if (($p_path == '')
@@ -1732,16 +1732,16 @@ 
     // ----- Reduce the path last (and duplicated) '/'
     if (($p_path != './') && ($p_path != '/')) {
         // ----- Look for the path end '/'
-      while (substr($p_path, -1) == '/') {
-          $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
+        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_size = strlen($p_remove_path);
+        $p_remove_path_size = strlen($p_remove_path);
 
     // ----- Open the zip file
     if (($v_result = $this->_openFd('rb')) != 1) {
@@ -1750,202 +1750,202 @@ 
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          // ----- Close the zip file
-      $this->_closeFd();
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            // ----- Close the zip file
+        $this->_closeFd();
 
-          return $v_result;
-      }
+            return $v_result;
+        }
 
     // ----- Start at beginning of Central Dir
     $v_pos_entry = $v_central_dir['offset'];
 
     // ----- Read each entry
     $j_start = 0;
-      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)) {
-              $this->_closeFd();
+        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)) {
+                $this->_closeFd();
 
-              $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-                         'Invalid archive size');
+                $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
+                            'Invalid archive size');
 
-              return Archive_Zip::errorCode();
-          }
+                return Archive_Zip::errorCode();
+            }
 
-      // ----- Read the file header
-      $v_header = array();
-          if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
-              $this->_closeFd();
+        // ----- Read the file header
+        $v_header = array();
+            if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
+                $this->_closeFd();
 
-              return $v_result;
-          }
+                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_params[ARCHIVE_ZIP_PARAM_BY_NAME])
+        // ----- Look for extract by name rule
+        if (isset($p_params[ARCHIVE_ZIP_PARAM_BY_NAME])
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
-          // ----- Look if the filename is in the list
-          for ($j=0;
-                  ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
+            // ----- Look if the filename is in the list
+            for ($j=0;
+                    ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                && (!$v_extract);
-               $j++) {
+                $j++) {
 
-              // ----- Look for a directory
-              if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == '/') {
+                // ----- Look for a directory
+                if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == '/') {
 
-                  // ----- Look if the directory is in the filename path
-                  if ((strlen($v_header['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
+                    // ----- Look if the directory is in the filename path
+                    if ((strlen($v_header['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
                       && (substr($v_header['stored_filename'], 0, strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG])
+                        $v_extract = true;
+                    }
+                }
+                // ----- Look for a filename
+                elseif ($v_header['stored_filename'] == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
+                    $v_extract = true;
+                }
+            }
+        }
+
+        // ----- Look for extract by ereg rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_EREG] != '')) {
-          if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
+            if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG], $v_header['stored_filename'])) {
+                $v_extract = true;
+            }
+        }
 
-      // ----- Look for extract by preg rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG])
+        // ----- Look for extract by preg rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_PREG] != '')) {
-          if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
+            if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG], $v_header['stored_filename'])) {
+                $v_extract = true;
+            }
+        }
 
-      // ----- Look for extract by index rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])
+        // ----- Look for extract by index rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
 
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
+            // ----- Look if the index is in the list
+            for ($j=$j_start; ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
+                if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
+                    $v_extract = true;
+                }
+                if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
+                    $j_start = $j+1;
+                }
+
+                if ($p_params[ARCHIVE_ZIP_PARAM_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;
+        }
 
 
-      // ----- 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->_closeFd();
+            if (@fseek($this->_zip_fd, $v_header['offset'])) {
+                // ----- Close the zip file
+            $this->_closeFd();
 
-          // ----- Error log
-          $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+            // ----- Error log
+            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
 
-          // ----- Return
-          return Archive_Zip::errorCode();
-          }
+            // ----- Return
+            return Archive_Zip::errorCode();
+            }
 
         // ----- Look for extraction as string
         if ($p_params[ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING]) {
 
-          // ----- Extracting the file
-          if (($v_result = $this->_extractFileAsString($v_header, $v_string)) != 1) {
-              // ----- Close the zip file
+            // ----- Extracting the file
+            if (($v_result = $this->_extractFileAsString($v_header, $v_string)) != 1) {
+                // ----- Close the zip file
             $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
-              // ----- Close the zip file
+            // ----- Get the only interesting attributes
+            if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1) {
+                // ----- Close the zip file
             $this->_closeFd();
 
-              return $v_result;
-          }
+                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++;
         } else {
             // ----- Extracting the file
-          if (($v_result = $this->_extractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_params)) != 1) {
-              // ----- Close the zip file
+            if (($v_result = $this->_extractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_params)) != 1) {
+                // ----- Close the zip file
             $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
 
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-              // ----- Close the zip file
+            // ----- Get the only interesting attributes
+            if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+                // ----- Close the zip file
             $this->_closeFd();
 
-              return $v_result;
-          }
+                return $v_result;
+            }
+        }
+        }
         }
-      }
-      }
 
     // ----- Close the zip file
     $this->_closeFd();
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractFile()
-  *
-  * { Description }
-  *
-  */
-  public function _extractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_params)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _extractFile()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_extractFile()
+     *
+     * { Description }
+     *
+     */
+    public function _extractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_params)
+    {
+        $v_result=1;
 
     // ----- Read the file header
     if (($v_result = $this->_readFileHeader($v_header)) != 1) {
         // ----- Return
-      return $v_result;
+        return $v_result;
     }
 
 
@@ -1961,14 +1961,14 @@ 
     // ----- Look for path to remove
     elseif ($p_remove_path != '') {
         //if (strcmp($p_remove_path, $p_entry['filename'])==0)
-      if ($this->_tool_PathInclusion($p_remove_path, $p_entry['filename']) == 2) {
+        if ($this->_tool_PathInclusion($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) {
@@ -1987,23 +1987,23 @@ 
     if (isset($p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT])
         && ($p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT] != '')) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
+        // ----- Generate a local information
+        $v_local_header = array();
         $this->_convertHeader2FileInfo($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.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT].'(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_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_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT].'(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_header);');
         if ($v_result == 0) {
             // ----- Change the file status
         $p_entry['status'] = 'skipped';
             $v_result = 1;
         }
 
-      // ----- 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
@@ -2014,34 +2014,34 @@ 
     // ----- Look for specific actions while the file exist
     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';
 
         // ----- Return
         //return $v_result;
-      }
-      // ----- Look if file is write protected
-      elseif (!is_writable($p_entry['filename'])) {
+        }
+        // ----- Look if file is write protected
+        elseif (!is_writable($p_entry['filename'])) {
 
         // ----- Change the file status
         $p_entry['status'] = 'write_protected';
 
         // ----- Return
         //return $v_result;
-      }
+        }
 
-      // ----- Look if the extracted file is older
-      elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
+        // ----- Look if the extracted file is older
+        elseif (filemtime($p_entry['filename']) > $p_entry['mtime']) {
 
         // ----- Change the file status
         $p_entry['status'] = 'newer_exist';
 
         // ----- Return
         //return $v_result;
-      }
+        }
     }
 
     // ----- Check the directory availability and create it if necessary
@@ -2069,25 +2069,25 @@ 
     // ----- 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']) {
 
-          // ----- 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 ARCHIVE_ZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
+            // ----- Read the file by ARCHIVE_ZIP_READ_BLOCK_SIZE octets blocks
+            $v_size = $p_entry['compressed_size'];
             while ($v_size != 0) {
                 $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
                 $v_buffer = fread($this->_zip_fd, $v_read_size);
@@ -2096,93 +2096,93 @@ 
                 $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 {
             // ----- Trace
 
-          // ----- 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 $v_result;
-          }
+                return $v_result;
+            }
 
 
-          // ----- 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);
+            // ----- Decompress the file
+            $v_file_content = gzinflate($v_buffer);
             unset($v_buffer);
 
-          // ----- Write the uncompressed data
-          @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+            // ----- Write the uncompressed data
+            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
             unset($v_file_content);
 
-          // ----- 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']);
         }
 
         // ----- Look for chmod option
         if (isset($p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD])
             && ($p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD] != 0)) {
 
-          // ----- Change the mode of the file
-          chmod($p_entry['filename'], $p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD]);
+            // ----- Change the mode of the file
+            chmod($p_entry['filename'], $p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD]);
+        }
         }
-      }
     }
 
     // ----- Look for post-extract callback
     if (isset($p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT])
         && ($p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT] != '')) {
 
-      // ----- Generate a local information
-      $v_local_header = array();
+        // ----- Generate a local information
+        $v_local_header = array();
         $this->_convertHeader2FileInfo($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.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT].'(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_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_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT].'(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_header);');
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractFileAsString()
-  *
-  * { Description }
-  *
-  */
-  public function _extractFileAsString(&$p_entry, &$p_string)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _extractFileAsString()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_extractFileAsString()
+     *
+     * { Description }
+     *
+     */
+    public function _extractFileAsString(&$p_entry, &$p_string)
+    {
+        $v_result=1;
 
     // ----- Read the file header
     $v_header = array();
-      if (($v_result = $this->_readFileHeader($v_header)) != 1) {
-          // ----- Return
-      return $v_result;
-      }
+        if (($v_result = $this->_readFileHeader($v_header)) != 1) {
+            // ----- Return
+        return $v_result;
+        }
 
 
     // ----- Check that the file header is coherent with $p_entry info
@@ -2193,59 +2193,59 @@ 
     // ----- 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']) {
-          // ----- Trace
+        if ($p_entry['compressed_size'] == $p_entry['size']) {
+            // ----- Trace
 
         // ----- Reading the file
         $p_string = fread($this->_zip_fd, $p_entry['compressed_size']);
-      } else {
-          // ----- Trace
+        } else {
+            // ----- Trace
 
         // ----- Reading the file
         $v_data = fread($this->_zip_fd, $p_entry['compressed_size']);
 
         // ----- Decompress the file
         $p_string = gzinflate($v_data);
-      }
+        }
 
-      // ----- Trace
+        // ----- Trace
     } else {
         // TBC : error : can not extract a folder in a string
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readFileHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _readFileHeader(&$p_header)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _readFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_readFileHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _readFileHeader(&$p_header)
+    {
+        $v_result=1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
-      $v_data = unpack('Vid', $v_binary_data);
+        $v_data = unpack('Vid', $v_binary_data);
 
     // ----- Check signature
     if ($v_data['id'] != 0x04034b50) {
 
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+        // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Read the first 42 bytes of the header
@@ -2256,11 +2256,11 @@ 
         $p_header['filename'] = '';
         $p_header['status'] = 'invalid_header';
 
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+        // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Extract the values
@@ -2278,30 +2278,30 @@ 
 
     // ----- Extract properties
     $p_header['compression'] = $v_data['compression'];
-      $p_header['size'] = $v_data['size'];
-      $p_header['compressed_size'] = $v_data['compressed_size'];
-      $p_header['crc'] = $v_data['crc'];
-      $p_header['flag'] = $v_data['flag'];
+        $p_header['size'] = $v_data['size'];
+        $p_header['compressed_size'] = $v_data['compressed_size'];
+        $p_header['crc'] = $v_data['crc'];
+        $p_header['flag'] = $v_data['flag'];
 
     // ----- Recuperate date in UNIX format
     $p_header['mdate'] = $v_data['mdate'];
-      $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 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);
-      } else {
-          $p_header['mtime'] = time();
-      }
+        $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 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);
+        } else {
+            $p_header['mtime'] = time();
+        }
 
     // ----- Other informations
 
@@ -2317,37 +2317,37 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readCentralFileHeader()
-  *
-  * { Description }
-  *
-  */
-  public function _readCentralFileHeader(&$p_header)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _readCentralFileHeader()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_readCentralFileHeader()
+     *
+     * { Description }
+     *
+     */
+    public function _readCentralFileHeader(&$p_header)
+    {
+        $v_result=1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
-      $v_data = unpack('Vid', $v_binary_data);
+        $v_data = unpack('Vid', $v_binary_data);
 
     // ----- Check signature
     if ($v_data['id'] != 0x02014b50) {
 
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+        // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Read the first 42 bytes of the header
@@ -2358,11 +2358,11 @@ 
         $p_header['filename'] = '';
         $p_header['status'] = 'invalid_header';
 
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+        // ----- Error log
+        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
 
-      // ----- Return
-      return Archive_Zip::errorCode();
+        // ----- Return
+        return Archive_Zip::errorCode();
     }
 
     // ----- Extract the values
@@ -2394,17 +2394,17 @@ 
     // ----- Recuperate date in UNIX format
     if ($p_header['mdate'] && $p_header['mtime']) {
         // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+        $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;
+        // ----- 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();
     }
@@ -2423,76 +2423,76 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readEndCentralDir()
-  *
-  * { Description }
-  *
-  */
-  public function _readEndCentralDir(&$p_central_dir)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _readEndCentralDir()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_readEndCentralDir()
+     *
+     * { Description }
+     *
+     */
+    public function _readEndCentralDir(&$p_central_dir)
+    {
+        $v_result=1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->_zipname);
-      @fseek($this->_zip_fd, $v_size);
-      if (@ftell($this->_zip_fd) != $v_size) {
-          $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-                       'Unable to go to the end of the archive \''
-                       .$this->_zipname.'\'');
-          return Archive_Zip::errorCode();
-      }
+        @fseek($this->_zip_fd, $v_size);
+        if (@ftell($this->_zip_fd) != $v_size) {
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
+                        'Unable to go to the end of the archive \''
+                        .$this->_zipname.'\'');
+            return Archive_Zip::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)) {
-              $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-                         'Unable to seek back to the middle of the archive \''
-                         .$this->_zipname.'\'');
-              return Archive_Zip::errorCode();
-          }
-
-      // ----- 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) {
-          $v_found = 1;
-      }
-
-          $v_pos = ftell($this->_zip_fd);
-      }
+        if ($v_size > 26) {
+            @fseek($this->_zip_fd, $v_size-22);
+            if (($v_pos = @ftell($this->_zip_fd)) != ($v_size-22)) {
+                $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
+                            'Unable to seek back to the middle of the archive \''
+                            .$this->_zipname.'\'');
+                return Archive_Zip::errorCode();
+            }
+
+        // ----- 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) {
+            $v_found = 1;
+        }
+
+            $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 = $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)) {
             $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-                         'Unable to seek back to the middle of the archive \''
-                         .$this->_zipname.'\'');
+                            'Unable to seek back to the middle of the archive \''
+                            .$this->_zipname.'\'');
             return Archive_Zip::errorCode();
         }
 
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->_zip_fd);
+        // ----- 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
@@ -2510,11 +2510,11 @@ 
             $v_pos++;
         }
 
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size) {
-          $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to find End of Central Dir Record signature');
-          return Archive_Zip::errorCode();
-      }
+        // ----- Look if not found end of central dir
+        if ($v_pos == $v_size) {
+            $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Unable to find End of Central Dir Record signature');
+            return Archive_Zip::errorCode();
+        }
     }
 
     // ----- Read the first 18 bytes of the header
@@ -2523,8 +2523,8 @@ 
     // ----- Look for invalid block size
     if (strlen($v_binary_data) != 18) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-                         'Invalid End of Central Dir Record size : '
-                         . strlen($v_binary_data));
+                            'Invalid End of Central Dir Record size : '
+                            . strlen($v_binary_data));
         return Archive_Zip::errorCode();
     }
 
@@ -2544,47 +2544,47 @@ 
         $p_central_dir['comment'] = '';
     }
 
-      $p_central_dir['entries'] = $v_data['entries'];
-      $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-      $p_central_dir['offset'] = $v_data['offset'];
-      $p_central_dir['size'] = $v_data['size'];
-      $p_central_dir['disk'] = $v_data['disk'];
-      $p_central_dir['disk_start'] = $v_data['disk_start'];
+        $p_central_dir['entries'] = $v_data['entries'];
+        $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+        $p_central_dir['offset'] = $v_data['offset'];
+        $p_central_dir['size'] = $v_data['size'];
+        $p_central_dir['disk'] = $v_data['disk'];
+        $p_central_dir['disk_start'] = $v_data['disk_start'];
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _deleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_deleteByRule()
-  *
-  * { Description }
-  *
-  */
-  public function _deleteByRule(&$p_result_list, &$p_params)
-  {
-      $v_result=1;
-      $v_list_detail = array();
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _deleteByRule()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_deleteByRule()
+     *
+     * { Description }
+     *
+     */
+    public function _deleteByRule(&$p_result_list, &$p_params)
+    {
+        $v_result=1;
+        $v_list_detail = array();
 
     // ----- Open the zip file
     if (($v_result=$this->_openFd('rb')) != 1) {
         // ----- Return
-      return $v_result;
+        return $v_result;
     }
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          $this->_closeFd();
-          return $v_result;
-      }
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            $this->_closeFd();
+            return $v_result;
+        }
 
     // ----- Go to beginning of File
     @rewind($this->_zip_fd);
@@ -2592,123 +2592,123 @@ 
     // ----- Scan all the files
     // ----- Start at beginning of Central Dir
     $v_pos_entry = $v_central_dir['offset'];
-      @rewind($this->_zip_fd);
-      if (@fseek($this->_zip_fd, $v_pos_entry)) {
-          // ----- Clean
-      $this->_closeFd();
+        @rewind($this->_zip_fd);
+        if (@fseek($this->_zip_fd, $v_pos_entry)) {
+            // ----- Clean
+        $this->_closeFd();
 
-          $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-                       'Invalid archive size');
-          return Archive_Zip::errorCode();
-      }
+            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
+                        'Invalid archive size');
+            return Archive_Zip::errorCode();
+        }
 
     // ----- Read each entry
     $v_header_list = array();
-      $j_start = 0;
-      for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
+        $j_start = 0;
+        for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
 
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-          $v_result
+        // ----- Read the file header
+        $v_header_list[$v_nb_extracted] = array();
+            $v_result
         = $this->_readCentralFileHeader($v_header_list[$v_nb_extracted]);
-          if ($v_result != 1) {
-              // ----- Clean
+            if ($v_result != 1) {
+                // ----- Clean
         $this->_closeFd();
 
-              return $v_result;
-          }
+                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_params[ARCHIVE_ZIP_PARAM_BY_NAME])
+        // ----- Look for extract by name rule
+        if (isset($p_params[ARCHIVE_ZIP_PARAM_BY_NAME])
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
-          // ----- Look if the filename is in the list
-          for ($j=0;
-               ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
+            // ----- Look if the filename is in the list
+            for ($j=0;
+                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                  && (!$v_found);
-               $j++) {
+                $j++) {
 
-              // ----- Look for a directory
-              if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == '/') {
+                // ----- Look for a directory
+                if (substr($p_params[ARCHIVE_ZIP_PARAM_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_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
+                    // ----- Look if the directory is in the filename path
+                    if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_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_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename']
-                      == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG])
+                        $v_found = true;
+                    }
+                }
+                // ----- Look for a filename
+                elseif ($v_header_list[$v_nb_extracted]['stored_filename']
+                        == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
+                    $v_found = true;
+                }
+            }
+        }
+
+        // ----- Look for extract by ereg rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_EREG] != '')) {
-          if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG],
-                   $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by preg rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG])
+            if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG],
+                    $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                $v_found = true;
+            }
+        }
+
+        // ----- Look for extract by preg rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_PREG] != '')) {
-          if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG],
-                         $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])
+            if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG],
+                            $v_header_list[$v_nb_extracted]['stored_filename'])) {
+                $v_found = true;
+            }
+        }
+
+        // ----- Look for extract by index rule
+        elseif (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
 
-          // ----- Look if the index is in the list
-          for ($j=$j_start;
-               ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX]))
+            // ----- Look if the index is in the list
+            for ($j=$j_start;
+                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX]))
                  && (!$v_found);
-               $j++) {
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
+                $j++) {
+                if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
                   && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for deletion
-      if ($v_found) {
-          unset($v_header_list[$v_nb_extracted]);
-      } else {
-          $v_nb_extracted++;
-      }
-      }
+                    $v_found = true;
+                }
+                if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
+                    $j_start = $j+1;
+                }
+
+                if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
+                    break;
+                }
+            }
+        }
+
+        // ----- Look for deletion
+        if ($v_found) {
+            unset($v_header_list[$v_nb_extracted]);
+        } else {
+            $v_nb_extracted++;
+        }
+        }
 
     // ----- Look if something need to be deleted
     if ($v_nb_extracted > 0) {
 
         // ----- Creates a temporay file
         $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-')
-                           .'.tmp';
+                            .'.tmp';
 
         // ----- Creates a temporary zip archive
         $v_temp_zip = new Archive_Zip($v_zip_temp_name);
@@ -2733,7 +2733,7 @@ 
                 @unlink($v_zip_temp_name);
 
                 $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-                                 'Invalid archive size');
+                                    'Invalid archive size');
                 return Archive_Zip::errorCode();
             }
 
@@ -2760,8 +2760,8 @@ 
 
             // ----- Read/write the data block
             $v_result = $this->_tool_CopyBlock($this->_zip_fd,
-                                               $v_temp_zip->_zip_fd,
-                                       $v_header_list[$i]['compressed_size']);
+                                                $v_temp_zip->_zip_fd,
+                                        $v_header_list[$i]['compressed_size']);
             if ($v_result != 1) {
                 // ----- Clean
                 $this->_closeFd();
@@ -2790,7 +2790,7 @@ 
 
             // ----- Transform the header to a 'usable' info
             $v_temp_zip->_convertHeader2FileInfo($v_header_list[$i],
-                                                 $p_result_list[$i]);
+                                                    $p_result_list[$i]);
         }
 
 
@@ -2802,8 +2802,8 @@ 
 
         // ----- Create the central dir footer
         $v_result = $v_temp_zip->_writeCentralHeader(count($v_header_list),
-                                                     $v_size, $v_offset,
-                                                     $v_comment);
+                                                        $v_size, $v_offset,
+                                                        $v_comment);
         if ($v_result != 1) {
             // ----- Clean
             unset($v_header_list);
@@ -2833,30 +2833,30 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _dirCheck()
-  // 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
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_dirCheck()
-  *
-  * { Description }
-  *
-  * @param [type] $p_is_dir
-  */
-  public function _dirCheck($p_dir, $p_is_dir=false)
-  {
-      $v_result = 1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _dirCheck()
+    // 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
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_dirCheck()
+     *
+     * { Description }
+     *
+     * @param [type] $p_is_dir
+     */
+    public function _dirCheck($p_dir, $p_is_dir=false)
+    {
+        $v_result = 1;
 
     // ----- Remove the final '/'
     if ($p_is_dir && (substr($p_dir, -1) == '/')) {
@@ -2874,52 +2874,52 @@ 
     // ----- Just a check
     if ($p_parent_dir != $p_dir) {
         // ----- Look for parent directory
-      if ($p_parent_dir != '') {
-          if (($v_result = $this->_dirCheck($p_parent_dir)) != 1) {
-              return $v_result;
-          }
-      }
+        if ($p_parent_dir != '') {
+            if (($v_result = $this->_dirCheck($p_parent_dir)) != 1) {
+                return $v_result;
+            }
+        }
     }
 
     // ----- Create the directory
     if (!@mkdir($p_dir, 0777)) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL,
-                       "Unable to create directory '$p_dir'");
+                        "Unable to create directory '$p_dir'");
         return Archive_Zip::errorCode();
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _merge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_merge()
-  *
-  * { Description }
-  *
-  */
-  public function _merge(&$p_archive_to_add)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _merge()
+    // Description :
+    //   If $p_archive_to_add does not exist, the function exit with a success result.
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_merge()
+     *
+     * { Description }
+     *
+     */
+    public function _merge(&$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
-      return 1;
+        return 1;
     }
 
     // ----- Look if the archive exists
     if (!is_file($this->_zipname)) {
         // ----- Do a duplicate
-      $v_result = $this->_duplicate($p_archive_to_add->_zipname);
+        $v_result = $this->_duplicate($p_archive_to_add->_zipname);
 
         return $v_result;
     }
@@ -2931,10 +2931,10 @@ 
 
     // ----- Read the central directory informations
     $v_central_dir = array();
-      if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-          $this->_closeFd();
-          return $v_result;
-      }
+        if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
+            $this->_closeFd();
+            return $v_result;
+        }
 
     // ----- Go to beginning of File
     @rewind($this->_zip_fd);
@@ -2947,12 +2947,12 @@ 
 
     // ----- Read the central directory informations
     $v_central_dir_to_add = array();
-      $v_result = $p_archive_to_add->_readEndCentralDir($v_central_dir_to_add);
-      if ($v_result != 1) {
-          $this->_closeFd();
-          $p_archive_to_add->_closeFd();
-          return $v_result;
-      }
+        $v_result = $p_archive_to_add->_readEndCentralDir($v_central_dir_to_add);
+        if ($v_result != 1) {
+            $this->_closeFd();
+            $p_archive_to_add->_closeFd();
+            return $v_result;
+        }
 
     // ----- Go to beginning of File
     @rewind($p_archive_to_add->_zip_fd);
@@ -2965,8 +2965,8 @@ 
         $this->_closeFd();
         $p_archive_to_add->_closeFd();
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Unable to open temporary file \''
-                       .$v_zip_temp_name.'\' in binary write mode');
+                        'Unable to open temporary file \''
+                        .$v_zip_temp_name.'\' in binary write mode');
         return Archive_Zip::errorCode();
     }
 
@@ -2974,46 +2974,46 @@ 
     // TBC : Here I should better append the file and go back to erase the
     // central dir
     $v_size = $v_central_dir['offset'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_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_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 < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_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_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
     $v_offset = @ftell($v_zip_temp_fd);
 
     // ----- Copy the block of file headers from the old archive
     $v_size = $v_central_dir['size'];
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_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_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 < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_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_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;
+        }
 
     // ----- Zip file comment
     // TBC : I should merge the two comments
@@ -3026,8 +3026,8 @@ 
     // Here is a trick : I swap the temporary fd with the zip fd, in order to use
     // the following methods on the temporary fil and not the real archive fd
     $v_swap = $this->_zip_fd;
-      $this->_zip_fd = $v_zip_temp_fd;
-      $v_zip_temp_fd = $v_swap;
+        $this->_zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
 
     // ----- Create the central dir footer
     if (($v_result = $this->_writeCentralHeader($v_central_dir['entries']
@@ -3039,21 +3039,21 @@ 
         @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
     $v_swap = $this->_zip_fd;
-      $this->_zip_fd = $v_zip_temp_fd;
-      $v_zip_temp_fd = $v_swap;
+        $this->_zip_fd = $v_zip_temp_fd;
+        $v_zip_temp_fd = $v_swap;
 
     // ----- Close
     $this->_closeFd();
-      $p_archive_to_add->_closeFd();
+        $p_archive_to_add->_closeFd();
 
     // ----- Close the temporary file
     @fclose($v_zip_temp_fd);
@@ -3069,47 +3069,47 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _duplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_duplicate()
-  *
-  * { Description }
-  *
-  */
-  public function _duplicate($p_archive_filename)
-  {
-      $v_result=1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _duplicate()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_duplicate()
+     *
+     * { Description }
+     *
+     */
+    public function _duplicate($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->_openFd('wb')) != 1) {
         // ----- Return
-      return $v_result;
+        return $v_result;
     }
 
     // ----- Open the temporary file in write mode
     if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
         $this->_closeFd();
         $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-                       'Unable to open archive file \''
-                       .$p_archive_filename.'\' in binary write mode');
+                        'Unable to open archive file \''
+                        .$p_archive_filename.'\' in binary write mode');
         return Archive_Zip::errorCode();
     }
 
@@ -3117,13 +3117,13 @@ 
     // TBC : Here I should better append the file and go back to erase the
     // central dir
     $v_size = filesize($p_archive_filename);
-      while ($v_size != 0) {
-          $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+        while ($v_size != 0) {
+            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                       ? $v_size : ARCHIVE_ZIP_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_buffer = fread($v_zip_temp_fd, $v_read_size);
+            @fwrite($this->_zip_fd, $v_buffer, $v_read_size);
+            $v_size -= $v_read_size;
+        }
 
     // ----- Close
     $this->_closeFd();
@@ -3131,25 +3131,25 @@ 
     // ----- Close the temporary file
     @fclose($v_zip_temp_fd);
 
-      return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  /**
-  * Archive_Zip::_check_parameters()
-  *
-  * { Description }
-  *
-  * @param integer $p_error_code
-  * @param string $p_error_string
-  */
-  public function _check_parameters(&$p_params, $p_default)
-  {
+        return $v_result;
+    }
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Archive_Zip::_check_parameters()
+     *
+     * { Description }
+     *
+     * @param integer $p_error_code
+     * @param string $p_error_string
+     */
+    public function _check_parameters(&$p_params, $p_default)
+    {
 
     // ----- Check that param is an array
     if (!is_array($p_params)) {
         $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-                         'Unsupported parameter, waiting for an array');
+                            'Unsupported parameter, waiting for an array');
         return Archive_Zip::errorCode();
     }
 
@@ -3157,7 +3157,7 @@ 
     for (reset($p_params); list($v_key, $v_value) = each($p_params);) {
         if (!isset($p_default[$v_key])) {
             $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-                             'Unsupported parameter with key \''.$v_key.'\'');
+                                'Unsupported parameter with key \''.$v_key.'\'');
 
             return Archive_Zip::errorCode();
         }
@@ -3172,170 +3172,170 @@ 
 
     // ----- Check specific parameters
     $v_callback_list = array('callback_pre_add', 'callback_post_add',
-                              'callback_pre_extract', 'callback_post_extract');
-      for ($i=0; $i < count($v_callback_list); $i++) {
-          $v_key=$v_callback_list[$i];
-          if (isset($p_params[$v_key]) && ($p_params[$v_key] != '')) {
-              if (!function_exists($p_params[$v_key])) {
-                  $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE,
-                                 "Callback '".$p_params[$v_key]
-                                 ."()' is not an existing function for "
-                                 ."parameter '".$v_key."'");
-                  return Archive_Zip::errorCode();
-              }
-          }
-      }
-
-      return 1;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _errorLog()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_errorLog()
-  *
-  * { Description }
-  *
-  * @param integer $p_error_code
-  * @param string $p_error_string
-  */
-  public function _errorLog($p_error_code=0, $p_error_string='')
-  {
-      $this->_error_code = $p_error_code;
-      $this->_error_string = $p_error_string;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _errorReset()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_errorReset()
-  *
-  * { Description }
-  *
-  */
-  public function _errorReset()
-  {
-      $this->_error_code = 1;
-      $this->_error_string = '';
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_PathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_PathReduction()
-  *
-  * { Description }
-  *
-  */
-  public function _tool_PathReduction($p_dir)
-  {
-      $v_result = '';
+                                'callback_pre_extract', 'callback_post_extract');
+        for ($i=0; $i < count($v_callback_list); $i++) {
+            $v_key=$v_callback_list[$i];
+            if (isset($p_params[$v_key]) && ($p_params[$v_key] != '')) {
+                if (!function_exists($p_params[$v_key])) {
+                    $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE,
+                                    "Callback '".$p_params[$v_key]
+                                    ."()' is not an existing function for "
+                                    ."parameter '".$v_key."'");
+                    return Archive_Zip::errorCode();
+                }
+            }
+        }
+
+        return 1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _errorLog()
+    // Description :
+    // Parameters :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_errorLog()
+     *
+     * { Description }
+     *
+     * @param integer $p_error_code
+     * @param string $p_error_string
+     */
+    public function _errorLog($p_error_code=0, $p_error_string='')
+    {
+        $this->_error_code = $p_error_code;
+        $this->_error_string = $p_error_string;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : _errorReset()
+    // Description :
+    // Parameters :
+    // ---------------------------------------------------------------------------
+    /**
+     * Archive_Zip::_errorReset()
+     *
+     * { Description }
+     *
+     */
+    public function _errorReset()
+    {
+        $this->_error_code = 1;
+        $this->_error_string = '';
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_PathReduction()
+    // Description :
+    // Parameters :
+    // Return Values :
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_PathReduction()
+     *
+     * { Description }
+     *
+     */
+    public function _tool_PathReduction($p_dir)
+    {
+        $v_result = '';
 
     // ----- Look for not empty path
     if ($p_dir != '') {
         // ----- Explode path by directory names
-      $v_list = explode('/', $p_dir);
+        $v_list = explode('/', $p_dir);
 
-      // ----- Study directories from last to first
-      for ($i= count($v_list) - 1; $i >= 0; $i--) {
-          // ----- Look for current path
+        // ----- Study directories from last to first
+        for ($i= count($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
+            // Should be the first $i=0, but no check is done
         } elseif ($v_list[$i] == '..') {
             // ----- Ignore it and ignore the $i-1
-          $i--;
+            $i--;
         } elseif (($v_list[$i] == '') && ($i != (count($v_list) - 1)) && ($i != 0)) {
             // ----- Ignore only the double '//' in path,
-          // but not the first and last '/'
+            // but not the first and last '/'
         } else {
             $v_result = $v_list[$i].($i!=(count($v_list) - 1)? '/' . $v_result: '');
         }
-      }
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_PathInclusion()
-  // 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
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_PathInclusion()
-  *
-  * { Description }
-  *
-  */
-  public function _tool_PathInclusion($p_dir, $p_path)
-  {
-      $v_result = 1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_PathInclusion()
+    // 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
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_PathInclusion()
+     *
+     * { Description }
+     *
+     */
+    public function _tool_PathInclusion($p_dir, $p_path)
+    {
+        $v_result = 1;
 
     // ----- Explode dir and path by directory separator
     $v_list_dir = explode('/', $p_dir);
-      $v_list_dir_size = count($v_list_dir);
-      $v_list_path = explode('/', $p_path);
-      $v_list_path_size = count($v_list_path);
+        $v_list_dir_size = count($v_list_dir);
+        $v_list_path = explode('/', $p_path);
+        $v_list_path_size = count($v_list_path);
 
     // ----- Study directories paths
     $i = 0;
-      $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] == '') {
-          $i++;
-          continue;
-      }
-          if ($v_list_path[$j] == '') {
-              $j++;
-              continue;
-          }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j])
+        $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] == '') {
+            $i++;
+            continue;
+        }
+            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] != '')) {
-          $v_result = 0;
-      }
+            $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 (($j < $v_list_path_size) && ($v_list_path[$j] == '')) {
+            $j++;
+        }
         while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) {
             $i++;
         }
@@ -3351,142 +3351,142 @@ 
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_CopyBlock()
-  // 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 :
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_CopyBlock()
-  *
-  * { Description }
-  *
-  * @param integer $p_mode
-  */
-  public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
-      $v_result = 1;
-
-      if ($p_mode==0) {
-          while ($p_size != 0) {
-              $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_CopyBlock()
+    // 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 :
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_CopyBlock()
+     *
+     * { Description }
+     *
+     * @param integer $p_mode
+     */
+    public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+    {
+        $v_result = 1;
+
+        if ($p_mode==0) {
+            while ($p_size != 0) {
+                $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-              $v_buffer = @fread($p_src, $v_read_size);
-              @fwrite($p_dest, $v_buffer, $v_read_size);
-              $p_size -= $v_read_size;
-          }
-      } elseif ($p_mode==1) {
-          while ($p_size != 0) {
-              $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+                $v_buffer = @fread($p_src, $v_read_size);
+                @fwrite($p_dest, $v_buffer, $v_read_size);
+                $p_size -= $v_read_size;
+            }
+        } elseif ($p_mode==1) {
+            while ($p_size != 0) {
+                $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-              $v_buffer = @gzread($p_src, $v_read_size);
-              @fwrite($p_dest, $v_buffer, $v_read_size);
-              $p_size -= $v_read_size;
-          }
-      } elseif ($p_mode==2) {
-          while ($p_size != 0) {
-              $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+                $v_buffer = @gzread($p_src, $v_read_size);
+                @fwrite($p_dest, $v_buffer, $v_read_size);
+                $p_size -= $v_read_size;
+            }
+        } elseif ($p_mode==2) {
+            while ($p_size != 0) {
+                $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-              $v_buffer = @fread($p_src, $v_read_size);
-              @gzwrite($p_dest, $v_buffer, $v_read_size);
-              $p_size -= $v_read_size;
-          }
-      } elseif ($p_mode==3) {
-          while ($p_size != 0) {
-              $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
+                $v_buffer = @fread($p_src, $v_read_size);
+                @gzwrite($p_dest, $v_buffer, $v_read_size);
+                $p_size -= $v_read_size;
+            }
+        } elseif ($p_mode==3) {
+            while ($p_size != 0) {
+                $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-              $v_buffer = @gzread($p_src, $v_read_size);
-              @gzwrite($p_dest, $v_buffer, $v_read_size);
-              $p_size -= $v_read_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 : $this->_tool_Rename()
-  // 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.
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_Rename()
-  *
-  * { Description }
-  *
-  */
-  public function _tool_Rename($p_src, $p_dest)
-  {
-      $v_result = 1;
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_Rename()
+    // 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.
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_Rename()
+     *
+     * { Description }
+     *
+     */
+    public function _tool_Rename($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)) {
-          $v_result = 0;
-      } elseif (!@unlink($p_src)) {
-          $v_result = 0;
-      }
+        // ----- Try to copy & unlink the src
+        if (!@copy($p_src, $p_dest)) {
+            $v_result = 0;
+        } elseif (!@unlink($p_src)) {
+            $v_result = 0;
+        }
     }
 
     // ----- Return
     return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_TranslateWinPath()
-  // 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.
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_TranslateWinPath()
-  *
-  * { Description }
-  *
-  * @param [type] $p_remove_disk_letter
-  */
-  public function _tool_TranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
-      if (stristr(php_uname(), 'windows')) {
-          // ----- Look for potential disk letter
-      if ($p_remove_disk_letter
+    }
+    // ---------------------------------------------------------------------------
+
+    // ---------------------------------------------------------------------------
+    // Function : $this->_tool_TranslateWinPath()
+    // 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.
+    // ---------------------------------------------------------------------------
+    /**
+     * _tool_TranslateWinPath()
+     *
+     * { Description }
+     *
+     * @param [type] $p_remove_disk_letter
+     */
+    public function _tool_TranslateWinPath($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, '\\', '/');
-      }
-      }
-      return $p_path;
-  }
-  // ---------------------------------------------------------------------------
+            $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;
+    }
+    // ---------------------------------------------------------------------------
 }
-  // End of class
+    // End of class
 

Doc Comments +12 added lines, -6 removed lines

@@ -136,6 +136,9 @@ 
     */
 //HACK by domifara
 //  function Archive_Zip($p_zipname)
+    /**
+     * @param string $p_zipname
+     */
     public function __construct($p_zipname)
     {
 
@@ -176,7 +179,7 @@ 
     * @param  mixed  $p_filelist  The list of the files or folders to add.
     *                             It can be a string with filenames separated
     *                             by a comma, or an array of filenames.
-    * @param  mixed  $p_params  An array of variable parameters and values.
+    * @param  integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               an error code on error
     */
@@ -247,7 +250,7 @@ 
     * @param    mixed  $p_filelist  The list of the files or folders to add.
     *                               It can be a string with filenames separated
     *                               by a comma, or an array of filenames.
-    * @param    mixed  $p_params  An array of variable parameters and values.
+    * @param    integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
@@ -397,7 +400,7 @@ 
     *                            each entry extraction.
     *
     * @access public
-    * @param    mixed  $p_params  An array of variable parameters and values.
+    * @param    integer  $p_params  An array of variable parameters and values.
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
@@ -512,7 +515,6 @@ 
     *    status : not_exist, ok
     *
     * @access public
-    * @param    mixed  $p_params  {Description}
     * @return mixed An array with the global properties or 0 on error.
     */
     public function properties()
@@ -996,6 +998,7 @@ 
   *
   * { Description }
   *
+  * @param string $p_mode
   */
   public function _openFd($p_mode)
   {
@@ -1565,6 +1568,7 @@ 
   *
   * { Description }
   *
+  * @param string $p_comment
   */
   public function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
   {
@@ -3140,8 +3144,6 @@ 
   *
   * { Description }
   *
-  * @param integer $p_error_code
-  * @param string $p_error_string
   */
   public function _check_parameters(&$p_params, $p_default)
   {
@@ -3371,6 +3373,8 @@ 
   * { Description }
   *
   * @param integer $p_mode
+  * @param integer $p_src
+  * @param integer $p_dest
   */
   public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
   {
@@ -3432,6 +3436,8 @@ 
   *
   * { Description }
   *
+  * @param string $p_src
+  * @param string $p_dest
   */
   public function _tool_Rename($p_src, $p_dest)
   {

Spacing +107 added lines, -107 removed lines

@@ -106,24 +106,24 @@ 
     *
     * @var string Name of the Zip file
     */
-    public $_zipname='';
+    public $_zipname = '';
 
     /**
     * File descriptor of the opened Zip file.
     *
     * @var int Internal zip file descriptor
     */
-    public $_zip_fd=0;
+    public $_zip_fd = 0;
 
     /**
     * @var int last error code
     */
-    public $_error_code=1;
+    public $_error_code = 1;
 
     /**
     * @var string Last error description
     */
-    public $_error_string='';
+    public $_error_string = '';
 
     // {{{ constructor
     /**
@@ -144,7 +144,7 @@ 
           PEAR::loadExtension('zlib');
       }*/ // GIJ
       if (!extension_loaded('zlib')) {
-          die("The extension 'zlib' couldn't be found.\n". 'Please make sure your version of PHP was built ' .
+          die("The extension 'zlib' couldn't be found.\n".'Please make sure your version of PHP was built '.
               "with 'zlib' support.\n");
           return false;
       }
@@ -180,7 +180,7 @@ 
     * @return mixed An array of file description on success,
     *               an error code on error
     */
-    public function create($p_filelist, $p_params=0)
+    public function create($p_filelist, $p_params = 0)
     {
         $this->_errorReset();
 
@@ -251,7 +251,7 @@ 
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
-    public function add($p_filelist, $p_params=0)
+    public function add($p_filelist, $p_params = 0)
     {
         $this->_errorReset();
 
@@ -401,7 +401,7 @@ 
     * @return mixed An array of file description on success,
     *               0 on an unrecoverable failure, an error code is logged.
     */
-    public function extract($p_params=0)
+    public function extract($p_params = 0)
     {
         $this->_errorReset();
 
@@ -671,7 +671,7 @@ 
     * @param  boolean $p_with_code  If true, gives the name and the int value.
     * @return string The error name.
     */
-    public function errorName($p_with_code=false)
+    public function errorName($p_with_code = false)
     {
         $v_const_list = get_defined_constants();
 
@@ -685,8 +685,8 @@ 
         }
 
         // ----- Search the name form the code value
-        $v_key=array_search($this->_error_code, $v_error_list, true);
-        if ($v_key!=false) {
+        $v_key = array_search($this->_error_code, $v_error_list, true);
+        if ($v_key != false) {
             $v_value = $v_key;
         } else {
             $v_value = 'NoName';
@@ -711,12 +711,12 @@ 
     *                         and the error code.
     * @return string The error description.
     */
-    public function errorInfo($p_full=false)
+    public function errorInfo($p_full = false)
     {
         if ($p_full) {
-            return($this->errorName(true) . ' : ' . $this->_error_string);
+            return($this->errorName(true).' : '.$this->_error_string);
         } else {
-            return($this->_error_string . ' [code ' . $this->_error_code . ']');
+            return($this->_error_string.' [code '.$this->_error_code.']');
         }
     }
     // }}}
@@ -749,7 +749,7 @@ 
   *
   * @param integer $p_level
   */
-  public function _checkFormat($p_level=0)
+  public function _checkFormat($p_level = 0)
   {
       $v_result = true;
 
@@ -800,7 +800,7 @@ 
   */
   public function _create($p_list, &$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
       $p_add_dir = $p_params['add_path'];
@@ -838,7 +838,7 @@ 
   */
   public function _add($p_list, &$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
       $p_add_dir = $p_params['add_path'];
@@ -852,7 +852,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         return $v_result;
     }
 
@@ -925,10 +925,10 @@ 
       }
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i < count($v_header_list); $i++) {
+    for ($i = 0, $v_count = 0; $i < count($v_header_list); $i++) {
         // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
-          if (($v_result=$this->_writeCentralFileHeader($v_header_list[$i]))!=1) {
+          if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
               fclose($v_zip_temp_fd);
               $this->_closeFd();
               @unlink($v_zip_temp_name);
@@ -947,7 +947,7 @@ 
     $v_comment = '';
 
     // ----- 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->_writeCentralHeader($v_count
@@ -999,7 +999,7 @@ 
   */
   public function _openFd($p_mode)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Look if already open
     if ($this->_zip_fd != 0) {
@@ -1034,7 +1034,7 @@ 
   */
   public function _closeFd()
   {
-      $v_result=1;
+      $v_result = 1;
 
       if ($this->_zip_fd != 0) {
           @fclose($this->_zip_fd);
@@ -1068,7 +1068,7 @@ 
   public function _addList($p_list, &$p_result_list,
                     $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Add the files
     $v_header_list = array();
@@ -1082,7 +1082,7 @@ 
     $v_offset = @ftell($this->_zip_fd);
 
     // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i < count($v_header_list); $i++) {
+    for ($i = 0, $v_count = 0; $i < count($v_header_list); $i++) {
         // ----- Create the file header
       if ($v_header_list[$i]['status'] == 'ok') {
           if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
@@ -1099,7 +1099,7 @@ 
     $v_comment = '';
 
     // ----- 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->_writeCentralHeader($v_count, $v_size, $v_offset,
@@ -1139,14 +1139,14 @@ 
                         $p_add_dir, $p_remove_dir, $p_remove_all_dir,
                         &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_header = array();
 
     // ----- Recuperate the current number of elt in list
     $v_nb = count($p_result_list);
 
     // ----- Loop on the files
-    for ($j=0; ($j<count($p_list)) && ($v_result==1); $j++) {
+    for ($j = 0; ($j < count($p_list)) && ($v_result == 1); $j++) {
         // ----- Recuperate the filename
       $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false);
 
@@ -1179,7 +1179,7 @@ 
 
         // ----- Look for path
         if ($p_filename != '.') {
-            $v_path = $p_filename . '/';
+            $v_path = $p_filename.'/';
         } else {
             $v_path = '';
         }
@@ -1238,7 +1238,7 @@ 
   */
   public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
       if ($p_filename == '') {
           // ----- Error log
@@ -1263,7 +1263,7 @@ 
 
         if ((substr($p_filename, 0, 2) == './') || (substr($p_remove_dir, 0, 2) == './')) {
             if ((substr($p_filename, 0, 2) == './') && (substr($p_remove_dir, 0, 2) != './')) {
-                $p_remove_dir = './' . $p_remove_dir;
+                $p_remove_dir = './'.$p_remove_dir;
             }
             if ((substr($p_filename, 0, 2) != './') && (substr($p_remove_dir, 0, 2) == './')) {
                 $p_remove_dir = substr($p_remove_dir, 2);
@@ -1287,7 +1287,7 @@ 
         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;
+            $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
         }
     }
 
@@ -1322,7 +1322,7 @@ 
       $p_header['comment_len'] = 0;
       $p_header['disk'] = 0;
       $p_header['internal'] = 0;
-      $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010);
+      $p_header['external'] = (is_file($p_filename) ? 0xFE49FFE0 : 0x41FF0010);
       $p_header['offset'] = 0;
       $p_header['filename'] = $p_filename;
       $p_header['stored_filename'] = $v_stored_filename;
@@ -1418,7 +1418,7 @@ 
         $p_header['filename'] .= '/';
           $p_header['filename_len']++;
           $p_header['size'] = 0;
-          $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+          $p_header['external'] = 0x41FF0010; // Value for a folder : to be checked
 
         // ----- Call the header generation
         if (($v_result = $this->_writeFileHeader($p_header)) != 1) {
@@ -1467,7 +1467,7 @@ 
   */
   public function _writeFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1478,8 +1478,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
     $v_binary_data = pack('VvvvvvVVVvv', 0x04034b50, $p_header['version'], $p_header['flag'],
@@ -1517,7 +1517,7 @@ 
   */
   public function _writeCentralFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // TBC
     //for(reset($p_header); $key = key($p_header); next($p_header)) {
@@ -1525,8 +1525,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
     $v_binary_data = pack('VvvvvvvVVVvvvvvVV', 0x02014b50, $p_header['version'], $p_header['version_extracted'],
@@ -1568,7 +1568,7 @@ 
   */
   public function _writeCentralHeader($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, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
@@ -1600,7 +1600,7 @@ 
   */
   public function _list(&$p_list)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Open the zip file
     if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) {
@@ -1628,7 +1628,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->_readCentralFileHeader($v_header)) != 1) {
           return $v_result;
@@ -1674,7 +1674,7 @@ 
   */
   public function _convertHeader2FileInfo($p_header, &$p_info)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Get the interesting attributes
     $p_info['filename'] = $p_header['filename'];
@@ -1683,7 +1683,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'];
 
@@ -1716,7 +1716,7 @@ 
   */
   public function _extractByRule(&$p_file_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
       $p_path = $p_params['add_path'];
       $p_remove_path = $p_params['remove_path'];
@@ -1726,14 +1726,14 @@ 
     if (($p_path == '')
         || ((substr($p_path, 0, 1) != '/')
         && (substr($p_path, 0, 3) != '../') && (substr($p_path, 1, 2) != ':/'))) {
-        $p_path = './' . $p_path;
+        $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) == '/') {
-          $p_path = substr($p_path, 0, strlen($p_path)-1);
+          $p_path = substr($p_path, 0, strlen($p_path) - 1);
       }
     }
 
@@ -1762,7 +1762,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
       @rewind($this->_zip_fd);
           if (@fseek($this->_zip_fd, $v_pos_entry)) {
@@ -1796,7 +1796,7 @@ 
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0;
+          for ($j = 0;
                   ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                && (!$v_extract);
                $j++) {
@@ -1838,15 +1838,15 @@ 
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start; ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
+          for ($j = $j_start; ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
+              if (($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i <= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
                   $v_extract = true;
               }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
+              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -1940,7 +1940,7 @@ 
   */
   public function _extractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the file header
     if (($v_result = $this->_readFileHeader($v_header)) != 1) {
@@ -1980,7 +1980,7 @@ 
 
     // ----- Add the path
     if ($p_path != '') {
-        $p_entry['filename'] = $p_path . '/' . $p_entry['filename'];
+        $p_entry['filename'] = $p_path.'/'.$p_entry['filename'];
     }
 
     // ----- Look for pre-extract callback
@@ -2046,7 +2046,7 @@ 
 
     // ----- 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'];
         } elseif (!strstr($p_entry['filename'], '/')) {
             $v_dir_to_check = '';
@@ -2070,7 +2070,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']) {
@@ -2175,7 +2175,7 @@ 
   */
   public function _extractFileAsString(&$p_entry, &$p_string)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the file header
     $v_header = array();
@@ -2191,7 +2191,7 @@ 
     // ----- Trace
 
     // ----- 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']) {
           // ----- Trace
@@ -2232,7 +2232,7 @@ 
   */
   public function _readFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
@@ -2257,7 +2257,7 @@ 
         $p_header['status'] = 'invalid_header';
 
       // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.strlen($v_binary_data));
 
       // ----- Return
       return Archive_Zip::errorCode();
@@ -2290,7 +2290,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;
@@ -2334,7 +2334,7 @@ 
   */
   public function _readCentralFileHeader(&$p_header)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Read the 4 bytes signature
     $v_binary_data = @fread($this->_zip_fd, 4);
@@ -2359,7 +2359,7 @@ 
         $p_header['status'] = 'invalid_header';
 
       // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : ' . strlen($v_binary_data));
+      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid block size : '.strlen($v_binary_data));
 
       // ----- Return
       return Archive_Zip::errorCode();
@@ -2396,7 +2396,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;
@@ -2440,7 +2440,7 @@ 
   */
   public function _readEndCentralDir(&$p_central_dir)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Go to the end of the zip file
     $v_size = filesize($this->_zipname);
@@ -2457,8 +2457,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)) {
               $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
                          'Unable to seek back to the middle of the archive \''
                          .$this->_zipname.'\'');
@@ -2483,8 +2483,8 @@ 
       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)) {
             $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
                          'Unable to seek back to the middle of the archive \''
                          .$this->_zipname.'\'');
@@ -2570,11 +2570,11 @@ 
   */
   public function _deleteByRule(&$p_result_list, &$p_params)
   {
-      $v_result=1;
+      $v_result = 1;
       $v_list_detail = array();
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         // ----- Return
       return $v_result;
     }
@@ -2605,7 +2605,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
       $v_header_list[$v_nb_extracted] = array();
@@ -2629,7 +2629,7 @@ 
           && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
 
           // ----- Look if the filename is in the list
-          for ($j=0;
+          for ($j = 0;
                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
                  && (!$v_found);
                $j++) {
@@ -2641,7 +2641,7 @@ 
                   if ((strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
                       && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_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_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
                       $v_found = true;
                   }
@@ -2677,19 +2677,19 @@ 
               && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
 
           // ----- Look if the index is in the list
-          for ($j=$j_start;
+          for ($j = $j_start;
                ($j < count($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX]))
                  && (!$v_found);
                $j++) {
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
-                  && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
+              if (($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
+                  && ($i <= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
                   $v_found = true;
               }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
+              if ($i >= $p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
+                  $j_start = $j + 1;
               }
 
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
+              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'] > $i) {
                   break;
               }
           }
@@ -2722,7 +2722,7 @@ 
         }
 
         // ----- Look which file need to be kept
-        for ($i=0; $i < count($v_header_list); $i++) {
+        for ($i = 0; $i < count($v_header_list); $i++) {
 
             // ----- Calculate the position of the header
             @rewind($this->_zip_fd);
@@ -2776,9 +2776,9 @@ 
         $v_offset = @ftell($v_temp_zip->_zip_fd);
 
         // ----- Re-Create the Central Dir files header
-        for ($i=0; $i < count($v_header_list); $i++) {
+        for ($i = 0; $i < count($v_header_list); $i++) {
             // ----- Create the file header
-            $v_result=$v_temp_zip->_writeCentralFileHeader($v_header_list[$i]);
+            $v_result = $v_temp_zip->_writeCentralFileHeader($v_header_list[$i]);
             if ($v_result != 1) {
                 // ----- Clean
                 $v_temp_zip->_closeFd();
@@ -2798,7 +2798,7 @@ 
         $v_comment = '';
 
         // ----- 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
         $v_result = $v_temp_zip->_writeCentralHeader(count($v_header_list),
@@ -2854,13 +2854,13 @@ 
   *
   * @param [type] $p_is_dir
   */
-  public function _dirCheck($p_dir, $p_is_dir=false)
+  public function _dirCheck($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
@@ -2908,7 +2908,7 @@ 
   */
   public function _merge(&$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)) {
@@ -2925,7 +2925,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
+    if (($v_result = $this->_openFd('rb')) != 1) {
         return $v_result;
     }
 
@@ -2940,7 +2940,7 @@ 
     @rewind($this->_zip_fd);
 
     // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->_openFd('rb')) != 1) {
+    if (($v_result = $p_archive_to_add->_openFd('rb')) != 1) {
         $this->_closeFd();
         return $v_result;
     }
@@ -3020,7 +3020,7 @@ 
     $v_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
@@ -3086,7 +3086,7 @@ 
   */
   public function _duplicate($p_archive_filename)
   {
-      $v_result=1;
+      $v_result = 1;
 
     // ----- Look if the $p_archive_filename exists
     if (!is_file($p_archive_filename)) {
@@ -3099,7 +3099,7 @@ 
     }
 
     // ----- Open the zip file
-    if (($v_result=$this->_openFd('wb')) != 1) {
+    if (($v_result = $this->_openFd('wb')) != 1) {
         // ----- Return
       return $v_result;
     }
@@ -3173,8 +3173,8 @@ 
     // ----- Check specific parameters
     $v_callback_list = array('callback_pre_add', 'callback_post_add',
                               'callback_pre_extract', 'callback_post_extract');
-      for ($i=0; $i < count($v_callback_list); $i++) {
-          $v_key=$v_callback_list[$i];
+      for ($i = 0; $i < count($v_callback_list); $i++) {
+          $v_key = $v_callback_list[$i];
           if (isset($p_params[$v_key]) && ($p_params[$v_key] != '')) {
               if (!function_exists($p_params[$v_key])) {
                   $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE,
@@ -3203,7 +3203,7 @@ 
   * @param integer $p_error_code
   * @param string $p_error_string
   */
-  public function _errorLog($p_error_code=0, $p_error_string='')
+  public function _errorLog($p_error_code = 0, $p_error_string = '')
   {
       $this->_error_code = $p_error_code;
       $this->_error_string = $p_error_string;
@@ -3250,7 +3250,7 @@ 
       $v_list = explode('/', $p_dir);
 
       // ----- Study directories from last to first
-      for ($i= count($v_list) - 1; $i >= 0; $i--) {
+      for ($i = count($v_list) - 1; $i >= 0; $i--) {
           // ----- Look for current path
         if ($v_list[$i] == '.') {
             // ----- Ignore this directory
@@ -3262,7 +3262,7 @@ 
             // ----- Ignore only the double '//' in path,
           // but not the first and last '/'
         } else {
-            $v_result = $v_list[$i].($i!=(count($v_list) - 1)? '/' . $v_result: '');
+            $v_result = $v_list[$i].($i != (count($v_list) - 1) ? '/'.$v_result : '');
         }
       }
     }
@@ -3372,11 +3372,11 @@ 
   *
   * @param integer $p_mode
   */
-  public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  public function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode = 0)
   {
       $v_result = 1;
 
-      if ($p_mode==0) {
+      if ($p_mode == 0) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3384,7 +3384,7 @@ 
               @fwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==1) {
+      } elseif ($p_mode == 1) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3392,7 +3392,7 @@ 
               @fwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==2) {
+      } elseif ($p_mode == 2) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3400,7 +3400,7 @@ 
               @gzwrite($p_dest, $v_buffer, $v_read_size);
               $p_size -= $v_read_size;
           }
-      } elseif ($p_mode==3) {
+      } elseif ($p_mode == 3) {
           while ($p_size != 0) {
               $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
                         ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
@@ -3471,13 +3471,13 @@ 
   *
   * @param [type] $p_remove_disk_letter
   */
-  public function _tool_TranslateWinPath($p_path, $p_remove_disk_letter=true)
+  public function _tool_TranslateWinPath($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) == '\\')) {

xoops_trust_path/libs/altsys/xoops_version.php

Spacing +56 added lines, -56 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-include_once __DIR__.'/include/altsys_functions.php' ;
+include_once __DIR__.'/include/altsys_functions.php';
 
 // language file (modinfo.php)
-altsys_include_language_file('modinfo') ;
+altsys_include_language_file('modinfo');
 
-$modversion['name'] = _MI_ALTSYS_MODULENAME ;
-$modversion['version'] = '0.83' ;
-$modversion['detailed_version'] = '0.83.0' ;
-$modversion['description'] = _MI_ALTSYS_MODULEDESC ;
+$modversion['name'] = _MI_ALTSYS_MODULENAME;
+$modversion['version'] = '0.83';
+$modversion['detailed_version'] = '0.83.0';
+$modversion['description'] = _MI_ALTSYS_MODULEDESC;
 $modversion['credits'] = 'PEAK Corp.';
 $modversion['author'] = 'GIJ=CHECKMATE<br />PEAK Corp.(http://www.peak.ne.jp/), XOOPS X Distribution(https://github.com/XoopsX)';
 $modversion['license'] = 'GPL see LICENSE';
@@ -26,18 +26,18 @@ 
 $modversion['adminmenu'] = 'admin/admin_menu.php';
 
 // All Templates can't be touched by modulesadmin.
-$modversion['templates'] = array() ;
+$modversion['templates'] = array();
 
 // Blocks
 $modversion['blocks'][1] = array(
-    'file'            => 'blocks.php' ,
-    'name'            => _MI_ALTSYS_BNAME_ADMIN_MENU ,
-    'description'    => '' ,
-    'show_func'        => 'b_altsys_admin_menu_show' ,
-    'edit_func'        => 'b_altsys_admin_menu_edit' ,
-    'options'        => "$mydirname" ,
-    'template'        => '' , // use "module" template instead
-) ;
+    'file'            => 'blocks.php',
+    'name'            => _MI_ALTSYS_BNAME_ADMIN_MENU,
+    'description'    => '',
+    'show_func'        => 'b_altsys_admin_menu_show',
+    'edit_func'        => 'b_altsys_admin_menu_edit',
+    'options'        => "$mydirname",
+    'template'        => '', // use "module" template instead
+);
 
 // Menu
 $modversion['hasMain'] = 1;
@@ -50,64 +50,64 @@ 
 
 // Configurations
 $modversion['config'][1] = array(
-    'name'            => 'adminmenu_hack_ft' ,
-    'title'            => '_MI_ALTSYS_ADMINMENU_HFT' ,
-    'description'    => '_MI_ALTSYS_ADMINMENU_HFTDSC' ,
-    'formtype'        => 'select' ,
-    'valuetype'        => 'int' ,
-    'default'        => 0 ,
-    'options'        => array( '_NONE' => 0 , '_MI_ALTSYS_AMHFT_OPT_2COL' => 1 , '_MI_ALTSYS_AMHFT_OPT_NOIMG' => 2 , '_MI_ALTSYS_AMHFT_OPT_XCSTY' => 3 )
-) ;
+    'name'            => 'adminmenu_hack_ft',
+    'title'            => '_MI_ALTSYS_ADMINMENU_HFT',
+    'description'    => '_MI_ALTSYS_ADMINMENU_HFTDSC',
+    'formtype'        => 'select',
+    'valuetype'        => 'int',
+    'default'        => 0,
+    'options'        => array('_NONE' => 0, '_MI_ALTSYS_AMHFT_OPT_2COL' => 1, '_MI_ALTSYS_AMHFT_OPT_NOIMG' => 2, '_MI_ALTSYS_AMHFT_OPT_XCSTY' => 3)
+);
 
 $modversion['config'][] = array(
-    'name'            => 'adminmenu_insert_mymenu' ,
-    'title'            => '_MI_ALTSYS_ADMINMENU_IM' ,
-    'description'    => '_MI_ALTSYS_ADMINMENU_IMDSC' ,
-    'formtype'        => 'yesno' ,
-    'valuetype'        => 'int' ,
-    'default'        => 0 ,
+    'name'            => 'adminmenu_insert_mymenu',
+    'title'            => '_MI_ALTSYS_ADMINMENU_IM',
+    'description'    => '_MI_ALTSYS_ADMINMENU_IMDSC',
+    'formtype'        => 'yesno',
+    'valuetype'        => 'int',
+    'default'        => 0,
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'admin_in_theme' ,
-    'title'            => '_MI_ALTSYS_ADMIN_IN_THEME' ,
-    'description'    => '_MI_ALTSYS_ADMIN_IN_THEMEDSC' ,
-    'formtype'        => 'textbox' ,
-    'valuetype'        => 'text' ,
-    'default'        => 'default' ,
+    'name'            => 'admin_in_theme',
+    'title'            => '_MI_ALTSYS_ADMIN_IN_THEME',
+    'description'    => '_MI_ALTSYS_ADMIN_IN_THEMEDSC',
+    'formtype'        => 'textbox',
+    'valuetype'        => 'text',
+    'default'        => 'default',
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'enable_force_clone' ,
-    'title'            => '_MI_ALTSYS_ENABLEFORCECLONE' ,
-    'description'    => '_MI_ALTSYS_ENABLEFORCECLONEDSC' ,
-    'formtype'        => 'yesno' ,
-    'valuetype'        => 'int' ,
-    'default'        => 1 ,
+    'name'            => 'enable_force_clone',
+    'title'            => '_MI_ALTSYS_ENABLEFORCECLONE',
+    'description'    => '_MI_ALTSYS_ENABLEFORCECLONEDSC',
+    'formtype'        => 'yesno',
+    'valuetype'        => 'int',
+    'default'        => 1,
     'options'        => array()
-) ;
+);
 
 $modversion['config'][] = array(
-    'name'            => 'images_dir' ,
-    'title'            => '_MI_ALTSYS_IMAGES_DIR' ,
-    'description'    => '_MI_ALTSYS_IMAGES_DIRDSC' ,
-    'formtype'        => 'textbox' ,
-    'valuetype'        => 'text' ,
-    'default'        => 'images' ,
+    'name'            => 'images_dir',
+    'title'            => '_MI_ALTSYS_IMAGES_DIR',
+    'description'    => '_MI_ALTSYS_IMAGES_DIRDSC',
+    'formtype'        => 'textbox',
+    'valuetype'        => 'text',
+    'default'        => 'images',
     'options'        => array()
-) ;
+);
 
 // Notification
 
 $modversion['hasNotification'] = 0;
 
-$modversion['onInstall'] = 'include/oninstall.php' ;
-$modversion['onUpdate'] = 'include/onupdate.php' ;
-$modversion['onUninstall'] = 'include/onuninstall.php' ;
+$modversion['onInstall'] = 'include/oninstall.php';
+$modversion['onUpdate'] = 'include/onupdate.php';
+$modversion['onUninstall'] = 'include/onuninstall.php';
 
 // keep block's options
-if (! defined('XOOPS_CUBE_LEGACY') && substr(XOOPS_VERSION, 6, 3) < 2.1 && ! empty($_POST['fct']) && ! empty($_POST['op']) && $_POST['fct'] == 'modulesadmin' && $_POST['op'] == 'update_ok' && $_POST['dirname'] == $modversion['dirname']) {
-    include __DIR__.'/include/x20_keepblockoptions.inc.php' ;
+if (!defined('XOOPS_CUBE_LEGACY') && substr(XOOPS_VERSION, 6, 3) < 2.1 && !empty($_POST['fct']) && !empty($_POST['op']) && $_POST['fct'] == 'modulesadmin' && $_POST['op'] == 'update_ok' && $_POST['dirname'] == $modversion['dirname']) {
+    include __DIR__.'/include/x20_keepblockoptions.inc.php';
 }

xoops_trust_path/libs/altsys/mymenusub/mylangadmin.php

Spacing +16 added lines, -16 removed lines

@@ -1,37 +1,37 @@
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']) ;
+$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']);
 
-$db = XoopsDatabaseFactory::getDatabaseConnection() ;
-$mrs = $db->query('SELECT m.name,m.dirname,COUNT(l.mid) FROM ' . $db->prefix('modules') . ' m LEFT JOIN ' . $db->prefix('altsys_language_constants') . ' l ON m.mid=l.mid WHERE m.isactive GROUP BY m.mid ORDER BY m.weight,m.mid') ;
+$db = XoopsDatabaseFactory::getDatabaseConnection();
+$mrs = $db->query('SELECT m.name,m.dirname,COUNT(l.mid) FROM '.$db->prefix('modules').' m LEFT JOIN '.$db->prefix('altsys_language_constants').' l ON m.mid=l.mid WHERE m.isactive GROUP BY m.mid ORDER BY m.weight,m.mid');
 
-$adminmenu = array() ;
+$adminmenu = array();
 while (list($name, $dirname, $count) = $db->fetchRow($mrs)) {
     if ($dirname == $current_dirname) {
         $adminmenu[] = array(
-            'selected' => true ,
-            'title' => $name . " ($count)" ,
+            'selected' => true,
+            'title' => $name." ($count)",
             'link' => '?mode=admin&lib=altsys&page=mylangadmin&dirname='.$dirname
-        ) ;
+        );
         //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => htmlspecialchars( $name , ENT_QUOTES ) ) ;
     } else {
         $adminmenu[] = array(
-            'selected' => false ,
-            'title' => $name . " ($count)" ,
+            'selected' => false,
+            'title' => $name." ($count)",
             'link' => '?mode=admin&lib=altsys&page=mylangadmin&dirname='.$dirname
-        ) ;
+        );
     }
 }
 
 // display
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 $tpl->assign(array(
     'adminmenu' => $adminmenu,
     'mypage' => 'mylangadmin'
-)) ;
-$tpl->display('db:altsys_inc_mymenusub.html') ;
+));
+$tpl->display('db:altsys_inc_mymenusub.html');

xoops_trust_path/libs/altsys/mymenusub/mytplsadmin.php

Spacing +21 added lines, -21 removed lines

@@ -1,56 +1,56 @@
 <?php
 
-if (! defined('XOOPS_ROOT_PATH')) {
-    exit ;
+if (!defined('XOOPS_ROOT_PATH')) {
+    exit;
 }
 
-$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']) ;
+$current_dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', @$_GET['dirname']);
 
-$db = XoopsDatabaseFactory::getDatabaseConnection() ;
+$db = XoopsDatabaseFactory::getDatabaseConnection();
 
 // get custom templates
-list($count) = $db->fetchRow($db->query('SELECT COUNT(t.tpl_module) AS tpl_count FROM ' . $db->prefix('tplfile') . " t WHERE t.tpl_type='custom'")) ;
+list($count) = $db->fetchRow($db->query('SELECT COUNT(t.tpl_module) AS tpl_count FROM '.$db->prefix('tplfile')." t WHERE t.tpl_type='custom'"));
 if ($current_dirname == '_custom') {
     //	$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => _MYTPLSADMIN_CUSTOMTEMPLATE ) ;
-    $custom_selected = true ;
+    $custom_selected = true;
 } else {
-    $custom_selected = false ;
+    $custom_selected = false;
 }
 
 $adminmenu = array(
     array(
-        'selected' => $custom_selected ,
-        'title' => _MYTPLSADMIN_CUSTOMTEMPLATE . " ($count)" ,
+        'selected' => $custom_selected,
+        'title' => _MYTPLSADMIN_CUSTOMTEMPLATE." ($count)",
         'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname=_custom'
     )
-) ;
+);
 
 // get modules/templates
-$mrs = $db->query('SELECT m.name,m.dirname,COUNT(t.tpl_module) AS tpl_count FROM ' . $db->prefix('modules') . ' m LEFT JOIN ' . $db->prefix('tplfile') . ' t ON m.dirname=t.tpl_module WHERE m.isactive GROUP BY m.mid HAVING tpl_count>0 ORDER BY m.weight,m.mid') ;
+$mrs = $db->query('SELECT m.name,m.dirname,COUNT(t.tpl_module) AS tpl_count FROM '.$db->prefix('modules').' m LEFT JOIN '.$db->prefix('tplfile').' t ON m.dirname=t.tpl_module WHERE m.isactive GROUP BY m.mid HAVING tpl_count>0 ORDER BY m.weight,m.mid');
 
 // module loop
 while (list($name, $dirname, $count) = $db->fetchRow($mrs)) {
     if ($dirname == $current_dirname) {
         $adminmenu[] = array(
-            'selected' => true ,
-            'title' => $name . " ($count)" ,
+            'selected' => true,
+            'title' => $name." ($count)",
             'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$dirname
-        ) ;
+        );
         //$GLOBALS['altsysXoopsBreadcrumbs'][] = array( 'name' => htmlspecialchars( $name , ENT_QUOTES ) ) ;
     } else {
         $adminmenu[] = array(
-            'selected' => false ,
-            'title' => $name . " ($count)" ,
+            'selected' => false,
+            'title' => $name." ($count)",
             'link' => '?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$dirname
-        ) ;
+        );
     }
 }
 
 // display
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 $tpl->assign(array(
     'adminmenu' => $adminmenu,
     'mypage' => 'mytplsadmin'
-)) ;
-$tpl->display('db:altsys_inc_mymenusub.html') ;
+));
+$tpl->display('db:altsys_inc_mymenusub.html');

xoops_trust_path/libs/altsys/mytplsadmin.php

Indentation +1 added lines, -1 removed lines

@@ -354,7 +354,7 @@
                 $fingerprints[ $fingerprint ] = $class ;
             }
             echo "<td class='{$evenodd}{$class}'>".formatTimestamp($tpl['tpl_lastmodified'], 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='{$tplset4disp}_check[{$tpl_file}]' value='1' /> &nbsp; <a href='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) . '&amp;tpl_tplset='
-                 . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . htmlspecialchars($target_dirname, ENT_QUOTES) . "'>" . _EDIT . "</a> ($numrows)</td>\n" ;
+                    . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . htmlspecialchars($target_dirname, ENT_QUOTES) . "'>" . _EDIT . "</a> ($numrows)</td>\n" ;
         }
     }
 

Spacing +140 added lines, -140 removed lines

@@ -5,63 +5,63 @@ 
 //                      GIJOE <http://www.peak.ne.jp/>                       //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__.'/class/AltsysBreadcrumbs.class.php' ;
-include_once __DIR__ . '/include/gtickets.php';
-include_once __DIR__.'/include/altsys_functions.php' ;
-include_once __DIR__ . '/include/tpls_functions.php';
+require_once __DIR__.'/class/AltsysBreadcrumbs.class.php';
+include_once __DIR__.'/include/gtickets.php';
+include_once __DIR__.'/include/altsys_functions.php';
+include_once __DIR__.'/include/tpls_functions.php';
 
 
 // only groups have 'module_admin' of 'altsys' can do that.
-$module_handler = xoops_getHandler('module') ;
-$module = $module_handler->getByDirname('altsys') ;
-if (! is_object($module)) {
-    die('install altsys') ;
+$module_handler = xoops_getHandler('module');
+$module = $module_handler->getByDirname('altsys');
+if (!is_object($module)) {
+    die('install altsys');
 }
-$moduleperm_handler = xoops_getHandler('groupperm') ;
-if (! is_object(@$xoopsUser) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
-    die('only admin of altsys can access this area') ;
+$moduleperm_handler = xoops_getHandler('groupperm');
+if (!is_object(@$xoopsUser) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $xoopsUser->getGroups())) {
+    die('only admin of altsys can access this area');
 }
 
 
 // initials
 $db = XoopsDatabaseFactory::getDatabaseConnection();
-(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+(method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
 // language file
-altsys_include_language_file('mytplsadmin') ;
+altsys_include_language_file('mytplsadmin');
 
 // check $xoopsModule
-if (! is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM) ;
+if (!is_object($xoopsModule)) {
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // set target_module if specified by $_GET['dirname']
 $module_handler = xoops_getHandler('module');
-if (! empty($_GET['dirname'])) {
-    $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']) ;
-    $target_module = $module_handler->getByDirname($dirname) ;
+if (!empty($_GET['dirname'])) {
+    $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']);
+    $target_module = $module_handler->getByDirname($dirname);
 }
 
-if (! empty($target_module) && is_object($target_module)) {
+if (!empty($target_module) && is_object($target_module)) {
     // specified by dirname (for tplsadmin as an independent module)
-    $target_mid = $target_module->getVar('mid') ;
-    $target_dirname = $target_module->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $target_module->getVar('name') . '&nbsp;' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0) ;
+    $target_mid = $target_module->getVar('mid');
+    $target_dirname = $target_module->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $target_module->getVar('name').'&nbsp;'.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
     //$query4redirect = '?dirname='.urlencode(strip_tags($_GET['dirname'])) ;
 } elseif (@$_GET['dirname'] == '_custom') {
     // custom template
-    $target_mid = 0 ;
-    $target_dirname = '_custom' ;
-    $target_dirname4sql = '_custom' ;
-    $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE ;
+    $target_mid = 0;
+    $target_dirname = '_custom';
+    $target_dirname4sql = '_custom';
+    $target_mname = _MYTPLSADMIN_CUSTOMTEMPLATE;
     //$query4redirect = '' ;
 } else {
     // not specified by dirname (for 3rd party modules as mytplsadmin)
-    $target_mid = $xoopsModule->getVar('mid') ;
-    $target_dirname = $xoopsModule->getVar('dirname') ;
-    $target_dirname4sql = addslashes($target_dirname) ;
-    $target_mname = $xoopsModule->getVar('name') ;
+    $target_mid = $xoopsModule->getVar('mid');
+    $target_dirname = $xoopsModule->getVar('dirname');
+    $target_dirname4sql = addslashes($target_dirname);
+    $target_mname = $xoopsModule->getVar('name');
     //$query4redirect = '' ;
 }
 
@@ -71,129 +71,129 @@ 
 //**************//
 
 // Create new template set (blank or clone)
-if (! empty($_POST['clone_tplset_do']) && ! empty($_POST['clone_tplset_from']) && ! empty($_POST['clone_tplset_to'])) {
+if (!empty($_POST['clone_tplset_do']) && !empty($_POST['clone_tplset_from']) && !empty($_POST['clone_tplset_to'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $tplset_from = $myts->stripSlashesGPC($_POST['clone_tplset_from']) ;
-    $tplset_to = $myts->stripSlashesGPC($_POST['clone_tplset_to']) ;
+    $tplset_from = $myts->stripSlashesGPC($_POST['clone_tplset_from']);
+    $tplset_to = $myts->stripSlashesGPC($_POST['clone_tplset_to']);
     // check tplset_name "from" and "to"
-    if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_from'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname) ;
+    if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_from'])) {
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname);
     }
-    if (! preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_to'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname) ;
+    if (!preg_match('/^[0-9A-Za-z_-]{1,16}$/', $_POST['clone_tplset_to'])) {
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDSETNAME, $target_dirname);
     }
-    list($is_exist) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_to) . "'")) ;
+    list($is_exist) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_to)."'"));
     if ($is_exist) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname);
     }
-    list($is_exist) = $db->fetchRow($db->query('SELECT COUNT(*) FROM ' . $db->prefix('tplset') . " WHERE tplset_name='" . addslashes($tplset_to) . "'")) ;
+    list($is_exist) = $db->fetchRow($db->query('SELECT COUNT(*) FROM '.$db->prefix('tplset')." WHERE tplset_name='".addslashes($tplset_to)."'"));
     if ($is_exist) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_DUPLICATEDSETNAME, $target_dirname);
     }
     // insert tplset table
-    $db->query('INSERT INTO ' . $db->prefix('tplset') . " SET tplset_name='" . addslashes($tplset_to) . "', tplset_desc='Created by tplsadmin', tplset_created=UNIX_TIMESTAMP()") ;
-    tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_module='$target_dirname4sql'") ;
-    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-    exit ;
+    $db->query('INSERT INTO '.$db->prefix('tplset')." SET tplset_name='".addslashes($tplset_to)."', tplset_desc='Created by tplsadmin', tplset_created=UNIX_TIMESTAMP()");
+    tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_module='$target_dirname4sql'");
+    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+    exit;
 }
 
 // DB to DB template copy (checked templates)
 if (is_array(@$_POST['copy_do'])) {
     foreach ($_POST['copy_do'] as $tplset_from_tmp => $val) {
-        if (! empty($val)) {
+        if (!empty($val)) {
             // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp) ;
+            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp);
             if (empty($_POST['copy_to'][$tplset_from]) || $_POST['copy_to'][$tplset_from] == $tplset_from) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname);
             }
             if (empty($_POST["{$tplset_from}_check"])) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
             }
-            $tplset_to = $myts->stripSlashesGPC($_POST['copy_to'][$tplset_from]) ;
+            $tplset_to = $myts->stripSlashesGPC($_POST['copy_to'][$tplset_from]);
             foreach ($_POST["{$tplset_from}_check"] as $tplfile_tmp => $val) {
                 if (empty($val)) {
-                    continue ;
+                    continue;
                 }
-                $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-                tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_file='".addslashes($tplfile)."'") ;
+                $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+                tplsadmin_copy_templates_db2db($tplset_from, $tplset_to, "tpl_file='".addslashes($tplfile)."'");
             }
-            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-            exit ;
+            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+            exit;
         }
     }
 }
 
 // File to DB template copy (checked templates)
-if (! empty($_POST['copyf2db_do'])) {
+if (!empty($_POST['copyf2db_do'])) {
     // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
     if (empty($_POST['copyf2db_to'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_INVALIDTPLSET, $target_dirname);
     }
     if (empty($_POST['basecheck'])) {
-        tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+        tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
     }
-    $tplset_to = $myts->stripSlashesGPC($_POST['copyf2db_to']) ;
+    $tplset_to = $myts->stripSlashesGPC($_POST['copyf2db_to']);
     foreach ($_POST['basecheck'] as $tplfile_tmp => $val) {
         if (empty($val)) {
-            continue ;
+            continue;
         }
-        $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-        tplsadmin_copy_templates_f2db($tplset_to, "tpl_file='".addslashes($tplfile)."'") ;
+        $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+        tplsadmin_copy_templates_f2db($tplset_to, "tpl_file='".addslashes($tplfile)."'");
     }
-    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-    exit ;
+    redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+    exit;
 }
 
 // DB template remove (checked templates)
 if (is_array(@$_POST['del_do'])) {
     foreach ($_POST['del_do'] as $tplset_from_tmp => $val) {
-        if (! empty($val)) {
+        if (!empty($val)) {
             // Ticket Check
-    if (! $xoopsGTicket->check()) {
+    if (!$xoopsGTicket->check()) {
         redirect_header(XOOPS_URL.'/', 3, $xoopsGTicket->getErrors());
     }
 
-            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp) ;
+            $tplset_from = $myts->stripSlashesGPC($tplset_from_tmp);
             if ($tplset_from == 'default' && $target_dirname != '_custom') {
-                tplsadmin_die(_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_CANTREMOVEDEFAULT, $target_dirname);
             }
             if (empty($_POST["{$tplset_from}_check"])) {
-                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname) ;
+                tplsadmin_die(_MYTPLSADMIN_ERR_NOTPLFILE, $target_dirname);
             }
 
-            require_once XOOPS_ROOT_PATH.'/class/template.php' ;
+            require_once XOOPS_ROOT_PATH.'/class/template.php';
             $tpl = new XoopsTpl();
             $tpl->force_compile = true;
 
             foreach ($_POST["{$tplset_from}_check"] as $tplfile_tmp => $val) {
                 if (empty($val)) {
-                    continue ;
+                    continue;
                 }
-                $tplfile = $myts->stripSlashesGPC($tplfile_tmp) ;
-                $result = $db->query('SELECT tpl_id FROM ' . $db->prefix('tplfile') . " WHERE tpl_tplset='" . addslashes($tplset_from) . "' AND tpl_file='" . addslashes($tplfile) . "'") ;
+                $tplfile = $myts->stripSlashesGPC($tplfile_tmp);
+                $result = $db->query('SELECT tpl_id FROM '.$db->prefix('tplfile')." WHERE tpl_tplset='".addslashes($tplset_from)."' AND tpl_file='".addslashes($tplfile)."'");
                 while (list($tpl_id) = $db->fetchRow($result)) {
                     $tpl_id = (int)$tpl_id;
-                    $db->query('DELETE FROM ' . $db->prefix('tplfile') . " WHERE tpl_id=$tpl_id") ;
-                    $db->query('DELETE FROM ' . $db->prefix('tplsource') . " WHERE tpl_id=$tpl_id") ;
+                    $db->query('DELETE FROM '.$db->prefix('tplfile')." WHERE tpl_id=$tpl_id");
+                    $db->query('DELETE FROM '.$db->prefix('tplsource')." WHERE tpl_id=$tpl_id");
                 }
         // remove templates_c
         $tpl->clear_cache('db:'.$tplfile);
                 $tpl->clear_compiled_tpl('db:'.$tplfile);
             }
-            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED) ;
-            exit ;
+            redirect_header('?mode=admin&lib=altsys&page=mytplsadmin&dirname='.$target_dirname, 1, _MYTPLSADMIN_DBUPDATED);
+            exit;
         }
     }
 }
@@ -234,60 +234,60 @@ 
 EOD;
 
 // get tplsets
-$tplset_handler = xoops_getHandler('tplset') ;
-$tplsets = array_keys($tplset_handler->getList()) ;
-$sql = 'SELECT distinct tpl_tplset FROM ' . $db->prefix('tplfile') . " ORDER BY tpl_tplset='default' DESC,tpl_tplset" ;
+$tplset_handler = xoops_getHandler('tplset');
+$tplsets = array_keys($tplset_handler->getList());
+$sql = 'SELECT distinct tpl_tplset FROM '.$db->prefix('tplfile')." ORDER BY tpl_tplset='default' DESC,tpl_tplset";
 $srs = $db->query($sql);
 while (list($tplset) = $db->fetchRow($srs)) {
-    if (! in_array($tplset, $tplsets)) {
-        $tplsets[] = $tplset ;
+    if (!in_array($tplset, $tplsets)) {
+        $tplsets[] = $tplset;
     }
 }
 
-$tplsets_th4disp = '' ;
-$tplset_options = "<option value=''>----</option>\n" ;
+$tplsets_th4disp = '';
+$tplset_options = "<option value=''>----</option>\n";
 foreach ($tplsets as $tplset) {
-    $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES) ;
+    $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
     $active = $th_attr = '';
     if ($tplset == $xoopsConfig['template_set']) {
         $th_attr = "class='active dbtplset_active'";
         $active = '<sup>*</sup>';
     }
-    $tplsets_th4disp .= "<th $th_attr><input type='checkbox' title='"._MYTPLSADMIN_TITLE_CHECKALL."' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type==='checkbox'&&elements[i].name.indexOf('{$tplset4disp}_check')>=0){elements[i].checked=this.checked;}}}\" />{$active}DB-{$tplset4disp}</th>" ;
-    $tplset_options .= "<option value='$tplset4disp'>$tplset4disp</option>\n" ;
+    $tplsets_th4disp .= "<th $th_attr><input type='checkbox' title='"._MYTPLSADMIN_TITLE_CHECKALL."' onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type==='checkbox'&&elements[i].name.indexOf('{$tplset4disp}_check')>=0){elements[i].checked=this.checked;}}}\" />{$active}DB-{$tplset4disp}</th>";
+    $tplset_options .= "<option value='$tplset4disp'>$tplset4disp</option>\n";
 }
 
 // get tpl_file owned by the module
-$sql = 'SELECT tpl_file,tpl_desc,tpl_type,COUNT(tpl_id) FROM ' . $db->prefix('tplfile') . " WHERE tpl_module='$target_dirname4sql' GROUP BY tpl_file ORDER BY tpl_type, tpl_file" ;
+$sql = 'SELECT tpl_file,tpl_desc,tpl_type,COUNT(tpl_id) FROM '.$db->prefix('tplfile')." WHERE tpl_module='$target_dirname4sql' GROUP BY tpl_file ORDER BY tpl_type, tpl_file";
 $frs = $db->query($sql);
 
-xoops_cp_header() ;
+xoops_cp_header();
 
 // css display
-require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-$tpl = new D3Tpl() ;
+require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+$tpl = new D3Tpl();
 echo '<style scoped="scoped">';
-$tpl->display('db:altsys_inc_mytplsadmin.css') ;
+$tpl->display('db:altsys_inc_mytplsadmin.css');
 echo '</style>';
 
 // javascript
 echo $javascript;
 
 // mymenu
-altsys_include_mymenu() ;
+altsys_include_mymenu();
 
 // breadcrumbs
-$breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
+$breadcrumbsObj = AltsysBreadcrumbs::getInstance();
 if ($breadcrumbsObj->hasPaths()) {
-    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MI_ALTSYS_MENU_MYTPLSADMIN) ;
-    $breadcrumbsObj->appendPath('', $target_mname) ;
+    $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&amp;lib=altsys&amp;page=mytplsadmin', _MI_ALTSYS_MENU_MYTPLSADMIN);
+    $breadcrumbsObj->appendPath('', $target_mname);
 }
 
-echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MYTPLSADMIN_H3_MODULE." : $target_mname</h3>\n" ;
+echo "<h3 style='text-align:"._GLOBAL_LEFT.";'>"._MYTPLSADMIN_H3_MODULE." : $target_mname</h3>\n";
 
 // link to create a new custom template
 if ($target_dirname == '_custom') {
-    echo "<a href='index.php?mode=admin&lib=altsys&page=mytplsform&tpl_tplset=default'>"._MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE."</a>\n" ;
+    echo "<a href='index.php?mode=admin&lib=altsys&page=mytplsform&tpl_tplset=default'>"._MYTPLSADMIN_CREATENEWCUSTOMTEMPLATE."</a>\n";
 }
 
 // beggining of table & form
@@ -296,18 +296,18 @@ 
 	".$xoopsGTicket->getTicketHtml(__LINE__)."
 	<table class='outer altsys_mytplsadmin'>
 		<tr>
-            <th>"._MYTPLSADMIN_TH_NAME . '</th>
-            <th>' . _MYTPLSADMIN_TH_TYPE . "</th>
+            <th>"._MYTPLSADMIN_TH_NAME.'</th>
+            <th>' . _MYTPLSADMIN_TH_TYPE."</th>
 			<th><input type='checkbox' title="._MYTPLSADMIN_TITLE_CHECKALL." onclick=\"with(document.MainForm){for(i=0;i<length;i++){if(elements[i].type==='checkbox'&&elements[i].name.indexOf('basecheck')>=0){elements[i].checked=this.checked;}}}\" />"._MYTPLSADMIN_TH_FILE."</th>
 			$tplsets_th4disp
-		</tr>\n" ;
+		</tr>\n";
 
 // STYLE for distinguishing fingerprints
-$fingerprint_classes = array( '' , ' fingerprint1' , ' fingerprint2' , ' fingerprint3' , ' fingerprint4' , ' fingerprint5' , ' fingerprint6' , ' fingerprint7' ) ;
+$fingerprint_classes = array('', ' fingerprint1', ' fingerprint2', ' fingerprint3', ' fingerprint4', ' fingerprint5', ' fingerprint6', ' fingerprint7');
 
 // template ROWS
 while (list($tpl_file, $tpl_desc, $type, $count) = $db->fetchRow($frs)) {
-    $evenodd = @$evenodd == 'even' ? 'odd' : 'even' ;
+    $evenodd = @$evenodd == 'even' ? 'odd' : 'even';
     $fingerprints = array();
 
     // information about the template
@@ -315,64 +315,64 @@ 
 		<tr>
 			<td class='$evenodd'>
 				<dl>
-                    <dt>".htmlspecialchars($tpl_file, ENT_QUOTES) . '</dt>
-                    <dd>' . htmlspecialchars($tpl_desc, ENT_QUOTES) . "</dd>
+                    <dt>".htmlspecialchars($tpl_file, ENT_QUOTES).'</dt>
+                    <dd>' . htmlspecialchars($tpl_desc, ENT_QUOTES)."</dd>
 				</dl>
 			</td>
-            <td class='$evenodd'>".$type . '<br />(' . $count . ")</td>\n" ;
+            <td class='$evenodd'>".$type.'<br />('.$count.")</td>\n";
 
     // the base file template column
-    $basefilepath = tplsadmin_get_basefilepath($target_dirname, $type, $tpl_file) ;
+    $basefilepath = tplsadmin_get_basefilepath($target_dirname, $type, $tpl_file);
 
     if (file_exists($basefilepath)) {
-        $fingerprint = tplsadmin_get_fingerprint(file($basefilepath)) ;
-        $fingerprints[ $fingerprint ] = '' ;
-        echo "<td class='$evenodd'>".formatTimestamp(filemtime($basefilepath), 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='basecheck[$tpl_file]' value='1' /></td>\n" ;
-        $fingerprint_class_count = 0 ;
+        $fingerprint = tplsadmin_get_fingerprint(file($basefilepath));
+        $fingerprints[$fingerprint] = '';
+        echo "<td class='$evenodd'>".formatTimestamp(filemtime($basefilepath), 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='basecheck[$tpl_file]' value='1' /></td>\n";
+        $fingerprint_class_count = 0;
     } else {
-        echo "<td class='$evenodd'><br /></td>" ;
-        $fingerprint_class_count = -1 ;
+        echo "<td class='$evenodd'><br /></td>";
+        $fingerprint_class_count = -1;
     }
 
     // db template columns
     foreach ($tplsets as $tplset) {
-        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES) ;
+        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
 
         // query for templates in db
-        $drs = $db->query('SELECT * FROM ' . $db->prefix('tplfile') . ' f NATURAL LEFT JOIN ' . $db->prefix('tplsource') . " s WHERE tpl_file='" . addslashes($tpl_file) . "' AND tpl_tplset='" . addslashes($tplset) . "'") ;
-        $numrows = $db->getRowsNum($drs) ;
-        $tpl = $db->fetchArray($drs) ;
+        $drs = $db->query('SELECT * FROM '.$db->prefix('tplfile').' f NATURAL LEFT JOIN '.$db->prefix('tplsource')." s WHERE tpl_file='".addslashes($tpl_file)."' AND tpl_tplset='".addslashes($tplset)."'");
+        $numrows = $db->getRowsNum($drs);
+        $tpl = $db->fetchArray($drs);
         if (empty($tpl['tpl_id'])) {
-            echo "<td class='$evenodd'>($numrows)</td>\n" ;
+            echo "<td class='$evenodd'>($numrows)</td>\n";
         } else {
-            $fingerprint = tplsadmin_get_fingerprint(explode("\n", $tpl['tpl_source'])) ;
-            if (isset($fingerprints[ $fingerprint ])) {
-                $class = $fingerprints[ $fingerprint ] ;
+            $fingerprint = tplsadmin_get_fingerprint(explode("\n", $tpl['tpl_source']));
+            if (isset($fingerprints[$fingerprint])) {
+                $class = $fingerprints[$fingerprint];
             } else {
                 //$fingerprint_class_count ++ ;
-                $class = $fingerprint_classes[++$fingerprint_class_count] ;
-                $fingerprints[ $fingerprint ] = $class ;
+                $class = $fingerprint_classes[++$fingerprint_class_count];
+                $fingerprints[$fingerprint] = $class;
             }
-            echo "<td class='{$evenodd}{$class}'>".formatTimestamp($tpl['tpl_lastmodified'], 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='{$tplset4disp}_check[{$tpl_file}]' value='1' /> &nbsp; <a href='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES) . '&amp;tpl_tplset='
-                 . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES) . '&amp;dirname=' . htmlspecialchars($target_dirname, ENT_QUOTES) . "'>" . _EDIT . "</a> ($numrows)</td>\n" ;
+            echo "<td class='{$evenodd}{$class}'>".formatTimestamp($tpl['tpl_lastmodified'], 'm').'<br />'.substr($fingerprint, 0, 16)."<br /><input type='checkbox' name='{$tplset4disp}_check[{$tpl_file}]' value='1' /> &nbsp; <a href='?mode=admin&amp;lib=altsys&amp;page=mytplsform&amp;tpl_file=".htmlspecialchars($tpl['tpl_file'], ENT_QUOTES).'&amp;tpl_tplset='
+                 . htmlspecialchars($tpl['tpl_tplset'], ENT_QUOTES).'&amp;dirname='.htmlspecialchars($target_dirname, ENT_QUOTES)."'>"._EDIT."</a> ($numrows)</td>\n";
         }
     }
 
-    echo "</tr>\n" ;
+    echo "</tr>\n";
 }
 
 // command submit ROW
 echo "
 	<tr>
 		<td class='head'>
-            "._MYTPLSADMIN_CREATE_NEW_TPLSET . ': <br />
-            ' . _MYTPLSADMIN_CAPTION_BASE . ":
+            "._MYTPLSADMIN_CREATE_NEW_TPLSET.': <br />
+            ' . _MYTPLSADMIN_CAPTION_BASE.":
 			<select name='clone_tplset_from'>
 				$tplset_options
-                <option value='_blank_'>"._MYTPLSADMIN_OPT_BLANKSET . '</option>
+                <option value='_blank_'>"._MYTPLSADMIN_OPT_BLANKSET.'</option>
 			</select>
 			<br />
-            ' . _MYTPLSADMIN_CAPTION_SETNAME . ": <input type='text' name='clone_tplset_to' size='8' maxlength='16' /> <input type='submit' name='clone_tplset_do' value='" . _MYTPLSADMIN_BTN_NEWTPLSET . "' />
+            ' . _MYTPLSADMIN_CAPTION_SETNAME.": <input type='text' name='clone_tplset_to' size='8' maxlength='16' /> <input type='submit' name='clone_tplset_do' value='"._MYTPLSADMIN_BTN_NEWTPLSET."' />
 		</td>
 		<td class='head'></td>
 		<td class='head'>
@@ -385,21 +385,21 @@ 
 		</td>\n" ;
 
     foreach ($tplsets as $tplset) {
-        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES) ;
+        $tplset4disp = htmlspecialchars($tplset, ENT_QUOTES);
         echo "\t\t<td class='head'>
-            " . ($tplset == 'default' && $target_dirname != '_custom' ? '' : "<input name='del_do[{$tplset4disp}]' type='submit' value='" . _DELETE . "' onclick='return altsys_mytpladmin_check_copy_submit(\"" . _MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES . "\", \"{$tplset4disp}_\", false);' /><br /><br />") . '
-            ' . _MYTPLSADMIN_CAPTION_COPYTO . ":
+            " . ($tplset == 'default' && $target_dirname != '_custom' ? '' : "<input name='del_do[{$tplset4disp}]' type='submit' value='"._DELETE."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_DELETE_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", false);' /><br /><br />").'
+            ' . _MYTPLSADMIN_CAPTION_COPYTO.":
 			<select name='copy_to[{$tplset4disp}]'>
 				".str_replace('<option value=\''.$tplset4disp.'\'>'.$tplset4disp.'</option>', '', $tplset_options)."
 			</select>
 			<input name='copy_do[{$tplset4disp}]' type='submit' value='"._MYTPLSADMIN_BTN_COPY."' onclick='return altsys_mytpladmin_check_copy_submit(\""._MYTPLSADMIN_CNF_COPY_SELECTED_TEMPLATES."\", \"{$tplset4disp}_\", true);' />
-		</td>\n" ;
+		</td>\n";
     }
 
-echo "	</tr>\n" ;
+echo "	</tr>\n";
 
 
 echo '</table></form>';
 // end of table & form
 
-xoops_cp_footer() ;
+xoops_cp_footer();

xoops_trust_path/libs/altsys/smarty_plugins/resource.db.php

Spacing +3 added lines, -3 removed lines

@@ -77,12 +77,12 @@
     $type = $tplobj->getVar('tpl_type', 'n');
     $blockpath = ($type == 'block') ? 'blocks/' : '';
     // First, check for an overloaded version within the theme folder
-    $filepath = XOOPS_THEME_PATH . "/$theme/modules/$module/$blockpath$tpl_name";
+    $filepath = XOOPS_THEME_PATH."/$theme/modules/$module/$blockpath$tpl_name";
     if (!file_exists($filepath)) {
         // If no custom version exists, get the tpl from its default location
-        $filepath = XOOPS_ROOT_PATH . "/modules/$module/templates/$blockpath$tpl_name";
+        $filepath = XOOPS_ROOT_PATH."/modules/$module/templates/$blockpath$tpl_name";
         if (!file_exists($filepath)) {
-            return $cache[$tpl_name] = $tplobj ;
+            return $cache[$tpl_name] = $tplobj;
         }
     }
     return $cache[$tpl_name] = $filepath;

xoops_trust_path/libs/altsys/class/MyBlocksAdmin.class.php

Doc Comments +24 added lines

@@ -487,6 +487,12 @@ 
     }
 
 
+    /**
+     * @param integer $bside
+     * @param integer $bweight
+     * @param integer $bvisible
+     * @param integer $bcachetime
+     */
     public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options=array())
     {
         global $xoopsConfig;
@@ -645,6 +651,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_delete($bid)
     {
         $bid = (int)$bid;
@@ -670,6 +679,9 @@ 
     }
 
 //HACK add by domifara
+/**
+ * @param integer $bid
+ */
 public function do_deleteBlockReadGroupPerm($bid)
 {
     $bid = (int)$bid;
@@ -678,6 +690,9 @@ 
     $this->db->query($sql) ;
 }
 
+    /**
+     * @param integer $bid
+     */
     public function form_delete($bid)
     {
         $bid = (int)$bid;
@@ -707,6 +722,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_clone($bid)
     {
         $bid = (int)$bid;
@@ -785,6 +803,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function do_edit($bid)
     {
         $bid = (int)$bid;
@@ -828,6 +849,9 @@ 
     }
 
 
+    /**
+     * @param integer $bid
+     */
     public function form_edit($bid, $mode = 'edit')
     {
         $bid = (int)$bid;

Switch Indentation +66 added lines, -66 removed lines

@@ -307,30 +307,30 @@ 
         $scoln = 'disabled';
     } else {
         switch ($side) {
-        case XOOPS_SIDEBLOCK_LEFT:
-            $ssel0 = " checked='checked'";
-            $scol0 = 'selected';
-            break ;
-        case XOOPS_SIDEBLOCK_RIGHT:
-            $ssel1 = " checked='checked'";
-            $scol1 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_LEFT:
-            $ssel2 = " checked='checked'";
-            $scol2 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_RIGHT:
-            $ssel4 = " checked='checked'";
-            $scol4 = 'selected';
-            break ;
-        case XOOPS_CENTERBLOCK_CENTER:
-            $ssel3 = " checked='checked'";
-            $scol3 = 'selected';
-            break ;
-        default:
-            $value4extra_side = $side ;
-            $stextbox = 'selected';
-            break ;
+            case XOOPS_SIDEBLOCK_LEFT:
+                $ssel0 = " checked='checked'";
+                $scol0 = 'selected';
+                break ;
+            case XOOPS_SIDEBLOCK_RIGHT:
+                $ssel1 = " checked='checked'";
+                $scol1 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_LEFT:
+                $ssel2 = " checked='checked'";
+                $scol2 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_RIGHT:
+                $ssel4 = " checked='checked'";
+                $scol4 = 'selected';
+                break ;
+            case XOOPS_CENTERBLOCK_CENTER:
+                $ssel3 = " checked='checked'";
+                $scol3 = 'selected';
+                break ;
+            default:
+                $value4extra_side = $side ;
+                $stextbox = 'selected';
+                break ;
     }
     }
 
@@ -850,31 +850,31 @@ 
         }
 
         switch ($mode) {
-        case 'clone':
-            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
-            $next_op = 'clone_ok' ;
-            // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
-            break ;
-        case 'new':
-            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
-            $next_op = 'new_ok' ;
-            // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
-            break ;
-        case 'edit':
-        default:
-            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
-            $next_op = 'edit_ok' ;
-            // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
-            break ;
+            case 'clone':
+                $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
+                $next_op = 'clone_ok' ;
+                // breadcrumbs
+                $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
+                break ;
+            case 'new':
+                $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
+                $next_op = 'new_ok' ;
+                // breadcrumbs
+                $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
+                break ;
+            case 'edit':
+            default:
+                $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
+                $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
+                $next_op = 'edit_ok' ;
+                // breadcrumbs
+                $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
+                $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
+                break ;
     }
 
         $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
@@ -1050,23 +1050,23 @@ 
     {
         $bid = (int)(@$_GET['bid']);
         switch (@$_GET['op']) {
-        case 'clone':
-            $this->form_edit($bid, 'clone') ;
-            break ;
-        case 'new':
-        case 'edit':
-            $this->form_edit($bid, 'edit') ;
-            break ;
-        case 'delete':
-            $this->form_delete($bid) ;
-            break ;
-        case 'list':
-        default:
-            // the first form (blocks)
-            $this->list_blocks() ;
-            // the second form (groups)
-            $this->list_groups() ;
-            break ;
+            case 'clone':
+                $this->form_edit($bid, 'clone') ;
+                break ;
+            case 'new':
+            case 'edit':
+                $this->form_edit($bid, 'edit') ;
+                break ;
+            case 'delete':
+                $this->form_delete($bid) ;
+                break ;
+            case 'list':
+            default:
+                // the first form (blocks)
+                $this->list_blocks() ;
+                // the second form (groups)
+                $this->list_groups() ;
+                break ;
     }
     }
 }

Spacing +353 added lines, -353 removed lines

@@ -3,16 +3,16 @@ 
 
 class MyBlocksAdmin
 {
-    public $db ;
-    public $lang ;
-    public $cachetime_options = array() ;
-    public $ctype_options = array() ;
-    public $type_options = array() ;
-    public $target_mid = 0 ;
-    public $target_dirname = '' ;
-    public $target_mname = '' ;
-    public $block_configs = array() ;
-    public $preview_request = array() ;
+    public $db;
+    public $lang;
+    public $cachetime_options = array();
+    public $ctype_options = array();
+    public $type_options = array();
+    public $target_mid = 0;
+    public $target_dirname = '';
+    public $target_mname = '';
+    public $block_configs = array();
+    public $preview_request = array();
 
     public function MyBlocksAadmin()
     {
@@ -21,37 +21,37 @@ 
 
     public function construct()
     {
-        $this->db = XoopsDatabaseFactory::getDatabaseConnection() ;
-        $this->lang = @$GLOBALS['xoopsConfig']['language'] ;
+        $this->db = XoopsDatabaseFactory::getDatabaseConnection();
+        $this->lang = @$GLOBALS['xoopsConfig']['language'];
 
         $this->cachetime_options = array(
-        0 => _NOCACHE ,
-        30 => sprintf(_SECONDS, 30) ,
-        60 => _MINUTE ,
-        300 => sprintf(_MINUTES, 5) ,
-        1800 => sprintf(_MINUTES, 30) ,
-        3600 => _HOUR ,
-        18000 => sprintf(_HOURS, 5) ,
-        86400 => _DAY ,
-        259200 => sprintf(_DAYS, 3) ,
-        604800 => _WEEK ,
+        0 => _NOCACHE,
+        30 => sprintf(_SECONDS, 30),
+        60 => _MINUTE,
+        300 => sprintf(_MINUTES, 5),
+        1800 => sprintf(_MINUTES, 30),
+        3600 => _HOUR,
+        18000 => sprintf(_HOURS, 5),
+        86400 => _DAY,
+        259200 => sprintf(_DAYS, 3),
+        604800 => _WEEK,
         2592000 => _MONTH
     );
 
         $this->ctype_options = array(
-        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML ,
-        'T' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE ,
-        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ,
+        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML,
+        'T' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE,
+        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE,
         'P' => _MD_A_MYBLOCKSADMIN_CTYPE_PHP
-    ) ;
+    );
 
         $this->type_options = array(
-        'C' => 'custom block' ,
-        'E' => 'cloned custom block' ,
-        'M' => 'module\'s block' ,
-        'D' => 'cloned module\'s block' ,
+        'C' => 'custom block',
+        'E' => 'cloned custom block',
+        'M' => 'module\'s block',
+        'D' => 'cloned module\'s block',
         'S' => 'system block'
-    ) ;
+    );
     }
 
 //HACK by domifara for php5.3+
@@ -60,8 +60,8 @@ 
 {
     static $instance;
     if (!isset($instance)) {
-        $instance = new MyBlocksAdmin() ;
-        $instance->construct() ;
+        $instance = new MyBlocksAdmin();
+        $instance->construct();
     }
     return $instance;
 }
@@ -71,11 +71,11 @@ 
 public function checkPermission()
 {
     // only groups have 'module_admin' of 'altsys' can do that.
-    $module_handler = xoops_getHandler('module') ;
-    $module = $module_handler->getByDirname('altsys') ;
-    $moduleperm_handler = xoops_getHandler('groupperm') ;
-    if (! is_object(@$GLOBALS['xoopsUser']) || ! $moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
-        die('only admin of altsys can access this area') ;
+    $module_handler = xoops_getHandler('module');
+    $module = $module_handler->getByDirname('altsys');
+    $moduleperm_handler = xoops_getHandler('groupperm');
+    if (!is_object(@$GLOBALS['xoopsUser']) || !$moduleperm_handler->checkRight('module_admin', $module->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
+        die('only admin of altsys can access this area');
     }
 }
 
@@ -86,52 +86,52 @@ 
     if ($xoopsModule->getVar('dirname') == 'altsys') {
         // set target_module if specified by $_GET['dirname']
         $module_handler = xoops_getHandler('module');
-        if (! empty($_GET['dirname'])) {
-            $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']) ;
-            $target_module = $module_handler->getByDirname($dirname) ;
+        if (!empty($_GET['dirname'])) {
+            $dirname = preg_replace('/[^0-9a-zA-Z_-]/', '', $_GET['dirname']);
+            $target_module = $module_handler->getByDirname($dirname);
         }
 
         if (is_object(@$target_module)) {
             // module's blocks
-            $this->target_mid = $target_module->getVar('mid') ;
-            $this->target_mname = $target_module->getVar('name') . ' ' . sprintf('(%2.2f)', $target_module->getVar('version') / 100.0) ;
-            $this->target_dirname = $target_module->getVar('dirname') ;
-            $modinfo = $target_module->getInfo() ;
+            $this->target_mid = $target_module->getVar('mid');
+            $this->target_mname = $target_module->getVar('name').' '.sprintf('(%2.2f)', $target_module->getVar('version') / 100.0);
+            $this->target_dirname = $target_module->getVar('dirname');
+            $modinfo = $target_module->getInfo();
             // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN') ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, $this->target_mname) ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, $this->target_mname);
         } else {
             // custom blocks
-            $this->target_mid = 0 ;
-            $this->target_mname = _MI_ALTSYS_MENU_CUSTOMBLOCKS ;
-            $this->target_dirname = '__CustomBlocks__' ;
+            $this->target_mid = 0;
+            $this->target_mname = _MI_ALTSYS_MENU_CUSTOMBLOCKS;
+            $this->target_dirname = '__CustomBlocks__';
             // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN') ;
-            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, '_MI_ALTSYS_MENU_CUSTOMBLOCKS') ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', '_MI_ALTSYS_MENU_MYBLOCKSADMIN');
+            $breadcrumbsObj->appendPath(XOOPS_URL.'/modules/altsys/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, '_MI_ALTSYS_MENU_CUSTOMBLOCKS');
         }
     } else {
         // myblocksadmin as a library
-        $this->target_mid = $xoopsModule->getVar('mid') ;
-        $this->target_mname = $xoopsModule->getVar('name') . ' ' . sprintf('(%2.2f)', $xoopsModule->getVar('version') / 100.0) ;
-        $this->target_dirname = $xoopsModule->getVar('dirname') ;
-        $mod_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname') ;
-        $modinfo = $xoopsModule->getInfo() ;
-        $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $this->target_mname) ;
-        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', _MD_A_MYBLOCKSADMIN_BLOCKADMIN) ;
+        $this->target_mid = $xoopsModule->getVar('mid');
+        $this->target_mname = $xoopsModule->getVar('name').' '.sprintf('(%2.2f)', $xoopsModule->getVar('version') / 100.0);
+        $this->target_dirname = $xoopsModule->getVar('dirname');
+        $mod_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname');
+        $modinfo = $xoopsModule->getInfo();
+        $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+        $breadcrumbsObj->appendPath($mod_url.'/'.@$modinfo['adminindex'], $this->target_mname);
+        $breadcrumbsObj->appendPath($mod_url.'/admin/index.php?mode=admin&lib=altsys&page=myblocksadmin', _MD_A_MYBLOCKSADMIN_BLOCKADMIN);
     }
 
     // read xoops_version.php of the target
-    $this->block_configs = $this->get_block_configs() ;
+    $this->block_configs = $this->get_block_configs();
     }
 
 
 // virtual
 public function canEdit($block)
 {
-    return true ;
+    return true;
 }
 
 
@@ -140,9 +140,9 @@ 
 {
     // can delete if it is a cloned block
     if ($block->getVar('block_type') == 'D' || $block->getVar('block_type') == 'C') {
-        return true ;
+        return true;
     } else {
-        return false ;
+        return false;
     }
 }
 
@@ -155,23 +155,23 @@ 
 {
     // can clone link if it is marked as cloneable block
     if ($block->getVar('block_type') == 'D' || $block->getVar('block_type') == 'C') {
-        return 2 ;
+        return 2;
     } else {
         // $modversion['blocks'][n]['can_clone']
         foreach ($this->block_configs as $bconf) {
             if ($block->getVar('show_func') == @$bconf['show_func'] && $block->getVar('func_file') == @$bconf['file'] && (empty($bconf['template']) || $block->getVar('template') == @$bconf['template'])) {
-                if (! empty($bconf['can_clone'])) {
-                    return 2 ;
+                if (!empty($bconf['can_clone'])) {
+                    return 2;
                 }
             }
         }
     }
 
-    if (! empty($GLOBALS['altsysModuleConfig']['enable_force_clone'])) {
-        return 1 ;
+    if (!empty($GLOBALS['altsysModuleConfig']['enable_force_clone'])) {
+        return 1;
     }
 
-    return 0 ;
+    return 0;
 }
 
 
@@ -184,12 +184,12 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_getHandler('block');
-        $block = $handler->create(false) ;
-        $block->load($bid) ;
+        $block = $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
-    return $block->getOptions() ;
+    return $block->getOptions();
 }
 
 
@@ -202,16 +202,16 @@ 
     // get selected targets
     if (is_array(@$block_data['bmodule'])) {
         // bmodule origined from request (preview etc.)
-        $selected_mids = $block_data['bmodule'] ;
+        $selected_mids = $block_data['bmodule'];
     } else {
         // origined from the table of `block_module_link`
-        $result = $this->db->query('SELECT module_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'") ;
+        $result = $this->db->query('SELECT module_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_mids = array();
         while (list($selected_mid) = $this->db->fetchRow($result)) {
             $selected_mids[] = (int)$selected_mid;
         }
         if (empty($selected_mids)) {
-            $selected_mids = array( 0 ) ;
+            $selected_mids = array(0);
         } // all pages
     }
 
@@ -220,25 +220,25 @@ 
     $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
     $criteria->add(new Criteria('isactive', 1));
     $module_list = $module_handler->getList($criteria);
-    $module_list= array( -1 => _MD_A_MYBLOCKSADMIN_TOPPAGE , 0 => _MD_A_MYBLOCKSADMIN_ALLPAGES ) + $module_list ;
+    $module_list = array( -1 => _MD_A_MYBLOCKSADMIN_TOPPAGE, 0 => _MD_A_MYBLOCKSADMIN_ALLPAGES ) + $module_list;
 
     // build options
-    $module_options = '' ;
+    $module_options = '';
     foreach ($module_list as $mid => $mname) {
-        $mname = htmlspecialchars($mname) ;
+        $mname = htmlspecialchars($mname);
         if (in_array($mid, $selected_mids)) {
-            $module_options .= "<option value='$mid' selected='selected'>$mname</option>\n" ;
+            $module_options .= "<option value='$mid' selected='selected'>$mname</option>\n";
         } else {
-            $module_options .= "<option value='$mid'>$mname</option>\n" ;
+            $module_options .= "<option value='$mid'>$mname</option>\n";
         }
     }
 
     $ret = "
 				<select name='bmodules[$bid][]' size='5' multiple='multiple'>
 					$module_options
-				</select>" ;
+				</select>";
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -251,41 +251,41 @@ 
     // get selected targets
     if (is_array(@$block_data['bgroup'])) {
         // bgroup origined from request (preview etc.)
-        $selected_gids = $block_data['bgroup'] ;
+        $selected_gids = $block_data['bgroup'];
     } else {
         // origined from the table of `group_perm`
-        $result = $this->db->query('SELECT gperm_groupid FROM ' . $this->db->prefix('group_permission') . " WHERE gperm_itemid='$bid' AND gperm_name='block_read'") ;
+        $result = $this->db->query('SELECT gperm_groupid FROM '.$this->db->prefix('group_permission')." WHERE gperm_itemid='$bid' AND gperm_name='block_read'");
         $selected_gids = array();
         while (list($selected_gid) = $this->db->fetchRow($result)) {
             $selected_gids[] = (int)$selected_gid;
         }
         if ($bid == 0 && empty($selected_gids)) {
-            $selected_gids = $GLOBALS['xoopsUser']->getGroups() ;
+            $selected_gids = $GLOBALS['xoopsUser']->getGroups();
         }
     }
 
     // get all targets
     $group_handler = xoops_getHandler('group');
-    $groups = $group_handler->getObjects() ;
+    $groups = $group_handler->getObjects();
 
     // build options
-    $group_options = '' ;
+    $group_options = '';
     foreach ($groups as $group) {
-        $gid = $group->getVar('groupid') ;
-        $gname = $group->getVar('name', 's') ;
+        $gid = $group->getVar('groupid');
+        $gname = $group->getVar('name', 's');
         if (in_array($gid, $selected_gids)) {
-            $group_options .= "<option value='$gid' selected='selected'>$gname</option>\n" ;
+            $group_options .= "<option value='$gid' selected='selected'>$gname</option>\n";
         } else {
-            $group_options .= "<option value='$gid'>$gname</option>\n" ;
+            $group_options .= "<option value='$gid'>$gname</option>\n";
         }
     }
 
     $ret = "
 				<select name='bgroups[$bid][]' size='5' multiple='multiple'>
 					$group_options
-				</select>" ;
+				</select>";
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -300,7 +300,7 @@ 
     $sseln = $ssel0 = $ssel1 = $ssel2 = $ssel3 = $ssel4 = '';
     $scoln = $scol0 = $scol1 = $scol2 = $scol3 = $scol4 = 'unselected';
     $stextbox = 'unselected';
-    $value4extra_side = '' ;
+    $value4extra_side = '';
 
     if ($visible != 1) {
         $sseln = " checked='checked'";
@@ -310,27 +310,27 @@ 
         case XOOPS_SIDEBLOCK_LEFT:
             $ssel0 = " checked='checked'";
             $scol0 = 'selected';
-            break ;
+            break;
         case XOOPS_SIDEBLOCK_RIGHT:
             $ssel1 = " checked='checked'";
             $scol1 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_LEFT:
             $ssel2 = " checked='checked'";
             $scol2 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_RIGHT:
             $ssel4 = " checked='checked'";
             $scol4 = 'selected';
-            break ;
+            break;
         case XOOPS_CENTERBLOCK_CENTER:
             $ssel3 = " checked='checked'";
             $scol3 = 'selected';
-            break ;
+            break;
         default:
-            $value4extra_side = $side ;
+            $value4extra_side = $side;
             $stextbox = 'selected';
-            break ;
+            break;
     }
     }
 
@@ -360,7 +360,7 @@ 
 				<div class='blockposition $scoln'>
 					<input type='radio' name='sides[$bid]' value='-1' class='blockposition' $sseln onclick='document.getElementById(\"extra_side_$bid\").value=-1;' />
 				</div>
-                <div style='float:"._GLOBAL_LEFT.";'>"._NONE . '</div>
+                <div style='float:"._GLOBAL_LEFT.";'>"._NONE.'</div>
     ';
 }
 
@@ -368,58 +368,58 @@ 
 // public
 public function list_blocks()
 {
-    global $xoopsGTicket ;
+    global $xoopsGTicket;
 
     // main query
-    $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . " WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight" ;
-    $result = $this->db->query($sql) ;
-    $block_arr = array() ;
+    $sql = 'SELECT * FROM '.$this->db->prefix('newblocks')." WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
+    $result = $this->db->query($sql);
+    $block_arr = array();
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler = xoops_getHandler('block');//add
+        $handler = xoops_getHandler('block'); //add
     }
     while ($myrow = $this->db->fetchArray($result)) {
 
 //HACK by domifara
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $block_one = $handler->create(false) ;
+            $block_one = $handler->create(false);
             $block_one->assignVars($myrow);
-            $block_arr[] =& $block_one ;
+            $block_arr[] = & $block_one;
         } else {
-            $block_arr[] = new XoopsBlock($myrow) ;
+            $block_arr[] = new XoopsBlock($myrow);
         }
     }
     if (empty($block_arr)) {
-        return ;
+        return;
     }
 
     // blocks rendering loop
-    $blocks4assign = array() ;
+    $blocks4assign = array();
     foreach ($block_arr as $i => $block) {
         $block_data = array(
             'bid' => (int)$block->getVar('bid'),
-            'name' => $block->getVar('name', 'n') ,
-            'title' => $block->getVar('title', 'n') ,
+            'name' => $block->getVar('name', 'n'),
+            'title' => $block->getVar('title', 'n'),
             'weight' => (int)$block->getVar('weight'),
             'bcachetime' => (int)$block->getVar('bcachetime'),
             'side' => (int)$block->getVar('side'),
             'visible' => (int)$block->getVar('visible'),
-            'can_edit' => $this->canEdit($block) ,
-            'can_delete' => $this->canDelete($block) ,
+            'can_edit' => $this->canEdit($block),
+            'can_delete' => $this->canDelete($block),
             'can_clone' => $this->canClone($block)
-        ) ;
+        );
         $blocks4assign[] = array(
-            'name_raw' => $block_data['name'] ,
-            'title_raw' => $block_data['title'] ,
-            'cell_position' => $this->renderCell4BlockPosition($block_data) ,
-            'cell_module_link' =>  $this->renderCell4BlockModuleLink($block_data) ,
+            'name_raw' => $block_data['name'],
+            'title_raw' => $block_data['title'],
+            'cell_position' => $this->renderCell4BlockPosition($block_data),
+            'cell_module_link' =>  $this->renderCell4BlockModuleLink($block_data),
             'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data)
-        ) + $block_data ;
+        ) + $block_data;
     }
 
     // display
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-    $tpl = new D3Tpl() ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+    $tpl = new D3Tpl();
     $tpl->assign(array(
         'target_mid' => $this->target_mid,
         'target_dirname' => $this->target_dirname,
@@ -428,22 +428,22 @@ 
         'cachetime_options' => $this->cachetime_options,
         'blocks' => $blocks4assign,
         'gticket_hidden' => $xoopsGTicket->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
-    $tpl->display('db:altsys_main_myblocksadmin_list.html') ;
+    ));
+    $tpl->display('db:altsys_main_myblocksadmin_list.html');
 }
 
 
     public function get_block_configs()
     {
         if ($this->target_mid <= 0) {
-            return array() ;
+            return array();
         }
-        include XOOPS_ROOT_PATH.'/modules/'.$this->target_dirname.'/xoops_version.php' ;
+        include XOOPS_ROOT_PATH.'/modules/'.$this->target_dirname.'/xoops_version.php';
 
         if (empty($modversion['blocks'])) {
-            return array() ;
+            return array();
         } else {
-            return $modversion['blocks'] ;
+            return $modversion['blocks'];
         }
     }
 
@@ -451,51 +451,51 @@ 
     public function list_groups()
     {
         // query for getting blocks
-    $sql = 'SELECT * FROM ' . $this->db->prefix('newblocks') . " WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight" ;
-        $result = $this->db->query($sql) ;
-        $block_arr = array() ;
+    $sql = 'SELECT * FROM '.$this->db->prefix('newblocks')." WHERE mid='$this->target_mid' ORDER BY visible DESC,side,weight";
+        $result = $this->db->query($sql);
+        $block_arr = array();
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $handler = xoops_getHandler('block');//add
+        $handler = xoops_getHandler('block'); //add
     }
         while ($myrow = $this->db->fetchArray($result)) {
             //HACK by domifara
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $block_one = $handler->create(false) ;
+            $block_one = $handler->create(false);
             $block_one->assignVars($myrow);
-            $block_arr[] =& $block_one ;
+            $block_arr[] = & $block_one;
         } else {
-            $block_arr[] = new XoopsBlock($myrow) ;
+            $block_arr[] = new XoopsBlock($myrow);
         }
         }
 
-        $item_list = array() ;
+        $item_list = array();
         foreach (array_keys($block_arr) as $i) {
-            $item_list[ $block_arr[$i]->getVar('bid') ] = $block_arr[$i]->getVar('title') ;
+            $item_list[$block_arr[$i]->getVar('bid')] = $block_arr[$i]->getVar('title');
         }
 
-        $form = new MyXoopsGroupPermForm(_MD_A_MYBLOCKSADMIN_PERMFORM, 1, 'block_read', '') ;
+        $form = new MyXoopsGroupPermForm(_MD_A_MYBLOCKSADMIN_PERMFORM, 1, 'block_read', '');
     // skip system (TODO)
     if ($this->target_mid > 1) {
-        $form->addAppendix('module_admin', $this->target_mid, $this->target_mname . ' ' . _MD_A_MYBLOCKSADMIN_PERM_MADMIN) ;
-        $form->addAppendix('module_read', $this->target_mid, $this->target_mname .' ' . _MD_A_MYBLOCKSADMIN_PERM_MREAD) ;
+        $form->addAppendix('module_admin', $this->target_mid, $this->target_mname.' '._MD_A_MYBLOCKSADMIN_PERM_MADMIN);
+        $form->addAppendix('module_read', $this->target_mid, $this->target_mname.' '._MD_A_MYBLOCKSADMIN_PERM_MREAD);
     }
         foreach ($item_list as $item_id => $item_name) {
-            $form->addItem($item_id, $item_name) ;
+            $form->addItem($item_id, $item_name);
         }
-        echo $form->render() ;
+        echo $form->render();
     }
 
 
-    public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options=array())
+    public function update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $options = array())
     {
         global $xoopsConfig;
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_getHandler('block');
-        $block = $handler->create(false) ;
-        $block->load($bid) ;
+        $block = $handler->create(false);
+        $block->load($bid);
     } else {
         $block = new XoopsBlock($bid);
     }
@@ -514,10 +514,10 @@ 
         }
         $block->setVar('bcachetime', $bcachetime);
         if (is_array($options) && count($options) > 0) {
-            $block->setVar('options', implode('|', $options)) ;
+            $block->setVar('options', implode('|', $options));
         }
         if ($block->getVar('block_type') == 'C') {
-            $name = $this->get_blockname_from_ctype($block->getVar('c_type')) ;
+            $name = $this->get_blockname_from_ctype($block->getVar('c_type'));
             $block->setVar('name', $name);
         }
         $msg = _MD_A_MYBLOCKSADMIN_DBUPDATED;
@@ -541,7 +541,7 @@ 
         } else {
             $msg = 'Failed update of block. ID:'.$bid;
         }
-        return $msg ;
+        return $msg;
     }
 
 
@@ -549,14 +549,14 @@ 
 public function updateBlockModuleLink($bid, $bmodules)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('block_module_link') ;
+    $table = $this->db->prefix('block_module_link');
 
-    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid";
+    $this->db->query($sql);
     foreach ($bmodules as $mid) {
         $mid = (int)$mid;
-        $sql = "INSERT INTO `$table` (`block_id`,`module_id`) VALUES ($bid,$mid)" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`block_id`,`module_id`) VALUES ($bid,$mid)";
+        $this->db->query($sql);
     }
 }
 
@@ -565,83 +565,83 @@ 
 public function updateBlockReadGroupPerm($bid, $req_gids)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('group_permission') ;
-    $req_gids = array_map('intval', $req_gids) ;
-    sort($req_gids) ;
+    $table = $this->db->prefix('group_permission');
+    $req_gids = array_map('intval', $req_gids);
+    sort($req_gids);
 
     // compare group ids from request and the records.
-    $sql = "SELECT `gperm_groupid` FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $result = $this->db->query($sql) ;
-    $db_gids = array() ;
+    $sql = "SELECT `gperm_groupid` FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $result = $this->db->query($sql);
+    $db_gids = array();
     while (list($gid) = $this->db->fetchRow($result)) {
-        $db_gids[] = $gid ;
+        $db_gids[] = $gid;
     }
-    $db_gids = array_map('intval', $db_gids) ;
-    sort($db_gids) ;
+    $db_gids = array_map('intval', $db_gids);
+    sort($db_gids);
 
     // if they are identical, just return (prevent increase of gperm_id)
     if (serialize($req_gids) == serialize($db_gids)) {
-        return ;
+        return;
     }
 
-    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $this->db->query($sql);
     foreach ($req_gids as $gid) {
         $gid = (int)$gid;
-        $sql = "INSERT INTO `$table` (`gperm_groupid`,`gperm_itemid`,`gperm_modid`,`gperm_name`) VALUES ($gid,$bid,1,'block_read')" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`gperm_groupid`,`gperm_itemid`,`gperm_modid`,`gperm_name`) VALUES ($gid,$bid,1,'block_read')";
+        $this->db->query($sql);
     }
 }
 
 
     public function do_order()
     {
-        $sides = is_array(@$_POST['sides']) ? $_POST['sides'] : array() ;
+        $sides = is_array(@$_POST['sides']) ? $_POST['sides'] : array();
         foreach (array_keys($sides) as $bid) {
-            $request = $this->fetchRequest4Block($bid) ;
+            $request = $this->fetchRequest4Block($bid);
 
         // update the block
-        $this->update_block($request['bid'], $request['side'], $request['weight'], $request['visible'], $request['title'], null, null, $request['bcachetime'], array()) ;
+        $this->update_block($request['bid'], $request['side'], $request['weight'], $request['visible'], $request['title'], null, null, $request['bcachetime'], array());
 
         // block_module_link update
-        $this->updateBlockModuleLink($bid, $request['bmodule']) ;
+        $this->updateBlockModuleLink($bid, $request['bmodule']);
 
         // group_permission update
-        $this->updateBlockReadGroupPerm($bid, $request['bgroup']) ;
+        $this->updateBlockReadGroupPerm($bid, $request['bgroup']);
         }
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 
     public function fetchRequest4Block($bid)
     {
         $bid = (int)$bid;
-        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance() ;
+        (method_exists('MyTextSanitizer', 'sGetInstance') and $myts = MyTextSanitizer::sGetInstance()) || $myts = MyTextSanitizer::getInstance();
 
         if (@$_POST['extra_sides'][$bid] > 0) {
             $_POST['sides'][$bid] = (int)$_POST['extra_sides'][$bid];
         }
 
         if (@$_POST['sides'][$bid] < 0) {
-            $visible = 0 ;
-            $_POST['sides'][$bid] = -1 ;
+            $visible = 0;
+            $_POST['sides'][$bid] = -1;
         } else {
-            $visible = 1 ;
+            $visible = 1;
         }
 
         return array(
-        'bid' => $bid ,
+        'bid' => $bid,
             'side' => (int)(@$_POST['sides'][$bid]),
             'weight' => (int)(@$_POST['weights'][$bid]),
-        'visible' => $visible ,
-        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]) ,
-        'content' => $myts->stripSlashesGPC(@$_POST['contents'][$bid]) ,
-        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]) ,
+        'visible' => $visible,
+        'title' => $myts->stripSlashesGPC(@$_POST['titles'][$bid]),
+        'content' => $myts->stripSlashesGPC(@$_POST['contents'][$bid]),
+        'ctype' => preg_replace('/[^A-Z]/', '', @$_POST['ctypes'][$bid]),
             'bcachetime' => (int)(@$_POST['bcachetimes'][$bid]),
-        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array( 0 ) ,
-        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array() ,
+        'bmodule' => is_array(@$_POST['bmodules'][$bid]) ? $_POST['bmodules'][$bid] : array(0),
+        'bgroup' => is_array(@$_POST['bgroups'][$bid]) ? $_POST['bgroups'][$bid] : array(),
         'options' => is_array(@$_POST['options'][$bid]) ? $_POST['options'][$bid] : array()
-    ) ;
+    );
     }
 
 
@@ -652,30 +652,30 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_getHandler('block');
-        $block = $handler->create(false) ;
-        $block->load($bid) ;
+        $block = $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! is_object($block)) {
-            die('Invalid bid') ;
+        if (!is_object($block)) {
+            die('Invalid bid');
         }
-        if (! $this->canDelete($block)) {
-            die('Cannot delete this block') ;
+        if (!$this->canDelete($block)) {
+            die('Cannot delete this block');
         }
         $this->do_deleteBlockReadGroupPerm($bid); //HACK add by domifara
-    $block->delete() ;
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+    $block->delete();
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 //HACK add by domifara
 public function do_deleteBlockReadGroupPerm($bid)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('group_permission') ;
-    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid" ;
-    $this->db->query($sql) ;
+    $table = $this->db->prefix('group_permission');
+    $sql = "DELETE FROM `$table` WHERE gperm_name='block_read' AND `gperm_itemid`=$bid";
+    $this->db->query($sql);
 }
 
     public function form_delete($bid)
@@ -686,24 +686,24 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_getHandler('block');
-        $block = $handler->create(false) ;
-        $block->load($bid) ;
+        $block = $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! is_object($block)) {
-            die('Invalid bid') ;
+        if (!is_object($block)) {
+            die('Invalid bid');
         }
-        if (! $this->canDelete($block)) {
-            die('Cannot delete this block') ;
+        if (!$this->canDelete($block)) {
+            die('Cannot delete this block');
         }
 
     // breadcrumbs
-    $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-        $breadcrumbsObj->appendPath('', _DELETE) ;
+    $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+        $breadcrumbsObj->appendPath('', _DELETE);
 
-        xoops_confirm(array( 'op' => 'delete_ok' ) + $GLOBALS['xoopsGTicket']->getTicketArray(__LINE__, 1800, 'myblocksadmin'), "?mode=admin&amp;lib=altsys&amp;page=myblocksadmin&amp;dirname=$this->target_dirname&amp;bid=$bid", sprintf(_MD_A_MYBLOCKSADMIN_FMT_REMOVEBLOCK, $block->getVar('title'))) ;
+        xoops_confirm(array('op' => 'delete_ok') + $GLOBALS['xoopsGTicket']->getTicketArray(__LINE__, 1800, 'myblocksadmin'), "?mode=admin&amp;lib=altsys&amp;page=myblocksadmin&amp;dirname=$this->target_dirname&amp;bid=$bid", sprintf(_MD_A_MYBLOCKSADMIN_FMT_REMOVEBLOCK, $block->getVar('title')));
     }
 
 
@@ -711,30 +711,30 @@ 
     {
         $bid = (int)$bid;
 
-        $request = $this->fetchRequest4Block($bid) ;
+        $request = $this->fetchRequest4Block($bid);
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_getHandler('block');
-        $block = $handler->create(false) ;
-        $block->load($bid) ;
+        $block = $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! $block->getVar('bid')) {
-            die('Invalid bid') ;
+        if (!$block->getVar('bid')) {
+            die('Invalid bid');
         }
-        if (! $this->canClone($block)) {
-            die('Invalid block_type') ;
+        if (!$this->canClone($block)) {
+            die('Invalid block_type');
         }
 
         if (empty($_POST['options'])) {
-            $options = array() ;
+            $options = array();
         } elseif (is_array($_POST['options'])) {
-            $options = $_POST['options'] ;
+            $options = $_POST['options'];
         } else {
-            $options = explode('|', $_POST['options']) ;
+            $options = explode('|', $_POST['options']);
         }
 
     // for backward compatibility
@@ -742,46 +742,46 @@ 
 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $cblock = $handler->create(false) ;
+        $cblock = $handler->create(false);
     } else {
-        $cblock = new XoopsBlock() ;
+        $cblock = new XoopsBlock();
     }
 
         foreach ($block->vars as $k => $v) {
-            $cblock->assignVar($k, $v['value']) ;
+            $cblock->assignVar($k, $v['value']);
         }
         $cblock->setNew();
         $cblock->setVar('bid', 0);
         $cblock->setVar('block_type', $block->getVar('block_type') == 'C' ? 'C' : 'D');
-        $cblock->setVar('func_num', $this->find_func_num_vacancy($block->getVar('mid'))) ;
+        $cblock->setVar('func_num', $this->find_func_num_vacancy($block->getVar('mid')));
     // store the block into DB as a new one
-    $newbid = $cblock->store() ;
-        if (! $newbid) {
-            return $cblock->getHtmlErrors() ;
+    $newbid = $cblock->store();
+        if (!$newbid) {
+            return $cblock->getHtmlErrors();
         }
 
     // update the block by the request
-    $this->update_block($newbid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array()) ;
+    $this->update_block($newbid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array());
 
     // block_module_link update
-    $this->updateBlockModuleLink($newbid, $request['bmodule']) ;
+    $this->updateBlockModuleLink($newbid, $request['bmodule']);
 
     // group_permission update
-    $this->updateBlockReadGroupPerm($newbid, $request['bgroup']) ;
+    $this->updateBlockReadGroupPerm($newbid, $request['bgroup']);
 
-        return _MD_A_MYBLOCKSADMIN_DBUPDATED ;
+        return _MD_A_MYBLOCKSADMIN_DBUPDATED;
     }
 
 
     public function find_func_num_vacancy($mid)
     {
-        $func_num = 256 ;
+        $func_num = 256;
         do {
-            $func_num -- ;
-            list($count) = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM ' . $this->db->prefix('newblocks') . ' WHERE mid=' . (int)$mid . ' AND func_num=' . $func_num)) ;
-        } while ($count > 0) ;
+            $func_num--;
+            list($count) = $this->db->fetchRow($this->db->query('SELECT COUNT(*) FROM '.$this->db->prefix('newblocks').' WHERE mid='.(int)$mid.' AND func_num='.$func_num));
+        } while ($count > 0);
 
-        return $func_num > 128 ? $func_num : 255 ;
+        return $func_num > 128 ? $func_num : 255;
     }
 
 
@@ -795,36 +795,36 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_getHandler('block');
-        $new_block = $handler->create(false) ;
+        $new_block = $handler->create(false);
     } else {
-        $new_block = new XoopsBlock() ;
+        $new_block = new XoopsBlock();
     }
 
-            $new_block->setNew() ;
-            $new_block->setVar('name', $this->get_blockname_from_ctype('C')) ;
-            $new_block->setVar('block_type', 'C') ;
-            $new_block->setVar('func_num', 0) ;
-            $bid = $new_block->store() ;
-            $request = $this->fetchRequest4Block(0) ;
+            $new_block->setNew();
+            $new_block->setVar('name', $this->get_blockname_from_ctype('C'));
+            $new_block->setVar('block_type', 'C');
+            $new_block->setVar('func_num', 0);
+            $bid = $new_block->store();
+            $request = $this->fetchRequest4Block(0);
         // permission copy
         foreach ($GLOBALS['xoopsUser']->getGroups() as $gid) {
-            $sql = 'INSERT INTO ' . $this->db->prefix('group_permission') . " (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $bid, 1, 'block_read')";
+            $sql = 'INSERT INTO '.$this->db->prefix('group_permission')." (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ($gid, $bid, 1, 'block_read')";
             $this->db->query($sql);
         }
         } else {
-            $request = $this->fetchRequest4Block($bid) ;
+            $request = $this->fetchRequest4Block($bid);
         }
 
     // update the block by the request
-    $msg = $this->update_block($bid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array()) ;
+    $msg = $this->update_block($bid, $request['side'], $request['weight'], $request['visible'], $request['title'], $request['content'], $request['ctype'], $request['bcachetime'], is_array(@$_POST['options']) ? $_POST['options'] : array());
 
     // block_module_link update
-    $this->updateBlockModuleLink($bid, $request['bmodule']) ;
+    $this->updateBlockModuleLink($bid, $request['bmodule']);
 
     // group_permission update
-    $this->updateBlockReadGroupPerm($bid, $request['bgroup']) ;
+    $this->updateBlockReadGroupPerm($bid, $request['bgroup']);
 
-        return $msg ;
+        return $msg;
     }
 
 
@@ -835,57 +835,57 @@ 
 //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
         $handler = xoops_getHandler('block');
-        $block = $handler->create(false) ;
-        $block->load($bid) ;
+        $block = $handler->create(false);
+        $block->load($bid);
     } else {
-        $block = new XoopsBlock($bid) ;
+        $block = new XoopsBlock($bid);
     }
 
-        if (! $block->getVar('bid')) {
+        if (!$block->getVar('bid')) {
             // new defaults
-        $bid = 0 ;
-            $mode = 'new' ;
-            $block->setVar('mid', 0) ;
-            $block->setVar('block_type', 'C') ;
+        $bid = 0;
+            $mode = 'new';
+            $block->setVar('mid', 0);
+            $block->setVar('block_type', 'C');
         }
 
         switch ($mode) {
         case 'clone':
-            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE ;
-            $next_op = 'clone_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_CLONEFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_CLONE;
+            $next_op = 'clone_ok';
             // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM) ;
-            break ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_CLONEFORM);
+            break;
         case 'new':
-            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW ;
-            $next_op = 'new_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_NEWFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_NEW;
+            $next_op = 'new_ok';
             // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM) ;
-            break ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_NEWFORM);
+            break;
         case 'edit':
         default:
-            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM ;
-            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT ;
-            $next_op = 'edit_ok' ;
+            $form_title = _MD_A_MYBLOCKSADMIN_EDITFORM;
+            $button_value = _MD_A_MYBLOCKSADMIN_BTN_EDIT;
+            $next_op = 'edit_ok';
             // breadcrumbs
-            $breadcrumbsObj = AltsysBreadcrumbs::getInstance() ;
-            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM) ;
-            break ;
+            $breadcrumbsObj = AltsysBreadcrumbs::getInstance();
+            $breadcrumbsObj->appendPath('', _MD_A_MYBLOCKSADMIN_EDITFORM);
+            break;
     }
 
-        $is_custom = in_array($block->getVar('block_type'), array( 'C', 'E' )) ? true : false ;
-        $block_template =& $block->getVar('template', 'n') ;
-        $block_template_tplset = '' ;
+        $is_custom = in_array($block->getVar('block_type'), array('C', 'E')) ? true : false;
+        $block_template = & $block->getVar('template', 'n');
+        $block_template_tplset = '';
 
-        if (! $is_custom && $block_template) {
+        if (!$is_custom && $block_template) {
             // find template of the block
         $tplfile_handler = xoops_getHandler('tplfile');
-            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template) ;
-            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default' ;
+            $found_templates = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', null, null, $block_template);
+            $block_template_tplset = count($found_templates) > 0 ? $GLOBALS['xoopsConfig']['template_set'] : 'default';
         }
 //HACK by domifara
 /*
@@ -894,43 +894,43 @@ 
     }
 */
     $block_data = $this->preview_request + array(
-        'bid' => $bid ,
-        'name' => $block->getVar('name', 'n') ,
-        'title' => $block->getVar('title', 'n') ,
+        'bid' => $bid,
+        'name' => $block->getVar('name', 'n'),
+        'title' => $block->getVar('title', 'n'),
             'weight' => (int)$block->getVar('weight'),
             'bcachetime' => (int)$block->getVar('bcachetime'),
             'side' => (int)$block->getVar('side'),
             'visible' => (int)$block->getVar('visible'),
-        'template' => $block_template ,
-        'template_tplset' => $block_template_tplset ,
-        'options' => $block->getVar('options') ,
-        'content' => $block->getVar('content', 'n') ,
-        'is_custom' => $is_custom ,
-        'type' => $block->getVar('block_type') ,
+        'template' => $block_template,
+        'template_tplset' => $block_template_tplset,
+        'options' => $block->getVar('options'),
+        'content' => $block->getVar('content', 'n'),
+        'is_custom' => $is_custom,
+        'type' => $block->getVar('block_type'),
         'ctype' => $block->getVar('c_type')
-    ) ;
+    );
 
         $block4assign = array(
-        'name_raw' => $block_data['name'] ,
-        'title_raw' => $block_data['title'] ,
-        'content_raw' => $block_data['content'] ,
-        'cell_position' => $this->renderCell4BlockPosition($block_data) ,
-        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data) ,
-        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data) ,
-        'cell_options' => $this->renderCell4BlockOptions($block_data) ,
+        'name_raw' => $block_data['name'],
+        'title_raw' => $block_data['title'],
+        'content_raw' => $block_data['content'],
+        'cell_position' => $this->renderCell4BlockPosition($block_data),
+        'cell_module_link' => $this->renderCell4BlockModuleLink($block_data),
+        'cell_group_perm' =>  $this->renderCell4BlockReadGroupPerm($block_data),
+        'cell_options' => $this->renderCell4BlockOptions($block_data),
         'content_preview' => $this->previewContent($block_data)
-    ) + $block_data ;
+    ) + $block_data;
 
     // display
-    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php' ;
-        $tpl = new D3Tpl() ;
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3Tpl.class.php';
+        $tpl = new D3Tpl();
 
     //HACK by domifara
     if (defined('XOOPS_CUBE_LEGACY')) {
-        $tpl->assign('xoops_cube_legacy', true) ;
+        $tpl->assign('xoops_cube_legacy', true);
         include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     } else {
-        $tpl->assign('xoops_cube_legacy', false) ;
+        $tpl->assign('xoops_cube_legacy', false);
     }
 
         $tpl->assign(array(
@@ -945,14 +945,14 @@ 
         'submit_button' => $button_value,
         'common_fck_installed' => $this->checkFck(),
         'gticket_hidden' => $GLOBALS['xoopsGTicket']->getTicketHtml(__LINE__, 1800, 'myblocksadmin')
-    )) ;
+    ));
 
         if (defined('XOOPS_CUBE_LEGACY')) {
-            $tpl->display('db:altsys_main_myblocksadmin_edit_4legacy.html') ;
+            $tpl->display('db:altsys_main_myblocksadmin_edit_4legacy.html');
         } else {
-            $tpl->display('db:altsys_main_myblocksadmin_edit.html') ;
+            $tpl->display('db:altsys_main_myblocksadmin_edit.html');
         }
-        return ;
+        return;
     }
 
     public function checkFck()
@@ -964,16 +964,16 @@ 
     {
         $bid = (int)$block_data['bid'];
 
-        if (! $block_data['is_custom']) {
-            return '' ;
+        if (!$block_data['is_custom']) {
+            return '';
         }
         if (empty($this->preview_request)) {
-            return '' ;
+            return '';
         }
 
 //HACK by domifara
 //TODO : need no hook block at this
-    $block = new XoopsBlock($bid) ;
+    $block = new XoopsBlock($bid);
 /*
     $handler = xoops_gethandler('block');
     $block =& $handler->create(false) ;
@@ -981,68 +981,68 @@ 
 */
 
     if ($block->getVar('mid')) {
-        return '' ;
+        return '';
     }
 
-        $block->setVar('title', $block_data['title']) ;
-        $block->setVar('content', $block_data['content']) ;
+        $block->setVar('title', $block_data['title']);
+        $block->setVar('content', $block_data['content']);
 
-        restore_error_handler() ;
-        $original_level = error_reporting(E_ALL) ;
-        $ret =& $block->getContent('S', $block_data['ctype']) ;
-        error_reporting($original_level) ;
+        restore_error_handler();
+        $original_level = error_reporting(E_ALL);
+        $ret = & $block->getContent('S', $block_data['ctype']);
+        error_reporting($original_level);
 
-        return $ret ;
+        return $ret;
     }
 
 
     public function get_blockname_from_ctype($bctype)
     {
         $ctypes = array(
-        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML ,
-        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ,
-        'N' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE ,
+        'H' => _MD_A_MYBLOCKSADMIN_CTYPE_HTML,
+        'S' => _MD_A_MYBLOCKSADMIN_CTYPE_SMILE,
+        'N' => _MD_A_MYBLOCKSADMIN_CTYPE_NOSMILE,
         'P' => _MD_A_MYBLOCKSADMIN_CTYPE_PHP
-    ) ;
+    );
 
-        return isset($ctypes[$bctype]) ? $ctypes[$bctype] : _MD_A_MYBLOCKSADMIN_CTYPE_SMILE ;
+        return isset($ctypes[$bctype]) ? $ctypes[$bctype] : _MD_A_MYBLOCKSADMIN_CTYPE_SMILE;
     }
 
 
     public function processPost()
     {
         // Ticket Check
-    if (! $GLOBALS['xoopsGTicket']->check(true, 'myblocksadmin')) {
+    if (!$GLOBALS['xoopsGTicket']->check(true, 'myblocksadmin')) {
         redirect_header(XOOPS_URL.'/', 3, $GLOBALS['xoopsGTicket']->getErrors());
     }
 
-        $msg = '' ;
+        $msg = '';
         $bid = (int)(@$_GET['bid']);
-        if (! empty($_POST['preview'])) {
+        if (!empty($_POST['preview'])) {
             // preview
-        $this->preview_request = $this->fetchRequest4Block($bid) ;
-            $_GET['op'] = str_replace('_ok', '', @$_POST['op']) ;
-            return ; // continue ;
+        $this->preview_request = $this->fetchRequest4Block($bid);
+            $_GET['op'] = str_replace('_ok', '', @$_POST['op']);
+            return; // continue ;
         } elseif (@$_POST['op'] == 'order') {
             // order ok
-        $msg = $this->do_order() ;
+        $msg = $this->do_order();
         } elseif (@$_POST['op'] == 'delete_ok') {
             // delete ok
-        $msg = $this->do_delete($bid) ;
+        $msg = $this->do_delete($bid);
         } elseif (@$_POST['op'] == 'clone_ok') {
             // clone ok
-        $msg = $this->do_clone($bid) ;
+        $msg = $this->do_clone($bid);
         } elseif (@$_POST['op'] == 'edit_ok' || @$_POST['op'] == 'new_ok') {
             // edit ok
-        $msg = $this->do_edit($bid) ;
-        } elseif (! empty($_POST['submit'])) {
+        $msg = $this->do_edit($bid);
+        } elseif (!empty($_POST['submit'])) {
             // update module_admin,module_read,block_read
-        include dirname(__DIR__).'/include/mygroupperm.php' ;
-            $msg = _MD_A_MYBLOCKSADMIN_PERMUPDATED ;
+        include dirname(__DIR__).'/include/mygroupperm.php';
+            $msg = _MD_A_MYBLOCKSADMIN_PERMUPDATED;
         }
 
-        redirect_header('?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, 1, $msg) ;
-        exit ;
+        redirect_header('?mode=admin&lib=altsys&page=myblocksadmin&dirname='.$this->target_dirname, 1, $msg);
+        exit;
     }
 
 
@@ -1051,22 +1051,22 @@ 
         $bid = (int)(@$_GET['bid']);
         switch (@$_GET['op']) {
         case 'clone':
-            $this->form_edit($bid, 'clone') ;
-            break ;
+            $this->form_edit($bid, 'clone');
+            break;
         case 'new':
         case 'edit':
-            $this->form_edit($bid, 'edit') ;
-            break ;
+            $this->form_edit($bid, 'edit');
+            break;
         case 'delete':
-            $this->form_delete($bid) ;
-            break ;
+            $this->form_delete($bid);
+            break;
         case 'list':
         default:
             // the first form (blocks)
-            $this->list_blocks() ;
+            $this->list_blocks();
             // the second form (groups)
-            $this->list_groups() ;
-            break ;
+            $this->list_groups();
+            break;
     }
     }
 }

xoops_trust_path/libs/altsys/class/MyBlocksAdminForICMS.class.php

Doc Comments +3 added lines

@@ -91,6 +91,9 @@
 
 
 // private
+/**
+ * @param integer $target_side
+ */
 public function renderRadio4BlockPosition($target_side, $block_data)
 {
     $bid = (int)$block_data['bid'];

Spacing +39 added lines, -39 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-require_once __DIR__.'/MyBlocksAdmin.class.php' ;
+require_once __DIR__.'/MyBlocksAdmin.class.php';
 
 class MyBlocksAdminForICMS extends MyBlocksAdmin
 {
-    public $block_positions = array() ;
+    public $block_positions = array();
 
     public function MyBlocksAadminForICMS()
     {
@@ -13,14 +13,14 @@ 
 
     public function construct()
     {
-        parent::construct() ;
+        parent::construct();
 
-        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php' ;
-        $result = $this->db->query('SELECT id,pname,title FROM ' . $this->db->prefix('block_positions')) ;
+        @include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$this->lang.'/admin/blocksadmin.php';
+        $result = $this->db->query('SELECT id,pname,title FROM '.$this->db->prefix('block_positions'));
         while (list($id, $pname, $title) = $this->db->fetchRow($result)) {
-            $this->block_positions[ $id ] = defined($title) ? constant($title) : $title ;
+            $this->block_positions[$id] = defined($title) ? constant($title) : $title;
         }
-        $this->block_positions[ -1 ] = _NONE ;
+        $this->block_positions[ -1] = _NONE;
     }
 
 //HACK by domifara for php5.3+
@@ -30,7 +30,7 @@ 
     static $instance;
     if (!isset($instance)) {
         $instance = new MyBlocksAdminForICMS();
-        $instance->construct() ;
+        $instance->construct();
     }
     return $instance;
 }
@@ -45,23 +45,23 @@ 
     // get selected targets
     if (is_array(@$block_data['bmodule'])) {
         // bmodule origined from request (preview etc.)
-        $selected_pages = $block_data['bmodule'] ;
+        $selected_pages = $block_data['bmodule'];
     } else {
         // origined from the table of `block_module_link`
-        $result = $this->db->query('SELECT module_id,page_id FROM ' . $this->db->prefix('block_module_link') . " WHERE block_id='$bid'") ;
+        $result = $this->db->query('SELECT module_id,page_id FROM '.$this->db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_pages = array();
         while (list($mid, $pid) = $this->db->fetchRow($result)) {
-            $selected_pages[] = (int)$mid . '-' . (int)$pid;
+            $selected_pages[] = (int)$mid.'-'.(int)$pid;
         }
     }
 
     $page_handler = xoops_getHandler('page');
     $ret = "
 				<select name='bmodules[$bid][]' size='5' multiple='multiple'>
-					".$page_handler->getPageSelOptions($selected_pages) . '
+					".$page_handler->getPageSelOptions($selected_pages).'
 				</select>';
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -72,19 +72,19 @@ 
     return "
 	<table>
 		<tr>
-			<td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(3, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(4, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(5, $block_data) . "</td>
-			<td rowspan='2'>".$this->renderRadio4BlockPosition(2, $block_data) . '</td>
+			<td rowspan='2'>".$this->renderRadio4BlockPosition(1, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(3, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(4, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(5, $block_data)."</td>
+			<td rowspan='2'>".$this->renderRadio4BlockPosition(2, $block_data).'</td>
 		</tr>
 		<tr>
-			<td>' . $this->renderRadio4BlockPosition(6, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(7, $block_data) . '</td>
-			<td>' . $this->renderRadio4BlockPosition(8, $block_data) . "</td>
+			<td>' . $this->renderRadio4BlockPosition(6, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(7, $block_data).'</td>
+			<td>' . $this->renderRadio4BlockPosition(8, $block_data)."</td>
 		</tr>
 		<tr>
-			<td colspan='5'>".$this->renderRadio4BlockPositions($block_data, array(1, 2, 3, 4, 5, 6, 7, 8)) . '</td>
+			<td colspan='5'>".$this->renderRadio4BlockPositions($block_data, array(1, 2, 3, 4, 5, 6, 7, 8)).'</td>
 		</tr>
 	</table>';
 }
@@ -95,19 +95,19 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $label4disp = htmlspecialchars($this->block_positions[ $target_side ], ENT_QUOTES) ;
+    $label4disp = htmlspecialchars($this->block_positions[$target_side], ENT_QUOTES);
 
     if ($current_side == $target_side) {
-        $checked = "checked='checked'" ;
+        $checked = "checked='checked'";
         $divstyle = $target_side == -1 ? 'disabled' : 'selected';
     } else {
         $checked = '';
         $divstyle = 'unselected';
     }
 
-    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>" ;
+    return "<div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' value='$target_side' class='blockposition' $checked /></div>";
 }
 
 
@@ -116,28 +116,28 @@ 
 {
     $bid = (int)$block_data['bid'];
     $visible = (int)$block_data['visible'];
-    $current_side = $visible ? (int)$block_data['side'] : -1 ;
+    $current_side = $visible ? (int)$block_data['side'] : -1;
 
-    $ret = '' ;
+    $ret = '';
     foreach ($this->block_positions as $target_side => $label) {
         if (in_array($target_side, $skip_sides)) {
-            continue ;
+            continue;
         }
 
-        $label4disp = htmlspecialchars($label, ENT_QUOTES) ;
+        $label4disp = htmlspecialchars($label, ENT_QUOTES);
 
         if ($current_side == $target_side) {
-            $checked = "checked='checked'" ;
+            $checked = "checked='checked'";
             $divstyle = $target_side == -1 ? 'disabled' : 'selected';
         } else {
             $checked = '';
             $divstyle = 'unselected';
         }
 
-        $ret .= "<div style='clear:both;'><div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' id='sides_{$bid}_{$target_side}' value='$target_side' class='blockposition' $checked /></div><label for='sides_{$bid}_{$target_side}'>$label4disp</label></label></div>" ;
+        $ret .= "<div style='clear:both;'><div class='blockposition $divstyle' title='$label4disp'><input type='radio' name='sides[$bid]' id='sides_{$bid}_{$target_side}' value='$target_side' class='blockposition' $checked /></div><label for='sides_{$bid}_{$target_side}'>$label4disp</label></label></div>";
     }
 
-    return $ret ;
+    return $ret;
 }
 
 
@@ -145,16 +145,16 @@ 
 public function updateBlockModuleLink($bid, $bmodules)
 {
     $bid = (int)$bid;
-    $table = $this->db->prefix('block_module_link') ;
+    $table = $this->db->prefix('block_module_link');
 
-    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid" ;
-    $this->db->query($sql) ;
+    $sql = "DELETE FROM `$table` WHERE `block_id`=$bid";
+    $this->db->query($sql);
     foreach ($bmodules as $mid) {
-        $regs = explode('-', $mid) ;
+        $regs = explode('-', $mid);
         $module_id = (int)(@$regs[0]);
         $page_id = (int)(@$regs[1]);
-        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)" ;
-        $this->db->query($sql) ;
+        $sql = "INSERT INTO `$table` (`block_id`,`module_id`,`page_id`) VALUES ($bid,$module_id,$page_id)";
+        $this->db->query($sql);
     }
 }
 }

html/modules/altsys/setup_xoops_trust_path.php

Spacing +17 added lines, -17 removed lines

@@ -1,45 +1,45 @@
 <?php
 
-$xoopsOption['nocommon'] = 1 ;
-define('_LEGACY_PREVENT_LOAD_CORE_', 1) ;
+$xoopsOption['nocommon'] = 1;
+define('_LEGACY_PREVENT_LOAD_CORE_', 1);
 
-include '../../mainfile.php' ;
+include '../../mainfile.php';
 
 if (defined('XOOPS_TRUST_PATH') && XOOPS_TRUST_PATH !== '' && file_exists(XOOPS_TRUST_PATH.'/libs/altsys')) {
-    die('No problem with your XOOPS_TRUST_PATH') ;
+    die('No problem with your XOOPS_TRUST_PATH');
 }
 
 
 // show the hint if password matches
-$hint = '' ;
+$hint = '';
 if (@$_POST['dbpassword'] == XOOPS_DB_PASS) {
     // find XOOPS_TRUST_PATH
-    $xoops_trust_path = '' ;
-    $base_dirs = array( XOOPS_ROOT_PATH , dirname(XOOPS_ROOT_PATH) , dirname(dirname(XOOPS_ROOT_PATH)) ) ;
+    $xoops_trust_path = '';
+    $base_dirs = array(XOOPS_ROOT_PATH, dirname(XOOPS_ROOT_PATH), dirname(dirname(XOOPS_ROOT_PATH)));
     foreach ($base_dirs as $base_dir) {
-        $dh = @opendir($base_dir) ;
-        if (! empty($dh)) {
+        $dh = @opendir($base_dir);
+        if (!empty($dh)) {
             while (($file = readdir($dh)) !== false) {
                 if (substr($file, 0, 1) == '.') {
-                    continue ;
+                    continue;
                 }
-                $fullpath = $base_dir . '/' . $file ;
-                if (! is_dir($fullpath)) {
-                    continue ;
+                $fullpath = $base_dir.'/'.$file;
+                if (!is_dir($fullpath)) {
+                    continue;
                 }
                 if (is_dir($fullpath.'/libs/altsys')) {
-                    $xoops_trust_path = $fullpath ;
-                    break 2 ;
+                    $xoops_trust_path = $fullpath;
+                    break 2;
                 }
             }
         }
     }
     // fall back
     if (empty($xoops_trust_path)) {
-        $xoops_trust_path = dirname(XOOPS_ROOT_PATH).'/xoops_trust_path' ;
+        $xoops_trust_path = dirname(XOOPS_ROOT_PATH).'/xoops_trust_path';
     }
     // create the hint
-    if (! defined('XOOPS_TRUST_PATH')) {
+    if (!defined('XOOPS_TRUST_PATH')) {
         $hint = "Insert the red line.<br />define('XOOPS_ROOT_PATH', '".htmlspecialchars(XOOPS_ROOT_PATH, ENT_QUOTES)."');<br /><ins style='color:red;'>define('XOOPS_TRUST_PATH', '".htmlspecialchars($xoops_trust_path, ENT_QUOTES)."');</ins>";
     } else {
         $hint = "<del>define('XOOPS_TRUST_PATH', '');</del><br /><ins style='color:red;'>define('XOOPS_TRUST_PATH', '".htmlspecialchars($xoops_trust_path, ENT_QUOTES)."');</ins>";