From bdf93ca29ada74b7142563aa6cdeb46eab362593 Mon Sep 17 00:00:00 2001 From: Exile Date: Sat, 27 Sep 2014 02:39:04 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=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=B8=20api=20?= =?UTF-8?q?=D0=B2=20=D1=81=D0=B2=D0=BE=D0=B8=20=D0=BF=D0=BE=D0=B4=D0=BF?= =?UTF-8?q?=D0=B0=D0=BF=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- upload/admin/admin_mass_email.php | 2 +- upload/ajax.php | 2 +- upload/group.php | 6 +++--- upload/library/includes/{api.sphinx.php => api/sphinx.php} | 0 .../includes/{class.correct.php => classes/correct.php} | 0 .../includes/{emailer.class.php => classes/emailer.php} | 0 .../{class.reflection.php => classes/reflection.php} | 0 .../includes/{class.sitemap.php => classes/sitemap.php} | 0 .../library/includes/{class.utf8.php => classes/utf8.php} | 0 upload/library/includes/cron/jobs/sitemap.php | 2 +- upload/library/includes/functions.php | 2 +- upload/library/includes/functions_post.php | 2 +- upload/library/includes/ucp/email.php | 6 +++--- upload/library/includes/ucp/register.php | 4 ++-- upload/library/includes/ucp/sendpasswd.php | 2 +- upload/privmsg.php | 2 +- upload/search.php | 6 +++--- upload/tracker.php | 6 +++--- 18 files changed, 21 insertions(+), 21 deletions(-) rename upload/library/includes/{api.sphinx.php => api/sphinx.php} (100%) rename upload/library/includes/{class.correct.php => classes/correct.php} (100%) rename upload/library/includes/{emailer.class.php => classes/emailer.php} (100%) rename upload/library/includes/{class.reflection.php => classes/reflection.php} (100%) rename upload/library/includes/{class.sitemap.php => classes/sitemap.php} (100%) rename upload/library/includes/{class.utf8.php => classes/utf8.php} (100%) diff --git a/upload/admin/admin_mass_email.php b/upload/admin/admin_mass_email.php index 95875f69f..705cba974 100644 --- a/upload/admin/admin_mass_email.php +++ b/upload/admin/admin_mass_email.php @@ -53,7 +53,7 @@ if (isset($_POST['submit'])) "); } - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); foreach ($user_list as $i => $row) { diff --git a/upload/ajax.php b/upload/ajax.php index eca31b0bb..db6c2ea47 100644 --- a/upload/ajax.php +++ b/upload/ajax.php @@ -67,7 +67,7 @@ switch ($ajax->action) break; case 'sitemap'; - require(INC_DIR .'class.sitemap.php'); + require(INC_DIR .'classes/sitemap.php'); break; } diff --git a/upload/group.php b/upload/group.php index c8b436f2a..44c40fa43 100644 --- a/upload/group.php +++ b/upload/group.php @@ -220,7 +220,7 @@ else if (@$_POST['joingroup']) if ($bb_cfg['group_send_email']) { - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -272,7 +272,7 @@ else if ($bb_cfg['group_send_email']) { - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -342,7 +342,7 @@ else bb_die('Could not get user email information'); } - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/upload/library/includes/api.sphinx.php b/upload/library/includes/api/sphinx.php similarity index 100% rename from upload/library/includes/api.sphinx.php rename to upload/library/includes/api/sphinx.php diff --git a/upload/library/includes/class.correct.php b/upload/library/includes/classes/correct.php similarity index 100% rename from upload/library/includes/class.correct.php rename to upload/library/includes/classes/correct.php diff --git a/upload/library/includes/emailer.class.php b/upload/library/includes/classes/emailer.php similarity index 100% rename from upload/library/includes/emailer.class.php rename to upload/library/includes/classes/emailer.php diff --git a/upload/library/includes/class.reflection.php b/upload/library/includes/classes/reflection.php similarity index 100% rename from upload/library/includes/class.reflection.php rename to upload/library/includes/classes/reflection.php diff --git a/upload/library/includes/class.sitemap.php b/upload/library/includes/classes/sitemap.php similarity index 100% rename from upload/library/includes/class.sitemap.php rename to upload/library/includes/classes/sitemap.php diff --git a/upload/library/includes/class.utf8.php b/upload/library/includes/classes/utf8.php similarity index 100% rename from upload/library/includes/class.utf8.php rename to upload/library/includes/classes/utf8.php diff --git a/upload/library/includes/cron/jobs/sitemap.php b/upload/library/includes/cron/jobs/sitemap.php index 9c33713c2..fcd83c551 100644 --- a/upload/library/includes/cron/jobs/sitemap.php +++ b/upload/library/includes/cron/jobs/sitemap.php @@ -2,7 +2,7 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); -require(INC_DIR .'class.sitemap.php'); +require(INC_DIR .'classes/sitemap.php'); $map = new sitemap(); $map->create(); diff --git a/upload/library/includes/functions.php b/upload/library/includes/functions.php index 23f9e4873..f151c9cfe 100644 --- a/upload/library/includes/functions.php +++ b/upload/library/includes/functions.php @@ -2516,7 +2516,7 @@ function init_sphinx () if (!isset($sphinx)) { - require(INC_DIR .'api.sphinx.php'); + require(INC_DIR .'api/sphinx.php'); $sphinx = new SphinxClient(); $sphinx->SetConnectTimeout(5); diff --git a/upload/library/includes/functions_post.php b/upload/library/includes/functions_post.php index 01df9690b..937ccd701 100644 --- a/upload/library/includes/functions_post.php +++ b/upload/library/includes/functions_post.php @@ -367,7 +367,7 @@ function user_notification($mode, &$post_data, &$topic_title, &$forum_id, &$topi if ($watch_list) { - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $orig_word = $replacement_word = array(); diff --git a/upload/library/includes/ucp/email.php b/upload/library/includes/ucp/email.php index a1c3c90d0..1e6fae97b 100644 --- a/upload/library/includes/ucp/email.php +++ b/upload/library/includes/ucp/email.php @@ -44,12 +44,12 @@ if ($row = DB()->fetch_row($sql)) $subject = trim(html_entity_decode($_POST['subject'])); $message = trim(html_entity_decode($_POST['message'])); - if(!$subject) $errors[] = $lang['EMPTY_SUBJECT_EMAIL']; - if(!$message) $errors[] = $lang['EMPTY_MESSAGE_EMAIL']; + if (!$subject) $errors[] = $lang['EMPTY_SUBJECT_EMAIL']; + if (!$message) $errors[] = $lang['EMPTY_MESSAGE_EMAIL']; if (!$errors) { - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($userdata['username'] ." <{$userdata['user_email']}>"); diff --git a/upload/library/includes/ucp/register.php b/upload/library/includes/ucp/register.php index 0ad277f68..e5f5f68d1 100644 --- a/upload/library/includes/ucp/register.php +++ b/upload/library/includes/ucp/register.php @@ -649,7 +649,7 @@ if ($submit && !$errors) $email_template = 'user_welcome'; } - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); @@ -688,7 +688,7 @@ if ($submit && !$errors) $pr_data['user_actkey'] = $user_actkey; $db_data['user_actkey'] = $user_actkey; - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/upload/library/includes/ucp/sendpasswd.php b/upload/library/includes/ucp/sendpasswd.php index 155ce5230..f098a1b4e 100644 --- a/upload/library/includes/ucp/sendpasswd.php +++ b/upload/library/includes/ucp/sendpasswd.php @@ -42,7 +42,7 @@ if ( isset($_POST['submit']) ) bb_die('Could not update new password information'); } - require(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/upload/privmsg.php b/upload/privmsg.php index 43eaf8f8b..93d2d3f47 100644 --- a/upload/privmsg.php +++ b/upload/privmsg.php @@ -1042,7 +1042,7 @@ 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(INC_DIR .'emailer.class.php'); + require(INC_DIR .'classes/emailer.php'); $emailer = new emailer($bb_cfg['smtp_delivery']); $emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>"); diff --git a/upload/search.php b/upload/search.php index 5bf7ae786..9b248d417 100644 --- a/upload/search.php +++ b/upload/search.php @@ -5,9 +5,9 @@ define('BB_ROOT', './'); require(BB_ROOT . 'common.php'); require(INC_DIR . 'bbcode.php'); -require(INC_DIR . 'class.utf8.php'); -require(INC_DIR . 'class.correct.php'); -require(INC_DIR . 'class.reflection.php'); +require(INC_DIR . 'classes/utf8.php'); +require(INC_DIR . 'classes/correct.php'); +require(INC_DIR . 'classes/reflection.php'); $page_cfg['load_tpl_vars'] = array( 'post_buttons', diff --git a/upload/tracker.php b/upload/tracker.php index 88c309647..2027f1858 100644 --- a/upload/tracker.php +++ b/upload/tracker.php @@ -4,9 +4,9 @@ define('BB_SCRIPT', 'tracker'); define('BB_ROOT', './'); require(BB_ROOT .'common.php'); -require(INC_DIR .'class.utf8.php'); -require(INC_DIR .'class.correct.php'); -require(INC_DIR .'class.reflection.php'); +require(INC_DIR .'classes/utf8.php'); +require(INC_DIR .'classes/correct.php'); +require(INC_DIR .'classes/reflection.php'); require(INC_DIR .'functions_group.php'); // Page config