mambax7 /
extcal
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | //require_once __DIR__ . '/config.php'; |
| 27 | 27 | //require_once __DIR__ . '/ExtDateTime.php'; |
| 28 | 28 | //require_once __DIR__ . '/utility.php'; |
| 29 | -require_once __DIR__ . '/../include/constantes.php'; |
|
| 29 | +require_once __DIR__.'/../include/constantes.php'; |
|
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * Class Event. |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | $this->initVar('event_etablissement', XOBJ_DTYPE_INT, 5, false); |
| 68 | 68 | $this->initVar('event_icone', XOBJ_DTYPE_TXTBOX, '', false); |
| 69 | 69 | |
| 70 | - $this->externalKey['cat_id'] = [ |
|
| 70 | + $this->externalKey['cat_id'] = [ |
|
| 71 | 71 | 'className' => 'Category', |
| 72 | 72 | 'getMethodeName' => 'getCat', |
| 73 | 73 | 'keyName' => 'cat', |
@@ -34,8 +34,8 @@ |
||
| 34 | 34 | protected function __construct($debug = false) |
| 35 | 35 | { |
| 36 | 36 | $this->debug = $debug; |
| 37 | - $moduleDirName = basename(dirname(__DIR__)); |
|
| 38 | - parent::__construct($moduleDirName); |
|
| 37 | + $moduleDirName = basename(dirname(__DIR__)); |
|
| 38 | + parent::__construct($moduleDirName); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | /** |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | */ |
| 34 | 34 | protected function __construct($debug = false) |
| 35 | 35 | { |
| 36 | - $this->debug = $debug; |
|
| 36 | + $this->debug = $debug; |
|
| 37 | 37 | $moduleDirName = basename(dirname(__DIR__)); |
| 38 | 38 | parent::__construct($moduleDirName); |
| 39 | 39 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | { |
| 73 | 73 | $ret = false; |
| 74 | 74 | $db = \XoopsDatabaseFactory::getDatabaseConnection(); |
| 75 | - $class = '\\XoopsModules\\' . ucfirst(strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler'; |
|
| 75 | + $class = '\\XoopsModules\\'.ucfirst(strtolower(basename(dirname(__DIR__)))).'\\'.$name.'Handler'; |
|
| 76 | 76 | $ret = new $class($db); |
| 77 | 77 | return $ret; |
| 78 | 78 | } |
@@ -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 | // -------------------------------------------------------------------------------- |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | // ----- Look if the $p_index is really an integer |
| 569 | 569 | if (is_int($p_index)) { |
| 570 | 570 | // ----- Call the extracting fct |
| 571 | - if (1 != ($v_result = PclTarHandleExtractByIndexList($p_tarname, (string)$p_index, $p_list, $p_path, $p_remove_path, $v_tar_mode))) { |
|
| 571 | + if (1 != ($v_result = PclTarHandleExtractByIndexList($p_tarname, (string) $p_index, $p_list, $p_path, $p_remove_path, $v_tar_mode))) { |
|
| 572 | 572 | TrFctEnd(__FILE__, __LINE__, 0, PclErrorString()); |
| 573 | 573 | |
| 574 | 574 | return 0; |
@@ -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 (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) { |
| 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 :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 917 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 918 | 918 | fseek($p_tar, $v_size - 512); |
| 919 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 919 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 920 | 920 | } // ----- Look for unknown type |
| 921 | 921 | else { |
| 922 | 922 | // ----- Error log |
@@ -999,7 +999,7 @@ discard block |
||
| 999 | 999 | // ----- Read new 512 block and write the already read |
| 1000 | 1000 | do { |
| 1001 | 1001 | // ----- Write the already read block |
| 1002 | - $v_binary_data = pack('a512', (string)$v_buffer); |
|
| 1002 | + $v_binary_data = pack('a512', (string) $v_buffer); |
|
| 1003 | 1003 | if ('tar' === $p_mode) { |
| 1004 | 1004 | fwrite($p_tar, $v_binary_data); |
| 1005 | 1005 | } else { |
@@ -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 (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) { |
| 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 :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1318 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1319 | 1319 | fseek($p_tar, $v_size - 512); |
| 1320 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1320 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1321 | 1321 | |
| 1322 | 1322 | // ----- Call the adding fct inside the tar |
| 1323 | 1323 | if (1 == ($v_result = PclTarHandleAddList($p_tar, $p_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir))) { |
@@ -1384,7 +1384,7 @@ discard block |
||
| 1384 | 1384 | // ----- Check the parameters |
| 1385 | 1385 | if (0 == $p_tar) { |
| 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 =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1442 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position before header ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1443 | 1443 | |
| 1444 | 1444 | // ----- Add the file |
| 1445 | 1445 | if (1 != ($v_result = PclTarHandleAddFile($p_tar, $p_filename, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) { |
@@ -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 (1 != ($v_result = PclTarHandleAddFile($p_tar, $v_path . $p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) { |
|
| 1475 | + if (1 != ($v_result = PclTarHandleAddFile($p_tar, $v_path.$p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) { |
|
| 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 =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1497 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.('tar' === $p_mode ? 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 (0 == $p_tar) { |
| 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,12 +1611,12 @@ discard block |
||
| 1611 | 1611 | return $v_result; |
| 1612 | 1612 | } |
| 1613 | 1613 | |
| 1614 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1614 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1615 | 1615 | |
| 1616 | 1616 | // ----- Read the file by 512 octets blocks |
| 1617 | 1617 | $i = 0; |
| 1618 | 1618 | while ('' != ($v_buffer = fread($v_file, 512))) { |
| 1619 | - $v_binary_data = pack('a512', (string)$v_buffer); |
|
| 1619 | + $v_binary_data = pack('a512', (string) $v_buffer); |
|
| 1620 | 1620 | if ('tar' === $p_mode) { |
| 1621 | 1621 | fwrite($p_tar, $v_binary_data); |
| 1622 | 1622 | } else { |
@@ -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 =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1632 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.('tar' === $p_mode ? 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 =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
| 1643 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.('tar' === $p_mode ? 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 ((0 == $p_tar) || ('' == $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 (1 != ($v_result = PclTarHandlerDirCheck($v_dir_to_check))) { |
| 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 && ('5' != $v_header['typeflag'])) { |
| 2142 | 2142 | // ----- Open the destination file in write mode |
| 2143 | 2143 | if (0 == ($v_dest_file = @fopen($v_header['filename'], 'wb'))) { |
| 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 ('tar' === $p_tar_mode) { |
| 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 (0 != ($v_header['size'] % 512)) { |
| 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 ('tar' === $p_tar_mode) { |
| 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 [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2223 | + TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].''); |
|
| 2224 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2225 | 2225 | |
| 2226 | 2226 | // ----- Jump to next file |
| 2227 | 2227 | if ('tar' === $p_tar_mode) { |
@@ -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 [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2233 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2234 | 2234 | } |
| 2235 | 2235 | |
| 2236 | 2236 | if ('tar' === $p_tar_mode) { |
@@ -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 [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2487 | + TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].''); |
|
| 2488 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2489 | 2489 | |
| 2490 | 2490 | // ----- Jump to next file |
| 2491 | 2491 | if ('tar' === $p_tar_mode) { |
@@ -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 [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2497 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2498 | 2498 | } |
| 2499 | 2499 | |
| 2500 | 2500 | if ('tar' === $p_tar_mode) { |
@@ -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 (1 != ($v_result = PclTarHandlerDirCheck($v_dir_to_check))) { |
| 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 && ('5' != $v_header['typeflag'])) { |
| 2656 | 2656 | // ----- Open the destination file in write mode |
| 2657 | 2657 | if (0 == ($v_dest_file = @fopen($v_header['filename'], 'wb'))) { |
| 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 ('tar' === $p_tar_mode) { |
| 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 (0 != ($v_header['size'] % 512)) { |
| 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 ('tar' === $p_tar_mode) { |
| 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 (0 == ($v_temp_tar = @fopen($v_temp_tarname, 'wb'))) { |
| 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 (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) { |
| 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 (0 == $v_len) { |
| 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 ('tar' === $p_tar_mode) { |
@@ -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 ('tar' === $p_tar_mode) { |
| 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 [' . ('tar' === $p_tar_mode ? 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 ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
| 2915 | 2915 | |
| 2916 | 2916 | // ----- Jump to next file |
| 2917 | 2917 | if ('tar' === $p_tar_mode) { |
@@ -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 [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
| 2923 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? 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 (0 == ($v_temp_tar = @fopen($v_temp_tarname, 'wb'))) { |
| 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 (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) { |
| 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 ('tar' === $p_tar_mode) { |
@@ -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 ('tar' === $p_tar_mode) { |
| 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 ('tar' === $p_tar_mode) { |
@@ -3356,10 +3356,10 @@ discard block |
||
| 3356 | 3356 | if (512 != strlen($v_binary_data)) { |
| 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 ('5' == ($v_header['typeflag'] = $v_data['typeflag'])) { |
| 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]"); |
@@ -3481,7 +3481,7 @@ discard block |
||
| 3481 | 3481 | { |
| 3482 | 3482 | $v_result = 1; |
| 3483 | 3483 | |
| 3484 | - TrFctStart(__FILE__, __LINE__, 'PclTarHandlerDirCheck', (string)$p_dir); |
|
| 3484 | + TrFctStart(__FILE__, __LINE__, 'PclTarHandlerDirCheck', (string) $p_dir); |
|
| 3485 | 3485 | |
| 3486 | 3486 | // ----- Check the directory availability |
| 3487 | 3487 | if (('' == $p_dir) || is_dir($p_dir)) { |
@@ -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 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | //Kraven 30 |
| 22 | 22 | // defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
| 23 | 23 | |
| 24 | -require_once XOOPS_ROOT_PATH . '/kernel/object.php'; |
|
| 24 | +require_once XOOPS_ROOT_PATH.'/kernel/object.php'; |
|
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * Class EtablissementHandler. |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | if (!$skipPerm) { |
| 53 | 53 | $this->addCatPermCriteria($criteriaCompo, $user); |
| 54 | 54 | } |
| 55 | - $ret =& $this->getObjects($criteriaCompo); |
|
| 55 | + $ret = & $this->getObjects($criteriaCompo); |
|
| 56 | 56 | if (isset($ret[0])) { |
| 57 | 57 | return $ret[0]; |
| 58 | 58 | } else { |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | $id_as_key = true |
| 76 | 76 | ) //getAll($criteria = null, $asObject = false) |
| 77 | 77 | { |
| 78 | - $rst =& $this->getObjects($criteria, $asObject); |
|
| 78 | + $rst = & $this->getObjects($criteria, $asObject); |
|
| 79 | 79 | if ($asObject) { |
| 80 | 80 | return $rst; |
| 81 | 81 | } else { |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * L'utilisation de ce formulaire d'adminitration suppose |
| 17 | 17 | * que la classe correspondante de la table a été générées avec classGenerator |
| 18 | 18 | **/ |
| 19 | -require_once XOOPS_ROOT_PATH . '/class/uploader.php'; |
|
| 19 | +require_once XOOPS_ROOT_PATH.'/class/uploader.php'; |
|
| 20 | 20 | |
| 21 | 21 | use XoopsModules\Extcal; |
| 22 | 22 | use XoopsModules\Extcal\Common; |
@@ -60,12 +60,12 @@ discard block |
||
| 60 | 60 | public static function loadImg(&$REQUEST, &$event_picture1, &$event_picture2) |
| 61 | 61 | { |
| 62 | 62 | /////////////////////////////////////////////////////////////////////////////// |
| 63 | - $uploaddir_event = XOOPS_ROOT_PATH . '/uploads/extcal/'; |
|
| 64 | - $uploadurl_event = XOOPS_URL . '/uploads/extcal/'; |
|
| 63 | + $uploaddir_event = XOOPS_ROOT_PATH.'/uploads/extcal/'; |
|
| 64 | + $uploadurl_event = XOOPS_URL.'/uploads/extcal/'; |
|
| 65 | 65 | //$picture = ''; |
| 66 | 66 | for ($j = 1; $j < 3; ++$j) { |
| 67 | - $delimg = @$REQUEST['delimg_' . $j . '']; |
|
| 68 | - $delimg = isset($delimg) ? (int)$delimg : 0; |
|
| 67 | + $delimg = @$REQUEST['delimg_'.$j.'']; |
|
| 68 | + $delimg = isset($delimg) ? (int) $delimg : 0; |
|
| 69 | 69 | if (0 == $delimg && !empty($REQUEST['xoops_upload_file'][$j])) { |
| 70 | 70 | $upload = new \XoopsMediaUploader($uploaddir_event, [ |
| 71 | 71 | 'image/gif', |
@@ -88,15 +88,15 @@ discard block |
||
| 88 | 88 | $event_picture2 = $upload->getSavedFileName(); |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | - } elseif (!empty($REQUEST['file' . $j])) { |
|
| 91 | + } elseif (!empty($REQUEST['file'.$j])) { |
|
| 92 | 92 | if (1 == $j) { |
| 93 | - $event_picture1 = $REQUEST['file' . $j]; |
|
| 93 | + $event_picture1 = $REQUEST['file'.$j]; |
|
| 94 | 94 | } elseif (2 == $j) { |
| 95 | - $event_picture2 = $REQUEST['file' . $j]; |
|
| 95 | + $event_picture2 = $REQUEST['file'.$j]; |
|
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | } else { |
| 99 | - $url_event = XOOPS_ROOT_PATH . '/uploads/extcal/' . $REQUEST['file' . $j]; |
|
| 99 | + $url_event = XOOPS_ROOT_PATH.'/uploads/extcal/'.$REQUEST['file'.$j]; |
|
| 100 | 100 | if (1 == $j) { |
| 101 | 101 | $event_picture1 = ''; |
| 102 | 102 | } elseif (2 == $j) { |
@@ -192,17 +192,17 @@ discard block |
||
| 192 | 192 | $select->addOption('', ''); |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | - $select->addOption('year ASC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
| 196 | - $select->addOption('year DESC', _MD_EXTCAL_YEAR . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
| 195 | + $select->addOption('year ASC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
| 196 | + $select->addOption('year DESC', _MD_EXTCAL_YEAR.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
| 197 | 197 | |
| 198 | - $select->addOption('month ASC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
| 199 | - $select->addOption('month DESC', _MD_EXTCAL_MONTH . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
| 198 | + $select->addOption('month ASC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
| 199 | + $select->addOption('month DESC', _MD_EXTCAL_MONTH.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
| 200 | 200 | |
| 201 | - $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
| 202 | - $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
| 201 | + $select->addOption('event_title ASC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
| 202 | + $select->addOption('event_title DESC', _MD_EXTCAL_ALPHA.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
| 203 | 203 | |
| 204 | - $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_ASC); |
|
| 205 | - $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY . ' ' . _MD_EXTCAL_ORDER_BY_DESC); |
|
| 204 | + $select->addOption('cat_name ASC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_ASC); |
|
| 205 | + $select->addOption('cat_name DESC', _MD_EXTCAL_CATEGORY.' '._MD_EXTCAL_ORDER_BY_DESC); |
|
| 206 | 206 | |
| 207 | 207 | return $select; |
| 208 | 208 | } |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | public static function echoDateArray($period) |
| 317 | 317 | { |
| 318 | 318 | foreach ($period as $dt) { |
| 319 | - echo $dt->format("l Y-m-d H:i:s\n") . '<br>'; |
|
| 319 | + echo $dt->format("l Y-m-d H:i:s\n").'<br>'; |
|
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | $txt = print_r($t, true); |
| 335 | - echo '<pre>Number of items: ' . count($t) . "<br>{$txt}</pre>"; |
|
| 335 | + echo '<pre>Number of items: '.count($t)."<br>{$txt}</pre>"; |
|
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | /*****************************************************************/ |
@@ -345,7 +345,7 @@ discard block |
||
| 345 | 345 | if ('' != $msg) { |
| 346 | 346 | echo "<hr>{$msg}<hr>"; |
| 347 | 347 | } |
| 348 | - echo $line . '<br>'; |
|
| 348 | + echo $line.'<br>'; |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | /*****************************************************************/ |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | echo "<hr>{$msg}<hr>"; |
| 373 | 373 | } |
| 374 | 374 | |
| 375 | - echo 'date --->' . $tsName . ' = ' . $ts . ' - ' . date('d-m-Y H:m:s', $ts) . '<br>'; |
|
| 375 | + echo 'date --->'.$tsName.' = '.$ts.' - '.date('d-m-Y H:m:s', $ts).'<br>'; |
|
| 376 | 376 | } |
| 377 | 377 | |
| 378 | 378 | /*****************************************************************/ |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | * |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | -require_once __DIR__ . '/../../include/common.php'; |
|
| 23 | +require_once __DIR__.'/../../include/common.php'; |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * Class Configurator |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | $moduleDirName = basename(dirname(__DIR__)); |
| 46 | 46 | $capsDirName = strtoupper($moduleDirName); |
| 47 | 47 | |
| 48 | - require_once __DIR__ . '/../../include/config.php'; |
|
| 48 | + require_once __DIR__.'/../../include/config.php'; |
|
| 49 | 49 | $config = getConfig(); |
| 50 | 50 | |
| 51 | 51 | $this->name = $config->name; |
@@ -34,19 +34,19 @@ discard block |
||
| 34 | 34 | // $sql .= " WHERE metakey='version' LIMIT 1"; |
| 35 | 35 | // $query = $GLOBALS['xoopsDB']->query($sql); |
| 36 | 36 | // list($meta) = $GLOBALS['xoopsDB']->fetchRow($query); |
| 37 | - $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n"; |
|
| 37 | + $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n"; |
|
| 38 | 38 | $html .= "<div style='padding: 8px;'>\n"; |
| 39 | 39 | // $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n"; |
| 40 | 40 | // $html .= "<br>\n"; |
| 41 | 41 | // $html .= "<br>\n"; |
| 42 | - $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n"; |
|
| 42 | + $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n"; |
|
| 43 | 43 | $html .= "<ul>\n"; |
| 44 | 44 | // |
| 45 | - $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>'; |
|
| 46 | - $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib; |
|
| 45 | + $gdlib = function_exists('gd_info') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>'; |
|
| 46 | + $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib; |
|
| 47 | 47 | if (function_exists('gd_info')) { |
| 48 | 48 | if (true === ($gdlib = gd_info())) { |
| 49 | - $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>'; |
|
| 49 | + $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>'; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | // |
@@ -56,18 +56,18 @@ discard block |
||
| 56 | 56 | // $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>'; |
| 57 | 57 | // $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals; |
| 58 | 58 | // |
| 59 | - $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>'; |
|
| 60 | - $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads; |
|
| 59 | + $downloads = ini_get('file_uploads') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>'; |
|
| 60 | + $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads; |
|
| 61 | 61 | // |
| 62 | - $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n"; |
|
| 63 | - $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n"; |
|
| 64 | - $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n"; |
|
| 62 | + $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.ini_get('upload_max_filesize')."</span></b>\n"; |
|
| 63 | + $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.ini_get('post_max_size')."</span></b>\n"; |
|
| 64 | + $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.ini_get('memory_limit')."</span></b>\n"; |
|
| 65 | 65 | $html .= "</ul>\n"; |
| 66 | 66 | $html .= "<ul>\n"; |
| 67 | - $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n"; |
|
| 67 | + $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n"; |
|
| 68 | 68 | $html .= "</ul>\n"; |
| 69 | 69 | $html .= "<br>\n"; |
| 70 | - $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n"; |
|
| 70 | + $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n"; |
|
| 71 | 71 | $html .= '</div>'; |
| 72 | 72 | $html .= '</fieldset><br>'; |
| 73 | 73 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder)); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>'); |
|
| 36 | + file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>'); |
|
| 37 | 37 | } |
| 38 | 38 | } catch (\Exception $e) { |
| 39 | 39 | echo 'Caught exception: ', $e->getMessage(), "\n", '<br>'; |
@@ -61,10 +61,10 @@ discard block |
||
| 61 | 61 | if (!mkdir($dst) && !is_dir($dst)) { |
| 62 | 62 | while (false !== ($file = readdir($dir))) { |
| 63 | 63 | if (('.' !== $file) && ('..' !== $file)) { |
| 64 | - if (is_dir($src . '/' . $file)) { |
|
| 65 | - self::recurseCopy($src . '/' . $file, $dst . '/' . $file); |
|
| 64 | + if (is_dir($src.'/'.$file)) { |
|
| 65 | + self::recurseCopy($src.'/'.$file, $dst.'/'.$file); |
|
| 66 | 66 | } else { |
| 67 | - copy($src . '/' . $file, $dst . '/' . $file); |
|
| 67 | + copy($src.'/'.$file, $dst.'/'.$file); |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | self::rrmdir($fObj->getPathname()); |
| 160 | 160 | } |
| 161 | 161 | } |
| 162 | - $iterator = null; // clear iterator Obj to close file/directory |
|
| 162 | + $iterator = null; // clear iterator Obj to close file/directory |
|
| 163 | 163 | return rmdir($src); // remove the directory & return results |
| 164 | 164 | } |
| 165 | 165 | |
@@ -192,14 +192,14 @@ discard block |
||
| 192 | 192 | $iterator = new \DirectoryIterator($src); |
| 193 | 193 | foreach ($iterator as $fObj) { |
| 194 | 194 | if ($fObj->isFile()) { |
| 195 | - rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename()); |
|
| 195 | + rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename()); |
|
| 196 | 196 | } elseif (!$fObj->isDot() && $fObj->isDir()) { |
| 197 | 197 | // Try recursively on directory |
| 198 | - self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename()); |
|
| 198 | + self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename()); |
|
| 199 | 199 | // rmdir($fObj->getPath()); // now delete the directory |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | - $iterator = null; // clear iterator Obj to close file/directory |
|
| 202 | + $iterator = null; // clear iterator Obj to close file/directory |
|
| 203 | 203 | return rmdir($src); // remove the directory & return results |
| 204 | 204 | } |
| 205 | 205 | |
@@ -235,9 +235,9 @@ discard block |
||
| 235 | 235 | $iterator = new \DirectoryIterator($src); |
| 236 | 236 | foreach ($iterator as $fObj) { |
| 237 | 237 | if ($fObj->isFile()) { |
| 238 | - copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename()); |
|
| 238 | + copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename()); |
|
| 239 | 239 | } elseif (!$fObj->isDot() && $fObj->isDir()) { |
| 240 | - self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename()); |
|
| 240 | + self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename()); |
|
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | return true; |
@@ -5,8 +5,8 @@ discard block |
||
| 5 | 5 | if (!@include 'Calendar/Calendar.php') { |
| 6 | 6 | define('CALENDAR_ROOT', '../../'); |
| 7 | 7 | } |
| 8 | -require_once CALENDAR_ROOT . 'Month/Weekdays.php'; |
|
| 9 | -require_once CALENDAR_ROOT . 'Util/Uri.php'; |
|
| 8 | +require_once CALENDAR_ROOT.'Month/Weekdays.php'; |
|
| 9 | +require_once CALENDAR_ROOT.'Util/Uri.php'; |
|
| 10 | 10 | |
| 11 | 11 | if (!isset($_GET['jahr'])) { |
| 12 | 12 | $_GET['jahr'] = date('Y'); |
@@ -18,15 +18,15 @@ discard block |
||
| 18 | 18 | // Build the month |
| 19 | 19 | $Calendar = new Calendar_Month_Weekdays($_GET['jahr'], $_GET['monat']); |
| 20 | 20 | |
| 21 | -echo '<p>The current month is ' . $Calendar->thisMonth() . ' of year ' . $Calendar->thisYear() . '</p>'; |
|
| 21 | +echo '<p>The current month is '.$Calendar->thisMonth().' of year '.$Calendar->thisYear().'</p>'; |
|
| 22 | 22 | |
| 23 | 23 | $Uri = new Calendar_Util_Uri('jahr', 'monat'); |
| 24 | 24 | $Uri->setFragments('jahr', 'monat'); |
| 25 | 25 | |
| 26 | 26 | echo '"Vector" URIs<pre>'; |
| 27 | -echo "Previous Uri:\t" . htmlentities($Uri->prev($Calendar, 'month'), ENT_QUOTES | ENT_HTML5) . "\n"; |
|
| 28 | -echo "This Uri:\t" . htmlentities($Uri->this($Calendar, 'month'), ENT_QUOTES | ENT_HTML5) . "\n"; |
|
| 29 | -echo "Next Uri:\t" . htmlentities($Uri->next($Calendar, 'month'), ENT_QUOTES | ENT_HTML5) . "\n"; |
|
| 27 | +echo "Previous Uri:\t".htmlentities($Uri->prev($Calendar, 'month'), ENT_QUOTES | ENT_HTML5)."\n"; |
|
| 28 | +echo "This Uri:\t".htmlentities($Uri->this($Calendar, 'month'), ENT_QUOTES | ENT_HTML5)."\n"; |
|
| 29 | +echo "Next Uri:\t".htmlentities($Uri->next($Calendar, 'month'), ENT_QUOTES | ENT_HTML5)."\n"; |
|
| 30 | 30 | echo '</pre>'; |
| 31 | 31 | |
| 32 | 32 | // Switch to scalar URIs |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | $Uri->scalar = true; // Omit variable names |
| 35 | 35 | |
| 36 | 36 | echo '"Scalar" URIs<pre>'; |
| 37 | -echo "Previous Uri:\t" . $Uri->prev($Calendar, 'month') . "\n"; |
|
| 38 | -echo "This Uri:\t" . $Uri->this($Calendar, 'month') . "\n"; |
|
| 39 | -echo "Next Uri:\t" . $Uri->next($Calendar, 'month') . "\n"; |
|
| 37 | +echo "Previous Uri:\t".$Uri->prev($Calendar, 'month')."\n"; |
|
| 38 | +echo "This Uri:\t".$Uri->this($Calendar, 'month')."\n"; |
|
| 39 | +echo "Next Uri:\t".$Uri->next($Calendar, 'month')."\n"; |
|
| 40 | 40 | echo '</pre>'; |
| 41 | 41 | |
| 42 | 42 | // Restore the vector URIs |
@@ -44,6 +44,6 @@ discard block |
||
| 44 | 44 | $Uri->scalar = false; |
| 45 | 45 | ?> |
| 46 | 46 | <p> |
| 47 | - <a href="<?php echo $_SERVER['PHP_SELF'] . '?' . $Uri->prev($Calendar, 'month'); ?>">Prev</a> : |
|
| 48 | - <a href="<?php echo $_SERVER['PHP_SELF'] . '?' . $Uri->next($Calendar, 'month'); ?>">Next</a> |
|
| 47 | + <a href="<?php echo $_SERVER['PHP_SELF'].'?'.$Uri->prev($Calendar, 'month'); ?>">Prev</a> : |
|
| 48 | + <a href="<?php echo $_SERVER['PHP_SELF'].'?'.$Uri->next($Calendar, 'month'); ?>">Next</a> |
|
| 49 | 49 | </p> |
