@@ -57,22 +57,22 @@ |
||
57 | 57 | * @access private |
58 | 58 | */ |
59 | 59 | private $messages = [// / |
60 | - 'unknow' => [1, 'Console_Getopt: unknown error ID (%s)'], |
|
61 | - // original Console_Getopt error messages |
|
62 | - 'ambigous' => [10, 'Console_Getopt: option --%s is ambiguous'], |
|
63 | - 'mandatory' => [11, 'Console_Getopt: option requires an argument --%s'], |
|
64 | - 'noargument' => [12, 'Console_Getopt: option --%s doesn\'t allow an argument'], |
|
65 | - 'noargs' => [13, 'Console_Getopt: Could not read cmd args (register_argc_argv=Off?)'], |
|
66 | - 'unrecognized' => [14, 'Console_Getopt: unrecognized option --%s'], |
|
67 | - // additional Console_GetoptPlus_Getopt error messages |
|
68 | - 'duplicate' => [20, 'Console_Getopt: duplicate option name definition --%s'], |
|
69 | - 'invalid' => [21, 'Console_Getopt: invalid long option definition %s'], |
|
70 | - 'string' => [22, 'Console_Getopt: short options definition must be a string'], |
|
71 | - 'syntax' => [23, 'Console_Getopt: short options definition syntax error %s'], |
|
72 | - // additional Console_GetoptPlus error messages |
|
73 | - 'missing' => [30, 'Console_GetoptPlus: unknown option name #%s'], |
|
74 | - 'type' => [31, 'Console_GetoptPlus: unknown option type %s'], |
|
75 | - 'convert' => [32, 'Console_GetoptPlus: wrong option name conversion %s'], |
|
60 | + 'unknow' => [1, 'Console_Getopt: unknown error ID (%s)'], |
|
61 | + // original Console_Getopt error messages |
|
62 | + 'ambigous' => [10, 'Console_Getopt: option --%s is ambiguous'], |
|
63 | + 'mandatory' => [11, 'Console_Getopt: option requires an argument --%s'], |
|
64 | + 'noargument' => [12, 'Console_Getopt: option --%s doesn\'t allow an argument'], |
|
65 | + 'noargs' => [13, 'Console_Getopt: Could not read cmd args (register_argc_argv=Off?)'], |
|
66 | + 'unrecognized' => [14, 'Console_Getopt: unrecognized option --%s'], |
|
67 | + // additional Console_GetoptPlus_Getopt error messages |
|
68 | + 'duplicate' => [20, 'Console_Getopt: duplicate option name definition --%s'], |
|
69 | + 'invalid' => [21, 'Console_Getopt: invalid long option definition %s'], |
|
70 | + 'string' => [22, 'Console_Getopt: short options definition must be a string'], |
|
71 | + 'syntax' => [23, 'Console_Getopt: short options definition syntax error %s'], |
|
72 | + // additional Console_GetoptPlus error messages |
|
73 | + 'missing' => [30, 'Console_GetoptPlus: unknown option name #%s'], |
|
74 | + 'type' => [31, 'Console_GetoptPlus: unknown option type %s'], |
|
75 | + 'convert' => [32, 'Console_GetoptPlus: wrong option name conversion %s'], |
|
76 | 76 | ]; |
77 | 77 | |
78 | 78 | /** |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @link http://pear.php.net/package/Console_GetoptPlus |
35 | 35 | */ |
36 | 36 | |
37 | -require_once __DIR__ . '/PEAR/Exception.php'; |
|
37 | +require_once __DIR__.'/PEAR/Exception.php'; |
|
38 | 38 | |
39 | 39 | /** |
40 | 40 | * Handling of error messages and exceptions. |
@@ -154,11 +154,11 @@ |
||
154 | 154 | * @access private |
155 | 155 | */ |
156 | 156 | private $type = [// / |
157 | - false => 'noarg', |
|
158 | - '=' => 'mandatory', |
|
159 | - ':' => 'mandatory', |
|
160 | - '==' => 'optional', |
|
161 | - '::' => 'optional', |
|
157 | + false => 'noarg', |
|
158 | + '=' => 'mandatory', |
|
159 | + ':' => 'mandatory', |
|
160 | + '==' => 'optional', |
|
161 | + '::' => 'optional', |
|
162 | 162 | ]; |
163 | 163 | |
164 | 164 | /** |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | * @link http://pear.php.net/package/Console_GetoptPlus |
35 | 35 | */ |
36 | 36 | |
37 | -require_once __DIR__ . '/Console/GetoptPlus/Exception.php'; |
|
38 | -require_once XOOPS_ROOT_PATH . '/modules/extgallery/class/pear/PEAR.php'; |
|
37 | +require_once __DIR__.'/Console/GetoptPlus/Exception.php'; |
|
38 | +require_once XOOPS_ROOT_PATH.'/modules/extgallery/class/pear/PEAR.php'; |
|
39 | 39 | |
40 | 40 | /** |
41 | 41 | * Parsing of a command line. |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | self::exception('noargument', $name); |
366 | 366 | } |
367 | 367 | // capture the option and its argument |
368 | - $this->options[] = ['--' . $name, $arg]; |
|
368 | + $this->options[] = ['--'.$name, $arg]; |
|
369 | 369 | } |
370 | 370 | |
371 | 371 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | // no addon or padding larger than addon |
96 | 96 | // pads the additional data and adds it to the left of the first line |
97 | 97 | $addon = str_pad($addon, $paddingLength); |
98 | - $firstLine = $addon . array_shift($lines); |
|
98 | + $firstLine = $addon.array_shift($lines); |
|
99 | 99 | } else { |
100 | 100 | // the information on the left is longer than the padding size |
101 | 101 | $firstLine = $addon; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | // extracts the option example value from the description |
164 | 164 | // encloses with angle/square brackets if mandatory/optional |
165 | 165 | $value = ''; |
166 | - empty($option['type']) or 'mandatory' == $option['type'] and $value = '<' . array_shift($desc) . '>' or 'optional' == $option['type'] and $value = '[' . array_shift($desc) . ']'; |
|
166 | + empty($option['type']) or 'mandatory' == $option['type'] and $value = '<'.array_shift($desc).'>' or 'optional' == $option['type'] and $value = '['.array_shift($desc).']'; |
|
167 | 167 | // sets the option names |
168 | 168 | $optionNames = []; |
169 | 169 | isset($option['short']) and $optionNames[] = "-{$option['short']}"; |
@@ -63,10 +63,10 @@ discard block |
||
63 | 63 | // This library should be called by each script before the include of PhpZip |
64 | 64 | // Library in order to limit the potential 'lib' directory path problem. |
65 | 65 | if (!defined('PCLERROR_LIB')) { |
66 | - include $g_pcltar_lib_dir . '/pclerror.lib.php'; |
|
66 | + include $g_pcltar_lib_dir.'/pclerror.lib.php'; |
|
67 | 67 | } |
68 | 68 | if (!defined('PCLTRACE_LIB')) { |
69 | - include $g_pcltar_lib_dir . '/pcltrace.lib.php'; |
|
69 | + include $g_pcltar_lib_dir.'/pcltrace.lib.php'; |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | // -------------------------------------------------------------------------------- |
@@ -812,7 +812,7 @@ discard block |
||
812 | 812 | if (!is_file($p_tarname)) { |
813 | 813 | PclErrorLog(-4, "Archive '$p_tarname' does not exist"); |
814 | 814 | } else { |
815 | - PclErrorLog(-6, "Archive '$p_tarname' has invalid size " . filesize($p_tarname) . '(not a 512 block multiple)'); |
|
815 | + PclErrorLog(-6, "Archive '$p_tarname' has invalid size ".filesize($p_tarname).'(not a 512 block multiple)'); |
|
816 | 816 | } |
817 | 817 | |
818 | 818 | // ----- Return |
@@ -827,7 +827,7 @@ discard block |
||
827 | 827 | if (!is_file($p_tarname_add)) { |
828 | 828 | PclErrorLog(-4, "Archive '$p_tarname_add' does not exist"); |
829 | 829 | } else { |
830 | - PclErrorLog(-6, "Archive '$p_tarname_add' has invalid size " . filesize($p_tarname_add) . '(not a 512 block multiple)'); |
|
830 | + PclErrorLog(-6, "Archive '$p_tarname_add' has invalid size ".filesize($p_tarname_add).'(not a 512 block multiple)'); |
|
831 | 831 | } |
832 | 832 | |
833 | 833 | // ----- Return |
@@ -850,7 +850,7 @@ discard block |
||
850 | 850 | } |
851 | 851 | |
852 | 852 | // ----- Open a temporary file in write mode |
853 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
853 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
854 | 854 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
855 | 855 | if (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) { |
856 | 856 | // ----- Close tar file |
@@ -902,9 +902,9 @@ discard block |
||
902 | 902 | } |
903 | 903 | |
904 | 904 | // ----- Go to the beginning of last block |
905 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
905 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
906 | 906 | fseek($p_tar, $v_size - 512); |
907 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
907 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
908 | 908 | } // ----- Look for unknown type |
909 | 909 | else { |
910 | 910 | // ----- Error log |
@@ -1190,7 +1190,7 @@ discard block |
||
1190 | 1190 | if (!is_file($p_tarname)) { |
1191 | 1191 | PclErrorLog(-4, "Archive '$p_tarname' does not exist"); |
1192 | 1192 | } else { |
1193 | - PclErrorLog(-6, "Archive '$p_tarname' has invalid size " . filesize($p_tarname) . '(not a 512 block multiple)'); |
|
1193 | + PclErrorLog(-6, "Archive '$p_tarname' has invalid size ".filesize($p_tarname).'(not a 512 block multiple)'); |
|
1194 | 1194 | } |
1195 | 1195 | |
1196 | 1196 | // ----- Return |
@@ -1213,7 +1213,7 @@ discard block |
||
1213 | 1213 | } |
1214 | 1214 | |
1215 | 1215 | // ----- Open a temporary file in write mode |
1216 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
1216 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
1217 | 1217 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
1218 | 1218 | if (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) { |
1219 | 1219 | // ----- Close tar file |
@@ -1297,9 +1297,9 @@ discard block |
||
1297 | 1297 | } |
1298 | 1298 | |
1299 | 1299 | // ----- Go to the beginning of last block |
1300 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position before :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1300 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position before :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1301 | 1301 | fseek($p_tar, $v_size - 512); |
1302 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position after :' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1302 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position after :'.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1303 | 1303 | |
1304 | 1304 | // ----- Call the adding fct inside the tar |
1305 | 1305 | if (1 == ($v_result = PclTarHandleAddList($p_tar, $p_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir))) { |
@@ -1365,7 +1365,7 @@ discard block |
||
1365 | 1365 | // ----- Check the parameters |
1366 | 1366 | if (0 == $p_tar) { |
1367 | 1367 | // ----- Error log |
1368 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
1368 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
1369 | 1369 | |
1370 | 1370 | // ----- Return |
1371 | 1371 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1420,7 +1420,7 @@ discard block |
||
1420 | 1420 | return PclErrorCode(); |
1421 | 1421 | } |
1422 | 1422 | |
1423 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position before header =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1423 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position before header ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1424 | 1424 | |
1425 | 1425 | // ----- Add the file |
1426 | 1426 | if (1 != ($v_result = PclTarHandleAddFile($p_tar, $p_filename, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) { |
@@ -1439,7 +1439,7 @@ discard block |
||
1439 | 1439 | |
1440 | 1440 | // ----- Look for path |
1441 | 1441 | if ('.' !== $p_filename) { |
1442 | - $v_path = $p_filename . '/'; |
|
1442 | + $v_path = $p_filename.'/'; |
|
1443 | 1443 | } else { |
1444 | 1444 | $v_path = ''; |
1445 | 1445 | } |
@@ -1450,11 +1450,11 @@ discard block |
||
1450 | 1450 | $p_hitem = readdir($p_hdir); // '..' directory |
1451 | 1451 | while (false !== ($p_hitem = readdir($p_hdir))) { |
1452 | 1452 | // ----- Look for a file |
1453 | - if (is_file($v_path . $p_hitem)) { |
|
1454 | - TrFctMessage(__FILE__, __LINE__, 4, "Add the file '" . $v_path . $p_hitem . "'"); |
|
1453 | + if (is_file($v_path.$p_hitem)) { |
|
1454 | + TrFctMessage(__FILE__, __LINE__, 4, "Add the file '".$v_path.$p_hitem."'"); |
|
1455 | 1455 | |
1456 | 1456 | // ----- Add the file |
1457 | - if (1 != ($v_result = PclTarHandleAddFile($p_tar, $v_path . $p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) { |
|
1457 | + if (1 != ($v_result = PclTarHandleAddFile($p_tar, $v_path.$p_hitem, $p_mode, $v_header, $p_add_dir, $p_remove_dir))) { |
|
1458 | 1458 | // ----- Return status |
1459 | 1459 | TrFctEnd(__FILE__, __LINE__, $v_result); |
1460 | 1460 | |
@@ -1465,10 +1465,10 @@ discard block |
||
1465 | 1465 | $p_list_detail[$v_nb++] = $v_header; |
1466 | 1466 | } // ----- Recursive call to PclTarHandleAddFile() |
1467 | 1467 | else { |
1468 | - TrFctMessage(__FILE__, __LINE__, 4, "'" . $v_path . $p_hitem . "' is a directory"); |
|
1468 | + TrFctMessage(__FILE__, __LINE__, 4, "'".$v_path.$p_hitem."' is a directory"); |
|
1469 | 1469 | |
1470 | 1470 | // ----- Need an array as parameter |
1471 | - $p_temp_list[0] = $v_path . $p_hitem; |
|
1471 | + $p_temp_list[0] = $v_path.$p_hitem; |
|
1472 | 1472 | $v_result = PclTarHandleAddList($p_tar, $p_temp_list, $p_mode, $p_list_detail, $p_add_dir, $p_remove_dir); |
1473 | 1473 | } |
1474 | 1474 | } |
@@ -1476,7 +1476,7 @@ discard block |
||
1476 | 1476 | // ----- Free memory for the recursive loop |
1477 | 1477 | unset($p_temp_list, $p_hdir, $p_hitem); |
1478 | 1478 | } else { |
1479 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1479 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1480 | 1480 | } |
1481 | 1481 | } |
1482 | 1482 | |
@@ -1512,7 +1512,7 @@ discard block |
||
1512 | 1512 | // ----- Check the parameters |
1513 | 1513 | if (0 == $p_tar) { |
1514 | 1514 | // ----- Error log |
1515 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
1515 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
1516 | 1516 | |
1517 | 1517 | // ----- Return |
1518 | 1518 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1540,7 +1540,7 @@ discard block |
||
1540 | 1540 | |
1541 | 1541 | if (('./' === substr($p_filename, 0, 2)) || ('./' === substr($p_remove_dir, 0, 2))) { |
1542 | 1542 | if (('./' === substr($p_filename, 0, 2)) && ('./' !== substr($p_remove_dir, 0, 2))) { |
1543 | - $p_remove_dir = './' . $p_remove_dir; |
|
1543 | + $p_remove_dir = './'.$p_remove_dir; |
|
1544 | 1544 | } |
1545 | 1545 | if (('./' !== substr($p_filename, 0, 2)) && ('./' === substr($p_remove_dir, 0, 2))) { |
1546 | 1546 | $p_remove_dir = substr($p_remove_dir, 2); |
@@ -1554,9 +1554,9 @@ discard block |
||
1554 | 1554 | } |
1555 | 1555 | if ('' != $p_add_dir) { |
1556 | 1556 | if ('/' === substr($p_add_dir, -1)) { |
1557 | - $v_stored_filename = $p_add_dir . $v_stored_filename; |
|
1557 | + $v_stored_filename = $p_add_dir.$v_stored_filename; |
|
1558 | 1558 | } else { |
1559 | - $v_stored_filename = $p_add_dir . '/' . $v_stored_filename; |
|
1559 | + $v_stored_filename = $p_add_dir.'/'.$v_stored_filename; |
|
1560 | 1560 | } |
1561 | 1561 | TrFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_filename' = '$v_stored_filename'"); |
1562 | 1562 | } |
@@ -1593,7 +1593,7 @@ discard block |
||
1593 | 1593 | return $v_result; |
1594 | 1594 | } |
1595 | 1595 | |
1596 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1596 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1597 | 1597 | |
1598 | 1598 | // ----- Read the file by 512 octets blocks |
1599 | 1599 | $i = 0; |
@@ -1611,7 +1611,7 @@ discard block |
||
1611 | 1611 | // ----- Close the file |
1612 | 1612 | fclose($v_file); |
1613 | 1613 | |
1614 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1614 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after blocks ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1615 | 1615 | } // ----- Look for a directory |
1616 | 1616 | else { |
1617 | 1617 | // ----- Call the header generation |
@@ -1622,7 +1622,7 @@ discard block |
||
1622 | 1622 | return $v_result; |
1623 | 1623 | } |
1624 | 1624 | |
1625 | - TrFctMessage(__FILE__, __LINE__, 4, 'File position after header =' . ('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1625 | + TrFctMessage(__FILE__, __LINE__, 4, 'File position after header ='.('tar' === $p_mode ? ftell($p_tar) : gztell($p_tar))); |
|
1626 | 1626 | } |
1627 | 1627 | |
1628 | 1628 | // ----- Return |
@@ -1669,7 +1669,7 @@ discard block |
||
1669 | 1669 | // ----- Check the parameters |
1670 | 1670 | if ((0 == $p_tar) || ('' == $p_filename)) { |
1671 | 1671 | // ----- Error log |
1672 | - PclErrorLog(-3, 'Invalid file descriptor in file ' . __FILE__ . ', line ' . __LINE__); |
|
1672 | + PclErrorLog(-3, 'Invalid file descriptor in file '.__FILE__.', line '.__LINE__); |
|
1673 | 1673 | |
1674 | 1674 | // ----- Return |
1675 | 1675 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -1682,7 +1682,7 @@ discard block |
||
1682 | 1682 | $p_stored_filename = $p_filename; |
1683 | 1683 | } |
1684 | 1684 | $v_reduce_filename = PclTarHandlePathReduction($p_stored_filename); |
1685 | - TrFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_reduce_filename', strlen " . strlen($v_reduce_filename)); |
|
1685 | + TrFctMessage(__FILE__, __LINE__, 2, "Filename (reduced) '$v_reduce_filename', strlen ".strlen($v_reduce_filename)); |
|
1686 | 1686 | |
1687 | 1687 | // ----- Get file info |
1688 | 1688 | $v_info = stat($p_filename); |
@@ -1883,7 +1883,7 @@ discard block |
||
1883 | 1883 | // ----- Check the path |
1884 | 1884 | //if (($p_path == "") || ((substr($p_path, 0, 1) != "/") && (substr($p_path, 0, 3) != "../"))) |
1885 | 1885 | if ('' == $p_path) { |
1886 | - $p_path = './' . $p_path; |
|
1886 | + $p_path = './'.$p_path; |
|
1887 | 1887 | } |
1888 | 1888 | |
1889 | 1889 | // ----- Look for path to remove format (should end by /) |
@@ -1978,28 +1978,28 @@ discard block |
||
1978 | 1978 | continue; |
1979 | 1979 | } |
1980 | 1980 | |
1981 | - TrFctMessage(__FILE__, __LINE__, 2, "Found file '" . $v_header['filename'] . "', size '" . $v_header['size'] . "'"); |
|
1981 | + TrFctMessage(__FILE__, __LINE__, 2, "Found file '".$v_header['filename']."', size '".$v_header['size']."'"); |
|
1982 | 1982 | |
1983 | 1983 | // ----- Look for partial extract |
1984 | 1984 | if ((!$v_extract_all) && is_array($p_file_list)) { |
1985 | - TrFctMessage(__FILE__, __LINE__, 2, 'Look if the file ' . $v_header['filename'] . ' need to be extracted'); |
|
1985 | + TrFctMessage(__FILE__, __LINE__, 2, 'Look if the file '.$v_header['filename'].' need to be extracted'); |
|
1986 | 1986 | |
1987 | 1987 | // ----- By default no unzip if the file is not found |
1988 | 1988 | $v_extract_file = false; |
1989 | 1989 | |
1990 | 1990 | // ----- Look into the file list |
1991 | 1991 | foreach ($p_file_list as $i => $iValue) { |
1992 | - TrFctMessage(__FILE__, __LINE__, 2, 'Compare archived file ' . $v_header['filename'] . " from asked list file '" . $iValue . "'"); |
|
1992 | + TrFctMessage(__FILE__, __LINE__, 2, 'Compare archived file '.$v_header['filename']." from asked list file '".$iValue."'"); |
|
1993 | 1993 | |
1994 | 1994 | // ----- Look if it is a directory |
1995 | 1995 | if ('/' === substr($p_file_list[$i], -1)) { |
1996 | - TrFctMessage(__FILE__, __LINE__, 3, 'Compare file ' . $v_header['filename'] . " with directory '$p_file_list[$i]'"); |
|
1996 | + TrFctMessage(__FILE__, __LINE__, 3, 'Compare file '.$v_header['filename']." with directory '$p_file_list[$i]'"); |
|
1997 | 1997 | |
1998 | 1998 | // ----- Look if the directory is in the filename path |
1999 | 1999 | if ((strlen($v_header['filename']) > strlen($p_file_list[$i])) |
2000 | 2000 | && (substr($v_header['filename'], 0, strlen($p_file_list[$i])) == $iValue)) { |
2001 | 2001 | // ----- The file is in the directory, so extract it |
2002 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . " is in directory '$p_file_list[$i]' : extract it"); |
|
2002 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename']." is in directory '$p_file_list[$i]' : extract it"); |
|
2003 | 2003 | $v_extract_file = true; |
2004 | 2004 | |
2005 | 2005 | // ----- End of loop |
@@ -2008,7 +2008,7 @@ discard block |
||
2008 | 2008 | } // ----- It is a file, so compare the file names |
2009 | 2009 | elseif ($iValue == $v_header['filename']) { |
2010 | 2010 | // ----- File found |
2011 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' should be extracted'); |
|
2011 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' should be extracted'); |
|
2012 | 2012 | $v_extract_file = true; |
2013 | 2013 | |
2014 | 2014 | // ----- End of loop |
@@ -2018,7 +2018,7 @@ discard block |
||
2018 | 2018 | |
2019 | 2019 | // ----- Trace |
2020 | 2020 | if (!$v_extract_file) { |
2021 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' should not be extracted'); |
|
2021 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' should not be extracted'); |
|
2022 | 2022 | } |
2023 | 2023 | } else { |
2024 | 2024 | // ----- All files need to be extracted |
@@ -2030,10 +2030,10 @@ discard block |
||
2030 | 2030 | // ----- Look for path to remove |
2031 | 2031 | if (('' != $p_remove_path) |
2032 | 2032 | && (substr($v_header['filename'], 0, $p_remove_path_size) == $p_remove_path)) { |
2033 | - TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file " . $v_header['filename'] . ''); |
|
2033 | + TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file ".$v_header['filename'].''); |
|
2034 | 2034 | // ----- Remove the path |
2035 | 2035 | $v_header['filename'] = substr($v_header['filename'], $p_remove_path_size); |
2036 | - TrFctMessage(__FILE__, __LINE__, 3, 'Reslting file is ' . $v_header['filename'] . ''); |
|
2036 | + TrFctMessage(__FILE__, __LINE__, 3, 'Reslting file is '.$v_header['filename'].''); |
|
2037 | 2037 | } |
2038 | 2038 | |
2039 | 2039 | // ----- Add the path to the file |
@@ -2047,22 +2047,22 @@ discard block |
||
2047 | 2047 | |
2048 | 2048 | // ----- Add the path |
2049 | 2049 | if ('/' === substr($v_header['filename'], 0, 1)) { |
2050 | - $v_header['filename'] = $p_path . $v_header['filename']; |
|
2050 | + $v_header['filename'] = $p_path.$v_header['filename']; |
|
2051 | 2051 | } else { |
2052 | - $v_header['filename'] = $p_path . '/' . $v_header['filename']; |
|
2052 | + $v_header['filename'] = $p_path.'/'.$v_header['filename']; |
|
2053 | 2053 | } |
2054 | 2054 | } |
2055 | 2055 | |
2056 | 2056 | // ----- Trace |
2057 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
2057 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
2058 | 2058 | |
2059 | 2059 | // ----- Check that the file does not exists |
2060 | 2060 | if (file_exists($v_header['filename'])) { |
2061 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' already exists'); |
|
2061 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' already exists'); |
|
2062 | 2062 | |
2063 | 2063 | // ----- Look if file is a directory |
2064 | 2064 | if (is_dir($v_header['filename'])) { |
2065 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is a directory'); |
|
2065 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is a directory'); |
|
2066 | 2066 | |
2067 | 2067 | // ----- Change the file status |
2068 | 2068 | $v_header['status'] = 'already_a_directory'; |
@@ -2072,7 +2072,7 @@ discard block |
||
2072 | 2072 | $v_extract_file = 0; |
2073 | 2073 | } // ----- Look if file is write protected |
2074 | 2074 | elseif (!is_writable($v_header['filename'])) { |
2075 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is write protected'); |
|
2075 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is write protected'); |
|
2076 | 2076 | |
2077 | 2077 | // ----- Change the file status |
2078 | 2078 | $v_header['status'] = 'write_protected'; |
@@ -2103,7 +2103,7 @@ discard block |
||
2103 | 2103 | } |
2104 | 2104 | |
2105 | 2105 | if (1 != ($v_result = PclTarHandlerDirCheck($v_dir_to_check))) { |
2106 | - TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for ' . $v_header['filename'] . ''); |
|
2106 | + TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for '.$v_header['filename'].''); |
|
2107 | 2107 | |
2108 | 2108 | // ----- Change the file status |
2109 | 2109 | $v_header['status'] = 'path_creation_fail'; |
@@ -2118,7 +2118,7 @@ discard block |
||
2118 | 2118 | if ($v_extract_file && ('5' != $v_header['typeflag'])) { |
2119 | 2119 | // ----- Open the destination file in write mode |
2120 | 2120 | if (0 == ($v_dest_file = @fopen($v_header['filename'], 'wb'))) { |
2121 | - TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening ' . $v_header['filename'] . ' in write binary mode'); |
|
2121 | + TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening '.$v_header['filename'].' in write binary mode'); |
|
2122 | 2122 | |
2123 | 2123 | // ----- Change the file status |
2124 | 2124 | $v_header['status'] = 'write_error'; |
@@ -2131,12 +2131,12 @@ discard block |
||
2131 | 2131 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2132 | 2132 | } |
2133 | 2133 | } else { |
2134 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of ' . $v_header['filename'] . ''); |
|
2134 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of '.$v_header['filename'].''); |
|
2135 | 2135 | |
2136 | 2136 | // ----- Read data |
2137 | 2137 | $n = floor($v_header['size'] / 512); |
2138 | 2138 | for ($i = 0; $i < $n; ++$i) { |
2139 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
2139 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
2140 | 2140 | if ('tar' === $p_tar_mode) { |
2141 | 2141 | $v_content = fread($v_tar, 512); |
2142 | 2142 | } else { |
@@ -2145,7 +2145,7 @@ discard block |
||
2145 | 2145 | fwrite($v_dest_file, $v_content, 512); |
2146 | 2146 | } |
2147 | 2147 | if (0 != ($v_header['size'] % 512)) { |
2148 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read last ' . ($v_header['size'] % 512) . ' bytes in a 512 block'); |
|
2148 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read last '.($v_header['size'] % 512).' bytes in a 512 block'); |
|
2149 | 2149 | if ('tar' === $p_tar_mode) { |
2150 | 2150 | $v_content = fread($v_tar, 512); |
2151 | 2151 | } else { |
@@ -2173,7 +2173,7 @@ discard block |
||
2173 | 2173 | } |
2174 | 2174 | |
2175 | 2175 | // ----- Error log |
2176 | - 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."); |
|
2176 | + 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."); |
|
2177 | 2177 | |
2178 | 2178 | // ----- Return |
2179 | 2179 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -2184,7 +2184,7 @@ discard block |
||
2184 | 2184 | // ----- Trace |
2185 | 2185 | TrFctMessage(__FILE__, __LINE__, 2, 'Extraction done'); |
2186 | 2186 | } else { |
2187 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file ' . $v_header['filename'] . ' skipped.'); |
|
2187 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file '.$v_header['filename'].' skipped.'); |
|
2188 | 2188 | |
2189 | 2189 | // ----- Jump to next file |
2190 | 2190 | TrFctMessage(__FILE__, __LINE__, 2, 'Jump to next file'); |
@@ -2197,8 +2197,8 @@ discard block |
||
2197 | 2197 | } // ----- Look for file that is not to be unzipped |
2198 | 2198 | else { |
2199 | 2199 | // ----- Trace |
2200 | - TrFctMessage(__FILE__, __LINE__, 2, 'Jump file ' . $v_header['filename'] . ''); |
|
2201 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2200 | + TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].''); |
|
2201 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2202 | 2202 | |
2203 | 2203 | // ----- Jump to next file |
2204 | 2204 | if ('tar' === $p_tar_mode) { |
@@ -2207,7 +2207,7 @@ discard block |
||
2207 | 2207 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2208 | 2208 | } |
2209 | 2209 | |
2210 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2210 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2211 | 2211 | } |
2212 | 2212 | |
2213 | 2213 | if ('tar' === $p_tar_mode) { |
@@ -2218,7 +2218,7 @@ discard block |
||
2218 | 2218 | |
2219 | 2219 | // ----- File name and properties are logged if listing mode or file is extracted |
2220 | 2220 | if ($v_listing || $v_extract_file || $v_extraction_stopped) { |
2221 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
2221 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
2222 | 2222 | |
2223 | 2223 | // ----- Log extracted files |
2224 | 2224 | if (($v_file_dir = dirname($v_header['filename'])) == $v_header['filename']) { |
@@ -2292,7 +2292,7 @@ discard block |
||
2292 | 2292 | if (('' == $p_path) |
2293 | 2293 | || (('/' !== substr($p_path, 0, 1)) && ('../' !== substr($p_path, 0, 3)) |
2294 | 2294 | && ('./' !== substr($p_path, 0, 2)))) { |
2295 | - $p_path = './' . $p_path; |
|
2295 | + $p_path = './'.$p_path; |
|
2296 | 2296 | } |
2297 | 2297 | |
2298 | 2298 | // ----- Look for path to remove format (should end by /) |
@@ -2437,14 +2437,14 @@ discard block |
||
2437 | 2437 | continue; |
2438 | 2438 | } |
2439 | 2439 | |
2440 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
2440 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
2441 | 2441 | |
2442 | 2442 | // ----- Look if file is in the range to be extracted |
2443 | 2443 | if (($p_index_current >= $p_index_start) && ($p_index_current <= $p_index_stop)) { |
2444 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' is in the range to be extracted'); |
|
2444 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' is in the range to be extracted'); |
|
2445 | 2445 | $v_extract_file = true; |
2446 | 2446 | } else { |
2447 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' is out of the range'); |
|
2447 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' is out of the range'); |
|
2448 | 2448 | $v_extract_file = false; |
2449 | 2449 | } |
2450 | 2450 | |
@@ -2459,8 +2459,8 @@ discard block |
||
2459 | 2459 | } // ----- Look for file that is not to be extracted |
2460 | 2460 | else { |
2461 | 2461 | // ----- Trace |
2462 | - TrFctMessage(__FILE__, __LINE__, 2, 'Jump file ' . $v_header['filename'] . ''); |
|
2463 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2462 | + TrFctMessage(__FILE__, __LINE__, 2, 'Jump file '.$v_header['filename'].''); |
|
2463 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2464 | 2464 | |
2465 | 2465 | // ----- Jump to next file |
2466 | 2466 | if ('tar' === $p_tar_mode) { |
@@ -2469,7 +2469,7 @@ discard block |
||
2469 | 2469 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2470 | 2470 | } |
2471 | 2471 | |
2472 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2472 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2473 | 2473 | } |
2474 | 2474 | |
2475 | 2475 | if ('tar' === $p_tar_mode) { |
@@ -2480,7 +2480,7 @@ discard block |
||
2480 | 2480 | |
2481 | 2481 | // ----- File name and properties are logged if listing mode or file is extracted |
2482 | 2482 | if ($v_extract_file) { |
2483 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
2483 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
2484 | 2484 | |
2485 | 2485 | // ----- Log extracted files |
2486 | 2486 | if (($v_file_dir = dirname($v_header['filename'])) == $v_header['filename']) { |
@@ -2537,10 +2537,10 @@ discard block |
||
2537 | 2537 | |
2538 | 2538 | // ----- Look for path to remove |
2539 | 2539 | if (('' != $p_remove_path) && (substr($v_header['filename'], 0, $p_remove_path_size) == $p_remove_path)) { |
2540 | - TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file " . $v_header['filename'] . ''); |
|
2540 | + TrFctMessage(__FILE__, __LINE__, 3, "Found path '$p_remove_path' to remove in file ".$v_header['filename'].''); |
|
2541 | 2541 | // ----- Remove the path |
2542 | 2542 | $v_header['filename'] = substr($v_header['filename'], $p_remove_path_size); |
2543 | - TrFctMessage(__FILE__, __LINE__, 3, 'Resulting file is ' . $v_header['filename'] . ''); |
|
2543 | + TrFctMessage(__FILE__, __LINE__, 3, 'Resulting file is '.$v_header['filename'].''); |
|
2544 | 2544 | } |
2545 | 2545 | |
2546 | 2546 | // ----- Add the path to the file |
@@ -2554,22 +2554,22 @@ discard block |
||
2554 | 2554 | |
2555 | 2555 | // ----- Add the path |
2556 | 2556 | if ('/' === substr($v_header['filename'], 0, 1)) { |
2557 | - $v_header['filename'] = $p_path . $v_header['filename']; |
|
2557 | + $v_header['filename'] = $p_path.$v_header['filename']; |
|
2558 | 2558 | } else { |
2559 | - $v_header['filename'] = $p_path . '/' . $v_header['filename']; |
|
2559 | + $v_header['filename'] = $p_path.'/'.$v_header['filename']; |
|
2560 | 2560 | } |
2561 | 2561 | } |
2562 | 2562 | |
2563 | 2563 | // ----- Trace |
2564 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
2564 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extracting file (with path) '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
2565 | 2565 | |
2566 | 2566 | // ----- Check that the file does not exists |
2567 | 2567 | if (file_exists($v_header['filename'])) { |
2568 | - TrFctMessage(__FILE__, __LINE__, 2, 'File ' . $v_header['filename'] . ' already exists'); |
|
2568 | + TrFctMessage(__FILE__, __LINE__, 2, 'File '.$v_header['filename'].' already exists'); |
|
2569 | 2569 | |
2570 | 2570 | // ----- Look if file is a directory |
2571 | 2571 | if (is_dir($v_header['filename'])) { |
2572 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is a directory'); |
|
2572 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is a directory'); |
|
2573 | 2573 | |
2574 | 2574 | // ----- Change the file status |
2575 | 2575 | $v_header['status'] = 'already_a_directory'; |
@@ -2579,7 +2579,7 @@ discard block |
||
2579 | 2579 | $v_extract_file = 0; |
2580 | 2580 | } // ----- Look if file is write protected |
2581 | 2581 | elseif (!is_writable($v_header['filename'])) { |
2582 | - TrFctMessage(__FILE__, __LINE__, 2, 'Existing file ' . $v_header['filename'] . ' is write protected'); |
|
2582 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is write protected'); |
|
2583 | 2583 | |
2584 | 2584 | // ----- Change the file status |
2585 | 2585 | $v_header['status'] = 'write_protected'; |
@@ -2589,7 +2589,7 @@ discard block |
||
2589 | 2589 | $v_extract_file = 0; |
2590 | 2590 | } // ----- Look if the extracted file is older |
2591 | 2591 | elseif (filemtime($v_header['filename']) > $v_header['mtime']) { |
2592 | - 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']) . ')'); |
|
2592 | + TrFctMessage(__FILE__, __LINE__, 2, 'Existing file '.$v_header['filename'].' is newer ('.date('l dS of F Y h:i:s A', filemtime($v_header['filename'])).') than the extracted file ('.date('l dS of F Y h:i:s A', $v_header['mtime']).')'); |
|
2593 | 2593 | |
2594 | 2594 | // ----- Change the file status |
2595 | 2595 | $v_header['status'] = 'newer_exist'; |
@@ -2609,7 +2609,7 @@ discard block |
||
2609 | 2609 | } |
2610 | 2610 | |
2611 | 2611 | if (1 != ($v_result = PclTarHandlerDirCheck($v_dir_to_check))) { |
2612 | - TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for ' . $v_header['filename'] . ''); |
|
2612 | + TrFctMessage(__FILE__, __LINE__, 2, 'Unable to create path for '.$v_header['filename'].''); |
|
2613 | 2613 | |
2614 | 2614 | // ----- Change the file status |
2615 | 2615 | $v_header['status'] = 'path_creation_fail'; |
@@ -2624,7 +2624,7 @@ discard block |
||
2624 | 2624 | if ($v_extract_file && ('5' != $v_header['typeflag'])) { |
2625 | 2625 | // ----- Open the destination file in write mode |
2626 | 2626 | if (0 == ($v_dest_file = @fopen($v_header['filename'], 'wb'))) { |
2627 | - TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening ' . $v_header['filename'] . ' in write binary mode'); |
|
2627 | + TrFctMessage(__FILE__, __LINE__, 2, 'Error while opening '.$v_header['filename'].' in write binary mode'); |
|
2628 | 2628 | |
2629 | 2629 | // ----- Change the file status |
2630 | 2630 | $v_header['status'] = 'write_error'; |
@@ -2637,12 +2637,12 @@ discard block |
||
2637 | 2637 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2638 | 2638 | } |
2639 | 2639 | } else { |
2640 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of ' . $v_header['filename'] . ''); |
|
2640 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start extraction of '.$v_header['filename'].''); |
|
2641 | 2641 | |
2642 | 2642 | // ----- Read data |
2643 | 2643 | $n = floor($v_header['size'] / 512); |
2644 | 2644 | for ($i = 0; $i < $n; ++$i) { |
2645 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
2645 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
2646 | 2646 | if ('tar' === $p_tar_mode) { |
2647 | 2647 | $v_content = fread($v_tar, 512); |
2648 | 2648 | } else { |
@@ -2651,7 +2651,7 @@ discard block |
||
2651 | 2651 | fwrite($v_dest_file, $v_content, 512); |
2652 | 2652 | } |
2653 | 2653 | if (0 != ($v_header['size'] % 512)) { |
2654 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read last ' . ($v_header['size'] % 512) . ' bytes in a 512 block'); |
|
2654 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read last '.($v_header['size'] % 512).' bytes in a 512 block'); |
|
2655 | 2655 | if ('tar' === $p_tar_mode) { |
2656 | 2656 | $v_content = fread($v_tar, 512); |
2657 | 2657 | } else { |
@@ -2672,7 +2672,7 @@ discard block |
||
2672 | 2672 | clearstatcache(); |
2673 | 2673 | if (filesize($v_header['filename']) != $v_header['size']) { |
2674 | 2674 | // ----- Error log |
2675 | - 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."); |
|
2675 | + 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."); |
|
2676 | 2676 | |
2677 | 2677 | // ----- Return |
2678 | 2678 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -2683,7 +2683,7 @@ discard block |
||
2683 | 2683 | // ----- Trace |
2684 | 2684 | TrFctMessage(__FILE__, __LINE__, 2, 'Extraction done'); |
2685 | 2685 | } else { |
2686 | - TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file ' . $v_header['filename'] . ' skipped.'); |
|
2686 | + TrFctMessage(__FILE__, __LINE__, 2, 'Extraction of file '.$v_header['filename'].' skipped.'); |
|
2687 | 2687 | |
2688 | 2688 | // ----- Jump to next file |
2689 | 2689 | TrFctMessage(__FILE__, __LINE__, 2, 'Jump to next file'); |
@@ -2737,7 +2737,7 @@ discard block |
||
2737 | 2737 | } |
2738 | 2738 | |
2739 | 2739 | // ----- Open a temporary file in write mode |
2740 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
2740 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
2741 | 2741 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
2742 | 2742 | if (0 == ($v_temp_tar = @fopen($v_temp_tarname, 'wb'))) { |
2743 | 2743 | // ----- Close tar file |
@@ -2766,7 +2766,7 @@ discard block |
||
2766 | 2766 | } |
2767 | 2767 | |
2768 | 2768 | // ----- Open a temporary file in write mode |
2769 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
2769 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
2770 | 2770 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
2771 | 2771 | if (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) { |
2772 | 2772 | // ----- Close tar file |
@@ -2823,7 +2823,7 @@ discard block |
||
2823 | 2823 | continue; |
2824 | 2824 | } |
2825 | 2825 | |
2826 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
2826 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
2827 | 2827 | |
2828 | 2828 | // ----- Look for filenames to delete |
2829 | 2829 | for ($i = 0, $v_delete_file = false; ($i < count($p_file_list)) && (!$v_delete_file); ++$i) { |
@@ -2831,12 +2831,12 @@ discard block |
||
2831 | 2831 | // if ($p_file_list[$i] == $v_header['filename']) |
2832 | 2832 | if (($v_len = strcmp($p_file_list[$i], $v_header['filename'])) <= 0) { |
2833 | 2833 | if (0 == $v_len) { |
2834 | - TrFctMessage(__FILE__, __LINE__, 3, 'Found that ' . $v_header['filename'] . ' need to be deleted'); |
|
2834 | + TrFctMessage(__FILE__, __LINE__, 3, 'Found that '.$v_header['filename'].' need to be deleted'); |
|
2835 | 2835 | $v_delete_file = true; |
2836 | 2836 | } else { |
2837 | - TrFctMessage(__FILE__, __LINE__, 3, 'Look if ' . $v_header['filename'] . " is a file in $p_file_list[$i]"); |
|
2837 | + TrFctMessage(__FILE__, __LINE__, 3, 'Look if '.$v_header['filename']." is a file in $p_file_list[$i]"); |
|
2838 | 2838 | if ('/' === substr($v_header['filename'], strlen($p_file_list[$i]), 1)) { |
2839 | - TrFctMessage(__FILE__, __LINE__, 3, '' . $v_header['filename'] . " is a file in $p_file_list[$i]"); |
|
2839 | + TrFctMessage(__FILE__, __LINE__, 3, ''.$v_header['filename']." is a file in $p_file_list[$i]"); |
|
2840 | 2840 | $v_delete_file = true; |
2841 | 2841 | } |
2842 | 2842 | } |
@@ -2845,7 +2845,7 @@ discard block |
||
2845 | 2845 | |
2846 | 2846 | // ----- Copy files that do not need to be deleted |
2847 | 2847 | if (!$v_delete_file) { |
2848 | - TrFctMessage(__FILE__, __LINE__, 2, 'Keep file ' . $v_header['filename'] . ''); |
|
2848 | + TrFctMessage(__FILE__, __LINE__, 2, 'Keep file '.$v_header['filename'].''); |
|
2849 | 2849 | |
2850 | 2850 | // ----- Write the file header |
2851 | 2851 | if ('tar' === $p_tar_mode) { |
@@ -2857,7 +2857,7 @@ discard block |
||
2857 | 2857 | // ----- Write the file data |
2858 | 2858 | $n = ceil($v_header['size'] / 512); |
2859 | 2859 | for ($i = 0; $i < $n; ++$i) { |
2860 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($i + 1)); |
|
2860 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($i + 1)); |
|
2861 | 2861 | if ('tar' === $p_tar_mode) { |
2862 | 2862 | $v_content = fread($v_tar, 512); |
2863 | 2863 | fwrite($v_temp_tar, $v_content, 512); |
@@ -2868,7 +2868,7 @@ discard block |
||
2868 | 2868 | } |
2869 | 2869 | |
2870 | 2870 | // ----- File name and properties are logged if listing mode or file is extracted |
2871 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
2871 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
2872 | 2872 | |
2873 | 2873 | // ----- Add the array describing the file into the list |
2874 | 2874 | $p_list_detail[$v_nb] = $v_header; |
@@ -2879,8 +2879,8 @@ discard block |
||
2879 | 2879 | } // ----- Look for file that is to be deleted |
2880 | 2880 | else { |
2881 | 2881 | // ----- Trace |
2882 | - TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of ' . $v_header['filename'] . ''); |
|
2883 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2882 | + TrFctMessage(__FILE__, __LINE__, 2, 'Start deletion of '.$v_header['filename'].''); |
|
2883 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position avant jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2884 | 2884 | |
2885 | 2885 | // ----- Jump to next file |
2886 | 2886 | if ('tar' === $p_tar_mode) { |
@@ -2889,7 +2889,7 @@ discard block |
||
2889 | 2889 | gzseek($v_tar, gztell($v_tar) + (ceil($v_header['size'] / 512) * 512)); |
2890 | 2890 | } |
2891 | 2891 | |
2892 | - TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump [' . ('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)) . ']'); |
|
2892 | + TrFctMessage(__FILE__, __LINE__, 4, 'Position après jump ['.('tar' === $p_tar_mode ? ftell($v_tar) : gztell($v_tar)).']'); |
|
2893 | 2893 | } |
2894 | 2894 | |
2895 | 2895 | // ----- Look for end of file |
@@ -2975,7 +2975,7 @@ discard block |
||
2975 | 2975 | } |
2976 | 2976 | |
2977 | 2977 | // ----- Open a temporary file in write mode |
2978 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
2978 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
2979 | 2979 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
2980 | 2980 | if (0 == ($v_temp_tar = @fopen($v_temp_tarname, 'wb'))) { |
2981 | 2981 | // ----- Close tar file |
@@ -3004,7 +3004,7 @@ discard block |
||
3004 | 3004 | } |
3005 | 3005 | |
3006 | 3006 | // ----- Open a temporary file in write mode |
3007 | - $v_temp_tarname = uniqid('pcltar-', true) . '.tmp'; |
|
3007 | + $v_temp_tarname = uniqid('pcltar-', true).'.tmp'; |
|
3008 | 3008 | TrFctMessage(__FILE__, __LINE__, 2, "Creating temporary archive file $v_temp_tarname"); |
3009 | 3009 | if (0 == ($v_temp_tar = @gzopen($v_temp_tarname, 'wb'))) { |
3010 | 3010 | // ----- Close tar file |
@@ -3039,9 +3039,9 @@ discard block |
||
3039 | 3039 | } |
3040 | 3040 | if ('' != $p_add_dir) { |
3041 | 3041 | if ('/' === substr($p_add_dir, -1)) { |
3042 | - $v_stored_list[$i] = $p_add_dir . $v_stored_list[$i]; |
|
3042 | + $v_stored_list[$i] = $p_add_dir.$v_stored_list[$i]; |
|
3043 | 3043 | } else { |
3044 | - $v_stored_list[$i] = $p_add_dir . '/' . $v_stored_list[$i]; |
|
3044 | + $v_stored_list[$i] = $p_add_dir.'/'.$v_stored_list[$i]; |
|
3045 | 3045 | } |
3046 | 3046 | TrFctMessage(__FILE__, __LINE__, 3, "Add path '$p_add_dir' in file '$p_file_list[$i]' = '$v_stored_list[$i]'"); |
3047 | 3047 | } |
@@ -3096,7 +3096,7 @@ discard block |
||
3096 | 3096 | continue; |
3097 | 3097 | } |
3098 | 3098 | |
3099 | - TrFctMessage(__FILE__, __LINE__, 2, 'Found file ' . $v_header['filename'] . ", size '" . $v_header['size'] . "'"); |
|
3099 | + TrFctMessage(__FILE__, __LINE__, 2, 'Found file '.$v_header['filename'].", size '".$v_header['size']."'"); |
|
3100 | 3100 | |
3101 | 3101 | // ----- Look for filenames to update |
3102 | 3102 | for ($i = 0, $v_update_file = false, $v_found_file = false; ($i < count($v_stored_list)) && (!$v_update_file); ++$i) { |
@@ -3105,8 +3105,8 @@ discard block |
||
3105 | 3105 | // ----- Compare the file names |
3106 | 3106 | if ($v_stored_list[$i] == $v_header['filename']) { |
3107 | 3107 | TrFctMessage(__FILE__, __LINE__, 3, "File '$v_stored_list[$i]' is present in archive"); |
3108 | - 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]))); |
|
3109 | - TrFctMessage(__FILE__, __LINE__, 3, 'Archived mtime=' . $v_header['mtime'] . ' ' . date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
3108 | + 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]))); |
|
3109 | + TrFctMessage(__FILE__, __LINE__, 3, 'Archived mtime='.$v_header['mtime'].' '.date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
3110 | 3110 | |
3111 | 3111 | // ----- Store found informations |
3112 | 3112 | $v_found_file = true; |
@@ -3124,13 +3124,13 @@ discard block |
||
3124 | 3124 | // ----- Flag the name in order not to add the file at the end |
3125 | 3125 | $v_found_list[$i] = 1; |
3126 | 3126 | } else { |
3127 | - TrFctMessage(__FILE__, __LINE__, 4, "File '$p_file_list[$i]' is not " . $v_header['filename'] . ''); |
|
3127 | + TrFctMessage(__FILE__, __LINE__, 4, "File '$p_file_list[$i]' is not ".$v_header['filename'].''); |
|
3128 | 3128 | } |
3129 | 3129 | } |
3130 | 3130 | |
3131 | 3131 | // ----- Copy files that do not need to be updated |
3132 | 3132 | if (!$v_update_file) { |
3133 | - TrFctMessage(__FILE__, __LINE__, 2, 'Keep file ' . $v_header['filename'] . ''); |
|
3133 | + TrFctMessage(__FILE__, __LINE__, 2, 'Keep file '.$v_header['filename'].''); |
|
3134 | 3134 | |
3135 | 3135 | // ----- Write the file header |
3136 | 3136 | if ('tar' === $p_tar_mode) { |
@@ -3142,7 +3142,7 @@ discard block |
||
3142 | 3142 | // ----- Write the file data |
3143 | 3143 | $n = ceil($v_header['size'] / 512); |
3144 | 3144 | for ($j = 0; $j < $n; ++$j) { |
3145 | - TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number ' . ($j + 1)); |
|
3145 | + TrFctMessage(__FILE__, __LINE__, 3, 'Read complete 512 bytes block number '.($j + 1)); |
|
3146 | 3146 | if ('tar' === $p_tar_mode) { |
3147 | 3147 | $v_content = fread($v_tar, 512); |
3148 | 3148 | fwrite($v_temp_tar, $v_content, 512); |
@@ -3153,7 +3153,7 @@ discard block |
||
3153 | 3153 | } |
3154 | 3154 | |
3155 | 3155 | // ----- File name and properties are logged if listing mode or file is extracted |
3156 | - TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file ' . $v_header['filename'] . ''); |
|
3156 | + TrFctMessage(__FILE__, __LINE__, 2, 'Memorize info about file '.$v_header['filename'].''); |
|
3157 | 3157 | |
3158 | 3158 | // ----- Add the array describing the file into the list |
3159 | 3159 | $p_list_detail[$v_nb] = $v_header; |
@@ -3188,7 +3188,7 @@ discard block |
||
3188 | 3188 | } |
3189 | 3189 | |
3190 | 3190 | // ----- Trace |
3191 | - TrFctMessage(__FILE__, __LINE__, 2, 'Skip old file ' . $v_header['filename'] . ''); |
|
3191 | + TrFctMessage(__FILE__, __LINE__, 2, 'Skip old file '.$v_header['filename'].''); |
|
3192 | 3192 | |
3193 | 3193 | // ----- Jump to next file |
3194 | 3194 | if ('tar' === $p_tar_mode) { |
@@ -3325,10 +3325,10 @@ discard block |
||
3325 | 3325 | if (512 != strlen($v_binary_data)) { |
3326 | 3326 | $v_header['filename'] = ''; |
3327 | 3327 | $v_header['status'] = 'invalid_header'; |
3328 | - TrFctMessage(__FILE__, __LINE__, 2, 'Invalid block size : ' . strlen($v_binary_data)); |
|
3328 | + TrFctMessage(__FILE__, __LINE__, 2, 'Invalid block size : '.strlen($v_binary_data)); |
|
3329 | 3329 | |
3330 | 3330 | // ----- Error log |
3331 | - PclErrorLog(-10, 'Invalid block size : ' . strlen($v_binary_data)); |
|
3331 | + PclErrorLog(-10, 'Invalid block size : '.strlen($v_binary_data)); |
|
3332 | 3332 | |
3333 | 3333 | // ----- Return |
3334 | 3334 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -3358,9 +3358,9 @@ discard block |
||
3358 | 3358 | |
3359 | 3359 | // ----- Extract the checksum for check |
3360 | 3360 | $v_header['checksum'] = octdec(trim($v_data['checksum'])); |
3361 | - TrFctMessage(__FILE__, __LINE__, 3, 'File checksum : ' . $v_header['checksum'] . ''); |
|
3361 | + TrFctMessage(__FILE__, __LINE__, 3, 'File checksum : '.$v_header['checksum'].''); |
|
3362 | 3362 | if ($v_header['checksum'] != $v_checksum) { |
3363 | - TrFctMessage(__FILE__, __LINE__, 2, "File checksum is invalid : $v_checksum calculated, " . $v_header['checksum'] . ' expected'); |
|
3363 | + TrFctMessage(__FILE__, __LINE__, 2, "File checksum is invalid : $v_checksum calculated, ".$v_header['checksum'].' expected'); |
|
3364 | 3364 | |
3365 | 3365 | $v_header['filename'] = ''; |
3366 | 3366 | $v_header['status'] = 'invalid_header'; |
@@ -3375,7 +3375,7 @@ discard block |
||
3375 | 3375 | } |
3376 | 3376 | |
3377 | 3377 | // ----- Error log |
3378 | - PclErrorLog(-13, "Invalid checksum : $v_checksum calculated, " . $v_header['checksum'] . ' expected'); |
|
3378 | + PclErrorLog(-13, "Invalid checksum : $v_checksum calculated, ".$v_header['checksum'].' expected'); |
|
3379 | 3379 | |
3380 | 3380 | // ----- Return |
3381 | 3381 | TrFctEnd(__FILE__, __LINE__, PclErrorCode(), PclErrorString()); |
@@ -3386,22 +3386,22 @@ discard block |
||
3386 | 3386 | |
3387 | 3387 | // ----- Extract the properties |
3388 | 3388 | $v_header['filename'] = trim($v_data['filename']); |
3389 | - TrFctMessage(__FILE__, __LINE__, 2, 'Name : ' . $v_header['filename'] . ''); |
|
3389 | + TrFctMessage(__FILE__, __LINE__, 2, 'Name : '.$v_header['filename'].''); |
|
3390 | 3390 | $v_header['mode'] = octdec(trim($v_data['mode'])); |
3391 | - TrFctMessage(__FILE__, __LINE__, 2, "Mode : '" . decoct($v_header['mode']) . "'"); |
|
3391 | + TrFctMessage(__FILE__, __LINE__, 2, "Mode : '".decoct($v_header['mode'])."'"); |
|
3392 | 3392 | $v_header['uid'] = octdec(trim($v_data['uid'])); |
3393 | - TrFctMessage(__FILE__, __LINE__, 2, "Uid : '" . $v_header['uid'] . "'"); |
|
3393 | + TrFctMessage(__FILE__, __LINE__, 2, "Uid : '".$v_header['uid']."'"); |
|
3394 | 3394 | $v_header['gid'] = octdec(trim($v_data['gid'])); |
3395 | - TrFctMessage(__FILE__, __LINE__, 2, "Gid : '" . $v_header['gid'] . "'"); |
|
3395 | + TrFctMessage(__FILE__, __LINE__, 2, "Gid : '".$v_header['gid']."'"); |
|
3396 | 3396 | $v_header['size'] = octdec(trim($v_data['size'])); |
3397 | - TrFctMessage(__FILE__, __LINE__, 2, "Size : '" . $v_header['size'] . "'"); |
|
3397 | + TrFctMessage(__FILE__, __LINE__, 2, "Size : '".$v_header['size']."'"); |
|
3398 | 3398 | $v_header['mtime'] = octdec(trim($v_data['mtime'])); |
3399 | - TrFctMessage(__FILE__, __LINE__, 2, 'Date : ' . date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
3399 | + TrFctMessage(__FILE__, __LINE__, 2, 'Date : '.date('l dS of F Y h:i:s A', $v_header['mtime'])); |
|
3400 | 3400 | if ('5' == ($v_header['typeflag'] = $v_data['typeflag'])) { |
3401 | 3401 | $v_header['size'] = 0; |
3402 | - TrFctMessage(__FILE__, __LINE__, 2, "Size (folder) : '" . $v_header['size'] . "'"); |
|
3402 | + TrFctMessage(__FILE__, __LINE__, 2, "Size (folder) : '".$v_header['size']."'"); |
|
3403 | 3403 | } |
3404 | - TrFctMessage(__FILE__, __LINE__, 2, 'File typeflag : ' . $v_header['typeflag'] . ''); |
|
3404 | + TrFctMessage(__FILE__, __LINE__, 2, 'File typeflag : '.$v_header['typeflag'].''); |
|
3405 | 3405 | /* ----- All these fields are removed form the header because they do not carry interesting info |
3406 | 3406 | $v_header[link] = trim($v_data[link]); |
3407 | 3407 | TrFctMessage(__FILE__, __LINE__, 2, "Linkname : $v_header[linkname]"); |
@@ -3577,7 +3577,7 @@ discard block |
||
3577 | 3577 | // ----- Ignore only the double '//' in path, |
3578 | 3578 | // but not the first and last '/' |
3579 | 3579 | } else { |
3580 | - $v_result = $v_list[$i] . ($i != (count($v_list) - 1) ? '/' . $v_result : ''); |
|
3580 | + $v_result = $v_list[$i].($i != (count($v_list) - 1) ? '/'.$v_result : ''); |
|
3581 | 3581 | } |
3582 | 3582 | } |
3583 | 3583 | } |
@@ -74,7 +74,7 @@ |
||
74 | 74 | { |
75 | 75 | $ret = false; |
76 | 76 | $db = \XoopsDatabaseFactory::getDatabaseConnection(); |
77 | - $class = '\\XoopsModules\\' . ucfirst(strtolower(basename(dirname(__DIR__)))) . '\\' . $name . 'Handler'; |
|
77 | + $class = '\\XoopsModules\\'.ucfirst(strtolower(basename(dirname(__DIR__)))).'\\'.$name.'Handler'; |
|
78 | 78 | $ret = new $class($db); |
79 | 79 | return $ret; |
80 | 80 | } |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | if (!isset($g_pcl_trace_name)) { |
174 | 174 | $g_pcl_trace_name = $p_name; |
175 | 175 | } else { |
176 | - $g_pcl_trace_name .= ',' . $p_name; |
|
176 | + $g_pcl_trace_name .= ','.$p_name; |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | // ----- Update the function entry |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | echo '<tr>'; |
402 | 402 | echo '<td><table width=100% border=0 cellspacing=0 cellpadding=0><tr>'; |
403 | 403 | $n = ($g_pcl_trace_entries[$i]['index'] + 1) * 10; |
404 | - echo '<td width=' . $n . '><table width=100% border=0 cellspacing=0 cellpadding=0><tr>'; |
|
404 | + echo '<td width='.$n.'><table width=100% border=0 cellspacing=0 cellpadding=0><tr>'; |
|
405 | 405 | |
406 | 406 | for ($j = 0; $j <= $g_pcl_trace_entries[$i]['index']; ++$j) { |
407 | 407 | if ($j == $g_pcl_trace_entries[$i]['index']) { |
@@ -418,25 +418,25 @@ discard block |
||
418 | 418 | echo '<td width=2></td>'; |
419 | 419 | switch ($g_pcl_trace_entries[$i]['type']) { |
420 | 420 | case 1: |
421 | - echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '(' . $g_pcl_trace_entries[$i]['param'] . ')</span></td>'; |
|
421 | + echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'('.$g_pcl_trace_entries[$i]['param'].')</span></td>'; |
|
422 | 422 | break; |
423 | 423 | case 2: |
424 | - echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '()=' . $g_pcl_trace_entries[$i]['param'] . '</span></td>'; |
|
424 | + echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'()='.$g_pcl_trace_entries[$i]['param'].'</span></td>'; |
|
425 | 425 | break; |
426 | 426 | case 3: |
427 | 427 | case 4: |
428 | 428 | echo '<td><table width=100% border=0 cellspacing=0 cellpadding=0><td width=20></td><td>'; |
429 | - echo "<span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['message'] . '</span>'; |
|
429 | + echo "<span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['message'].'</span>'; |
|
430 | 430 | echo '</td></table></td>'; |
431 | 431 | break; |
432 | 432 | default: |
433 | - echo "<td><span style='font-size: x-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['name'] . '(' . $g_pcl_trace_entries[$i]['param'] . ')</span></td>'; |
|
433 | + echo "<td><span style='font-size: x-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['name'].'('.$g_pcl_trace_entries[$i]['param'].')</span></td>'; |
|
434 | 434 | } |
435 | 435 | echo '</tr></table></td>'; |
436 | 436 | echo '<td width=5></td>'; |
437 | - echo "<td><span style='font-size: xx-small; font-family: $v_font; '>" . basename($g_pcl_trace_entries[$i]['file']) . '</span></td>'; |
|
437 | + echo "<td><span style='font-size: xx-small; font-family: $v_font; '>".basename($g_pcl_trace_entries[$i]['file']).'</span></td>'; |
|
438 | 438 | echo '<td width=5></td>'; |
439 | - echo "<td><span style='font-size: xx-small; font-family: $v_font; '>" . $g_pcl_trace_entries[$i]['line'] . '</span></td>'; |
|
439 | + echo "<td><span style='font-size: xx-small; font-family: $v_font; '>".$g_pcl_trace_entries[$i]['line'].'</span></td>'; |
|
440 | 440 | echo '</tr>'; |
441 | 441 | } |
442 | 442 | |
@@ -480,11 +480,11 @@ discard block |
||
480 | 480 | echo '---'; |
481 | 481 | } |
482 | 482 | if (1 == $p_entry['type']) { |
483 | - echo '<b>' . $p_entry['name'] . '</b>(' . $p_entry['param'] . ') : ' . $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>'; |
|
483 | + echo '<b>'.$p_entry['name'].'</b>('.$p_entry['param'].') : '.$p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>'; |
|
484 | 484 | } elseif (2 == $p_entry['type']) { |
485 | - echo '<b>' . $p_entry['name'] . '</b>()=' . $p_entry['param'] . ' : ' . $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>'; |
|
485 | + echo '<b>'.$p_entry['name'].'</b>()='.$p_entry['param'].' : '.$p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>'; |
|
486 | 486 | } else { |
487 | - echo $p_entry['message'] . ' [' . $p_entry['file'] . ', ' . $p_entry['line'] . ']<br>'; |
|
487 | + echo $p_entry['message'].' ['.$p_entry['file'].', '.$p_entry['line'].']<br>'; |
|
488 | 488 | } |
489 | 489 | } |
490 | 490 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | |
21 | 21 | // defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
22 | 22 | |
23 | -require XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php'; |
|
23 | +require XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php'; |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * Class Extgallery\GroupPermForm |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | } |
63 | 63 | // get selected item id(s) for each group |
64 | 64 | $selected = $grouppermHandler->getItemIds($this->_permName, $i, $this->_modid); |
65 | - $ele = new Extgallery\GroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected); |
|
65 | + $ele = new Extgallery\GroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected); |
|
66 | 66 | $ele->setOptionTree($this->_itemTree); |
67 | 67 | $this->addElement($ele); |
68 | 68 | unset($ele); |
@@ -71,20 +71,20 @@ discard block |
||
71 | 71 | $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit')); |
72 | 72 | $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset')); |
73 | 73 | $this->addElement($tray); |
74 | - echo '<h4>' . $this->getTitle() . '</h4>'; |
|
74 | + echo '<h4>'.$this->getTitle().'</h4>'; |
|
75 | 75 | if ($this->_permDesc) { |
76 | - echo $this->_permDesc . '<br><br>'; |
|
76 | + echo $this->_permDesc.'<br><br>'; |
|
77 | 77 | } |
78 | - echo "<form name='" . $this->getName() . '\' id=\'' . $this->getName() . '\' action=\'' . $this->getAction() . '\' method=\'' . $this->getMethod() . '\'' . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n"; |
|
79 | - $elements =& $this->getElements(); |
|
78 | + echo "<form name='".$this->getName().'\' id=\''.$this->getName().'\' action=\''.$this->getAction().'\' method=\''.$this->getMethod().'\''.$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n"; |
|
79 | + $elements = & $this->getElements(); |
|
80 | 80 | $hidden = ''; |
81 | 81 | foreach (array_keys($elements) as $i) { |
82 | 82 | if (!is_object($elements[$i])) { |
83 | 83 | echo $elements[$i]; |
84 | 84 | } elseif (!$elements[$i]->isHidden()) { |
85 | - echo "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption(); |
|
85 | + echo "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption(); |
|
86 | 86 | if ('' != $elements[$i]->getDescription()) { |
87 | - echo '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>'; |
|
87 | + echo '<br><br><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>'; |
|
88 | 88 | } |
89 | 89 | echo "</td>\n<td class='even'>\n"; |
90 | 90 | if (is_a($elements[$i], 'Extgallery\GroupFormCheckBox')) { |
@@ -577,7 +577,7 @@ |
||
577 | 577 | public function Create() |
578 | 578 | { |
579 | 579 | $sText = $this->Mask($this->sCode); |
580 | - $sFile = md5($this->sCode . time()); |
|
580 | + $sFile = md5($this->sCode.time()); |
|
581 | 581 | |
582 | 582 | // create file with flite |
583 | 583 | shell_exec("$this->sFlitePath -t \"$sText\" -o $this->sAudioPath$sFile.wav"); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | if (!in_array($this->handler->keyName, $fields)) { |
48 | 48 | $fields[] = $this->handler->keyName; |
49 | 49 | } |
50 | - $select = '`' . implode('`, `', $fields) . '`'; |
|
50 | + $select = '`'.implode('`, `', $fields).'`'; |
|
51 | 51 | } else { |
52 | 52 | $select = '*'; |
53 | 53 | } |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | $start = null; |
56 | 56 | $sql = "SELECT {$select} FROM `{$this->handler->table}`"; |
57 | 57 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
58 | - $sql .= ' ' . $criteria->renderWhere(); |
|
58 | + $sql .= ' '.$criteria->renderWhere(); |
|
59 | 59 | if ($sort = $criteria->getSort()) { |
60 | - $sql .= " ORDER BY {$sort} " . $criteria->getOrder(); |
|
60 | + $sql .= " ORDER BY {$sort} ".$criteria->getOrder(); |
|
61 | 61 | $orderSet = true; |
62 | 62 | } |
63 | 63 | $limit = $criteria->getLimit(); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | */ |
110 | 110 | public function &getObjects(\CriteriaElement $criteria = null, $id_as_key = false, $as_object = true) |
111 | 111 | { |
112 | - $objects =& $this->getAll($criteria, null, $as_object, $id_as_key); |
|
112 | + $objects = & $this->getAll($criteria, null, $as_object, $id_as_key); |
|
113 | 113 | |
114 | 114 | return $objects; |
115 | 115 | } |
@@ -136,9 +136,9 @@ discard block |
||
136 | 136 | } |
137 | 137 | $sql .= " FROM `{$this->handler->table}`"; |
138 | 138 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
139 | - $sql .= ' ' . $criteria->renderWhere(); |
|
139 | + $sql .= ' '.$criteria->renderWhere(); |
|
140 | 140 | if ($sort = $criteria->getSort()) { |
141 | - $sql .= ' ORDER BY ' . $sort . ' ' . $criteria->getOrder(); |
|
141 | + $sql .= ' ORDER BY '.$sort.' '.$criteria->getOrder(); |
|
142 | 142 | } |
143 | 143 | $limit = $criteria->getLimit(); |
144 | 144 | $start = $criteria->getStart(); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $sql = "SELECT `{$this->handler->keyName}` FROM `{$this->handler->table}`"; |
170 | 170 | $limit = $start = null; |
171 | 171 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
172 | - $sql .= ' ' . $criteria->renderWhere(); |
|
172 | + $sql .= ' '.$criteria->renderWhere(); |
|
173 | 173 | $limit = $criteria->getLimit(); |
174 | 174 | $start = $criteria->getStart(); |
175 | 175 | } |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | $asObject = true |
204 | 204 | ) { |
205 | 205 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
206 | - trigger_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated, please use getAll instead.' . ". Called from {$trace[0]['file']}line {$trace[0]['line']}", E_USER_WARNING); |
|
206 | + trigger_error(__CLASS__.'::'.__FUNCTION__.'() is deprecated, please use getAll instead.'.". Called from {$trace[0]['file']}line {$trace[0]['line']}", E_USER_WARNING); |
|
207 | 207 | if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) { |
208 | 208 | $criteria->setLimit($limit); |
209 | 209 | $criteria->setStart($start); |
@@ -229,14 +229,14 @@ discard block |
||
229 | 229 | public function convertResultSet($result, $id_as_key = false, $as_object = true) |
230 | 230 | { |
231 | 231 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
232 | - trigger_error(__CLASS__ . '::' . __FUNCTION__ . '() is deprecated.' . ". Called from {$trace[0]['file']}line {$trace[0]['line']}", E_USER_WARNING); |
|
232 | + trigger_error(__CLASS__.'::'.__FUNCTION__.'() is deprecated.'.". Called from {$trace[0]['file']}line {$trace[0]['line']}", E_USER_WARNING); |
|
233 | 233 | $ret = []; |
234 | 234 | while (false !== ($myrow = $this->handler->db->fetchArray($result))) { |
235 | 235 | $obj = $this->handler->create(false); |
236 | 236 | $obj->assignVars($myrow); |
237 | 237 | if (!$id_as_key) { |
238 | 238 | if ($as_object) { |
239 | - $ret[] =& $obj; |
|
239 | + $ret[] = & $obj; |
|
240 | 240 | } else { |
241 | 241 | $row = []; |
242 | 242 | $vars = $obj->getVars(); |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | } |
248 | 248 | } else { |
249 | 249 | if ($as_object) { |
250 | - $ret[$myrow[$this->handler->keyName]] =& $obj; |
|
250 | + $ret[$myrow[$this->handler->keyName]] = & $obj; |
|
251 | 251 | } else { |
252 | 252 | $row = []; |
253 | 253 | $vars = $obj->getVars(); |