mambax7 / extcal

class/pcltar.lib.php

Doc Comments +14 added lines, -14 removed lines

@@ -1190,7 +1190,7 @@ 
     /**
      * @param        $p_tarname
      * @param        $p_list
-     * @param        $p_mode
+     * @param        string $p_mode
      * @param string $p_add_dir
      * @param string $p_remove_dir
      *
@@ -1290,10 +1290,10 @@ 
     /**
      * @param $p_tarname
      * @param $p_list
-     * @param $p_mode
+     * @param string $p_mode
      * @param $p_list_detail
-     * @param $p_add_dir
-     * @param $p_remove_dir
+     * @param string $p_add_dir
+     * @param string $p_remove_dir
      *
      * @return int
      */
@@ -2092,10 +2092,10 @@ 
      * @param $p_tarname
      * @param $p_file_list
      * @param $p_list_detail
-     * @param $p_mode
-     * @param $p_path
+     * @param string $p_mode
+     * @param string $p_path
      * @param $p_tar_mode
-     * @param $p_remove_path
+     * @param string $p_remove_path
      *
      * @return int
      */
@@ -2648,8 +2648,8 @@ 
      * @param $p_tarname
      * @param $p_index_string
      * @param $p_list_detail
-     * @param $p_path
-     * @param $p_remove_path
+     * @param string $p_path
+     * @param string $p_remove_path
      * @param $p_tar_mode
      *
      * @return int
@@ -3219,7 +3219,7 @@ 
      * @param $p_tarname
      * @param $p_file_list
      * @param $p_list_detail
-     * @param $p_tar_mode
+     * @param string $p_tar_mode
      *
      * @return int
      */
@@ -3513,9 +3513,9 @@ 
      * @param $p_tarname
      * @param $p_file_list
      * @param $p_list_detail
-     * @param $p_tar_mode
-     * @param $p_add_dir
-     * @param $p_remove_dir
+     * @param string $p_tar_mode
+     * @param string $p_add_dir
+     * @param string $p_remove_dir
      *
      * @return int
      */
