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 (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) {
                 // ----- Close tar file
@@ -914,9 +914,9 @@ 
                 }
 
                 // ----- Go to the beginning of last block
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
                 fseek($p_tar, $v_size - 512);
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.($p_mode === 'tar' ? 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 (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) {
                 // ----- Close tar file
@@ -1315,9 +1315,9 @@ 
                 }
 
                 // ----- Go to the beginning of last block
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
                 fseek($p_tar, $v_size - 512);
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
 
                 // ----- Call the adding fct inside the tar
                 if (($v_result = PclTarHandleAddList($p_tar, $p_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir)) == 1) {
@@ -1384,7 +1384,7 @@ 
         // ----- Check the parameters
         if ($p_tar == 0) {
             // ----- 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 =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+            TrFctMessage(__FILE__, __LINE__, 4, 'File position before header ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
 
             // ----- Add the file
             if (($v_result = PclTarHandleAddFile($p_tar, $p_filename, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) {
@@ -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 (($v_result = PclTarHandleAddFile($p_tar, $v_path . $p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) {
+                        if (($v_result = PclTarHandleAddFile($p_tar, $v_path.$p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) {
                             // ----- 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 =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+                TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
             }
         }
 
@@ -1530,7 +1530,7 @@ 
         // ----- Check the parameters
         if ($p_tar == 0) {
             // ----- 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 =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+            TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.($p_mode === 'tar' ? 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 =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+            TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.($p_mode === 'tar' ? 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 =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
+            TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar)));
         }
 
         // ----- Return
@@ -1687,7 +1687,7 @@ 
         // ----- Check the parameters
         if (($p_tar == 0) || ($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 (($v_result = PclTarHandlerDirCheck($v_dir_to_check)) != 1) {
-                        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 && ($v_header['typeflag'] != '5')) {
                     // ----- Open the destination file in write mode
                     if (($v_dest_file = @fopen($v_header['filename'], 'wb')) == 0) {
-                        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 ($p_tar_mode === 'tar') {
                                 $v_content = fread($v_tar, 512);
                             } else {
@@ -2168,7 +2168,7 @@ 
                             fwrite($v_dest_file, $v_content, 512);
                         }
                         if (($v_header['size'] % 512) != 0) {
-                            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 ($p_tar_mode === 'tar') {
                                 $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 [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].'');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']');
 
                 // ----- Jump to next file
                 if ($p_tar_mode === 'tar') {
@@ -2230,7 +2230,7 @@ 
                     gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512));
                 }
 
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']');
             }
 
             if ($p_tar_mode === 'tar') {
@@ -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 [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].'');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']');
 
                 // ----- Jump to next file
                 if ($p_tar_mode === 'tar') {
@@ -2494,7 +2494,7 @@ 
                     gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512));
                 }
 
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']');
             }
 
             if ($p_tar_mode === 'tar') {
@@ -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 (($v_result = PclTarHandlerDirCheck($v_dir_to_check)) != 1) {
-                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 && ($v_header['typeflag'] != '5')) {
             // ----- Open the destination file in write mode
             if (($v_dest_file = @fopen($v_header['filename'], 'wb')) == 0) {
-                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 ($p_tar_mode === 'tar') {
                         $v_content = fread($v_tar, 512);
                     } else {
@@ -2682,7 +2682,7 @@ 
                     fwrite($v_dest_file, $v_content, 512);
                 }
                 if (($v_header['size'] % 512) != 0) {
-                    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 ($p_tar_mode === 'tar') {
                         $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 (($v_temp_tar = @fopen($v_temp_tarname, 'wb')) == 0) {
                 // ----- 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 (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) {
                 // ----- 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 ($v_len == 0) {
-                        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 ($p_tar_mode === 'tar') {
@@ -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 ($p_tar_mode === 'tar') {
                         $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 [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of '.$v_header['filename'].'');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']');
 
                 // ----- Jump to next file
                 if ($p_tar_mode === 'tar') {
@@ -2920,7 +2920,7 @@ 
                     gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512));
                 }
 
-                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']');
+                TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? 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 (($v_temp_tar = @fopen($v_temp_tarname, 'wb')) == 0) {
                 // ----- 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 (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) {
                 // ----- 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 ($p_tar_mode === 'tar') {
@@ -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 ($p_tar_mode === 'tar') {
                         $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 ($p_tar_mode === 'tar') {
@@ -3356,10 +3356,10 @@ 
         if (strlen($v_binary_data) != 512) {
             $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 (($v_header['typeflag'] = $v_data['typeflag']) == '5') {
             $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 = array(
@@ -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/colorTools.php

Spacing +3 added lines, -3 removed lines

@@ -159,9 +159,9 @@
         $tHex = array('', '', '', '');
 
         $tHex[0] = $aColors[0];
-        $tHex[1] = substr('00' . dechex($aColors[1]), -2);
-        $tHex[2] = substr('00' . dechex($aColors[2]), -2);
-        $tHex[3] = substr('00' . dechex($aColors[3]), -2);
+        $tHex[1] = substr('00'.dechex($aColors[1]), -2);
+        $tHex[2] = substr('00'.dechex($aColors[2]), -2);
+        $tHex[3] = substr('00'.dechex($aColors[3]), -2);
 
         $colorHexa = implode('', $tHex);
 

Doc Comments +4 added lines

@@ -255,6 +255,10 @@
      * @param $max
      * @return mixed
      */
+
+    /**
+     * @param integer $min
+     */
     public static function bornerValeur($val, $min, $max)
     {
         if ($val < $min) {

class/form/spin/formspin.php

Spacing +7 added lines, -7 removed lines

@@ -203,7 +203,7 @@ 
      */
     public function setMin($min)
     {
-        $this->_min = (int)$min;
+        $this->_min = (int) $min;
     }
     /*-----------------------------------------------------------------*/
     /**
@@ -221,7 +221,7 @@ 
      */
     public function setMax($max)
     {
-        $this->_max = (int)$max;
+        $this->_max = (int) $max;
     }
 
     /*-----------------------------------------------------------------*/
@@ -242,7 +242,7 @@ 
      */
     public function setSmallIncrement($smallIncrement)
     {
-        $this->_smallIncrement = (int)$smallIncrement;
+        $this->_smallIncrement = (int) $smallIncrement;
         if ($this->_smallIncrement == 0) {
             $this->_smallIncrement = 1;
         }
@@ -264,7 +264,7 @@ 
      */
     public function setLargeIncrement($largeIncrement)
     {
-        $this->_largeIncrement = (int)$largeIncrement;
+        $this->_largeIncrement = (int) $largeIncrement;
         if ($this->_largeIncrement == 0) {
             $this->_largeIncrement = 10;
         }
@@ -405,7 +405,7 @@ 
         $sFolderImg  = "{$sSpinFolder}/images/{$this->getImgFolder()}/";
 
         $prefixe  = $this->getName();
-        $prefixe2 = 'spin' . $prefixe;
+        $prefixe2 = 'spin'.$prefixe;
 
         $smallIncrement = $this->getSmallIncrement();
         $largeIncrement = $this->getLargeIncrement();
@@ -424,7 +424,7 @@ 
         $t = array();
 
         if ($this->_loadJS) {
-            $js  = $sSpinFolder . '/js/spin.js';
+            $js  = $sSpinFolder.'/js/spin.js';
             $t[] = "<script src='{$js}' type='text/javascript'></script>";
         }
 
@@ -469,7 +469,7 @@ 
         //-------------------------------------------------------
 
         $t[] = '  </tr>';
-        $t[] = '</table>' . "\n";
+        $t[] = '</table>'."\n";
         $t[] = '</div>';
         //-------------------------------------------
         $html = implode("\n", $t);

Doc Comments +16 added lines, -11 removed lines

@@ -178,7 +178,7 @@ 
     /**
      * Set the value.
      *
-     * @param  $value int
+     * @param  integer $value int
      */
     public function setValue($value)
     {
@@ -197,7 +197,7 @@ 
     /**
      * Set the min value.
      *
-     * @param  $min int
+     * @param  integer $min int
      */
     public function setMin($min)
     {
@@ -215,7 +215,7 @@ 
     /**
      * Set the max value - must be more great then min.
      *
-     * @param  $max int
+     * @param  integer $max int
      */
     public function setMax($max)
     {
@@ -235,7 +235,7 @@ 
      * Set the small increment when click a short time on up down nutton
      * must be  " > 0 ".
      *
-     * @param $smallIncrement
+     * @param integer $smallIncrement
      *
      * @internal param int $value
      */
@@ -259,7 +259,7 @@ 
     /**
      * Set the large increment when click a long time on up down nutton.
      *
-     * @param  $largeIncrement int
+     * @param  integer $largeIncrement int
      */
     public function setLargeIncrement($largeIncrement)
     {
@@ -282,7 +282,7 @@ 
      * Set the size in nb car of the input text for the value
      * must be 2 car min.
      *
-     * @param  $size mixed
+     * @param  integer $size mixed
      */
     public function setSize($size)
     {
@@ -307,7 +307,7 @@ 
     /**
      * Set the shortname of the folder images.
      *
-     * @param  $folder string
+     * @param  string $folder string
      */
     public function setImgFolder($folder)
     {
@@ -327,7 +327,7 @@ 
     /**
      * Set the label of unites between value and buttons.
      *
-     * @param  $unite string
+     * @param  string $unite string
      */
     public function setUnite($unite)
     {
@@ -345,7 +345,7 @@ 
     /**
      * Set the style CSS of the text.
      *
-     * @param  $style string
+     * @param  string $style string
      */
     public function setStyleText($style)
     {
@@ -365,7 +365,7 @@ 
     /**
      * Set the style CSS of the frame.
      *
-     * @param  $style string
+     * @param  string $style string
      */
     public function setStyleBordure($style)
     {
@@ -385,7 +385,7 @@ 
     /**
      * Set  MinMaxVisible : show the button to go min and max value.
      *
-     * @param  $visible bool
+     * @param  boolean $visible bool
      */
     public function setMinMaxVisible($visible)
     {
@@ -494,6 +494,11 @@ 
      * @param string $default
      * @return string
      */
+
+    /**
+     * @param string $attribut
+     * @param string $value
+     */
     public function htmlAddAttribut($attribut, $value, $default = '')
     {
         $r = '';

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/docs/examples/13.php

Switch Indentation +26 added lines, -26 removed lines

@@ -39,32 +39,32 @@
 }
 
 switch (@$_GET['view']) {
-    default:
-        $_GET['view'] = 'calendar_year';
-    case 'calendar_year':
-        require_once CALENDAR_ROOT . 'Year.php';
-        $c = new Calendar_Year($_GET['y']);
-        break;
-    case 'calendar_month':
-        require_once CALENDAR_ROOT . 'Month.php';
-        $c = new Calendar_Month($_GET['y'], $_GET['m']);
-        break;
-    case 'calendar_day':
-        require_once CALENDAR_ROOT . 'Day.php';
-        $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']);
-        break;
-    case 'calendar_hour':
-        require_once CALENDAR_ROOT . 'Hour.php';
-        $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']);
-        break;
-    case 'calendar_minute':
-        require_once CALENDAR_ROOT . 'Minute.php';
-        $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']);
-        break;
-    case 'calendar_second':
-        require_once CALENDAR_ROOT . 'Second.php';
-        $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
-        break;
+        default:
+            $_GET['view'] = 'calendar_year';
+        case 'calendar_year':
+            require_once CALENDAR_ROOT . 'Year.php';
+            $c = new Calendar_Year($_GET['y']);
+            break;
+        case 'calendar_month':
+            require_once CALENDAR_ROOT . 'Month.php';
+            $c = new Calendar_Month($_GET['y'], $_GET['m']);
+            break;
+        case 'calendar_day':
+            require_once CALENDAR_ROOT . 'Day.php';
+            $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']);
+            break;
+        case 'calendar_hour':
+            require_once CALENDAR_ROOT . 'Hour.php';
+            $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']);
+            break;
+        case 'calendar_minute':
+            require_once CALENDAR_ROOT . 'Minute.php';
+            $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']);
+            break;
+        case 'calendar_second':
+            require_once CALENDAR_ROOT . 'Second.php';
+            $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
+            break;
 }
 
 // Convert timestamp to human readable date

Spacing +17 added lines, -17 removed lines

@@ -9,7 +9,7 @@ 
 {
     list($usec, $sec) = explode(' ', microtime());
 
-    return (float)$usec + (float)$sec;
+    return (float) $usec + (float) $sec;
 }
 
 // Switch to PEAR::Date engine
@@ -42,27 +42,27 @@ 
     default:
         $_GET['view'] = 'calendar_year';
     case 'calendar_year':
-        require_once CALENDAR_ROOT . 'Year.php';
+        require_once CALENDAR_ROOT.'Year.php';
         $c = new Calendar_Year($_GET['y']);
         break;
     case 'calendar_month':
-        require_once CALENDAR_ROOT . 'Month.php';
+        require_once CALENDAR_ROOT.'Month.php';
         $c = new Calendar_Month($_GET['y'], $_GET['m']);
         break;
     case 'calendar_day':
-        require_once CALENDAR_ROOT . 'Day.php';
+        require_once CALENDAR_ROOT.'Day.php';
         $c = new Calendar_Day($_GET['y'], $_GET['m'], $_GET['d']);
         break;
     case 'calendar_hour':
-        require_once CALENDAR_ROOT . 'Hour.php';
+        require_once CALENDAR_ROOT.'Hour.php';
         $c = new Calendar_Hour($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h']);
         break;
     case 'calendar_minute':
-        require_once CALENDAR_ROOT . 'Minute.php';
+        require_once CALENDAR_ROOT.'Minute.php';
         $c = new Calendar_Minute($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i']);
         break;
     case 'calendar_second':
-        require_once CALENDAR_ROOT . 'Second.php';
+        require_once CALENDAR_ROOT.'Second.php';
         $c = new Calendar_Second($_GET['y'], $_GET['m'], $_GET['d'], $_GET['h'], $_GET['i'], $_GET['s']);
         break;
 }
@@ -71,8 +71,8 @@ 
 $date = new Date($c->getTimestamp());
 
 echo '<h1>Using PEAR::Date engine</h1>';
-echo 'Viewing: ' . @$_GET['view'] . '<br>';
-echo 'The time is now: ' . $date->format('%Y %a %e %T') . '<br >';
+echo 'Viewing: '.@$_GET['view'].'<br>';
+echo 'The time is now: '.$date->format('%Y %a %e %T').'<br >';
 
 $i = 1;
 echo '<h1>First Iteration</h1>';
@@ -82,15 +82,15 @@ 
 $c->build();
 while ($e = $c->fetch()) {
     $class  = strtolower(get_class($e));
-    $link   = '&y=' . $e->thisYear() . '&m=' . $e->thisMonth() . '&d=' . $e->thisDay() . '&h=' . $e->thisHour() . '&i=' . $e->thisMinute() . '&s=' . $e->thisSecond();
-    $method = 'this' . str_replace('calendar_', '', $class);
-    echo '<a href="' . $_SERVER['PHP_SELF'] . '?view=' . $class . $link . '">' . $e->{$method}() . '</a> : ';
+    $link   = '&y='.$e->thisYear().'&m='.$e->thisMonth().'&d='.$e->thisDay().'&h='.$e->thisHour().'&i='.$e->thisMinute().'&s='.$e->thisSecond();
+    $method = 'this'.str_replace('calendar_', '', $class);
+    echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$class.$link.'">'.$e->{$method}().'</a> : ';
     if (($i % 10) == 0) {
         echo '<br>';
     }
     ++$i;
 }
-echo '<p><b>Took: ' . (getmicrotime() - $start) . ' seconds</b></p>';
+echo '<p><b>Took: '.(getmicrotime() - $start).' seconds</b></p>';
 
 $i = 1;
 echo '<h1>Second Iteration</h1>';
@@ -99,12 +99,12 @@ 
 $start = getmicrotime();
 while ($e = $c->fetch()) {
     $class  = strtolower(get_class($e));
-    $link   = '&y=' . $e->thisYear() . '&m=' . $e->thisMonth() . '&d=' . $e->thisDay() . '&h=' . $e->thisHour() . '&i=' . $e->thisMinute() . '&s=' . $e->thisSecond();
-    $method = 'this' . str_replace('calendar_', '', $class);
-    echo '<a href="' . $_SERVER['PHP_SELF'] . '?view=' . $class . $link . '">' . $e->{$method}() . '</a> : ';
+    $link   = '&y='.$e->thisYear().'&m='.$e->thisMonth().'&d='.$e->thisDay().'&h='.$e->thisHour().'&i='.$e->thisMinute().'&s='.$e->thisSecond();
+    $method = 'this'.str_replace('calendar_', '', $class);
+    echo '<a href="'.$_SERVER['PHP_SELF'].'?view='.$class.$link.'">'.$e->{$method}().'</a> : ';
     if (($i % 10) == 0) {
         echo '<br>';
     }
     ++$i;
 }
-echo '<p><b>Took: ' . (getmicrotime() - $start) . ' seconds</b></p>';
+echo '<p><b>Took: '.(getmicrotime() - $start).' seconds</b></p>';

include/notification.inc.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
         $event        = $eventHandler->getEvent($itemId, 0, true);
         $item['name'] = $event->getVar('event_title');
-        $item['url']  = XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id');
+        $item['url']  = XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id');
 
         return $item;
     }

class/ExtcalPersistableObjectHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -536,7 +536,7 @@
 
     /**
      * @param        $objects
-     * @param array  $externalKeys
+     * @param string[]  $externalKeys
      * @param string $format
      *
      * @return array

Spacing +44 added lines, -44 removed lines

@@ -100,10 +100,10 @@ 
         if (is_array($this->keyName)) {
             $criteria = new CriteriaCompo();
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                $criteria->add(new Criteria($this->keyName[$i], (int)$id[$i]));
+                $criteria->add(new Criteria($this->keyName[$i], (int) $id[$i]));
             }
         } else {
-            $criteria = new Criteria($this->keyName, (int)$id);
+            $criteria = new Criteria($this->keyName, (int) $id);
         }
         $criteria->setLimit(1);
         $objectArray = $this->getObjects($criteria, false, true);
@@ -127,11 +127,11 @@ 
     {
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->table;
+        $sql   = 'SELECT * FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -166,7 +166,7 @@ 
                     $ret[] = $obj;
                 } else {
                     $row  = array();
-                    $vars =& $obj->getVars();
+                    $vars = & $obj->getVars();
                     foreach (array_keys($vars) as $i) {
                         $row[$i] = $obj->getVar($i);
                     }
@@ -177,7 +177,7 @@ 
                     $ret[$myrow[$this->keyName]] = $obj;
                 } else {
                     $row  = array();
-                    $vars =& $obj->getVars();
+                    $vars = & $obj->getVars();
                     foreach (array_keys($vars) as $i) {
                         $row[$i] = $obj->getVar($i);
                     }
@@ -210,15 +210,15 @@ 
             $criteria->setSort($this->identifierName);
         }
 
-        $sql = 'SELECT ' . $this->keyName;
+        $sql = 'SELECT '.$this->keyName;
         if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->identifierName;
+            $sql .= ', '.$this->identifierName;
         }
-        $sql .= ' FROM ' . $this->table;
+        $sql .= ' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -251,12 +251,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             if ($criteria->groupby != '') {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
+        $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -292,13 +292,13 @@ 
         if (is_array($this->keyName)) {
             $clause = array();
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                $clause[] = $this->keyName[$i] . ' = ' . $id[$i];
+                $clause[] = $this->keyName[$i].' = '.$id[$i];
             }
             $whereclause = implode(' AND ', $clause);
         } else {
-            $whereclause = $this->keyName . ' = ' . $id;
+            $whereclause = $this->keyName.' = '.$id;
         }
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
+        $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause;
         if (false !== $force) {
             $result = $this->db->queryF($sql);
         } else {
@@ -329,7 +329,7 @@ 
             }
 
             if (!($obj instanceof $this->className && class_exists($this->className))) {
-                $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
+                $obj->setErrors(get_class($obj).' Differs from '.$this->className);
 
                 return false;
             }
@@ -340,7 +340,7 @@ 
 
         foreach ($obj->cleanVars as $k => $v) {
             if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
-                $cleanvars[$k] = (int)$v;
+                $cleanvars[$k] = (int) $v;
             } elseif (is_array($v)) {
                 $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
             } else {
@@ -350,12 +350,12 @@ 
         if ($obj->isNew()) {
             if (!is_array($this->keyName)) {
                 if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
                 }
             }
-            $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
+            $sql = 'INSERT INTO '.$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')';
         } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
+            $sql = 'UPDATE '.$this->table.' SET';
             foreach ($cleanvars as $key => $value) {
                 if ((!is_array($this->keyName) && $key == $this->keyName)
                     || (is_array($this->keyName)
@@ -366,7 +366,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql      .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -375,12 +375,12 @@ 
                     if ($i > 0) {
                         $whereclause .= ' AND ';
                     }
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                    $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
                 }
             } else {
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+                $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
             }
-            $sql .= ' WHERE ' . $whereclause;
+            $sql .= ' WHERE '.$whereclause;
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -409,7 +409,7 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, CriteriaElement $criteria = null, $force = false)
     {
-        $setClause = $fieldname . ' = ';
+        $setClause = $fieldname.' = ';
         if (is_numeric($fieldvalue)) {
             $setClause .= $fieldvalue;
         } elseif (is_array($fieldvalue)) {
@@ -417,9 +417,9 @@ 
         } else {
             $setClause .= $this->db->quoteString($fieldvalue);
         }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $setClause;
+        $sql = 'UPDATE '.$this->table.' SET '.$setClause;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -443,9 +443,9 @@ 
      */
     public function updateFieldValue($fieldname, $fieldvalue, $criteria = null, $force = true)
     {
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldvalue;
+        $sql = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldvalue;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);
@@ -472,8 +472,8 @@ 
     public function deleteAll(CriteriaElement $criteria = null, $force = true, $asObject = false)
     {
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql = 'DELETE FROM '.$this->table;
+            $sql .= ' '.$criteria->renderWhere();
             if (!$this->db->query($sql)) {
                 return false;
             }
@@ -607,8 +607,8 @@ 
      */
     public function updateCounter($fieldname, $criteria, $op = '+')
     {
-        $sql    = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldname . $op . '1';
-        $sql    .= ' ' . $criteria->renderWhere();
+        $sql    = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldname.$op.'1';
+        $sql .= ' '.$criteria->renderWhere();
         $result = $this->db->queryF($sql);
         if (!$result) {
             return false;
@@ -630,12 +630,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             if ($criteria->groupby != '') {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . "SUM($sum) FROM " . $this->table;
+        $sql = 'SELECT '.$field."SUM($sum) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -671,12 +671,12 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             if ($criteria->groupby != '') {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
-        $sql = 'SELECT ' . $field . "MAX($max) FROM " . $this->table;
+        $sql = 'SELECT '.$field."MAX($max) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -709,9 +709,9 @@ 
     {
         $field = '';
 
-        $sql = 'SELECT ' . $field . "AVG($avg) FROM " . $this->table;
+        $sql = 'SELECT '.$field."AVG($avg) FROM ".$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {

class/pear/Calendar/Decorator.php

Doc Comments +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
     /**
      * Returns the date as an associative array (helper method).
      *
-     * @param mixed $stamp timestamp (leave empty for current timestamp)
+     * @param integer $stamp timestamp (leave empty for current timestamp)
      *
      * @return array
      */
@@ -242,7 +242,7 @@ 
      *
      * @param array $sDates array containing Calendar objects to select (optional)
      *
-     * @return bool
+     * @return boolean|null
      * @abstract
      */
     public function build($sDates = array())

Spacing +7 added lines, -7 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function __construct(&$calendar)
     {
-        $this->calendar =& $calendar;
+        $this->calendar = & $calendar;
     }
 
     /**
@@ -403,8 +403,8 @@ 
         if (method_exists($this->calendar, 'prevWeek')) {
             return $this->calendar->prevWeek($format);
         } else {
-            require_once __DIR__ . '/PEAR.php';
-            PEAR::raiseError('Cannot call prevWeek on Calendar object of type: ' . get_class($this->calendar), 133, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Decorator::prevWeek()');
+            require_once __DIR__.'/PEAR.php';
+            PEAR::raiseError('Cannot call prevWeek on Calendar object of type: '.get_class($this->calendar), 133, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Decorator::prevWeek()');
 
             return false;
         }
@@ -422,8 +422,8 @@ 
         if (method_exists($this->calendar, 'thisWeek')) {
             return $this->calendar->thisWeek($format);
         } else {
-            require_once __DIR__ . '/PEAR.php';
-            PEAR::raiseError('Cannot call thisWeek on Calendar object of type: ' . get_class($this->calendar), 133, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Decorator::thisWeek()');
+            require_once __DIR__.'/PEAR.php';
+            PEAR::raiseError('Cannot call thisWeek on Calendar object of type: '.get_class($this->calendar), 133, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Decorator::thisWeek()');
 
             return false;
         }
@@ -441,8 +441,8 @@ 
         if (method_exists($this->calendar, 'nextWeek')) {
             return $this->calendar->nextWeek($format);
         } else {
-            require_once __DIR__ . '/PEAR.php';
-            PEAR::raiseError('Cannot call thisWeek on Calendar object of type: ' . get_class($this->calendar), 133, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Decorator::nextWeek()');
+            require_once __DIR__.'/PEAR.php';
+            PEAR::raiseError('Cannot call thisWeek on Calendar object of type: '.get_class($this->calendar), 133, PEAR_ERROR_TRIGGER, E_USER_NOTICE, 'Calendar_Decorator::nextWeek()');
 
             return false;
         }