mambax7 / extcal

blocks/minical.php

Doc Comments +4 added lines, -4 removed lines

@@ -417,11 +417,11 @@
 /**
  * @param $event
  * @param $eventsArray
- * @param $extcalTimeHandler
- * @param $startMonth
- * @param $endMonth
+ * @param ExtcalTime $extcalTimeHandler
+ * @param integer $startMonth
+ * @param integer $endMonth
  * @param $cats
- * @return bool
+ * @return false|null
  */
 function bExtcalMinicalAddEventToArray(&$event, &$eventsArray, $extcalTimeHandler, $startMonth, $endMonth, $cats)
 {

Indentation +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
     // Flag current day
     $selectedDays = array(
         new Calendar_Day(date('Y', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))), date('n', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser']))),
-                         date('j', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))),
+                            date('j', xoops_getUserTimestamp(time(), $extcalTimeHandler->_getUserTimeZone($GLOBALS['xoopsUser'])))),
     );
 
     // Build calendar object

Spacing +20 added lines, -20 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 global $extcalConfig, $xoopsUser;
-include_once __DIR__ . '/../include/constantes.php';
-include_once __DIR__ . '/../class/utilities.php';
-include_once __DIR__ . '/../class/tableForm.php';
+include_once __DIR__.'/../include/constantes.php';
+include_once __DIR__.'/../class/utilities.php';
+include_once __DIR__.'/../class/tableForm.php';
 //---------------------------------------------------------------------------
 /**
  * @param $options
@@ -16,11 +16,11 @@ 
 
     extcal_getDefautminicalOption($options);
 
-    include_once __DIR__ . '/../class/config.php';
+    include_once __DIR__.'/../class/config.php';
 
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Util/Textual.php';
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weeks.php';
-    require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Day.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Util/Textual.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weeks.php';
+    require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Day.php';
     //     require_once CALENDAR_ROOT . 'Month/Weeks.php';
     //     require_once CALENDAR_ROOT . 'Day.php';
 
@@ -106,7 +106,7 @@ 
             'cat'          => $tCatSelected,
             'externalKeys' => 'cat_id',
         );
-        $events   = $eventHandler->getEventsOnPeriode($criteres);
+        $events = $eventHandler->getEventsOnPeriode($criteres);
     } else {
         $events = array();
     }
@@ -168,7 +168,7 @@ 
                 'number'     => $dayCalObj->thisDay(),
                 'isSelected' => $dayCalObj->isSelected(),
             );
-            $day                                = $dayCalObj->thisDay();
+            $day = $dayCalObj->thisDay();
             if (isset($eventsArray[$day]) && !$dayCalObj->isEmpty()) {
                 $tableRows[$rowId]['week'][$cellId]['haveEvents'] = true;
                 $tableRows[$rowId]['week'][$cellId]['color']      = $eventsArray[$day]['color'];
@@ -198,15 +198,15 @@ 
     // Making navig data
     $navig = array(
         'page' => $extcalConfig['start_page'],
-        'uri'  => 'year=' . $monthCalObj->thisYear() . '&amp;month=' . $monthCalObj->thisMonth(),
+        'uri'  => 'year='.$monthCalObj->thisYear().'&amp;month='.$monthCalObj->thisMonth(),
         'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_month'], $monthCalObj->getTimestamp()),
     );
 
     $horloge             = array();
     $horloge['display']  = (trim($options[11]) != '');
-    $horloge['fullName'] = XOOPS_URL . _EXTCAL_PATH_HORLOGES . $options[11];
-    $horloge['width']    = $options[12] . 'px';
-    $horloge['height']   = $options[13] . 'px';
+    $horloge['fullName'] = XOOPS_URL._EXTCAL_PATH_HORLOGES.$options[11];
+    $horloge['width']    = $options[12].'px';
+    $horloge['height']   = $options[13].'px';
 
     $ret = array(
         'imageParam'   => $imageParam,
@@ -232,7 +232,7 @@ 
  */
 function bExtcalMinicalEdit($options)
 {
-    include_once __DIR__ . '/../class/form/spin/formspin.php';
+    include_once __DIR__.'/../class/form/spin/formspin.php';
     global $xoopsUser;
 
     //  $t = print_r(get_defined_vars(),true);
@@ -253,7 +253,7 @@ 
     $imageCatHandler = xoops_getHandler('imagecategory');
 
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SLIDE_SHOW . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SLIDE_SHOW.'</div>', 'head');
 
     $k           = 0;
     $xfValue[$k] = new XoopsFormRadio(_MB_EXTCAL_DISPLAY_IMG, "options[{$k}]", $options[$k]);
