diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-07-06 18:48:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-07-06 18:48:33 +0000 |
| commit | 1b320bbb006a685d33032a6d1a39de44b4e858a7 (patch) | |
| tree | 79959cc9ae9d93be18ecf5b56eb991b5511ec8bd /phpBB/adm | |
| parent | f31b471ee12c96eb1a61484c684202f4d3a8b8bd (diff) | |
| download | forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.gz forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.bz2 forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.tar.xz forums-1b320bbb006a685d33032a6d1a39de44b4e858a7.zip | |
merged log tables, added new log_type (critical).
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
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/admin_email.php | 10 | ||||
| -rw-r--r-- | phpBB/adm/admin_viewlogs.php | 11 | ||||
| -rw-r--r-- | phpBB/adm/index.php | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/phpBB/adm/admin_email.php b/phpBB/adm/admin_email.php index 00353ee399..e16bfedca5 100644 --- a/phpBB/adm/admin_email.php +++ b/phpBB/adm/admin_email.php @@ -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) diff --git a/phpBB/adm/admin_viewlogs.php b/phpBB/adm/admin_viewlogs.php index fa582ab3c2..5e8abd5239 100644 --- a/phpBB/adm/admin_viewlogs.php +++ b/phpBB/adm/admin_viewlogs.php @@ -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); diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 0df62c566e..4067008b74 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -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']), |