@@ -3922,7 +3922,7 @@ 
     // Return Values :
     // --------------------------------------------------------------------------------
     /**
-     * @param $v_binary_data
+     * @param string $v_binary_data
      * @param $v_header
      *
      * @return int

Spacing +118 added lines, -118 removed lines

@@ -60,10 +60,10 @@ 
     // This library should be called by each script before the include of PhpZip
     // Library in order to limit the potential 'lib' directory path problem.
     if (!defined('PCLERROR_LIB')) {
-        include $gPcltarLibDir . '/pclerror.lib.php';
+        include $gPcltarLibDir.'/pclerror.lib.php';
     }
     if (!defined('PCLTRACE_LIB')) {
-        include $gPcltarLibDir . '/pcltrace.lib.php';
+        include $gPcltarLibDir.'/pcltrace.lib.php';
     }
 
     // --------------------------------------------------------------------------------
@@ -823,7 +823,7 @@ 
             if (!is_file($p_tarname)) {
                 PclErrorLog(-4, "Archive '$p_tarname' does not exist");
             } else {
-                PclErrorLog(-6, "Archive '$p_tarname' has invalid size " . filesize($p_tarname) . '(not a 512 block multiple)');
+                PclErrorLog(-6, "Archive '$p_tarname' has invalid size ".filesize($p_tarname).'(not a 512 block multiple)');
             }
 
             // ----- Return
@@ -838,7 +838,7 @@ 
             if (!is_file($p_tarname_add)) {
                 PclErrorLog(-4, "Archive '$p_tarname_add' does not exist");
             } else {
-                PclErrorLog(-6, "Archive '$p_tarname_add' has invalid size " . filesize($p_tarname_add) . '(not a 512 block multiple)');
+                PclErrorLog(-6, "Archive '$p_tarname_add' has invalid size ".filesize($p_tarname_add).'(not a 512 block multiple)');
             }
 
             // ----- Return
@@ -861,7 +861,7 @@ 
             }
 
             // ----- Open a temporary file in write mode
-            $v_temp_tarname = uniqid('pcltar-', true) . '.tmp';
+            $v_temp_tarname = uniqid('pcltar-', true).'.tmp';
             TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname");
             if (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) {
                 // ----- Close tar file
@@ -914,9 +914,9 @@ 
                 }
 
                 // ----- Go to the beginning of last block
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
                 fseek($p_tar, $v_size - 512);
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
             } // ----- Look for unknown type
             else {
                 // ----- Error log
@@ -1207,7 +1207,7 @@ 
             if (!is_file($p_tarname)) {
                 PclErrorLog(-4, "Archive '$p_tarname' does not exist");
             } else {
-                PclErrorLog(-6, "Archive '$p_tarname' has invalid size " . filesize($p_tarname) . '(not a 512 block multiple)');
+                PclErrorLog(-6, "Archive '$p_tarname' has invalid size ".filesize($p_tarname).'(not a 512 block multiple)');
             }
 
             // ----- Return
@@ -1230,7 +1230,7 @@ 
             }
 
             // ----- Open a temporary file in write mode
-            $v_temp_tarname = uniqid('pcltar-', true) . '.tmp';
+            $v_temp_tarname = uniqid('pcltar-', true).'.tmp';
             TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname");
             if (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) {
                 // ----- Close tar file
@@ -1315,9 +1315,9 @@ 
                 }
 
                 // ----- Go to the beginning of last block
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
                 fseek($p_tar, $v_size - 512);
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
 
                 // ----- Call the adding fct inside the tar
                 if (1 == ($v_result = PclTarHandleAddList($p_tar, $p_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir))) {
@@ -1384,7 +1384,7 @@ 
         // ----- Check the parameters
         if (0 == $p_tar) {
             // ----- Error log
-            PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__);
+            PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__);
 
             // ----- Return
             TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString());
@@ -1439,7 +1439,7 @@ 
                 return PclErrorCode();
             }
 
-            TrFctMessage(__FILE__, __LINE__, 4, 'File position before header =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+            TrFctMessage(__FILE__, __LINE__, 4, 'File position before header ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
 
             // ----- Add the file
             if (1 != ($v_result = PclTarHandleAddFile($p_tar, $p_filename, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) {
@@ -1459,7 +1459,7 @@ 
                 // ----- Look for path
                 $v_path = '';
                 if ('.' !== $p_filename) {
-                    $v_path = $p_filename . '/';
+                    $v_path = $p_filename.'/';
                 }
 
                 // ----- Read the directory for files and sub-directories
@@ -1468,11 +1468,11 @@ 
                 $p_hitem = readdir($p_hdir); // '..' directory
                 while ($p_hitem = readdir($p_hdir)) {
                     // ----- Look for a file
-                    if (is_file($v_path . $p_hitem)) {
-                        TrFctMessage(__FILE__, __LINE__, 4, "Add the file '" . $v_path . $p_hitem . "'");
+                    if (is_file($v_path.$p_hitem)) {
+                        TrFctMessage(__FILE__, __LINE__, 4, "Add the file '".$v_path.$p_hitem."'");
 
                         // ----- Add the file
-                        if (1 != ($v_result = PclTarHandleAddFile($p_tar, $v_path . $p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) {
+                        if (1 != ($v_result = PclTarHandleAddFile($p_tar, $v_path.$p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) {
                             // ----- Return status
                             TrFctEnd(__FILE__, __LINE__, $v_result);
 
@@ -1483,10 +1483,10 @@ 
                         $p_list_detail[$v_nb++] = $v_header;
                     } // ----- Recursive call to PclTarHandleAddFile()
                     else {
-                        TrFctMessage(__FILE__, __LINE__, 4, "'" . $v_path . $p_hitem . "' is a directory");
+                        TrFctMessage(__FILE__, __LINE__, 4, "'".$v_path.$p_hitem."' is a directory");
 
                         // ----- Need an array as parameter
-                        $p_temp_list[0] = $v_path . $p_hitem;
+                        $p_temp_list[0] = $v_path.$p_hitem;
                         $v_result       = PclTarHandleAddList($p_tar, $p_temp_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir);
                     }
                 }
@@ -1494,7 +1494,7 @@ 
                 // ----- Free memory for the recursive loop
                 unset($p_temp_list, $p_hdir, $p_hitem);
             } else {
-                TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
             }
         }
 
@@ -1530,7 +1530,7 @@ 
         // ----- Check the parameters
         if (0 == $p_tar) {
             // ----- Error log
-            PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__);
+            PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__);
 
             // ----- Return
             TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString());
@@ -1558,7 +1558,7 @@ 
 
             if ((0 === strpos($p_filename, './')) || (0 === strpos($p_remove_dir, './'))) {
                 if ((0 === strpos($p_filename, './')) && (0 !== strpos($p_remove_dir, './'))) {
-                    $p_remove_dir = './' . $p_remove_dir;
+                    $p_remove_dir = './'.$p_remove_dir;
                 }
                 if ((0 !== strpos($p_filename, './')) && (0 === strpos($p_remove_dir, './'))) {
                     $p_remove_dir = substr($p_remove_dir, 2);
@@ -1572,9 +1572,9 @@ 
         }
         if ('' != $p_add_dir) {
             if ('/' === substr($p_add_dir, -1)) {
-                $v_stored_filename = $p_add_dir . $v_stored_filename;
+                $v_stored_filename = $p_add_dir.$v_stored_filename;
             } else {
-                $v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
+                $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
             }
             TrFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_filename' = '$v_stored_filename'");
         }
@@ -1611,7 +1611,7 @@ 
                 return $v_result;
             }
 
-            TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+            TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
 
             // ----- Read the file by 512 octets blocks
             $i = 0;
@@ -1629,7 +1629,7 @@ 
             // ----- Close the file
             fclose($v_file);
 
-            TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+            TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
         } // ----- Look for a directory
         else {
             // ----- Call the header generation
@@ -1640,7 +1640,7 @@ 
                 return $v_result;
             }
 
-            TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
+            TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar)));
         }
 
         // ----- Return
@@ -1687,7 +1687,7 @@ 
         // ----- Check the parameters
         if ((0 == $p_tar) || ('' == $p_filename)) {
             // ----- Error log
-            PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__);
+            PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__);
 
             // ----- Return
             TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString());
@@ -1700,7 +1700,7 @@ 
             $p_stored_filename = $p_filename;
         }
         $v_reduce_filename = PclTarHandlePathReduction($p_stored_filename);
-        TrFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_reduce_filename', strlen " . strlen($v_reduce_filename));
+        TrFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_reduce_filename', strlen ".strlen($v_reduce_filename));
 
         // ----- Get file info
         $v_info = stat($p_filename);
@@ -1901,7 +1901,7 @@ 
         // ----- Check the path
         //if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../")))
         if ('' == $p_path) {
-            $p_path = './' . $p_path;
+            $p_path = './'.$p_path;
         }
 
         // ----- Look for path to remove format (should end by /)
@@ -1996,28 +1996,28 @@ 
                 continue;
             }
 
-            TrFctMessage(__FILE__, __LINE__, 2, "Found file '" . $v_header['filename'] . "', size '" . $v_header['size'] . "'");
+            TrFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'");
 
             // ----- Look for partial extract
             if ((!$v_extract_all) && is_array($p_file_list)) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Look if the file ' . $v_header['filename'] . ' need to be extracted');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Look if the file '.$v_header['filename'].' need to be extracted');
 
                 // ----- By default no unzip if the file is not found
                 $v_extract_file = false;
 
                 // ----- Look into the file list
                 for ($i = 0, $iMax = count($p_file_list); $i < $iMax; ++$i) {
-                    TrFctMessage(__FILE__, __LINE__, 2, 'Compare archived file ' . $v_header['filename'] . " from asked list file '" . $p_file_list[$i] . "'");
+                    TrFctMessage(__FILE__, __LINE__, 2, 'Compare archived file '.$v_header['filename']." from asked list file '".$p_file_list[$i]."'");
 
                     // ----- Look if it is a directory
                     if ('/' === substr($p_file_list[$i], -1)) {
-                        TrFctMessage(__FILE__, __LINE__, 3, 'Compare file ' . $v_header['filename'] . " with directory '$p_file_list[$i]'");
+                        TrFctMessage(__FILE__, __LINE__, 3, 'Compare file '.$v_header['filename']." with directory '$p_file_list[$i]'");
 
                         // ----- Look if the directory is in the filename path
                         if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
                             && (0 === strpos($v_header['filename'], $p_file_list[$i]))) {
                             // ----- The file is in the directory, so extract it
-                            TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . " is in directory '$p_file_list[$i]' : extract it");
+                            TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename']." is in directory '$p_file_list[$i]' : extract it");
                             $v_extract_file = true;
 
                             // ----- End of loop
@@ -2027,7 +2027,7 @@ 
                     else {
                         if ($p_file_list[$i] == $v_header['filename']) {
                             // ----- File found
-                            TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' should be extracted');
+                            TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' should be extracted');
                             $v_extract_file = true;
 
                             // ----- End of loop
@@ -2038,7 +2038,7 @@ 
 
                 // ----- Trace
                 if (!$v_extract_file) {
-                    TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' should not be extracted');
+                    TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' should not be extracted');
                 }
             } else {
                 // ----- All files need to be extracted
@@ -2049,10 +2049,10 @@ 
             if ($v_extract_file && (!$v_listing)) {
                 // ----- Look for path to remove
                 if (('' != $p_remove_path) && (0 === strpos($v_header['filename'], $p_remove_path))) {
-                    TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file " . $v_header['filename'] . '');
+                    TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file ".$v_header['filename'].'');
                     // ----- Remove the path
                     $v_header['filename'] = substr($v_header['filename'], $p_remove_path_size);
-                    TrFctMessage(__FILE__, __LINE__, 3, 'Reslting file is ' . $v_header['filename'] . '');
+                    TrFctMessage(__FILE__, __LINE__, 3, 'Reslting file is '.$v_header['filename'].'');
                 }
 
                 // ----- Add the path to the file
@@ -2066,22 +2066,22 @@ 
 
                     // ----- Add the path
                     if (0 === strpos($v_header['filename'], '/')) {
-                        $v_header['filename'] = $p_path . $v_header['filename'];
+                        $v_header['filename'] = $p_path.$v_header['filename'];
                     } else {
-                        $v_header['filename'] = $p_path . '/' . $v_header['filename'];
+                        $v_header['filename'] = $p_path.'/'.$v_header['filename'];
                     }
                 }
 
                 // ----- Trace
-                TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'");
+                TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) '.$v_header['filename'].", size '".$v_header['size']."'");
 
                 // ----- Check that the file does not exists
                 if (file_exists($v_header['filename'])) {
-                    TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' already exists');
+                    TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' already exists');
 
                     // ----- Look if file is a directory
                     if (is_dir($v_header['filename'])) {
-                        TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is a directory');
+                        TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is a directory');
 
                         // ----- Change the file status
                         $v_header['status'] = 'already_a_directory';
@@ -2092,7 +2092,7 @@ 
                     } // ----- Look if file is write protected
                     else {
                         if (!s_writable($v_header['filename'])) {
-                            TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is write protected');
+                            TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is write protected');
 
                             // ----- Change the file status
                             $v_header['status'] = 'write_protected';
@@ -2126,7 +2126,7 @@ 
                     }
 
                     if (1 != ($v_result = PclTarHandlerDirCheck($v_dir_to_check))) {
-                        TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for ' . $v_header['filename'] . '');
+                        TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for '.$v_header['filename'].'');
 
                         // ----- Change the file status
                         $v_header['status'] = 'path_creation_fail';
@@ -2141,7 +2141,7 @@ 
                 if ($v_extract_file && ('5' != $v_header['typeflag'])) {
                     // ----- Open the destination file in write mode
                     if (0 == ($v_dest_file = @fopen($v_header['filename'], 'wb'))) {
-                        TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening ' . $v_header['filename'] . ' in write binary mode');
+                        TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening '.$v_header['filename'].' in write binary mode');
 
                         // ----- Change the file status
                         $v_header['status'] = 'write_error';
@@ -2154,12 +2154,12 @@ 
                             gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512));
                         }
                     } else {
-                        TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of ' . $v_header['filename'] . '');
+                        TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of '.$v_header['filename'].'');
 
                         // ----- Read data
                         $n = floor($v_header['size'] / 512);
                         for ($i = 0; $i < $n; ++$i) {
-                            TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1));
+                            TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1));
                             if ('tar' === $p_tar_mode) {
                                 $v_content = fread($v_tar, 512);
                             } else {
@@ -2168,7 +2168,7 @@ 
                             fwrite($v_dest_file, $v_content, 512);
                         }
                         if (0 != ($v_header['size'] % 512)) {
-                            TrFctMessage(__FILE__, __LINE__, 3, 'Read last ' . ($v_header['size'] % 512) . ' bytes in a 512 block');
+                            TrFctMessage(__FILE__, __LINE__, 3, 'Read last '.($v_header['size'] % 512).' bytes in a 512 block');
                             if ('tar' === $p_tar_mode) {
                                 $v_content = fread($v_tar, 512);
                             } else {
@@ -2196,7 +2196,7 @@ 
                         }
 
                         // ----- Error log
-                        PclErrorLog(-7, 'Extracted file ' . $v_header['filename'] . " does not have the correct file size '" . filesize($v_filename) . "' ('" . $v_header['size'] . "' expected). Archive may be corrupted.");
+                        PclErrorLog(-7, 'Extracted file '.$v_header['filename']." does not have the correct file size '".filesize($v_filename)."' ('".$v_header['size']."' expected). Archive may be corrupted.");
 
                         // ----- Return
                         TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString());
@@ -2207,7 +2207,7 @@ 
                     // ----- Trace
                     TrFctMessage(__FILE__, __LINE__, 2, 'Extraction done');
                 } else {
-                    TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file ' . $v_header['filename'] . ' skipped.');
+                    TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file '.$v_header['filename'].' skipped.');
 
                     // ----- Jump to next file
                     TrFctMessage(__FILE__, __LINE__, 2, 'Jump to next file');
@@ -2220,8 +2220,8 @@ 
             } // ----- Look for file that is not to be unzipped
             else {
                 // ----- Trace
-                TrFctMessage(__FILE__, __LINE__, 2, 'Jump file ' . $v_header['filename'] . '');
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].'');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']');
 
                 // ----- Jump to next file
                 if ('tar' === $p_tar_mode) {
@@ -2230,7 +2230,7 @@ 
                     gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512));
                 }
 
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']');
             }
 
             if ('tar' === $p_tar_mode) {
@@ -2241,7 +2241,7 @@ 
 
             // ----- File name and properties are logged if listing mode or file is extracted
             if ($v_listing || $v_extract_file || $v_extraction_stopped) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].'');
 
                 // ----- Log extracted files
                 if (($v_file_dir = dirname($v_header['filename'])) == $v_header['filename']) {
@@ -2315,7 +2315,7 @@ 
         if (('' === $p_path)
             || ((0 !== strpos($p_path, '/')) && (0 !== strpos($p_path, '../'))
                 && (0 !== strpos($p_path, './')))) {
-            $p_path = './' . $p_path;
+            $p_path = './'.$p_path;
         }
 
         // ----- Look for path to remove format (should end by /)
@@ -2462,14 +2462,14 @@ 
                 continue;
             }
 
-            TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'");
+            TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'");
 
             // ----- Look if file is in the range to be extracted
             if (($p_index_current >= $p_index_start) && ($p_index_current <= $p_index_stop)) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' is in the range to be extracted');
+                TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' is in the range to be extracted');
                 $v_extract_file = true;
             } else {
-                TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' is out of the range');
+                TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' is out of the range');
                 $v_extract_file = false;
             }
 
@@ -2484,8 +2484,8 @@ 
             } // ----- Look for file that is not to be extracted
             else {
                 // ----- Trace
-                TrFctMessage(__FILE__, __LINE__, 2, 'Jump file ' . $v_header['filename'] . '');
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].'');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']');
 
                 // ----- Jump to next file
                 if ('tar' === $p_tar_mode) {
@@ -2494,7 +2494,7 @@ 
                     gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512));
                 }
 
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']');
             }
 
             if ('tar' === $p_tar_mode) {
@@ -2505,7 +2505,7 @@ 
 
             // ----- File name and properties are logged if listing mode or file is extracted
             if ($v_extract_file) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].'');
 
                 // ----- Log extracted files
                 if (($v_file_dir = dirname($v_header['filename'])) == $v_header['filename']) {
@@ -2562,10 +2562,10 @@ 
 
         // ----- Look for path to remove
         if (('' != $p_remove_path) && (0 === strpos($v_header['filename'], $p_remove_path))) {
-            TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file " . $v_header['filename'] . '');
+            TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file ".$v_header['filename'].'');
             // ----- Remove the path
             $v_header['filename'] = substr($v_header['filename'], $p_remove_path_size);
-            TrFctMessage(__FILE__, __LINE__, 3, 'Resulting file is ' . $v_header['filename'] . '');
+            TrFctMessage(__FILE__, __LINE__, 3, 'Resulting file is '.$v_header['filename'].'');
         }
 
         // ----- Add the path to the file
@@ -2579,22 +2579,22 @@ 
 
             // ----- Add the path
             if (0 === strpos($v_header['filename'], '/')) {
-                $v_header['filename'] = $p_path . $v_header['filename'];
+                $v_header['filename'] = $p_path.$v_header['filename'];
             } else {
-                $v_header['filename'] = $p_path . '/' . $v_header['filename'];
+                $v_header['filename'] = $p_path.'/'.$v_header['filename'];
             }
         }
 
         // ----- Trace
-        TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'");
+        TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) '.$v_header['filename'].", size '".$v_header['size']."'");
 
         // ----- Check that the file does not exists
         if (file_exists($v_header['filename'])) {
-            TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' already exists');
+            TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' already exists');
 
             // ----- Look if file is a directory
             if (is_dir($v_header['filename'])) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is a directory');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is a directory');
 
                 // ----- Change the file status
                 $v_header['status'] = 'already_a_directory';
@@ -2605,7 +2605,7 @@ 
             } // ----- Look if file is write protected
             else {
                 if (!s_writable($v_header['filename'])) {
-                    TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is write protected');
+                    TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is write protected');
 
                     // ----- Change the file status
                     $v_header['status'] = 'write_protected';
@@ -2616,7 +2616,7 @@ 
                 } // ----- Look if the extracted file is older
                 else {
                     if (filemtime($v_header['filename']) > $v_header['mtime']) {
-                        TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is newer (' . date('l dS of F Y h:i:s A', filemtime($v_header['filename'])) . ') than the extracted file (' . date('l dS of F Y h:i:s A', $v_header['mtime']) . ')');
+                        TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is newer ('.date('l dS of F Y h:i:s A', filemtime($v_header['filename'])).') than the extracted file ('.date('l dS of F Y h:i:s A', $v_header['mtime']).')');
 
                         // ----- Change the file status
                         $v_header['status'] = 'newer_exist';
@@ -2640,7 +2640,7 @@ 
             }
 
             if (1 != ($v_result = PclTarHandlerDirCheck($v_dir_to_check))) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for '.$v_header['filename'].'');
 
                 // ----- Change the file status
                 $v_header['status'] = 'path_creation_fail';
@@ -2655,7 +2655,7 @@ 
         if ($v_extract_file && ('5' != $v_header['typeflag'])) {
             // ----- Open the destination file in write mode
             if (0 == ($v_dest_file = @fopen($v_header['filename'], 'wb'))) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening ' . $v_header['filename'] . ' in write binary mode');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening '.$v_header['filename'].' in write binary mode');
 
                 // ----- Change the file status
                 $v_header['status'] = 'write_error';
@@ -2668,12 +2668,12 @@ 
                     gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512));
                 }
             } else {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of '.$v_header['filename'].'');
 
                 // ----- Read data
                 $n = floor($v_header['size'] / 512);
                 for ($i = 0; $i < $n; ++$i) {
-                    TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1));
+                    TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1));
                     if ('tar' === $p_tar_mode) {
                         $v_content = fread($v_tar, 512);
                     } else {
@@ -2682,7 +2682,7 @@ 
                     fwrite($v_dest_file, $v_content, 512);
                 }
                 if (0 != ($v_header['size'] % 512)) {
-                    TrFctMessage(__FILE__, __LINE__, 3, 'Read last ' . ($v_header['size'] % 512) . ' bytes in a 512 block');
+                    TrFctMessage(__FILE__, __LINE__, 3, 'Read last '.($v_header['size'] % 512).' bytes in a 512 block');
                     if ('tar' === $p_tar_mode) {
                         $v_content = fread($v_tar, 512);
                     } else {
@@ -2703,7 +2703,7 @@ 
             clearstatcache();
             if (filesize($v_header['filename']) != $v_header['size']) {
                 // ----- Error log
-                PclErrorLog(-7, 'Extracted file ' . $v_header['filename'] . " does not have the correct file size '" . filesize($v_filename) . "' ('" . $v_header['size'] . "' expected). Archive may be corrupted.");
+                PclErrorLog(-7, 'Extracted file '.$v_header['filename']." does not have the correct file size '".filesize($v_filename)."' ('".$v_header['size']."' expected). Archive may be corrupted.");
 
                 // ----- Return
                 TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString());
@@ -2714,7 +2714,7 @@ 
             // ----- Trace
             TrFctMessage(__FILE__, __LINE__, 2, 'Extraction done');
         } else {
-            TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file ' . $v_header['filename'] . ' skipped.');
+            TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file '.$v_header['filename'].' skipped.');
 
             // ----- Jump to next file
             TrFctMessage(__FILE__, __LINE__, 2, 'Jump to next file');
@@ -2768,7 +2768,7 @@ 
             }
 
             // ----- Open a temporary file in write mode
-            $v_temp_tarname = uniqid('pcltar-', true) . '.tmp';
+            $v_temp_tarname = uniqid('pcltar-', true).'.tmp';
             TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname");
             if (0 == ($v_temp_tar = @fopen($v_temp_tarname, 'wb'))) {
                 // ----- Close tar file
@@ -2797,7 +2797,7 @@ 
             }
 
             // ----- Open a temporary file in write mode
-            $v_temp_tarname = uniqid('pcltar-', true) . '.tmp';
+            $v_temp_tarname = uniqid('pcltar-', true).'.tmp';
             TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname");
             if (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) {
                 // ----- Close tar file
@@ -2854,7 +2854,7 @@ 
                 continue;
             }
 
-            TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'");
+            TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'");
 
             // ----- Look for filenames to delete
             for ($i = 0, $v_delete_file = false; ($i < count($p_file_list)) && (!$v_delete_file); ++$i) {
@@ -2862,12 +2862,12 @@ 
                 //        if ($p_file_list[$i] == $v_header['filename'])
                 if (($v_len = strcmp($p_file_list[$i], $v_header['filename'])) <= 0) {
                     if (0 == $v_len) {
-                        TrFctMessage(__FILE__, __LINE__, 3, 'Found that ' . $v_header['filename'] . ' need to be deleted');
+                        TrFctMessage(__FILE__, __LINE__, 3, 'Found that '.$v_header['filename'].' need to be deleted');
                         $v_delete_file = true;
                     } else {
-                        TrFctMessage(__FILE__, __LINE__, 3, 'Look if ' . $v_header['filename'] . " is a file in $p_file_list[$i]");
+                        TrFctMessage(__FILE__, __LINE__, 3, 'Look if '.$v_header['filename']." is a file in $p_file_list[$i]");
                         if ('/' === substr($v_header['filename'], strlen($p_file_list[$i]), 1)) {
-                            TrFctMessage(__FILE__, __LINE__, 3, '' . $v_header['filename'] . " is a file in $p_file_list[$i]");
+                            TrFctMessage(__FILE__, __LINE__, 3, ''.$v_header['filename']." is a file in $p_file_list[$i]");
                             $v_delete_file = true;
                         }
                     }
@@ -2876,7 +2876,7 @@ 
 
             // ----- Copy files that do not need to be deleted
             if (!$v_delete_file) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Keep file ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Keep file '.$v_header['filename'].'');
 
                 // ----- Write the file header
                 if ('tar' === $p_tar_mode) {
@@ -2888,7 +2888,7 @@ 
                 // ----- Write the file data
                 $n = ceil($v_header['size'] / 512);
                 for ($i = 0; $i < $n; ++$i) {
-                    TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1));
+                    TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1));
                     if ('tar' === $p_tar_mode) {
                         $v_content = fread($v_tar, 512);
                         fwrite($v_temp_tar, $v_content, 512);
@@ -2899,7 +2899,7 @@ 
                 }
 
                 // ----- File name and properties are logged if listing mode or file is extracted
-                TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].'');
 
                 // ----- Add the array describing the file into the list
                 $p_list_detail[$v_nb]           = $v_header;
@@ -2910,8 +2910,8 @@ 
             } // ----- Look for file that is to be deleted
             else {
                 // ----- Trace
-                TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of ' . $v_header['filename'] . '');
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of '.$v_header['filename'].'');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']');
 
                 // ----- Jump to next file
                 if ('tar' === $p_tar_mode) {
@@ -2920,7 +2920,7 @@ 
                     gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512));
                 }
 
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']');
             }
 
             // ----- Look for end of file
@@ -3006,7 +3006,7 @@ 
             }
 
             // ----- Open a temporary file in write mode
-            $v_temp_tarname = uniqid('pcltar-', true) . '.tmp';
+            $v_temp_tarname = uniqid('pcltar-', true).'.tmp';
             TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname");
             if (0 == ($v_temp_tar = @fopen($v_temp_tarname, 'wb'))) {
                 // ----- Close tar file
@@ -3035,7 +3035,7 @@ 
             }
 
             // ----- Open a temporary file in write mode
-            $v_temp_tarname = uniqid('pcltar-', true) . '.tmp';
+            $v_temp_tarname = uniqid('pcltar-', true).'.tmp';
             TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname");
             if (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) {
                 // ----- Close tar file
@@ -3070,9 +3070,9 @@ 
             }
             if ('' != $p_add_dir) {
                 if ('/' === substr($p_add_dir, -1)) {
-                    $v_stored_list[$i] = $p_add_dir . $v_stored_list[$i];
+                    $v_stored_list[$i] = $p_add_dir.$v_stored_list[$i];
                 } else {
-                    $v_stored_list[$i] = $p_add_dir . '/' . $v_stored_list[$i];
+                    $v_stored_list[$i] = $p_add_dir.'/'.$v_stored_list[$i];
                 }
                 TrFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_file_list[$i]' = '$v_stored_list[$i]'");
             }
@@ -3127,7 +3127,7 @@ 
                 continue;
             }
 
-            TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'");
+            TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'");
 
             // ----- Look for filenames to update
             for ($i = 0, $v_update_file = false, $v_found_file = false; ($i < count($v_stored_list)) && (!$v_update_file); ++$i) {
@@ -3136,8 +3136,8 @@ 
                 // ----- Compare the file names
                 if ($v_stored_list[$i] == $v_header['filename']) {
                     TrFctMessage(__FILE__, __LINE__, 3, "File '$v_stored_list[$i]' is present in archive");
-                    TrFctMessage(__FILE__, __LINE__, 3, "File '$v_stored_list[$i]' mtime=" . filemtime($p_file_list[$i]) . ' ' . date('l dS of F Y h:i:s A', filemtime($p_file_list[$i])));
-                    TrFctMessage(__FILE__, __LINE__, 3, 'Archived mtime=' . $v_header['mtime'] . ' ' . date('l dS of F Y h:i:s A', $v_header['mtime']));
+                    TrFctMessage(__FILE__, __LINE__, 3, "File '$v_stored_list[$i]' mtime=".filemtime($p_file_list[$i]).' '.date('l dS of F Y h:i:s A', filemtime($p_file_list[$i])));
+                    TrFctMessage(__FILE__, __LINE__, 3, 'Archived mtime='.$v_header['mtime'].' '.date('l dS of F Y h:i:s A', $v_header['mtime']));
 
                     // ----- Store found informations
                     $v_found_file       = true;
@@ -3155,13 +3155,13 @@ 
                     // ----- Flag the name in order not to add the file at the end
                     $v_found_list[$i] = 1;
                 } else {
-                    TrFctMessage(__FILE__, __LINE__, 4, "File '$p_file_list[$i]' is not " . $v_header['filename'] . '');
+                    TrFctMessage(__FILE__, __LINE__, 4, "File '$p_file_list[$i]' is not ".$v_header['filename'].'');
                 }
             }
 
             // ----- Copy files that do not need to be updated
             if (!$v_update_file) {
-                TrFctMessage(__FILE__, __LINE__, 2, 'Keep file ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Keep file '.$v_header['filename'].'');
 
                 // ----- Write the file header
                 if ('tar' === $p_tar_mode) {
@@ -3173,7 +3173,7 @@ 
                 // ----- Write the file data
                 $n = ceil($v_header['size'] / 512);
                 for ($j = 0; $j < $n; ++$j) {
-                    TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($j + 1));
+                    TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($j + 1));
                     if ('tar' === $p_tar_mode) {
                         $v_content = fread($v_tar, 512);
                         fwrite($v_temp_tar, $v_content, 512);
@@ -3184,7 +3184,7 @@ 
                 }
 
                 // ----- File name and properties are logged if listing mode or file is extracted
-                TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].'');
 
                 // ----- Add the array describing the file into the list
                 $p_list_detail[$v_nb]           = $v_header;
@@ -3219,7 +3219,7 @@ 
                 }
 
                 // ----- Trace
-                TrFctMessage(__FILE__, __LINE__, 2, 'Skip old file ' . $v_header['filename'] . '');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Skip old file '.$v_header['filename'].'');
 
                 // ----- Jump to next file
                 if ('tar' === $p_tar_mode) {
@@ -3356,10 +3356,10 @@ 
         if (512 != strlen($v_binary_data)) {
             $v_header['filename'] = '';
             $v_header['status']   = 'invalid_header';
-            TrFctMessage(__FILE__, __LINE__, 2, 'Invalid block size : ' . strlen($v_binary_data));
+            TrFctMessage(__FILE__, __LINE__, 2, 'Invalid block size : '.strlen($v_binary_data));
 
             // ----- Error log
-            PclErrorLog(-10, 'Invalid block size : ' . strlen($v_binary_data));
+            PclErrorLog(-10, 'Invalid block size : '.strlen($v_binary_data));
 
             // ----- Return
             TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString());
@@ -3389,9 +3389,9 @@ 
 
         // ----- Extract the checksum for check
         $v_header['checksum'] = octdec(trim($v_data['checksum']));
-        TrFctMessage(__FILE__, __LINE__, 3, 'File checksum : ' . $v_header['checksum'] . '');
+        TrFctMessage(__FILE__, __LINE__, 3, 'File checksum : '.$v_header['checksum'].'');
         if ($v_header['checksum'] != $v_checksum) {
-            TrFctMessage(__FILE__, __LINE__, 2, "File checksum is invalid : $v_checksum calculated, " . $v_header['checksum'] . ' expected');
+            TrFctMessage(__FILE__, __LINE__, 2, "File checksum is invalid : $v_checksum calculated, ".$v_header['checksum'].' expected');
 
             $v_header['filename'] = '';
             $v_header['status']   = 'invalid_header';
@@ -3406,7 +3406,7 @@ 
             }
 
             // ----- Error log
-            PclErrorLog(-13, "Invalid checksum : $v_checksum calculated, " . $v_header['checksum'] . ' expected');
+            PclErrorLog(-13, "Invalid checksum : $v_checksum calculated, ".$v_header['checksum'].' expected');
 
             // ----- Return
             TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString());
@@ -3417,22 +3417,22 @@ 
 
         // ----- Extract the properties
         $v_header['filename'] = trim($v_data['filename']);
-        TrFctMessage(__FILE__, __LINE__, 2, 'Name : ' . $v_header['filename'] . '');
+        TrFctMessage(__FILE__, __LINE__, 2, 'Name : '.$v_header['filename'].'');
         $v_header['mode'] = octdec(trim($v_data['mode']));
-        TrFctMessage(__FILE__, __LINE__, 2, "Mode : '" . decoct($v_header['mode']) . "'");
+        TrFctMessage(__FILE__, __LINE__, 2, "Mode : '".decoct($v_header['mode'])."'");
         $v_header['uid'] = octdec(trim($v_data['uid']));
-        TrFctMessage(__FILE__, __LINE__, 2, "Uid : '" . $v_header['uid'] . "'");
+        TrFctMessage(__FILE__, __LINE__, 2, "Uid : '".$v_header['uid']."'");
         $v_header['gid'] = octdec(trim($v_data['gid']));
-        TrFctMessage(__FILE__, __LINE__, 2, "Gid : '" . $v_header['gid'] . "'");
+        TrFctMessage(__FILE__, __LINE__, 2, "Gid : '".$v_header['gid']."'");
         $v_header['size'] = octdec(trim($v_data['size']));
-        TrFctMessage(__FILE__, __LINE__, 2, "Size : '" . $v_header['size'] . "'");
+        TrFctMessage(__FILE__, __LINE__, 2, "Size : '".$v_header['size']."'");
         $v_header['mtime'] = octdec(trim($v_data['mtime']));
-        TrFctMessage(__FILE__, __LINE__, 2, 'Date : ' . date('l dS of F Y h:i:s A', $v_header['mtime']));
+        TrFctMessage(__FILE__, __LINE__, 2, 'Date : '.date('l dS of F Y h:i:s A', $v_header['mtime']));
         if ('5' == ($v_header['typeflag'] = $v_data['typeflag'])) {
             $v_header['size'] = 0;
-            TrFctMessage(__FILE__, __LINE__, 2, "Size (folder) : '" . $v_header['size'] . "'");
+            TrFctMessage(__FILE__, __LINE__, 2, "Size (folder) : '".$v_header['size']."'");
         }
-        TrFctMessage(__FILE__, __LINE__, 2, 'File typeflag : ' . $v_header['typeflag'] . '');
+        TrFctMessage(__FILE__, __LINE__, 2, 'File typeflag : '.$v_header['typeflag'].'');
         /* ----- All these fields are removed form the header because they do not carry interesting info
     $v_header[link] = trim($v_data[link]);
     TrFctMessage(__FILE__, __LINE__, 2, "Linkname : $v_header[linkname]");
@@ -3612,7 +3612,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 : '');
                         }
                     }
                 }

class/pear/Calendar/docs/examples/11.php

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     public $entry;
 
     /**
-     * @param $calendar
+     * @param Calendar_Day $calendar
      */
     public function __construct($calendar)
     {
@@ -35,7 +35,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return boolean
      */
     public function getEntry()
     {

Spacing +6 added lines, -6 removed lines

@@ -6,9 +6,9 @@ 
 if (!@include 'Calendar/Calendar.php') {
     define('CALENDAR_ROOT', '../../');
 }
-require_once CALENDAR_ROOT . 'Day.php';
-require_once CALENDAR_ROOT . 'Hour.php';
-require_once CALENDAR_ROOT . 'Decorator.php';
+require_once CALENDAR_ROOT.'Day.php';
+require_once CALENDAR_ROOT.'Hour.php';
+require_once CALENDAR_ROOT.'Decorator.php';
 
 // Decorator to "attach" functionality to selected hours
 
@@ -54,9 +54,9 @@ 
         FROM
             diary
         WHERE
-            eventtime >= '" . $Day->thisDay(true) . "'
+            eventtime >= '" . $Day->thisDay(true)."'
         AND
-            eventtime < '" . $Day->nextDay(true) . "';";
+            eventtime < '" . $Day->nextDay(true)."';";
 
 // An array simulating data from a database
 $result = [
@@ -112,7 +112,7 @@ 
 
             // If the hour is selected, call the decorator method...
             if ($Hour->isSelected()) {
-                echo '<td bgcolor="silver">' . $Hour->getEntry() . "</td>\n";
+                echo '<td bgcolor="silver">'.$Hour->getEntry()."</td>\n";
             } else {
                 echo "<td>&nbsp;</td>\n";
             }

class/pear/Calendar/docs/examples/9.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 if (!@include 'Calendar/Calendar.php') {
     define('CALENDAR_ROOT', '../../');
 }
-require_once CALENDAR_ROOT . 'Day.php';
+require_once CALENDAR_ROOT.'Day.php';
 
 $Day = new Calendar_Day(2003, 10, 23);
 

class/pear/Calendar/Engine/Interface.php

Doc Comments +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
      *
      * @param int timestamp (depending on implementation)
      *
-     * @return bool
+     * @return boolean|null
      */
     public function isToday($stamp)
     {

notification_update.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php
 
-include __DIR__ . '/../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/notification_update.php';
+include __DIR__.'/../../mainfile.php';
+include XOOPS_ROOT_PATH.'/include/notification_update.php';

class/pcltrace.lib.php

Doc Comments +8 added lines, -8 removed lines

@@ -146,9 +146,9 @@ 
     //   $p_level : Level of trace required.
     // --------------------------------------------------------------------------------
     /**
-     * @param        $p_file
-     * @param        $p_line
-     * @param        $p_name
+     * @param        string $p_file
+     * @param        integer $p_line
+     * @param        string $p_name
      * @param string $p_param
      * @param string $p_message
      */
@@ -213,8 +213,8 @@ 
     //   $p_level : Level of trace required.
     // --------------------------------------------------------------------------------
     /**
-     * @param        $p_file
-     * @param        $p_line
+     * @param        string $p_file
+     * @param        integer $p_line
      * @param int    $p_return
      * @param string $p_message
      */
@@ -279,9 +279,9 @@ 
     // Parameters :
     // --------------------------------------------------------------------------------
     /**
-     * @param        $p_file
-     * @param        $p_line
-     * @param        $p_level
+     * @param        string $p_file
+     * @param        integer $p_line
+     * @param        integer $p_level
      * @param string $p_message
      */
     function TrFctMessage($p_file, $p_line, $p_level, $p_message = '')

Spacing +11 added lines, -11 removed lines

@@ -170,7 +170,7 @@ 
         if (!isset($g_pcl_trace_name)) {
             $g_pcl_trace_name = $p_name;
         } else {
-            $g_pcl_trace_name .= ',' . $p_name;
+            $g_pcl_trace_name .= ','.$p_name;
         }
 
         // ----- Update the function entry
@@ -398,7 +398,7 @@ 
             echo '<tr>';
             echo '<td><table width=100% border=0 cellspacing=0 cellpadding=0><tr>';
             $n = ($g_pcl_trace_entries[$i]['index'] + 1) * 10;
-            echo '<td width=' . $n . '><table width=100% border=0 cellspacing=0 cellpadding=0><tr>';
+            echo '<td width='.$n.'><table width=100% border=0 cellspacing=0 cellpadding=0><tr>';
 
             for ($j = 0; $j <= $g_pcl_trace_entries[$i]['index']; ++$j) {
                 if ($j == $g_pcl_trace_entries[$i]['index']) {
@@ -415,25 +415,25 @@ 
             echo '<td width=2></td>';
             switch ($g_pcl_trace_entries[$i]['type']) {
                 case 1:
-                    echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '(' . $g_pcl_trace_entries[$i]['param'] . ')</span></td>';
+                    echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'('.$g_pcl_trace_entries[$i]['param'].')</span></td>';
                     break;
                 case 2:
-                    echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '()=' . $g_pcl_trace_entries[$i]['param'] . '</span></td>';
+                    echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'()='.$g_pcl_trace_entries[$i]['param'].'</span></td>';
                     break;
                 case 3:
                 case 4:
                     echo '<td><table width=100% border=0 cellspacing=0 cellpadding=0><td width=20></td><td>';
-                    echo "<span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['message'] . '</span>';
+                    echo "<span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['message'].'</span>';
                     echo '</td></table></td>';
                     break;
                 default:
-                    echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '(' . $g_pcl_trace_entries[$i]['param'] . ')</span></td>';
+                    echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'('.$g_pcl_trace_entries[$i]['param'].')</span></td>';
             }
             echo '</tr></table></td>';
             echo '<td width=5></td>';
-            echo '<td><span style="font-size: xx-small; font-family: $v_font; ">' . basename($g_pcl_trace_entries[$i]['file']) . '</span></td>';
+            echo '<td><span style="font-size: xx-small; font-family: $v_font; ">'.basename($g_pcl_trace_entries[$i]['file']).'</span></td>';
             echo '<td width=5></td>';
-            echo '<td><span style="font-size: xx-small; font-family: $v_font; ">' . $g_pcl_trace_entries[$i]['line'] . '</span></td>';
+            echo '<td><span style="font-size: xx-small; font-family: $v_font; ">'.$g_pcl_trace_entries[$i]['line'].'</span></td>';
             echo '</tr>';
         }
 
@@ -477,12 +477,12 @@ 
                 echo '---';
             }
             if (1 == $p_entry['type']) {
-                echo '<b>' . $p_entry['name'] . '</b>(' . $p_entry['param'] . ') : ' . $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>';
+                echo '<b>'.$p_entry['name'].'</b>('.$p_entry['param'].') : '.$p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>';
             } else {
                 if (2 == $p_entry['type']) {
-                    echo '<b>' . $p_entry['name'] . '</b>()=' . $p_entry['param'] . ' : ' . $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>';
+                    echo '<b>'.$p_entry['name'].'</b>()='.$p_entry['param'].' : '.$p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>';
                 } else {
-                    echo $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>';
+                    echo $p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>';
                 }
             }
         }

class/pear/Calendar/Engine/PearDate.php

Doc Comments +5 added lines, -2 removed lines

@@ -192,6 +192,9 @@ 
      * @param int &$h hour   (13)
      * @param int &$i minute (34)
      * @param int &$s second (53)
+     * @param integer $y
+     * @param integer $m
+     * @param integer $d
      */
     public function adjustDate(&$y, &$m, &$d, &$h, &$i, &$s)
     {
@@ -407,7 +410,7 @@ 
      * @param int $m month (9)
      * @param int $d day (4)
      *
-     * @return array (0, 1, 2, 3, 4, 5, 6) 1 = Monday
+     * @return integer[] (0, 1, 2, 3, 4, 5, 6) 1 = Monday
      */
     public function getWeekDays($y = null, $m = null, $d = null)
     {
@@ -476,7 +479,7 @@ 
     /**
      * Checks if the given day is the current day.
      *
-     * @param mixed $stamp Any timestamp format recognized by Pear::Date
+     * @param string $stamp Any timestamp format recognized by Pear::Date
      *
      * @return bool
      */

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
 /**
  * Load PEAR::Date class.
  */
-require_once __DIR__ . '/Date.php';
+require_once __DIR__.'/Date.php';
 
 /**
  * Performs calendar calculations based on the PEAR::Date class
@@ -86,7 +86,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date->year;
+        return (int) $date->year;
     }
 
     /**
@@ -100,7 +100,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date->month;
+        return (int) $date->month;
     }
 
     /**
@@ -114,7 +114,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date->day;
+        return (int) $date->day;
     }
 
     /**
@@ -128,7 +128,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date->hour;
+        return (int) $date->hour;
     }
 
     /**
@@ -142,7 +142,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date->minute;
+        return (int) $date->minute;
     }
 
     /**
@@ -156,7 +156,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date->second;
+        return (int) $date->second;
     }
 
     /**
@@ -175,7 +175,7 @@ 
     {
         $r = [];
         self::adjustDate($y, $m, $d, $h, $i, $s);
-        $key = $y . $m . $d . $h . $i . $s;
+        $key = $y.$m.$d.$h.$i.$s;
         if (!isset($r[$key])) {
             $r[$key] = sprintf('%04d-%02d-%02d %02d:%02d:%02d', $y, $m, $d, $h, $i, $s);
         }
@@ -286,7 +286,7 @@ 
      */
     public function getDaysInMonth($y, $m)
     {
-        return (int)Date_Calc::daysInMonth($m, $y);
+        return (int) Date_Calc::daysInMonth($m, $y);
     }
 
     /**
@@ -300,7 +300,7 @@ 
      */
     public function getFirstDayInMonth($y, $m)
     {
-        return (int)Date_Calc::dayOfWeek(1, $m, $y);
+        return (int) Date_Calc::dayOfWeek(1, $m, $y);
     }
 
     /**
@@ -347,7 +347,7 @@ 
     public function getWeekNInMonth($y, $m, $d, $firstDay = 1)
     {
         $weekEnd     = (0 == $firstDay) ? $this->getDaysInWeek() - 1 : $firstDay - 1;
-        $end_of_week = (int)Date_Calc::nextDayOfWeek($weekEnd, 1, $m, $y, '%e', true);
+        $end_of_week = (int) Date_Calc::nextDayOfWeek($weekEnd, 1, $m, $y, '%e', true);
         $w           = 1;
         while ($d > $end_of_week) {
             ++$w;
@@ -381,7 +381,7 @@ 
         }
         $daysInTheFirstWeek %= $this->getDaysInWeek();
 
-        return (int)(ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) / $this->getDaysInWeek()) + $weeks);
+        return (int) (ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) / $this->getDaysInWeek()) + $weeks);
     }
 
     /**

class/pear/Calendar/Engine/UnixTS.php

Doc Comments +2 added lines, -2 removed lines

@@ -363,7 +363,7 @@ 
      * @param int $m month (9)
      * @param int $d day (4)
      *
-     * @return array (0,1,2,3,4,5,6) 1 = Monday
+     * @return integer[] (0,1,2,3,4,5,6) 1 = Monday
      */
     public function getWeekDays($y = null, $m = null, $d = null)
     {
@@ -432,7 +432,7 @@ 
     /**
      * Checks if the given day is the current day.
      *
-     * @param mixed $stamp Any timestamp format recognized by Pear::Date
+     * @param integer $stamp Any timestamp format recognized by Pear::Date
      *
      * @return bool
      */

Spacing +7 added lines, -7 removed lines

@@ -95,7 +95,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[0];
+        return (int) $date[0];
     }
 
     /**
@@ -109,7 +109,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[1];
+        return (int) $date[1];
     }
 
     /**
@@ -123,7 +123,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[2];
+        return (int) $date[2];
     }
 
     /**
@@ -137,7 +137,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[3];
+        return (int) $date[3];
     }
 
     /**
@@ -151,7 +151,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[4];
+        return (int) $date[4];
     }
 
     /**
@@ -165,7 +165,7 @@ 
     {
         $date = self::stampCollection($stamp);
 
-        return (int)$date[5];
+        return (int) $date[5];
     }
 
     /**
@@ -336,7 +336,7 @@ 
         }
         $daysInTheFirstWeek %= $this->getDaysInWeek();
 
-        return (int)(ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) / $this->getDaysInWeek()) + $weeks);
+        return (int) (ceil(($this->getDaysInMonth($y, $m) - $daysInTheFirstWeek) / $this->getDaysInWeek()) + $weeks);
     }
 
     /**

class/pear/Calendar/Table/Helper.php

Doc Comments +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
     /**
      * Returns the first day of the month.
      *
-     * @return int
+     * @return string
      *
      * @see    Calendar_Engine_Interface::getFirstDayOfWeek()
      */