phpBB

Code Changes

File: phpbb/avatar/driver/local.php

  Unmodified   Added   Modified   Removed
Line 23Line 23
	*/
public function get_data($row)
{

	*/
public function get_data($row)
{

 
		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $this->path_helper->get_web_root_path();


		return array(

		return array(

			'src' => $this->path_helper->get_web_root_path() . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],

			'src' => $root_path . $this->config['avatar_gallery_path'] . '/' . $row['avatar'],

			'width' => $row['avatar_width'],
'height' => $row['avatar_height'],
);

			'width' => $row['avatar_width'],
'height' => $row['avatar_height'],
);

Line 82Line 84
					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
'AVATAR_NAME' => $img['name'],
'AVATAR_FILE' => $img['filename'],

					'AVATAR_IMAGE'  => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
'AVATAR_NAME' => $img['name'],
'AVATAR_FILE' => $img['filename'],

 
					'CHECKED'			=> $img['file'] === $row['avatar'],

				));

$template->assign_block_vars('avatar_local_row.avatar_local_option', array(
'AVATAR_FILE' => $img['filename'],

				));

$template->assign_block_vars('avatar_local_row.avatar_local_option', array(
'AVATAR_FILE' => $img['filename'],

					'S_OPTIONS_AVATAR'	=> $img['filename']


					'S_OPTIONS_AVATAR'	=> $img['filename'],
'CHECKED' => $img['file'] === $row['avatar'],

				));

$col_count = ($col_count + 1) % $table_cols;

				));

$col_count = ($col_count + 1) % $table_cols;

Line 170Line 174
				// Match all images in the gallery folder
if (preg_match('#^[^&\'"<>]+\.(?:' . implode('|', $this->allowed_extensions) . ')$#i', $image) && is_file($file_path . '/' . $image))
{

				// Match all images in the gallery folder
if (preg_match('#^[^&\'"<>]+\.(?:' . implode('|', $this->allowed_extensions) . ')$#i', $image) && is_file($file_path . '/' . $image))
{

					if (function_exists('getimagesize'))



					$dims = $this->imagesize->getImageSize($file_path . '/' . $image);

if ($dims === false)

					{

					{

						$dims = getimagesize($file_path . '/' . $image);

						$dims = array(0, 0);

					}
else
{

					}
else
{

						$dims = array(0, 0);

						$dims = array($dims['width'], $dims['height']);

					}
$cat = ($path == $file_path) ? $user->lang['NO_AVATAR_CATEGORY'] : str_replace("$path/", '', $file_path);
$avatar_list[$cat][$image] = array(

					}
$cat = ($path == $file_path) ? $user->lang['NO_AVATAR_CATEGORY'] : str_replace("$path/", '', $file_path);
$avatar_list[$cat][$image] = array(

						'file'      => ($cat != $user->lang['NO_AVATAR_CATEGORY']) ? rawurlencode($cat) . '/' . rawurlencode($image) : rawurlencode($image),

						'file'      => ($cat != $user->lang['NO_AVATAR_CATEGORY']) ? str_replace('%2F', '/', rawurlencode($cat)) . '/' . rawurlencode($image) : rawurlencode($image),

						'filename'  => rawurlencode($image),
'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
'width' => $dims[0],

						'filename'  => rawurlencode($image),
'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
'width' => $dims[0],