@@ -294,7 +294,7 @@ 
     $xfValue[$k] = new ExtcalFormSpin(_MB_EXTCAL_SS_NB_PHOTOS, "options[{$k}]", $options[$k], 0, 50, 1, 0, 8, _MB_EXTCAL_PX, $imgFolder = '');
     $form->addElement($xfValue[$k], false);
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_OPT_SHOW . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_OPT_SHOW.'</div>', 'head');
 
     $t = array(
         -1 => _MB_EXTCAL_PREVIEW,
@@ -333,9 +333,9 @@ 
     $form->addElement($xfValue[$k], false);
 
     //=====================================================================
-    $form->insertBreak('<div style="text-align: center;font-weight: bold;">' . _MB_EXTCAL_HORLOGE_OPT . '</div>', 'head');
+    $form->insertBreak('<div style="text-align: center;font-weight: bold;">'._MB_EXTCAL_HORLOGE_OPT.'</div>', 'head');
     //---------------------------------------------------------------------
-    $t = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . _EXTCAL_PATH_HORLOGES);
+    $t = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH._EXTCAL_PATH_HORLOGES);
     $t = array_merge(array(' ' => _NONE), $t);
 
     $k           = 11;
@@ -418,12 +418,12 @@ 
         // $src   = $doc->createElement('src');
         $src   = clone $tempSrc;
         $src   = $photo->appendChild($src);
-        $value = $doc->createTextNode(XOOPS_URL . '/uploads/' . $images->getVar('image_name'));
+        $value = $doc->createTextNode(XOOPS_URL.'/uploads/'.$images->getVar('image_name'));
         $src->appendChild($value);
     }
 
     // get completed xml document
-    $xml_string = $doc->save(XOOPS_ROOT_PATH . '/cache/extcalSlideShowParam.xml');
+    $xml_string = $doc->save(XOOPS_ROOT_PATH.'/cache/extcalSlideShowParam.xml');
 }
 
 /**************************************************************************/

class/colorTools.php

Doc Comments +4 added lines

@@ -264,6 +264,10 @@
      * @param $max
      * @return
 */
