aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-05-12 20:52:58 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-05-12 20:52:58 +0000
commita8d99f2228cc042c8410553f5f3ec375148552f5 (patch)
tree11ccbd184cbc222775a08852d633d74ced7b2695 /phpBB/includes/ucp
parent7dd067bf5a532e4c30908cca24449274a4863326 (diff)
downloadforums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar
forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.gz
forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.bz2
forums-a8d99f2228cc042c8410553f5f3ec375148552f5.tar.xz
forums-a8d99f2228cc042c8410553f5f3ec375148552f5.zip
- introduce new function build_url to easily build a valid url from the user->page object as well as optionally removing certain keys
- changed attachment config to utilize the config build methods - cleaned up posting.php - the submit/delete_post functions are now usable (functions_posting.php) - adjusted header icons (transparency) - a bunch of fixes for mssql - bug fixes git-svn-id: file:///svn/phpbb/trunk@5902 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_groups.php5
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php2
-rw-r--r--phpBB/includes/ucp/ucp_register.php13
3 files changed, 13 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index b8642ca69d..1806fc4d94 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -49,6 +49,7 @@ class ucp_groups
while ($row = $db->sql_fetchrow($result))
{
+ $row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
$group_row[$row['group_id']] = $row;
}
$db->sql_freeresult($result);
@@ -58,10 +59,6 @@ class ucp_groups
trigger_error('GROUP_NOT_EXIST');
}
- $group_row[$group_id]['group_name'] = ($group_row[$group_id]['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row[$group_id]['group_name']] : $group_row[$group_id]['group_name'];
- $group_row[$user->data['group_id']]['group_name'] = ($group_row[$user->data['group_id']]['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row[$user->data['group_id']]['group_name']] : $group_row[$user->data['group_id']]['group_name'];
-
-
switch ($action)
{
case 'change_default':
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 45cd22a13c..7c06895494 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -512,7 +512,7 @@ function compose_pm($id, $mode, $action)
trigger_error($message);
}
- $message_subject = stripslashes($subject);
+ $message_subject = $subject;
}
// Preview
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 9e04caf41f..40d530f808 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -24,7 +24,7 @@ class ucp_register
{
trigger_error($user->lang['UCP_REGISTER_DISABLE']);
}
-
+$config['max_reg_attempts'] = 0;
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$confirm_id = request_var('confirm_id', '');
@@ -236,6 +236,7 @@ class ucp_register
$sql_ary = array(
'username' => $username,
+ 'user_permissions' => '',
'user_password' => md5($new_password),
'user_email' => $email,
'user_email_hash' => (int) crc32(strtolower($email)) . strlen($email),
@@ -248,7 +249,15 @@ class ucp_register
'user_actkey' => $user_actkey,
'user_ip' => $user->ip,
'user_regdate' => time(),
- 'user_lastmark' => time(),
+
+ 'user_lastmark' => time(),
+ 'user_lastvisit' => 0,
+ 'user_lastpost_time' => 0,
+ 'user_lastpage' => '',
+ 'user_posts' => 0,
+ 'user_dst' => 0,
+ 'user_colour' => '',
+ 'user_avatar' => '',
);
$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);