github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 06:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

r481

Browse source 
фикс рассылки писем об активации, если активация одобряется администратором git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@481 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2012-12-05 22:17:42 +00:00
commit d83d147ed0
4 changed files with 57 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
upload/config.php
View file

@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.5 pre-stable';
$bb_cfg['tp_release_date'] = '5-12-2012';
$bb_cfg['tp_release_state'] = 'R480';
$bb_cfg['tp_release_date'] = '6-12-2012';
$bb_cfg['tp_release_state'] = 'R481';
// Database
$charset = 'utf8';

4
upload/includes/ucp/usercp_activate.php
View file

@ -39,7 +39,7 @@ if ( $row = DB()->sql_fetchrow($result) )
}
}
$sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . DB()->escape($row['user_newpasswd']) . "', user_newpasswd = ''" : '';
$sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . md5(md5($row['user_newpasswd'])) . "', user_newpasswd = ''" : '';
$sql = "UPDATE " . BB_USERS . "
SET user_active = 1, user_actkey = ''" . $sql_update_pass . "
@ -64,7 +64,7 @@ if ( $row = DB()->sql_fetchrow($result) )
$emailer->assign_vars(array(
'SITENAME' => $bb_cfg['sitename'],
'USERNAME' => $row['username'],
'PASSWORD' => $password_confirm,
'PASSWORD' => $row['user_newpasswd'],
'EMAIL_SIG' => (!empty($bb_cfg['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $bb_cfg['board_email_sig']) : '')
);
$emailer->send();

44
upload/includes/ucp/usercp_register.php
View file

@ -822,11 +822,26 @@ if ($submit && !$errors)
if ($bb_cfg['require_activation'] == USER_ACTIVATION_ADMIN)
{
$sql = "SELECT user_email, user_lang, usr_opt
FROM ". BB_USERS ."
WHERE user_level = " . ADMIN;
if ( !($result = DB()->sql_query($sql)) )
{
message_die(GENERAL_ERROR, 'Could not select Administrators', '', __LINE__, __FILE__, $sql);
}
while ($row = DB()->sql_fetchrow($result))
{
if(bf($to_userdata['user_opt'], 'user_opt', 'notify_pm'))
{
$active_admin = true;
$emailer->from($bb_cfg['board_email']);
$emailer->replyto($bb_cfg['board_email']);
$emailer->email_address($email);
$emailer->use_template('admin_activate', $user_lang);
$emailer->email_address(trim($row['user_email']));
$emailer->use_template("admin_activate", $row['user_lang']);
$emailer->set_subject($lang['NEW_ACCOUNT_SUBJECT']);
$emailer->assign_vars(array(
@ -835,11 +850,36 @@ if ($submit && !$errors)
'U_ACTIVATE' => make_url('profile.php?mode=activate&' . POST_USERS_URL . '=' . $new_user_id . '&act_key=' . $db_data['user_actkey'])
));
$emailer->send();
$emailer->reset();
}
}
if(empty($active_admin))
{
$emailer->from($bb_cfg['board_email']);
$emailer->replyto($bb_cfg['board_email']);
$emailer->email_address($bb_cfg['board_email']);
$emailer->use_template("admin_activate", $row['user_lang']);
$emailer->set_subject($lang['NEW_ACCOUNT_SUBJECT']);
$emailer->assign_vars(array(
'USERNAME' => html_entity_decode($username),
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $bb_cfg['board_email_sig']),
'U_ACTIVATE' => make_url('profile.php?mode=activate&' . POST_USERS_URL . '=' . $new_user_id . '&act_key=' . $db_data['user_actkey'])
));
$emailer->send();
$emailer->reset();
}
DB()->sql_freeresult($result);
}
}
bb_die($message);
}
/**

2
upload/includes/ucp/usercp_sendpasswd.php
View file

@ -37,7 +37,7 @@ if ( isset($_POST['submit']) )
$user_password = make_rand_str(8);
$sql = "UPDATE " . BB_USERS . "
SET user_newpasswd = '" . md5(md5($user_password)) . "', user_actkey = '$user_actkey'
SET user_newpasswd = '$user_password', user_actkey = '$user_actkey'
WHERE user_id = " . $row['user_id'];
if ( !DB()->sql_query($sql) )
{