From 1083ae90d15e503c1e14ff1932c654a92b0deaec Mon Sep 17 00:00:00 2001 From: PheRum Date: Wed, 13 May 2015 02:52:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2.=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B4=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/admin_mass_email.php | 2 -- ajax.php | 4 ---- group.php | 3 --- library/{includes/classes => TorrentPier}/emailer.php | 4 +--- library/{includes/classes => TorrentPier}/sitemap.php | 2 +- library/config.php | 1 - library/includes/classes/.htaccess | 2 -- library/includes/cron/jobs/sitemap.php | 2 -- library/includes/functions_post.php | 1 - library/includes/ucp/email.php | 1 - library/includes/ucp/register.php | 2 -- library/includes/ucp/sendpasswd.php | 1 - privmsg.php | 1 - 13 files changed, 2 insertions(+), 24 deletions(-) rename library/{includes/classes => TorrentPier}/emailer.php (98%) rename library/{includes/classes => TorrentPier}/sitemap.php (99%) delete mode 100644 library/includes/classes/.htaccess diff --git a/admin/admin_mass_email.php b/admin/admin_mass_email.php index a9285ebf0..38230907e 100644 --- a/admin/admin_mass_email.php +++ b/admin/admin_mass_email.php @@ -53,8 +53,6 @@ if (isset($_POST['submit'])) "); } - require(CLASS_DIR .'emailer.php'); - foreach ($user_list as $i => $row) { $emailer = new emailer($bb_cfg['smtp_delivery']); diff --git a/ajax.php b/ajax.php index 3c154750d..bc6125799 100644 --- a/ajax.php +++ b/ajax.php @@ -60,10 +60,6 @@ switch ($ajax->action) case 'manage_group': require(INC_DIR . 'functions_group.php'); break; - - case 'sitemap'; - require(CLASS_DIR .'sitemap.php'); - break; } // Position in $ajax->valid_actions['xxx'] diff --git a/group.php b/group.php index d8094fee4..3a4a3a7c9 100644 --- a/group.php +++ b/group.php @@ -219,7 +219,6 @@ else if (isset($_POST['joingroup']) && $_POST['joingroup']) if ($bb_cfg['group_send_email']) { - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -271,7 +270,6 @@ else if ($bb_cfg['group_send_email']) { - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -341,7 +339,6 @@ else bb_die('Could not get user email information'); } - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/library/includes/classes/emailer.php b/library/TorrentPier/emailer.php similarity index 98% rename from library/includes/classes/emailer.php rename to library/TorrentPier/emailer.php index 3256eba20..5f58b9c93 100644 --- a/library/includes/classes/emailer.php +++ b/library/TorrentPier/emailer.php @@ -1,8 +1,6 @@ create(); diff --git a/library/includes/functions_post.php b/library/includes/functions_post.php index 7923a53be..ded560045 100644 --- a/library/includes/functions_post.php +++ b/library/includes/functions_post.php @@ -367,7 +367,6 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi if ($watch_list) { - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $orig_word = $replacement_word = array(); diff --git a/library/includes/ucp/email.php b/library/includes/ucp/email.php index 2022dca34..ca85de0a4 100644 --- a/library/includes/ucp/email.php +++ b/library/includes/ucp/email.php @@ -49,7 +49,6 @@ if ($row = DB()->fetch_row($sql)) if (!$errors) { - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($userdata['username'] ." <{$userdata['user_email']}>"); diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php index f606177ee..ac5a0f88e 100644 --- a/library/includes/ucp/register.php +++ b/library/includes/ucp/register.php @@ -648,7 +648,6 @@ if ($submit && !$errors) $email_template = 'user_welcome'; } - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -685,7 +684,6 @@ if ($submit && !$errors) $pr_data['user_actkey'] = $user_actkey; $db_data['user_actkey'] = $user_actkey; - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/library/includes/ucp/sendpasswd.php b/library/includes/ucp/sendpasswd.php index 546177c77..b2373ddc6 100644 --- a/library/includes/ucp/sendpasswd.php +++ b/library/includes/ucp/sendpasswd.php @@ -40,7 +40,6 @@ if (isset($_POST['submit'])) bb_die('Could not update new password information'); } - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/privmsg.php b/privmsg.php index 9da32edb9..bdc3593a1 100644 --- a/privmsg.php +++ b/privmsg.php @@ -1041,7 +1041,6 @@ else if ( $submit || $refresh || $mode != '' ) if (bf($to_userdata['user_opt'], 'user_opt', 'user_notify_pm') && $to_userdata['user_active'] && $bb_cfg['pm_notify_enabled']) { - require(CLASS_DIR .'emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>");