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

Indentation +2 added lines, -2 removed lines

@@ -2418,7 +2418,7 @@ 
         $p_tar_mode
     ) {
         TrFctStart(__FILE__, __LINE__, 'PclTarHandleExtractByIndex',
-                   "archive_descr='$p_tar', index_current=$p_index_current, index_start='$p_index_start', index_stop='$p_index_stop', list, path=$p_path, remove_path='$p_remove_path', tar_mode=$p_tar_mode");
+                    "archive_descr='$p_tar', index_current=$p_index_current, index_start='$p_index_start', index_stop='$p_index_stop', list, path=$p_path, remove_path='$p_remove_path', tar_mode=$p_tar_mode");
         $v_result = 1;
         $v_nb     = 0;
 
@@ -2621,7 +2621,7 @@ 
                 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']) . ')');
+                                        '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';

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
@@ -839,7 +839,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
@@ -862,7 +862,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
@@ -915,9 +915,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
@@ -1208,7 +1208,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
@@ -1231,7 +1231,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
@@ -1316,9 +1316,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) {
@@ -1385,7 +1385,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());
@@ -1440,7 +1440,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) {
@@ -1460,7 +1460,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
@@ -1469,11 +1469,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);
 
@@ -1484,10 +1484,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);
                     }
                 }
@@ -1495,7 +1495,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)));
             }
         }
 
@@ -1531,7 +1531,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());
@@ -1559,7 +1559,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);
@@ -1573,9 +1573,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'");
         }
@@ -1612,7 +1612,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;
@@ -1630,7 +1630,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
@@ -1641,7 +1641,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
@@ -1688,7 +1688,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());
@@ -1701,7 +1701,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);
@@ -1902,7 +1902,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 /)
@@ -1997,29 +1997,29 @@ 
                 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
@@ -2029,7 +2029,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
@@ -2040,7 +2040,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
@@ -2051,10 +2051,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
@@ -2068,22 +2068,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';
@@ -2094,7 +2094,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';
@@ -2128,7 +2128,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';
@@ -2143,7 +2143,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';
@@ -2156,12 +2156,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 {
@@ -2170,7 +2170,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 {
@@ -2198,7 +2198,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());
@@ -2209,7 +2209,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');
@@ -2222,8 +2222,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') {
@@ -2232,7 +2232,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') {
@@ -2243,7 +2243,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']) {
@@ -2318,7 +2318,7 @@ 
             || ((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 /)
@@ -2466,14 +2466,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;
             }
 
@@ -2488,8 +2488,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') {
@@ -2498,7 +2498,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') {
@@ -2509,7 +2509,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']) {
@@ -2566,10 +2566,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
@@ -2583,22 +2583,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';
@@ -2609,7 +2609,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';
@@ -2621,7 +2621,7 @@ 
                 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']) . ')');
+                                     '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';
@@ -2645,7 +2645,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';
@@ -2660,7 +2660,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';
@@ -2673,12 +2673,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 {
@@ -2687,7 +2687,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 {
@@ -2708,7 +2708,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());
@@ -2719,7 +2719,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');
@@ -2773,7 +2773,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
@@ -2802,7 +2802,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
@@ -2859,7 +2859,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) {
@@ -2867,12 +2867,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;
                         }
                     }
@@ -2881,7 +2881,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') {
@@ -2893,7 +2893,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);
@@ -2904,7 +2904,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;
@@ -2915,8 +2915,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') {
@@ -2925,7 +2925,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
@@ -3011,7 +3011,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
@@ -3040,7 +3040,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
@@ -3075,9 +3075,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]'");
             }
