mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

[feature/avatars] Add more consistency to codebase

Browse Source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-12-11 21:02:37 +01:00
parent 1aae72961a
commit 2f47c99432
7 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<dl> <dl>
<dt><label for="avatar_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="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; <input type="text" name="avatar_gravatar_width" id="avatar_gravatar_width" size="3" value="{AVATAR_GRAVATAR_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
<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> <input type="text" name="avatar_gravatar_height" id="avatar_gravatar_height" size="3" value="{AVATAR_GRAVATAR_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
</dd> </dd>
</dl> </dl>

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

@ -5,7 +5,7 @@
<dl> <dl>
<dt><label for="avatar_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="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; <input type="text" name="avatar_remote_width" id="avatar_remote_width" size="3" value="{AVATAR_REMOTE_WIDTH}" class="inputbox autowidth" /> {L_PIXEL} &times;&nbsp;
<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> <input type="text" name="avatar_remote_height" id="avatar_remote_height" size="3" value="{AVATAR_REMOTE_HEIGHT}" class="inputbox autowidth" /> {L_PIXEL}
</dd> </dd>
</dl> </dl>

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

@ -529,7 +529,7 @@ class acp_groups
$avatars_enabled = true; $avatars_enabled = true;
$config_name = $phpbb_avatar_manager->get_driver_config_name($driver); $config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
$template->set_filenames(array( $template->set_filenames(array(
'avatar' => "acp_avatar_options_$config_name.html", 'avatar' => "acp_avatar_options_{$config_name}.html",
)); ));
if ($driver->prepare_form($template, $avatar_data, $avatar_error)) if ($driver->prepare_form($template, $avatar_data, $avatar_error))

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

@ -1765,7 +1765,7 @@ class acp_users
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . ' SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . $user_id; WHERE user_id = ' . (int) $user_id;
$db->sql_query($sql); $db->sql_query($sql);
trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id)); trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&amp;u=' . $user_id));
@ -1810,7 +1810,7 @@ class acp_users
$avatars_enabled = true; $avatars_enabled = true;
$config_name = $phpbb_avatar_manager->get_driver_config_name($driver); $config_name = $phpbb_avatar_manager->get_driver_config_name($driver);
$template->set_filenames(array( $template->set_filenames(array(
'avatar' => "acp_avatar_options_$config_name.html", 'avatar' => "acp_avatar_options_{$config_name}.html",
)); ));
if ($driver->prepare_form($template, $avatar_data, $error)) if ($driver->prepare_form($template, $avatar_data, $error))

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

@ -77,13 +77,18 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext); require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
} }
$error = array_merge($error, validate_data(array( $validate_array = validate_data(
'email' => $row['avatar'], array(
), array( 'email' => $row['avatar'],
'email' => array( ),
array('string', false, 6, 60), array(
array('email')), 'email' => array(
))); array('string', false, 6, 60),
array('email'))
)
);
$error = array_merge($error, $validate_array);
if (!empty($error)) if (!empty($error))
{ {

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

@ -66,11 +66,16 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext); require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
} }
$error = array_merge($error, validate_data(array( $validate_array = validate_data(
'url' => $url, array(
), array( 'url' => $url,
'url' => array('string', true, 5, 255), ),
))); array(
'url' => array('string', true, 5, 255),
)
);
$error = array_merge($error, $validate_array);
if (!empty($error)) if (!empty($error))
{ {

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

@ -590,7 +590,7 @@ class ucp_profile
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . ' SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . $user->data['user_id']; WHERE user_id = ' . (int) $user->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
@ -615,7 +615,7 @@ class ucp_profile
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $result) . ' SET ' . $db->sql_build_array('UPDATE', $result) . '
WHERE user_id = ' . $user->data['user_id']; WHERE user_id = ' . (int) $user->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);