diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-08-26 18:56:09 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-08-26 18:56:09 +0200 |
| commit | d0ce637251da211b2e969f7a173d3bde97b0894b (patch) | |
| tree | fcb6c80b5b1c7c21d212bd5f51b7eb93d71cc092 /phpBB/includes/functions_display.php | |
| parent | 18039cfa6af73d6582145023b6a3e67788d7a948 (diff) | |
| parent | e1a4aa3ea255874660d31e13c0b4cadc8993ef4f (diff) | |
| download | forums-d0ce637251da211b2e969f7a173d3bde97b0894b.tar forums-d0ce637251da211b2e969f7a173d3bde97b0894b.tar.gz forums-d0ce637251da211b2e969f7a173d3bde97b0894b.tar.bz2 forums-d0ce637251da211b2e969f7a173d3bde97b0894b.tar.xz forums-d0ce637251da211b2e969f7a173d3bde97b0894b.zip | |
Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop
* Fyorl/feature/attach-dl: (75 commits)
[feature/attach-dl] Removed the use of some abbreviations
[feature/attach-dl] Changed $files_added checks
[feature/attach-dl] Renamed $post_id to $post_msg_id
[feature/attach-dl] Fixed a comment
[feature/attach-dl] Optimised an sql query
[feature/attach-dl] Fixed the logic in an sql statement
[feature/attch-dl] $forum_id cast to int
[feature/attach-dl] Fixed $file_added to $files_added
[feature/attach-dl] Moved definition of $archive_name
[feature/attach-dl] Swapped the order of an if statement
[feature/attach-dl] Cast variables to int
[feature/attach-dl] Added $archive_path
[feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
[feature/attach-dl] Renamed $count to $files_added
[feature/attach-dl] Removed sprintf() use
[feature/attach-dl] Removed need for array_keys()
[feature/attach-dl] Added multiple attachment downloads to PMs
[feature/attach-dl] Removed reliance on current($row)
[feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
[feature/attach-dl] Moved PM authentication handling into own function
...
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 66e8459c18..881c95907b 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1387,3 +1387,38 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $ $avatar_img .= $avatar; return '<img src="' . (str_replace(' ', '%20', $avatar_img)) . '" width="' . $avatar_width . '" height="' . $avatar_height . '" alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />'; } + +/** +* Generate a list of archive types available for compressing attachments +* +* @param string $param_key Either topic_id or post_id +* @param string $param_val The value of the topic or post id +* @param string $phpbb_root_path The root path of the phpBB installation +* @param string $phpEx The PHP extension +* +* @return array Array containing the link and the type of compression +*/ +function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $phpEx) +{ + if (!class_exists('compress')) + { + require $phpbb_root_path . 'includes/functions_compress.' . $phpEx; + } + + $methods = compress::methods(); + $links = array(); + + foreach ($methods as $method) + { + $type = array_pop(explode('.', $method)); + $params = array('archive' => $method); + $params[$param_key] = $param_val; + + $links[] = array( + 'LINK' => append_sid("{$phpbb_root_path}download/file.$phpEx", $params), + 'TYPE' => $type, + ); + } + + return $links; +} |