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

- create forums by default

Browse Source 
- hide prune options if not enabled
- fixed module management enable/disable switch if in module itself
- fixed some schema errors
- adjusted $user->page array generation for developers calling scripts outside of phpBB root


git-svn-id: file:///svn/phpbb/trunk@5995 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-06-01 13:47:42 +00:00
parent 4354cda6dc
commit 721a9dd4a1
22 changed files with 172 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
phpBB/includes/functions_profile_fields.php
View File

@@ -355,14 +355,8 @@ class custom_profile
WHERE user_id IN (' . implode(', ', array_map('intval', $user_id)) . ')';
$result = $db->sql_query($sql);
if (!($row = $db->sql_fetchrow($result)))
{
$db->sql_freeresult($result);
return array();
}
$user_fields = array();
do
while ($row = $db->sql_fetchrow($result))
{
foreach ($row as $ident => $value)
{
@@ -372,8 +366,7 @@ class custom_profile
$user_fields[$row['user_id']][$ident]['data'] = $this->profile_cache[$ident];
}
}
}
while ($row = $db->sql_fetchrow($result));
}
$db->sql_freeresult($result);
return $user_fields;
@@ -431,6 +424,10 @@ class custom_profile
switch ($this->profile_types[$field_type])
{
case 'int':
if ($value == '')
{
return NULL;
}
return (int) $value;
break;
@@ -493,7 +490,7 @@ class custom_profile
if ($ident_ary['data']['field_length'] == 1)
{
$this->options_lang[$field_id][$lang_id][(int) $value];
return (isset($this->options_lang[$field_id][$lang_id][(int) $value])) ? $this->options_lang[$field_id][$lang_id][(int) $value] : NULL;
}
else if (!$value)
{
@@ -527,6 +524,30 @@ class custom_profile
{
$value = (isset($_REQUEST[$profile_row['field_ident']])) ? true : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]);
}
else if ($profile_row['field_type'] == FIELD_INT)
{
if (isset($_REQUEST[$profile_row['field_ident']]))
{
$value = ($_REQUEST[$profile_row['field_ident']] === '') ? NULL : request_var($profile_row['field_ident'], $default_value);
}
else
{
if (is_null($user->profile_fields[$user_ident]) && !$preview)
{
$value = NULL;
}
else if (!isset($user->profile_fields[$user_ident]) || $preview)
{
$value = $default_value;
}
else
{
$value = $user->profile_fields[$user_ident];
}
}
return (is_null($value)) ? '' : (int) $value;
}
else
{
$value = (isset($_REQUEST[$profile_row['field_ident']])) ? request_var($profile_row['field_ident'], $default_value, true) : ((!isset($user->profile_fields[$user_ident]) || $preview) ? $default_value : $user->profile_fields[$user_ident]);
@@ -818,6 +839,17 @@ class custom_profile
$var = request_var($var_name, $profile_row['field_default_value'], true);
break;
case FIELD_INT:
if (isset($_REQUEST[$var_name]) && $_REQUEST[$var_name] === '')
{
$var = NULL;
}
else
{
$var = request_var($var_name, $profile_row['field_default_value']);
}
break;
default:
$var = request_var($var_name, $profile_row['field_default_value']);
break;