diff --git a/phpBB/develop/adjust_avatars.php b/phpBB/develop/adjust_avatars.php
new file mode 100755
index 0000000000..87514166ff
--- /dev/null
+++ b/phpBB/develop/adjust_avatars.php
@@ -0,0 +1,142 @@
+session_begin();
+$auth->acl($user->data);
+$user->setup();
+
+$echos = 0;
+
+if (!isset($config['avatar_salt']))
+{
+ $cache->purge();
+ if (!isset($config['avatar_salt']))
+ {
+ die('database not up to date');
+ }
+ die('database not up to date');
+}
+
+// let's start with the users using a group_avatar.
+$sql = 'SELECT group_id, group_avatar
+ FROM ' . GROUPS_TABLE .
+ ' WHERE group_avatar_type = ' . AVATAR_UPLOAD;
+
+// We'll skip these, so remember them
+$group_avatars = array();
+
+echo '
Updating groups' . "\n";
+
+$result = $db->sql_query($sql);
+
+while ($row = $db->sql_fetchrow($result))
+{
+
+ $new_avatar_name = adjust_avatar($row['group_avatar'], 'g' . $row['group_id']);
+ $group_avatars[] = $new_avatar_name;
+
+ // failure is probably due to the avatar name already being adjusted
+ if ($new_avatar_name !== false)
+ {
+ $sql = 'UPDATE ' . USERS_TABLE . "
+ SET user_avatar = '$new_avatar_name'
+ WHERE user_avatar = '{$row['group_avatar']}'
+ AND user_avatar_type = " . AVATAR_UPLOAD;
+ $db->sql_query($sql);
+
+ $sql = 'UPDATE ' . GROUPS_TABLE . "
+ SET group_avatar = '$new_avatar_name'
+ WHERE group_id = {$row['group_id']}";
+ $db->sql_query($sql);
+ }
+ else
+ {
+ echo '
Failed updating group ' . $row['group_id'] . "\n";
+ }
+
+ if ($echos > 200)
+ {
+ echo '
' . "\n";
+ $echos = 0;
+ }
+
+ echo '.';
+ $echos++;
+
+ flush();
+}
+$db->sql_freeresult($result);
+
+$sql = 'SELECT user_id, username, user_avatar, user_avatar_type
+ FROM ' . USERS_TABLE . '
+ WHERE user_avatar_type = ' . AVATAR_UPLOAD . '
+ AND ' . $db->sql_in_set('user_avatar', $group_avatars, true);
+
+$result = $db->sql_query($sql);
+
+echo '
Updating users' . "\n";
+
+while ($row = $db->sql_fetchrow($result))
+{
+
+ $new_avatar_name = adjust_avatar($row['user_avatar'], $row['user_id']);
+
+ // failure is probably due to the avatar name already being adjusted
+ if ($new_avatar_name !== false)
+ {
+ $sql = 'UPDATE ' . USERS_TABLE . "
+ SET user_avatar = '$new_avatar_name'
+ WHERE user_id = {$row['user_id']}";
+ $db->sql_query($sql);
+ }
+ else
+ {
+ echo '
Failed updating user ' . $row['user_id'] . "\n";
+ }
+
+ if ($echos > 200)
+ {
+ echo '
' . "\n";
+ $echos = 0;
+ }
+
+ echo '.';
+ $echos++;
+
+ flush();
+}
+
+$db->sql_freeresult($result);
+
+echo 'FINISHED';
+
+// Done
+$db->sql_close();
+
+function adjust_avatar($old_name, $midfix)
+{
+ global $config, $phpbb_root_path;
+
+ $avatar_path = $phpbb_root_path . $config['avatar_path'];
+ if (@file_exists($avatar_path . '/' . $old_name) && @is_writable($avatar_path . '/' . $old_name))
+ {
+ $new_name = $config['avatar_salt'] . '_' . $midfix . '.' . substr(strrchr($old_name, '.'), 1);
+ @rename($avatar_path . '/' . $old_name, $avatar_path . '/' . $new_name);
+ return $midfix . '.' . substr(strrchr($old_name, '.'), 1);
+ }
+ return false;
+}
+?>
\ No newline at end of file
diff --git a/phpBB/download.php b/phpBB/download.php
index b333023872..5b2f7b17cf 100644
--- a/phpBB/download.php
+++ b/phpBB/download.php
@@ -14,9 +14,87 @@
define('IN_PHPBB', true);
$phpbb_root_path = './';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
+
+if (isset($_GET['avatar']))
+{
+ require($phpbb_root_path . 'config.' . $phpEx);
+ require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
+ require($phpbb_root_path . 'includes/cache.' . $phpEx);
+ require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
+ require($phpbb_root_path . 'includes/constants.' . $phpEx);
+
+ $db = new $sql_db();
+ $cache = new cache();
+
+ // Connect to DB
+ if (!@$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, false))
+ {
+ exit;
+ }
+
+ $config = $cache->obtain_config();
+ $filename = $_GET['avatar'];
+ $avatar_group = false;
+ if ($filename[0] === 'g')
+ {
+ $avatar_group = true;
+ $filename = substr($filename, 1);
+ }
+
+ // '==' is not a bug - . as the first char is as bad as no dot at all
+ if (strpos($filename, '.') == false)
+ {
+ header('HTTP/1.0 403 forbidden');
+ if (!empty($cache))
+ {
+ $cache->unload();
+ }
+ $db->sql_close();
+ exit;
+ }
+
+ $ext = substr(strrchr($filename, '.'), 1);
+ $filename = intval($filename);
+
+ if (!in_array($ext, array('png', 'gif', 'jpg', 'jpeg')))
+ {
+ // no way such an avatar could exist. They are not following the rules, stop the show.
+ header("HTTP/1.0 403 forbidden");
+ if (!empty($cache))
+ {
+ $cache->unload();
+ }
+ $db->sql_close();
+ exit;
+ }
+
+ if (!$filename)
+ {
+ // no way such an avatar could exist. They are not following the rules, stop the show.
+ header("HTTP/1.0 403 forbidden");
+ if (!empty($cache))
+ {
+ $cache->unload();
+ }
+ $db->sql_close();
+ exit;
+ }
+
+ send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext);
+
+ if (!empty($cache))
+ {
+ $cache->unload();
+ }
+ $db->sql_close();
+ exit;
+}
+
+// implicit else: we are not in avatar mode
include($phpbb_root_path . 'common.' . $phpEx);
$download_id = request_var('id', 0);
+$mode = request_var('mode', '');
$thumbnail = request_var('t', false);
// Start session management, do not update session page.
@@ -158,25 +236,116 @@ else if (($display_cat == ATTACHMENT_CATEGORY_NONE || $display_cat == ATTACHMENT
$db->sql_query($sql);
}
-// Determine the 'presenting'-method
-if ($download_mode == PHYSICAL_LINK)
+if ($mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && strpos(strtolower($user->browser), 'msie') !== false)
{
- // This presenting method should no longer be used
- if (!@is_dir($phpbb_root_path . $config['upload_path']))
- {
- trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']);
- }
-
- redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']);
- exit;
+ wrap_img_in_html(append_sid('./download.' . $phpEx, 'id=' . $attachment['attach_id']), $attachment['real_filename']);
}
else
{
- send_file_to_browser($attachment, $config['upload_path'], $extensions[$attachment['extension']]['display_cat']);
- exit;
+ // Determine the 'presenting'-method
+ if ($download_mode == PHYSICAL_LINK)
+ {
+ // This presenting method should no longer be used
+ if (!@is_dir($phpbb_root_path . $config['upload_path']))
+ {
+ trigger_error($user->lang['PHYSICAL_DOWNLOAD_NOT_POSSIBLE']);
+ }
+
+ redirect($phpbb_root_path . $config['upload_path'] . '/' . $attachment['physical_filename']);
+ exit;
+ }
+ else
+ {
+ send_file_to_browser($attachment, $config['upload_path'], $extensions[$attachment['extension']]['display_cat']);
+ exit;
+ }
}
+/**
+* A simplified function to deliver avatars
+* The argument needs to be checked before calling this function.
+*/
+function send_avatar_to_browser($file)
+{
+ global $config, $phpbb_root_path;
+ $prefix = $config['avatar_salt'] . '_';
+ $img_dir = $config['avatar_path'];
+ $browser = $_SERVER['HTTP_USER_AGENT'];
+
+ // Adjust img_dir path (no trailing slash)
+ if (substr($img_dir, -1, 1) == '/' || substr($img_dir, -1, 1) == '\\')
+ {
+ $img_dir = substr($img_dir, 0, -1) . '/';
+ }
+ $img_dir = str_replace(array('../', '..\\', './', '.\\'), '', $img_dir);
+ if ($img_dir && ($img_dir[0] == '/' || $img_dir[0] == '\\'))
+ {
+ $img_dir = '';
+ }
+ $file_path = $phpbb_root_path . $img_dir . '/' . $prefix . $file;
+
+ if ((@file_exists($file_path) && @is_readable($file_path)) || headers_sent())
+ {
+ header('Pragma: public');
+
+ $image_data = (getimagesize($file_path));
+ header('Content-Type: ' . image_type_to_mime_type($image_data[2]));
+
+ if (strpos(strtolower($browser), 'msie') !== false)
+ {
+ header('Content-Disposition: attachment; ' . header_filename($file));
+ if (strpos(strtolower($browser), 'msie 6.0') !== false)
+ {
+ header('Expires: -1');
+ }
+ else
+ {
+ header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 31536000));
+ }
+ }
+ else
+ {
+ header('Content-Disposition: inline; ' . header_filename($file));
+ header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 31536000));
+ }
+
+ $size = @filesize($file_path);
+ if ($size)
+ {
+ header("Content-Length: $size");
+ }
+
+ readfile($file_path);
+ flush();
+ }
+ else
+ {
+ header('HTTP/1.0 404 not found');
+ }
+}
+
+/**
+* Wraps an url into a simple html page. Used to display attachments in IE.
+* this is a workaround for now; might be moved to template system later
+* direct any complaints to 1 Microsoft Way, Redmond
+*/
+function wrap_img_in_html($src, $title)
+{
+ echo '';
+ echo '';
+ echo '';
+ echo '';
+ echo '' . $title . '';
+ echo '';
+ echo '';
+ echo '';
+ echo '
';
+ echo '
- 
- {_file.COMMENT}
- {_file.DOWNLOAD_NAME} ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}
@@ -22,14 +22,14 @@
- - {_file.UPLOAD_ICON} {_file.DOWNLOAD_NAME}
+ - {_file.UPLOAD_ICON} {_file.DOWNLOAD_NAME}
- {_file.COMMENT}
- ({_file.FILESIZE} {_file.SIZE_LANG}) {_file.L_DOWNLOAD_COUNT}
-
+
-
-
+
+