mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 22:14:59 +02:00
Code Issues Releases Wiki Activity

[ticket/13799] Correctly urlencode category and show selected avatar

Browse Source 
PHPBB3-13799
This commit is contained in:
Marc Alexander 2015-05-30 11:54:54 +02:00
parent ed064ce0f1
commit 1ba86eaa8e
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/adm/style/acp_avatar_options_local.html
View File

@ -12,7 +12,7 @@
<!-- BEGIN avatar_local_col --> <!-- BEGIN avatar_local_col -->
<li> <li>
<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br /> <label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label> <input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}"<!-- IF avatar_local_row.avatar_local_col.CHECKED -->checked="checked"<!-- ENDIF --> /></label>
</li> </li>
<!-- END avatar_local_col --> <!-- END avatar_local_col -->
<!-- END avatar_local_row --> <!-- END avatar_local_row -->

6
phpBB/phpbb/avatar/driver/local.php
View File

@ -84,11 +84,13 @@ class local extends \phpbb\avatar\driver\driver
'AVATAR_IMAGE' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'], 'AVATAR_IMAGE' => $this->phpbb_root_path . $this->config['avatar_gallery_path'] . '/' . $img['file'],
'AVATAR_NAME' => $img['name'], 'AVATAR_NAME' => $img['name'],
'AVATAR_FILE' => $img['filename'], 'AVATAR_FILE' => $img['filename'],
'CHECKED' => $img['file'] === $row['avatar'],
)); ));
$template->assign_block_vars('avatar_local_row.avatar_local_option', array( $template->assign_block_vars('avatar_local_row.avatar_local_option', array(
'AVATAR_FILE' => $img['filename'], '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;
@ -182,7 +184,7 @@ class local extends \phpbb\avatar\driver\driver
} }
$cat = ($path == $file_path) ? $user->lang['NO_AVATAR_CATEGORY'] : str_replace("$path/", '', $file_path); $cat = ($path == $file_path) ? $user->lang['NO_AVATAR_CATEGORY'] : str_replace("$path/", '', $file_path);
$avatar_list[$cat][$image] = array( $avatar_list[$cat][$image] = array(
'file' => ($cat != $user->lang['NO_AVATAR_CATEGORY']) ? $cat . '/' . rawurlencode($image) : rawurlencode($image), 'file' => ($cat != $user->lang['NO_AVATAR_CATEGORY']) ? str_replace('%2F', '/', rawurlencode($cat)) . '/' . rawurlencode($image) : rawurlencode($image),
'filename' => rawurlencode($image), 'filename' => rawurlencode($image),
'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))), 'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $image))),
'width' => $dims[0], 'width' => $dims[0],

2
phpBB/styles/prosilver/template/ucp_avatar_options_local.html
View File

@ -10,7 +10,7 @@
<!-- BEGIN avatar_local_row --> <!-- BEGIN avatar_local_row -->
<!-- BEGIN avatar_local_col --> <!-- BEGIN avatar_local_col -->
<label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br /> <label for="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="" /><br />
<input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}" /></label> <input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_col.AVATAR_FILE}"<!-- IF avatar_local_row.avatar_local_col.CHECKED -->checked="checked"<!-- ENDIF --> /></label>
<!-- END avatar_local_col --> <!-- END avatar_local_col -->
<!-- END avatar_local_row --> <!-- END avatar_local_row -->
</div> </div>

2
phpBB/styles/subsilver2/template/ucp_avatar_options_local.html
View File

@ -19,7 +19,7 @@
</tr> </tr>
<tr> <tr>
<!-- BEGIN avatar_local_option --> <!-- BEGIN avatar_local_option -->
<td class="row2" align="center"><input type="radio" class="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_option.S_OPTIONS_AVATAR}" /></td> <td class="row2" align="center"><input type="radio" class="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_col.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_option.S_OPTIONS_AVATAR}"<!-- IF avatar_local_row.avatar_local_option.CHECKED -->checked="checked"<!-- ENDIF --> /></td>
<!-- END avatar_local_option --> <!-- END avatar_local_option -->
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->