Edit File by line

|| ($p_filedescr_list[$j]['type'] == 'virtual_file')

[2500] Fix | Delete

|| ( ($p_filedescr_list[$j]['type'] == 'folder')

[2501] Fix | Delete

&& ( !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])

[2502] Fix | Delete

|| !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))

[2503] Fix | Delete

) {

[2504] Fix | Delete

[2505] Fix | Delete

// ----- Add the file

[2506] Fix | Delete

$v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,

[2507] Fix | Delete

$p_options);

[2508] Fix | Delete

if ($v_result != 1) {

[2509] Fix | Delete

return $v_result;

[2510] Fix | Delete

}

[2511] Fix | Delete

[2512] Fix | Delete

// ----- Store the file infos

[2513] Fix | Delete

$p_result_list[$v_nb++] = $v_header;

[2514] Fix | Delete

}

[2515] Fix | Delete

}

[2516] Fix | Delete

[2517] Fix | Delete

// ----- Return

[2518] Fix | Delete

return $v_result;

[2519] Fix | Delete

}

[2520] Fix | Delete

// --------------------------------------------------------------------------------

[2521] Fix | Delete

[2522] Fix | Delete

// --------------------------------------------------------------------------------

[2523] Fix | Delete

// Function : privAddFile()

[2524] Fix | Delete

// Description :

[2525] Fix | Delete

// Parameters :

[2526] Fix | Delete

// Return Values :

[2527] Fix | Delete

// --------------------------------------------------------------------------------

[2528] Fix | Delete

function privAddFile($p_filedescr, &$p_header, &$p_options)

[2529] Fix | Delete

