4 files changed, 143 insertions, 83 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index dbd992fbf2..43d04eda4a 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -3,7 +3,7 @@
 //
 // $Id$
 //
-// FILENAME  : usercp_activate.php
+// FILENAME  : ucp_activate.php
 // STARTED   : Mon May 19, 2003
 // COPYRIGHT : © 2001, 2003 phpBB Group
 // WWW       : http://www.phpbb.com/
@@ -13,74 +13,86 @@
  
 class ucp_activate extends module 
 {
-	function main($module_id)
+	function ucp_activate($id, $mode)
 	{
 		global $censors, $config, $db, $user, $auth, $SID, $template, $phpbb_root_path, $phpEx;
 
-		$user_id = (isset($_REQUEST['u'])) ? intval($_REQUEST['u']) : false;
+		$user_id = request_var('u', 0);
+		$key = request_var('k', '');
 
-		$sql = 'SELECT user_id, username, user_active, user_email, user_newpasswd, user_lang, user_actkey
+		$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey
 			FROM ' . USERS_TABLE . "
 			WHERE user_id = $user_id";
 		$result = $db->sql_query($sql);
 
-		if ($row = $db->sql_fetchrow($result))
+		if (!($row = $db->sql_fetchrow($result)))
 		{
-			if ($row['user_active'] && $row['user_actkey'] == '')
-			{
-				meta_refresh(3, "index.$phpEx$SID");
-				trigger_error($user->lang['Already_activated']);
-			}
-			else if ($row['user_actkey'] == $_GET['k'])
-			{
-				$sql_update_pass = ($row['user_newpasswd'] != '') ? ", user_password = '" . $db->sql_escape($row['user_newpasswd']) . "', user_newpasswd = ''" : '';
-
-				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_active = 1, user_actkey = ''" . $sql_update_pass . "
-					WHERE user_id = " . $row['user_id'];
-				$result = $db->sql_query($sql);
-
-				if ($config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass == '')
-				{
-					$this->include_file('includes/emailer');
-					$emailer = new emailer($config['smtp_delivery']);
-
-					$emailer->use_template('admin_welcome_activated', $row['user_lang']);
-					$emailer->to($row['user_email']);
-
-					$emailer->assign_vars(array(
-						'SITENAME'	=> $config['sitename'],
-						'USERNAME'	=> $row['username'],
-						'PASSWORD'	=> $password_confirm,
-						'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']))
-					);
-					$emailer->send();
-					$emailer->reset();
-
-					meta_refresh(3, "index.$phpEx$SID");
-					trigger_error($user->lang['Account_active_admin']);
-				}
-				else
-				{
-					meta_refresh(3, "index.$phpEx$SID");
-					$message = (!$sql_update_pass) ? $user->lang['ACCOUNT_ACTIVE'] : $user->lang['PASSWORD_ACTIVATED'];
-					trigger_error($message);
-				}
-
-				set_config('newest_user_id', $row['user_id']);
-				set_config('newest_username', $row['username']);
-				set_config('num_users', $config['num_users'] + 1, TRUE);
-			}
-			else
-			{
-				trigger_error($user->lang['Wrong_activation']);
-			}
+			trigger_error($user->lang['NO_USER']);
+		}
+		$db->sql_freeresult($result);
+
+		if ($row['user_type'] <> USER_INACTIVE && !$row['user_newpasswd'])
+		{
+			meta_refresh(3, "index.$phpEx$SID");
+			trigger_error($user->lang['ALREADY_ACTIVATED']);
+		}
+		
+		if ($row['user_actkey'] != $key)
+		{
+			trigger_error($user->lang['WRONG_ACTIVATION']);
+		}
+
+		$sql_update_pass = ($row['user_newpasswd']) ? ", user_password = '" . $db->sql_escape($row['user_newpasswd']) . "', user_newpasswd = ''" : '';
+
+		$sql = 'UPDATE ' . USERS_TABLE . '
+			SET user_type = ' . USER_NORMAL . ", user_actkey = ''$sql_update_pass 
+			WHERE user_id = " . $row['user_id'];
+		$result = $db->sql_query($sql);
+
+		if ($config['require_activation'] == USER_ACTIVATION_ADMIN && $sql_update_pass)
+		{
+			include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
+
+			$messenger = new messenger();
+
+			$messenger->template('admin_welcome_activated', $row['user_lang']);
+			$messenger->subject($subject);
+
+			$messenger->replyto($user->data['board_contact']);
+			$messenger->to($row['user_email'], $row['username']);
+
+			$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
+			$messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
+			$messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']);
+			$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
+
+			$messenger->assign_vars(array(
+				'SITENAME'	=> $config['sitename'],
+				'USERNAME'	=> $row['username'],
+				'PASSWORD'	=> $password_confirm,
+				'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']))
+			);
+
+			$messenger->send($row['user_notify_type']);
+			$messenger->queue->save();
+
+			$message = 'ACCOUNT_ACTIVE_ADMIN';
+
 		}
 		else
 		{
-			trigger_error($user->lang['NO_USER']);
+			$message = (!$sql_update_pass) ? 'ACCOUNT_ACTIVE' : 'PASSWORD_ACTIVATED';
 		}
