mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

- telling the admin for what the board contact and board email addresses are used for and also making sure this explanation is correct ;)

Browse Source 
- fixes for bugs #6694, #6664 and #6662


git-svn-id: file:///svn/phpbb/trunk@6826 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-12-31 16:56:15 +00:00
parent 54f79e200f
commit 46f3bd40a8
22 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/ucp/ucp_activate.php
View File

@@ -84,7 +84,6 @@ class ucp_activate
$messenger->template('admin_welcome_activated', $user_row['user_lang']);
$messenger->replyto($config['board_contact']);
$messenger->to($user_row['user_email'], $user_row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);

1
phpBB/includes/ucp/ucp_groups.php
View File

@@ -183,7 +183,6 @@ class ucp_groups
{
$messenger->template($email_template, $row['user_lang']);
$messenger->replyto($config['board_email']);
$messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']);

2
phpBB/includes/ucp/ucp_profile.php
View File

@@ -130,7 +130,6 @@ class ucp_profile
$template_file = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate';
$messenger->template($template_file, $user->data['user_lang']);
$messenger->replyto($config['board_contact']);
$messenger->to($data['email'], $data['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
@@ -167,7 +166,6 @@ class ucp_profile
while ($row = $db->sql_fetchrow($result))
{
$messenger->template('admin_activate', $row['user_lang']);
$messenger->replyto($config['board_contact']);
$messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']);

2
phpBB/includes/ucp/ucp_register.php
View File

@@ -321,7 +321,6 @@ class ucp_register
$messenger->template($email_template, $data['lang']);
$messenger->replyto($config['board_contact']);
$messenger->to($data['email'], $data['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
@@ -369,7 +368,6 @@ class ucp_register
while ($row = $db->sql_fetchrow($result))
{
$messenger->template('admin_activate', $row['user_lang']);
$messenger->replyto($config['board_contact']);
$messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']);

1
phpBB/includes/ucp/ucp_remind.php
View File

@@ -64,7 +64,6 @@ class ucp_remind
$messenger->template('user_activate_passwd', $user_row['user_lang']);
$messenger->replyto($user->data['user_email']);
$messenger->to($user_row['user_email'], $user_row['username']);
$messenger->im($user_row['user_jabber'], $user_row['username']);

3
phpBB/includes/ucp/ucp_resend.php
View File

@@ -67,8 +67,6 @@ class ucp_resend
if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa)
{
$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
$messenger->replyto($config['board_contact']);
$messenger->to($user_row['user_email'], $user_row['username']);
$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
@@ -107,7 +105,6 @@ class ucp_resend
while ($row = $db->sql_fetchrow($result))
{
$messenger->template('admin_activate', $row['user_lang']);
$messenger->replyto($config['board_contact']);
$messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']);