@@ -3132,7 +3132,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) {
@@ -3141,8 +3141,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;
@@ -3160,13 +3160,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') {
@@ -3178,7 +3178,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);
@@ -3189,7 +3189,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;
@@ -3224,7 +3224,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') {
@@ -3361,10 +3361,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());
@@ -3394,9 +3394,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';
@@ -3411,7 +3411,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());
@@ -3422,22 +3422,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]");
@@ -3617,7 +3617,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()
     {

versions/extcal_2_04.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     {
         global $xoopsDB;
 
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('extcal_event') . "` ADD `event_nbmember` tinyint(4) NOT NULL default '0' AFTER `event_submitdate` ;";
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('extcal_event')."` ADD `event_nbmember` tinyint(4) NOT NULL default '0' AFTER `event_submitdate` ;";
         $xoopsDB->query($sql);
     }
 

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 = '';

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;
     }

language/english/main.php

Spacing +36 added lines, -36 removed lines

@@ -1,34 +1,34 @@ 
 <?php
-include_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/calendar.php';
+include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php';
 define('_MD_CLEAR_CRITERIA', 'clear criteria');
-define('_MD_EXTCAL_1_FR', '1st ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_1_MO', '1st ' . _CAL_MONDAY);
-define('_MD_EXTCAL_1_SA', '1st ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_1_SU', '1st ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_1_TH', '1st ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_1_TU', '1st ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_1_WE', '1st ' . _CAL_WEDNESDAY);
-define('_MD_EXTCAL_2_FR', '2nd ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_2_MO', '2nd ' . _CAL_MONDAY);
-define('_MD_EXTCAL_2_SA', '2nd ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_2_SU', '2nd ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_2_TH', '2nd ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_2_TU', '2nd ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_2_WE', '2nd ' . _CAL_WEDNESDAY);
-define('_MD_EXTCAL_3_FR', '3rd ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_3_MO', '3rd ' . _CAL_MONDAY);
-define('_MD_EXTCAL_3_SA', '3rd ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_3_SU', '3rd ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_3_TH', '3rd ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_3_TU', '3rd ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_3_WE', '3rd ' . _CAL_WEDNESDAY);
-define('_MD_EXTCAL_4_FR', '4th ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_4_MO', '4th ' . _CAL_MONDAY);
-define('_MD_EXTCAL_4_SA', '4th ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_4_SU', '4th ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_4_TH', '4th ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_4_TU', '4th ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_4_WE', '4th ' . _CAL_WEDNESDAY);
+define('_MD_EXTCAL_1_FR', '1st '._CAL_FRIDAY);
+define('_MD_EXTCAL_1_MO', '1st '._CAL_MONDAY);
+define('_MD_EXTCAL_1_SA', '1st '._CAL_SATURDAY);
+define('_MD_EXTCAL_1_SU', '1st '._CAL_SUNDAY);
+define('_MD_EXTCAL_1_TH', '1st '._CAL_THURSDAY);
+define('_MD_EXTCAL_1_TU', '1st '._CAL_TUESDAY);
+define('_MD_EXTCAL_1_WE', '1st '._CAL_WEDNESDAY);
+define('_MD_EXTCAL_2_FR', '2nd '._CAL_FRIDAY);
+define('_MD_EXTCAL_2_MO', '2nd '._CAL_MONDAY);
+define('_MD_EXTCAL_2_SA', '2nd '._CAL_SATURDAY);
+define('_MD_EXTCAL_2_SU', '2nd '._CAL_SUNDAY);
+define('_MD_EXTCAL_2_TH', '2nd '._CAL_THURSDAY);
+define('_MD_EXTCAL_2_TU', '2nd '._CAL_TUESDAY);
+define('_MD_EXTCAL_2_WE', '2nd '._CAL_WEDNESDAY);
+define('_MD_EXTCAL_3_FR', '3rd '._CAL_FRIDAY);
+define('_MD_EXTCAL_3_MO', '3rd '._CAL_MONDAY);
+define('_MD_EXTCAL_3_SA', '3rd '._CAL_SATURDAY);
+define('_MD_EXTCAL_3_SU', '3rd '._CAL_SUNDAY);
+define('_MD_EXTCAL_3_TH', '3rd '._CAL_THURSDAY);
+define('_MD_EXTCAL_3_TU', '3rd '._CAL_TUESDAY);
+define('_MD_EXTCAL_3_WE', '3rd '._CAL_WEDNESDAY);
+define('_MD_EXTCAL_4_FR', '4th '._CAL_FRIDAY);
+define('_MD_EXTCAL_4_MO', '4th '._CAL_MONDAY);
+define('_MD_EXTCAL_4_SA', '4th '._CAL_SATURDAY);
+define('_MD_EXTCAL_4_SU', '4th '._CAL_SUNDAY);
+define('_MD_EXTCAL_4_TH', '4th '._CAL_THURSDAY);
+define('_MD_EXTCAL_4_TU', '4th '._CAL_TUESDAY);
+define('_MD_EXTCAL_4_WE', '4th '._CAL_WEDNESDAY);
 define('_MD_EXTCAL_ABSENT', 'Absent');
 define('_MD_EXTCAL_ACTION_COME', 'Register');
 define('_MD_EXTCAL_ACTION_DELEGATION', 'Delegate');