+
+    /**
+     * @param integer $min
+     */
     Function bornerValeur($val, $min, $max)
     {
 

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

class/event.php

Doc Comments +5 added lines, -5 removed lines

@@ -633,7 +633,7 @@ 
      * @param     $cat
      * @param int $nbDays
      *
-     * @return CriteriaCompo
+     * @return null|CriteriaElement
      */
     function _getEventWeekCriteria($day, $month, $year, $cat, $nbDays = 7)
     {
@@ -655,7 +655,7 @@ 
      * @param $year
      * @param $cat
      *
-     * @return CriteriaCompo
+     * @return null|CriteriaElement
      */
     function _getEventMonthCriteria($month, $year, $cat)
     {
@@ -676,7 +676,7 @@ 
      * @param     $year
      * @param int $cat
      *
-     * @return CriteriaCompo
+     * @return null|CriteriaElement
      */
     function _getEventYearCriteria($year, $cat = 0)
     {
@@ -760,7 +760,7 @@ 
     /**
      * @param $start
      * @param $end
-     * @param $cat
+     * @param integer $cat
      * @param $user
      *
      * @return CriteriaCompo
@@ -1763,7 +1763,7 @@ 
 
     /**
      * @param $month
-     * @param $year
+     * @param string $year
      * @param $dayCode
      *
      * @return int

Spacing +47 added lines, -47 removed lines

@@ -2,13 +2,13 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once __DIR__ . '/ExtcalPersistableObjectHandler.php';
-include_once __DIR__ . '/perm.php';
-include_once __DIR__ . '/time.php';
-include_once __DIR__ . '/config.php';
-include_once __DIR__ . '/extDateTime.php';
-include_once __DIR__ . '/utilities.php';
-include_once __DIR__ . '/../include/constantes.php';
+include_once __DIR__.'/ExtcalPersistableObjectHandler.php';
+include_once __DIR__.'/perm.php';
+include_once __DIR__.'/time.php';
+include_once __DIR__.'/config.php';
+include_once __DIR__.'/extDateTime.php';
+include_once __DIR__.'/utilities.php';
+include_once __DIR__.'/../include/constantes.php';
 
 /**
  * Class ExtcalEvent.
@@ -49,7 +49,7 @@ 
         $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false);
         $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false);
 
-        $this->externalKey['cat_id']          = array(
+        $this->externalKey['cat_id'] = array(
             'className'      => 'cat',
             'getMethodeName' => 'getCat',
             'keyName'        => 'cat',
@@ -382,7 +382,7 @@ 
         $eventArray = array();
 
         while (list($k, $v) = each($events)) {
-            $ordre[] = (int)$v['event_start'];
+            $ordre[] = (int) $v['event_start'];
             $this->formatEventDate($v, $extcalConfig['event_date_week']);
             //$v['cat']['cat_light_color'] = $v['cat']['cat_color'];
             $v['cat']['cat_light_color'] = ExtcalUtilities::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX);
@@ -583,7 +583,7 @@ 
 
         reset($period);
         foreach ($period as $dt) {
-            echo $dt->format("l d-m-Y H:i:s\n") . '<br>';
+            echo $dt->format("l d-m-Y H:i:s\n").'<br>';
         }
     }
 
@@ -909,10 +909,10 @@ 
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
         $count                = count($authorizedAccessCats);
         if ($count > 0) {
-            $in = '(' . $authorizedAccessCats[0];
+            $in = '('.$authorizedAccessCats[0];
             array_shift($authorizedAccessCats);
             foreach ($authorizedAccessCats as $authorizedAccessCat) {
-                $in .= ',' . $authorizedAccessCat;
+                $in .= ','.$authorizedAccessCat;
             }
             $in .= ')';
             $criteria->add(new Criteria('cat_id', $in, 'IN'));
@@ -932,10 +932,10 @@ 
         }
         if (is_array($cats)) {
             if (array_search(0, $cats) === false) {
-                $in = '(' . current($cats);
+                $in = '('.current($cats);
                 array_shift($cats);
                 foreach ($cats as $cat) {
-                    $in .= ',' . $cat;
+                    $in .= ','.$cat;
                 }
                 $in .= ')';
                 $criteria->add(new Criteria('cat_id', $in, 'IN'));
@@ -958,7 +958,7 @@ 
         $fileHandler = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE);
 
         /***************************************************/
-        include_once __DIR__ . '/etablissement.php';
+        include_once __DIR__.'/etablissement.php';
         if ($siteSide === 'admin') {
             $action = 'event.php?op=enreg';
             $cats   = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all');
@@ -976,7 +976,7 @@ 
             if ($mode === 'clone') {
                 $data['event_id'] = 0;
                 $event->setVar('event_id', 0);
-                $newTitle = $event->getVar('event_title') . ' (' . _AM_EXTCAL_CLONE_OF . $data['event_id'] . ')';
+                $newTitle = $event->getVar('event_title').' ('._AM_EXTCAL_CLONE_OF.$data['event_id'].')';
                 $event->setVar('event_title', $newTitle);
             }
 
@@ -1160,7 +1160,7 @@ 
         $form->addElement($catSelect, true);
         //-----------------------------------------------------------
 
-        $file_path = __DIR__ . '/../assets/css/images';
+        $file_path = __DIR__.'/../assets/css/images';
         $tf        = XoopsLists::getImgListAsArray($file_path);
         array_unshift($tf, _MD_EXTCAL_NONE);
         $xfIcones = new XoopsFormSelect(_MD_EXTCAL_ICONE, 'event_icone', $event_icone, '');
@@ -1265,7 +1265,7 @@ 
         if (count($files) > 0) {
             $eventFiles = new ExtcalFormFileCheckBox('', 'filetokeep');
             foreach ($files as $file) {
-                $name = $file['file_nicename'] . ' (<i>' . $file['file_mimetype'] . '</i>) ' . $file['formated_file_size'];
+                $name = $file['file_nicename'].' (<i>'.$file['file_mimetype'].'</i>) '.$file['formated_file_size'];
                 $eventFiles->addOption($file['file_id'], $name);
             }
             $fileElmtTray->addElement($eventFiles);
@@ -1281,7 +1281,7 @@ 
         //Picture1
         $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 1), '');
         if (!empty($event_picture1)) {
-            $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture1 . "' name='image' id='image' alt=''/><br><br>"));
+            $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture1."' name='image' id='image' alt=''/><br><br>"));
             $check_del_img = new XoopsFormCheckBox('', 'delimg_1');
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
             $file_tray->addElement($check_del_img);
@@ -1292,8 +1292,8 @@ 
         }
         $file_img->setExtra("size ='40'");
         $file_tray->addElement($file_img);
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500);
-        $file_label = new XoopsFormLabel('', '<br>' . $msg);
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500);
+        $file_label = new XoopsFormLabel('', '<br>'.$msg);
         $file_tray->addElement($file_label);
         $form->addElement($file_tray);
         $form->addElement(new XoopsFormHidden('file1', $event_picture1));
