mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 22:26:32 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Remove unnecessary abbreviations

Browse Source 
PHPBB3-10018
This commit is contained in:
Marc Alexander
2012-11-25 00:54:34 +01:00
parent 2b91719906
commit ce44e3908e
28 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/adm/style/acp_avatar_options_gravatar.html
View File

@ -1,11 +1,11 @@
<dl> <dl>
<dt><label for="av_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt> <dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd> <dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="av_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt> <dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
<dd> <dd>
<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; <label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp;
<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label> <label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
</dd> </dd>
</dl> </dl>

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

@ -1,25 +1,25 @@
<dl> <dl>
<dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt> <dt><label for="category">{L_AVATAR_CATEGORY}{L_COLON}</label></dt>
<dd><select name="av_local_cat" id="category"> <dd><select name="avatar_local_cat" id="category">
<option value="">{L_NO_AVATAR_CATEGORY}</option> <option value="">{L_NO_AVATAR_CATEGORY}</option>
<!-- BEGIN av_local_cats --> <!-- BEGIN avatar_local_cats -->
<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option> <option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
<!-- END av_local_cats --> <!-- END avatar_local_cats -->
</select>&nbsp;<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /></dd> </select>&nbsp;<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" /></dd>
</dl> </dl>
<!-- IF AV_LOCAL_SHOW --> <!-- IF AVATAR_LOCAL_SHOW -->
<table style="border-spacing: 1px;"> <table style="border-spacing: 1px;">
<!-- BEGIN av_local_row --> <!-- BEGIN avatar_local_row -->
<tr> <tr>
<!-- BEGIN av_local_col --> <!-- BEGIN avatar_local_col -->
<td class="row1" style="text-align: center;"><img src="{av_local_row.av_local_col.AVATAR_IMAGE}" alt="{av_local_row.av_local_col.AVATAR_NAME}" title="{av_local_row.av_local_col.AVATAR_NAME}"/></td> <td class="row1" style="text-align: center;"><img src="{avatar_local_row.avatar_local_col.AVATAR_IMAGE}" alt="{avatar_local_row.avatar_local_col.AVATAR_NAME}" title="{avatar_local_row.avatar_local_col.AVATAR_NAME}"/></td>
<!-- END av_local_col --> <!-- END avatar_local_col -->
</tr> </tr>
<tr> <tr>
<!-- BEGIN av_local_option --> <!-- BEGIN avatar_local_option -->
<td class="row2" style="text-align: center;"><input type="radio" name="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_option.S_ROW_COUNT}" value="{av_local_row.av_local_option.AVATAR_FILE}" /></td> <td class="row2" style="text-align: center;"><input type="radio" name="avatar_local_file" id="av-{avatar_local_row.S_ROW_COUNT}-{avatar_local_row.avatar_local_option.S_ROW_COUNT}" value="{avatar_local_row.avatar_local_option.AVATAR_FILE}" /></td>
<!-- END av_local_option --> <!-- END avatar_local_option -->
</tr> </tr>
<!-- END av_local_row --> <!-- END avatar_local_row -->
</table> </table>
<!-- ENDIF --> <!-- ENDIF -->

10
phpBB/adm/style/acp_avatar_options_remote.html
View File

@ -1,11 +1,11 @@
<dl> <dl>
<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> <dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd> <dd><input type="text" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="av_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> <dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
<dd> <dd>
<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; <label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp;
<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label> <label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
</dd> </dd>
</dl> </dl>

8
phpBB/adm/style/acp_avatar_options_upload.html
View File

@ -1,11 +1,11 @@
<dl> <dl>
<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt> <dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd> <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
</dl> </dl>
<!-- IF S_UPLOAD_AVATAR_URL --> <!-- IF S_UPLOAD_AVATAR_URL -->
<dl> <dl>
<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> <dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd> <dd><input type="text" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->

6
phpBB/adm/style/acp_groups.html
View File

