mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 19:24:01 +02:00
- make sure the sql layer for mysql always states mysql4 and get to mysql if using mysql < 4
- assign some default vars to email templates (we always need some basic ones) git-svn-id: file:///svn/phpbb/trunk@6546 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -93,10 +93,7 @@ class ucp_activate
|
||||
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'SITENAME' => utf8_html_entity_decode($config['sitename']),
|
||||
'USERNAME' => utf8_html_entity_decode($user_row['username']),
|
||||
|
||||
'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])))
|
||||
'USERNAME' => utf8_html_entity_decode($user_row['username']))
|
||||
);
|
||||
|
||||
$messenger->send($user_row['user_notify_type']);
|
||||
|
@@ -172,8 +172,6 @@ class ucp_groups
|
||||
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
|
||||
$messenger = new messenger();
|
||||
|
||||
$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
|
||||
|
||||
$sql = 'SELECT u.username, u.user_email, u.user_notify_type, u.user_jabber, u.user_lang
|
||||
FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u
|
||||
WHERE ug.user_id = u.user_id
|
||||
@@ -190,8 +188,6 @@ class ucp_groups
|
||||
$messenger->im($row['user_jabber'], $row['username']);
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'EMAIL_SIG' => utf8_html_entity_decode($email_sig),
|
||||
'SITENAME' => utf8_html_entity_decode($config['sitename']),
|
||||
'USERNAME' => utf8_html_entity_decode($row['username']),
|
||||
'GROUP_NAME' => utf8_html_entity_decode($group_row[$group_id]['group_name']),
|
||||
|
||||
|
@@ -144,10 +144,7 @@ class ucp_profile
|
||||
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'SITENAME' => utf8_html_entity_decode($config['sitename']),
|
||||
'USERNAME' => utf8_html_entity_decode($username),
|
||||
'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])),
|
||||
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
|
||||
);
|
||||
|
||||
@@ -181,8 +178,6 @@ class ucp_profile
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'USERNAME' => utf8_html_entity_decode($username),
|
||||
'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])),
|
||||
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
|
||||
);
|
||||
|
||||
|
@@ -336,12 +336,9 @@ class ucp_register
|
||||
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'SITENAME' => utf8_html_entity_decode($config['sitename']),
|
||||
'WELCOME_MSG' => utf8_html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
|
||||
'USERNAME' => utf8_html_entity_decode($data['username']),
|
||||
'PASSWORD' => html_entity_decode($data['new_password']),
|
||||
'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])),
|
||||
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
|
||||
);
|
||||
|
||||
@@ -350,8 +347,7 @@ class ucp_register
|
||||
$messenger->assign_vars(array(
|
||||
'FAX_INFO' => $config['coppa_fax'],
|
||||
'MAIL_INFO' => $config['coppa_mail'],
|
||||
'EMAIL_ADDRESS' => $data['email'],
|
||||
'SITENAME' => utf8_html_entity_decode($config['sitename']))
|
||||
'EMAIL_ADDRESS' => $data['email'])
|
||||
);
|
||||
}
|
||||
|
||||
@@ -385,8 +381,6 @@ class ucp_register
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'USERNAME' => utf8_html_entity_decode($data['username']),
|
||||
'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])),
|
||||
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
|
||||
);
|
||||
|
||||
|
@@ -69,11 +69,8 @@ class ucp_remind
|
||||
$messenger->im($user_row['user_jabber'], $user_row['username']);
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'SITENAME' => utf8_html_entity_decode($config['sitename']),
|
||||
'USERNAME' => utf8_html_entity_decode($user_row['username']),
|
||||
'PASSWORD' => html_entity_decode($user_password),
|
||||
'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])),
|
||||
|
||||
'USERNAME' => utf8_html_entity_decode($user_row['username']),
|
||||
'PASSWORD' => html_entity_decode($user_password),
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey")
|
||||
);
|
||||
|
||||
|
@@ -77,11 +77,8 @@ class ucp_resend
|
||||
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'SITENAME' => utf8_html_entity_decode($config['sitename']),
|
||||
'WELCOME_MSG' => utf8_html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
|
||||
'USERNAME' => utf8_html_entity_decode($user_row['username']),
|
||||
'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])),
|
||||
|
||||
'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}")
|
||||
);
|
||||
|
||||
@@ -90,8 +87,7 @@ class ucp_resend
|
||||
$messenger->assign_vars(array(
|
||||
'FAX_INFO' => $config['coppa_fax'],
|
||||
'MAIL_INFO' => $config['coppa_mail'],
|
||||
'EMAIL_ADDRESS' => $user_row['user_email'],
|
||||
'SITENAME' => $config['sitename'])
|
||||
'EMAIL_ADDRESS' => $user_row['user_email'])
|
||||
);
|
||||
}
|
||||
|
||||
@@ -117,8 +113,6 @@ class ucp_resend
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'USERNAME' => utf8_html_entity_decode($user_row['username']),
|
||||
'EMAIL_SIG' => utf8_html_entity_decode(str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])),
|
||||
|
||||
'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}")
|
||||
);
|
||||
|
||||
|
Reference in New Issue
Block a user