@@ -1301,7 +1301,7 @@ 
         //Picture2
         $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), '');
         if (!empty($event_picture2)) {
-            $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture2 . "' name='image' id='image' alt=''/><br><br>"));
+            $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture2."' name='image' id='image' alt=''/><br><br>"));
             $check_del_img = new XoopsFormCheckBox('', 'delimg_2');
             $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG);
             $file_tray->addElement($check_del_img);
@@ -1312,8 +1312,8 @@ 
         }
         $file_img->setExtra("size ='40'");
         $file_tray->addElement($file_img);
-        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500);
-        $file_label = new XoopsFormLabel('', '<br>' . $msg);
+        $msg        = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500);
+        $file_label = new XoopsFormLabel('', '<br>'.$msg);
         $file_tray->addElement($file_label);
         $form->addElement($file_tray);
         $form->addElement(new XoopsFormHidden('file2', $event_picture2));
@@ -1380,7 +1380,7 @@ 
                 $recurRules = 'weekly|';
                 $recurRules .= $parm['rrule_weekly_interval'];
                 foreach ($parm['rrule_weekly_bydays'] as $day) {
-                    $recurRules .= '|' . $day;
+                    $recurRules .= '|'.$day;
                 }
 
                 break;
@@ -1390,11 +1390,11 @@ 
                     $parm['rrule_monthly_interval'] = 0;
                 }
                 $recurRules = 'monthly|';
-                $recurRules .= $parm['rrule_monthly_interval'] . '|';
+                $recurRules .= $parm['rrule_monthly_interval'].'|';
                 if ($parm['rrule_monthly_byday'] != '') {
                     $recurRules .= $parm['rrule_monthly_byday'];
                 } else {
-                    $recurRules .= 'MD' . $parm['rrule_bymonthday'];
+                    $recurRules .= 'MD'.$parm['rrule_bymonthday'];
                 }
 
                 break;
@@ -1428,9 +1428,9 @@ 
 
                 $recurRules = 'yearly|';
                 $recurRules .= $parm['rrule_yearly_interval'];
-                $recurRules .= '|' . $parm['rrule_yearly_byday'];
+                $recurRules .= '|'.$parm['rrule_yearly_byday'];
                 foreach ($parm['rrule_yearly_bymonths'] as $month) {
-                    $recurRules .= '|' . $month;
+                    $recurRules .= '|'.$month;
                 }
 
                 break;
@@ -2363,10 +2363,10 @@ 
         global $xoopsDB;
 
         //echo "<hr>{$andor}-{$limit}-{$offset}-{$userId}-{$user}<br>{$criteresPlus}";
-        $tEvent = $xoopsDB->prefix('extcal_event') . ' AS te';
-        $tCat   = $xoopsDB->prefix('extcal_cat') . ' AS tc';
+        $tEvent = $xoopsDB->prefix('extcal_event').' AS te';
+        $tCat   = $xoopsDB->prefix('extcal_cat').' AS tc';
 
