Commit 573ca3ea authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4629 (Downloads coming as downloadfile.bin instead of proper... 

Fixed MANTIS-4629 (Downloads coming as downloadfile.bin instead of proper filename, in Facebook's inbuilt browser)
parent c551cf9a

sources/attachments.php

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ function attachments_script() 
    $mime_type = get_mime_type($extension, has_privilege($myrow['a_member_id'], 'comcode_dangerous'));



    // Send header

    header('Content-Type: ' . $mime_type . '; authoritative=true;');

    header('Content-Type: ' . $mime_type . '; authoritative=true');

    if ((strpos($original_filename, "\n") !== false) || (strpos($original_filename, "\r") !== false)) {

        log_hack_attack_and_exit('HEADER_SPLIT_HACK');

    }

sources/downloads2.php

+2 −2
Original line number Diff line number Diff line
@@ -170,10 +170,10 @@ function dload_script() 
    require_code('mime_types');

    $mime_type = get_mime_type(get_file_extension($myrow['original_filename']), false);

    if (get_option('immediate_downloads') == '1' && $mime_type != 'application/octet-stream') {

        header('Content-Type: ' . $mime_type . '; authoritative=true;');

        header('Content-Type: ' . $mime_type . '; authoritative=true');

        header('Content-Disposition: inline; filename="' . escape_header($myrow['original_filename'], true) . '"');

    } else {

        header('Content-Type: application/octet-stream' . '; authoritative=true;');

        header('Content-Type: application/octet-stream' . '; authoritative=true');

        header('Content-Disposition: attachment; filename="' . escape_header($myrow['original_filename'], true) . '"');

    }

sources/fields.php

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ function catalogue_file_script() 


    // Send header

    require_code('mime_types');

    header('Content-Type: ' . get_mime_type(get_file_extension($original_filename), false) . '; authoritative=true;');

    header('Content-Type: ' . get_mime_type(get_file_extension($original_filename), false) . '; authoritative=true');

    if ($original_filename !== null) {

        $original_filename = filter_naughty($original_filename);
@@ -122,7 +122,7 @@ function catalogue_file_script() 
        if (get_option('immediate_downloads', true) === '1' || get_param_integer('inline', 0) == 1) {

            require_code('mime_types');

            $as_admin = ($submitter !== null) && (has_privilege($submitter, 'comcode_dangerous'));

            header('Content-Type: ' . get_mime_type(get_file_extension($original_filename), $as_admin) . '; authoritative=true;');

            header('Content-Type: ' . get_mime_type(get_file_extension($original_filename), $as_admin) . '; authoritative=true');

            header('Content-Disposition: inline; filename="' . escape_header($original_filename, true) . '"');

        } else {

            header('Content-Disposition: attachment; filename="' . escape_header($original_filename, true) . '"');