@ -105,7 +105,7 @@
<dl> <dl>
<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> <dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
<dd>{AVATAR}</dd> <dd>{AVATAR}</dd>
<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd> <dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
</dl> </dl>
<dl> <dl>
<dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt> <dt><label>{L_AVATAR_TYPE}{L_COLON}</label></dt>
@ -116,9 +116,9 @@
<!-- END avatar_drivers --> <!-- END avatar_drivers -->
</select></dd> </select></dd>
</dl> </dl>
<div id="av_options"> <div id="avatar_options">
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<div id="av_option_{avatar_drivers.DRIVER}"> <div id="avatar_option_{avatar_drivers.DRIVER}">
<p>{avatar_drivers.L_EXPLAIN}</p> <p>{avatar_drivers.L_EXPLAIN}</p>
{avatar_drivers.OUTPUT} {avatar_drivers.OUTPUT}
</div> </div>

6
phpBB/adm/style/acp_users_avatar.html
View File

@ -6,7 +6,7 @@
<dl> <dl>
<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> <dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
<dd>{AVATAR}</dd> <dd>{AVATAR}</dd>
<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd> <dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
</dl> </dl>
</fieldset> </fieldset>
<fieldset> <fieldset>
@ -20,9 +20,9 @@
<!-- END avatar_drivers --> <!-- END avatar_drivers -->
</select></dd> </select></dd>
</dl> </dl>
<div id="av_options"> <div id="avatar_options">
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<div id="av_option_{avatar_drivers.DRIVER}"> <div id="avatar_option_{avatar_drivers.DRIVER}">
<p>{avatar_drivers.L_EXPLAIN}</p> <p>{avatar_drivers.L_EXPLAIN}</p>
{avatar_drivers.OUTPUT} {avatar_drivers.OUTPUT}
</div> </div>

4
phpBB/adm/style/avatars.js
View File

@ -3,10 +3,10 @@
"use strict"; "use strict";
function avatar_simplify() { function avatar_simplify() {
$('#av_options > div').hide(); $('#avatar_options > div').hide();
var selected = $('#avatar_driver').val(); var selected = $('#avatar_driver').val();
$('#av_option_' + selected).show(); $('#avatar_option_' + selected).show();
} }
avatar_simplify(); avatar_simplify();

16
phpBB/includes/acp/acp_groups.php
View File

@ -335,8 +335,8 @@ class acp_groups
// Handle avatar // Handle avatar
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar.driver.#', '', $driver);
$av_delete = $request->variable('av_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $avatar_error); $result = $avatar->process_form($template, $avatar_data, $avatar_error);
@ -541,14 +541,14 @@ class acp_groups
if ($avatar->prepare_form($template, $avatar_data, $avatar_error)) if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
{ {
$driver_n = str_replace('.', '_', $driver); $driver_name = str_replace('.', '_', $driver);
$driver_u = strtoupper($driver_n); $driver_upper = strtoupper($driver_name);
$template->assign_block_vars('avatar_drivers', array( $template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang($driver_u . '_TITLE'), 'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'), 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_n, 'DRIVER' => $driver_name,
'SELECTED' => ($driver == $focused_driver), 'SELECTED' => $driver == $focused_driver,
'OUTPUT' => $template->assign_display('avatar'), 'OUTPUT' => $template->assign_display('avatar'),
)); ));
} }

16
phpBB/includes/acp/acp_users.php
View File

@ -1746,8 +1746,8 @@ class acp_users
{ {
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar.driver.#', '', $driver);
$av_delete = $request->variable('av_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $error); $result = $avatar->process_form($template, $avatar_data, $error);
@ -1814,15 +1814,15 @@ class acp_users
if ($avatar->prepare_form($template, $avatar_data, $error)) if ($avatar->prepare_form($template, $avatar_data, $error))
{ {
$driver_n = str_replace('.', '_', $driver); $driver_name = str_replace('.', '_', $driver);
$driver_u = strtoupper($driver_n); $driver_upper = strtoupper($driver_name);
$template->assign_block_vars('avatar_drivers', array( $template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang($driver_u . '_TITLE'), 'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'), 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_n, 'DRIVER' => $driver_name,
'SELECTED' => ($driver == $focused_driver), 'SELECTED' => $driver == $focused_driver,
'OUTPUT' => $template->assign_display('avatar'), 'OUTPUT' => $template->assign_display('avatar'),
)); ));
} }