-		$db->sql_freeresult($result);
+
+		if (!$sql_update_pass)
+		{
+			set_config('newest_user_id', $row['user_id']);
+			set_config('newest_username', $row['username']);
+			set_config('num_users', $config['num_users'] + 1, TRUE);
+		}
+
+		meta_refresh(3, "index.$phpEx$SID");
+		trigger_error($user->lang[$message]);
 	}
 }
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 367c0dd6d5..f78ae8c5db 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -91,6 +91,9 @@ class ucp_profile extends module
 							update_username($user->data['username'], $username);
 						}
 
+						// TODO
+						// If email changed and email activation enabled, deactivate and notify
+
 						meta_refresh(3, "ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode");
 						$message = $user->lang['PROFILE_UPDATED'] . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], "<a href=\"ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode\">", '</a>');
 						trigger_error($message);
@@ -358,6 +361,9 @@ class ucp_profile extends module
 
 			case 'avatar':
 
+				$display_gallery = (isset($_POST['displaygallery'])) ? true : false;
+				$avatar_category = request_var('category', '');
+
 				// Can we upload? 
 				$can_upload = ($config['allow_avatar_upload'] && file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path']) && $auth->acl_get('u_chgavatar') && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
 
@@ -386,6 +392,8 @@ class ucp_profile extends module
 
 					if (!sizeof($error))
 					{
+						$data['user_id'] = $user->data['user_id'];
+
 						if (!empty($_FILES['uploadfile']['tmp_name']) && $can_upload)
 						{
 							$data = avatar_upload($data, $error);
@@ -444,10 +452,10 @@ class ucp_profile extends module
 					switch ($user->data['user_avatar_type'])
 					{
 						case AVATAR_UPLOAD:
-							$avatar_img = $config['avatar_path'] . '/';
+							$avatar_img = $phpbb_root_path . $config['avatar_path'] . '/';
 							break;
 						case AVATAR_GALLERY:
-							$avatar_img = $config['avatar_gallery_path'] . '/';
+							$avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/';
 							break;
 					}
 					$avatar_img .= $user->data['user_avatar'];
@@ -457,37 +465,76 @@ class ucp_profile extends module
 
 				$template->assign_vars(array(
 					'ERROR'			=> (sizeof($error)) ? implode('<br />', $error) : '', 
-
 					'AVATAR'		=> $avatar_img, 
 					'AVATAR_SIZE'	=> $config['avatar_filesize'], 
-					'AVATAR_URL'	=> (isset($uploadurl)) ? $uploadurl : '', 
-					'AVATAR_REMOTE'	=> (isset($remotelink)) ? $remotelink : (($user->data['user_avatar_type'] == AVATAR_REMOTE) ? $user->data['user_avatar'] : ''), 
-					'WIDTH'			=> (isset($width)) ? $width : $user->data['user_avatar_width'], 
-					'HEIGHT'		=> (isset($height)) ? $height : $user->data['user_avatar_height'], 
-
-					'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)), 
-
-					'S_FORM_ENCTYPE'		=> ($can_upload) ? ' enctype="multipart/form-data"' : '', 
-					'S_UPLOAD_AVATAR_FILE'	=> $can_upload,
-					'S_UPLOAD_AVATAR_URL'	=> $can_upload, 
-					'S_LINK_AVATAR'			=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false, 
-					'S_GALLERY_AVATAR'		=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) ? true : false,
-					'S_AVATAR_CAT_OPTIONS'	=> $s_categories, 
-					'S_AVATAR_PAGE_OPTIONS'	=> $s_pages,)
+
+					'S_FORM_ENCTYPE'	=> ($can_upload) ? ' enctype="multipart/form-data"' : '', 
+
+					'L_AVATAR_EXPLAIN'	=> sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)),)
 				);
 
