@@ -417,11 +417,11 @@ |
||
417 | 417 | /** |
418 | 418 | * @param $event |
419 | 419 | * @param $eventsArray |
420 | - * @param $extcalTimeHandler |
|
421 | - * @param $startMonth |
|
422 | - * @param $endMonth |
|
420 | + * @param ExtcalTime $extcalTimeHandler |
|
421 | + * @param integer $startMonth |
|
422 | + * @param integer $endMonth |
|
423 | 423 | * @param $cats |
424 | - * @return bool |
|
424 | + * @return false|null |
|
425 | 425 | */ |
426 | 426 | function bExtcalMinicalAddEventToArray(&$event, &$eventsArray, $extcalTimeHandler, $startMonth, $endMonth, $cats) |
427 | 427 | { |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | global $extcalConfig, $xoopsUser; |
3 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php'); |
|
4 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php'); |
|
5 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/class/tableForm.php'); |
|
3 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/include/constantes.php'); |
|
4 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/include/functions.php'); |
|
5 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/class/tableForm.php'); |
|
6 | 6 | //--------------------------------------------------------------------------- |
7 | 7 | /** |
8 | 8 | * @param $options |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | |
16 | 16 | extcal_getDefautminicalOption($options); |
17 | 17 | |
18 | - include_once XOOPS_ROOT_PATH . '/modules/extcal/class/config.php'; |
|
18 | + include_once XOOPS_ROOT_PATH.'/modules/extcal/class/config.php'; |
|
19 | 19 | |
20 | - require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Util/Textual.php'; |
|
21 | - require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Month/Weeks.php'; |
|
22 | - require_once _EXTCAL_PEAR_CALENDAR_ROOT . '/Day.php'; |
|
20 | + require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Util/Textual.php'; |
|
21 | + require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Month/Weeks.php'; |
|
22 | + require_once _EXTCAL_PEAR_CALENDAR_ROOT.'/Day.php'; |
|
23 | 23 | // require_once CALENDAR_ROOT . 'Month/Weeks.php'; |
24 | 24 | // require_once CALENDAR_ROOT . 'Day.php'; |
25 | 25 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | 'year' => $year, |
104 | 104 | 'cat' => $tCatSelected, |
105 | 105 | 'externalKeys' => 'cat_id'); |
106 | - $events = $eventHandler->getEventsOnPeriode($criteres); |
|
106 | + $events = $eventHandler->getEventsOnPeriode($criteres); |
|
107 | 107 | } else { |
108 | 108 | $events = array(); |
109 | 109 | } |
@@ -188,14 +188,14 @@ discard block |
||
188 | 188 | // Making navig data |
189 | 189 | $navig = array( |
190 | 190 | 'page' => $extcalConfig['start_page'], |
191 | - 'uri' => 'year=' . $monthCalObj->thisYear() . '&month=' . $monthCalObj->thisMonth(), |
|
191 | + 'uri' => 'year='.$monthCalObj->thisYear().'&month='.$monthCalObj->thisMonth(), |
|
192 | 192 | 'name' => $extcalTimeHandler->getFormatedDate($extcalConfig['nav_date_month'], $monthCalObj->getTimestamp())); |
193 | 193 | |
194 | 194 | $horloge = array(); |
195 | 195 | $horloge['display'] = (trim($options[11]) <> ''); |
196 | - $horloge['fullName'] = XOOPS_URL . _EXTCAL_PATH_HORLOGES . $options[11]; |
|
197 | - $horloge['width'] = $options[12] . 'px'; |
|
198 | - $horloge['height'] = $options[13] . 'px'; |
|
196 | + $horloge['fullName'] = XOOPS_URL._EXTCAL_PATH_HORLOGES.$options[11]; |
|
197 | + $horloge['width'] = $options[12].'px'; |
|
198 | + $horloge['height'] = $options[13].'px'; |
|
199 | 199 | |
200 | 200 | $ret = array( |
201 | 201 | 'imageParam' => $imageParam, |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | function bExtcalMinicalEdit($options) |
222 | 222 | { |
223 | - include_once(__DIR__ . '/../class/form/spin/formspin.php'); |
|
223 | + include_once(__DIR__.'/../class/form/spin/formspin.php'); |
|
224 | 224 | global $xoopsUser; |
225 | 225 | |
226 | 226 | // $t = print_r(get_defined_vars(),true); |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | $imageCatHandler = xoops_getHandler('imagecategory'); |
242 | 242 | |
243 | 243 | //===================================================================== |
244 | - $form->insertBreak('<center><b>' . _MB_EXTCAL_OPT_SLIDE_SHOW . '</b></center>', 'head'); |
|
244 | + $form->insertBreak('<center><b>'._MB_EXTCAL_OPT_SLIDE_SHOW.'</b></center>', 'head'); |
|
245 | 245 | |
246 | 246 | $k = 0; |
247 | 247 | $xfValue[$k] = new XoopsFormRadio(_MB_EXTCAL_DISPLAY_IMG, "options[{$k}]", $options[$k]); |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | $xfValue[$k] = new ExtcalFormSpin(_MB_EXTCAL_SS_NB_PHOTOS, "options[{$k}]", $options[$k], 0, 50, 1, 0, 8, _MB_EXTCAL_PX, $imgFolder = ''); |
283 | 283 | $form->addElement($xfValue[$k], false); |
284 | 284 | //===================================================================== |
285 | - $form->insertBreak('<center><b>' . _MB_EXTCAL_OPT_SHOW . '</b></center>', 'head'); |
|
285 | + $form->insertBreak('<center><b>'._MB_EXTCAL_OPT_SHOW.'</b></center>', 'head'); |
|
286 | 286 | |
287 | 287 | $t = array( |
288 | 288 | -1 => _MB_EXTCAL_PREVIEW, |
@@ -320,9 +320,9 @@ discard block |
||
320 | 320 | $form->addElement($xfValue[$k], false); |
321 | 321 | |
322 | 322 | //===================================================================== |
323 | - $form->insertBreak('<center><b>' . _MB_EXTCAL_HORLOGE_OPT . '</b></center>', 'head'); |
|
323 | + $form->insertBreak('<center><b>'._MB_EXTCAL_HORLOGE_OPT.'</b></center>', 'head'); |
|
324 | 324 | //--------------------------------------------------------------------- |
325 | - $t = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH . _EXTCAL_PATH_HORLOGES); |
|
325 | + $t = XoopsLists::getFileListAsArray(XOOPS_ROOT_PATH._EXTCAL_PATH_HORLOGES); |
|
326 | 326 | $t = array_merge(array(' ' => _NONE), $t); |
327 | 327 | |
328 | 328 | $k = 11; |
@@ -405,12 +405,12 @@ discard block |
||
405 | 405 | // $src = $doc->createElement('src'); |
406 | 406 | $src = clone $tempSrc; |
407 | 407 | $src = $photo->appendChild($src); |
408 | - $value = $doc->createTextNode(XOOPS_URL . '/uploads/' . $images->getVar('image_name')); |
|
408 | + $value = $doc->createTextNode(XOOPS_URL.'/uploads/'.$images->getVar('image_name')); |
|
409 | 409 | $src->appendChild($value); |
410 | 410 | } |
411 | 411 | |
412 | 412 | // get completed xml document |
413 | - $xml_string = $doc->save(XOOPS_ROOT_PATH . '/cache/extcalSlideShowParam.xml'); |
|
413 | + $xml_string = $doc->save(XOOPS_ROOT_PATH.'/cache/extcalSlideShowParam.xml'); |
|
414 | 414 | } |
415 | 415 | |
416 | 416 | /**************************************************************************/ |
@@ -264,6 +264,10 @@ |
||
264 | 264 | * @param $max |
265 | 265 | * @return |
266 | 266 | */ |
267 | + |
|
268 | + /** |
|
269 | + * @param integer $min |
|
270 | + */ |
|
267 | 271 | Function bornerValeur($val, $min, $max) |
268 | 272 | { |
269 | 273 |
@@ -159,9 +159,9 @@ |
||
159 | 159 | $tHex = array('', '', '', ''); |
160 | 160 | |
161 | 161 | $tHex[0] = $aColors[0]; |
162 | - $tHex[1] = substr('00' . dechex($aColors[1]), -2); |
|
163 | - $tHex[2] = substr('00' . dechex($aColors[2]), -2); |
|
164 | - $tHex[3] = substr('00' . dechex($aColors[3]), -2); |
|
162 | + $tHex[1] = substr('00'.dechex($aColors[1]), -2); |
|
163 | + $tHex[2] = substr('00'.dechex($aColors[2]), -2); |
|
164 | + $tHex[3] = substr('00'.dechex($aColors[3]), -2); |
|
165 | 165 | |
166 | 166 | $colorHexa = implode('', $tHex); |
167 | 167 |
@@ -633,7 +633,7 @@ discard block |
||
633 | 633 | * @param $cat |
634 | 634 | * @param int $nbDays |
635 | 635 | * |
636 | - * @return CriteriaCompo |
|
636 | + * @return null|CriteriaElement |
|
637 | 637 | */ |
638 | 638 | function _getEventWeekCriteria($day, $month, $year, $cat, $nbDays = 7) |
639 | 639 | { |
@@ -655,7 +655,7 @@ discard block |
||
655 | 655 | * @param $year |
656 | 656 | * @param $cat |
657 | 657 | * |
658 | - * @return CriteriaCompo |
|
658 | + * @return null|CriteriaElement |
|
659 | 659 | */ |
660 | 660 | function _getEventMonthCriteria($month, $year, $cat) |
661 | 661 | { |
@@ -676,7 +676,7 @@ discard block |
||
676 | 676 | * @param $year |
677 | 677 | * @param int $cat |
678 | 678 | * |
679 | - * @return CriteriaCompo |
|
679 | + * @return null|CriteriaElement |
|
680 | 680 | */ |
681 | 681 | function _getEventYearCriteria($year, $cat = 0) |
682 | 682 | { |
@@ -760,7 +760,7 @@ discard block |
||
760 | 760 | /** |
761 | 761 | * @param $start |
762 | 762 | * @param $end |
763 | - * @param $cat |
|
763 | + * @param integer $cat |
|
764 | 764 | * @param $user |
765 | 765 | * |
766 | 766 | * @return CriteriaCompo |
@@ -1763,7 +1763,7 @@ discard block |
||
1763 | 1763 | |
1764 | 1764 | /** |
1765 | 1765 | * @param $month |
1766 | - * @param $year |
|
1766 | + * @param string $year |
|
1767 | 1767 | * @param $dayCode |
1768 | 1768 | * |
1769 | 1769 | * @return int |
@@ -2,14 +2,14 @@ discard block |
||
2 | 2 | |
3 | 3 | // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); |
4 | 4 | |
5 | -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/ExtcalPersistableObjectHandler.php'; |
|
6 | -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/perm.php'; |
|
7 | -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/time.php'; |
|
8 | -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/config.php'; |
|
9 | -include_once XOOPS_ROOT_PATH . '/modules/extcal/class/extDateTime.php'; |
|
5 | +include_once XOOPS_ROOT_PATH.'/modules/extcal/class/ExtcalPersistableObjectHandler.php'; |
|
6 | +include_once XOOPS_ROOT_PATH.'/modules/extcal/class/perm.php'; |
|
7 | +include_once XOOPS_ROOT_PATH.'/modules/extcal/class/time.php'; |
|
8 | +include_once XOOPS_ROOT_PATH.'/modules/extcal/class/config.php'; |
|
9 | +include_once XOOPS_ROOT_PATH.'/modules/extcal/class/extDateTime.php'; |
|
10 | 10 | |
11 | -include_once(XOOPS_ROOT_PATH . '/modules/extcal/include/functions.php'); |
|
12 | -include_once XOOPS_ROOT_PATH . '/modules/extcal/include/constantes.php'; |
|
11 | +include_once(XOOPS_ROOT_PATH.'/modules/extcal/include/functions.php'); |
|
12 | +include_once XOOPS_ROOT_PATH.'/modules/extcal/include/constantes.php'; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * Class ExtcalEvent |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false); |
52 | 52 | $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false); |
53 | 53 | |
54 | - $this->externalKey['cat_id'] = array( |
|
54 | + $this->externalKey['cat_id'] = array( |
|
55 | 55 | 'className' => 'cat', |
56 | 56 | 'getMethodeName' => 'getCat', |
57 | 57 | 'keyName' => 'cat', |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | public function getAllEvents($criteria = null, $asObject = false) |
185 | 185 | { |
186 | 186 | |
187 | - $rst =& $this->getObjects($criteria, $asObject); |
|
187 | + $rst = & $this->getObjects($criteria, $asObject); |
|
188 | 188 | if ($asObject) { |
189 | 189 | return $rst; |
190 | 190 | } else { |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | if (!$skipPerm) { |
211 | 211 | $this->_addCatPermCriteria($criteriaCompo, $user); |
212 | 212 | } |
213 | - $ret =& $this->getObjects($criteriaCompo); |
|
213 | + $ret = & $this->getObjects($criteriaCompo); |
|
214 | 214 | if (isset($ret[0])) { |
215 | 215 | return $ret[0]; |
216 | 216 | } else { |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | if (!$skipPerm) { |
236 | 236 | $this->_addCatPermCriteria($criteriaCompo, $user); |
237 | 237 | } |
238 | - $ret =& $this->getObjects($criteriaCompo); |
|
238 | + $ret = & $this->getObjects($criteriaCompo); |
|
239 | 239 | if (isset($ret[0])) { |
240 | 240 | return $ret[0]; |
241 | 241 | } else { |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | $eventArray = array(); |
394 | 394 | |
395 | 395 | while (list($k, $v) = each($events)) { |
396 | - $ordre[] = (int)$v['event_start']; |
|
396 | + $ordre[] = (int) $v['event_start']; |
|
397 | 397 | $this->formatEventDate($v, $extcalConfig['event_date_week']); |
398 | 398 | //$v['cat']['cat_light_color'] = $v['cat']['cat_color']; |
399 | 399 | $v['cat']['cat_light_color'] = eclaircirCouleur($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX); |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | $criteriaCompo->add(new Criteria('event_isrecur', 0, '=')); |
483 | 483 | $criteriaCompo->setOrder($sens); |
484 | 484 | |
485 | - $result =& $this->getObjects($criteriaCompo); |
|
485 | + $result = & $this->getObjects($criteriaCompo); |
|
486 | 486 | $events = $this->objectToArray($result, $externalKeys); |
487 | 487 | $this->serverTimeToUserTimes($events); |
488 | 488 | |
@@ -557,7 +557,7 @@ discard block |
||
557 | 557 | $criteriaCompo->add(new Criteria('event_isrecur', 1, '=')); |
558 | 558 | $criteriaCompo->setOrder($sens); |
559 | 559 | |
560 | - $result =& $this->getObjects($criteriaCompo); |
|
560 | + $result = & $this->getObjects($criteriaCompo); |
|
561 | 561 | $events = $this->objectToArray($result, $externalKeys); |
562 | 562 | $this->serverTimeToUserTimes($events); |
563 | 563 | |
@@ -598,7 +598,7 @@ discard block |
||
598 | 598 | |
599 | 599 | reset($period); |
600 | 600 | foreach ($period as $dt) { |
601 | - echo $dt->format("l d-m-Y H:i:s\n") . '<br>'; |
|
601 | + echo $dt->format("l d-m-Y H:i:s\n").'<br>'; |
|
602 | 602 | } |
603 | 603 | |
604 | 604 | } |
@@ -930,10 +930,10 @@ discard block |
||
930 | 930 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
931 | 931 | $count = count($authorizedAccessCats); |
932 | 932 | if ($count > 0) { |
933 | - $in = '(' . $authorizedAccessCats[0]; |
|
933 | + $in = '('.$authorizedAccessCats[0]; |
|
934 | 934 | array_shift($authorizedAccessCats); |
935 | 935 | foreach ($authorizedAccessCats as $authorizedAccessCat) { |
936 | - $in .= ',' . $authorizedAccessCat; |
|
936 | + $in .= ','.$authorizedAccessCat; |
|
937 | 937 | } |
938 | 938 | $in .= ')'; |
939 | 939 | $criteria->add(new Criteria('cat_id', $in, 'IN')); |
@@ -953,10 +953,10 @@ discard block |
||
953 | 953 | } |
954 | 954 | if (is_array($cats)) { |
955 | 955 | if (array_search(0, $cats) === false) { |
956 | - $in = '(' . current($cats); |
|
956 | + $in = '('.current($cats); |
|
957 | 957 | array_shift($cats); |
958 | 958 | foreach ($cats as $cat) { |
959 | - $in .= ',' . $cat; |
|
959 | + $in .= ','.$cat; |
|
960 | 960 | } |
961 | 961 | $in .= ')'; |
962 | 962 | $criteria->add(new Criteria('cat_id', $in, 'IN')); |
@@ -979,7 +979,7 @@ discard block |
||
979 | 979 | $fileHandler = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE); |
980 | 980 | |
981 | 981 | /***************************************************/ |
982 | - include_once XOOPS_ROOT_PATH . '/modules/extcal/class/etablissement.php'; |
|
982 | + include_once XOOPS_ROOT_PATH.'/modules/extcal/class/etablissement.php'; |
|
983 | 983 | if ($siteSide === 'admin') { |
984 | 984 | $action = 'event.php?op=enreg'; |
985 | 985 | $cats = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all'); |
@@ -997,7 +997,7 @@ discard block |
||
997 | 997 | if ($mode === 'clone') { |
998 | 998 | $data['event_id'] = 0; |
999 | 999 | $event->setVar('event_id', 0); |
1000 | - $newTitle = $event->getVar('event_title') . ' (' . _AM_EXTCAL_CLONE_OF . $data['event_id'] . ')'; |
|
1000 | + $newTitle = $event->getVar('event_title').' ('._AM_EXTCAL_CLONE_OF.$data['event_id'].')'; |
|
1001 | 1001 | $event->setVar('event_title', $newTitle); |
1002 | 1002 | } |
1003 | 1003 | |
@@ -1185,7 +1185,7 @@ discard block |
||
1185 | 1185 | $form->addElement($catSelect, true); |
1186 | 1186 | //----------------------------------------------------------- |
1187 | 1187 | |
1188 | - $file_path = XOOPS_ROOT_PATH . '/modules/extcal/assets/css/images'; |
|
1188 | + $file_path = XOOPS_ROOT_PATH.'/modules/extcal/assets/css/images'; |
|
1189 | 1189 | $tf = XoopsLists::getImgListAsArray($file_path); |
1190 | 1190 | array_unshift($tf, _MD_EXTCAL_NONE); |
1191 | 1191 | $xfIcones = new XoopsFormSelect(_MD_EXTCAL_ICONE, 'event_icone', $event_icone, ''); |
@@ -1290,7 +1290,7 @@ discard block |
||
1290 | 1290 | if (count($files) > 0) { |
1291 | 1291 | $eventFiles = new ExtcalFormFileCheckBox('', 'filetokeep'); |
1292 | 1292 | foreach ($files as $file) { |
1293 | - $name = $file['file_nicename'] . ' (<i>' . $file['file_mimetype'] . '</i>) ' . $file['formated_file_size']; |
|
1293 | + $name = $file['file_nicename'].' (<i>'.$file['file_mimetype'].'</i>) '.$file['formated_file_size']; |
|
1294 | 1294 | $eventFiles->addOption($file['file_id'], $name); |
1295 | 1295 | } |
1296 | 1296 | $fileElmtTray->addElement($eventFiles); |
@@ -1306,7 +1306,7 @@ discard block |
||
1306 | 1306 | //Picture1 |
1307 | 1307 | $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 1), ''); |
1308 | 1308 | if (!empty($event_picture1)) { |
1309 | - $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture1 . "' name='image' id='image' alt=''/><br /><br />")); |
|
1309 | + $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture1."' name='image' id='image' alt=''/><br /><br />")); |
|
1310 | 1310 | $check_del_img = new XoopsFormCheckBox('', 'delimg_1'); |
1311 | 1311 | $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); |
1312 | 1312 | $file_tray->addElement($check_del_img); |
@@ -1317,8 +1317,8 @@ discard block |
||
1317 | 1317 | } |
1318 | 1318 | $file_img->setExtra("size ='40'"); |
1319 | 1319 | $file_tray->addElement($file_img); |
1320 | - $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500); |
|
1321 | - $file_label = new XoopsFormLabel('', '<br />' . $msg); |
|
1320 | + $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500); |
|
1321 | + $file_label = new XoopsFormLabel('', '<br />'.$msg); |
|
1322 | 1322 | $file_tray->addElement($file_label); |
1323 | 1323 | $form->addElement($file_tray); |
1324 | 1324 | $form->addElement(new XoopsFormHidden('file1', $event_picture1)); |
@@ -1326,7 +1326,7 @@ discard block |
||
1326 | 1326 | //Picture2 |
1327 | 1327 | $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), ''); |
1328 | 1328 | if (!empty($event_picture2)) { |
1329 | - $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture2 . "' name='image' id='image' alt=''/><br /><br />")); |
|
1329 | + $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture2."' name='image' id='image' alt=''/><br /><br />")); |
|
1330 | 1330 | $check_del_img = new XoopsFormCheckBox('', 'delimg_2'); |
1331 | 1331 | $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); |
1332 | 1332 | $file_tray->addElement($check_del_img); |
@@ -1337,8 +1337,8 @@ discard block |
||
1337 | 1337 | } |
1338 | 1338 | $file_img->setExtra("size ='40'"); |
1339 | 1339 | $file_tray->addElement($file_img); |
1340 | - $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500); |
|
1341 | - $file_label = new XoopsFormLabel('', '<br />' . $msg); |
|
1340 | + $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500); |
|
1341 | + $file_label = new XoopsFormLabel('', '<br />'.$msg); |
|
1342 | 1342 | $file_tray->addElement($file_label); |
1343 | 1343 | $form->addElement($file_tray); |
1344 | 1344 | $form->addElement(new XoopsFormHidden('file2', $event_picture2)); |
@@ -1408,7 +1408,7 @@ discard block |
||
1408 | 1408 | $recurRules = 'weekly|'; |
1409 | 1409 | $recurRules .= $parm['rrule_weekly_interval']; |
1410 | 1410 | foreach ($parm['rrule_weekly_bydays'] as $day) { |
1411 | - $recurRules .= '|' . $day; |
|
1411 | + $recurRules .= '|'.$day; |
|
1412 | 1412 | } |
1413 | 1413 | |
1414 | 1414 | break; |
@@ -1418,11 +1418,11 @@ discard block |
||
1418 | 1418 | $parm['rrule_monthly_interval'] = 0; |
1419 | 1419 | } |
1420 | 1420 | $recurRules = 'monthly|'; |
1421 | - $recurRules .= $parm['rrule_monthly_interval'] . '|'; |
|
1421 | + $recurRules .= $parm['rrule_monthly_interval'].'|'; |
|
1422 | 1422 | if ($parm['rrule_monthly_byday'] != '') { |
1423 | 1423 | $recurRules .= $parm['rrule_monthly_byday']; |
1424 | 1424 | } else { |
1425 | - $recurRules .= 'MD' . $parm['rrule_bymonthday']; |
|
1425 | + $recurRules .= 'MD'.$parm['rrule_bymonthday']; |
|
1426 | 1426 | } |
1427 | 1427 | |
1428 | 1428 | break; |
@@ -1456,9 +1456,9 @@ discard block |
||
1456 | 1456 | |
1457 | 1457 | $recurRules = 'yearly|'; |
1458 | 1458 | $recurRules .= $parm['rrule_yearly_interval']; |
1459 | - $recurRules .= '|' . $parm['rrule_yearly_byday']; |
|
1459 | + $recurRules .= '|'.$parm['rrule_yearly_byday']; |
|
1460 | 1460 | foreach ($parm['rrule_yearly_bymonths'] as $month) { |
1461 | - $recurRules .= '|' . $month; |
|
1461 | + $recurRules .= '|'.$month; |
|
1462 | 1462 | } |
1463 | 1463 | |
1464 | 1464 | break; |
@@ -2393,10 +2393,10 @@ discard block |
||
2393 | 2393 | global $xoopsDB; |
2394 | 2394 | |
2395 | 2395 | //echo "<hr>{$andor}-{$limit}-{$offset}-{$userId}-{$user}<br>{$criteresPlus}"; |
2396 | - $tEvent = $xoopsDB->prefix('extcal_event') . ' AS te'; |
|
2397 | - $tCat = $xoopsDB->prefix('extcal_cat') . ' AS tc'; |
|
2396 | + $tEvent = $xoopsDB->prefix('extcal_event').' AS te'; |
|
2397 | + $tCat = $xoopsDB->prefix('extcal_cat').' AS tc'; |
|
2398 | 2398 | |
2399 | - $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}"; |
|
2399 | + $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}"; |
|
2400 | 2400 | //--------------------------------------------------- |
2401 | 2401 | $tw = array(); |
2402 | 2402 | $tw[] = 'te.cat_id = tc.cat_id'; |
@@ -2405,7 +2405,7 @@ discard block |
||
2405 | 2405 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
2406 | 2406 | $inCat = 'te.cat_id IN (0)'; |
2407 | 2407 | if (count($authorizedAccessCats) > 0) { |
2408 | - $inCat = 'te.cat_id IN (' . implode(',', $authorizedAccessCats) . ')'; |
|
2408 | + $inCat = 'te.cat_id IN ('.implode(',', $authorizedAccessCats).')'; |
|
2409 | 2409 | } |
2410 | 2410 | //echo $tw[count($tw)-1]; |
2411 | 2411 | |
@@ -2441,12 +2441,12 @@ discard block |
||
2441 | 2441 | 'te.event_contact', |
2442 | 2442 | 'te.event_address', |
2443 | 2443 | 'tc.cat_name'); |
2444 | - $t = array(); |
|
2444 | + $t = array(); |
|
2445 | 2445 | for ($i = 0, $count = count($queryarray); $i < $count; ++$i) { |
2446 | 2446 | $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' "; |
2447 | 2447 | } |
2448 | 2448 | |
2449 | - $flt = '(' . implode(" {$andor} ", $t1) . ')'; |
|
2449 | + $flt = '('.implode(" {$andor} ", $t1).')'; |
|
2450 | 2450 | |
2451 | 2451 | $t = array(); |
2452 | 2452 | for ($h = 0, $count = count($tFields); $h < $count; ++$h) { |
@@ -2455,10 +2455,10 @@ discard block |
||
2455 | 2455 | |
2456 | 2456 | $filtre = implode(' OR ', $t); |
2457 | 2457 | $filtre = str_replace('#', '%', $filtre); |
2458 | - $tw[] = '(' . $filtre . ')'; |
|
2458 | + $tw[] = '('.$filtre.')'; |
|
2459 | 2459 | } |
2460 | 2460 | |
2461 | - $sql .= ' WHERE ' . implode(' AND ', $tw); |
|
2461 | + $sql .= ' WHERE '.implode(' AND ', $tw); |
|
2462 | 2462 | //------------------------------------------------------------ |
2463 | 2463 | if (count($orderBy) > 0) { |
2464 | 2464 | $t = array(); |
@@ -2468,7 +2468,7 @@ discard block |
||
2468 | 2468 | } |
2469 | 2469 | } |
2470 | 2470 | if (count($t) > 0) { |
2471 | - $sql .= ' ORDER BY ' . implode(',', $t); |
|
2471 | + $sql .= ' ORDER BY '.implode(',', $t); |
|
2472 | 2472 | } |
2473 | 2473 | } |
2474 | 2474 | |
@@ -2501,7 +2501,7 @@ discard block |
||
2501 | 2501 | $i = 0; |
2502 | 2502 | while ($myrow = $xoopsDB->fetchArray($result)) { |
2503 | 2503 | $ret[$i]['image'] = 'assets/images/icons/extcal.gif'; |
2504 | - $ret[$i]['link'] = 'event.php?event=' . $myrow['event_id']; |
|
2504 | + $ret[$i]['link'] = 'event.php?event='.$myrow['event_id']; |
|
2505 | 2505 | $ret[$i]['title'] = $myrow['event_title']; |
2506 | 2506 | $ret[$i]['time'] = $myrow['event_submitdate']; |
2507 | 2507 | $ret[$i]['uid'] = $myrow['event_submitter']; |
@@ -2535,23 +2535,23 @@ discard block |
||
2535 | 2535 | // } |
2536 | 2536 | $tEvent = $xoopsDB->prefix('extcal_event'); |
2537 | 2537 | $tCat = $xoopsDB->prefix('extcal_cat'); |
2538 | - $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'"; |
|
2538 | + $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'"; |
|
2539 | 2539 | |
2540 | 2540 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
2541 | 2541 | $count = count($authorizedAccessCats); |
2542 | 2542 | if ($count > 0) { |
2543 | - $in = '(' . $authorizedAccessCats[0]; |
|
2543 | + $in = '('.$authorizedAccessCats[0]; |
|
2544 | 2544 | array_shift($authorizedAccessCats); |
2545 | 2545 | foreach ($authorizedAccessCats as $authorizedAccessCat) { |
2546 | - $in .= ',' . $authorizedAccessCat; |
|
2546 | + $in .= ','.$authorizedAccessCat; |
|
2547 | 2547 | } |
2548 | 2548 | $in .= ')'; |
2549 | 2549 | } else { |
2550 | 2550 | $in = '(0)'; |
2551 | 2551 | } |
2552 | - $sql .= " AND {$tEvent}.cat_id IN " . $in . ''; |
|
2552 | + $sql .= " AND {$tEvent}.cat_id IN ".$in.''; |
|
2553 | 2553 | if ($userId != 0) { |
2554 | - $sql .= " AND event_submitter = '" . $userId . "'"; |
|
2554 | + $sql .= " AND event_submitter = '".$userId."'"; |
|
2555 | 2555 | } |
2556 | 2556 | |
2557 | 2557 | //echoArray($queryarray,false); |
@@ -2571,7 +2571,7 @@ discard block |
||
2571 | 2571 | $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' "; |
2572 | 2572 | } |
2573 | 2573 | |
2574 | - $flt = '(' . implode(" {$andor} ", $t1) . ')'; |
|
2574 | + $flt = '('.implode(" {$andor} ", $t1).')'; |
|
2575 | 2575 | |
2576 | 2576 | $t = array(); |
2577 | 2577 | for ($h = 0, $count = count($tFields); $h < $count; ++$h) { |
@@ -2584,7 +2584,7 @@ discard block |
||
2584 | 2584 | } |
2585 | 2585 | |
2586 | 2586 | if ($criteresPlus != '') { |
2587 | - $sql .= ' AND ' . $criteresPlus; |
|
2587 | + $sql .= ' AND '.$criteresPlus; |
|
2588 | 2588 | } |
2589 | 2589 | $sql .= ' ORDER BY event_id DESC'; |
2590 | 2590 | |
@@ -2594,7 +2594,7 @@ discard block |
||
2594 | 2594 | if ($xoopsSearch) { |
2595 | 2595 | while ($myrow = $xoopsDB->fetchArray($result)) { |
2596 | 2596 | $ret[$i]['image'] = 'assets/images/icons/extcal.gif'; |
2597 | - $ret[$i]['link'] = 'event.php?event=' . $myrow['event_id']; |
|
2597 | + $ret[$i]['link'] = 'event.php?event='.$myrow['event_id']; |
|
2598 | 2598 | $ret[$i]['title'] = $myrow['event_title']; |
2599 | 2599 | $ret[$i]['time'] = $myrow['event_submitdate']; |
2600 | 2600 | $ret[$i]['uid'] = $myrow['event_submitter']; |
@@ -1691,9 +1691,11 @@ |
||
1691 | 1691 | if ($occurEventStart <= $periodEnd // Event start falls within search period |
1692 | 1692 | && $occurEventEnd >= $periodStart // Event end falls within search period |
1693 | 1693 | && in_array($dayArray[date('w', $occurEventStart)], $eventOptions) |
1694 | - ) // This week day is selected |
|
1694 | + ) { |
|
1695 | + // This week day is selected |
|
1695 | 1696 | { |
1696 | 1697 | $event['event_start'] = $occurEventStart; |
1698 | + } |
|
1697 | 1699 | $event['event_end'] = $occurEventEnd; |
1698 | 1700 | |
1699 | 1701 | $recuEvents[] = $event; |
@@ -499,7 +499,7 @@ |
||
499 | 499 | |
500 | 500 | /** |
501 | 501 | * @param $objects |
502 | - * @param array $externalKeys |
|
502 | + * @param string[] $externalKeys |
|
503 | 503 | * @param string $format |
504 | 504 | * |
505 | 505 | * @return array |
@@ -87,13 +87,13 @@ discard block |
||
87 | 87 | if (is_array($this->keyName)) { |
88 | 88 | $criteria = new CriteriaCompo(); |
89 | 89 | for ($i = 0; $i < count($this->keyName); ++$i) { |
90 | - $criteria->add(new Criteria($this->keyName[$i], (int)$id[$i])); |
|
90 | + $criteria->add(new Criteria($this->keyName[$i], (int) $id[$i])); |
|
91 | 91 | } |
92 | 92 | } else { |
93 | - $criteria = new Criteria($this->keyName, (int)$id); |
|
93 | + $criteria = new Criteria($this->keyName, (int) $id); |
|
94 | 94 | } |
95 | 95 | $criteria->setLimit(1); |
96 | - $objectArray =& $this->getObjects($criteria, false, true); |
|
96 | + $objectArray = & $this->getObjects($criteria, false, true); |
|
97 | 97 | if (count($objectArray) != 1) { |
98 | 98 | return $this->create(); |
99 | 99 | } |
@@ -114,11 +114,11 @@ discard block |
||
114 | 114 | { |
115 | 115 | $ret = array(); |
116 | 116 | $limit = $start = 0; |
117 | - $sql = 'SELECT * FROM ' . $this->table; |
|
117 | + $sql = 'SELECT * FROM '.$this->table; |
|
118 | 118 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
119 | - $sql .= ' ' . $criteria->renderWhere(); |
|
119 | + $sql .= ' '.$criteria->renderWhere(); |
|
120 | 120 | if ($criteria->getSort() != '') { |
121 | - $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder(); |
|
121 | + $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder(); |
|
122 | 122 | } |
123 | 123 | $limit = $criteria->getLimit(); |
124 | 124 | $start = $criteria->getStart(); |
@@ -197,15 +197,15 @@ discard block |
||
197 | 197 | $criteria->setSort($this->identifierName); |
198 | 198 | } |
199 | 199 | |
200 | - $sql = 'SELECT ' . $this->keyName; |
|
200 | + $sql = 'SELECT '.$this->keyName; |
|
201 | 201 | if (!empty($this->identifierName)) { |
202 | - $sql .= ', ' . $this->identifierName; |
|
202 | + $sql .= ', '.$this->identifierName; |
|
203 | 203 | } |
204 | - $sql .= ' FROM ' . $this->table; |
|
204 | + $sql .= ' FROM '.$this->table; |
|
205 | 205 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
206 | - $sql .= ' ' . $criteria->renderWhere(); |
|
206 | + $sql .= ' '.$criteria->renderWhere(); |
|
207 | 207 | if ($criteria->getSort() != '') { |
208 | - $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder(); |
|
208 | + $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder(); |
|
209 | 209 | } |
210 | 210 | $limit = $criteria->getLimit(); |
211 | 211 | $start = $criteria->getStart(); |
@@ -238,12 +238,12 @@ discard block |
||
238 | 238 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
239 | 239 | if ($criteria->groupby != '') { |
240 | 240 | $groupby = true; |
241 | - $field = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
241 | + $field = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
242 | 242 | } |
243 | 243 | } |
244 | - $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table; |
|
244 | + $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table; |
|
245 | 245 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
246 | - $sql .= ' ' . $criteria->renderWhere(); |
|
246 | + $sql .= ' '.$criteria->renderWhere(); |
|
247 | 247 | if ($criteria->groupby != '') { |
248 | 248 | $sql .= $criteria->getGroupby(); |
249 | 249 | } |
@@ -279,13 +279,13 @@ discard block |
||
279 | 279 | if (is_array($this->keyName)) { |
280 | 280 | $clause = array(); |
281 | 281 | for ($i = 0; $i < count($this->keyName); ++$i) { |
282 | - $clause[] = $this->keyName[$i] . ' = ' . $id[$i]; |
|
282 | + $clause[] = $this->keyName[$i].' = '.$id[$i]; |
|
283 | 283 | } |
284 | 284 | $whereclause = implode(' AND ', $clause); |
285 | 285 | } else { |
286 | - $whereclause = $this->keyName . ' = ' . $id; |
|
286 | + $whereclause = $this->keyName.' = '.$id; |
|
287 | 287 | } |
288 | - $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause; |
|
288 | + $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause; |
|
289 | 289 | if (false != $force) { |
290 | 290 | $result = $this->db->queryF($sql); |
291 | 291 | } else { |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | } |
319 | 319 | |
320 | 320 | if (!($obj instanceof $this->className && class_exists($this->className))) { |
321 | - $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className); |
|
321 | + $obj->setErrors(get_class($obj).' Differs from '.$this->className); |
|
322 | 322 | |
323 | 323 | return false; |
324 | 324 | } |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | |
330 | 330 | foreach ($obj->cleanVars as $k => $v) { |
331 | 331 | if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) { |
332 | - $cleanvars[$k] = (int)$v; |
|
332 | + $cleanvars[$k] = (int) $v; |
|
333 | 333 | } elseif (is_array($v)) { |
334 | 334 | $cleanvars[$k] = $this->db->quoteString(implode(',', $v)); |
335 | 335 | } else { |
@@ -339,12 +339,12 @@ discard block |
||
339 | 339 | if ($obj->isNew()) { |
340 | 340 | if (!is_array($this->keyName)) { |
341 | 341 | if ($cleanvars[$this->keyName] < 1) { |
342 | - $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq'); |
|
342 | + $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq'); |
|
343 | 343 | } |
344 | 344 | } |
345 | - $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')'; |
|
345 | + $sql = 'INSERT INTO '.$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')'; |
|
346 | 346 | } else { |
347 | - $sql = 'UPDATE ' . $this->table . ' SET'; |
|
347 | + $sql = 'UPDATE '.$this->table.' SET'; |
|
348 | 348 | foreach ($cleanvars as $key => $value) { |
349 | 349 | if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) { |
350 | 350 | continue; |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | if (isset($notfirst)) { |
353 | 353 | $sql .= ','; |
354 | 354 | } |
355 | - $sql .= ' ' . $key . ' = ' . $value; |
|
355 | + $sql .= ' '.$key.' = '.$value; |
|
356 | 356 | $notfirst = true; |
357 | 357 | } |
358 | 358 | if (is_array($this->keyName)) { |
@@ -361,12 +361,12 @@ discard block |
||
361 | 361 | if ($i > 0) { |
362 | 362 | $whereclause .= ' AND '; |
363 | 363 | } |
364 | - $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]); |
|
364 | + $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]); |
|
365 | 365 | } |
366 | 366 | } else { |
367 | - $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName); |
|
367 | + $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName); |
|
368 | 368 | } |
369 | - $sql .= ' WHERE ' . $whereclause; |
|
369 | + $sql .= ' WHERE '.$whereclause; |
|
370 | 370 | } |
371 | 371 | if (false != $force) { |
372 | 372 | $result = $this->db->queryF($sql); |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | */ |
397 | 397 | public function updateAll($fieldname, $fieldvalue, CriteriaElement $criteria = null, $force = false) |
398 | 398 | { |
399 | - $setClause = $fieldname . ' = '; |
|
399 | + $setClause = $fieldname.' = '; |
|
400 | 400 | if (is_numeric($fieldvalue)) { |
401 | 401 | $setClause .= $fieldvalue; |
402 | 402 | } elseif (is_array($fieldvalue)) { |
@@ -404,9 +404,9 @@ discard block |
||
404 | 404 | } else { |
405 | 405 | $setClause .= $this->db->quoteString($fieldvalue); |
406 | 406 | } |
407 | - $sql = 'UPDATE ' . $this->table . ' SET ' . $setClause; |
|
407 | + $sql = 'UPDATE '.$this->table.' SET '.$setClause; |
|
408 | 408 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
409 | - $sql .= ' ' . $criteria->renderWhere(); |
|
409 | + $sql .= ' '.$criteria->renderWhere(); |
|
410 | 410 | } |
411 | 411 | if (false != $force) { |
412 | 412 | $result = $this->db->queryF($sql); |
@@ -430,9 +430,9 @@ discard block |
||
430 | 430 | */ |
431 | 431 | public function updateFieldValue($fieldname, $fieldvalue, $criteria = null, $force = true) |
432 | 432 | { |
433 | - $sql = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldvalue; |
|
433 | + $sql = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldvalue; |
|
434 | 434 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
435 | - $sql .= ' ' . $criteria->renderWhere(); |
|
435 | + $sql .= ' '.$criteria->renderWhere(); |
|
436 | 436 | } |
437 | 437 | if (false != $force) { |
438 | 438 | $result = $this->db->queryF($sql); |
@@ -460,8 +460,8 @@ discard block |
||
460 | 460 | public function deleteAll(CriteriaElement $criteria = null, $force = true, $asObject = false) |
461 | 461 | { |
462 | 462 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
463 | - $sql = 'DELETE FROM ' . $this->table; |
|
464 | - $sql .= ' ' . $criteria->renderWhere(); |
|
463 | + $sql = 'DELETE FROM '.$this->table; |
|
464 | + $sql .= ' '.$criteria->renderWhere(); |
|
465 | 465 | if (!$this->db->query($sql)) { |
466 | 466 | return false; |
467 | 467 | } |
@@ -595,8 +595,8 @@ discard block |
||
595 | 595 | */ |
596 | 596 | public function updateCounter($fieldname, $criteria, $op = '+') |
597 | 597 | { |
598 | - $sql = 'UPDATE ' . $this->table . ' SET ' . $fieldname . ' = ' . $fieldname . $op . '1'; |
|
599 | - $sql .= ' ' . $criteria->renderWhere(); |
|
598 | + $sql = 'UPDATE '.$this->table.' SET '.$fieldname.' = '.$fieldname.$op.'1'; |
|
599 | + $sql .= ' '.$criteria->renderWhere(); |
|
600 | 600 | $result = $this->db->queryF($sql); |
601 | 601 | if (!$result) { |
602 | 602 | return false; |
@@ -618,12 +618,12 @@ discard block |
||
618 | 618 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
619 | 619 | if ($criteria->groupby != '') { |
620 | 620 | $groupby = true; |
621 | - $field = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
621 | + $field = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
622 | 622 | } |
623 | 623 | } |
624 | - $sql = 'SELECT ' . $field . "SUM($sum) FROM " . $this->table; |
|
624 | + $sql = 'SELECT '.$field."SUM($sum) FROM ".$this->table; |
|
625 | 625 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
626 | - $sql .= ' ' . $criteria->renderWhere(); |
|
626 | + $sql .= ' '.$criteria->renderWhere(); |
|
627 | 627 | if ($criteria->groupby != '') { |
628 | 628 | $sql .= $criteria->getGroupby(); |
629 | 629 | } |
@@ -659,12 +659,12 @@ discard block |
||
659 | 659 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
660 | 660 | if ($criteria->groupby != '') { |
661 | 661 | $groupby = true; |
662 | - $field = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
662 | + $field = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used |
|
663 | 663 | } |
664 | 664 | } |
665 | - $sql = 'SELECT ' . $field . "MAX($max) FROM " . $this->table; |
|
665 | + $sql = 'SELECT '.$field."MAX($max) FROM ".$this->table; |
|
666 | 666 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
667 | - $sql .= ' ' . $criteria->renderWhere(); |
|
667 | + $sql .= ' '.$criteria->renderWhere(); |
|
668 | 668 | if ($criteria->groupby != '') { |
669 | 669 | $sql .= $criteria->getGroupby(); |
670 | 670 | } |
@@ -697,9 +697,9 @@ discard block |
||
697 | 697 | { |
698 | 698 | $field = ''; |
699 | 699 | |
700 | - $sql = 'SELECT ' . $field . "AVG($avg) FROM " . $this->table; |
|
700 | + $sql = 'SELECT '.$field."AVG($avg) FROM ".$this->table; |
|
701 | 701 | if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { |
702 | - $sql .= ' ' . $criteria->renderWhere(); |
|
702 | + $sql .= ' '.$criteria->renderWhere(); |
|
703 | 703 | } |
704 | 704 | $result = $this->db->query($sql); |
705 | 705 | if (!$result) { |
@@ -9,7 +9,7 @@ |
||
9 | 9 | { |
10 | 10 | |
11 | 11 | /** |
12 | - * @param $form |
|
12 | + * @param ExtcalThemeForm $form |
|
13 | 13 | * @param int $startTS |
14 | 14 | * @param int $endTS |
15 | 15 | */ |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | */ |
16 | 16 | public function __construct(&$form, $startTS = 0, $endTS = 0) |
17 | 17 | { |
18 | - $startTS = (int)$startTS; |
|
18 | + $startTS = (int) $startTS; |
|
19 | 19 | $startTS = ($startTS > 0) ? $startTS : time(); |
20 | 20 | $startDatetime = getdate($startTS); |
21 | 21 | |
22 | - $endTS = (int)$endTS; |
|
22 | + $endTS = (int) $endTS; |
|
23 | 23 | $endTS = ($endTS > 0) ? $endTS : time(); |
24 | 24 | $endDatetime = getdate($endTS); |
25 | 25 | |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | for ($i = 0; $i < 24; ++$i) { |
28 | 28 | for ($j = 0; $j < _EXTCAL_TS_MINUTE; $j += 15) { |
29 | 29 | $key = ($i * _EXTCAL_TS_HOUR) + ($j * _EXTCAL_TS_MINUTE); |
30 | - $timearray[$key] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j; |
|
30 | + $timearray[$key] = ($j != 0) ? $i.':'.$j : $i.':0'.$j; |
|
31 | 31 | } |
32 | 32 | } |
33 | 33 | ksort($timearray); |
@@ -7,8 +7,8 @@ |
||
7 | 7 | { |
8 | 8 | |
9 | 9 | /** |
10 | - * @param $caption |
|
11 | - * @param $name |
|
10 | + * @param string $caption |
|
11 | + * @param string $name |
|
12 | 12 | * @param null $value |
13 | 13 | */ |
14 | 14 | function ExtcalFormFileCheckBox($caption, $name, $value = null) |
@@ -25,13 +25,13 @@ |
||
25 | 25 | { |
26 | 26 | $ret = ''; |
27 | 27 | if (count($this->getOptions()) > 1 && substr($this->getName(), -2, 2) !== '[]') { |
28 | - $newname = $this->getName() . '[]'; |
|
28 | + $newname = $this->getName().'[]'; |
|
29 | 29 | $this->setName($newname); |
30 | 30 | } |
31 | 31 | foreach ($this->getOptions() as $value => $name) { |
32 | - $ret .= "<input type='checkbox' name='" . $this->getName() . "' value='" . $value . "'"; |
|
32 | + $ret .= "<input type='checkbox' name='".$this->getName()."' value='".$value."'"; |
|
33 | 33 | $ret .= " checked='checked'"; |
34 | - $ret .= $this->getExtra() . ' />' . $name . "<br />\n"; |
|
34 | + $ret .= $this->getExtra().' />'.$name."<br />\n"; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | return $ret; |
@@ -7,9 +7,9 @@ |
||
7 | 7 | { |
8 | 8 | |
9 | 9 | /** |
10 | - * @param $caption |
|
11 | - * @param $name |
|
12 | - * @param null $value |
|
10 | + * @param string $caption |
|
11 | + * @param string $name |
|
12 | + * @param string $value |
|
13 | 13 | */ |
14 | 14 | function ExtcalFormRRuleCheckBox($caption, $name, $value = null) |
15 | 15 | { |
@@ -25,18 +25,18 @@ |
||
25 | 25 | $ret = '<table><tr>'; |
26 | 26 | $i = 0; |
27 | 27 | if (count($this->getOptions()) > 1 && substr($this->getName(), -2, 2) !== '[]') { |
28 | - $newname = $this->getName() . '[]'; |
|
28 | + $newname = $this->getName().'[]'; |
|
29 | 29 | $this->setName($newname); |
30 | 30 | } |
31 | 31 | foreach ($this->getOptions() as $value => $name) { |
32 | 32 | if ((++$i) % 6 == 0) { |
33 | 33 | $ret .= '</tr><tr>'; |
34 | 34 | } |
35 | - $ret .= "<td><input type='checkbox' name='" . $this->getName() . "' value='" . $value . "'"; |
|
35 | + $ret .= "<td><input type='checkbox' name='".$this->getName()."' value='".$value."'"; |
|
36 | 36 | if (count($this->getValue()) > 0 && in_array($value, $this->getValue())) { |
37 | 37 | $ret .= " checked='checked'"; |
38 | 38 | } |
39 | - $ret .= $this->getExtra() . ' />' . $name . "</td>\n"; |
|
39 | + $ret .= $this->getExtra().' />'.$name."</td>\n"; |
|
40 | 40 | } |
41 | 41 | $ret .= '</tr></table>'; |
42 | 42 |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | /** |
181 | 181 | * Set the value |
182 | 182 | * |
183 | - * @param $value int |
|
183 | + * @param integer $value int |
|
184 | 184 | */ |
185 | 185 | public function setValue($value) |
186 | 186 | { |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | /** |
200 | 200 | * Set the min value |
201 | 201 | * |
202 | - * @param $min int |
|
202 | + * @param integer $min int |
|
203 | 203 | */ |
204 | 204 | public function setMin($min) |
205 | 205 | { |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | /** |
218 | 218 | * Set the max value - must be more great then min |
219 | 219 | * |
220 | - * @param $max int |
|
220 | + * @param integer $max int |
|
221 | 221 | */ |
222 | 222 | public function setMax($max) |
223 | 223 | { |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | * Set the small increment when click a short time on up down nutton |
238 | 238 | * must be " > 0 " |
239 | 239 | * |
240 | - * @param $smallIncrement |
|
240 | + * @param integer $smallIncrement |
|
241 | 241 | * @internal param int $value |
242 | 242 | */ |
243 | 243 | public function setSmallIncrement($smallIncrement) |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | /** |
261 | 261 | * Set the large increment when click a long time on up down nutton |
262 | 262 | * |
263 | - * @param $largeIncrement int |
|
263 | + * @param integer $largeIncrement int |
|
264 | 264 | */ |
265 | 265 | public function setLargeIncrement($largeIncrement) |
266 | 266 | { |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | * Set the size in nb car of the input text for the value |
284 | 284 | * must be 2 car min |
285 | 285 | * |
286 | - * @param $size mixed |
|
286 | + * @param integer $size mixed |
|
287 | 287 | */ |
288 | 288 | public function setSize($size) |
289 | 289 | { |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | /** |
309 | 309 | * Set the shortname of the folder images |
310 | 310 | * |
311 | - * @param $folder string |
|
311 | + * @param string $folder string |
|
312 | 312 | */ |
313 | 313 | public function setImgFolder($folder) |
314 | 314 | { |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | /** |
329 | 329 | * Set the label of unites between value and buttons |
330 | 330 | * |
331 | - * @param $unite string |
|
331 | + * @param string $unite string |
|
332 | 332 | */ |
333 | 333 | public function setUnite($unite) |
334 | 334 | { |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | /** |
347 | 347 | * Set the style CSS of the text |
348 | 348 | * |
349 | - * @param $style string |
|
349 | + * @param string $style string |
|
350 | 350 | */ |
351 | 351 | public function setStyleText($style) |
352 | 352 | { |
@@ -366,7 +366,7 @@ discard block |
||
366 | 366 | /** |
367 | 367 | * Set the style CSS of the frame |
368 | 368 | * |
369 | - * @param $style string |
|
369 | + * @param string $style string |
|
370 | 370 | */ |
371 | 371 | public function setStyleBordure($style) |
372 | 372 | { |
@@ -386,7 +386,7 @@ discard block |
||
386 | 386 | /** |
387 | 387 | * Set MinMaxVisible : show the button to go min and max value |
388 | 388 | * |
389 | - * @param $visible bool |
|
389 | + * @param boolean $visible bool |
|
390 | 390 | */ |
391 | 391 | public function setMinMaxVisible($visible) |
392 | 392 | { |
@@ -495,6 +495,11 @@ discard block |
||
495 | 495 | * @param string $default |
496 | 496 | * @return string |
497 | 497 | */ |
498 | + |
|
499 | + /** |
|
500 | + * @param string $attribut |
|
501 | + * @param string $value |
|
502 | + */ |
|
498 | 503 | public function htmlAddAttribut($attribut, $value, $default = '') |
499 | 504 | { |
500 | 505 | $r = ''; |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | */ |
204 | 204 | public function setMin($min) |
205 | 205 | { |
206 | - $this->_min = (int)$min; |
|
206 | + $this->_min = (int) $min; |
|
207 | 207 | } |
208 | 208 | /*-----------------------------------------------------------------*/ |
209 | 209 | /** |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | */ |
222 | 222 | public function setMax($max) |
223 | 223 | { |
224 | - $this->_max = (int)$max; |
|
224 | + $this->_max = (int) $max; |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /*-----------------------------------------------------------------*/ |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | */ |
243 | 243 | public function setSmallIncrement($smallIncrement) |
244 | 244 | { |
245 | - $this->_smallIncrement = (int)$smallIncrement; |
|
245 | + $this->_smallIncrement = (int) $smallIncrement; |
|
246 | 246 | if ($this->_smallIncrement == 0) { |
247 | 247 | $this->_smallIncrement = 1; |
248 | 248 | } |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | */ |
265 | 265 | public function setLargeIncrement($largeIncrement) |
266 | 266 | { |
267 | - $this->_largeIncrement = (int)$largeIncrement; |
|
267 | + $this->_largeIncrement = (int) $largeIncrement; |
|
268 | 268 | if ($this->_largeIncrement == 0) { |
269 | 269 | $this->_largeIncrement = 10; |
270 | 270 | } |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | $sFolderImg = "{$sSpinFolder}/images/{$this->getImgFolder()}/"; |
406 | 406 | |
407 | 407 | $prefixe = $this->getName(); |
408 | - $prefixe2 = 'spin' . $prefixe; |
|
408 | + $prefixe2 = 'spin'.$prefixe; |
|
409 | 409 | |
410 | 410 | $smallIncrement = $this->getSmallIncrement(); |
411 | 411 | $largeIncrement = $this->getLargeIncrement(); |
@@ -424,7 +424,7 @@ discard block |
||
424 | 424 | $t = array(); |
425 | 425 | |
426 | 426 | if ($this->_loadJS) { |
427 | - $js = $sSpinFolder . '/js/spin.js'; |
|
427 | + $js = $sSpinFolder.'/js/spin.js'; |
|
428 | 428 | $t[] = "<script src='{$js}' type='text/javascript'></script>"; |
429 | 429 | } |
430 | 430 | |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | //------------------------------------------------------- |
470 | 470 | |
471 | 471 | $t[] = ' </tr>'; |
472 | - $t[] = '</table>' . "\n"; |
|
472 | + $t[] = '</table>'."\n"; |
|
473 | 473 | $t[] = '</div>'; |
474 | 474 | //------------------------------------------- |
475 | 475 | $html = implode("\n", $t); |
@@ -1190,7 +1190,7 @@ discard block |
||
1190 | 1190 | /** |
1191 | 1191 | * @param $p_tarname |
1192 | 1192 | * @param $p_list |
1193 | - * @param $p_mode |
|
1193 | + * @param string $p_mode |
|
1194 | 1194 | * @param string $p_add_dir |
1195 | 1195 | * @param string $p_remove_dir |
1196 | 1196 | * |
@@ -1290,10 +1290,10 @@ discard block |
||
1290 | 1290 | /** |
1291 | 1291 | * @param $p_tarname |
1292 | 1292 | * @param $p_list |
1293 | - * @param $p_mode |
|
1293 | + * @param string $p_mode |
|
1294 | 1294 | * @param $p_list_detail |
1295 | - * @param $p_add_dir |
|
1296 | - * @param $p_remove_dir |
|
1295 | + * @param string $p_add_dir |
|
1296 | + * @param string $p_remove_dir |
|
1297 | 1297 | * |
1298 | 1298 | * @return int |
1299 | 1299 | */ |
@@ -2092,10 +2092,10 @@ discard block |
||
2092 | 2092 | * @param $p_tarname |
2093 | 2093 | * @param $p_file_list |
2094 | 2094 | * @param $p_list_detail |
2095 | - * @param $p_mode |
|
2096 | - * @param $p_path |
|
2095 | + * @param string $p_mode |
|
2096 | + * @param string $p_path |
|
2097 | 2097 | * @param $p_tar_mode |
2098 | - * @param $p_remove_path |
|
2098 | + * @param string $p_remove_path |
|
2099 | 2099 | * |
2100 | 2100 | * @return int |
2101 | 2101 | */ |
@@ -2648,8 +2648,8 @@ discard block |
||
2648 | 2648 | * @param $p_tarname |
2649 | 2649 | * @param $p_index_string |
2650 | 2650 | * @param $p_list_detail |
2651 | - * @param $p_path |
|
2652 | - * @param $p_remove_path |
|
2651 | + * @param string $p_path |
|
2652 | + * @param string $p_remove_path |
|
2653 | 2653 | * @param $p_tar_mode |
2654 | 2654 | * |
2655 | 2655 | * @return int |
@@ -3219,7 +3219,7 @@ discard block |
||
3219 | 3219 | * @param $p_tarname |
3220 | 3220 | * @param $p_file_list |
3221 | 3221 | * @param $p_list_detail |
3222 | - * @param $p_tar_mode |
|
3222 | + * @param string $p_tar_mode |
|
3223 | 3223 | * |
3224 | 3224 | * @return int |
3225 | 3225 | */ |
@@ -3513,9 +3513,9 @@ discard block |
||
3513 | 3513 | * @param $p_tarname |
3514 | 3514 | * @param $p_file_list |
3515 | 3515 | * @param $p_list_detail |
3516 | - * @param $p_tar_mode |
|
3517 | - * @param $p_add_dir |
|
3518 | - * @param $p_remove_dir |
|
3516 | + * @param string $p_tar_mode |
|
3517 | + * @param string $p_add_dir |
|
3518 | + * @param string $p_remove_dir |
|
3519 | 3519 | * |
3520 | 3520 | * @return int |
3521 | 3521 | */ |
@@ -3922,7 +3922,7 @@ discard block |
||
3922 | 3922 | // Return Values : |
3923 | 3923 | // -------------------------------------------------------------------------------- |
3924 | 3924 | /** |
3925 | - * @param $v_binary_data |
|
3925 | + * @param string $v_binary_data |
|
3926 | 3926 | * @param $v_header |
3927 | 3927 | * |
3928 | 3928 | * @return int |
@@ -60,10 +60,10 @@ discard block |
||
60 | 60 | // This library should be called by each script before the include of PhpZip |
61 | 61 | // Library in order to limit the potential 'lib' directory path problem. |
62 | 62 | if (!defined('PCLERROR_LIB')) { |
63 | - include($gPcltarLibDir . '/pclerror.lib.php'); |
|
63 | + include($gPcltarLibDir.'/pclerror.lib.php'); |
|
64 | 64 | } |
65 | 65 | if (!defined('PCLTRACE_LIB')) { |
66 | - include($gPcltarLibDir . '/pcltrace.lib.php'); |
|
66 | + include($gPcltarLibDir.'/pcltrace.lib.php'); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | // -------------------------------------------------------------------------------- |
@@ -823,7 +823,7 @@ discard block |
||
823 | 823 | if (!is_file($p_tarname)) { |
824 | 824 | PclErrorLog(-4, "Archive '$p_tarname' does not exist"); |
825 | 825 | } else { |
826 | - PclErrorLog(-6, "Archive '$p_tarname' has invalid size " . filesize($p_tarname) . '(not a 512 block multiple)'); |
|
826 | + PclErrorLog(-6, "Archive '$p_tarname' has invalid size ".filesize($p_tarname).'(not a 512 block multiple)'); |
|
827 | 827 | } |
828 | 828 | |
829 | 829 | // ----- Return |
@@ -836,7 +836,7 @@ discard block |
||
836 | 836 | if (!is_file($p_tarname_add)) { |
837 | 837 | PclErrorLog(-4, "Archive '$p_tarname_add' does not exist"); |
838 | 838 | } else { |
839 | - PclErrorLog(-6, "Archive '$p_tarname_add' has invalid size " . filesize($p_tarname_add) . '(not a 512 block multiple)'); |
|
839 | + PclErrorLog(-6, "Archive '$p_tarname_add' has invalid size ".filesize($p_tarname_add).'(not a 512 block multiple)'); |
|
840 | 840 | } |
841 | 841 | |
842 | 842 | // ----- Return |
@@ -859,7 +859,7 @@ discard block |
||
859 | 859 | } |
860 | 860 | |
861 | 861 | // ----- Open a temporary file in write mode |
862 | - $v_temp_tarname = uniqid('pcltar-') . '.tmp'; |
|
862 | + $v_temp_tarname = uniqid('pcltar-').'.tmp'; |
|
863 | 863 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
864 | 864 | if (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) { |
865 | 865 | // ----- Close tar file |
@@ -912,9 +912,9 @@ discard block |
||
912 | 912 | } |
913 | 913 | |
914 | 914 | // ----- Go to the beginning of last block |
915 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
915 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
916 | 916 | fseek($p_tar, $v_size - 512); |
917 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
917 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
918 | 918 | } // ----- Look for unknown type |
919 | 919 | else { |
920 | 920 | // ----- Error log |
@@ -1205,7 +1205,7 @@ discard block |
||
1205 | 1205 | if (!is_file($p_tarname)) { |
1206 | 1206 | PclErrorLog(-4, "Archive '$p_tarname' does not exist"); |
1207 | 1207 | } else { |
1208 | - PclErrorLog(-6, "Archive '$p_tarname' has invalid size " . filesize($p_tarname) . '(not a 512 block multiple)'); |
|
1208 | + PclErrorLog(-6, "Archive '$p_tarname' has invalid size ".filesize($p_tarname).'(not a 512 block multiple)'); |
|
1209 | 1209 | } |
1210 | 1210 | |
1211 | 1211 | // ----- Return |
@@ -1228,7 +1228,7 @@ discard block |
||
1228 | 1228 | } |
1229 | 1229 | |
1230 | 1230 | // ----- Open a temporary file in write mode |
1231 | - $v_temp_tarname = uniqid('pcltar-') . '.tmp'; |
|
1231 | + $v_temp_tarname = uniqid('pcltar-').'.tmp'; |
|
1232 | 1232 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
1233 | 1233 | if (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) { |
1234 | 1234 | // ----- Close tar file |
@@ -1313,9 +1313,9 @@ discard block |
||
1313 | 1313 | } |
1314 | 1314 | |
1315 | 1315 | // ----- Go to the beginning of last block |
1316 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1316 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1317 | 1317 | fseek($p_tar, $v_size - 512); |
1318 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1318 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1319 | 1319 | |
1320 | 1320 | // ----- Call the adding fct inside the tar |
1321 | 1321 | if (($v_result = PclTarHandleAddList($p_tar, $p_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir)) == 1) { |
@@ -1382,7 +1382,7 @@ discard block |
||
1382 | 1382 | // ----- Check the parameters |
1383 | 1383 | if ($p_tar == 0) { |
1384 | 1384 | // ----- Error log |
1385 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
1385 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
1386 | 1386 | |
1387 | 1387 | // ----- Return |
1388 | 1388 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1437,7 +1437,7 @@ discard block |
||
1437 | 1437 | return PclErrorCode(); |
1438 | 1438 | } |
1439 | 1439 | |
1440 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position before header =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1440 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position before header ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1441 | 1441 | |
1442 | 1442 | // ----- Add the file |
1443 | 1443 | if (($v_result = PclTarHandleAddFile($p_tar, $p_filename, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) { |
@@ -1457,7 +1457,7 @@ discard block |
||
1457 | 1457 | // ----- Look for path |
1458 | 1458 | $v_path = ''; |
1459 | 1459 | if ($p_filename !== '.') { |
1460 | - $v_path = $p_filename . '/'; |
|
1460 | + $v_path = $p_filename.'/'; |
|
1461 | 1461 | } |
1462 | 1462 | |
1463 | 1463 | // ----- Read the directory for files and sub-directories |
@@ -1466,11 +1466,11 @@ discard block |
||
1466 | 1466 | $p_hitem = readdir($p_hdir); // '..' directory |
1467 | 1467 | while ($p_hitem = readdir($p_hdir)) { |
1468 | 1468 | // ----- Look for a file |
1469 | - if (is_file($v_path . $p_hitem)) { |
|
1470 | - TrFctMessage(__FILE__, __LINE__, 4, "Add the file '" . $v_path . $p_hitem . "'"); |
|
1469 | + if (is_file($v_path.$p_hitem)) { |
|
1470 | + TrFctMessage(__FILE__, __LINE__, 4, "Add the file '".$v_path.$p_hitem."'"); |
|
1471 | 1471 | |
1472 | 1472 | // ----- Add the file |
1473 | - if (($v_result = PclTarHandleAddFile($p_tar, $v_path . $p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) { |
|
1473 | + if (($v_result = PclTarHandleAddFile($p_tar, $v_path.$p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) { |
|
1474 | 1474 | // ----- Return status |
1475 | 1475 | TrFctEnd(__FILE__, __LINE__, $v_result); |
1476 | 1476 | |
@@ -1481,10 +1481,10 @@ discard block |
||
1481 | 1481 | $p_list_detail[$v_nb++] = $v_header; |
1482 | 1482 | } // ----- Recursive call to PclTarHandleAddFile() |
1483 | 1483 | else { |
1484 | - TrFctMessage(__FILE__, __LINE__, 4, "'" . $v_path . $p_hitem . "' is a directory"); |
|
1484 | + TrFctMessage(__FILE__, __LINE__, 4, "'".$v_path.$p_hitem."' is a directory"); |
|
1485 | 1485 | |
1486 | 1486 | // ----- Need an array as parameter |
1487 | - $p_temp_list[0] = $v_path . $p_hitem; |
|
1487 | + $p_temp_list[0] = $v_path.$p_hitem; |
|
1488 | 1488 | $v_result = PclTarHandleAddList($p_tar, $p_temp_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir); |
1489 | 1489 | } |
1490 | 1490 | } |
@@ -1492,7 +1492,7 @@ discard block |
||
1492 | 1492 | // ----- Free memory for the recursive loop |
1493 | 1493 | unset($p_temp_list, $p_hdir, $p_hitem); |
1494 | 1494 | } else { |
1495 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1495 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1496 | 1496 | } |
1497 | 1497 | } |
1498 | 1498 | |
@@ -1528,7 +1528,7 @@ discard block |
||
1528 | 1528 | // ----- Check the parameters |
1529 | 1529 | if ($p_tar == 0) { |
1530 | 1530 | // ----- Error log |
1531 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
1531 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
1532 | 1532 | |
1533 | 1533 | // ----- Return |
1534 | 1534 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1556,7 +1556,7 @@ discard block |
||
1556 | 1556 | |
1557 | 1557 | if ((0 === strpos($p_filename, './')) || (0 === strpos($p_remove_dir, './'))) { |
1558 | 1558 | if ((0 === strpos($p_filename, './')) && (0 !== strpos($p_remove_dir, './'))) { |
1559 | - $p_remove_dir = './' . $p_remove_dir; |
|
1559 | + $p_remove_dir = './'.$p_remove_dir; |
|
1560 | 1560 | } |
1561 | 1561 | if ((0 !== strpos($p_filename, './')) && (0 === strpos($p_remove_dir, './'))) { |
1562 | 1562 | $p_remove_dir = substr($p_remove_dir, 2); |
@@ -1570,9 +1570,9 @@ discard block |
||
1570 | 1570 | } |
1571 | 1571 | if ($p_add_dir != '') { |
1572 | 1572 | if (substr($p_add_dir, -1) === '/') { |
1573 | - $v_stored_filename = $p_add_dir . $v_stored_filename; |
|
1573 | + $v_stored_filename = $p_add_dir.$v_stored_filename; |
|
1574 | 1574 | } else { |
1575 | - $v_stored_filename = $p_add_dir . '/' . $v_stored_filename; |
|
1575 | + $v_stored_filename = $p_add_dir.'/'.$v_stored_filename; |
|
1576 | 1576 | } |
1577 | 1577 | TrFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_filename' = '$v_stored_filename'"); |
1578 | 1578 | } |
@@ -1609,7 +1609,7 @@ discard block |
||
1609 | 1609 | return $v_result; |
1610 | 1610 | } |
1611 | 1611 | |
1612 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1612 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1613 | 1613 | |
1614 | 1614 | // ----- Read the file by 512 octets blocks |
1615 | 1615 | $i = 0; |
@@ -1627,7 +1627,7 @@ discard block |
||
1627 | 1627 | // ----- Close the file |
1628 | 1628 | fclose($v_file); |
1629 | 1629 | |
1630 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1630 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1631 | 1631 | } // ----- Look for a directory |
1632 | 1632 | else { |
1633 | 1633 | // ----- Call the header generation |
@@ -1638,7 +1638,7 @@ discard block |
||
1638 | 1638 | return $v_result; |
1639 | 1639 | } |
1640 | 1640 | |
1641 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1641 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
1642 | 1642 | } |
1643 | 1643 | |
1644 | 1644 | // ----- Return |
@@ -1685,7 +1685,7 @@ discard block |
||
1685 | 1685 | // ----- Check the parameters |
1686 | 1686 | if (($p_tar == 0) || ($p_filename == '')) { |
1687 | 1687 | // ----- Error log |
1688 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
1688 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
1689 | 1689 | |
1690 | 1690 | // ----- Return |
1691 | 1691 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1698,7 +1698,7 @@ discard block |
||
1698 | 1698 | $p_stored_filename = $p_filename; |
1699 | 1699 | } |
1700 | 1700 | $v_reduce_filename = PclTarHandlePathReduction($p_stored_filename); |
1701 | - TrFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_reduce_filename', strlen " . strlen($v_reduce_filename)); |
|
1701 | + TrFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_reduce_filename', strlen ".strlen($v_reduce_filename)); |
|
1702 | 1702 | |
1703 | 1703 | // ----- Get file info |
1704 | 1704 | $v_info = stat($p_filename); |
@@ -1892,7 +1892,7 @@ discard block |
||
1892 | 1892 | // ----- Check the path |
1893 | 1893 | //if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../"))) |
1894 | 1894 | if ($p_path == '') { |
1895 | - $p_path = './' . $p_path; |
|
1895 | + $p_path = './'.$p_path; |
|
1896 | 1896 | } |
1897 | 1897 | |
1898 | 1898 | // ----- Look for path to remove format (should end by /) |
@@ -1987,27 +1987,27 @@ discard block |
||
1987 | 1987 | continue; |
1988 | 1988 | } |
1989 | 1989 | |
1990 | - TrFctMessage(__FILE__, __LINE__, 2, "Found file '" . $v_header['filename'] . "', size '" . $v_header['size'] . "'"); |
|
1990 | + TrFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'"); |
|
1991 | 1991 | |
1992 | 1992 | // ----- Look for partial extract |
1993 | 1993 | if ((!$v_extract_all) && is_array($p_file_list)) { |
1994 | - TrFctMessage(__FILE__, __LINE__, 2, 'Look if the file ' . $v_header['filename'] . ' need to be extracted'); |
|
1994 | + TrFctMessage(__FILE__, __LINE__, 2, 'Look if the file '.$v_header['filename'].' need to be extracted'); |
|
1995 | 1995 | |
1996 | 1996 | // ----- By default no unzip if the file is not found |
1997 | 1997 | $v_extract_file = false; |
1998 | 1998 | |
1999 | 1999 | // ----- Look into the file list |
2000 | 2000 | for ($i = 0; $i < count($p_file_list); ++$i) { |
2001 | - TrFctMessage(__FILE__, __LINE__, 2, 'Compare archived file ' . $v_header['filename'] . " from asked list file '" . $p_file_list[$i] . "'"); |
|
2001 | + TrFctMessage(__FILE__, __LINE__, 2, 'Compare archived file '.$v_header['filename']." from asked list file '".$p_file_list[$i]."'"); |
|
2002 | 2002 | |
2003 | 2003 | // ----- Look if it is a directory |
2004 | 2004 | if (substr($p_file_list[$i], -1) === '/') { |
2005 | - TrFctMessage(__FILE__, __LINE__, 3, 'Compare file ' . $v_header['filename'] . " with directory '$p_file_list[$i]'"); |
|
2005 | + TrFctMessage(__FILE__, __LINE__, 3, 'Compare file '.$v_header['filename']." with directory '$p_file_list[$i]'"); |
|
2006 | 2006 | |
2007 | 2007 | // ----- Look if the directory is in the filename path |
2008 | 2008 | if ((strlen($v_header['filename']) > strlen($p_file_list[$i])) && (0 === strpos($v_header['filename'], $p_file_list[$i]))) { |
2009 | 2009 | // ----- The file is in the directory, so extract it |
2010 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . " is in directory '$p_file_list[$i]' : extract it"); |
|
2010 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename']." is in directory '$p_file_list[$i]' : extract it"); |
|
2011 | 2011 | $v_extract_file = true; |
2012 | 2012 | |
2013 | 2013 | // ----- End of loop |
@@ -2017,7 +2017,7 @@ discard block |
||
2017 | 2017 | else { |
2018 | 2018 | if ($p_file_list[$i] == $v_header['filename']) { |
2019 | 2019 | // ----- File found |
2020 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' should be extracted'); |
|
2020 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' should be extracted'); |
|
2021 | 2021 | $v_extract_file = true; |
2022 | 2022 | |
2023 | 2023 | // ----- End of loop |
@@ -2028,7 +2028,7 @@ discard block |
||
2028 | 2028 | |
2029 | 2029 | // ----- Trace |
2030 | 2030 | if (!$v_extract_file) { |
2031 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' should not be extracted'); |
|
2031 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' should not be extracted'); |
|
2032 | 2032 | } |
2033 | 2033 | } else { |
2034 | 2034 | // ----- All files need to be extracted |
@@ -2039,10 +2039,10 @@ discard block |
||
2039 | 2039 | if ($v_extract_file && (!$v_listing)) { |
2040 | 2040 | // ----- Look for path to remove |
2041 | 2041 | if (($p_remove_path != '') && (0 === strpos($v_header['filename'], $p_remove_path))) { |
2042 | - TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file " . $v_header['filename'] . ''); |
|
2042 | + TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file ".$v_header['filename'].''); |
|
2043 | 2043 | // ----- Remove the path |
2044 | 2044 | $v_header['filename'] = substr($v_header['filename'], $p_remove_path_size); |
2045 | - TrFctMessage(__FILE__, __LINE__, 3, 'Reslting file is ' . $v_header['filename'] . ''); |
|
2045 | + TrFctMessage(__FILE__, __LINE__, 3, 'Reslting file is '.$v_header['filename'].''); |
|
2046 | 2046 | } |
2047 | 2047 | |
2048 | 2048 | // ----- Add the path to the file |
@@ -2056,22 +2056,22 @@ discard block |
||
2056 | 2056 | |
2057 | 2057 | // ----- Add the path |
2058 | 2058 | if (0 === strpos($v_header['filename'], '/')) { |
2059 | - $v_header['filename'] = $p_path . $v_header['filename']; |
|
2059 | + $v_header['filename'] = $p_path.$v_header['filename']; |
|
2060 | 2060 | } else { |
2061 | - $v_header['filename'] = $p_path . '/' . $v_header['filename']; |
|
2061 | + $v_header['filename'] = $p_path.'/'.$v_header['filename']; |
|
2062 | 2062 | } |
2063 | 2063 | } |
2064 | 2064 | |
2065 | 2065 | // ----- Trace |
2066 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
2066 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
2067 | 2067 | |
2068 | 2068 | // ----- Check that the file does not exists |
2069 | 2069 | if (file_exists($v_header['filename'])) { |
2070 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' already exists'); |
|
2070 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' already exists'); |
|
2071 | 2071 | |
2072 | 2072 | // ----- Look if file is a directory |
2073 | 2073 | if (is_dir($v_header['filename'])) { |
2074 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is a directory'); |
|
2074 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is a directory'); |
|
2075 | 2075 | |
2076 | 2076 | // ----- Change the file status |
2077 | 2077 | $v_header['status'] = 'already_a_directory'; |
@@ -2082,7 +2082,7 @@ discard block |
||
2082 | 2082 | } // ----- Look if file is write protected |
2083 | 2083 | else { |
2084 | 2084 | if (!s_writable($v_header['filename'])) { |
2085 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is write protected'); |
|
2085 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is write protected'); |
|
2086 | 2086 | |
2087 | 2087 | // ----- Change the file status |
2088 | 2088 | $v_header['status'] = 'write_protected'; |
@@ -2116,7 +2116,7 @@ discard block |
||
2116 | 2116 | } |
2117 | 2117 | |
2118 | 2118 | if (($v_result = PclTarHandlerDirCheck($v_dir_to_check)) != 1) { |
2119 | - TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for ' . $v_header['filename'] . ''); |
|
2119 | + TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for '.$v_header['filename'].''); |
|
2120 | 2120 | |
2121 | 2121 | // ----- Change the file status |
2122 | 2122 | $v_header['status'] = 'path_creation_fail'; |
@@ -2131,7 +2131,7 @@ discard block |
||
2131 | 2131 | if ($v_extract_file && ($v_header['typeflag'] != '5')) { |
2132 | 2132 | // ----- Open the destination file in write mode |
2133 | 2133 | if (($v_dest_file = @fopen($v_header['filename'], 'wb')) == 0) { |
2134 | - TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening ' . $v_header['filename'] . ' in write binary mode'); |
|
2134 | + TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening '.$v_header['filename'].' in write binary mode'); |
|
2135 | 2135 | |
2136 | 2136 | // ----- Change the file status |
2137 | 2137 | $v_header['status'] = 'write_error'; |
@@ -2144,12 +2144,12 @@ discard block |
||
2144 | 2144 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2145 | 2145 | } |
2146 | 2146 | } else { |
2147 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of ' . $v_header['filename'] . ''); |
|
2147 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of '.$v_header['filename'].''); |
|
2148 | 2148 | |
2149 | 2149 | // ----- Read data |
2150 | 2150 | $n = floor($v_header['size'] / 512); |
2151 | 2151 | for ($i = 0; $i < $n; ++$i) { |
2152 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
2152 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
2153 | 2153 | if ($p_tar_mode === 'tar') { |
2154 | 2154 | $v_content = fread($v_tar, 512); |
2155 | 2155 | } else { |
@@ -2158,7 +2158,7 @@ discard block |
||
2158 | 2158 | fwrite($v_dest_file, $v_content, 512); |
2159 | 2159 | } |
2160 | 2160 | if (($v_header['size'] % 512) != 0) { |
2161 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read last ' . ($v_header['size'] % 512) . ' bytes in a 512 block'); |
|
2161 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read last '.($v_header['size'] % 512).' bytes in a 512 block'); |
|
2162 | 2162 | if ($p_tar_mode === 'tar') { |
2163 | 2163 | $v_content = fread($v_tar, 512); |
2164 | 2164 | } else { |
@@ -2186,7 +2186,7 @@ discard block |
||
2186 | 2186 | } |
2187 | 2187 | |
2188 | 2188 | // ----- Error log |
2189 | - 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."); |
|
2189 | + 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."); |
|
2190 | 2190 | |
2191 | 2191 | // ----- Return |
2192 | 2192 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -2197,7 +2197,7 @@ discard block |
||
2197 | 2197 | // ----- Trace |
2198 | 2198 | TrFctMessage(__FILE__, __LINE__, 2, 'Extraction done'); |
2199 | 2199 | } else { |
2200 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file ' . $v_header['filename'] . ' skipped.'); |
|
2200 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file '.$v_header['filename'].' skipped.'); |
|
2201 | 2201 | |
2202 | 2202 | // ----- Jump to next file |
2203 | 2203 | TrFctMessage(__FILE__, __LINE__, 2, 'Jump to next file'); |
@@ -2210,8 +2210,8 @@ discard block |
||
2210 | 2210 | } // ----- Look for file that is not to be unzipped |
2211 | 2211 | else { |
2212 | 2212 | // ----- Trace |
2213 | - TrFctMessage(__FILE__, __LINE__, 2, 'Jump file ' . $v_header['filename'] . ''); |
|
2214 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2213 | + TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].''); |
|
2214 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2215 | 2215 | |
2216 | 2216 | // ----- Jump to next file |
2217 | 2217 | if ($p_tar_mode === 'tar') { |
@@ -2220,7 +2220,7 @@ discard block |
||
2220 | 2220 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2221 | 2221 | } |
2222 | 2222 | |
2223 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2223 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2224 | 2224 | } |
2225 | 2225 | |
2226 | 2226 | if ($p_tar_mode === 'tar') { |
@@ -2231,7 +2231,7 @@ discard block |
||
2231 | 2231 | |
2232 | 2232 | // ----- File name and properties are logged if listing mode or file is extracted |
2233 | 2233 | if ($v_listing || $v_extract_file || $v_extraction_stopped) { |
2234 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
2234 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
2235 | 2235 | |
2236 | 2236 | // ----- Log extracted files |
2237 | 2237 | if (($v_file_dir = dirname($v_header['filename'])) == $v_header['filename']) { |
@@ -2297,7 +2297,7 @@ discard block |
||
2297 | 2297 | |
2298 | 2298 | // ----- Check the path |
2299 | 2299 | if (($p_path === '') || ((0 !== strpos($p_path, '/')) && (0 !== strpos($p_path, '../')) && (0 !== strpos($p_path, './')))) { |
2300 | - $p_path = './' . $p_path; |
|
2300 | + $p_path = './'.$p_path; |
|
2301 | 2301 | } |
2302 | 2302 | |
2303 | 2303 | // ----- Look for path to remove format (should end by /) |
@@ -2436,14 +2436,14 @@ discard block |
||
2436 | 2436 | continue; |
2437 | 2437 | } |
2438 | 2438 | |
2439 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
2439 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
2440 | 2440 | |
2441 | 2441 | // ----- Look if file is in the range to be extracted |
2442 | 2442 | if (($p_index_current >= $p_index_start) && ($p_index_current <= $p_index_stop)) { |
2443 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' is in the range to be extracted'); |
|
2443 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' is in the range to be extracted'); |
|
2444 | 2444 | $v_extract_file = true; |
2445 | 2445 | } else { |
2446 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' is out of the range'); |
|
2446 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' is out of the range'); |
|
2447 | 2447 | $v_extract_file = false; |
2448 | 2448 | } |
2449 | 2449 | |
@@ -2458,8 +2458,8 @@ discard block |
||
2458 | 2458 | } // ----- Look for file that is not to be extracted |
2459 | 2459 | else { |
2460 | 2460 | // ----- Trace |
2461 | - TrFctMessage(__FILE__, __LINE__, 2, 'Jump file ' . $v_header['filename'] . ''); |
|
2462 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2461 | + TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].''); |
|
2462 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2463 | 2463 | |
2464 | 2464 | // ----- Jump to next file |
2465 | 2465 | if ($p_tar_mode === 'tar') { |
@@ -2468,7 +2468,7 @@ discard block |
||
2468 | 2468 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2469 | 2469 | } |
2470 | 2470 | |
2471 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2471 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2472 | 2472 | } |
2473 | 2473 | |
2474 | 2474 | if ($p_tar_mode === 'tar') { |
@@ -2479,7 +2479,7 @@ discard block |
||
2479 | 2479 | |
2480 | 2480 | // ----- File name and properties are logged if listing mode or file is extracted |
2481 | 2481 | if ($v_extract_file) { |
2482 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
2482 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
2483 | 2483 | |
2484 | 2484 | // ----- Log extracted files |
2485 | 2485 | if (($v_file_dir = dirname($v_header['filename'])) == $v_header['filename']) { |
@@ -2536,10 +2536,10 @@ discard block |
||
2536 | 2536 | |
2537 | 2537 | // ----- Look for path to remove |
2538 | 2538 | if (($p_remove_path != '') && (0 === strpos($v_header['filename'], $p_remove_path))) { |
2539 | - TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file " . $v_header['filename'] . ''); |
|
2539 | + TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file ".$v_header['filename'].''); |
|
2540 | 2540 | // ----- Remove the path |
2541 | 2541 | $v_header['filename'] = substr($v_header['filename'], $p_remove_path_size); |
2542 | - TrFctMessage(__FILE__, __LINE__, 3, 'Resulting file is ' . $v_header['filename'] . ''); |
|
2542 | + TrFctMessage(__FILE__, __LINE__, 3, 'Resulting file is '.$v_header['filename'].''); |
|
2543 | 2543 | } |
2544 | 2544 | |
2545 | 2545 | // ----- Add the path to the file |
@@ -2553,22 +2553,22 @@ discard block |
||
2553 | 2553 | |
2554 | 2554 | // ----- Add the path |
2555 | 2555 | if (0 === strpos($v_header['filename'], '/')) { |
2556 | - $v_header['filename'] = $p_path . $v_header['filename']; |
|
2556 | + $v_header['filename'] = $p_path.$v_header['filename']; |
|
2557 | 2557 | } else { |
2558 | - $v_header['filename'] = $p_path . '/' . $v_header['filename']; |
|
2558 | + $v_header['filename'] = $p_path.'/'.$v_header['filename']; |
|
2559 | 2559 | } |
2560 | 2560 | } |
2561 | 2561 | |
2562 | 2562 | // ----- Trace |
2563 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
2563 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
2564 | 2564 | |
2565 | 2565 | // ----- Check that the file does not exists |
2566 | 2566 | if (file_exists($v_header['filename'])) { |
2567 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' already exists'); |
|
2567 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' already exists'); |
|
2568 | 2568 | |
2569 | 2569 | // ----- Look if file is a directory |
2570 | 2570 | if (is_dir($v_header['filename'])) { |
2571 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is a directory'); |
|
2571 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is a directory'); |
|
2572 | 2572 | |
2573 | 2573 | // ----- Change the file status |
2574 | 2574 | $v_header['status'] = 'already_a_directory'; |
@@ -2579,7 +2579,7 @@ discard block |
||
2579 | 2579 | } // ----- Look if file is write protected |
2580 | 2580 | else { |
2581 | 2581 | if (!s_writable($v_header['filename'])) { |
2582 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is write protected'); |
|
2582 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is write protected'); |
|
2583 | 2583 | |
2584 | 2584 | // ----- Change the file status |
2585 | 2585 | $v_header['status'] = 'write_protected'; |
@@ -2590,7 +2590,7 @@ discard block |
||
2590 | 2590 | } // ----- Look if the extracted file is older |
2591 | 2591 | else { |
2592 | 2592 | if (filemtime($v_header['filename']) > $v_header['mtime']) { |
2593 | - 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']) . ')'); |
|
2593 | + 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']).')'); |
|
2594 | 2594 | |
2595 | 2595 | // ----- Change the file status |
2596 | 2596 | $v_header['status'] = 'newer_exist'; |
@@ -2614,7 +2614,7 @@ discard block |
||
2614 | 2614 | } |
2615 | 2615 | |
2616 | 2616 | if (($v_result = PclTarHandlerDirCheck($v_dir_to_check)) != 1) { |
2617 | - TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for ' . $v_header['filename'] . ''); |
|
2617 | + TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for '.$v_header['filename'].''); |
|
2618 | 2618 | |
2619 | 2619 | // ----- Change the file status |
2620 | 2620 | $v_header['status'] = 'path_creation_fail'; |
@@ -2629,7 +2629,7 @@ discard block |
||
2629 | 2629 | if ($v_extract_file && ($v_header['typeflag'] != '5')) { |
2630 | 2630 | // ----- Open the destination file in write mode |
2631 | 2631 | if (($v_dest_file = @fopen($v_header['filename'], 'wb')) == 0) { |
2632 | - TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening ' . $v_header['filename'] . ' in write binary mode'); |
|
2632 | + TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening '.$v_header['filename'].' in write binary mode'); |
|
2633 | 2633 | |
2634 | 2634 | // ----- Change the file status |
2635 | 2635 | $v_header['status'] = 'write_error'; |
@@ -2642,12 +2642,12 @@ discard block |
||
2642 | 2642 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2643 | 2643 | } |
2644 | 2644 | } else { |
2645 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of ' . $v_header['filename'] . ''); |
|
2645 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of '.$v_header['filename'].''); |
|
2646 | 2646 | |
2647 | 2647 | // ----- Read data |
2648 | 2648 | $n = floor($v_header['size'] / 512); |
2649 | 2649 | for ($i = 0; $i < $n; ++$i) { |
2650 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
2650 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
2651 | 2651 | if ($p_tar_mode === 'tar') { |
2652 | 2652 | $v_content = fread($v_tar, 512); |
2653 | 2653 | } else { |
@@ -2656,7 +2656,7 @@ discard block |
||
2656 | 2656 | fwrite($v_dest_file, $v_content, 512); |
2657 | 2657 | } |
2658 | 2658 | if (($v_header['size'] % 512) != 0) { |
2659 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read last ' . ($v_header['size'] % 512) . ' bytes in a 512 block'); |
|
2659 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read last '.($v_header['size'] % 512).' bytes in a 512 block'); |
|
2660 | 2660 | if ($p_tar_mode === 'tar') { |
2661 | 2661 | $v_content = fread($v_tar, 512); |
2662 | 2662 | } else { |
@@ -2677,7 +2677,7 @@ discard block |
||
2677 | 2677 | clearstatcache(); |
2678 | 2678 | if (filesize($v_header['filename']) != $v_header['size']) { |
2679 | 2679 | // ----- Error log |
2680 | - 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."); |
|
2680 | + 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."); |
|
2681 | 2681 | |
2682 | 2682 | // ----- Return |
2683 | 2683 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -2688,7 +2688,7 @@ discard block |
||
2688 | 2688 | // ----- Trace |
2689 | 2689 | TrFctMessage(__FILE__, __LINE__, 2, 'Extraction done'); |
2690 | 2690 | } else { |
2691 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file ' . $v_header['filename'] . ' skipped.'); |
|
2691 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file '.$v_header['filename'].' skipped.'); |
|
2692 | 2692 | |
2693 | 2693 | // ----- Jump to next file |
2694 | 2694 | TrFctMessage(__FILE__, __LINE__, 2, 'Jump to next file'); |
@@ -2742,7 +2742,7 @@ discard block |
||
2742 | 2742 | } |
2743 | 2743 | |
2744 | 2744 | // ----- Open a temporary file in write mode |
2745 | - $v_temp_tarname = uniqid('pcltar-') . '.tmp'; |
|
2745 | + $v_temp_tarname = uniqid('pcltar-').'.tmp'; |
|
2746 | 2746 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
2747 | 2747 | if (($v_temp_tar = @fopen($v_temp_tarname, 'wb')) == 0) { |
2748 | 2748 | // ----- Close tar file |
@@ -2771,7 +2771,7 @@ discard block |
||
2771 | 2771 | } |
2772 | 2772 | |
2773 | 2773 | // ----- Open a temporary file in write mode |
2774 | - $v_temp_tarname = uniqid('pcltar-') . '.tmp'; |
|
2774 | + $v_temp_tarname = uniqid('pcltar-').'.tmp'; |
|
2775 | 2775 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
2776 | 2776 | if (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) { |
2777 | 2777 | // ----- Close tar file |
@@ -2828,7 +2828,7 @@ discard block |
||
2828 | 2828 | continue; |
2829 | 2829 | } |
2830 | 2830 | |
2831 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
2831 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
2832 | 2832 | |
2833 | 2833 | // ----- Look for filenames to delete |
2834 | 2834 | for ($i = 0, $v_delete_file = false; ($i < count($p_file_list)) && (!$v_delete_file); ++$i) { |
@@ -2836,12 +2836,12 @@ discard block |
||
2836 | 2836 | // if ($p_file_list[$i] == $v_header['filename']) |
2837 | 2837 | if (($v_len = strcmp($p_file_list[$i], $v_header['filename'])) <= 0) { |
2838 | 2838 | if ($v_len == 0) { |
2839 | - TrFctMessage(__FILE__, __LINE__, 3, 'Found that ' . $v_header['filename'] . ' need to be deleted'); |
|
2839 | + TrFctMessage(__FILE__, __LINE__, 3, 'Found that '.$v_header['filename'].' need to be deleted'); |
|
2840 | 2840 | $v_delete_file = true; |
2841 | 2841 | } else { |
2842 | - TrFctMessage(__FILE__, __LINE__, 3, 'Look if ' . $v_header['filename'] . " is a file in $p_file_list[$i]"); |
|
2842 | + TrFctMessage(__FILE__, __LINE__, 3, 'Look if '.$v_header['filename']." is a file in $p_file_list[$i]"); |
|
2843 | 2843 | if (substr($v_header['filename'], strlen($p_file_list[$i]), 1) === '/') { |
2844 | - TrFctMessage(__FILE__, __LINE__, 3, '' . $v_header['filename'] . " is a file in $p_file_list[$i]"); |
|
2844 | + TrFctMessage(__FILE__, __LINE__, 3, ''.$v_header['filename']." is a file in $p_file_list[$i]"); |
|
2845 | 2845 | $v_delete_file = true; |
2846 | 2846 | } |
2847 | 2847 | } |
@@ -2850,7 +2850,7 @@ discard block |
||
2850 | 2850 | |
2851 | 2851 | // ----- Copy files that do not need to be deleted |
2852 | 2852 | if (!$v_delete_file) { |
2853 | - TrFctMessage(__FILE__, __LINE__, 2, 'Keep file ' . $v_header['filename'] . ''); |
|
2853 | + TrFctMessage(__FILE__, __LINE__, 2, 'Keep file '.$v_header['filename'].''); |
|
2854 | 2854 | |
2855 | 2855 | // ----- Write the file header |
2856 | 2856 | if ($p_tar_mode === 'tar') { |
@@ -2862,7 +2862,7 @@ discard block |
||
2862 | 2862 | // ----- Write the file data |
2863 | 2863 | $n = ceil($v_header['size'] / 512); |
2864 | 2864 | for ($i = 0; $i < $n; ++$i) { |
2865 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
2865 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
2866 | 2866 | if ($p_tar_mode === 'tar') { |
2867 | 2867 | $v_content = fread($v_tar, 512); |
2868 | 2868 | fwrite($v_temp_tar, $v_content, 512); |
@@ -2873,7 +2873,7 @@ discard block |
||
2873 | 2873 | } |
2874 | 2874 | |
2875 | 2875 | // ----- File name and properties are logged if listing mode or file is extracted |
2876 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
2876 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
2877 | 2877 | |
2878 | 2878 | // ----- Add the array describing the file into the list |
2879 | 2879 | $p_list_detail[$v_nb] = $v_header; |
@@ -2884,8 +2884,8 @@ discard block |
||
2884 | 2884 | } // ----- Look for file that is to be deleted |
2885 | 2885 | else { |
2886 | 2886 | // ----- Trace |
2887 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of ' . $v_header['filename'] . ''); |
|
2888 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2887 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of '.$v_header['filename'].''); |
|
2888 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2889 | 2889 | |
2890 | 2890 | // ----- Jump to next file |
2891 | 2891 | if ($p_tar_mode === 'tar') { |
@@ -2894,7 +2894,7 @@ discard block |
||
2894 | 2894 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2895 | 2895 | } |
2896 | 2896 | |
2897 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2897 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2898 | 2898 | } |
2899 | 2899 | |
2900 | 2900 | // ----- Look for end of file |
@@ -2980,7 +2980,7 @@ discard block |
||
2980 | 2980 | } |
2981 | 2981 | |
2982 | 2982 | // ----- Open a temporary file in write mode |
2983 | - $v_temp_tarname = uniqid('pcltar-') . '.tmp'; |
|
2983 | + $v_temp_tarname = uniqid('pcltar-').'.tmp'; |
|
2984 | 2984 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
2985 | 2985 | if (($v_temp_tar = @fopen($v_temp_tarname, 'wb')) == 0) { |
2986 | 2986 | // ----- Close tar file |
@@ -3009,7 +3009,7 @@ discard block |
||
3009 | 3009 | } |
3010 | 3010 | |
3011 | 3011 | // ----- Open a temporary file in write mode |
3012 | - $v_temp_tarname = uniqid('pcltar-') . '.tmp'; |
|
3012 | + $v_temp_tarname = uniqid('pcltar-').'.tmp'; |
|
3013 | 3013 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
3014 | 3014 | if (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) { |
3015 | 3015 | // ----- Close tar file |
@@ -3044,9 +3044,9 @@ discard block |
||
3044 | 3044 | } |
3045 | 3045 | if ($p_add_dir != '') { |
3046 | 3046 | if (substr($p_add_dir, -1) === '/') { |
3047 | - $v_stored_list[$i] = $p_add_dir . $v_stored_list[$i]; |
|
3047 | + $v_stored_list[$i] = $p_add_dir.$v_stored_list[$i]; |
|
3048 | 3048 | } else { |
3049 | - $v_stored_list[$i] = $p_add_dir . '/' . $v_stored_list[$i]; |
|
3049 | + $v_stored_list[$i] = $p_add_dir.'/'.$v_stored_list[$i]; |
|
3050 | 3050 | } |
3051 | 3051 | TrFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_file_list[$i]' = '$v_stored_list[$i]'"); |
3052 | 3052 | } |
@@ -3101,7 +3101,7 @@ discard block |
||
3101 | 3101 | continue; |
3102 | 3102 | } |
3103 | 3103 | |
3104 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
3104 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
3105 | 3105 | |
3106 | 3106 | // ----- Look for filenames to update |
3107 | 3107 | for ($i = 0, $v_update_file = false, $v_found_file = false; ($i < count($v_stored_list)) && (!$v_update_file); ++$i) { |
@@ -3110,8 +3110,8 @@ discard block |
||
3110 | 3110 | // ----- Compare the file names |
3111 | 3111 | if ($v_stored_list[$i] == $v_header['filename']) { |
3112 | 3112 | TrFctMessage(__FILE__, __LINE__, 3, "File '$v_stored_list[$i]' is present in archive"); |
3113 | - 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]))); |
|
3114 | - TrFctMessage(__FILE__, __LINE__, 3, 'Archived mtime=' . $v_header['mtime'] . ' ' . date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
3113 | + 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]))); |
|
3114 | + TrFctMessage(__FILE__, __LINE__, 3, 'Archived mtime='.$v_header['mtime'].' '.date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
3115 | 3115 | |
3116 | 3116 | // ----- Store found informations |
3117 | 3117 | $v_found_file = true; |
@@ -3129,13 +3129,13 @@ discard block |
||
3129 | 3129 | // ----- Flag the name in order not to add the file at the end |
3130 | 3130 | $v_found_list[$i] = 1; |
3131 | 3131 | } else { |
3132 | - TrFctMessage(__FILE__, __LINE__, 4, "File '$p_file_list[$i]' is not " . $v_header['filename'] . ''); |
|
3132 | + TrFctMessage(__FILE__, __LINE__, 4, "File '$p_file_list[$i]' is not ".$v_header['filename'].''); |
|
3133 | 3133 | } |
3134 | 3134 | } |
3135 | 3135 | |
3136 | 3136 | // ----- Copy files that do not need to be updated |
3137 | 3137 | if (!$v_update_file) { |
3138 | - TrFctMessage(__FILE__, __LINE__, 2, 'Keep file ' . $v_header['filename'] . ''); |
|
3138 | + TrFctMessage(__FILE__, __LINE__, 2, 'Keep file '.$v_header['filename'].''); |
|
3139 | 3139 | |
3140 | 3140 | // ----- Write the file header |
3141 | 3141 | if ($p_tar_mode === 'tar') { |
@@ -3147,7 +3147,7 @@ discard block |
||
3147 | 3147 | // ----- Write the file data |
3148 | 3148 | $n = ceil($v_header['size'] / 512); |
3149 | 3149 | for ($j = 0; $j < $n; ++$j) { |
3150 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($j + 1)); |
|
3150 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($j + 1)); |
|
3151 | 3151 | if ($p_tar_mode === 'tar') { |
3152 | 3152 | $v_content = fread($v_tar, 512); |
3153 | 3153 | fwrite($v_temp_tar, $v_content, 512); |
@@ -3158,7 +3158,7 @@ discard block |
||
3158 | 3158 | } |
3159 | 3159 | |
3160 | 3160 | // ----- File name and properties are logged if listing mode or file is extracted |
3161 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
3161 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
3162 | 3162 | |
3163 | 3163 | // ----- Add the array describing the file into the list |
3164 | 3164 | $p_list_detail[$v_nb] = $v_header; |
@@ -3193,7 +3193,7 @@ discard block |
||
3193 | 3193 | } |
3194 | 3194 | |
3195 | 3195 | // ----- Trace |
3196 | - TrFctMessage(__FILE__, __LINE__, 2, 'Skip old file ' . $v_header['filename'] . ''); |
|
3196 | + TrFctMessage(__FILE__, __LINE__, 2, 'Skip old file '.$v_header['filename'].''); |
|
3197 | 3197 | |
3198 | 3198 | // ----- Jump to next file |
3199 | 3199 | if ($p_tar_mode === 'tar') { |
@@ -3330,10 +3330,10 @@ discard block |
||
3330 | 3330 | if (strlen($v_binary_data) != 512) { |
3331 | 3331 | $v_header['filename'] = ''; |
3332 | 3332 | $v_header['status'] = 'invalid_header'; |
3333 | - TrFctMessage(__FILE__, __LINE__, 2, 'Invalid block size : ' . strlen($v_binary_data)); |
|
3333 | + TrFctMessage(__FILE__, __LINE__, 2, 'Invalid block size : '.strlen($v_binary_data)); |
|
3334 | 3334 | |
3335 | 3335 | // ----- Error log |
3336 | - PclErrorLog(-10, 'Invalid block size : ' . strlen($v_binary_data)); |
|
3336 | + PclErrorLog(-10, 'Invalid block size : '.strlen($v_binary_data)); |
|
3337 | 3337 | |
3338 | 3338 | // ----- Return |
3339 | 3339 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -3363,9 +3363,9 @@ discard block |
||
3363 | 3363 | |
3364 | 3364 | // ----- Extract the checksum for check |
3365 | 3365 | $v_header['checksum'] = octdec(trim($v_data['checksum'])); |
3366 | - TrFctMessage(__FILE__, __LINE__, 3, 'File checksum : ' . $v_header['checksum'] . ''); |
|
3366 | + TrFctMessage(__FILE__, __LINE__, 3, 'File checksum : '.$v_header['checksum'].''); |
|
3367 | 3367 | if ($v_header['checksum'] != $v_checksum) { |
3368 | - TrFctMessage(__FILE__, __LINE__, 2, "File checksum is invalid : $v_checksum calculated, " . $v_header['checksum'] . ' expected'); |
|
3368 | + TrFctMessage(__FILE__, __LINE__, 2, "File checksum is invalid : $v_checksum calculated, ".$v_header['checksum'].' expected'); |
|
3369 | 3369 | |
3370 | 3370 | $v_header['filename'] = ''; |
3371 | 3371 | $v_header['status'] = 'invalid_header'; |
@@ -3380,7 +3380,7 @@ discard block |
||
3380 | 3380 | } |
3381 | 3381 | |
3382 | 3382 | // ----- Error log |
3383 | - PclErrorLog(-13, "Invalid checksum : $v_checksum calculated, " . $v_header['checksum'] . ' expected'); |
|
3383 | + PclErrorLog(-13, "Invalid checksum : $v_checksum calculated, ".$v_header['checksum'].' expected'); |
|
3384 | 3384 | |
3385 | 3385 | // ----- Return |
3386 | 3386 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -3391,22 +3391,22 @@ discard block |
||
3391 | 3391 | |
3392 | 3392 | // ----- Extract the properties |
3393 | 3393 | $v_header['filename'] = trim($v_data['filename']); |
3394 | - TrFctMessage(__FILE__, __LINE__, 2, 'Name : ' . $v_header['filename'] . ''); |
|
3394 | + TrFctMessage(__FILE__, __LINE__, 2, 'Name : '.$v_header['filename'].''); |
|
3395 | 3395 | $v_header['mode'] = octdec(trim($v_data['mode'])); |
3396 | - TrFctMessage(__FILE__, __LINE__, 2, "Mode : '" . decoct($v_header['mode']) . "'"); |
|
3396 | + TrFctMessage(__FILE__, __LINE__, 2, "Mode : '".decoct($v_header['mode'])."'"); |
|
3397 | 3397 | $v_header['uid'] = octdec(trim($v_data['uid'])); |
3398 | - TrFctMessage(__FILE__, __LINE__, 2, "Uid : '" . $v_header['uid'] . "'"); |
|
3398 | + TrFctMessage(__FILE__, __LINE__, 2, "Uid : '".$v_header['uid']."'"); |
|
3399 | 3399 | $v_header['gid'] = octdec(trim($v_data['gid'])); |
3400 | - TrFctMessage(__FILE__, __LINE__, 2, "Gid : '" . $v_header['gid'] . "'"); |
|
3400 | + TrFctMessage(__FILE__, __LINE__, 2, "Gid : '".$v_header['gid']."'"); |
|
3401 | 3401 | $v_header['size'] = octdec(trim($v_data['size'])); |
3402 | - TrFctMessage(__FILE__, __LINE__, 2, "Size : '" . $v_header['size'] . "'"); |
|
3402 | + TrFctMessage(__FILE__, __LINE__, 2, "Size : '".$v_header['size']."'"); |
|
3403 | 3403 | $v_header['mtime'] = octdec(trim($v_data['mtime'])); |
3404 | - TrFctMessage(__FILE__, __LINE__, 2, 'Date : ' . date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
3404 | + TrFctMessage(__FILE__, __LINE__, 2, 'Date : '.date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
3405 | 3405 | if (($v_header['typeflag'] = $v_data['typeflag']) == '5') { |
3406 | 3406 | $v_header['size'] = 0; |
3407 | - TrFctMessage(__FILE__, __LINE__, 2, "Size (folder) : '" . $v_header['size'] . "'"); |
|
3407 | + TrFctMessage(__FILE__, __LINE__, 2, "Size (folder) : '".$v_header['size']."'"); |
|
3408 | 3408 | } |
3409 | - TrFctMessage(__FILE__, __LINE__, 2, 'File typeflag : ' . $v_header['typeflag'] . ''); |
|
3409 | + TrFctMessage(__FILE__, __LINE__, 2, 'File typeflag : '.$v_header['typeflag'].''); |
|
3410 | 3410 | /* ----- All these fields are removed form the header because they do not carry interesting info |
3411 | 3411 | $v_header[link] = trim($v_data[link]); |
3412 | 3412 | TrFctMessage(__FILE__, __LINE__, 2, "Linkname : $v_header[linkname]"); |
@@ -3586,7 +3586,7 @@ discard block |
||
3586 | 3586 | // ----- Ignore only the double '//' in path, |
3587 | 3587 | // but not the first and last '/' |
3588 | 3588 | } else { |
3589 | - $v_result = $v_list[$i] . ($i != (count($v_list) - 1) ? '/' . $v_result : ''); |
|
3589 | + $v_result = $v_list[$i].($i != (count($v_list) - 1) ? '/'.$v_result : ''); |
|
3590 | 3590 | } |
3591 | 3591 | } |
3592 | 3592 | } |