mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 08:35:31 +02:00
Code Issues Releases Wiki Activity

[ticket/10561] Moved and renamed the funtion validate_style().

Browse Source 
Fixed minor changes as suggested by @bantu.

PHPBB3-10561
This commit is contained in:
Hari Sankar R 2012-04-05 19:31:18 +05:30
parent a84b97f58e
commit 018419b36c
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/functions.php
View File

@ -1238,26 +1238,6 @@ function style_select($default = '', $all = false)
return $style_options; return $style_options;
} }
/**
* @author Hari Sankar R <hsr@theinglorio.us>
* @param int $style_id The style_id of a style which should be checked if activated or not.
* @return boolean
*/
function phpbb_style_is_active($style_id)
{
global $db;
$sql = 'SELECT style_active
FROM ' . STYLES_TABLE . "
WHERE style_id = ". (int) $style_id;
$result = $db->sql_query($sql);
$style_is_active = (bool) $db->sql_fetchfield('style_active');
$db->sql_freeresult($result);
return $style_is_active;
}
/** /**
* Pick a timezone * Pick a timezone
*/ */

19
phpBB/includes/functions_user.php
View File

@ -1948,6 +1948,25 @@ function validate_jabber($jid)
return false; return false;
} }
/**
* @param int $style_id The style_id of a style which should be checked if activated or not.
* @return boolean
*/
function phpbb_validate_style($style_id)
{
global $db;
$sql = 'SELECT style_active
FROM ' . STYLES_TABLE . '
WHERE style_id = '. (int) $style_id;
$result = $db->sql_query($sql);
$style_is_active = (bool) $db->sql_fetchfield('style_active');
$db->sql_freeresult($result);
return $style_is_active;
}
/** /**
* Remove avatar * Remove avatar
*/ */

10
phpBB/includes/ucp/ucp_prefs.php
View File

@ -61,8 +61,14 @@ class ucp_prefs
if ($submit) if ($submit)
{ {
$data['style'] = ($config['override_user_style']) ? $config['default_style'] : if ($config['override_user_style'])
(phpbb_style_is_active($data['style']) ? $data['style'] : ((int) $user->data['user_style'])); {
$data['style'] = $config['default_style'];
}
else if (!phpbb_validate_style($data['style']))
{
$data['style'] = (int) $user->data['user_style']);
}
$error = validate_data($data, array( $error = validate_data($data, array(
'dateformat' => array('string', false, 1, 30), 'dateformat' => array('string', false, 1, 30),