{

[2530] Fix | Delete

$v_result=1;

[2531] Fix | Delete

[2532] Fix | Delete

// ----- Working variable

[2533] Fix | Delete

$p_filename = $p_filedescr['filename'];

[2534] Fix | Delete

[2535] Fix | Delete

// TBC : Already done in the fileAtt check ... ?

[2536] Fix | Delete

if ($p_filename == "") {

[2537] Fix | Delete

// ----- Error log

[2538] Fix | Delete

PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");

[2539] Fix | Delete

[2540] Fix | Delete

// ----- Return

[2541] Fix | Delete

return PclZip::errorCode();

[2542] Fix | Delete

}

[2543] Fix | Delete

[2544] Fix | Delete

// ----- Look for a stored different filename

[2545] Fix | Delete

/* TBC : Removed

[2546] Fix | Delete

if (isset($p_filedescr['stored_filename'])) {

[2547] Fix | Delete

$v_stored_filename = $p_filedescr['stored_filename'];

[2548] Fix | Delete

}

[2549] Fix | Delete

else {

[2550] Fix | Delete

$v_stored_filename = $p_filedescr['stored_filename'];

[2551] Fix | Delete

}

[2552] Fix | Delete

[2553] Fix | Delete

[2554] Fix | Delete

// ----- Set the file properties

[2555] Fix | Delete

clearstatcache();

[2556] Fix | Delete

$p_header['version'] = 20;

[2557] Fix | Delete

$p_header['version_extracted'] = 10;

[2558] Fix | Delete

$p_header['flag'] = 0;

[2559] Fix | Delete

$p_header['compression'] = 0;

[2560] Fix | Delete

$p_header['crc'] = 0;

[2561] Fix | Delete

$p_header['compressed_size'] = 0;

[2562] Fix | Delete

$p_header['filename_len'] = strlen($p_filename);

[2563] Fix | Delete

$p_header['extra_len'] = 0;

[2564] Fix | Delete

$p_header['disk'] = 0;

[2565] Fix | Delete

$p_header['internal'] = 0;

[2566] Fix | Delete

$p_header['offset'] = 0;

[2567] Fix | Delete

$p_header['filename'] = $p_filename;

[2568] Fix | Delete

// TBC : Removed $p_header['stored_filename'] = $v_stored_filename;

[2569] Fix | Delete

$p_header['stored_filename'] = $p_filedescr['stored_filename'];

[2570] Fix | Delete

$p_header['extra'] = '';

[2571] Fix | Delete

$p_header['status'] = 'ok';

[2572] Fix | Delete

$p_header['index'] = -1;

[2573] Fix | Delete

[2574] Fix | Delete

// ----- Look for regular file

[2575] Fix | Delete

if ($p_filedescr['type']=='file') {

[2576] Fix | Delete

$p_header['external'] = 0x00000000;

[2577] Fix | Delete

$p_header['size'] = filesize($p_filename);

[2578] Fix | Delete

}

[2579] Fix | Delete

[2580] Fix | Delete

// ----- Look for regular folder

[2581] Fix | Delete

else if ($p_filedescr['type']=='folder') {

[2582] Fix | Delete

$p_header['external'] = 0x00000010;

[2583] Fix | Delete

$p_header['mtime'] = filemtime($p_filename);

[2584] Fix | Delete

$p_header['size'] = filesize($p_filename);

[2585] Fix | Delete

}

[2586] Fix | Delete

[2587] Fix | Delete

// ----- Look for virtual file

[2588] Fix | Delete

else if ($p_filedescr['type'] == 'virtual_file') {

[2589] Fix | Delete

$p_header['external'] = 0x00000000;

[2590] Fix | Delete

$p_header['size'] = strlen($p_filedescr['content']);

[2591] Fix | Delete

}

[2592] Fix | Delete

[2593] Fix | Delete

[2594] Fix | Delete

// ----- Look for filetime

[2595] Fix | Delete

if (isset($p_filedescr['mtime'])) {

[2596] Fix | Delete

$p_header['mtime'] = $p_filedescr['mtime'];

[2597] Fix | Delete

}

[2598] Fix | Delete

else if ($p_filedescr['type'] == 'virtual_file') {

[2599] Fix | Delete

$p_header['mtime'] = time();

[2600] Fix | Delete

}

[2601] Fix | Delete

else {

[2602] Fix | Delete

$p_header['mtime'] = filemtime($p_filename);

[2603] Fix | Delete

}

[2604] Fix | Delete

[2605] Fix | Delete

// ------ Look for file comment

[2606] Fix | Delete

if (isset($p_filedescr['comment'])) {

[2607] Fix | Delete

$p_header['comment_len'] = strlen($p_filedescr['comment']);

[2608] Fix | Delete

$p_header['comment'] = $p_filedescr['comment'];

[2609] Fix | Delete

}

[2610] Fix | Delete

else {

[2611] Fix | Delete

$p_header['comment_len'] = 0;

[2612] Fix | Delete

$p_header['comment'] = '';

[2613] Fix | Delete

}

[2614] Fix | Delete

[2615] Fix | Delete

// ----- Look for pre-add callback

[2616] Fix | Delete

if (isset($p_options[PCLZIP_CB_PRE_ADD])) {

[2617] Fix | Delete

[2618] Fix | Delete

// ----- Generate a local information

[2619] Fix | Delete

$v_local_header = array();

[2620] Fix | Delete

$this->privConvertHeader2FileInfo($p_header, $v_local_header);

[2621] Fix | Delete

[2622] Fix | Delete

// ----- Call the callback

[2623] Fix | Delete

// Here I do not use call_user_func() because I need to send a reference to the

[2624] Fix | Delete

// header.

[2625] Fix | Delete

$v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);

[2626] Fix | Delete

if ($v_result == 0) {

[2627] Fix | Delete

// ----- Change the file status

[2628] Fix | Delete

$p_header['status'] = "skipped";

[2629] Fix | Delete

$v_result = 1;

[2630] Fix | Delete

}

[2631] Fix | Delete

[2632] Fix | Delete

// ----- Update the information

[2633] Fix | Delete

// Only some fields can be modified

[2634] Fix | Delete

if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {

[2635] Fix | Delete

$p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);

[2636] Fix | Delete

}

[2637] Fix | Delete

}

[2638] Fix | Delete

[2639] Fix | Delete

// ----- Look for empty stored filename

[2640] Fix | Delete

if ($p_header['stored_filename'] == "") {

[2641] Fix | Delete

$p_header['status'] = "filtered";

[2642] Fix | Delete

}

[2643] Fix | Delete

[2644] Fix | Delete

// ----- Check the path length

[2645] Fix | Delete

if (strlen($p_header['stored_filename']) > 0xFF) {

[2646] Fix | Delete

$p_header['status'] = 'filename_too_long';

[2647] Fix | Delete

}

[2648] Fix | Delete

[2649] Fix | Delete

// ----- Look if no error, or file not skipped

[2650] Fix | Delete

if ($p_header['status'] == 'ok') {

[2651] Fix | Delete

[2652] Fix | Delete

// ----- Look for a file

[2653] Fix | Delete

if ($p_filedescr['type'] == 'file') {

[2654] Fix | Delete

// ----- Look for using temporary file to zip

[2655] Fix | Delete

if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))

[2656] Fix | Delete

&& (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])

[2657] Fix | Delete

|| (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])

[2658] Fix | Delete

&& ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {

[2659] Fix | Delete

$v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);

[2660] Fix | Delete

if ($v_result < PCLZIP_ERR_NO_ERROR) {

[2661] Fix | Delete

return $v_result;

[2662] Fix | Delete

}

[2663] Fix | Delete

}

[2664] Fix | Delete

[2665] Fix | Delete

// ----- Use "in memory" zip algo

[2666] Fix | Delete

else {

[2667] Fix | Delete

[2668] Fix | Delete

// ----- Open the source file

[2669] Fix | Delete

if (($v_file = @fopen($p_filename, "rb")) == 0) {

[2670] Fix | Delete

PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");

[2671] Fix | Delete

return PclZip::errorCode();

[2672] Fix | Delete

}

[2673] Fix | Delete

[2674] Fix | Delete

// ----- Read the file content

[2675] Fix | Delete

if ($p_header['size'] > 0) {

[2676] Fix | Delete

$v_content = @fread($v_file, $p_header['size']);

[2677] Fix | Delete

}

[2678] Fix | Delete

else {

[2679] Fix | Delete

$v_content = '';

[2680] Fix | Delete

}

[2681] Fix | Delete

[2682] Fix | Delete

// ----- Close the file

[2683] Fix | Delete

@fclose($v_file);

[2684] Fix | Delete

[2685] Fix | Delete

// ----- Calculate the CRC

[2686] Fix | Delete

$p_header['crc'] = @crc32($v_content);

[2687] Fix | Delete

[2688] Fix | Delete

// ----- Look for no compression

[2689] Fix | Delete

if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {

[2690] Fix | Delete

// ----- Set header parameters

[2691] Fix | Delete

$p_header['compressed_size'] = $p_header['size'];

[2692] Fix | Delete

$p_header['compression'] = 0;

[2693] Fix | Delete

}

[2694] Fix | Delete

[2695] Fix | Delete

// ----- Look for normal compression

[2696] Fix | Delete

else {

[2697] Fix | Delete

// ----- Compress the content

[2698] Fix | Delete

$v_content = @gzdeflate($v_content);

[2699] Fix | Delete

[2700] Fix | Delete

// ----- Set header parameters

[2701] Fix | Delete

$p_header['compressed_size'] = strlen($v_content);

[2702] Fix | Delete

$p_header['compression'] = 8;

[2703] Fix | Delete

}

[2704] Fix | Delete

[2705] Fix | Delete

// ----- Call the header generation

[2706] Fix | Delete

if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {

[2707] Fix | Delete

@fclose($v_file);

[2708] Fix | Delete

return $v_result;

[2709] Fix | Delete

}

[2710] Fix | Delete

[2711] Fix | Delete

// ----- Write the compressed (or not) content

[2712] Fix | Delete

@fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);

[2713] Fix | Delete

[2714] Fix | Delete

}

[2715] Fix | Delete

[2716] Fix | Delete

}

[2717] Fix | Delete

[2718] Fix | Delete

// ----- Look for a virtual file (a file from string)

[2719] Fix | Delete

else if ($p_filedescr['type'] == 'virtual_file') {

[2720] Fix | Delete

[2721] Fix | Delete

$v_content = $p_filedescr['content'];

[2722] Fix | Delete

[2723] Fix | Delete

// ----- Calculate the CRC

[2724] Fix | Delete

$p_header['crc'] = @crc32($v_content);

[2725] Fix | Delete

[2726] Fix | Delete

// ----- Look for no compression

[2727] Fix | Delete

if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {

[2728] Fix | Delete

// ----- Set header parameters

[2729] Fix | Delete

$p_header['compressed_size'] = $p_header['size'];

[2730] Fix | Delete

$p_header['compression'] = 0;

[2731] Fix | Delete

}

[2732] Fix | Delete

[2733] Fix | Delete

// ----- Look for normal compression

[2734] Fix | Delete

else {

[2735] Fix | Delete

// ----- Compress the content

[2736] Fix | Delete

$v_content = @gzdeflate($v_content);

[2737] Fix | Delete

[2738] Fix | Delete

// ----- Set header parameters

[2739] Fix | Delete

$p_header['compressed_size'] = strlen($v_content);

[2740] Fix | Delete

$p_header['compression'] = 8;

[2741] Fix | Delete

}

[2742] Fix | Delete

[2743] Fix | Delete

// ----- Call the header generation

[2744] Fix | Delete

if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {

[2745] Fix | Delete

@fclose($v_file);

[2746] Fix | Delete

return $v_result;

[2747] Fix | Delete

}

[2748] Fix | Delete

[2749] Fix | Delete

// ----- Write the compressed (or not) content

[2750] Fix | Delete

@fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);

[2751] Fix | Delete

}

[2752] Fix | Delete

[2753] Fix | Delete

// ----- Look for a directory

[2754] Fix | Delete

else if ($p_filedescr['type'] == 'folder') {

[2755] Fix | Delete

// ----- Look for directory last '/'

[2756] Fix | Delete

if (@substr($p_header['stored_filename'], -1) != '/') {

[2757] Fix | Delete

$p_header['stored_filename'] .= '/';

[2758] Fix | Delete

}

[2759] Fix | Delete

[2760] Fix | Delete

// ----- Set the file properties

[2761] Fix | Delete

$p_header['size'] = 0;

[2762] Fix | Delete

//$p_header['external'] = 0x41FF0010; // Value for a folder : to be checked

[2763] Fix | Delete

$p_header['external'] = 0x00000010; // Value for a folder : to be checked

[2764] Fix | Delete

[2765] Fix | Delete

// ----- Call the header generation

[2766] Fix | Delete

if (($v_result = $this->privWriteFileHeader($p_header)) != 1)

[2767] Fix | Delete

{

[2768] Fix | Delete

return $v_result;

[2769] Fix | Delete

}

[2770] Fix | Delete

}

[2771] Fix | Delete

}

[2772] Fix | Delete

[2773] Fix | Delete

// ----- Look for post-add callback

[2774] Fix | Delete

if (isset($p_options[PCLZIP_CB_POST_ADD])) {

[2775] Fix | Delete

[2776] Fix | Delete

// ----- Generate a local information

[2777] Fix | Delete

$v_local_header = array();

[2778] Fix | Delete

$this->privConvertHeader2FileInfo($p_header, $v_local_header);

[2779] Fix | Delete

[2780] Fix | Delete

// ----- Call the callback

[2781] Fix | Delete

// Here I do not use call_user_func() because I need to send a reference to the

[2782] Fix | Delete

// header.

[2783] Fix | Delete

$v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);

[2784] Fix | Delete

if ($v_result == 0) {

[2785] Fix | Delete

// ----- Ignored

[2786] Fix | Delete

$v_result = 1;

[2787] Fix | Delete

}

[2788] Fix | Delete

[2789] Fix | Delete

// ----- Update the information

[2790] Fix | Delete

// Nothing can be modified

[2791] Fix | Delete

}

[2792] Fix | Delete

[2793] Fix | Delete

// ----- Return

[2794] Fix | Delete

return $v_result;

[2795] Fix | Delete

}

[2796] Fix | Delete

// --------------------------------------------------------------------------------

[2797] Fix | Delete

[2798] Fix | Delete

// --------------------------------------------------------------------------------

[2799] Fix | Delete

// Function : privAddFileUsingTempFile()

[2800] Fix | Delete

// Description :

[2801] Fix | Delete

// Parameters :

[2802] Fix | Delete

// Return Values :

[2803] Fix | Delete

// --------------------------------------------------------------------------------

[2804] Fix | Delete

function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)

[2805] Fix | Delete

{

[2806] Fix | Delete

$v_result=PCLZIP_ERR_NO_ERROR;

[2807] Fix | Delete

[2808] Fix | Delete

// ----- Working variable

[2809] Fix | Delete

$p_filename = $p_filedescr['filename'];

[2810] Fix | Delete

[2811] Fix | Delete

[2812] Fix | Delete

// ----- Open the source file

[2813] Fix | Delete

if (($v_file = @fopen($p_filename, "rb")) == 0) {

[2814] Fix | Delete

PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");

[2815] Fix | Delete

return PclZip::errorCode();

[2816] Fix | Delete

}

[2817] Fix | Delete

[2818] Fix | Delete

// ----- Creates a compressed temporary file

[2819] Fix | Delete

$v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';

[2820] Fix | Delete

if (($v_file_compressed = @gzopen($v_gzip_temp_name, "wb")) == 0) {

[2821] Fix | Delete

fclose($v_file);

[2822] Fix | Delete

PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');

[2823] Fix | Delete

return PclZip::errorCode();

[2824] Fix | Delete

}

[2825] Fix | Delete

[2826] Fix | Delete

// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks

[2827] Fix | Delete

$v_size = filesize($p_filename);

[2828] Fix | Delete

while ($v_size != 0) {

[2829] Fix | Delete

$v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

[2830] Fix | Delete

$v_buffer = @fread($v_file, $v_read_size);

[2831] Fix | Delete

//$v_binary_data = pack('a'.$v_read_size, $v_buffer);

[2832] Fix | Delete

@gzputs($v_file_compressed, $v_buffer, $v_read_size);

[2833] Fix | Delete

$v_size -= $v_read_size;

[2834] Fix | Delete

}

[2835] Fix | Delete

[2836] Fix | Delete

// ----- Close the file

[2837] Fix | Delete

@fclose($v_file);

[2838] Fix | Delete

@gzclose($v_file_compressed);

[2839] Fix | Delete

[2840] Fix | Delete

// ----- Check the minimum file size

[2841] Fix | Delete

if (filesize($v_gzip_temp_name) < 18) {

[2842] Fix | Delete

PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');

[2843] Fix | Delete

return PclZip::errorCode();

[2844] Fix | Delete

}

[2845] Fix | Delete

[2846] Fix | Delete

// ----- Extract the compressed attributes

[2847] Fix | Delete

if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {

[2848] Fix | Delete

PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');

[2849] Fix | Delete

return PclZip::errorCode();

[2850] Fix | Delete

}

[2851] Fix | Delete

[2852] Fix | Delete

// ----- Read the gzip file header

[2853] Fix | Delete

$v_binary_data = @fread($v_file_compressed, 10);

[2854] Fix | Delete

$v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);

[2855] Fix | Delete

[2856] Fix | Delete

// ----- Check some parameters

[2857] Fix | Delete

$v_data_header['os'] = bin2hex($v_data_header['os']);

[2858] Fix | Delete

[2859] Fix | Delete

// ----- Read the gzip file footer

[2860] Fix | Delete

@fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);

[2861] Fix | Delete

$v_binary_data = @fread($v_file_compressed, 8);

[2862] Fix | Delete

$v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);

[2863] Fix | Delete

[2864] Fix | Delete

// ----- Set the attributes

[2865] Fix | Delete

$p_header['compression'] = ord($v_data_header['cm']);

[2866] Fix | Delete

//$p_header['mtime'] = $v_data_header['mtime'];

[2867] Fix | Delete

$p_header['crc'] = $v_data_footer['crc'];

[2868] Fix | Delete

$p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;

[2869] Fix | Delete

[2870] Fix | Delete

// ----- Close the file

[2871] Fix | Delete

@fclose($v_file_compressed);

[2872] Fix | Delete

[2873] Fix | Delete

// ----- Call the header generation

[2874] Fix | Delete

if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {

[2875] Fix | Delete

return $v_result;

[2876] Fix | Delete

}

[2877] Fix | Delete

[2878] Fix | Delete

// ----- Add the compressed data

[2879] Fix | Delete

if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)

[2880] Fix | Delete

{

[2881] Fix | Delete

PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');

[2882] Fix | Delete

return PclZip::errorCode();

[2883] Fix | Delete

}

[2884] Fix | Delete

[2885] Fix | Delete

// ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks

[2886] Fix | Delete

fseek($v_file_compressed, 10);

[2887] Fix | Delete

$v_size = $p_header['compressed_size'];

[2888] Fix | Delete

while ($v_size != 0)

[2889] Fix | Delete

{

[2890] Fix | Delete

$v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);

[2891] Fix | Delete

$v_buffer = @fread($v_file_compressed, $v_read_size);

[2892] Fix | Delete

//$v_binary_data = pack('a'.$v_read_size, $v_buffer);

[2893] Fix | Delete

@fwrite($this->zip_fd, $v_buffer, $v_read_size);

[2894] Fix | Delete

$v_size -= $v_read_size;

[2895] Fix | Delete

}

[2896] Fix | Delete

[2897] Fix | Delete

// ----- Close the file

[2898] Fix | Delete

@fclose($v_file_compressed);

[2899] Fix | Delete

[2900] Fix | Delete

// ----- Unlink the temporary file

[2901] Fix | Delete

@unlink($v_gzip_temp_name);

[2902] Fix | Delete

[2903] Fix | Delete

// ----- Return

[2904] Fix | Delete

return $v_result;

[2905] Fix | Delete

}

[2906] Fix | Delete

// --------------------------------------------------------------------------------

[2907] Fix | Delete

[2908] Fix | Delete

// --------------------------------------------------------------------------------

[2909] Fix | Delete

// Function : privCalculateStoredFilename()

[2910] Fix | Delete

// Description :

[2911] Fix | Delete

// Based on file descriptor properties and global options, this method

[2912] Fix | Delete

// calculate the filename that will be stored in the archive.

[2913] Fix | Delete

// Parameters :

[2914] Fix | Delete

// Return Values :

[2915] Fix | Delete

// --------------------------------------------------------------------------------

[2916] Fix | Delete

function privCalculateStoredFilename(&$p_filedescr, &$p_options)

[2917] Fix | Delete

{

[2918] Fix | Delete

$v_result=1;

[2919] Fix | Delete

[2920] Fix | Delete

// ----- Working variables

[2921] Fix | Delete

$p_filename = $p_filedescr['filename'];

[2922] Fix | Delete

if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {

[2923] Fix | Delete

$p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];

[2924] Fix | Delete

}

[2925] Fix | Delete

else {

[2926] Fix | Delete

$p_add_dir = '';

[2927] Fix | Delete

}

[2928] Fix | Delete

if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {

[2929] Fix | Delete

$p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];

[2930] Fix | Delete

}

[2931] Fix | Delete

else {

[2932] Fix | Delete

$p_remove_dir = '';

[2933] Fix | Delete

}

[2934] Fix | Delete

if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {

[2935] Fix | Delete

$p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];

[2936] Fix | Delete

}

[2937] Fix | Delete

else {

[2938] Fix | Delete

$p_remove_all_dir = 0;

[2939] Fix | Delete

}

[2940] Fix | Delete

[2941] Fix | Delete

[2942] Fix | Delete

// ----- Look for full name change

[2943] Fix | Delete

if (isset($p_filedescr['new_full_name'])) {

[2944] Fix | Delete

// ----- Remove drive letter if any

[2945] Fix | Delete

$v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);

[2946] Fix | Delete

}

[2947] Fix | Delete

[2948] Fix | Delete

// ----- Look for path and/or short name change

[2949] Fix | Delete

else {

[2950] Fix | Delete

[2951] Fix | Delete

// ----- Look for short name change

[2952] Fix | Delete

// Its when we change just the filename but not the path

[2953] Fix | Delete

if (isset($p_filedescr['new_short_name'])) {

[2954] Fix | Delete

$v_path_info = pathinfo($p_filename);

[2955] Fix | Delete

$v_dir = '';

[2956] Fix | Delete

if ($v_path_info['dirname'] != '') {

[2957] Fix | Delete

$v_dir = $v_path_info['dirname'].'/';

[2958] Fix | Delete

}

[2959] Fix | Delete

$v_stored_filename = $v_dir.$p_filedescr['new_short_name'];

[2960] Fix | Delete

}

[2961] Fix | Delete

else {

[2962] Fix | Delete

// ----- Calculate the stored filename

[2963] Fix | Delete

$v_stored_filename = $p_filename;

[2964] Fix | Delete

}

[2965] Fix | Delete

[2966] Fix | Delete

// ----- Look for all path to remove

[2967] Fix | Delete

if ($p_remove_all_dir) {

[2968] Fix | Delete

$v_stored_filename = basename($p_filename);

[2969] Fix | Delete

}

[2970] Fix | Delete

// ----- Look for partial path remove

[2971] Fix | Delete

else if ($p_remove_dir != "") {

[2972] Fix | Delete

if (substr($p_remove_dir, -1) != '/')

[2973] Fix | Delete

$p_remove_dir .= "/";

[2974] Fix | Delete

[2975] Fix | Delete

if ( (substr($p_filename, 0, 2) == "./")

[2976] Fix | Delete

|| (substr($p_remove_dir, 0, 2) == "./")) {

[2977] Fix | Delete

[2978] Fix | Delete

if ( (substr($p_filename, 0, 2) == "./")

[2979] Fix | Delete

&& (substr($p_remove_dir, 0, 2) != "./")) {

[2980] Fix | Delete

$p_remove_dir = "./".$p_remove_dir;

[2981] Fix | Delete

}

[2982] Fix | Delete

if ( (substr($p_filename, 0, 2) != "./")

[2983] Fix | Delete

&& (substr($p_remove_dir, 0, 2) == "./")) {

[2984] Fix | Delete

$p_remove_dir = substr($p_remove_dir, 2);

[2985] Fix | Delete

}

[2986] Fix | Delete

}

[2987] Fix | Delete

[2988] Fix | Delete

$v_compare = PclZipUtilPathInclusion($p_remove_dir,

[2989] Fix | Delete

$v_stored_filename);

[2990] Fix | Delete

if ($v_compare > 0) {

[2991] Fix | Delete

if ($v_compare == 2) {

[2992] Fix | Delete

$v_stored_filename = "";

[2993] Fix | Delete

}

[2994] Fix | Delete

else {

[2995] Fix | Delete

$v_stored_filename = substr($v_stored_filename,

[2996] Fix | Delete

strlen($p_remove_dir));

[2997] Fix | Delete

}

[2998] Fix | Delete

}

[2999] Fix | Delete

1 ...4 567 8 ...12