mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

BBCode enabled profile fields, removed field_name from profile fields, fixed some uninitialised variable issues, some small conversion issues

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5076 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Bart van Bragt
2005-01-24 13:14:31 +00:00
parent 61fbde5a72
commit 0a1b040588
14 changed files with 197 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions.php
View File

@@ -598,7 +598,7 @@ function markread($mode, $forum_id = 0, $topic_id = 0, $marktime = false)
}
// Default tracking type
// $type = TRACK_NORMAL;
$type = TRACK_NORMAL;
$current_time = ($marktime) ? $marktime : time();
$topic_id = (int) $topic_id;

4
phpBB/includes/functions_admin.php
View File

@@ -1344,7 +1344,9 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = FALSE,
unset($topic_data);
// if some topics have been resync'ed then resync parent forums
if ($resync_parents && sizeof($resync_forums))
// except when we're only syncing a range, we don't want to sync forums during
// batch processing.
if ($resync_parents && sizeof($resync_forums) && $where_type != 'range')
{
sync('forum', 'forum_id', $resync_forums, TRUE);
}

116
phpBB/includes/functions_profile_fields.php
View File

@@ -92,8 +92,27 @@ class custom_profile
while ($row = $db->sql_fetchrow($result))
{
$cp_data[$row['field_ident']] = $this->get_profile_field($row);
// get_profile_field returns an array with values for TEXT fields.
if(is_array($cp_data[$row['field_ident']]))
{
// Contains the original text without bbcode processing etc
$check_value = $cp_data[$row['field_ident']]['submitted'];
if (($cp_result = $this->validate_profile_field($row['field_type'], $cp_data[$row['field_ident']], $row)) !== false)
foreach($cp_data[$row['field_ident']] as $key => $value)
{
if($key != 'submitted')
{
$cp_data[$key] = $value;
}
}
}
else
{
$check_value = $cp_data[$row['field_ident']];
}
if (($cp_result = $this->validate_profile_field($row['field_type'], $check_value, $row)) !== false)
{
// If not and only showing common error messages, use this one
$error = '';
@@ -193,34 +212,40 @@ class custom_profile
{
return array();
}
$user_fields = array();
do
{
foreach ($row as $ident => $value)
{
if ($ident != 'user_id')
if (isset($this->profile_cache[$ident]))
{
$user_fields[$row['user_id']][$ident]['value'] = $value;
$user_fields[$row['user_id']][$ident]['data'] = $this->profile_cache[$ident];
}
else if($i = strpos($ident, '_bbcode'))
{
// Add extra data (bbcode_uid and bbcode_bitfield) to the data for this profile field.
// TODO: Maybe we should try to make this a bit more generic (not limited to bbcode)?
$field = substr($ident, 0, $i);
$subfield = substr($ident, $i+1);
$user_fields[$row['user_id']][$field]['data'][$subfield] = $value;
}
}
}
while ($row = $db->sql_fetchrow($result));
$db->sql_freeresult($result);
return $user_fields;
}
else if ($mode == 'show')
{
// $profile_row == $user_fields[$row['user_id']]
// $profile_row == $user_fields[$row['user_id']];
$tpl_fields = array();
foreach ($profile_row as $ident => $ident_ary)
{
$tpl_fields += array(
'PROFILE_' . strtoupper($ident) . '_VALUE' => $this->get_profile_value($ident_ary['data']['field_id'], $ident_ary['data']['lang_id'], $ident_ary['data']['field_type'], $ident_ary['value']),
'PROFILE_' . strtoupper($ident) . '_VALUE' => $this->get_profile_value($ident_ary),
'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'],
'PROFILE_' . strtoupper($ident) . '_NAME' => $ident_ary['data']['lang_name'],
'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $ident_ary['data']['lang_explain'],
@@ -291,6 +316,7 @@ class custom_profile
break;
case FIELD_DROPDOWN:
print_r($field_data['field_novalue']);
if ($field_value == $field_data['field_novalue'] && $field_data['field_required'])
{
return 'FIELD_REQUIRED';
@@ -331,23 +357,37 @@ class custom_profile
return false;
}
// Get Profile Value
function get_profile_value($field_id, $lang_id, $field_type, $value)
// Get Profile Value for display
function get_profile_value($ident_ary)
{
$value = $ident_ary['value'];
$field_type = $ident_ary['data']['field_type'];
switch ($this->profile_types[$field_type])
{
case 'int':
return (int) $value;
break;
case 'string':
return str_replace("\n", '<br />', $value);
break;
case 'text':
// Prepare further, censor_text, smilies, bbcode, html, whatever
if ($ident_ary['data']['bbcode_bitfield'])
{
$bbcode = new bbcode($ident_ary['data']['bbcode_bitfield']);
$bbcode->bbcode_second_pass($value, $ident_ary['data']['bbcode_uid'], $ident_ary['data']['bbcode_bitfield']);
$value = smilie_text($value);
$value = censor_text($value);
}
return str_replace("\n", '<br />', $value);
break;
case 'date':
break;
case 'dropdown':
if (!sizeof($this->options_lang[$field_id][$lang_id]))
$field_id = $ident_ary['data']['field_id'];
$lang_id = $ident_ary['data']['lang_id'];
if (!isset($this->options_lang[$field_id][$lang_id]))
{
$this->get_option_lang($field_id, $lang_id, FIELD_DROPDOWN, false);
}
@@ -356,6 +396,9 @@ class custom_profile
break;
case 'bool':
break;
default:
trigger_error('Unknown profile type');
break;
}
}
@@ -364,16 +407,16 @@ class custom_profile
{
global $user;
$profile_row['field_name'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
// checkbox - only testing for isset
if ($profile_row['field_type'] == FIELD_BOOL && $profile_row['field_length'] == 2)
{
$value = (isset($_REQUEST[$profile_row['field_name']])) ? true : ((!isset($user->profile_fields[$profile_row['field_ident']]) || $preview) ? $default_value : $user->profile_fields[$profile_row['field_ident']]);
$value = (isset($_REQUEST[$profile_row['field_ident']])) ? true : ((!isset($user->profile_fields[$profile_row['field_ident']]) || $preview) ? $default_value : $user->profile_fields[$profile_row['field_ident']]);
}
else
{
$value = (isset($_REQUEST[$profile_row['field_name']])) ? request_var($profile_row['field_name'], $default_value) : ((!isset($user->profile_fields[$profile_row['field_ident']]) || $preview) ? $default_value : $user->profile_fields[$profile_row['field_ident']]);
$value = (isset($_REQUEST[$profile_row['field_ident']])) ? request_var($profile_row['field_ident'], $default_value) : ((!isset($user->profile_fields[$profile_row['field_ident']]) || $preview) ? $default_value : $user->profile_fields[$profile_row['field_ident']]);
}
switch ($field_validation)
@@ -401,10 +444,10 @@ class custom_profile
{
global $user;
$profile_row['field_name'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
$profile_row['field_ident'] = (isset($profile_row['var_name'])) ? $profile_row['var_name'] : 'pf_' . $profile_row['field_ident'];
$now = getdate();
if (!isset($_REQUEST[$profile_row['field_name'] . '_day']))
if (!isset($_REQUEST[$profile_row['field_ident'] . '_day']))
{
if ($profile_row['field_default_value'] == 'now')
{
@@ -421,9 +464,9 @@ class custom_profile
}
else
{
$day = request_var($profile_row['field_name'] . '_day', 0);
$month = request_var($profile_row['field_name'] . '_month', 0);
$year = request_var($profile_row['field_name'] . '_year', 0);
$day = request_var($profile_row['field_ident'] . '_day', 0);
$month = request_var($profile_row['field_ident'] . '_month', 0);
$year = request_var($profile_row['field_ident'] . '_year', 0);
}
}
@@ -482,7 +525,8 @@ class custom_profile
{
global $template;
$value = $this->get_var('', $profile_row, $profile_row['lang_default_value'], $preview);
// Get the data associated with this field for this user
$value = $this->get_var('', $profile_row, $profile_row['lang_default_value'], $preview);
$this->set_tpl_vars($profile_row, $value);
return $this->get_cp_html();
@@ -491,8 +535,16 @@ class custom_profile
function generate_text($profile_row, $preview = false)
{
global $template;
global $user;
$value = $this->get_var('', $profile_row, $profile_row['lang_default_value'], $preview);
if($preview == false)
{
$message_parser = new parse_message();
$message_parser->message = $value;
$message_parser->decode_message($user->profile_fields[$profile_row['field_ident'] . '_bbcode_uid']);
$value = $message_parser->message;
}
$field_length = explode('|', $profile_row['field_length']);
$profile_row['field_rows'] = $field_length[0];
@@ -529,7 +581,7 @@ class custom_profile
}
// Return Templated value (change == user is able to set/enter profile values; show == just show the value)
// Return Templated value (change == user is able to set/enter profile values; preview == just show the value)
function process_field_row($mode, $profile_row)
{
$preview = false;
@@ -579,11 +631,14 @@ class custom_profile
function get_profile_field($profile_row)
{
global $phpbb_root_path, $phpEx;
global $config;
$var_name = 'pf_' . $profile_row['field_ident'];
switch ($profile_row['field_type'])
{
case FIELD_DATE:
$var_name = 'pf_' . $profile_row['field_ident'];
if (!isset($_REQUEST[$var_name . '_day']))
{
if ($profile_row['field_default_value'] == 'now')
@@ -602,9 +657,22 @@ class custom_profile
$var = sprintf('%2d-%2d-%4d', $day, $month, $year);
break;
case FIELD_TEXT:
include_once($phpbb_root_path . 'includes/message_parser.' . $phpEx);
$message_parser = new parse_message(request_var($var_name, ''));
// Get the allowed settings from the global settings. Magic URLs are always set to true.
// TODO: It might be nice to make this a per field setting.
$message_parser->parse($config['allow_html'], $config['allow_bbcode'], true, $config['allow_smilies']);
$var = array($profile_row['field_ident'] => $message_parser->message,
$profile_row['field_ident'] . '_bbcode_uid' => $message_parser->bbcode_uid,
$profile_row['field_ident'] . '_bbcode_bitfield' => $message_parser->bbcode_bitfield,
'submitted' => request_var($var_name, ''));
break;
default:
$var = request_var('pf_' . $profile_row['field_ident'], $profile_row['field_default_value']);
$var = request_var($var_name, $profile_row['field_default_value']);
break;
}
return $var;
@@ -795,4 +863,4 @@ class custom_profile_admin extends custom_profile
}
}
?>
?>

15
phpBB/includes/message_parser.php
View File

@@ -659,13 +659,16 @@ class parse_message extends bbcode_firstpass
$replace = array("\n", '', "\n\n");
$this->message = preg_replace($match, $replace, trim($this->message));
// Message length check
$msg_len = ($mode == 'post') ? strlen($this->message) : strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#is', ' ', $this->message));
if (!$msg_len || ($config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars']))
// Message length check. -1 disables this check completely, even allows empty messsages.
if($config['max_' . $mode . '_chars'] != -1)
{
$this->warn_msg[] = (!$msg_len) ? $user->lang['TOO_FEW_CHARS'] : $user->lang['TOO_MANY_CHARS'];
return $this->warn_msg;
$msg_len = ($mode == 'post') ? strlen($this->message) : strlen(preg_replace('#\[\/?[a-z\*\+\-]+(=[\S]+)?\]#is', ' ', $this->message));
if (!$msg_len || ($config['max_' . $mode . '_chars'] && $msg_len > $config['max_' . $mode . '_chars']))
{
$this->warn_msg[] = (!$msg_len) ? $user->lang['TOO_FEW_CHARS'] : $user->lang['TOO_MANY_CHARS'];
return $this->warn_msg;
}
}
// Parse HTML

2
phpBB/includes/session.php
View File

@@ -78,7 +78,7 @@ class session
}
// session_id exists so go ahead and attempt to grab all data in preparation
if (!empty($this->session_id) && (!defined('NEED_SID') || $this->session_id == $_GET['sid']))
if (!empty($this->session_id) && (!defined('NEED_SID') || (isset($_GET['sid']) && $this->session_id == $_GET['sid'])))
{
$sql = 'SELECT u.*, s.*
FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u

13
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@@ -421,13 +421,16 @@ function get_user_informations($user_id, $user_row)
}
else
{
foreach ($ranks['normal'] as $rank)
if(isset($ranks['normal']))
{
if ($user_row['user_posts'] >= $rank['rank_min'])
foreach ($ranks['normal'] as $rank)
{
$user_row['rank_title'] = $rank['rank_title'];
$user_row['rank_image'] = (!empty($rank['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $rank['rank_image'] . '" border="0" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" /><br />' : '';
break;
if ($user_row['user_posts'] >= $rank['rank_min'])
{
$user_row['rank_title'] = $rank['rank_title'];
$user_row['rank_image'] = (!empty($rank['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $rank['rank_image'] . '" border="0" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" /><br />' : '';
break;
}
}
}
}

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

@@ -202,6 +202,10 @@ class ucp_profile extends module
case 'profile_info':
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
// TODO: The posting file is included because $message_parser->decode_message() relies on decode_message() in the posting functions.
include($phpbb_root_path . 'includes/functions_posting.'.$phpEx);
$cp = new custom_profile();
$cp_data = $cp_error = array();