mambax7 /
extcal
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | //Kraven 30 |
| 21 | 21 | // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); |
| 22 | 22 | |
| 23 | -require_once XOOPS_ROOT_PATH . '/kernel/object.php'; |
|
| 23 | +require_once XOOPS_ROOT_PATH.'/kernel/object.php'; |
|
| 24 | 24 | |
| 25 | 25 | //class ExtcalEvent extends XoopsObject |
| 26 | 26 | //class extcal_etablissement extends XoopsObject |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | $title = $this->isNew() ? sprintf(_MD_EXTCAL_ETABLISSEMENT_ADD) : sprintf(_MD_EXTCAL_ETABLISSEMENT_EDIT); |
| 72 | 72 | |
| 73 | - require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; |
|
| 73 | + require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php'; |
|
| 74 | 74 | |
| 75 | 75 | $form = new XoopsThemeForm($title, 'form', $action, 'post', true); |
| 76 | 76 | $form->setExtra('enctype="multipart/form-data"'); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_HORAIRES, 'horaires', $this->getVar('horaires'), 3, 40)); |
| 90 | 90 | $form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_DIVERS, 'divers', $this->getVar('divers'), 5, 40)); |
| 91 | 91 | //$form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_TARIFS, 'tarifs', $this->getVar("tarifs"), 5, 40)); |
| 92 | - $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TARIFS . ' ( ' . _MD_EXTCAL_DEVISE2 . ' )', 'tarifs', 20, 20, $this->getVar('tarifs')), false); |
|
| 92 | + $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_TARIFS.' ( '._MD_EXTCAL_DEVISE2.' )', 'tarifs', 20, 20, $this->getVar('tarifs')), false); |
|
| 93 | 93 | |
| 94 | 94 | //$form->addElement(new XoopsFormTextArea(_MD_EXTCAL_ETABLISSEMENT_MAP, 'map', $this->getVar("map"), 5, 40)); |
| 95 | 95 | $form->addElement(new XoopsFormText(_MD_EXTCAL_ETABLISSEMENT_MAP, 'map', 150, 255, $this->getVar('map')), false); |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | //Logo |
| 98 | 98 | $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), ''); |
| 99 | 99 | if ($this->getVar('logo') != '') { |
| 100 | - $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/etablissement/' . $this->getVar('logo') . "' name='image' id='image' alt=''><br><br>")); |
|
| 100 | + $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/etablissement/'.$this->getVar('logo')."' name='image' id='image' alt=''><br><br>")); |
|
| 101 | 101 | $check_del_img = new XoopsFormCheckBox('', 'delimg'); |
| 102 | 102 | $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); |
| 103 | 103 | $file_tray->addElement($check_del_img); |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | } |
| 109 | 109 | $file_img->setExtra("size ='40'"); |
| 110 | 110 | $file_tray->addElement($file_img); |
| 111 | - $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(3145728 / 1000), 500, 500); |
|
| 112 | - $file_label = new XoopsFormLabel('', '<br>' . $msg); |
|
| 111 | + $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (3145728 / 1000), 500, 500); |
|
| 112 | + $file_label = new XoopsFormLabel('', '<br>'.$msg); |
|
| 113 | 113 | $file_tray->addElement($file_label); |
| 114 | 114 | $form->addElement($file_tray); |
| 115 | 115 | $form->addElement(new XoopsFormHidden('file', $this->getVar('logo'))); |
@@ -19,13 +19,13 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined'); |
| 21 | 21 | |
| 22 | -require_once __DIR__ . '/ExtcalPersistableObjectHandler.php'; |
|
| 23 | -require_once __DIR__ . '/perm.php'; |
|
| 24 | -require_once __DIR__ . '/time.php'; |
|
| 25 | -require_once __DIR__ . '/config.php'; |
|
| 26 | -require_once __DIR__ . '/extDateTime.php'; |
|
| 27 | -require_once __DIR__ . '/utility.php'; |
|
| 28 | -require_once __DIR__ . '/../include/constantes.php'; |
|
| 22 | +require_once __DIR__.'/ExtcalPersistableObjectHandler.php'; |
|
| 23 | +require_once __DIR__.'/perm.php'; |
|
| 24 | +require_once __DIR__.'/time.php'; |
|
| 25 | +require_once __DIR__.'/config.php'; |
|
| 26 | +require_once __DIR__.'/extDateTime.php'; |
|
| 27 | +require_once __DIR__.'/utility.php'; |
|
| 28 | +require_once __DIR__.'/../include/constantes.php'; |
|
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * Class ExtcalEvent. |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false); |
| 67 | 67 | $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false); |
| 68 | 68 | |
| 69 | - $this->externalKey['cat_id'] = array( |
|
| 69 | + $this->externalKey['cat_id'] = array( |
|
| 70 | 70 | 'className' => 'cat', |
| 71 | 71 | 'getMethodeName' => 'getCat', |
| 72 | 72 | 'keyName' => 'cat', |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | |
| 403 | 403 | // while (list($k, $v) = each($events)) { |
| 404 | 404 | foreach ($events as $k => $t) { |
| 405 | - $ordre[] = (int)$v['event_start']; |
|
| 405 | + $ordre[] = (int) $v['event_start']; |
|
| 406 | 406 | $this->formatEventDate($v, $extcalConfig['event_date_week']); |
| 407 | 407 | //$v['cat']['cat_light_color'] = $v['cat']['cat_color']; |
| 408 | 408 | $v['cat']['cat_light_color'] = ExtcalUtility::getLighterColor($v['cat']['cat_color'], _EXTCAL_INFOBULLE_RGB_MIN, _EXTCAL_INFOBULLE_RGB_MAX); |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | |
| 607 | 607 | reset($period); |
| 608 | 608 | foreach ($period as $dt) { |
| 609 | - echo $dt->format("l d-m-Y H:i:s\n") . '<br>'; |
|
| 609 | + echo $dt->format("l d-m-Y H:i:s\n").'<br>'; |
|
| 610 | 610 | } |
| 611 | 611 | } |
| 612 | 612 | |
@@ -939,10 +939,10 @@ discard block |
||
| 939 | 939 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
| 940 | 940 | $count = count($authorizedAccessCats); |
| 941 | 941 | if ($count > 0) { |
| 942 | - $in = '(' . $authorizedAccessCats[0]; |
|
| 942 | + $in = '('.$authorizedAccessCats[0]; |
|
| 943 | 943 | array_shift($authorizedAccessCats); |
| 944 | 944 | foreach ($authorizedAccessCats as $authorizedAccessCat) { |
| 945 | - $in .= ',' . $authorizedAccessCat; |
|
| 945 | + $in .= ','.$authorizedAccessCat; |
|
| 946 | 946 | } |
| 947 | 947 | $in .= ')'; |
| 948 | 948 | $criteria->add(new Criteria('cat_id', $in, 'IN')); |
@@ -962,10 +962,10 @@ discard block |
||
| 962 | 962 | } |
| 963 | 963 | if (is_array($cats)) { |
| 964 | 964 | if (array_search(0, $cats) === false) { |
| 965 | - $in = '(' . current($cats); |
|
| 965 | + $in = '('.current($cats); |
|
| 966 | 966 | array_shift($cats); |
| 967 | 967 | foreach ($cats as $cat) { |
| 968 | - $in .= ',' . $cat; |
|
| 968 | + $in .= ','.$cat; |
|
| 969 | 969 | } |
| 970 | 970 | $in .= ')'; |
| 971 | 971 | $criteria->add(new Criteria('cat_id', $in, 'IN')); |
@@ -988,7 +988,7 @@ discard block |
||
| 988 | 988 | $fileHandler = xoops_getModuleHandler(_EXTCAL_CLS_FILE, _EXTCAL_MODULE); |
| 989 | 989 | |
| 990 | 990 | /***************************************************/ |
| 991 | - require_once __DIR__ . '/etablissement.php'; |
|
| 991 | + require_once __DIR__.'/etablissement.php'; |
|
| 992 | 992 | if ($siteSide === 'admin') { |
| 993 | 993 | $action = 'event.php?op=enreg'; |
| 994 | 994 | $cats = $catHandler->getAllCat($GLOBALS['xoopsUser'], 'all'); |
@@ -1006,7 +1006,7 @@ discard block |
||
| 1006 | 1006 | if ($mode === 'clone') { |
| 1007 | 1007 | $data['event_id'] = 0; |
| 1008 | 1008 | $event->setVar('event_id', 0); |
| 1009 | - $newTitle = $event->getVar('event_title') . ' (' . _MD_EXTCAL_CLONE_OF . $data['event_id'] . ')'; |
|
| 1009 | + $newTitle = $event->getVar('event_title').' ('._MD_EXTCAL_CLONE_OF.$data['event_id'].')'; |
|
| 1010 | 1010 | $event->setVar('event_title', $newTitle); |
| 1011 | 1011 | } |
| 1012 | 1012 | |
@@ -1190,7 +1190,7 @@ discard block |
||
| 1190 | 1190 | $form->addElement($catSelect, true); |
| 1191 | 1191 | //----------------------------------------------------------- |
| 1192 | 1192 | |
| 1193 | - $file_path = __DIR__ . '/../assets/css/images'; |
|
| 1193 | + $file_path = __DIR__.'/../assets/css/images'; |
|
| 1194 | 1194 | $tf = XoopsLists::getImgListAsArray($file_path); |
| 1195 | 1195 | array_unshift($tf, _MD_EXTCAL_NONE); |
| 1196 | 1196 | $xfIcones = new XoopsFormSelect(_MD_EXTCAL_ICONE, 'event_icone', $event_icone, ''); |
@@ -1295,7 +1295,7 @@ discard block |
||
| 1295 | 1295 | if (count($files) > 0) { |
| 1296 | 1296 | $eventFiles = new ExtcalFormFileCheckBox('', 'filetokeep'); |
| 1297 | 1297 | foreach ($files as $file) { |
| 1298 | - $name = $file['file_nicename'] . ' (<i>' . $file['file_mimetype'] . '</i>) ' . $file['formated_file_size']; |
|
| 1298 | + $name = $file['file_nicename'].' (<i>'.$file['file_mimetype'].'</i>) '.$file['formated_file_size']; |
|
| 1299 | 1299 | $eventFiles->addOption($file['file_id'], $name); |
| 1300 | 1300 | } |
| 1301 | 1301 | $fileElmtTray->addElement($eventFiles); |
@@ -1311,7 +1311,7 @@ discard block |
||
| 1311 | 1311 | //Picture1 |
| 1312 | 1312 | $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 1), ''); |
| 1313 | 1313 | if (!empty($event_picture1)) { |
| 1314 | - $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture1 . "' name='image' id='image' alt=''><br><br>")); |
|
| 1314 | + $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture1."' name='image' id='image' alt=''><br><br>")); |
|
| 1315 | 1315 | $check_del_img = new XoopsFormCheckBox('', 'delimg_1'); |
| 1316 | 1316 | $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); |
| 1317 | 1317 | $file_tray->addElement($check_del_img); |
@@ -1322,8 +1322,8 @@ discard block |
||
| 1322 | 1322 | } |
| 1323 | 1323 | $file_img->setExtra("size ='40'"); |
| 1324 | 1324 | $file_tray->addElement($file_img); |
| 1325 | - $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500); |
|
| 1326 | - $file_label = new XoopsFormLabel('', '<br>' . $msg); |
|
| 1325 | + $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500); |
|
| 1326 | + $file_label = new XoopsFormLabel('', '<br>'.$msg); |
|
| 1327 | 1327 | $file_tray->addElement($file_label); |
| 1328 | 1328 | $form->addElement($file_tray); |
| 1329 | 1329 | $form->addElement(new XoopsFormHidden('file1', $event_picture1)); |
@@ -1331,7 +1331,7 @@ discard block |
||
| 1331 | 1331 | //Picture2 |
| 1332 | 1332 | $file_tray = new XoopsFormElementTray(sprintf(_MD_EXTCAL_FORM_IMG, 2), ''); |
| 1333 | 1333 | if (!empty($event_picture2)) { |
| 1334 | - $file_tray->addElement(new XoopsFormLabel('', "<img src='" . XOOPS_URL . '/uploads/extcal/' . $event_picture2 . "' name='image' id='image' alt=''><br><br>")); |
|
| 1334 | + $file_tray->addElement(new XoopsFormLabel('', "<img src='".XOOPS_URL.'/uploads/extcal/'.$event_picture2."' name='image' id='image' alt=''><br><br>")); |
|
| 1335 | 1335 | $check_del_img = new XoopsFormCheckBox('', 'delimg_2'); |
| 1336 | 1336 | $check_del_img->addOption(1, _MD_EXTCAL_DEL_IMG); |
| 1337 | 1337 | $file_tray->addElement($check_del_img); |
@@ -1342,8 +1342,8 @@ discard block |
||
| 1342 | 1342 | } |
| 1343 | 1343 | $file_img->setExtra("size ='40'"); |
| 1344 | 1344 | $file_tray->addElement($file_img); |
| 1345 | - $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int)(400728 / 1000), 500, 500); |
|
| 1346 | - $file_label = new XoopsFormLabel('', '<br>' . $msg); |
|
| 1345 | + $msg = sprintf(_MD_EXTCAL_IMG_CONFIG, (int) (400728 / 1000), 500, 500); |
|
| 1346 | + $file_label = new XoopsFormLabel('', '<br>'.$msg); |
|
| 1347 | 1347 | $file_tray->addElement($file_label); |
| 1348 | 1348 | $form->addElement($file_tray); |
| 1349 | 1349 | $form->addElement(new XoopsFormHidden('file2', $event_picture2)); |
@@ -1410,7 +1410,7 @@ discard block |
||
| 1410 | 1410 | $recurRules = 'weekly|'; |
| 1411 | 1411 | $recurRules .= $parm['rrule_weekly_interval']; |
| 1412 | 1412 | foreach ($parm['rrule_weekly_bydays'] as $day) { |
| 1413 | - $recurRules .= '|' . $day; |
|
| 1413 | + $recurRules .= '|'.$day; |
|
| 1414 | 1414 | } |
| 1415 | 1415 | |
| 1416 | 1416 | break; |
@@ -1420,11 +1420,11 @@ discard block |
||
| 1420 | 1420 | $parm['rrule_monthly_interval'] = 0; |
| 1421 | 1421 | } |
| 1422 | 1422 | $recurRules = 'monthly|'; |
| 1423 | - $recurRules .= $parm['rrule_monthly_interval'] . '|'; |
|
| 1423 | + $recurRules .= $parm['rrule_monthly_interval'].'|'; |
|
| 1424 | 1424 | if ($parm['rrule_monthly_byday'] != '') { |
| 1425 | 1425 | $recurRules .= $parm['rrule_monthly_byday']; |
| 1426 | 1426 | } else { |
| 1427 | - $recurRules .= 'MD' . $parm['rrule_bymonthday']; |
|
| 1427 | + $recurRules .= 'MD'.$parm['rrule_bymonthday']; |
|
| 1428 | 1428 | } |
| 1429 | 1429 | |
| 1430 | 1430 | break; |
@@ -1458,9 +1458,9 @@ discard block |
||
| 1458 | 1458 | |
| 1459 | 1459 | $recurRules = 'yearly|'; |
| 1460 | 1460 | $recurRules .= $parm['rrule_yearly_interval']; |
| 1461 | - $recurRules .= '|' . $parm['rrule_yearly_byday']; |
|
| 1461 | + $recurRules .= '|'.$parm['rrule_yearly_byday']; |
|
| 1462 | 1462 | foreach ($parm['rrule_yearly_bymonths'] as $month) { |
| 1463 | - $recurRules .= '|' . $month; |
|
| 1463 | + $recurRules .= '|'.$month; |
|
| 1464 | 1464 | } |
| 1465 | 1465 | |
| 1466 | 1466 | break; |
@@ -2390,10 +2390,10 @@ discard block |
||
| 2390 | 2390 | global $xoopsDB; |
| 2391 | 2391 | |
| 2392 | 2392 | //echo "<hr>{$andor}-{$limit}-{$offset}-{$userId}-{$user}<br>{$criteresPlus}"; |
| 2393 | - $tEvent = $xoopsDB->prefix('extcal_event') . ' AS te'; |
|
| 2394 | - $tCat = $xoopsDB->prefix('extcal_cat') . ' AS tc'; |
|
| 2393 | + $tEvent = $xoopsDB->prefix('extcal_event').' AS te'; |
|
| 2394 | + $tCat = $xoopsDB->prefix('extcal_cat').' AS tc'; |
|
| 2395 | 2395 | |
| 2396 | - $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}"; |
|
| 2396 | + $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}"; |
|
| 2397 | 2397 | //--------------------------------------------------- |
| 2398 | 2398 | $tw = array(); |
| 2399 | 2399 | $tw[] = 'te.cat_id = tc.cat_id'; |
@@ -2402,7 +2402,7 @@ discard block |
||
| 2402 | 2402 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
| 2403 | 2403 | $inCat = 'te.cat_id IN (0)'; |
| 2404 | 2404 | if (count($authorizedAccessCats) > 0) { |
| 2405 | - $inCat = 'te.cat_id IN (' . implode(',', $authorizedAccessCats) . ')'; |
|
| 2405 | + $inCat = 'te.cat_id IN ('.implode(',', $authorizedAccessCats).')'; |
|
| 2406 | 2406 | } |
| 2407 | 2407 | //echo $tw[count($tw)-1]; |
| 2408 | 2408 | |
@@ -2438,12 +2438,12 @@ discard block |
||
| 2438 | 2438 | 'te.event_address', |
| 2439 | 2439 | 'tc.cat_name', |
| 2440 | 2440 | ); |
| 2441 | - $t = array(); |
|
| 2441 | + $t = array(); |
|
| 2442 | 2442 | for ($i = 0, $count = count($queryarray); $i < $count; ++$i) { |
| 2443 | 2443 | $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' "; |
| 2444 | 2444 | } |
| 2445 | 2445 | |
| 2446 | - $flt = '(' . implode(" {$andor} ", $t1) . ')'; |
|
| 2446 | + $flt = '('.implode(" {$andor} ", $t1).')'; |
|
| 2447 | 2447 | |
| 2448 | 2448 | $t = array(); |
| 2449 | 2449 | for ($h = 0, $count = count($tFields); $h < $count; ++$h) { |
@@ -2452,10 +2452,10 @@ discard block |
||
| 2452 | 2452 | |
| 2453 | 2453 | $filtre = implode(' OR ', $t); |
| 2454 | 2454 | $filtre = str_replace('#', '%', $filtre); |
| 2455 | - $tw[] = '(' . $filtre . ')'; |
|
| 2455 | + $tw[] = '('.$filtre.')'; |
|
| 2456 | 2456 | } |
| 2457 | 2457 | |
| 2458 | - $sql .= ' WHERE ' . implode(' AND ', $tw); |
|
| 2458 | + $sql .= ' WHERE '.implode(' AND ', $tw); |
|
| 2459 | 2459 | //------------------------------------------------------------ |
| 2460 | 2460 | if (count($orderBy) > 0) { |
| 2461 | 2461 | $t = array(); |
@@ -2465,7 +2465,7 @@ discard block |
||
| 2465 | 2465 | } |
| 2466 | 2466 | } |
| 2467 | 2467 | if (count($t) > 0) { |
| 2468 | - $sql .= ' ORDER BY ' . implode(',', $t); |
|
| 2468 | + $sql .= ' ORDER BY '.implode(',', $t); |
|
| 2469 | 2469 | } |
| 2470 | 2470 | } |
| 2471 | 2471 | |
@@ -2498,7 +2498,7 @@ discard block |
||
| 2498 | 2498 | $i = 0; |
| 2499 | 2499 | while ($myrow = $xoopsDB->fetchArray($result)) { |
| 2500 | 2500 | $ret[$i]['image'] = 'assets/images/icons/extcal.gif'; |
| 2501 | - $ret[$i]['link'] = 'event.php?event=' . $myrow['event_id']; |
|
| 2501 | + $ret[$i]['link'] = 'event.php?event='.$myrow['event_id']; |
|
| 2502 | 2502 | $ret[$i]['title'] = $myrow['event_title']; |
| 2503 | 2503 | $ret[$i]['time'] = $myrow['event_submitdate']; |
| 2504 | 2504 | $ret[$i]['uid'] = $myrow['event_submitter']; |
@@ -2538,23 +2538,23 @@ discard block |
||
| 2538 | 2538 | // } |
| 2539 | 2539 | $tEvent = $xoopsDB->prefix('extcal_event'); |
| 2540 | 2540 | $tCat = $xoopsDB->prefix('extcal_cat'); |
| 2541 | - $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'"; |
|
| 2541 | + $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'"; |
|
| 2542 | 2542 | |
| 2543 | 2543 | $authorizedAccessCats = $this->_extcalPerm->getAuthorizedCat($user, 'extcal_cat_view'); |
| 2544 | 2544 | $count = count($authorizedAccessCats); |
| 2545 | 2545 | if ($count > 0) { |
| 2546 | - $in = '(' . $authorizedAccessCats[0]; |
|
| 2546 | + $in = '('.$authorizedAccessCats[0]; |
|
| 2547 | 2547 | array_shift($authorizedAccessCats); |
| 2548 | 2548 | foreach ($authorizedAccessCats as $authorizedAccessCat) { |
| 2549 | - $in .= ',' . $authorizedAccessCat; |
|
| 2549 | + $in .= ','.$authorizedAccessCat; |
|
| 2550 | 2550 | } |
| 2551 | 2551 | $in .= ')'; |
| 2552 | 2552 | } else { |
| 2553 | 2553 | $in = '(0)'; |
| 2554 | 2554 | } |
| 2555 | - $sql .= " AND {$tEvent}.cat_id IN " . $in . ''; |
|
| 2555 | + $sql .= " AND {$tEvent}.cat_id IN ".$in.''; |
|
| 2556 | 2556 | if ($userId != 0) { |
| 2557 | - $sql .= " AND event_submitter = '" . $userId . "'"; |
|
| 2557 | + $sql .= " AND event_submitter = '".$userId."'"; |
|
| 2558 | 2558 | } |
| 2559 | 2559 | |
| 2560 | 2560 | //echoArray($queryarray,false); |
@@ -2574,7 +2574,7 @@ discard block |
||
| 2574 | 2574 | $t1[] = " %1\$s LIKE '#{$queryarray[$i]}#' "; |
| 2575 | 2575 | } |
| 2576 | 2576 | |
| 2577 | - $flt = '(' . implode(" {$andor} ", $t1) . ')'; |
|
| 2577 | + $flt = '('.implode(" {$andor} ", $t1).')'; |
|
| 2578 | 2578 | |
| 2579 | 2579 | $t = array(); |
| 2580 | 2580 | for ($h = 0, $count = count($tFields); $h < $count; ++$h) { |
@@ -2583,11 +2583,11 @@ discard block |
||
| 2583 | 2583 | |
| 2584 | 2584 | $filtre = implode(' OR ', $t); |
| 2585 | 2585 | $filtre = str_replace('#', '%', $filtre); |
| 2586 | - $sql .= " AND ($filtre)"; |
|
| 2586 | + $sql .= " AND ($filtre)"; |
|
| 2587 | 2587 | } |
| 2588 | 2588 | |
| 2589 | 2589 | if ($criteresPlus != '') { |
| 2590 | - $sql .= ' AND ' . $criteresPlus; |
|
| 2590 | + $sql .= ' AND '.$criteresPlus; |
|
| 2591 | 2591 | } |
| 2592 | 2592 | $sql .= ' ORDER BY event_id DESC'; |
| 2593 | 2593 | |
@@ -2597,7 +2597,7 @@ discard block |
||
| 2597 | 2597 | if ($xoopsSearch) { |
| 2598 | 2598 | while ($myrow = $xoopsDB->fetchArray($result)) { |
| 2599 | 2599 | $ret[$i]['image'] = 'assets/images/icons/extcal.gif'; |
| 2600 | - $ret[$i]['link'] = 'event.php?event=' . $myrow['event_id']; |
|
| 2600 | + $ret[$i]['link'] = 'event.php?event='.$myrow['event_id']; |
|
| 2601 | 2601 | $ret[$i]['title'] = $myrow['event_title']; |
| 2602 | 2602 | $ret[$i]['time'] = $myrow['event_submitdate']; |
| 2603 | 2603 | $ret[$i]['uid'] = $myrow['event_submitter']; |
@@ -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 |
@@ -838,7 +838,7 @@ discard block |
||
| 838 | 838 | if (!is_file($p_tarname_add)) { |
| 839 | 839 | PclErrorLog(-4, "Archive '$p_tarname_add' does not exist"); |
| 840 | 840 | } else { |
| 841 | - PclErrorLog(-6, "Archive '$p_tarname_add' has invalid size " . filesize($p_tarname_add) . '(not a 512 block multiple)'); |
|
| 841 | + PclErrorLog(-6, "Archive '$p_tarname_add' has invalid size ".filesize($p_tarname_add).'(not a 512 block multiple)'); |
|
| 842 | 842 | } |
| 843 | 843 | |
| 844 | 844 | // ----- Return |
@@ -861,7 +861,7 @@ discard block |
||
| 861 | 861 | } |
| 862 | 862 | |
| 863 | 863 | // ----- Open a temporary file in write mode |
| 864 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
| 864 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
| 865 | 865 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
| 866 | 866 | if (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) { |
| 867 | 867 | // ----- Close tar file |
@@ -914,9 +914,9 @@ discard block |
||
| 914 | 914 | } |
| 915 | 915 | |
| 916 | 916 | // ----- Go to the beginning of last block |
| 917 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 917 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 918 | 918 | fseek($p_tar, $v_size - 512); |
| 919 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 919 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 920 | 920 | } // ----- Look for unknown type |
| 921 | 921 | else { |
| 922 | 922 | // ----- Error log |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | if (!is_file($p_tarname)) { |
| 1208 | 1208 | PclErrorLog(-4, "Archive '$p_tarname' does not exist"); |
| 1209 | 1209 | } else { |
| 1210 | - PclErrorLog(-6, "Archive '$p_tarname' has invalid size " . filesize($p_tarname) . '(not a 512 block multiple)'); |
|
| 1210 | + PclErrorLog(-6, "Archive '$p_tarname' has invalid size ".filesize($p_tarname).'(not a 512 block multiple)'); |
|
| 1211 | 1211 | } |
| 1212 | 1212 | |
| 1213 | 1213 | // ----- Return |
@@ -1230,7 +1230,7 @@ discard block |
||
| 1230 | 1230 | } |
| 1231 | 1231 | |
| 1232 | 1232 | // ----- Open a temporary file in write mode |
| 1233 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
| 1233 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
| 1234 | 1234 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
| 1235 | 1235 | if (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) { |
| 1236 | 1236 | // ----- Close tar file |
@@ -1315,9 +1315,9 @@ discard block |
||
| 1315 | 1315 | } |
| 1316 | 1316 | |
| 1317 | 1317 | // ----- Go to the beginning of last block |
| 1318 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1318 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1319 | 1319 | fseek($p_tar, $v_size - 512); |
| 1320 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1320 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1321 | 1321 | |
| 1322 | 1322 | // ----- Call the adding fct inside the tar |
| 1323 | 1323 | if (($v_result = PclTarHandleAddList($p_tar, $p_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir)) == 1) { |
@@ -1384,7 +1384,7 @@ discard block |
||
| 1384 | 1384 | // ----- Check the parameters |
| 1385 | 1385 | if ($p_tar == 0) { |
| 1386 | 1386 | // ----- Error log |
| 1387 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
| 1387 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
| 1388 | 1388 | |
| 1389 | 1389 | // ----- Return |
| 1390 | 1390 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1439,7 +1439,7 @@ discard block |
||
| 1439 | 1439 | return PclErrorCode(); |
| 1440 | 1440 | } |
| 1441 | 1441 | |
| 1442 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position before header =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1442 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position before header ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1443 | 1443 | |
| 1444 | 1444 | // ----- Add the file |
| 1445 | 1445 | if (($v_result = PclTarHandleAddFile($p_tar, $p_filename, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) { |
@@ -1459,7 +1459,7 @@ discard block |
||
| 1459 | 1459 | // ----- Look for path |
| 1460 | 1460 | $v_path = ''; |
| 1461 | 1461 | if ($p_filename !== '.') { |
| 1462 | - $v_path = $p_filename . '/'; |
|
| 1462 | + $v_path = $p_filename.'/'; |
|
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | // ----- Read the directory for files and sub-directories |
@@ -1468,11 +1468,11 @@ discard block |
||
| 1468 | 1468 | $p_hitem = readdir($p_hdir); // '..' directory |
| 1469 | 1469 | while ($p_hitem = readdir($p_hdir)) { |
| 1470 | 1470 | // ----- Look for a file |
| 1471 | - if (is_file($v_path . $p_hitem)) { |
|
| 1472 | - TrFctMessage(__FILE__, __LINE__, 4, "Add the file '" . $v_path . $p_hitem . "'"); |
|
| 1471 | + if (is_file($v_path.$p_hitem)) { |
|
| 1472 | + TrFctMessage(__FILE__, __LINE__, 4, "Add the file '".$v_path.$p_hitem."'"); |
|
| 1473 | 1473 | |
| 1474 | 1474 | // ----- Add the file |
| 1475 | - if (($v_result = PclTarHandleAddFile($p_tar, $v_path . $p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) { |
|
| 1475 | + if (($v_result = PclTarHandleAddFile($p_tar, $v_path.$p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir)) != 1) { |
|
| 1476 | 1476 | // ----- Return status |
| 1477 | 1477 | TrFctEnd(__FILE__, __LINE__, $v_result); |
| 1478 | 1478 | |
@@ -1483,10 +1483,10 @@ discard block |
||
| 1483 | 1483 | $p_list_detail[$v_nb++] = $v_header; |
| 1484 | 1484 | } // ----- Recursive call to PclTarHandleAddFile() |
| 1485 | 1485 | else { |
| 1486 | - TrFctMessage(__FILE__, __LINE__, 4, "'" . $v_path . $p_hitem . "' is a directory"); |
|
| 1486 | + TrFctMessage(__FILE__, __LINE__, 4, "'".$v_path.$p_hitem."' is a directory"); |
|
| 1487 | 1487 | |
| 1488 | 1488 | // ----- Need an array as parameter |
| 1489 | - $p_temp_list[0] = $v_path . $p_hitem; |
|
| 1489 | + $p_temp_list[0] = $v_path.$p_hitem; |
|
| 1490 | 1490 | $v_result = PclTarHandleAddList($p_tar, $p_temp_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir); |
| 1491 | 1491 | } |
| 1492 | 1492 | } |
@@ -1494,7 +1494,7 @@ discard block |
||
| 1494 | 1494 | // ----- Free memory for the recursive loop |
| 1495 | 1495 | unset($p_temp_list, $p_hdir, $p_hitem); |
| 1496 | 1496 | } else { |
| 1497 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1497 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1498 | 1498 | } |
| 1499 | 1499 | } |
| 1500 | 1500 | |
@@ -1530,7 +1530,7 @@ discard block |
||
| 1530 | 1530 | // ----- Check the parameters |
| 1531 | 1531 | if ($p_tar == 0) { |
| 1532 | 1532 | // ----- Error log |
| 1533 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
| 1533 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
| 1534 | 1534 | |
| 1535 | 1535 | // ----- Return |
| 1536 | 1536 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1558,7 +1558,7 @@ discard block |
||
| 1558 | 1558 | |
| 1559 | 1559 | if ((0 === strpos($p_filename, './')) || (0 === strpos($p_remove_dir, './'))) { |
| 1560 | 1560 | if ((0 === strpos($p_filename, './')) && (0 !== strpos($p_remove_dir, './'))) { |
| 1561 | - $p_remove_dir = './' . $p_remove_dir; |
|
| 1561 | + $p_remove_dir = './'.$p_remove_dir; |
|
| 1562 | 1562 | } |
| 1563 | 1563 | if ((0 !== strpos($p_filename, './')) && (0 === strpos($p_remove_dir, './'))) { |
| 1564 | 1564 | $p_remove_dir = substr($p_remove_dir, 2); |
@@ -1572,9 +1572,9 @@ discard block |
||
| 1572 | 1572 | } |
| 1573 | 1573 | if ($p_add_dir != '') { |
| 1574 | 1574 | if (substr($p_add_dir, -1) === '/') { |
| 1575 | - $v_stored_filename = $p_add_dir . $v_stored_filename; |
|
| 1575 | + $v_stored_filename = $p_add_dir.$v_stored_filename; |
|
| 1576 | 1576 | } else { |
| 1577 | - $v_stored_filename = $p_add_dir . '/' . $v_stored_filename; |
|
| 1577 | + $v_stored_filename = $p_add_dir.'/'.$v_stored_filename; |
|
| 1578 | 1578 | } |
| 1579 | 1579 | TrFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_filename' = '$v_stored_filename'"); |
| 1580 | 1580 | } |
@@ -1611,7 +1611,7 @@ discard block |
||
| 1611 | 1611 | return $v_result; |
| 1612 | 1612 | } |
| 1613 | 1613 | |
| 1614 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1614 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1615 | 1615 | |
| 1616 | 1616 | // ----- Read the file by 512 octets blocks |
| 1617 | 1617 | $i = 0; |
@@ -1629,7 +1629,7 @@ discard block |
||
| 1629 | 1629 | // ----- Close the file |
| 1630 | 1630 | fclose($v_file); |
| 1631 | 1631 | |
| 1632 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1632 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1633 | 1633 | } // ----- Look for a directory |
| 1634 | 1634 | else { |
| 1635 | 1635 | // ----- Call the header generation |
@@ -1640,7 +1640,7 @@ discard block |
||
| 1640 | 1640 | return $v_result; |
| 1641 | 1641 | } |
| 1642 | 1642 | |
| 1643 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1643 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.($p_mode === 'tar' ? ftell($p_tar) : gztell($p_tar))); |
|
| 1644 | 1644 | } |
| 1645 | 1645 | |
| 1646 | 1646 | // ----- Return |
@@ -1687,7 +1687,7 @@ discard block |
||
| 1687 | 1687 | // ----- Check the parameters |
| 1688 | 1688 | if (($p_tar == 0) || ($p_filename == '')) { |
| 1689 | 1689 | // ----- Error log |
| 1690 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
| 1690 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
| 1691 | 1691 | |
| 1692 | 1692 | // ----- Return |
| 1693 | 1693 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1700,7 +1700,7 @@ discard block |
||
| 1700 | 1700 | $p_stored_filename = $p_filename; |
| 1701 | 1701 | } |
| 1702 | 1702 | $v_reduce_filename = PclTarHandlePathReduction($p_stored_filename); |
| 1703 | - TrFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_reduce_filename', strlen " . strlen($v_reduce_filename)); |
|
| 1703 | + TrFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_reduce_filename', strlen ".strlen($v_reduce_filename)); |
|
| 1704 | 1704 | |
| 1705 | 1705 | // ----- Get file info |
| 1706 | 1706 | $v_info = stat($p_filename); |
@@ -1901,7 +1901,7 @@ discard block |
||
| 1901 | 1901 | // ----- Check the path |
| 1902 | 1902 | //if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../"))) |
| 1903 | 1903 | if ($p_path == '') { |
| 1904 | - $p_path = './' . $p_path; |
|
| 1904 | + $p_path = './'.$p_path; |
|
| 1905 | 1905 | } |
| 1906 | 1906 | |
| 1907 | 1907 | // ----- Look for path to remove format (should end by /) |
@@ -1996,28 +1996,28 @@ discard block |
||
| 1996 | 1996 | continue; |
| 1997 | 1997 | } |
| 1998 | 1998 | |
| 1999 | - TrFctMessage(__FILE__, __LINE__, 2, "Found file '" . $v_header['filename'] . "', size '" . $v_header['size'] . "'"); |
|
| 1999 | + TrFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'"); |
|
| 2000 | 2000 | |
| 2001 | 2001 | // ----- Look for partial extract |
| 2002 | 2002 | if ((!$v_extract_all) && is_array($p_file_list)) { |
| 2003 | - TrFctMessage(__FILE__, __LINE__, 2, 'Look if the file ' . $v_header['filename'] . ' need to be extracted'); |
|
| 2003 | + TrFctMessage(__FILE__, __LINE__, 2, 'Look if the file '.$v_header['filename'].' need to be extracted'); |
|
| 2004 | 2004 | |
| 2005 | 2005 | // ----- By default no unzip if the file is not found |
| 2006 | 2006 | $v_extract_file = false; |
| 2007 | 2007 | |
| 2008 | 2008 | // ----- Look into the file list |
| 2009 | 2009 | for ($i = 0, $iMax = count($p_file_list); $i < $iMax; ++$i) { |
| 2010 | - TrFctMessage(__FILE__, __LINE__, 2, 'Compare archived file ' . $v_header['filename'] . " from asked list file '" . $p_file_list[$i] . "'"); |
|
| 2010 | + TrFctMessage(__FILE__, __LINE__, 2, 'Compare archived file '.$v_header['filename']." from asked list file '".$p_file_list[$i]."'"); |
|
| 2011 | 2011 | |
| 2012 | 2012 | // ----- Look if it is a directory |
| 2013 | 2013 | if (substr($p_file_list[$i], -1) === '/') { |
| 2014 | - TrFctMessage(__FILE__, __LINE__, 3, 'Compare file ' . $v_header['filename'] . " with directory '$p_file_list[$i]'"); |
|
| 2014 | + TrFctMessage(__FILE__, __LINE__, 3, 'Compare file '.$v_header['filename']." with directory '$p_file_list[$i]'"); |
|
| 2015 | 2015 | |
| 2016 | 2016 | // ----- Look if the directory is in the filename path |
| 2017 | 2017 | if ((strlen($v_header['filename']) > strlen($p_file_list[$i])) |
| 2018 | 2018 | && (0 === strpos($v_header['filename'], $p_file_list[$i]))) { |
| 2019 | 2019 | // ----- The file is in the directory, so extract it |
| 2020 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . " is in directory '$p_file_list[$i]' : extract it"); |
|
| 2020 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename']." is in directory '$p_file_list[$i]' : extract it"); |
|
| 2021 | 2021 | $v_extract_file = true; |
| 2022 | 2022 | |
| 2023 | 2023 | // ----- End of loop |
@@ -2027,7 +2027,7 @@ discard block |
||
| 2027 | 2027 | else { |
| 2028 | 2028 | if ($p_file_list[$i] == $v_header['filename']) { |
| 2029 | 2029 | // ----- File found |
| 2030 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' should be extracted'); |
|
| 2030 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' should be extracted'); |
|
| 2031 | 2031 | $v_extract_file = true; |
| 2032 | 2032 | |
| 2033 | 2033 | // ----- End of loop |
@@ -2038,7 +2038,7 @@ discard block |
||
| 2038 | 2038 | |
| 2039 | 2039 | // ----- Trace |
| 2040 | 2040 | if (!$v_extract_file) { |
| 2041 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' should not be extracted'); |
|
| 2041 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' should not be extracted'); |
|
| 2042 | 2042 | } |
| 2043 | 2043 | } else { |
| 2044 | 2044 | // ----- All files need to be extracted |
@@ -2049,10 +2049,10 @@ discard block |
||
| 2049 | 2049 | if ($v_extract_file && (!$v_listing)) { |
| 2050 | 2050 | // ----- Look for path to remove |
| 2051 | 2051 | if (($p_remove_path != '') && (0 === strpos($v_header['filename'], $p_remove_path))) { |
| 2052 | - TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file " . $v_header['filename'] . ''); |
|
| 2052 | + TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file ".$v_header['filename'].''); |
|
| 2053 | 2053 | // ----- Remove the path |
| 2054 | 2054 | $v_header['filename'] = substr($v_header['filename'], $p_remove_path_size); |
| 2055 | - TrFctMessage(__FILE__, __LINE__, 3, 'Reslting file is ' . $v_header['filename'] . ''); |
|
| 2055 | + TrFctMessage(__FILE__, __LINE__, 3, 'Reslting file is '.$v_header['filename'].''); |
|
| 2056 | 2056 | } |
| 2057 | 2057 | |
| 2058 | 2058 | // ----- Add the path to the file |
@@ -2066,22 +2066,22 @@ discard block |
||
| 2066 | 2066 | |
| 2067 | 2067 | // ----- Add the path |
| 2068 | 2068 | if (0 === strpos($v_header['filename'], '/')) { |
| 2069 | - $v_header['filename'] = $p_path . $v_header['filename']; |
|
| 2069 | + $v_header['filename'] = $p_path.$v_header['filename']; |
|
| 2070 | 2070 | } else { |
| 2071 | - $v_header['filename'] = $p_path . '/' . $v_header['filename']; |
|
| 2071 | + $v_header['filename'] = $p_path.'/'.$v_header['filename']; |
|
| 2072 | 2072 | } |
| 2073 | 2073 | } |
| 2074 | 2074 | |
| 2075 | 2075 | // ----- Trace |
| 2076 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
| 2076 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
| 2077 | 2077 | |
| 2078 | 2078 | // ----- Check that the file does not exists |
| 2079 | 2079 | if (file_exists($v_header['filename'])) { |
| 2080 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' already exists'); |
|
| 2080 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' already exists'); |
|
| 2081 | 2081 | |
| 2082 | 2082 | // ----- Look if file is a directory |
| 2083 | 2083 | if (is_dir($v_header['filename'])) { |
| 2084 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is a directory'); |
|
| 2084 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is a directory'); |
|
| 2085 | 2085 | |
| 2086 | 2086 | // ----- Change the file status |
| 2087 | 2087 | $v_header['status'] = 'already_a_directory'; |
@@ -2092,7 +2092,7 @@ discard block |
||
| 2092 | 2092 | } // ----- Look if file is write protected |
| 2093 | 2093 | else { |
| 2094 | 2094 | if (!s_writable($v_header['filename'])) { |
| 2095 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is write protected'); |
|
| 2095 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is write protected'); |
|
| 2096 | 2096 | |
| 2097 | 2097 | // ----- Change the file status |
| 2098 | 2098 | $v_header['status'] = 'write_protected'; |
@@ -2126,7 +2126,7 @@ discard block |
||
| 2126 | 2126 | } |
| 2127 | 2127 | |
| 2128 | 2128 | if (($v_result = PclTarHandlerDirCheck($v_dir_to_check)) != 1) { |
| 2129 | - TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for ' . $v_header['filename'] . ''); |
|
| 2129 | + TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for '.$v_header['filename'].''); |
|
| 2130 | 2130 | |
| 2131 | 2131 | // ----- Change the file status |
| 2132 | 2132 | $v_header['status'] = 'path_creation_fail'; |
@@ -2141,7 +2141,7 @@ discard block |
||
| 2141 | 2141 | if ($v_extract_file && ($v_header['typeflag'] != '5')) { |
| 2142 | 2142 | // ----- Open the destination file in write mode |
| 2143 | 2143 | if (($v_dest_file = @fopen($v_header['filename'], 'wb')) == 0) { |
| 2144 | - TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening ' . $v_header['filename'] . ' in write binary mode'); |
|
| 2144 | + TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening '.$v_header['filename'].' in write binary mode'); |
|
| 2145 | 2145 | |
| 2146 | 2146 | // ----- Change the file status |
| 2147 | 2147 | $v_header['status'] = 'write_error'; |
@@ -2154,12 +2154,12 @@ discard block |
||
| 2154 | 2154 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
| 2155 | 2155 | } |
| 2156 | 2156 | } else { |
| 2157 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of ' . $v_header['filename'] . ''); |
|
| 2157 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of '.$v_header['filename'].''); |
|
| 2158 | 2158 | |
| 2159 | 2159 | // ----- Read data |
| 2160 | 2160 | $n = floor($v_header['size'] / 512); |
| 2161 | 2161 | for ($i = 0; $i < $n; ++$i) { |
| 2162 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
| 2162 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
| 2163 | 2163 | if ($p_tar_mode === 'tar') { |
| 2164 | 2164 | $v_content = fread($v_tar, 512); |
| 2165 | 2165 | } else { |
@@ -2168,7 +2168,7 @@ discard block |
||
| 2168 | 2168 | fwrite($v_dest_file, $v_content, 512); |
| 2169 | 2169 | } |
| 2170 | 2170 | if (($v_header['size'] % 512) != 0) { |
| 2171 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read last ' . ($v_header['size'] % 512) . ' bytes in a 512 block'); |
|
| 2171 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read last '.($v_header['size'] % 512).' bytes in a 512 block'); |
|
| 2172 | 2172 | if ($p_tar_mode === 'tar') { |
| 2173 | 2173 | $v_content = fread($v_tar, 512); |
| 2174 | 2174 | } else { |
@@ -2196,7 +2196,7 @@ discard block |
||
| 2196 | 2196 | } |
| 2197 | 2197 | |
| 2198 | 2198 | // ----- Error log |
| 2199 | - 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."); |
|
| 2199 | + 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."); |
|
| 2200 | 2200 | |
| 2201 | 2201 | // ----- Return |
| 2202 | 2202 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -2207,7 +2207,7 @@ discard block |
||
| 2207 | 2207 | // ----- Trace |
| 2208 | 2208 | TrFctMessage(__FILE__, __LINE__, 2, 'Extraction done'); |
| 2209 | 2209 | } else { |
| 2210 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file ' . $v_header['filename'] . ' skipped.'); |
|
| 2210 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file '.$v_header['filename'].' skipped.'); |
|
| 2211 | 2211 | |
| 2212 | 2212 | // ----- Jump to next file |
| 2213 | 2213 | TrFctMessage(__FILE__, __LINE__, 2, 'Jump to next file'); |
@@ -2220,8 +2220,8 @@ discard block |
||
| 2220 | 2220 | } // ----- Look for file that is not to be unzipped |
| 2221 | 2221 | else { |
| 2222 | 2222 | // ----- Trace |
| 2223 | - TrFctMessage(__FILE__, __LINE__, 2, 'Jump file ' . $v_header['filename'] . ''); |
|
| 2224 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2223 | + TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].''); |
|
| 2224 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2225 | 2225 | |
| 2226 | 2226 | // ----- Jump to next file |
| 2227 | 2227 | if ($p_tar_mode === 'tar') { |
@@ -2230,7 +2230,7 @@ discard block |
||
| 2230 | 2230 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
| 2231 | 2231 | } |
| 2232 | 2232 | |
| 2233 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2233 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2234 | 2234 | } |
| 2235 | 2235 | |
| 2236 | 2236 | if ($p_tar_mode === 'tar') { |
@@ -2241,7 +2241,7 @@ discard block |
||
| 2241 | 2241 | |
| 2242 | 2242 | // ----- File name and properties are logged if listing mode or file is extracted |
| 2243 | 2243 | if ($v_listing || $v_extract_file || $v_extraction_stopped) { |
| 2244 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
| 2244 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
| 2245 | 2245 | |
| 2246 | 2246 | // ----- Log extracted files |
| 2247 | 2247 | if (($v_file_dir = dirname($v_header['filename'])) == $v_header['filename']) { |
@@ -2315,7 +2315,7 @@ discard block |
||
| 2315 | 2315 | if (($p_path === '') |
| 2316 | 2316 | || ((0 !== strpos($p_path, '/')) && (0 !== strpos($p_path, '../')) |
| 2317 | 2317 | && (0 !== strpos($p_path, './')))) { |
| 2318 | - $p_path = './' . $p_path; |
|
| 2318 | + $p_path = './'.$p_path; |
|
| 2319 | 2319 | } |
| 2320 | 2320 | |
| 2321 | 2321 | // ----- Look for path to remove format (should end by /) |
@@ -2462,14 +2462,14 @@ discard block |
||
| 2462 | 2462 | continue; |
| 2463 | 2463 | } |
| 2464 | 2464 | |
| 2465 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
| 2465 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
| 2466 | 2466 | |
| 2467 | 2467 | // ----- Look if file is in the range to be extracted |
| 2468 | 2468 | if (($p_index_current >= $p_index_start) && ($p_index_current <= $p_index_stop)) { |
| 2469 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' is in the range to be extracted'); |
|
| 2469 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' is in the range to be extracted'); |
|
| 2470 | 2470 | $v_extract_file = true; |
| 2471 | 2471 | } else { |
| 2472 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' is out of the range'); |
|
| 2472 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' is out of the range'); |
|
| 2473 | 2473 | $v_extract_file = false; |
| 2474 | 2474 | } |
| 2475 | 2475 | |
@@ -2484,8 +2484,8 @@ discard block |
||
| 2484 | 2484 | } // ----- Look for file that is not to be extracted |
| 2485 | 2485 | else { |
| 2486 | 2486 | // ----- Trace |
| 2487 | - TrFctMessage(__FILE__, __LINE__, 2, 'Jump file ' . $v_header['filename'] . ''); |
|
| 2488 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2487 | + TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].''); |
|
| 2488 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2489 | 2489 | |
| 2490 | 2490 | // ----- Jump to next file |
| 2491 | 2491 | if ($p_tar_mode === 'tar') { |
@@ -2494,7 +2494,7 @@ discard block |
||
| 2494 | 2494 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
| 2495 | 2495 | } |
| 2496 | 2496 | |
| 2497 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2497 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2498 | 2498 | } |
| 2499 | 2499 | |
| 2500 | 2500 | if ($p_tar_mode === 'tar') { |
@@ -2505,7 +2505,7 @@ discard block |
||
| 2505 | 2505 | |
| 2506 | 2506 | // ----- File name and properties are logged if listing mode or file is extracted |
| 2507 | 2507 | if ($v_extract_file) { |
| 2508 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
| 2508 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
| 2509 | 2509 | |
| 2510 | 2510 | // ----- Log extracted files |
| 2511 | 2511 | if (($v_file_dir = dirname($v_header['filename'])) == $v_header['filename']) { |
@@ -2562,10 +2562,10 @@ discard block |
||
| 2562 | 2562 | |
| 2563 | 2563 | // ----- Look for path to remove |
| 2564 | 2564 | if (($p_remove_path != '') && (0 === strpos($v_header['filename'], $p_remove_path))) { |
| 2565 | - TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file " . $v_header['filename'] . ''); |
|
| 2565 | + TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file ".$v_header['filename'].''); |
|
| 2566 | 2566 | // ----- Remove the path |
| 2567 | 2567 | $v_header['filename'] = substr($v_header['filename'], $p_remove_path_size); |
| 2568 | - TrFctMessage(__FILE__, __LINE__, 3, 'Resulting file is ' . $v_header['filename'] . ''); |
|
| 2568 | + TrFctMessage(__FILE__, __LINE__, 3, 'Resulting file is '.$v_header['filename'].''); |
|
| 2569 | 2569 | } |
| 2570 | 2570 | |
| 2571 | 2571 | // ----- Add the path to the file |
@@ -2579,22 +2579,22 @@ discard block |
||
| 2579 | 2579 | |
| 2580 | 2580 | // ----- Add the path |
| 2581 | 2581 | if (0 === strpos($v_header['filename'], '/')) { |
| 2582 | - $v_header['filename'] = $p_path . $v_header['filename']; |
|
| 2582 | + $v_header['filename'] = $p_path.$v_header['filename']; |
|
| 2583 | 2583 | } else { |
| 2584 | - $v_header['filename'] = $p_path . '/' . $v_header['filename']; |
|
| 2584 | + $v_header['filename'] = $p_path.'/'.$v_header['filename']; |
|
| 2585 | 2585 | } |
| 2586 | 2586 | } |
| 2587 | 2587 | |
| 2588 | 2588 | // ----- Trace |
| 2589 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
| 2589 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
| 2590 | 2590 | |
| 2591 | 2591 | // ----- Check that the file does not exists |
| 2592 | 2592 | if (file_exists($v_header['filename'])) { |
| 2593 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' already exists'); |
|
| 2593 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' already exists'); |
|
| 2594 | 2594 | |
| 2595 | 2595 | // ----- Look if file is a directory |
| 2596 | 2596 | if (is_dir($v_header['filename'])) { |
| 2597 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is a directory'); |
|
| 2597 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is a directory'); |
|
| 2598 | 2598 | |
| 2599 | 2599 | // ----- Change the file status |
| 2600 | 2600 | $v_header['status'] = 'already_a_directory'; |
@@ -2605,7 +2605,7 @@ discard block |
||
| 2605 | 2605 | } // ----- Look if file is write protected |
| 2606 | 2606 | else { |
| 2607 | 2607 | if (!s_writable($v_header['filename'])) { |
| 2608 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is write protected'); |
|
| 2608 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is write protected'); |
|
| 2609 | 2609 | |
| 2610 | 2610 | // ----- Change the file status |
| 2611 | 2611 | $v_header['status'] = 'write_protected'; |
@@ -2616,7 +2616,7 @@ discard block |
||
| 2616 | 2616 | } // ----- Look if the extracted file is older |
| 2617 | 2617 | else { |
| 2618 | 2618 | if (filemtime($v_header['filename']) > $v_header['mtime']) { |
| 2619 | - 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']) . ')'); |
|
| 2619 | + 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']).')'); |
|
| 2620 | 2620 | |
| 2621 | 2621 | // ----- Change the file status |
| 2622 | 2622 | $v_header['status'] = 'newer_exist'; |
@@ -2640,7 +2640,7 @@ discard block |
||
| 2640 | 2640 | } |
| 2641 | 2641 | |
| 2642 | 2642 | if (($v_result = PclTarHandlerDirCheck($v_dir_to_check)) != 1) { |
| 2643 | - TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for ' . $v_header['filename'] . ''); |
|
| 2643 | + TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for '.$v_header['filename'].''); |
|
| 2644 | 2644 | |
| 2645 | 2645 | // ----- Change the file status |
| 2646 | 2646 | $v_header['status'] = 'path_creation_fail'; |
@@ -2655,7 +2655,7 @@ discard block |
||
| 2655 | 2655 | if ($v_extract_file && ($v_header['typeflag'] != '5')) { |
| 2656 | 2656 | // ----- Open the destination file in write mode |
| 2657 | 2657 | if (($v_dest_file = @fopen($v_header['filename'], 'wb')) == 0) { |
| 2658 | - TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening ' . $v_header['filename'] . ' in write binary mode'); |
|
| 2658 | + TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening '.$v_header['filename'].' in write binary mode'); |
|
| 2659 | 2659 | |
| 2660 | 2660 | // ----- Change the file status |
| 2661 | 2661 | $v_header['status'] = 'write_error'; |
@@ -2668,12 +2668,12 @@ discard block |
||
| 2668 | 2668 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
| 2669 | 2669 | } |
| 2670 | 2670 | } else { |
| 2671 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of ' . $v_header['filename'] . ''); |
|
| 2671 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of '.$v_header['filename'].''); |
|
| 2672 | 2672 | |
| 2673 | 2673 | // ----- Read data |
| 2674 | 2674 | $n = floor($v_header['size'] / 512); |
| 2675 | 2675 | for ($i = 0; $i < $n; ++$i) { |
| 2676 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
| 2676 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
| 2677 | 2677 | if ($p_tar_mode === 'tar') { |
| 2678 | 2678 | $v_content = fread($v_tar, 512); |
| 2679 | 2679 | } else { |
@@ -2682,7 +2682,7 @@ discard block |
||
| 2682 | 2682 | fwrite($v_dest_file, $v_content, 512); |
| 2683 | 2683 | } |
| 2684 | 2684 | if (($v_header['size'] % 512) != 0) { |
| 2685 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read last ' . ($v_header['size'] % 512) . ' bytes in a 512 block'); |
|
| 2685 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read last '.($v_header['size'] % 512).' bytes in a 512 block'); |
|
| 2686 | 2686 | if ($p_tar_mode === 'tar') { |
| 2687 | 2687 | $v_content = fread($v_tar, 512); |
| 2688 | 2688 | } else { |
@@ -2703,7 +2703,7 @@ discard block |
||
| 2703 | 2703 | clearstatcache(); |
| 2704 | 2704 | if (filesize($v_header['filename']) != $v_header['size']) { |
| 2705 | 2705 | // ----- Error log |
| 2706 | - 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."); |
|
| 2706 | + 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."); |
|
| 2707 | 2707 | |
| 2708 | 2708 | // ----- Return |
| 2709 | 2709 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -2714,7 +2714,7 @@ discard block |
||
| 2714 | 2714 | // ----- Trace |
| 2715 | 2715 | TrFctMessage(__FILE__, __LINE__, 2, 'Extraction done'); |
| 2716 | 2716 | } else { |
| 2717 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file ' . $v_header['filename'] . ' skipped.'); |
|
| 2717 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file '.$v_header['filename'].' skipped.'); |
|
| 2718 | 2718 | |
| 2719 | 2719 | // ----- Jump to next file |
| 2720 | 2720 | TrFctMessage(__FILE__, __LINE__, 2, 'Jump to next file'); |
@@ -2768,7 +2768,7 @@ discard block |
||
| 2768 | 2768 | } |
| 2769 | 2769 | |
| 2770 | 2770 | // ----- Open a temporary file in write mode |
| 2771 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
| 2771 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
| 2772 | 2772 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
| 2773 | 2773 | if (($v_temp_tar = @fopen($v_temp_tarname, 'wb')) == 0) { |
| 2774 | 2774 | // ----- Close tar file |
@@ -2797,7 +2797,7 @@ discard block |
||
| 2797 | 2797 | } |
| 2798 | 2798 | |
| 2799 | 2799 | // ----- Open a temporary file in write mode |
| 2800 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
| 2800 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
| 2801 | 2801 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
| 2802 | 2802 | if (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) { |
| 2803 | 2803 | // ----- Close tar file |
@@ -2854,7 +2854,7 @@ discard block |
||
| 2854 | 2854 | continue; |
| 2855 | 2855 | } |
| 2856 | 2856 | |
| 2857 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
| 2857 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
| 2858 | 2858 | |
| 2859 | 2859 | // ----- Look for filenames to delete |
| 2860 | 2860 | for ($i = 0, $v_delete_file = false; ($i < count($p_file_list)) && (!$v_delete_file); ++$i) { |
@@ -2862,12 +2862,12 @@ discard block |
||
| 2862 | 2862 | // if ($p_file_list[$i] == $v_header['filename']) |
| 2863 | 2863 | if (($v_len = strcmp($p_file_list[$i], $v_header['filename'])) <= 0) { |
| 2864 | 2864 | if ($v_len == 0) { |
| 2865 | - TrFctMessage(__FILE__, __LINE__, 3, 'Found that ' . $v_header['filename'] . ' need to be deleted'); |
|
| 2865 | + TrFctMessage(__FILE__, __LINE__, 3, 'Found that '.$v_header['filename'].' need to be deleted'); |
|
| 2866 | 2866 | $v_delete_file = true; |
| 2867 | 2867 | } else { |
| 2868 | - TrFctMessage(__FILE__, __LINE__, 3, 'Look if ' . $v_header['filename'] . " is a file in $p_file_list[$i]"); |
|
| 2868 | + TrFctMessage(__FILE__, __LINE__, 3, 'Look if '.$v_header['filename']." is a file in $p_file_list[$i]"); |
|
| 2869 | 2869 | if (substr($v_header['filename'], strlen($p_file_list[$i]), 1) === '/') { |
| 2870 | - TrFctMessage(__FILE__, __LINE__, 3, '' . $v_header['filename'] . " is a file in $p_file_list[$i]"); |
|
| 2870 | + TrFctMessage(__FILE__, __LINE__, 3, ''.$v_header['filename']." is a file in $p_file_list[$i]"); |
|
| 2871 | 2871 | $v_delete_file = true; |
| 2872 | 2872 | } |
| 2873 | 2873 | } |
@@ -2876,7 +2876,7 @@ discard block |
||
| 2876 | 2876 | |
| 2877 | 2877 | // ----- Copy files that do not need to be deleted |
| 2878 | 2878 | if (!$v_delete_file) { |
| 2879 | - TrFctMessage(__FILE__, __LINE__, 2, 'Keep file ' . $v_header['filename'] . ''); |
|
| 2879 | + TrFctMessage(__FILE__, __LINE__, 2, 'Keep file '.$v_header['filename'].''); |
|
| 2880 | 2880 | |
| 2881 | 2881 | // ----- Write the file header |
| 2882 | 2882 | if ($p_tar_mode === 'tar') { |
@@ -2888,7 +2888,7 @@ discard block |
||
| 2888 | 2888 | // ----- Write the file data |
| 2889 | 2889 | $n = ceil($v_header['size'] / 512); |
| 2890 | 2890 | for ($i = 0; $i < $n; ++$i) { |
| 2891 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
| 2891 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
| 2892 | 2892 | if ($p_tar_mode === 'tar') { |
| 2893 | 2893 | $v_content = fread($v_tar, 512); |
| 2894 | 2894 | fwrite($v_temp_tar, $v_content, 512); |
@@ -2899,7 +2899,7 @@ discard block |
||
| 2899 | 2899 | } |
| 2900 | 2900 | |
| 2901 | 2901 | // ----- File name and properties are logged if listing mode or file is extracted |
| 2902 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
| 2902 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
| 2903 | 2903 | |
| 2904 | 2904 | // ----- Add the array describing the file into the list |
| 2905 | 2905 | $p_list_detail[$v_nb] = $v_header; |
@@ -2910,8 +2910,8 @@ discard block |
||
| 2910 | 2910 | } // ----- Look for file that is to be deleted |
| 2911 | 2911 | else { |
| 2912 | 2912 | // ----- Trace |
| 2913 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of ' . $v_header['filename'] . ''); |
|
| 2914 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2913 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of '.$v_header['filename'].''); |
|
| 2914 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2915 | 2915 | |
| 2916 | 2916 | // ----- Jump to next file |
| 2917 | 2917 | if ($p_tar_mode === 'tar') { |
@@ -2920,7 +2920,7 @@ discard block |
||
| 2920 | 2920 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
| 2921 | 2921 | } |
| 2922 | 2922 | |
| 2923 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2923 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.($p_tar_mode === 'tar' ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2924 | 2924 | } |
| 2925 | 2925 | |
| 2926 | 2926 | // ----- Look for end of file |
@@ -3006,7 +3006,7 @@ discard block |
||
| 3006 | 3006 | } |
| 3007 | 3007 | |
| 3008 | 3008 | // ----- Open a temporary file in write mode |
| 3009 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
| 3009 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
| 3010 | 3010 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
| 3011 | 3011 | if (($v_temp_tar = @fopen($v_temp_tarname, 'wb')) == 0) { |
| 3012 | 3012 | // ----- Close tar file |
@@ -3035,7 +3035,7 @@ discard block |
||
| 3035 | 3035 | } |
| 3036 | 3036 | |
| 3037 | 3037 | // ----- Open a temporary file in write mode |
| 3038 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
| 3038 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
| 3039 | 3039 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
| 3040 | 3040 | if (($v_temp_tar = @gzopen($v_temp_tarname, 'wb')) == 0) { |
| 3041 | 3041 | // ----- Close tar file |
@@ -3070,9 +3070,9 @@ discard block |
||
| 3070 | 3070 | } |
| 3071 | 3071 | if ($p_add_dir != '') { |
| 3072 | 3072 | if (substr($p_add_dir, -1) === '/') { |
| 3073 | - $v_stored_list[$i] = $p_add_dir . $v_stored_list[$i]; |
|
| 3073 | + $v_stored_list[$i] = $p_add_dir.$v_stored_list[$i]; |
|
| 3074 | 3074 | } else { |
| 3075 | - $v_stored_list[$i] = $p_add_dir . '/' . $v_stored_list[$i]; |
|
| 3075 | + $v_stored_list[$i] = $p_add_dir.'/'.$v_stored_list[$i]; |
|
| 3076 | 3076 | } |
| 3077 | 3077 | TrFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_file_list[$i]' = '$v_stored_list[$i]'"); |
| 3078 | 3078 | } |
@@ -3127,7 +3127,7 @@ discard block |
||
| 3127 | 3127 | continue; |
| 3128 | 3128 | } |
| 3129 | 3129 | |
| 3130 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
| 3130 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
| 3131 | 3131 | |
| 3132 | 3132 | // ----- Look for filenames to update |
| 3133 | 3133 | for ($i = 0, $v_update_file = false, $v_found_file = false; ($i < count($v_stored_list)) && (!$v_update_file); ++$i) { |
@@ -3136,8 +3136,8 @@ discard block |
||
| 3136 | 3136 | // ----- Compare the file names |
| 3137 | 3137 | if ($v_stored_list[$i] == $v_header['filename']) { |
| 3138 | 3138 | TrFctMessage(__FILE__, __LINE__, 3, "File '$v_stored_list[$i]' is present in archive"); |
| 3139 | - 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]))); |
|
| 3140 | - TrFctMessage(__FILE__, __LINE__, 3, 'Archived mtime=' . $v_header['mtime'] . ' ' . date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
| 3139 | + 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]))); |
|
| 3140 | + TrFctMessage(__FILE__, __LINE__, 3, 'Archived mtime='.$v_header['mtime'].' '.date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
| 3141 | 3141 | |
| 3142 | 3142 | // ----- Store found informations |
| 3143 | 3143 | $v_found_file = true; |
@@ -3155,13 +3155,13 @@ discard block |
||
| 3155 | 3155 | // ----- Flag the name in order not to add the file at the end |
| 3156 | 3156 | $v_found_list[$i] = 1; |
| 3157 | 3157 | } else { |
| 3158 | - TrFctMessage(__FILE__, __LINE__, 4, "File '$p_file_list[$i]' is not " . $v_header['filename'] . ''); |
|
| 3158 | + TrFctMessage(__FILE__, __LINE__, 4, "File '$p_file_list[$i]' is not ".$v_header['filename'].''); |
|
| 3159 | 3159 | } |
| 3160 | 3160 | } |
| 3161 | 3161 | |
| 3162 | 3162 | // ----- Copy files that do not need to be updated |
| 3163 | 3163 | if (!$v_update_file) { |
| 3164 | - TrFctMessage(__FILE__, __LINE__, 2, 'Keep file ' . $v_header['filename'] . ''); |
|
| 3164 | + TrFctMessage(__FILE__, __LINE__, 2, 'Keep file '.$v_header['filename'].''); |
|
| 3165 | 3165 | |
| 3166 | 3166 | // ----- Write the file header |
| 3167 | 3167 | if ($p_tar_mode === 'tar') { |
@@ -3173,7 +3173,7 @@ discard block |
||
| 3173 | 3173 | // ----- Write the file data |
| 3174 | 3174 | $n = ceil($v_header['size'] / 512); |
| 3175 | 3175 | for ($j = 0; $j < $n; ++$j) { |
| 3176 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($j + 1)); |
|
| 3176 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($j + 1)); |
|
| 3177 | 3177 | if ($p_tar_mode === 'tar') { |
| 3178 | 3178 | $v_content = fread($v_tar, 512); |
| 3179 | 3179 | fwrite($v_temp_tar, $v_content, 512); |
@@ -3184,7 +3184,7 @@ discard block |
||
| 3184 | 3184 | } |
| 3185 | 3185 | |
| 3186 | 3186 | // ----- File name and properties are logged if listing mode or file is extracted |
| 3187 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
| 3187 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
| 3188 | 3188 | |
| 3189 | 3189 | // ----- Add the array describing the file into the list |
| 3190 | 3190 | $p_list_detail[$v_nb] = $v_header; |
@@ -3219,7 +3219,7 @@ discard block |
||
| 3219 | 3219 | } |
| 3220 | 3220 | |
| 3221 | 3221 | // ----- Trace |
| 3222 | - TrFctMessage(__FILE__, __LINE__, 2, 'Skip old file ' . $v_header['filename'] . ''); |
|
| 3222 | + TrFctMessage(__FILE__, __LINE__, 2, 'Skip old file '.$v_header['filename'].''); |
|
| 3223 | 3223 | |
| 3224 | 3224 | // ----- Jump to next file |
| 3225 | 3225 | if ($p_tar_mode === 'tar') { |
@@ -3356,10 +3356,10 @@ discard block |
||
| 3356 | 3356 | if (strlen($v_binary_data) != 512) { |
| 3357 | 3357 | $v_header['filename'] = ''; |
| 3358 | 3358 | $v_header['status'] = 'invalid_header'; |
| 3359 | - TrFctMessage(__FILE__, __LINE__, 2, 'Invalid block size : ' . strlen($v_binary_data)); |
|
| 3359 | + TrFctMessage(__FILE__, __LINE__, 2, 'Invalid block size : '.strlen($v_binary_data)); |
|
| 3360 | 3360 | |
| 3361 | 3361 | // ----- Error log |
| 3362 | - PclErrorLog(-10, 'Invalid block size : ' . strlen($v_binary_data)); |
|
| 3362 | + PclErrorLog(-10, 'Invalid block size : '.strlen($v_binary_data)); |
|
| 3363 | 3363 | |
| 3364 | 3364 | // ----- Return |
| 3365 | 3365 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -3389,9 +3389,9 @@ discard block |
||
| 3389 | 3389 | |
| 3390 | 3390 | // ----- Extract the checksum for check |
| 3391 | 3391 | $v_header['checksum'] = octdec(trim($v_data['checksum'])); |
| 3392 | - TrFctMessage(__FILE__, __LINE__, 3, 'File checksum : ' . $v_header['checksum'] . ''); |
|
| 3392 | + TrFctMessage(__FILE__, __LINE__, 3, 'File checksum : '.$v_header['checksum'].''); |
|
| 3393 | 3393 | if ($v_header['checksum'] != $v_checksum) { |
| 3394 | - TrFctMessage(__FILE__, __LINE__, 2, "File checksum is invalid : $v_checksum calculated, " . $v_header['checksum'] . ' expected'); |
|
| 3394 | + TrFctMessage(__FILE__, __LINE__, 2, "File checksum is invalid : $v_checksum calculated, ".$v_header['checksum'].' expected'); |
|
| 3395 | 3395 | |
| 3396 | 3396 | $v_header['filename'] = ''; |
| 3397 | 3397 | $v_header['status'] = 'invalid_header'; |
@@ -3406,7 +3406,7 @@ discard block |
||
| 3406 | 3406 | } |
| 3407 | 3407 | |
| 3408 | 3408 | // ----- Error log |
| 3409 | - PclErrorLog(-13, "Invalid checksum : $v_checksum calculated, " . $v_header['checksum'] . ' expected'); |
|
| 3409 | + PclErrorLog(-13, "Invalid checksum : $v_checksum calculated, ".$v_header['checksum'].' expected'); |
|
| 3410 | 3410 | |
| 3411 | 3411 | // ----- Return |
| 3412 | 3412 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -3417,22 +3417,22 @@ discard block |
||
| 3417 | 3417 | |
| 3418 | 3418 | // ----- Extract the properties |
| 3419 | 3419 | $v_header['filename'] = trim($v_data['filename']); |
| 3420 | - TrFctMessage(__FILE__, __LINE__, 2, 'Name : ' . $v_header['filename'] . ''); |
|
| 3420 | + TrFctMessage(__FILE__, __LINE__, 2, 'Name : '.$v_header['filename'].''); |
|
| 3421 | 3421 | $v_header['mode'] = octdec(trim($v_data['mode'])); |
| 3422 | - TrFctMessage(__FILE__, __LINE__, 2, "Mode : '" . decoct($v_header['mode']) . "'"); |
|
| 3422 | + TrFctMessage(__FILE__, __LINE__, 2, "Mode : '".decoct($v_header['mode'])."'"); |
|
| 3423 | 3423 | $v_header['uid'] = octdec(trim($v_data['uid'])); |
| 3424 | - TrFctMessage(__FILE__, __LINE__, 2, "Uid : '" . $v_header['uid'] . "'"); |
|
| 3424 | + TrFctMessage(__FILE__, __LINE__, 2, "Uid : '".$v_header['uid']."'"); |
|
| 3425 | 3425 | $v_header['gid'] = octdec(trim($v_data['gid'])); |
| 3426 | - TrFctMessage(__FILE__, __LINE__, 2, "Gid : '" . $v_header['gid'] . "'"); |
|
| 3426 | + TrFctMessage(__FILE__, __LINE__, 2, "Gid : '".$v_header['gid']."'"); |
|
| 3427 | 3427 | $v_header['size'] = octdec(trim($v_data['size'])); |
| 3428 | - TrFctMessage(__FILE__, __LINE__, 2, "Size : '" . $v_header['size'] . "'"); |
|
| 3428 | + TrFctMessage(__FILE__, __LINE__, 2, "Size : '".$v_header['size']."'"); |
|
| 3429 | 3429 | $v_header['mtime'] = octdec(trim($v_data['mtime'])); |
| 3430 | - TrFctMessage(__FILE__, __LINE__, 2, 'Date : ' . date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
| 3430 | + TrFctMessage(__FILE__, __LINE__, 2, 'Date : '.date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
| 3431 | 3431 | if (($v_header['typeflag'] = $v_data['typeflag']) == '5') { |
| 3432 | 3432 | $v_header['size'] = 0; |
| 3433 | - TrFctMessage(__FILE__, __LINE__, 2, "Size (folder) : '" . $v_header['size'] . "'"); |
|
| 3433 | + TrFctMessage(__FILE__, __LINE__, 2, "Size (folder) : '".$v_header['size']."'"); |
|
| 3434 | 3434 | } |
| 3435 | - TrFctMessage(__FILE__, __LINE__, 2, 'File typeflag : ' . $v_header['typeflag'] . ''); |
|
| 3435 | + TrFctMessage(__FILE__, __LINE__, 2, 'File typeflag : '.$v_header['typeflag'].''); |
|
| 3436 | 3436 | /* ----- All these fields are removed form the header because they do not carry interesting info |
| 3437 | 3437 | $v_header[link] = trim($v_data[link]); |
| 3438 | 3438 | TrFctMessage(__FILE__, __LINE__, 2, "Linkname : $v_header[linkname]"); |
@@ -3612,7 +3612,7 @@ discard block |
||
| 3612 | 3612 | // ----- Ignore only the double '//' in path, |
| 3613 | 3613 | // but not the first and last '/' |
| 3614 | 3614 | } else { |
| 3615 | - $v_result = $v_list[$i] . ($i != (count($v_list) - 1) ? '/' . $v_result : ''); |
|
| 3615 | + $v_result = $v_list[$i].($i != (count($v_list) - 1) ? '/'.$v_result : ''); |
|
| 3616 | 3616 | } |
| 3617 | 3617 | } |
| 3618 | 3618 | } |
@@ -55,22 +55,22 @@ |
||
| 55 | 55 | $edit_delete = ''; |
| 56 | 56 | if (is_object($xoopsUser) && $isAdmin) { |
| 57 | 57 | $edit_delete = '<a href="' |
| 58 | - . XOOPS_URL |
|
| 59 | - . '/modules/extcal/admin/etablissement.php?op=edit_etablissement&etablissement_id=' |
|
| 60 | - . $etablissement_id |
|
| 61 | - . '"><img src="' |
|
| 62 | - . $pathIcon16 |
|
| 63 | - . '/edit.png" width="16px" height="16px" border="0" title="' |
|
| 64 | - . _MD_EXTCAL_ETABLISSEMENT_EDIT |
|
| 65 | - . '"></a><a href="' |
|
| 66 | - . XOOPS_URL |
|
| 67 | - . '/modules/extcal/admin/etablissement.php?op=delete_etablissement&etablissement_id=' |
|
| 68 | - . $etablissement_id |
|
| 69 | - . '"><img src="' |
|
| 70 | - . $pathIcon16 |
|
| 71 | - . '/delete.png" width="16px" height="16px" border="0" title="' |
|
| 72 | - . _MD_EXTCAL_ETABLISSEMENT_DELETE |
|
| 73 | - . '"></a>'; |
|
| 58 | + . XOOPS_URL |
|
| 59 | + . '/modules/extcal/admin/etablissement.php?op=edit_etablissement&etablissement_id=' |
|
| 60 | + . $etablissement_id |
|
| 61 | + . '"><img src="' |
|
| 62 | + . $pathIcon16 |
|
| 63 | + . '/edit.png" width="16px" height="16px" border="0" title="' |
|
| 64 | + . _MD_EXTCAL_ETABLISSEMENT_EDIT |
|
| 65 | + . '"></a><a href="' |
|
| 66 | + . XOOPS_URL |
|
| 67 | + . '/modules/extcal/admin/etablissement.php?op=delete_etablissement&etablissement_id=' |
|
| 68 | + . $etablissement_id |
|
| 69 | + . '"><img src="' |
|
| 70 | + . $pathIcon16 |
|
| 71 | + . '/delete.png" width="16px" height="16px" border="0" title="' |
|
| 72 | + . _MD_EXTCAL_ETABLISSEMENT_DELETE |
|
| 73 | + . '"></a>'; |
|
| 74 | 74 | } |
| 75 | 75 | $xoopsTpl->assign('edit_delete', $edit_delete); |
| 76 | 76 | |
@@ -17,10 +17,10 @@ discard block |
||
| 17 | 17 | * @author XOOPS Development Team, |
| 18 | 18 | */ |
| 19 | 19 | |
| 20 | -require_once __DIR__ . '/../../mainfile.php'; |
|
| 21 | -require_once __DIR__ . '/include/constantes.php'; |
|
| 20 | +require_once __DIR__.'/../../mainfile.php'; |
|
| 21 | +require_once __DIR__.'/include/constantes.php'; |
|
| 22 | 22 | $GLOBALS['xoopsOption']['template_main'] = 'extcal_etablissement.tpl'; |
| 23 | -require_once __DIR__ . '/header.php'; |
|
| 23 | +require_once __DIR__.'/header.php'; |
|
| 24 | 24 | |
| 25 | 25 | //require_once XOOPS_ROOT_PATH."/modules/extcal/class/etablissement.php"; |
| 26 | 26 | $etablissementHandler = xoops_getModuleHandler(_EXTCAL_CLS_ETABLISSEMENT, _EXTCAL_MODULE); |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $etablissement_exist = $etablissementHandler->getCount($criteria); |
| 37 | 37 | |
| 38 | 38 | if ($etablissement_exist == 0) { |
| 39 | - redirect_header(XOOPS_URL . '/modules/extcal/index.php', 3, _NOPERM); |
|
| 39 | + redirect_header(XOOPS_URL.'/modules/extcal/index.php', 3, _NOPERM); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | $view_etablissement = $etablissementHandler->getEtablissement($etablissement_id, true); |
@@ -78,12 +78,12 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | $date = mktime(0, 0, 0, date('m'), date('d'), date('y')); |
| 80 | 80 | |
| 81 | -$requete = $xoopsDB->query('SELECT event_id, event_title, event_desc, event_picture1, event_start FROM ' . $xoopsDB->prefix('extcal_event') . " WHERE event_etablissement='" . $etablissement_id . "' AND event_start >='" . $date . "'"); |
|
| 81 | +$requete = $xoopsDB->query('SELECT event_id, event_title, event_desc, event_picture1, event_start FROM '.$xoopsDB->prefix('extcal_event')." WHERE event_etablissement='".$etablissement_id."' AND event_start >='".$date."'"); |
|
| 82 | 82 | while ($donnees = $xoopsDB->fetchArray($requete)) { |
| 83 | 83 | if ($donnees['event_desc'] > 210) { |
| 84 | 84 | $event_desc = $donnees['event_desc']; |
| 85 | 85 | } else { |
| 86 | - $event_desc = substr($donnees['event_desc'], 0, 210) . '...'; |
|
| 86 | + $event_desc = substr($donnees['event_desc'], 0, 210).'...'; |
|
| 87 | 87 | } |
| 88 | 88 | $xoopsTpl->append('events', array( |
| 89 | 89 | 'event_picture1' => $donnees['event_picture1'], |
@@ -96,4 +96,4 @@ discard block |
||
| 96 | 96 | /** @var xos_opal_Theme $xoTheme */ |
| 97 | 97 | $xoTheme->addScript('browse.php?modules/extcal/assets/js/highslide.js'); |
| 98 | 98 | $xoTheme->addStylesheet('browse.php?modules/extcal/assets/js/highslide.css'); |
| 99 | -require_once XOOPS_ROOT_PATH . '/footer.php'; |
|
| 99 | +require_once XOOPS_ROOT_PATH.'/footer.php'; |
|
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require_once __DIR__ . '/../../include/constantes.php'; |
|
| 3 | +require_once __DIR__.'/../../include/constantes.php'; |
|
| 4 | 4 | define('_MI_EXTCAL_NAME', 'eXtCal'); |
| 5 | 5 | define('_MI_EXTCAL_ABOUT', 'About'); |
| 6 | 6 | define('_MI_EXTCAL_AFTER', 'After'); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | define('_MI_EXTCAL_START_PAGE', 'Module home page'); |
| 136 | 136 | define('_MI_EXTCAL_SUBMIT_EVENT', 'Submit Event'); |
| 137 | 137 | define('_MI_EXTCAL_TABS_WEIGHT', 'Order of the Tabs'); |
| 138 | -define('_MI_EXTCAL_TABS_WEIGHT_DESC', 'Set the tab order <br>Be careful to respect tab names:<br>' . "<span style='color:#0000FF;'>" . _EXTCAL_NAV_LIST . '</span>' . ' <br>Separator: new line'); |
|
| 138 | +define('_MI_EXTCAL_TABS_WEIGHT_DESC', 'Set the tab order <br>Be careful to respect tab names:<br>'."<span style='color:#0000FF;'>"._EXTCAL_NAV_LIST.'</span>'.' <br>Separator: new line'); |
|
| 139 | 139 | define('_MI_EXTCAL_VISIBLE_TAB_DESC', 'Define the visible view.'); |
| 140 | 140 | define('_MI_EXTCAL_VISIBLE_TABS', 'Visible tab'); |
| 141 | 141 | define('_MI_EXTCAL_WEEK_START_DAY', 'Week start Day'); |
@@ -162,6 +162,6 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | //Help |
| 164 | 164 | define('_MI_EXTCAL_DIRNAME', basename(dirname(dirname(__DIR__)))); |
| 165 | -define('_MI_EXTCAL_HELP_HEADER', __DIR__ . '/help/helpheader.tpl'); |
|
| 165 | +define('_MI_EXTCAL_HELP_HEADER', __DIR__.'/help/helpheader.tpl'); |
|
| 166 | 166 | define('_MI_EXTCAL_BACK_2_ADMIN', 'Back to Administration of '); |
| 167 | 167 | define('_MI_EXTCAL_OVERVIEW', 'Overview'); |
@@ -1,22 +1,22 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include __DIR__ . '/../../mainfile.php'; |
|
| 4 | -require_once __DIR__ . '/include/constantes.php'; |
|
| 3 | +include __DIR__.'/../../mainfile.php'; |
|
| 4 | +require_once __DIR__.'/include/constantes.php'; |
|
| 5 | 5 | $params = array('view' => _EXTCAL_NAV_AGENDA_WEEK, 'file' => _EXTCAL_FILE_AGENDA_WEEK); |
| 6 | 6 | $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl"; |
| 7 | -require_once __DIR__ . '/header.php'; |
|
| 7 | +require_once __DIR__.'/header.php'; |
|
| 8 | 8 | |
| 9 | 9 | /* ========================================================================== */ |
| 10 | -$year = isset($_GET['year']) ? (int)$_GET['year'] : date('Y'); |
|
| 11 | -$month = isset($_GET['month']) ? (int)$_GET['month'] : date('n'); |
|
| 12 | -$day = isset($_GET['day']) ? (int)$_GET['day'] : date('j'); |
|
| 13 | -$cat = isset($_GET['cat']) ? (int)$_GET['cat'] : 0; |
|
| 10 | +$year = isset($_GET['year']) ? (int) $_GET['year'] : date('Y'); |
|
| 11 | +$month = isset($_GET['month']) ? (int) $_GET['month'] : date('n'); |
|
| 12 | +$day = isset($_GET['day']) ? (int) $_GET['day'] : date('j'); |
|
| 13 | +$cat = isset($_GET['cat']) ? (int) $_GET['cat'] : 0; |
|
| 14 | 14 | |
| 15 | 15 | // Validate the date (day, month and year) |
| 16 | 16 | $dayTS = mktime(0, 0, 0, $month, $day, $year); |
| 17 | 17 | //$offset = date('w', $dayTS) - $xoopsModuleConfig['week_start_day']; |
| 18 | 18 | $offset = date('w', $dayTS) + 7 - $xoopsModuleConfig['week_start_day'] < 7 ? date('w', $dayTS) + 7 - $xoopsModuleConfig['week_start_day'] : 0; |
| 19 | -$dayTS -= ($offset * _EXTCAL_TS_DAY); |
|
| 19 | +$dayTS -= ($offset * _EXTCAL_TS_DAY); |
|
| 20 | 20 | $year = date('Y', $dayTS); |
| 21 | 21 | $month = date('n', $dayTS); |
| 22 | 22 | $day = date('j', $dayTS); |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | 'nbJours' => $nbJours, |
| 50 | 50 | 'externalKeys' => 'cat_id', |
| 51 | 51 | ); |
| 52 | -$events = $eventHandler->getEventsOnPeriode($criteres); |
|
| 52 | +$events = $eventHandler->getEventsOnPeriode($criteres); |
|
| 53 | 53 | /**********************************************************************/ |
| 54 | 54 | $eventsArray = $events; |
| 55 | 55 | // Formating date |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | //------------------------------------------------------------------- |
| 82 | 82 | |
| 83 | 83 | //$params['colJourWidth'] = (int)((((500-50)/$nbJours)/500*100)+.5); |
| 84 | -$params['colJourWidth'] = (int)((((500 - 50) / $nbJours) / 500 * 100) + .6); |
|
| 84 | +$params['colJourWidth'] = (int) ((((500 - 50) / $nbJours) / 500 * 100) + .6); |
|
| 85 | 85 | // echo "agenda_week : {$dayTS}<br>"; |
| 86 | 86 | $tAgenda = agenda_getEvents($eventsArray, $dayTS, $hStart, $hEnd, $mTranche, $nbJours); |
| 87 | 87 | //$exp = print_r($eventsArray, true); |
@@ -103,21 +103,21 @@ discard block |
||
| 103 | 103 | |
| 104 | 104 | $navig = array( |
| 105 | 105 | 'prev' => array( |
| 106 | - 'uri' => 'year=' . $pWeekCalObj->thisYear() . '&month=' . $pWeekCalObj->thisMonth() . '&day=' . $pWeekCalObj->thisDay(), |
|
| 106 | + 'uri' => 'year='.$pWeekCalObj->thisYear().'&month='.$pWeekCalObj->thisMonth().'&day='.$pWeekCalObj->thisDay(), |
|
| 107 | 107 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $pWeekCalObj->getTimestamp()), |
| 108 | 108 | ), |
| 109 | 109 | 'this' => array( |
| 110 | - 'uri' => 'year=' . $weekCalObj->thisYear() . '&month=' . $weekCalObj->thisMonth() . '&day=' . $weekCalObj->thisDay(), |
|
| 110 | + 'uri' => 'year='.$weekCalObj->thisYear().'&month='.$weekCalObj->thisMonth().'&day='.$weekCalObj->thisDay(), |
|
| 111 | 111 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $weekCalObj->getTimestamp()), |
| 112 | 112 | ), |
| 113 | 113 | 'next' => array( |
| 114 | - 'uri' => 'year=' . $nWeekCalObj->thisYear() . '&month=' . $nWeekCalObj->thisMonth() . '&day=' . $nWeekCalObj->thisDay(), |
|
| 114 | + 'uri' => 'year='.$nWeekCalObj->thisYear().'&month='.$nWeekCalObj->thisMonth().'&day='.$nWeekCalObj->thisDay(), |
|
| 115 | 115 | 'name' => $extcalTimeHandler->getFormatedDate($xoopsModuleConfig['nav_date_week'], $nWeekCalObj->getTimestamp()), |
| 116 | 116 | ), |
| 117 | 117 | ); |
| 118 | 118 | |
| 119 | 119 | // Title of the page |
| 120 | -$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']); |
|
| 120 | +$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']); |
|
| 121 | 121 | |
| 122 | 122 | // Assigning navig data to the template |
| 123 | 123 | $xoopsTpl->assign('navig', $navig); |
@@ -158,4 +158,4 @@ discard block |
||
| 158 | 158 | $xoopsTpl->assign('lang', $lang); |
| 159 | 159 | $xoopsTpl->assign('view', 'agendaweek'); |
| 160 | 160 | |
| 161 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
| 161 | +include XOOPS_ROOT_PATH.'/footer.php'; |
|
@@ -1,10 +1,10 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include __DIR__ . '/../../mainfile.php'; |
|
| 3 | +include __DIR__.'/../../mainfile.php'; |
|
| 4 | 4 | |
| 5 | -require_once __DIR__ . '/include/constantes.php'; |
|
| 6 | -require_once __DIR__ . '/include/mail_fnc.php'; |
|
| 7 | -require_once __DIR__ . '/class/utility.php'; |
|
| 5 | +require_once __DIR__.'/include/constantes.php'; |
|
| 6 | +require_once __DIR__.'/include/mail_fnc.php'; |
|
| 7 | +require_once __DIR__.'/class/utility.php'; |
|
| 8 | 8 | |
| 9 | 9 | // $member_uid = 1; |
| 10 | 10 | // $event_id = 393; |
@@ -39,26 +39,26 @@ discard block |
||
| 39 | 39 | //echo "<hr>"; |
| 40 | 40 | |
| 41 | 41 | if (!$GLOBALS['xoopsSecurity']->check()) { |
| 42 | - redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors())); |
|
| 42 | + redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors())); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | if ($xoopsUser && $xoopsModuleConfig['whos_going']) { |
| 46 | 46 | // If param are right |
| 47 | - if ((int)$_POST['event'] > 0 && ($_POST['mode'] === 'add' || $_POST['mode'] === 'remove')) { |
|
| 47 | + if ((int) $_POST['event'] > 0 && ($_POST['mode'] === 'add' || $_POST['mode'] === 'remove')) { |
|
| 48 | 48 | $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE); |
| 49 | 49 | $eventMemberHandler = xoops_getModuleHandler(_EXTCAL_CLS_MEMBER, _EXTCAL_MODULE); |
| 50 | 50 | |
| 51 | 51 | // If the user have to be added |
| 52 | 52 | if ($_POST['mode'] === 'add') { |
| 53 | - $event = $eventHandler->getEvent((int)$_POST['event'], $xoopsUser); |
|
| 53 | + $event = $eventHandler->getEvent((int) $_POST['event'], $xoopsUser); |
|
| 54 | 54 | |
| 55 | 55 | if ($event->getVar('event_nbmember') > 0 |
| 56 | - && $eventMemberHandler->getNbMember((int)$_POST['event']) >= $event->getVar('event_nbmember')) { |
|
| 56 | + && $eventMemberHandler->getNbMember((int) $_POST['event']) >= $event->getVar('event_nbmember')) { |
|
| 57 | 57 | sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_0, _MD_EXTCAL_MSG_0); |
| 58 | 58 | $rediredtMessage = _MD_EXTCAL_MAX_MEMBER_REACHED; |
| 59 | 59 | } else { |
| 60 | 60 | $eventMemberHandler->createEventmember(array( |
| 61 | - 'event_id' => (int)$_POST['event'], |
|
| 61 | + 'event_id' => (int) $_POST['event'], |
|
| 62 | 62 | 'uid' => $xoopsUser->getVar('uid'), |
| 63 | 63 | )); |
| 64 | 64 | sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_1, _MD_EXTCAL_MSG_1); |
@@ -67,12 +67,12 @@ discard block |
||
| 67 | 67 | // If the user have to be remove |
| 68 | 68 | } else { |
| 69 | 69 | if ($_POST['mode'] === 'remove') { |
| 70 | - $eventMemberHandler->deleteEventmember(array((int)$_POST['event'], $xoopsUser->getVar('uid'))); |
|
| 70 | + $eventMemberHandler->deleteEventmember(array((int) $_POST['event'], $xoopsUser->getVar('uid'))); |
|
| 71 | 71 | sendMail2member($mode, $event_id, $member_uid, _MD_EXTCAL_SUBJECT_2, _MD_EXTCAL_MSG_2); |
| 72 | 72 | $rediredtMessage = _MD_EXTCAL_WHOS_GOING_REMOVED_TO_EVENT; |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | - redirect_header('event.php?event=' . $_POST['event'], 3, $rediredtMessage, false); |
|
| 75 | + redirect_header('event.php?event='.$_POST['event'], 3, $rediredtMessage, false); |
|
| 76 | 76 | } else { |
| 77 | 77 | redirect_header('index.php', 3, _NOPERM, false); |
| 78 | 78 | } |
