github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 22:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

перенос классов. продолжение

Browse source
This commit is contained in:
PheRum 2015-05-13 02:52:55 +03:00
commit 1083ae90d1
13 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/admin_mass_email.php
View file

@ -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']);

4
ajax.php
View file

@ -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']

3
group.php
View file

@ -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']}>");

4
library/includes/classes/emailer.php → library/TorrentPier/emailer.php
View file

@ -1,8 +1,6 @@
<?php
if (!defined('BB_ROOT')) die(basename(__FILE__));
use Zend\Mail;
// @todo переписать
class emailer
{

2
library/includes/classes/sitemap.php → library/TorrentPier/sitemap.php
View file

@ -1,6 +1,6 @@
<?php
if (!defined('BB_ROOT')) die(basename(__FILE__));
// @todo переписать
class sitemap
{

1
library/config.php
View file

@ -259,7 +259,6 @@ define('LIB_DIR', BB_ROOT .'/library/' );
define('AJAX_DIR', BB_ROOT .'/library/ajax/' );
define('CFG_DIR', BB_PATH .'/library/config/' );
define('INC_DIR', BB_PATH .'/library/includes/' );
define('CLASS_DIR', BB_PATH .'/library/includes/classes/');
define('CORE_DIR', BB_PATH .'/library/includes/core/' );
define('UCP_DIR', BB_PATH .'/library/includes/ucp/' );
define('LANG_ROOT_DIR', BB_PATH .'/library/language/' );

2
library/includes/classes/.htaccess
View file

@ -1,2 +0,0 @@
order allow,deny
deny from all

2
library/includes/cron/jobs/sitemap.php
View file

@ -2,8 +2,6 @@
if (!defined('BB_ROOT')) die(basename(__FILE__));
require(CLASS_DIR .'sitemap.php');
$map = new sitemap();
$map->create();

1
library/includes/functions_post.php
View file

@ -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();

1
library/includes/ucp/email.php
View file

@ -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']}>");

2
library/includes/ucp/register.php
View file

@ -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']}>");

1
library/includes/ucp/sendpasswd.php
View file

@ -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']}>");

1
privmsg.php
View file

@ -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']}>");