-        $sql = 'SELECT te.*, tc.cat_name , tc.cat_color, ' . 'year(FROM_UNIXTIME(event_start)) AS year,' . 'month(FROM_UNIXTIME(event_start)) AS month,' . 'day(FROM_UNIXTIME(event_start)) AS day' . " FROM {$tEvent}, {$tCat}";
+        $sql = 'SELECT te.*, tc.cat_name , tc.cat_color, '.'year(FROM_UNIXTIME(event_start)) AS year,'.'month(FROM_UNIXTIME(event_start)) AS month,'.'day(FROM_UNIXTIME(event_start)) AS day'." FROM {$tEvent}, {$tCat}";
         //---------------------------------------------------
         $tw   = array();
         $tw[] = 'te.cat_id = tc.cat_id';
@@ -2375,7 +2375,7 @@ 
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
         $inCat                = 'te.cat_id IN (0)';
         if (count($authorizedAccessCats) > 0) {
-            $inCat = 'te.cat_id IN (' . implode(',', $authorizedAccessCats) . ')';
+            $inCat = 'te.cat_id IN ('.implode(',', $authorizedAccessCats).')';
         }
         //echo $tw[count($tw)-1];
 
@@ -2411,12 +2411,12 @@ 
                 'te.event_address',
                 'tc.cat_name',
             );
-            $t       = array();
+            $t = array();
             for ($i = 0, $count = count($queryarray); $i < $count; ++$i) {
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = array();
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2425,10 +2425,10 @@ 
 
             $filtre = implode(' OR ', $t);
             $filtre = str_replace('#', '%', $filtre);
-            $tw[]   = '(' . $filtre . ')';
+            $tw[]   = '('.$filtre.')';
         }
 
-        $sql .= ' WHERE ' . implode(' AND ', $tw);
+        $sql .= ' WHERE '.implode(' AND ', $tw);
         //------------------------------------------------------------
         if (count($orderBy) > 0) {
             $t = array();
@@ -2438,7 +2438,7 @@ 
                 }
             }
             if (count($t) > 0) {
-                $sql .= ' ORDER BY ' . implode(',', $t);
+                $sql .= ' ORDER BY '.implode(',', $t);
             }
         }
 
@@ -2471,7 +2471,7 @@ 
         $i = 0;
         while ($myrow = $xoopsDB->fetchArray($result)) {
             $ret[$i]['image'] = 'assets/images/icons/extcal.gif';
-            $ret[$i]['link']  = 'event.php?event=' . $myrow['event_id'];
+            $ret[$i]['link']  = 'event.php?event='.$myrow['event_id'];
             $ret[$i]['title'] = $myrow['event_title'];
             $ret[$i]['time']  = $myrow['event_submitdate'];
             $ret[$i]['uid']   = $myrow['event_submitter'];
@@ -2511,23 +2511,23 @@ 
         //        }
         $tEvent = $xoopsDB->prefix('extcal_event');
         $tCat   = $xoopsDB->prefix('extcal_cat');
-        $sql    = "SELECT {$tEvent}.*, {$tCat}.cat_name AS categorie, {$tCat}.cat_color " . " FROM {$tEvent}, {$tCat}" . " WHERE {$tEvent}.cat_id = {$tCat}.cat_id AND event_approved = '1'";
+        $sql    = "SELECT {$tEvent}.*, {$tCat}.cat_name AS categorie, {$tCat}.cat_color "." FROM {$tEvent}, {$tCat}"." WHERE {$tEvent}.cat_id = {$tCat}.cat_id AND event_approved = '1'";
 
         $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view');
         $count                = count($authorizedAccessCats);
         if ($count > 0) {
-            $in = '(' . $authorizedAccessCats[0];
+            $in = '('.$authorizedAccessCats[0];
             array_shift($authorizedAccessCats);
             foreach ($authorizedAccessCats as $authorizedAccessCat) {
-                $in .= ',' . $authorizedAccessCat;
+                $in .= ','.$authorizedAccessCat;
             }
             $in .= ')';
         } else {
             $in = '(0)';
         }
-        $sql .= " AND {$tEvent}.cat_id IN " . $in . '';
+        $sql .= " AND {$tEvent}.cat_id IN ".$in.'';
         if ($userId != 0) {
-            $sql .= " AND event_submitter = '" . $userId . "'";
+            $sql .= " AND event_submitter = '".$userId."'";
         }
 
         //echoArray($queryarray,false);
@@ -2547,7 +2547,7 @@ 
                 $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' ";
             }
 
