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

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

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

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

library/TorrentPier/emailer.php

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

library/TorrentPier/sitemap.php

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

library/config.php

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

library/includes/classes/.htaccess

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

library/includes/cron/jobs/sitemap.php

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

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

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

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

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

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