mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-20 07:42:09 +02:00
Code Issues Releases Wiki Activity

[ticket/10407] Fix check for empty image paths in convertor

Browse Source 
This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will temporarily remove the trailing slash, then check if the path is
empty.

PHPBB3-10407
This commit is contained in:
Richard Foote 2011-12-29 16:27:48 -05:00
parent 51f8f642de
commit d5dc70cbe3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/functions_convert.php
View File

@ -424,7 +424,10 @@ function import_avatar_gallery($gallery_name = '', $subdirs_as_galleries = false
$relative_path = empty($convert->convertor['source_path_absolute']);
if (empty($convert->convertor['avatar_gallery_path']))
// strip trailing slash
$trimmed_avatar_gallery_path = rtrim($convert->convertor['avatar_gallery_path'], '/');
if (empty($trimmed_avatar_gallery_path))
{
$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_GALLERY_PATH'], 'import_avatar_gallery()'), __LINE__, __FILE__);
}
@ -588,7 +591,10 @@ function import_attachment($source, $use_target = false)
global $convert, $phpbb_root_path, $config, $user;
if (empty($convert->convertor['upload_path']))
// strip trailing slash
$trimmed_upload_path = rtrim($convert->convertor['upload_path'], '/');
if (empty($trimmed_upload_path))
{
$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_UPLOAD_DIR'], 'import_attachment()'), __LINE__, __FILE__);
}
@ -647,7 +653,10 @@ function import_smiley($source, $use_target = false)
global $convert, $phpbb_root_path, $config, $user;
if (!isset($convert->convertor['smilies_path']))
// strip trailing slash
$trimmed_smilies_path = rtrim($convert->convertor['smilies_path'], '/');
if (empty($trimmed_smilies_path))
{
$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_SMILIES_PATH'], 'import_smiley()'), __LINE__, __FILE__);
}
@ -667,7 +676,10 @@ function import_avatar($source, $use_target = false, $user_id = false)
global $convert, $phpbb_root_path, $config, $user;
if (!isset($convert->convertor['avatar_path']))
// strip trailing slash
$trimmed_avatar_path = rtrim($convert->convertor['avatar_path'], '/');
if (empty($trimmed_avatar_path))
{
$convert->p_master->error(sprintf($user->lang['CONV_ERROR_NO_AVATAR_PATH'], 'import_avatar()'), __LINE__, __FILE__);
}