-            $flt = '(' . implode(" {$andor} ", $t1) . ')';
+            $flt = '('.implode(" {$andor} ", $t1).')';
 
             $t = array();
             for ($h = 0, $count = count($tFields); $h < $count; ++$h) {
@@ -2560,7 +2560,7 @@ 
         }
 
         if ($criteresPlus != '') {
-            $sql .= ' AND ' . $criteresPlus;
+            $sql .= ' AND '.$criteresPlus;
         }
         $sql .= ' ORDER BY event_id DESC';
 
@@ -2570,7 +2570,7 @@ 
         if ($xoopsSearch) {
             while ($myrow = $xoopsDB->fetchArray($result)) {
                 $ret[$i]['image'] = 'assets/images/icons/extcal.gif';
-                $ret[$i]['link']  = 'event.php?event=' . $myrow['event_id'];
+                $ret[$i]['link']  = 'event.php?event='.$myrow['event_id'];
                 $ret[$i]['title'] = $myrow['event_title'];
                 $ret[$i]['time']  = $myrow['event_submitdate'];
                 $ret[$i]['uid']   = $myrow['event_submitter'];

class/form/formdatetime.php

Doc Comments +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 {
 
     /**
-     * @param     $form
+     * @param     ExtcalThemeForm $form
      * @param int $startTS
      * @param int $endTS
      */

class/form/formfilecheckbox.php

Doc Comments +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 {
 
     /**
-     * @param      $caption
-     * @param      $name
+     * @param      string $caption
+     * @param      string $name
      * @param null $value
      */
     function ExtcalFormFileCheckBox($caption, $name, $value = null)

class/form/formrrulecheckbox.php

Doc Comments +3 added lines, -3 removed lines

@@ -7,9 +7,9 @@
 {
 
     /**
-     * @param      $caption
-     * @param      $name
-     * @param null $value
+     * @param      string $caption
+     * @param      string $name
+     * @param string $value
      */
     function ExtcalFormRRuleCheckBox($caption, $name, $value = null)
     {

class/form/spin/formspin.php

Doc Comments +16 added lines, -11 removed lines

@@ -180,7 +180,7 @@ 
     /**
      * Set the value
      *
-     * @param  $value int
+     * @param  integer $value int
      */
     public function setValue($value)
     {
@@ -199,7 +199,7 @@ 
     /**
      * Set the min value
      *
-     * @param  $min int
+     * @param  integer $min int
      */
     public function setMin($min)
     {
@@ -217,7 +217,7 @@ 
     /**
      * Set the max value - must be more great then min
      *
-     * @param  $max int
+     * @param  integer $max int
      */
     public function setMax($max)
     {
@@ -237,7 +237,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
      */
     public function setSmallIncrement($smallIncrement)
@@ -260,7 +260,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)
     {
@@ -283,7 +283,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)
     {
@@ -308,7 +308,7 @@ 
     /**
      * Set the shortname of the folder images
      *
-     * @param  $folder string
+     * @param  string $folder string
      */
     public function setImgFolder($folder)
     {
@@ -328,7 +328,7 @@ 
     /**
      * Set the label of unites between value and buttons
      *
-     * @param  $unite string
+     * @param  string $unite string
      */
     public function setUnite($unite)
     {
@@ -346,7 +346,7 @@ 
     /**
      * Set the style CSS of the text
      *
-     * @param  $style string
+     * @param  string $style string
      */
     public function setStyleText($style)
     {
@@ -366,7 +366,7 @@ 
     /**
      * Set the style CSS of the frame
      *
-     * @param  $style string
+     * @param  string $style string
      */
     public function setStyleBordure($style)
     {
@@ -386,7 +386,7 @@ 
     /**
      * Set  MinMaxVisible : show the button to go min and max value
      *
-     * @param  $visible bool
+     * @param  boolean $visible bool
      */
     public function setMinMaxVisible($visible)
     {
@@ -495,6 +495,11 @@ 
      * @param string $default
      * @return string
      */
+
+    /**
+     * @param string $attribut
+     * @param string $value
+     */
     public function htmlAddAttribut($attribut, $value, $default = '')
     {
         $r = '';

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

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/pcltrace.lib.php

Doc Comments +8 added lines, -8 removed lines

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

Spacing +11 added lines, -11 removed lines

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