@@ -109,13 +109,13 @@ 
 define('_MD_EXTCAL_JAN', 'Jan');
 define('_MD_EXTCAL_JUL', 'Jul');
 define('_MD_EXTCAL_JUN', 'Jun');
-define('_MD_EXTCAL_LAST_FR', 'Last ' . _CAL_FRIDAY);
-define('_MD_EXTCAL_LAST_MO', 'Last ' . _CAL_MONDAY);
-define('_MD_EXTCAL_LAST_SA', 'Last ' . _CAL_SATURDAY);
-define('_MD_EXTCAL_LAST_SU', 'Last ' . _CAL_SUNDAY);
-define('_MD_EXTCAL_LAST_TH', 'Last ' . _CAL_THURSDAY);
-define('_MD_EXTCAL_LAST_TU', 'Last ' . _CAL_TUESDAY);
-define('_MD_EXTCAL_LAST_WE', 'Last ' . _CAL_WEDNESDAY);
+define('_MD_EXTCAL_LAST_FR', 'Last '._CAL_FRIDAY);
+define('_MD_EXTCAL_LAST_MO', 'Last '._CAL_MONDAY);
+define('_MD_EXTCAL_LAST_SA', 'Last '._CAL_SATURDAY);
+define('_MD_EXTCAL_LAST_SU', 'Last '._CAL_SUNDAY);
+define('_MD_EXTCAL_LAST_TH', 'Last '._CAL_THURSDAY);
+define('_MD_EXTCAL_LAST_TU', 'Last '._CAL_TUESDAY);
+define('_MD_EXTCAL_LAST_WE', 'Last '._CAL_WEDNESDAY);
 define('_MD_EXTCAL_LIB_COME', 'Register');
 define('_MD_EXTCAL_LIB_NONE', 'None');
 define('_MD_EXTCAL_LIB_NOTCOME', 'Unsubscribe');

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

@@ -83,10 +83,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);
@@ -110,11 +110,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();
@@ -149,7 +149,7 @@ 
                     $ret[] = $obj;
                 } else {
                     $row  = array();
-                    $vars =& $obj->getVars();
+                    $vars = & $obj->getVars();
                     foreach (array_keys($vars) as $i) {
                         $row[$i] = $obj->getVar($i);
                     }
@@ -160,7 +160,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);
                     }
@@ -193,15 +193,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();
@@ -234,12 +234,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();
             }
@@ -275,13 +275,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 {
@@ -312,7 +312,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;
             }
@@ -323,7 +323,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 {
@@ -333,12 +333,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)
@@ -349,7 +349,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -358,12 +358,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);
@@ -392,7 +392,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)) {
@@ -400,9 +400,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);
@@ -426,9 +426,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);
@@ -455,8 +455,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;
             }
@@ -590,8 +590,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;
@@ -613,12 +613,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();
             }
@@ -654,12 +654,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();
             }
@@ -692,9 +692,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())