12
phpBB/includes/avatar/driver/gravatar.php
View File

@ -69,9 +69,9 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
public function prepare_form($template, $row, &$error) public function prepare_form($template, $row, &$error)
{ {
$template->assign_vars(array( $template->assign_vars(array(
'AV_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_gravatar_width', 0), 'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('avatar_gravatar_width', 0),
'AV_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_gravatar_width', 0), 'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('avatar_gravatar_width', 0),
'AV_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '', 'AVATAR_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '',
)); ));
return true; return true;
@ -92,9 +92,9 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
*/ */
public function process_form($template, $row, &$error) public function process_form($template, $row, &$error)
{ {
$row['avatar'] = $this->request->variable('av_gravatar_email', ''); $row['avatar'] = $this->request->variable('avatar_gravatar_email', '');
$row['avatar_width'] = $this->request->variable('av_gravatar_width', 0); $row['avatar_width'] = $this->request->variable('avatar_gravatar_width', 0);
$row['avatar_height'] = $this->request->variable('av_gravatar_height', 0); $row['avatar_height'] = $this->request->variable('avatar_gravatar_height', 0);
require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx); require_once($this->phpbb_root_path . 'includes/functions_user' . $this->phpEx);

30
phpBB/includes/avatar/driver/local.php
View File

@ -50,13 +50,13 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
public function prepare_form($template, $row, &$error) public function prepare_form($template, $row, &$error)
{ {
$avatar_list = $this->get_avatar_list(); $avatar_list = $this->get_avatar_list();
$category = $this->request->variable('av_local_cat', ''); $category = $this->request->variable('avatar_local_cat', '');
foreach ($avatar_list as $cat => $null) foreach ($avatar_list as $cat => $null)
{ {
if (!empty($avatar_list[$cat])) if (!empty($avatar_list[$cat]))
{ {
$template->assign_block_vars('av_local_cats', array( $template->assign_block_vars('avatar_local_cats', array(
'NAME' => $cat, 'NAME' => $cat,
'SELECTED' => ($cat == $category), 'SELECTED' => ($cat == $category),
)); ));
@ -71,16 +71,16 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
if (!empty($avatar_list[$category])) if (!empty($avatar_list[$category]))
{ {
$template->assign_vars(array( $template->assign_vars(array(
'AV_LOCAL_SHOW' => true, 'AVATAR_LOCAL_SHOW' => true,
)); ));
$table_cols = isset($row['av_gallery_cols']) ? $row['av_gallery_cols'] : 4; $table_cols = isset($row['avatar_gallery_cols']) ? $row['avatar_gallery_cols'] : 4;
$row_count = $col_count = $av_pos = 0; $row_count = $col_count = $avatar_pos = 0;
$av_count = sizeof($avatar_list[$category]); $avatar_count = sizeof($avatar_list[$category]);
reset($avatar_list[$category]); reset($avatar_list[$category]);
while ($av_pos < $av_count) while ($avatar_pos < $avatar_count)
{ {
$img = current($avatar_list[$category]); $img = current($avatar_list[$category]);
next($avatar_list[$category]); next($avatar_list[$category]);
@ -88,24 +88,24 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
if ($col_count == 0) if ($col_count == 0)
{ {
++$row_count; ++$row_count;
$template->assign_block_vars('av_local_row', array( $template->assign_block_vars('avatar_local_row', array(
)); ));
} }
$template->assign_block_vars('av_local_row.av_local_col', array( $template->assign_block_vars('avatar_local_row.avatar_local_col', array(
'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'],
)); ));
$template->assign_block_vars('av_local_row.av_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']
)); ));
$col_count = ($col_count + 1) % $table_cols; $col_count = ($col_count + 1) % $table_cols;
++$av_pos; ++$avatar_pos;
} }
} }
@ -129,9 +129,9 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
public function process_form($template, $row, &$error) public function process_form($template, $row, &$error)
{ {
$avatar_list = $this->get_avatar_list(); $avatar_list = $this->get_avatar_list();
$category = $this->request->variable('av_local_cat', ''); $category = $this->request->variable('avatar_local_cat', '');
$file = $this->request->variable('av_local_file', ''); $file = $this->request->variable('avatar_local_file', '');
if (!isset($avatar_list[$category][urldecode($file)])) if (!isset($avatar_list[$category][urldecode($file)]))
{ {
$error[] = 'AVATAR_URL_NOT_FOUND'; $error[] = 'AVATAR_URL_NOT_FOUND';
@ -152,7 +152,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
*/ */
protected function get_avatar_list() protected function get_avatar_list()
{ {
$avatar_list = ($this->cache == null) ? false : $this->cache->get('av_local_list'); $avatar_list = ($this->cache == null) ? false : $this->cache->get('avatar_local_list');
if (!$avatar_list) if (!$avatar_list)
{ {
@ -190,7 +190,7 @@ class phpbb_avatar_driver_local extends phpbb_avatar_driver
if ($this->cache != null) if ($this->cache != null)
{ {
$this->cache->put('av_local_list', $avatar_list); $this->cache->put('avatar_local_list', $avatar_list);
} }
} }

12
phpBB/includes/avatar/driver/remote.php
View File

@ -50,9 +50,9 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
public function prepare_form($template, $row, &$error) public function prepare_form($template, $row, &$error)
{ {
$template->assign_vars(array( $template->assign_vars(array(
'AV_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('av_remote_width', 0), 'AVATAR_REMOTE_WIDTH' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_width']) ? $row['avatar_width'] : $this->request->variable('avatar_remote_width', 0),
'AV_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('av_remote_width', 0), 'AVATAR_REMOTE_HEIGHT' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar_height']) ? $row['avatar_height'] : $this->request->variable('avatar_remote_width', 0),
'AV_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '', 'AVATAR_REMOTE_URL' => ((in_array($row['avatar_type'], array(AVATAR_REMOTE, $this->get_name(), 'remote'))) && $row['avatar']) ? $row['avatar'] : '',
)); ));
return true; return true;
@ -73,9 +73,9 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
*/ */
public function process_form($template, $row, &$error) public function process_form($template, $row, &$error)
{ {
$url = $this->request->variable('av_remote_url', ''); $url = $this->request->variable('avatar_remote_url', '');
$width = $this->request->variable('av_remote_width', 0); $width = $this->request->variable('avatar_remote_width', 0);
$height = $this->request->variable('av_remote_height', 0); $height = $this->request->variable('avatar_remote_height', 0);
if (!preg_match('#^(http|https|ftp)://#i', $url)) if (!preg_match('#^(http|https|ftp)://#i', $url))
{ {

8
phpBB/includes/avatar/driver/upload.php
View File

@ -56,7 +56,7 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
$template->assign_vars(array( $template->assign_vars(array(
'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false, 'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false,
'AV_UPLOAD_SIZE' => $this->config['avatar_filesize'], 'AVATAR_UPLOAD_SIZE' => $this->config['avatar_filesize'],
)); ));
return true; return true;
@ -76,12 +76,12 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
$upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false));
$url = $this->request->variable('av_upload_url', ''); $url = $this->request->variable('avatar_upload_url', '');
$upload_file = $this->request->file('av_upload_file'); $upload_file = $this->request->file('avatar_upload_file');
if (!empty($upload_file['name'])) if (!empty($upload_file['name']))
{ {
$file = $upload->form_upload('av_upload_file'); $file = $upload->form_upload('avatar_upload_file');
} }
else else
{ {

16
phpBB/includes/ucp/ucp_groups.php
View File

@ -522,8 +522,8 @@ class ucp_groups
// Handle avatar // Handle avatar
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar.driver.#', '', $driver);
$av_delete = $request->variable('av_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $avatar_error); $result = $avatar->process_form($template, $avatar_data, $avatar_error);
@ -666,14 +666,14 @@ class ucp_groups
if ($avatar->prepare_form($template, $avatar_data, $avatar_error)) if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
{ {
$driver_n = str_replace('.', '_', $driver); $driver_name = str_replace('.', '_', $driver);
$driver_u = strtoupper($driver_n); $driver_upper = strtoupper($driver_name);
$template->assign_block_vars('avatar_drivers', array( $template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang($driver_u . '_TITLE'), 'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'), 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_n, 'DRIVER' => $driver_name,
'SELECTED' => ($driver == $focused_driver), 'SELECTED' => $driver == $focused_driver,
'OUTPUT' => $template->assign_display('avatar'), 'OUTPUT' => $template->assign_display('avatar'),
)); ));
} }

16
phpBB/includes/ucp/ucp_profile.php
View File

@ -565,8 +565,8 @@ class ucp_profile
{ {
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar.driver.#', '', $driver); $config_name = preg_replace('#^avatar.driver.#', '', $driver);
$av_delete = $request->variable('av_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
$result = $avatar->process_form($template, $avatar_data, $error); $result = $avatar->process_form($template, $avatar_data, $error);
@ -638,15 +638,15 @@ class ucp_profile
if ($avatar->prepare_form($template, $avatar_data, $error)) if ($avatar->prepare_form($template, $avatar_data, $error))
{ {
$driver_n = str_replace('.', '_', $driver); $driver_name = str_replace('.', '_', $driver);
$driver_u = strtoupper($driver_n); $driver_upper = strtoupper($driver_name);
$template->assign_block_vars('avatar_drivers', array( $template->assign_block_vars('avatar_drivers', array(
'L_TITLE' => $user->lang($driver_u . '_TITLE'), 'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
'L_EXPLAIN' => $user->lang($driver_u . '_EXPLAIN'), 'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
'DRIVER' => $driver_n, 'DRIVER' => $driver_name,
'SELECTED' => ($driver == $focused_driver), 'SELECTED' => $driver == $focused_driver,
'OUTPUT' => $template->assign_display('avatar'), 'OUTPUT' => $template->assign_display('avatar'),
)); ));
} }

4
phpBB/styles/prosilver/template/avatars.js
View File

@ -3,10 +3,10 @@
"use strict"; "use strict";
function avatar_simplify() { function avatar_simplify() {
$('#av_options > div').hide(); $('#avatar_options > div').hide();
var selected = $('#avatar_driver').val(); var selected = $('#avatar_driver').val();
$('#av_option_' + selected).show(); $('#avatar_option_' + selected).show();
} }
avatar_simplify(); avatar_simplify();

6
phpBB/styles/prosilver/template/ucp_avatar_options.html
View File

@ -9,7 +9,7 @@
<dl> <dl>
<dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> <dt><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt>
<dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd> <dd><!-- IF AVATAR -->{AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF --></dd>
<dd><label for="av_delete"><input type="checkbox" name="av_delete" id="av_delete" /> {L_DELETE_AVATAR}</label></dd> <dd><label for="avatar_delete"><input type="checkbox" name="avatar_delete" id="avatar_delete" /> {L_DELETE_AVATAR}</label></dd>
</dl> </dl>
</fieldset> </fieldset>
<h3>{L_AVATAR_SELECT}</h3> <h3>{L_AVATAR_SELECT}</h3>
@ -24,9 +24,9 @@
</select></dd> </select></dd>
</dl> </dl>
</fieldset> </fieldset>
<div id="av_options"> <div id="avatar_options">
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<div id="av_option_{avatar_drivers.DRIVER}"> <div id="avatar_option_{avatar_drivers.DRIVER}">
<noscript> <noscript>
<h3 class="avatar_section_header">{avatar_drivers.L_TITLE}</h3> <h3 class="avatar_section_header">{avatar_drivers.L_TITLE}</h3>
</noscript> </noscript>

10
phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
View File

@ -1,11 +1,11 @@
<dl> <dl>
<dt><label for="av_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt> <dt><label for="avatar_gravatar_email">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></dt>
<dd><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></dd> <dd><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="av_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt> <dt><label for="avatar_gravatar_width">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</label><br /><span>{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></dt>
<dd> <dd>
<label for="av_gravatar_width"><input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; <label for="avatar_gravatar_width"><input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp;
<label for="av_gravatar_height"><input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label> <label for="avatar_gravatar_height"><input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
</dd> </dd>
</dl> </dl>

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

@ -1,16 +1,16 @@
<label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="av_local_cat" id="category"> <label for="category">{L_AVATAR_CATEGORY}{L_COLON} <select name="avatar_local_cat" id="category">
<option value="">{L_NO_AVATAR_CATEGORY}</option> <option value="">{L_NO_AVATAR_CATEGORY}</option>
<!-- BEGIN av_local_cats --> <!-- BEGIN avatar_local_cats -->
<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option> <option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
<!-- END av_local_cats --> <!-- END avatar_local_cats -->
</select></label> </select></label>
<input type="submit" value="{L_GO}" name="av_local_go" class="button2" /> <input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" />
<div id="gallery"> <div id="gallery">
<!-- BEGIN av_local_row --> <!-- BEGIN avatar_local_row -->
<!-- BEGIN av_local_col --> <!-- BEGIN avatar_local_col -->
<label for="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_col.S_ROW_COUNT}"><img src="{av_local_row.av_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="av_local_file" id="av-{av_local_row.S_ROW_COUNT}-{av_local_row.av_local_col.S_ROW_COUNT}" value="{av_local_row.av_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}" /></label>
<!-- END av_local_col --> <!-- END avatar_local_col -->
<!-- END av_local_row --> <!-- END avatar_local_row -->
</div> </div>

10
phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
View File

@ -1,11 +1,11 @@
<dl> <dl>
<dt><label for="av_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> <dt><label for="avatar_remote_url">{L_LINK_REMOTE_AVATAR}{L_COLON}</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt>
<dd><input type="text" name="av_remote_url" id="av_remote_url" value="{AV_REMOTE_URL}" class="inputbox" /></dd> <dd><input type="text" name="avatar_remote_url" id="avatar_remote_url" value="{AVATAR_REMOTE_URL}" class="inputbox" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="av_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> <dt><label for="avatar_remote_width">{L_LINK_REMOTE_SIZE}{L_COLON}</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt>
<dd> <dd>
<label for="av_remote_width"><input type="text" name="av_remote_width" id="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp; <label for="avatar_remote_width"><input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL}</label> &times;&nbsp;
<label for="av_remote_height"><input type="text" name="av_remote_height" id="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label> <label for="avatar_remote_height"><input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}</label>
</dd> </dd>
</dl> </dl>

8
phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
View File

@ -1,11 +1,11 @@
<dl> <dl>
<dt><label for="av_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt> <dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt>
<dd><input type="hidden" name="MAX_FILE_SIZE" value="{AV_UPLOAD_SIZE}" /><input type="file" name="av_upload_file" id="av_upload_file" class="inputbox autowidth" /></dd> <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" /></dd>
</dl> </dl>
<!-- IF S_UPLOAD_AVATAR_URL --> <!-- IF S_UPLOAD_AVATAR_URL -->
<dl> <dl>
<dt><label for="av_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> <dt><label for="avatar_upload_url">{L_UPLOAD_AVATAR_URL}{L_COLON}</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt>
<dd><input type="text" name="av_upload_url" id="av_upload_url" value="" class="inputbox" /></dd> <dd><input type="text" name="avatar_upload_url" id="avatar_upload_url" value="" class="inputbox" /></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->

4
phpBB/styles/subsilver2/template/avatars.js
View File

@ -3,10 +3,10 @@
"use strict"; "use strict";
function avatar_simplify() { function avatar_simplify() {
$('.[class^="av_option_"]').hide(); $('.[class^="avatar_option_"]').hide();
var selected = $('#avatar_driver').val(); var selected = $('#avatar_driver').val();
$('.av_option_' + selected).show(); $('.avatar_option_' + selected).show();
} }
avatar_simplify(); avatar_simplify();

6
phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
View File

@ -1,13 +1,13 @@
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></td> <td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_EMAIL}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_EMAIL_EXPLAIN}</span></td>
<td class="row2"><input type="text" name="av_gravatar_email" id="av_gravatar_email" value="{AV_GRAVATAR_EMAIL}" class="inputbox" /></td> <td class="row2"><input type="text" name="avatar_gravatar_email" id="avatar_gravatar_email" value="{AVATAR_GRAVATAR_EMAIL}" class="inputbox" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></td> <td class="row1" width="35%"><b class="genmed">{L_GRAVATAR_AVATAR_SIZE}{L_COLON}</b><br /><span class="gensmall">{L_GRAVATAR_AVATAR_SIZE_EXPLAIN}</span></td>
<td class="row2"> <td class="row2">
<input type="text" name="av_gravatar_width" id="av_gravatar_width" size="3" value="{AV_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp; <input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
<input type="text" name="av_gravatar_height" id="av_gravatar_height" size="3" value="{AV_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL} <input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
</td> </td>
</tr> </tr>
</table> </table>

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

@ -1,32 +1,32 @@
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="av_local_cat" id="category"> <td class="cat" colspan="2" align="center" valign="middle"><span class="genmed">{L_AVATAR_CATEGORY}{L_COLON} </span><select name="avatar_local_cat" id="category">
<option value="">{L_NO_AVATAR_CATEGORY}</option> <option value="">{L_NO_AVATAR_CATEGORY}</option>
<!-- BEGIN av_local_cats --> <!-- BEGIN avatar_local_cats -->
<option value="{av_local_cats.NAME}"<!-- IF av_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{av_local_cats.NAME}</option> <option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
<!-- END av_local_cats --> <!-- END avatar_local_cats -->
</select>&nbsp; <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="av_local_go" /> </select>&nbsp; <input class="btnlite" tabindex="0" type="submit" value="{L_GO}" name="avatar_local_go" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="row1" colspan="2" align="center"> <td class="row1" colspan="2" align="center">
<table cellspacing="1" cellpadding="4" border="0"> <table cellspacing="1" cellpadding="4" border="0">
<!-- BEGIN av_local_row --> <!-- BEGIN avatar_local_row -->
<tr> <tr>
<!-- BEGIN av_local_col --> <!-- BEGIN avatar_local_col -->
<td class="row1" align="center"><img src="{av_local_col.av_local_col.AVATAR_IMAGE}" alt="{av_local_col.av_local_col.AVATAR_NAME}" title="{av_local_col.av_local_col.AVATAR_NAME}" /></td> <td class="row1" align="center"><img src="{avatar_local_col.avatar_local_col.AVATAR_IMAGE}" alt="{avatar_local_col.avatar_local_col.AVATAR_NAME}" title="{avatar_local_col.avatar_local_col.AVATAR_NAME}" /></td>
<!-- END av_local_col --> <!-- END avatar_local_col -->
</tr> </tr>
<tr> <tr>
<!-- BEGIN av_local_option --> <!-- BEGIN avatar_local_option -->
<td class="row2" align="center"><input type="radio" class="radio" name="av_local_file" value="{av_local_col.av_local_option.S_OPTIONS_AVATAR}" /></td> <td class="row2" align="center"><input type="radio" class="radio" name="avatar_local_file" value="{avatar_local_col.avatar_local_option.S_OPTIONS_AVATAR}" /></td>
<!-- END av_local_option --> <!-- END avatar_local_option -->
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr> <tr>
<td class="row1" colspan="2">{L_NO_AVATAR_CATEGORY}</td> <td class="row1" colspan="2">{L_NO_AVATAR_CATEGORY}</td>
</tr> </tr>
<!-- END av_local_col --> <!-- END avatar_local_col -->
</table> </table>
</td> </td>
</tr> </tr>

4
phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
View File

@ -1,10 +1,10 @@
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> <td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_AVATAR}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
<td class="row2"><input class="post" type="text" name="av_remote_url" size="40" value="{AV_REMOTE_URL}" /></td> <td class="row2"><input class="post" type="text" name="avatar_remote_url" size="40" value="{AVATAR_REMOTE_URL}" /></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td> <td class="row1" width="35%"><b class="genmed">{L_LINK_REMOTE_SIZE}{L_COLON} </b><br /><span class="gensmall">{L_LINK_REMOTE_SIZE_EXPLAIN}</span></td>
<td class="row2"><input class="post" type="text" name="av_remote_width" size="3" value="{AV_REMOTE_WIDTH}" /> <span class="gen">{L_PIXEL} &times; </span> <input class="post" type="text" name="av_remote_height" size="3" value="{AV_REMOTE_HEIGHT}" /> <span class="gen">{L_PIXEL}</span></td> <td class="row2"><input class="post" type="text" name="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" /> <span class="gen">{L_PIXEL} &times; </span> <input class="post" type="text" name="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" /> <span class="gen">{L_PIXEL}</span></td>
</tr> </tr>
</table> </table>

4
phpBB/styles/subsilver2/template/ucp_avatar_options_upload.html
View File

@ -1,12 +1,12 @@
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}{L_COLON} </b></td> <td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_FILE}{L_COLON} </b></td>
<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="av_upload_file" /></td> <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input class="post" type="file" name="avatar_upload_file" /></td>
</tr> </tr>
<!-- IF S_UPLOAD_AVATAR_URL --> <!-- IF S_UPLOAD_AVATAR_URL -->
<tr> <tr>
<td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}{L_COLON} </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> <td class="row1" width="35%"><b class="genmed">{L_UPLOAD_AVATAR_URL}{L_COLON} </b><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
<td class="row2"><input class="post" type="text" name="av_upload_url" size="40" value="" /></td> <td class="row2"><input class="post" type="text" name="avatar_upload_url" size="40" value="" /></td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
</table> </table>

6
phpBB/styles/subsilver2/template/ucp_groups_manage.html
View File

@ -60,7 +60,7 @@
</tr> </tr>
<tr> <tr>
<td class="row1" width="35%"><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></td> <td class="row1" width="35%"><label>{L_CURRENT_IMAGE}{L_COLON}</label><br /><span>{L_AVATAR_EXPLAIN}</span></td>
<td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="av_delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td> <td class="row2">{AVATAR_IMAGE}<br /><br /><input type="checkbox" class="radio" name="avatar_delete" />&nbsp;<span>{L_DELETE_AVATAR}</span></td>
</tr> </tr>
<!-- IF not S_AVATARS_ENABLED --> <!-- IF not S_AVATARS_ENABLED -->
<tr> <tr>
@ -81,10 +81,10 @@
</select></td> </select></td>
</tr> </tr>
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<tr class="av_option_{avatar_drivers.DRIVER}"> <tr class="avatar_option_{avatar_drivers.DRIVER}">
<td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td> <td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td>
</tr> </tr>
<tr class="av_option_{avatar_drivers.DRIVER}"> <tr class="avatar_option_{avatar_drivers.DRIVER}">
<td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td> <td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td>
</tr> </tr>
<!-- END avatar_drivers --> <!-- END avatar_drivers -->

6
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
View File

@ -12,7 +12,7 @@
<tr> <tr>
<td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}{L_COLON} </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td> <td class="row1" width="35%"><b class="genmed">{L_CURRENT_IMAGE}{L_COLON} </b><br /><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
<td class="row2" align="center"><br /> <td class="row2" align="center"><br />
<!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="av_delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span> <!-- IF AVATAR -->{AVATAR}<br /><br /><input type="checkbox" class="radio" name="avatar_delete" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span>
<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /> <!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" />
<!-- ENDIF --></td> <!-- ENDIF --></td>
</tr> </tr>
@ -35,10 +35,10 @@
</select></td> </select></td>
</tr> </tr>
<!-- BEGIN avatar_drivers --> <!-- BEGIN avatar_drivers -->
<tr class="av_option_{avatar_drivers.DRIVER}"> <tr class="avatar_option_{avatar_drivers.DRIVER}">
<td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td> <td class="row1" width="35%" colspan="2"><noscript><b class="genmed">{avatar_drivers.L_TITLE} </b><br /></noscript>{avatar_drivers.L_EXPLAIN}</span></td>
</tr> </tr>
<tr class="av_option_{avatar_drivers.DRIVER}"> <tr class="avatar_option_{avatar_drivers.DRIVER}">
<td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td> <td colspan="2" style="padding: 0">{avatar_drivers.OUTPUT}</td>
</tr> </tr>
<!-- END avatar_drivers --> <!-- END avatar_drivers -->