From 990cf7c5c73e9d26d4d0fb7cd8c90ff4743978b4 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Thu, 10 Aug 2023 13:35:32 +0700 Subject: [PATCH] Fixed formatting --- admin/admin_mass_email.php | 2 +- ajax.php | 36 +++++++++++++------------- common.php | 2 +- library/ajax/index_data.php | 16 ++++++------ library/ajax/manage_admin.php | 4 +-- library/ajax/manage_user.php | 4 +-- library/ajax/mod_action.php | 2 +- library/ajax/sitemap.php | 16 ++++++------ library/ajax/user_register.php | 4 +-- library/config.php | 4 +-- library/includes/cache/sqlite.php | 16 ++++++------ library/includes/core/caches.php | 2 +- library/includes/cron/jobs/sitemap.php | 4 +-- library/includes/datastore/sqlite.php | 16 ++++++------ library/includes/functions.php | 12 ++++----- library/includes/init_bb.php | 2 +- library/includes/page_footer.php | 4 +-- library/includes/page_footer_dev.php | 6 ++--- library/includes/ucp/register.php | 2 +- library/language/en/main.php | 2 +- library/language/ru/main.php | 2 +- library/language/uk/main.php | 2 +- memberlist.php | 8 +++--- privmsg.php | 2 +- 24 files changed, 85 insertions(+), 85 deletions(-) diff --git a/admin/admin_mass_email.php b/admin/admin_mass_email.php index b652af6e..9c9611b0 100644 --- a/admin/admin_mass_email.php +++ b/admin/admin_mass_email.php @@ -9,7 +9,7 @@ require('./pagestart.php'); if ($bb_cfg['emailer_disabled']) { - bb_die($lang['EMAILER_DISABLED']); + bb_die($lang['EMAILER_DISABLED']); } @set_time_limit(1200); diff --git a/ajax.php b/ajax.php index 7b2bcc04..b19a9e62 100644 --- a/ajax.php +++ b/ajax.php @@ -111,7 +111,7 @@ class ajax_common */ function exec() { - global $lang, $bb_cfg; + global $lang, $bb_cfg; // Exit if we already have errors if (!empty($this->response['error_code'])) @@ -122,8 +122,8 @@ class ajax_common // Check that requested action is valid $action = $this->action; - // Action params - $action_params = null; + // Action params + $action_params = null; if (!$action || !is_string($action)) { @@ -134,21 +134,21 @@ class ajax_common $this->ajax_die('invalid action: ' . $action); } - // Exit if board is disabled via ON/OFF trigger or by admin - if ($bb_cfg['board_disable'] || file_exists(BB_DISABLED)) - { - if ($action_params[AJAX_ALWAYS_ACTIVE] !== true) - { - if ($bb_cfg['board_disable']) - { - $this->ajax_die($lang['BOARD_DISABLE']); - } - elseif (file_exists(BB_DISABLED)) - { - $this->ajax_die($lang['BOARD_DISABLE_CRON']); - } - } - } + // Exit if board is disabled via ON/OFF trigger or by admin + if ($bb_cfg['board_disable'] || file_exists(BB_DISABLED)) + { + if ($action_params[AJAX_ALWAYS_ACTIVE] !== true) + { + if ($bb_cfg['board_disable']) + { + $this->ajax_die($lang['BOARD_DISABLE']); + } + elseif (file_exists(BB_DISABLED)) + { + $this->ajax_die($lang['BOARD_DISABLE_CRON']); + } + } + } // Auth check switch ($action_params[AJAX_AUTH]) diff --git a/common.php b/common.php index d43e41b6..b36d5420 100644 --- a/common.php +++ b/common.php @@ -73,7 +73,7 @@ define('BOT_UID', -746); function sqlite3_escape_string ($str) { - return SQLite3::escapeString($str); + return SQLite3::escapeString($str); } /** diff --git a/library/ajax/index_data.php b/library/ajax/index_data.php index 856361d5..e93aedac 100644 --- a/library/ajax/index_data.php +++ b/library/ajax/index_data.php @@ -14,14 +14,14 @@ switch($mode) 'stats', )); - $users = array(); - $stats = $datastore->get('stats'); + $users = array(); + $stats = $datastore->get('stats'); if ($stats['birthday_week_list']) { foreach($stats['birthday_week_list'] as $week) { - $users[] = profile_url($week) .' ('. birthday_age(date('Y-m-d', strtotime('-1 year', strtotime($week['user_birthday'])))) .')'; + $users[] = profile_url($week) .' ('. birthday_age(date('Y-m-d', strtotime('-1 year', strtotime($week['user_birthday'])))) .')'; } $html = sprintf($lang['BIRTHDAY_WEEK'], $bb_cfg['birthday_check_day'], join(', ', $users)); } @@ -33,14 +33,14 @@ switch($mode) 'stats', )); - $users = array(); - $stats = $datastore->get('stats'); + $users = array(); + $stats = $datastore->get('stats'); if ($stats['birthday_today_list']) { foreach($stats['birthday_today_list'] as $today) { - $users[] = profile_url($today) .' ('. birthday_age($today['user_birthday']) .')'; + $users[] = profile_url($today) .' ('. birthday_age($today['user_birthday']) .')'; } $html = $lang['BIRTHDAY_TODAY'] . join(', ', $users); } @@ -131,8 +131,8 @@ switch($mode) '; break; - default: - $this->ajax_die('Invalid mode'); + default: + $this->ajax_die('Invalid mode'); } $this->response['html'] = $html; diff --git a/library/ajax/manage_admin.php b/library/ajax/manage_admin.php index 6f11a3d9..7d71217d 100644 --- a/library/ajax/manage_admin.php +++ b/library/ajax/manage_admin.php @@ -111,9 +111,9 @@ switch ($mode) break; - default: + default: - $this->ajax_die('Invalid mode'); + $this->ajax_die('Invalid mode'); } $this->response['mode'] = $mode; \ No newline at end of file diff --git a/library/ajax/manage_user.php b/library/ajax/manage_user.php index c13263a4..f8e72ce2 100644 --- a/library/ajax/manage_user.php +++ b/library/ajax/manage_user.php @@ -79,9 +79,9 @@ switch ($mode) break; - default: + default: - $this->ajax_die('Invalid mode'); + $this->ajax_die('Invalid mode'); } $this->response['mode'] = $mode; diff --git a/library/ajax/mod_action.php b/library/ajax/mod_action.php index 7ae9d52a..82b0dfac 100644 --- a/library/ajax/mod_action.php +++ b/library/ajax/mod_action.php @@ -130,6 +130,6 @@ switch ($mode) '; break; - default: + default: $this->ajax_die('Invalid mode'); } diff --git a/library/ajax/sitemap.php b/library/ajax/sitemap.php index d573d352..a6705949 100644 --- a/library/ajax/sitemap.php +++ b/library/ajax/sitemap.php @@ -27,19 +27,19 @@ switch ($mode) foreach ($bb_cfg['sitemap_sending'] as $source_name => $source_link) { - if ($map->send_url($source_link, $map_link)) + if ($map->send_url($source_link, $map_link)) { - $html .= '
' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' ' . $source_name . ' : ' . $lang['SITEMAP_SENT'] . ''; - } + $html .= '
' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' ' . $source_name . ' : ' . $lang['SITEMAP_SENT'] . ''; + } else { - $html .= '
' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' ' . $source_name . ' : ' . $lang['SITEMAP_ERROR'] . ' URL: ' . $source_link . $map_link . ''; - } - } + $html .= '
' . $lang['SITEMAP_NOTIFY_SEARCH'] . ' ' . $source_name . ' : ' . $lang['SITEMAP_ERROR'] . ' URL: ' . $source_link . $map_link . ''; + } + } break; - default: - $this->ajax_die('Invalid mode'); + default: + $this->ajax_die('Invalid mode'); } $this->response['html'] = $html; diff --git a/library/ajax/user_register.php b/library/ajax/user_register.php index 25b9ba13..61860a6a 100644 --- a/library/ajax/user_register.php +++ b/library/ajax/user_register.php @@ -67,8 +67,8 @@ switch($mode) } break; - default: - $this->ajax_die('Invalid mode'); + default: + $this->ajax_die('Invalid mode'); } $this->response['html'] = $html; diff --git a/library/config.php b/library/config.php index 29e6542f..c448575f 100644 --- a/library/config.php +++ b/library/config.php @@ -218,11 +218,11 @@ $bb_cfg['charset'] = 'utf8'; // page charset if (isset($bb_cfg['default_lang']) && file_exists(LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/')) { - $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/'; + $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR . $bb_cfg['default_lang'] .'/'; } else { - $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'en/'; + $bb_cfg['default_lang_dir'] = LANG_ROOT_DIR .'en/'; } $bb_cfg['lang'] = array( diff --git a/library/includes/cache/sqlite.php b/library/includes/cache/sqlite.php index da08a6a0..4dfc801c 100644 --- a/library/includes/cache/sqlite.php +++ b/library/includes/cache/sqlite.php @@ -23,10 +23,10 @@ class cache_sqlite extends cache_common function cache_sqlite ($cfg, $prefix = null) { - if (!$this->is_installed()) - { - die("Error: {$this->db->engine} extension not installed"); - } + if (!$this->is_installed()) + { + die("Error: {$this->db->engine} extension not installed"); + } $this->cfg = array_merge($this->cfg, $cfg); $this->db = new sqlite_common($this->cfg); @@ -113,10 +113,10 @@ class cache_sqlite extends cache_common return ($result) ? $this->db->changes() : 0; } - function is_installed () - { - return class_exists('SQLite3'); - } + function is_installed () + { + return class_exists('SQLite3'); + } } class sqlite_common extends cache_common diff --git a/library/includes/core/caches.php b/library/includes/core/caches.php index f0369285..19f141ed 100644 --- a/library/includes/core/caches.php +++ b/library/includes/core/caches.php @@ -85,7 +85,7 @@ class CACHES $this->ref[$cache_name] =& $this->obj[$cache_name]; break; - case 'filecache': + case 'filecache': default: //filecache if (!isset($this->obj[$cache_name])) { diff --git a/library/includes/cron/jobs/sitemap.php b/library/includes/cron/jobs/sitemap.php index 320e7865..70f608fb 100644 --- a/library/includes/cron/jobs/sitemap.php +++ b/library/includes/cron/jobs/sitemap.php @@ -13,6 +13,6 @@ if (@file_exists(SITEMAP_DIR. 'sitemap.xml')) foreach ($bb_cfg['sitemap_sending'] as $source_name => $source_link) { - $map->send_url($source_link, $map_link); - } + $map->send_url($source_link, $map_link); + } } \ No newline at end of file diff --git a/library/includes/datastore/sqlite.php b/library/includes/datastore/sqlite.php index e80784d7..c23374d3 100644 --- a/library/includes/datastore/sqlite.php +++ b/library/includes/datastore/sqlite.php @@ -22,10 +22,10 @@ class datastore_sqlite extends datastore_common function datastore_sqlite ($cfg, $prefix = null) { - if (!$this->is_installed()) - { - die("Error: {$this->engine} extension not installed"); - } + if (!$this->is_installed()) + { + die("Error: {$this->engine} extension not installed"); + } $this->cfg = array_merge($this->cfg, $cfg); $this->db = new sqlite_common($this->cfg); @@ -69,8 +69,8 @@ class datastore_sqlite extends datastore_common $this->db->debug('stop'); } - function is_installed () - { - return class_exists('SQLite3'); - } + function is_installed () + { + return class_exists('SQLite3'); + } } \ No newline at end of file diff --git a/library/includes/functions.php b/library/includes/functions.php index 46063e8d..ef45875c 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -1240,12 +1240,12 @@ function show_bt_userdata ($user_id) { global $lang, $template; - if (!$btu = get_bt_userdata($user_id)) - { - require(INC_DIR .'functions_torrent.php'); - generate_passkey($user_id, true); - $btu = get_bt_userdata($user_id); - } + if (!$btu = get_bt_userdata($user_id)) + { + require(INC_DIR .'functions_torrent.php'); + generate_passkey($user_id, true); + $btu = get_bt_userdata($user_id); + } $template->assign_vars(array( 'SHOW_BT_USERDATA' => true, diff --git a/library/includes/init_bb.php b/library/includes/init_bb.php index 495c384e..85fe682c 100644 --- a/library/includes/init_bb.php +++ b/library/includes/init_bb.php @@ -207,7 +207,7 @@ $bb_cfg['tor_icons'] = array( TOR_CHECKING => '%', TOR_TMP => 'T', TOR_PREMOD => '∏', - TOR_REPLENISH => 'R', + TOR_REPLENISH => 'R', ); // Запрет на скачивание diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php index e63955a9..f41f459c 100644 --- a/library/includes/page_footer.php +++ b/library/includes/page_footer.php @@ -6,11 +6,11 @@ global $bb_cfg, $userdata, $template, $DBS, $lang; if (!empty($template)) { - $birthday_tp = ((string)bb_date(TIMENOW, 'd.m', false) === '04.04') ? ' | 🎉🍰💚' : null; + $birthday_tp = ((string)bb_date(TIMENOW, 'd.m', false) === '04.04') ? ' | 🎉🍰💚' : null; $template->assign_vars(array( 'SIMPLE_FOOTER' => !empty($gen_simple_header), - 'POWERED' => 'Powered by TorrentPier II © 2005-' . date('Y') . $birthday_tp, + 'POWERED' => 'Powered by TorrentPier II © 2005-' . date('Y') . $birthday_tp, 'SHOW_ADMIN_LINK' => (IS_ADMIN && !defined('IN_ADMIN')), 'ADMIN_LINK_HREF' => "admin/index.php", )); diff --git a/library/includes/page_footer_dev.php b/library/includes/page_footer_dev.php index 36d0bff1..9b4aa1a9 100644 --- a/library/includes/page_footer_dev.php +++ b/library/includes/page_footer_dev.php @@ -67,9 +67,9 @@ if ($sql_log) ?> \ No newline at end of file diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php index c48a561b..bfa8b8c1 100644 --- a/library/includes/ucp/register.php +++ b/library/includes/ucp/register.php @@ -356,7 +356,7 @@ foreach ($profile_fields as $field => $can_edit) } } - $pr_data['user_birthday'] = $db_data['user_birthday'] = !empty($user_birthday) ? $user_birthday : null; + $pr_data['user_birthday'] = $db_data['user_birthday'] = !empty($user_birthday) ? $user_birthday : null; } $tp_data['USER_BIRTHDAY'] = $pr_data['user_birthday']; break; diff --git a/library/language/en/main.php b/library/language/en/main.php index 790fd315..8e29b1f1 100644 --- a/library/language/en/main.php +++ b/library/language/en/main.php @@ -1094,7 +1094,7 @@ $lang['TOR_STATUS_NAME'] = array( TOR_CHECKING => 'verified', TOR_TMP => 'temporary', TOR_PREMOD => 'pre-moderation', - TOR_REPLENISH => 'replenish', + TOR_REPLENISH => 'replenish', ); $lang['TOR_STATUS_FAILED'] = 'Such status does not exist!'; $lang['TORRENT_FAILED'] = 'Distribution was not found!'; diff --git a/library/language/ru/main.php b/library/language/ru/main.php index cae8b85e..ef82b792 100644 --- a/library/language/ru/main.php +++ b/library/language/ru/main.php @@ -1094,7 +1094,7 @@ $lang['TOR_STATUS_NAME'] = array( TOR_CHECKING => 'проверяется', TOR_TMP => 'временная', TOR_PREMOD => 'премодерация', - TOR_REPLENISH => 'пополняемая', + TOR_REPLENISH => 'пополняемая', ); $lang['TOR_STATUS_FAILED'] = 'Такого статуса не существует!'; $lang['TORRENT_FAILED'] = 'Раздача не найдена!'; diff --git a/library/language/uk/main.php b/library/language/uk/main.php index ac5ed46a..7411d11b 100644 --- a/library/language/uk/main.php +++ b/library/language/uk/main.php @@ -1094,7 +1094,7 @@ $lang['TOR_STATUS_NAME'] = array( TOR_CHECKING => 'перевіряється', TOR_TMP => 'тимчасова', TOR_PREMOD => 'премодерація', - TOR_REPLENISH => 'поповнювана', + TOR_REPLENISH => 'поповнювана', ); $lang['TOR_STATUS_FAILED'] = 'Такого статусу не існує!'; $lang['TORRENT_FAILED'] = 'Роздача не знайдено!'; diff --git a/memberlist.php b/memberlist.php index d14f512f..d681dcb5 100644 --- a/memberlist.php +++ b/memberlist.php @@ -190,10 +190,10 @@ if ($result = DB()->fetch_rowset($sql)) $www = $lang['NOSELECT']; } - if(!$from) - { - $from = $lang['NOSELECT']; - } + if(!$from) + { + $from = $lang['NOSELECT']; + } $row_class = !($i % 2) ? 'row1' : 'row2'; $template->assign_block_vars('memberrow', array( diff --git a/privmsg.php b/privmsg.php index 265a77c2..ca7b7523 100644 --- a/privmsg.php +++ b/privmsg.php @@ -894,7 +894,7 @@ else if ( $submit || $refresh || $mode != '' ) { if ( !empty($_POST['username']) ) { - $to_userdata = get_userdata($_POST['username']); + $to_userdata = get_userdata($_POST['username']); if (!$to_userdata || $to_userdata['user_id'] == GUEST_UID) {