phpBB

Code Changes

File: includes/ucp/ucp_activate.php

  Unmodified   Added   Modified   Removed
Line 29Line 29

function main($id, $mode)
{


function main($id, $mode)
{

		global $config, $phpbb_root_path, $phpEx;
global $db, $user, $auth, $template, $phpbb_container;

		global $config, $phpbb_root_path, $phpEx, $request;
global $db, $user, $auth, $phpbb_container, $phpbb_log, $phpbb_dispatcher;





		$user_id = request_var('u', 0);
$key = request_var('k', '');

		$user_id = $request->variable('u', 0);
$key = $request->variable('k', '');


$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason
FROM ' . USERS_TABLE . "


$sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason
FROM ' . USERS_TABLE . "

Line 67Line 67
			{
login_box('', $user->lang['NO_AUTH_OPERATION']);
}

			{
login_box('', $user->lang['NO_AUTH_OPERATION']);
}

 
			send_status_line(403, 'Forbidden');

			trigger_error('NO_AUTH_OPERATION');
}


			trigger_error('NO_AUTH_OPERATION');
}


Line 86Line 87
				WHERE user_id = ' . $user_row['user_id'];
$db->sql_query($sql);


				WHERE user_id = ' . $user_row['user_id'];
$db->sql_query($sql);


			add_log('user', $user_row['user_id'], 'LOG_USER_NEW_PASSWORD', $user_row['username']);




			$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_NEW_PASSWORD', false, array(
'reportee_id' => $user_row['user_id'],
$user_row['username']
));

		}

if (!$update_password)

		}

if (!$update_password)

Line 101Line 105
			$db->sql_query($sql);

// Create the correct logs

			$db->sql_query($sql);

// Create the correct logs

			add_log('user', $user_row['user_id'], 'LOG_USER_ACTIVE_USER');




			$phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_ACTIVE_USER', false, array(
'reportee_id' => $user_row['user_id']
));


			if ($auth->acl_get('a_user'))
{

			if ($auth->acl_get('a_user'))
{

				add_log('admin', 'LOG_USER_ACTIVE', $user_row['username']);

				$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_ACTIVE', false, array($user_row['username']));

			}
}

if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password)
{

			}
}

if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password)
{

 
			/* @var $phpbb_notifications \phpbb\notification\manager */

			$phpbb_notifications = $phpbb_container->get('notification_manager');
$phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']);


			$phpbb_notifications = $phpbb_container->get('notification_manager');
$phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']);


Line 142Line 150
				$message = 'PASSWORD_ACTIVATED';
}
}

				$message = 'PASSWORD_ACTIVATED';
}
}

 

/**
* This event can be used to modify data after user account's activation
*
* @event core.ucp_activate_after
* @var array user_row Array with some user data
* @var string message Language string of the message that will be displayed to the user
* @since 3.1.6-RC1
*/
$vars = array('user_row', 'message');
extract($phpbb_dispatcher->trigger_event('core.ucp_activate_after', compact($vars)));


meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
trigger_error($user->lang[$message]);


meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx"));
trigger_error($user->lang[$message]);