+				if ($display_gallery && $auth->acl_get('u_chgavatar') && $config['allow_avatar_local'])
+				{
+					$avatar_list = avatar_gallery($category, $error);
+
+					$category = (!$category) ? key($avatar_list) : $category;
+
+					$s_category_options = '';
+					foreach (array_keys($avatar_list) as $cat)
+					{
+						$s_category_options .= '<option value="' . $cat . '">' . $cat . '</option>';
+					}
+
+					$template->assign_vars(array(
+						'S_DISPLAY_GALLERY'	=> true,
+						'S_CAT_OPTIONS'		=> $s_category_options)
+					);
+
+					foreach ($avatar_list[$category] as $avatar_row_ary)
+					{
+						$template->assign_block_vars('avatar_row', array());
+
+						foreach ($avatar_row_ary as $avatar_col_ary)
+						{
+							$template->assign_block_vars('avatar_row.avatar_column', array(
+								'AVATAR_IMAGE'	=> $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'],
+								'AVATAR_NAME'	=> $avatar_col_ary['name'])
+							);
+
+							$template->assign_block_vars('avatar_row.avatar_option_column', array(
+								'AVATAR_IMAGE'	=> $phpbb_root_path . $config['avatar_gallery_path'] . '/' . $avatar_col_ary['file'],)
+							);
+						}
+					}
+				}
+				else
+				{
+					$template->assign_vars(array(
+						'AVATAR'		=> $avatar_img, 
+						'AVATAR_SIZE'	=> $config['avatar_filesize'], 
+						'WIDTH'			=> (isset($width)) ? $width : $user->data['user_avatar_width'], 
+						'HEIGHT'		=> (isset($height)) ? $height : $user->data['user_avatar_height'], 
+
+						'S_UPLOAD_AVATAR_FILE'	=> $can_upload,
+						'S_UPLOAD_AVATAR_URL'	=> $can_upload, 
+						'S_LINK_AVATAR'			=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false, 
+						'S_GALLERY_AVATAR'		=> ($auth->acl_get('u_chgavatar') && $config['allow_avatar_local']) ? true : false,
+						'S_AVATAR_CAT_OPTIONS'	=> $s_categories, 
+						'S_AVATAR_PAGE_OPTIONS'	=> $s_pages,)
+					);
+				}
+
 				break;
 		}
 
 		$template->assign_vars(array(
 			'L_TITLE'	=> $user->lang['UCP_' . strtoupper($mode)],
 
-			'S_DISPLAY_' . strtoupper($mode)	=> true, 
-			'S_HIDDEN_FIELDS'					=> $s_hidden_fields,
-			'S_UCP_ACTION'						=> "ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode")
+			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
+			'S_UCP_ACTION'		=> "ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode")
 		);
 
-		$this->display($user->lang['UCP_PROFILE'], 'ucp_profile.html');
+		$this->display($user->lang['UCP_PROFILE'], 'ucp_profile_' . $mode . '.html');
 	}
 }
 
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index a6742d8687..c6be2e8b05 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -152,11 +152,11 @@ class ucp_register extends module
 					$key_len = 54 - (strlen($server_url));
 					$key_len = ($key_len > 6) ? $key_len : 6;
 					$user_actkey = substr($user_actkey, 0, $key_len);
-					$user_active = 0;
+					$user_type = USER_INACTIVE;
 				}
 				else
 				{
-					$user_active = 1;
+					$user_type = USER_NORMAL;
 					$user_actkey = '';
 				}
 		
@@ -170,7 +170,7 @@ class ucp_register extends module
 					'user_timezone' => (float) $tz,
 					'user_lang'		=> $lang,
 					'user_allow_pm'	=> 1,
-					'user_active'	=> $user_active,
+					'user_type'		=> $user_type,
 					'user_actkey'	=> $user_actkey, 
 					'user_ip'		=> $user->ip, 
 					'user_regdate'	=> time(),
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index 98b44640c1..80b863b321 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -24,7 +24,7 @@ class ucp_remind extends module
 			$username	= request_var('username', '');
 			$email		= request_var('email', '');
 
-			$sql = 'SELECT user_id, username, user_email, user_jabber, user_notify_type, user_active, user_lang
+			$sql = 'SELECT user_id, username, user_email, user_jabber, user_notify_type, user_type, user_lang
 				FROM ' . USERS_TABLE . "
 				WHERE user_email = '" . $db->sql_escape($email) . "'
 					AND username = '" . $db->sql_escape($username) . "'";
@@ -39,13 +39,14 @@ class ucp_remind extends module
 			}
 			$db->sql_freeresult($result);
 
-			if (!$row['user_active'])
+			if ($row['user_type'] == USER_INACTIVE)
 			{
 				trigger_error($lang['ACCOUNT_INACTIVE']);
 			}
 
 			$server_url = generate_board_url();
 			$username = $row['username'];
+			$user_id = $row['user_id'];
 
 			$key_len = 54 - strlen($server_url);
 			$key_len = ($str_len > 6) ? $key_len : 6;
@@ -74,7 +75,7 @@ class ucp_remind extends module
 				'PASSWORD'	=> $user_password,
 				'EMAIL_SIG'	=> str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
 
-				'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&k=$user_actkey")
+				'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
 			);
 
 			$messenger->send($row['user_notify_type']);