mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

merged log tables, added new log_type (critical).

Browse Source 
changed email class a little bit.
bug fixed the queue a little bit.


git-svn-id: file:///svn/phpbb/trunk@4210 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2003-07-06 18:48:33 +00:00
parent f31b471ee1
commit 1b320bbb00
10 changed files with 357 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/adm/admin_email.php
View File

@@ -101,10 +101,10 @@ if (isset($_POST['submit']))
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer(true);
$extra_headers = 'X-AntiAbuse: Board servername - ' . $config['server_name'] . "\r\n";
$extra_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\r\n";
$extra_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\r\n";
$extra_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\r\n";
$extra_headers = 'X-AntiAbuse: Board servername - ' . $config['server_name'] . "\n";
$extra_headers .= 'X-AntiAbuse: User_id - ' . $user->data['user_id'] . "\n";
$extra_headers .= 'X-AntiAbuse: Username - ' . $user->data['username'] . "\n";
$extra_headers .= 'X-AntiAbuse: User IP - ' . $user->ip . "\n";
foreach ($email_list as $lang => $to_ary)
{
@@ -129,7 +129,7 @@ if (isset($_POST['submit']))
}
}
$emailer->queue->save();
$emailer->mail_queue->save();
unset($email_list);
if ($group_id)

11
phpBB/adm/admin_viewlogs.php
View File

@@ -29,6 +29,7 @@ if (!empty($setmodules))
$filename = basename(__FILE__);
$module['LOG']['ADMIN_LOGS'] = $filename . "$SID&mode=admin";
$module['LOG']['MOD_LOGS'] = $filename . "$SID&mode=mod";
$module['LOG']['CRITICAL_LOGS'] = $filename . "$SID&mode=critical";
return;
}
@@ -59,9 +60,9 @@ $sort_dir = (!empty($_REQUEST['sd'])) ? htmlspecialchars($_REQUEST['sd']) : 'd';
// Define some vars depending on which logs we're looking at
$log_table_sql = ($mode == 'admin') ? LOG_ADMIN_TABLE : LOG_MOD_TABLE;
$l_title = ($mode == 'admin') ? $user->lang['ADMIN_LOGS'] : $user->lang['MOD_LOGS'];
$l_title_explain = ($mode == 'admin') ? $user->lang['ADMIN_LOGS_EXPLAIN'] : $user->lang['MOD_LOGS_EXPLAIN'];
$log_type = ($mode == 'admin') ? LOG_ADMIN : (($mode == 'mod') ? LOG_MOD : LOG_CRITICAL);
$l_title = $user->lang[strtoupper($mode) . '_LOGS'];
$l_title_explain = $user->lang[strtoupper($mode) . '_LOGS_EXPLAIN'];
// Delete entries if requested and able
@@ -74,10 +75,10 @@ if ((isset($_POST['delmarked']) || isset($_POST['delall'])) && $auth->acl_get('a
{
$where_sql .= (($where_sql != '') ? ', ' : '') . intval($marked);
}
$where_sql = "WHERE log_id IN ($where_sql)";
$where_sql = "WHERE log_type = $log_type AND log_id IN ($where_sql)";
}
$sql = "DELETE FROM $table_sql
$sql = "DELETE FROM " . LOG_TABLE . "
$where_sql";
$db->sql_query($sql);

2
phpBB/adm/index.php
View File

@@ -207,7 +207,7 @@ elseif (isset($_GET['pane']) && $_GET['pane'] == 'right')
do
{
$emailer->use_template('user_remind_inactive', $row['user_lang']);
$emailer->to($row['user_email']);
$emailer->to($row['user_email'], $row['username']);
$emailer->assign_vars(array(
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),