diff --git a/admin/admin_attach_cp.php b/admin/admin_attach_cp.php index 9943ac12f..71dcf532a 100644 --- a/admin/admin_attach_cp.php +++ b/admin/admin_attach_cp.php @@ -33,7 +33,7 @@ $view = (isset($_POST['search']) && $_POST['search']) ? 'attachments' : $view; // process modes based on view if ($view === 'username') { - $mode_types_text = array($lang['SORT_USERNAME'], $lang['SORT_ATTACHMENTS'], $lang['SORT_SIZE']); + $mode_types_text = array(trans('messages.SORT_USERNAME'), trans('messages.SORT_ATTACHMENTS'), trans('messages.SORT_SIZE')); $mode_types = array('username', 'attachments', 'filesize'); if (!$mode) { @@ -41,7 +41,7 @@ if ($view === 'username') { $sort_order = 'DESC'; } } elseif ($view === 'attachments') { - $mode_types_text = array($lang['SORT_FILENAME'], $lang['SORT_COMMENT'], $lang['SORT_EXTENSION'], $lang['SORT_SIZE'], $lang['SORT_DOWNLOADS'], $lang['SORT_POSTTIME']); + $mode_types_text = array(trans('messages.SORT_FILENAME'), trans('messages.SORT_COMMENT'), trans('messages.SORT_EXTENSION'), trans('messages.SORT_SIZE'), trans('messages.SORT_DOWNLOADS'), trans('messages.SORT_POSTTIME')); $mode_types = array('real_filename', 'comment', 'extension', 'filesize', 'downloads', 'post_time'); if (!$mode) { @@ -49,7 +49,7 @@ if ($view === 'username') { $sort_order = 'ASC'; } } elseif ($view === 'search') { - $mode_types_text = array($lang['SORT_FILENAME'], $lang['SORT_COMMENT'], $lang['SORT_EXTENSION'], $lang['SORT_SIZE'], $lang['SORT_DOWNLOADS'], $lang['SORT_POSTTIME']); + $mode_types_text = array(trans('messages.SORT_FILENAME'), trans('messages.SORT_COMMENT'), trans('messages.SORT_EXTENSION'), trans('messages.SORT_SIZE'), trans('messages.SORT_DOWNLOADS'), trans('messages.SORT_POSTTIME')); $mode_types = array('real_filename', 'comment', 'extension', 'filesize', 'downloads', 'post_time'); $sort_order = 'DESC'; @@ -111,7 +111,7 @@ if ($view === 'username') { } // Set select fields -$view_types_text = array($lang['VIEW_STATISTIC'], $lang['VIEW_SEARCH']); +$view_types_text = array(trans('messages.VIEW_STATISTIC'), trans('messages.VIEW_SEARCH')); $view_types = array('stats', 'search'); $select_view = ''; if ($sort_order === 'ASC') { - $select_sort_order .= ''; + $select_sort_order .= ''; } else { - $select_sort_order .= ''; + $select_sort_order .= ''; } $select_sort_order .= ''; @@ -268,16 +268,16 @@ if ($view === 'search') { $s_categories = ''; if ($s_forums) { - $s_forums = '' . $s_forums; + $s_forums = '' . $s_forums; // Category to search - $s_categories = ''; + $s_categories = ''; foreach ($list_cat as $cat_id => $cat_title) { $s_categories .= ''; } } else { - bb_die($lang['NO_SEARCHABLE_FORUMS']); + bb_die(trans('messages.NO_SEARCHABLE_FORUMS')); } $template->assign_vars(array( @@ -333,7 +333,7 @@ if ($view === 'attachments') { $template->assign_vars(array( 'S_USER_HIDDEN' => $s_hidden, - 'L_STATISTICS_FOR_USER' => sprintf($lang['STATISTICS_FOR_USER'], $username), + 'L_STATISTICS_FOR_USER' => sprintf(trans('messages.STATISTICS_FOR_USER'), $username), )); $sql = 'SELECT attach_id @@ -430,7 +430,7 @@ if ($view === 'attachments') { $post_titles[] = '' . $post_title . ''; } else { - $post_titles[] = $lang['PRIVATE_MESSAGE']; + $post_titles[] = trans('messages.PRIVATE_MESSAGE'); } } diff --git a/admin/admin_attachments.php b/admin/admin_attachments.php index 4f8a1ad0b..846b6d79b 100644 --- a/admin/admin_attachments.php +++ b/admin/admin_attachments.php @@ -197,18 +197,18 @@ if ($check_upload) { // Does the target directory exist, is it a directory and writeable if (!@file_exists(amod_realpath($upload_dir))) { $error = true; - $error_msg = sprintf($lang['DIRECTORY_DOES_NOT_EXIST'], $attach_config['upload_dir']) . '
'; + $error_msg = sprintf(trans('messages.DIRECTORY_DOES_NOT_EXIST'), $attach_config['upload_dir']) . '
'; } if (!$error && !is_dir($upload_dir)) { $error = true; - $error_msg = sprintf($lang['DIRECTORY_IS_NOT_A_DIR'], $attach_config['upload_dir']) . '
'; + $error_msg = sprintf(trans('messages.DIRECTORY_IS_NOT_A_DIR'), $attach_config['upload_dir']) . '
'; } if (!$error) { if (!($fp = @fopen($upload_dir . '/0_000000.000', 'wb'))) { $error = true; - $error_msg = sprintf($lang['DIRECTORY_NOT_WRITEABLE'], $attach_config['upload_dir']) . '
'; + $error_msg = sprintf(trans('messages.DIRECTORY_NOT_WRITEABLE'), $attach_config['upload_dir']) . '
'; } else { @fclose($fp); unlink_attach($upload_dir . '/0_000000.000'); @@ -216,14 +216,14 @@ if ($check_upload) { } if (!$error) { - bb_die($lang['TEST_SETTINGS_SUCCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.TEST_SETTINGS_SUCCESSFUL') . '

' . sprintf(trans('messages.CLICK_RETURN_ATTACH_CONFIG'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } } // Management if ($submit && $mode == 'manage') { if (!$error) { - bb_die($lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.ATTACH_CONFIG_UPDATED') . '

' . sprintf(trans('messages.CLICK_RETURN_ATTACH_CONFIG'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } } @@ -256,12 +256,12 @@ if ($mode == 'manage') { if ($submit && $mode == 'cats') { if (!$error) { - bb_die($lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.ATTACH_CONFIG_UPDATED') . '

' . sprintf(trans('messages.CLICK_RETURN_ATTACH_CONFIG'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } } if ($mode == 'cats') { - $s_assigned_group_images = $lang['NONE']; + $s_assigned_group_images = trans('messages.NONE'); $sql = 'SELECT group_name, cat_id FROM ' . BB_EXTENSION_GROUPS . ' WHERE cat_id > 0 ORDER BY cat_id'; @@ -351,19 +351,19 @@ if ($check_image_cat) { if (!@file_exists(amod_realpath($upload_dir))) { $error = true; - $error_msg = sprintf($lang['DIRECTORY_DOES_NOT_EXIST'], $upload_dir) . '
'; + $error_msg = sprintf(trans('messages.DIRECTORY_DOES_NOT_EXIST'), $upload_dir) . '
'; } } if (!$error && !is_dir($upload_dir)) { $error = true; - $error_msg = sprintf($lang['DIRECTORY_IS_NOT_A_DIR'], $upload_dir) . '
'; + $error_msg = sprintf(trans('messages.DIRECTORY_IS_NOT_A_DIR'), $upload_dir) . '
'; } if (!$error) { if (!($fp = @fopen($upload_dir . '/0_000000.000', 'wb'))) { $error = true; - $error_msg = sprintf($lang['DIRECTORY_NOT_WRITEABLE'], $upload_dir) . '
'; + $error_msg = sprintf(trans('messages.DIRECTORY_NOT_WRITEABLE'), $upload_dir) . '
'; } else { @fclose($fp); @unlink($upload_dir . '/0_000000.000'); @@ -371,7 +371,7 @@ if ($check_image_cat) { } if (!$error) { - bb_die($lang['TEST_SETTINGS_SUCCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.TEST_SETTINGS_SUCCESSFUL') . '

' . sprintf(trans('messages.CLICK_RETURN_ATTACH_CONFIG'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } } @@ -442,7 +442,7 @@ if ($submit && $mode == 'quota') { if (isset($error_msg)) { $error_msg .= '
'; } - $error_msg .= sprintf($lang['QUOTA_LIMIT_EXIST'], $extension_group); + $error_msg .= sprintf(trans('messages.QUOTA_LIMIT_EXIST'), $extension_group); } } } @@ -460,7 +460,7 @@ if ($submit && $mode == 'quota') { } if (!$error) { - bb_die($lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.ATTACH_CONFIG_UPDATED') . '

' . sprintf(trans('messages.CLICK_RETURN_ATTACH_CONFIG'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } } diff --git a/admin/admin_board.php b/admin/admin_board.php index 94d8f3442..ebf659ae1 100644 --- a/admin/admin_board.php +++ b/admin/admin_board.php @@ -18,9 +18,9 @@ require INC_DIR . '/functions_selects.php'; $mode = $_GET['mode'] ?? ''; $return_links = array( - 'index' => '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''), - 'config' => '

' . sprintf($lang['CLICK_RETURN_CONFIG'], '', ''), - 'config_mods' => '

' . sprintf($lang['CLICK_RETURN_CONFIG_MODS'], '', '') + 'index' => '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''), + 'config' => '

' . sprintf(trans('messages.CLICK_RETURN_CONFIG'), '', ''), + 'config_mods' => '

' . sprintf(trans('messages.CLICK_RETURN_CONFIG_MODS'), '', '') ); /** @@ -50,7 +50,7 @@ if (!$result = OLD_DB()->sql_query($sql)) { } if (isset($_POST['submit'])) { - bb_die($lang['CONFIG_UPDATED'] . $return_links[$mode] . $return_links['index']); + bb_die(trans('messages.CONFIG_UPDATED') . $return_links[$mode] . $return_links['index']); } } diff --git a/admin/admin_bt_forum_cfg.php b/admin/admin_bt_forum_cfg.php index a563132c1..f40fe09a2 100644 --- a/admin/admin_bt_forum_cfg.php +++ b/admin/admin_bt_forum_cfg.php @@ -87,7 +87,7 @@ if ($submit && $confirm) { $datastore->update('cat_forums'); - bb_die($lang['CONFIG_UPD'] . '

' . sprintf($lang['RETURN_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.CONFIG_UPD') . '

' . sprintf(trans('messages.RETURN_CONFIG'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } // Set template vars @@ -136,9 +136,9 @@ foreach ($db_fields_bool as $field_name => $field_def_val) { } $template->assign_vars(array( - 'L_BT_SHOW_PEERS_MODE_COUNT' => ($cfg['bt_show_peers_mode'] == SHOW_PEERS_COUNT) ? '' . $lang['BT_SHOW_PEERS_MODE_COUNT'] . '' : $lang['BT_SHOW_PEERS_MODE_COUNT'], - 'L_BT_SHOW_PEERS_MODE_NAMES' => ($cfg['bt_show_peers_mode'] == SHOW_PEERS_NAMES) ? '' . $lang['BT_SHOW_PEERS_MODE_NAMES'] . '' : $lang['BT_SHOW_PEERS_MODE_NAMES'], - 'L_BT_SHOW_PEERS_MODE_FULL' => ($cfg['bt_show_peers_mode'] == SHOW_PEERS_FULL) ? '' . $lang['BT_SHOW_PEERS_MODE_FULL'] . '' : $lang['BT_SHOW_PEERS_MODE_FULL'], + 'L_BT_SHOW_PEERS_MODE_COUNT' => ($cfg['bt_show_peers_mode'] == SHOW_PEERS_COUNT) ? '' . trans('messages.BT_SHOW_PEERS_MODE_COUNT') . '' : trans('messages.BT_SHOW_PEERS_MODE_COUNT'), + 'L_BT_SHOW_PEERS_MODE_NAMES' => ($cfg['bt_show_peers_mode'] == SHOW_PEERS_NAMES) ? '' . trans('messages.BT_SHOW_PEERS_MODE_NAMES') . '' : trans('messages.BT_SHOW_PEERS_MODE_NAMES'), + 'L_BT_SHOW_PEERS_MODE_FULL' => ($cfg['bt_show_peers_mode'] == SHOW_PEERS_FULL) ? '' . trans('messages.BT_SHOW_PEERS_MODE_FULL') . '' : trans('messages.BT_SHOW_PEERS_MODE_FULL'), 'BT_SHOW_PEERS_MODE_COUNT_VAL' => SHOW_PEERS_COUNT, 'BT_SHOW_PEERS_MODE_NAMES_VAL' => SHOW_PEERS_NAMES, diff --git a/admin/admin_bt_tracker_cfg.php b/admin/admin_bt_tracker_cfg.php index a963abf28..f7297f9ab 100644 --- a/admin/admin_bt_tracker_cfg.php +++ b/admin/admin_bt_tracker_cfg.php @@ -16,7 +16,7 @@ if (!empty($setmodules)) { require __DIR__ . '/pagestart.php'; if (!IS_SUPER_ADMIN) { - bb_die($lang['NOT_ADMIN']); + bb_die(trans('messages.NOT_ADMIN')); } require INC_DIR . '/functions_admin_torrent.php'; diff --git a/admin/admin_cron.php b/admin/admin_cron.php index ab1c4115a..290871ffa 100644 --- a/admin/admin_cron.php +++ b/admin/admin_cron.php @@ -30,7 +30,7 @@ if ($mode == 'run' && !$job_id) { } if (!IS_SUPER_ADMIN) { - bb_die($lang['NOT_ADMIN']); + bb_die(trans('messages.NOT_ADMIN')); } require INC_DIR . '/functions_admin_torrent.php'; @@ -64,10 +64,10 @@ switch ($mode) { 'ROW_CLASS' => !($i % 2) ? 'row2' : 'row1', 'JOB_ID' => $i + 1, 'CRON_ID' => $row['cron_id'], - 'CRON_ACTIVE' => $row['cron_active'] ? '' . $lang['YES'] . '' : '' . $lang['NO'] . '', + 'CRON_ACTIVE' => $row['cron_active'] ? '' . trans('messages.YES') . '' : '' . trans('messages.NO') . '', 'CRON_TITLE' => $row['cron_title'], 'CRON_SCRIPT' => $row['cron_script'], - 'SCHEDULE' => $row['schedule'] ? $lang['SCHEDULE'][$row['schedule']] : '' . $lang['NOSELECT'] . '', + 'SCHEDULE' => $row['schedule'] ? trans('messages.SCHEDULE.' . $row['schedule']) : '' . trans('messages.NOSELECT') . '', 'RUN_DAY' => $row['run_day'], 'LAST_RUN' => $row['last_run'], 'NEXT_RUN' => $row['next_run'], @@ -110,7 +110,7 @@ switch ($mode) { 'CRON_ACTIVE' => $row['cron_active'], 'CRON_TITLE' => $row['cron_title'], 'CRON_SCRIPT' => $row['cron_script'], - 'SCHEDULE' => $row['schedule'] ? $lang['SCHEDULE'][$row['schedule']] : '', + 'SCHEDULE' => $row['schedule'] ? trans('messages.SCHEDULE.' . $row['schedule']) : '', 'RUN_DAY' => $row['run_day'], 'RUN_TIME' => $row['run_time'], 'RUN_ORDER' => $row['run_order'], @@ -125,13 +125,13 @@ switch ($mode) { )); } - $run_day = array($lang['DELTA_TIME']['INTERVALS']['mday'][0] => 0); + $run_day = [trans('messages.DELTA_TIME.INTERVALS.mday.0') => 0]; for ($i = 1; $i <= 28; $i++) { $run_day[$i] = $i; } - $schedule = array($lang['SCHEDULE']['select'] => 0); - foreach ($lang['SCHEDULE'] as $type => $key) { + $schedule = [trans('messages.SCHEDULE.select') => 0]; + foreach (trans('messages.SCHEDULE') as $type => $key) { $schedule[$key] = $type; } @@ -141,18 +141,18 @@ switch ($mode) { 'S_MODE' => 'edit', 'SCHEDULE' => build_select('schedule', $schedule, $row['schedule']), 'RUN_DAY' => build_select('run_day', $run_day, $row['run_day']), - 'L_CRON_EDIT_HEAD' => $lang['CRON_EDIT_HEAD_EDIT'], + 'L_CRON_EDIT_HEAD' => trans('messages.CRON_EDIT_HEAD_EDIT'), )); break; case 'add': - $run_day = array($lang['DELTA_TIME']['INTERVALS']['mday'][0] => 0); + $run_day = [trans('messages.DELTA_TIME.INTERVALS.mday.0') => 0]; for ($i = 1; $i <= 28; $i++) { $run_day[$i] = $i; } $schedule = array(); - foreach ($lang['SCHEDULE'] as $type => $key) { + foreach (trans('messages.SCHEDULE') as $type => $key) { $schedule[$key] = $type; } @@ -181,7 +181,7 @@ switch ($mode) { case 'delete': delete_jobs($job_id); - bb_die($lang['JOB_REMOVED'] . '

' . sprintf($lang['CLICK_RETURN_JOBS'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.JOB_REMOVED') . '

' . sprintf(trans('messages.CLICK_RETURN_JOBS'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); break; } diff --git a/admin/admin_disallow.php b/admin/admin_disallow.php index 88618783f..cd774e0b4 100644 --- a/admin/admin_disallow.php +++ b/admin/admin_disallow.php @@ -21,20 +21,20 @@ if (isset($_POST['add_name'])) { $disallowed_user = isset($_POST['disallowed_user']) ? trim($_POST['disallowed_user']) : trim($_GET['disallowed_user']); if ($disallowed_user == '') { - bb_die($lang['FIELDS_EMPTY']); + bb_die(trans('messages.FIELDS_EMPTY')); } if (!validate_username($disallowed_user)) { - $message = $lang['DISALLOWED_ALREADY']; + $message = trans('messages.DISALLOWED_ALREADY'); } else { $sql = 'INSERT INTO ' . BB_DISALLOW . " (disallow_username) VALUES('" . OLD_DB()->escape($disallowed_user) . "')"; $result = OLD_DB()->sql_query($sql); if (!$result) { bb_die('Could not add disallowed user'); } - $message = $lang['DISALLOW_SUCCESSFUL']; + $message = trans('messages.DISALLOW_SUCCESSFUL'); } - $message .= '

' . sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= '

' . sprintf(trans('messages.CLICK_RETURN_DISALLOWADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } elseif (isset($_POST['delete_name'])) { @@ -46,7 +46,7 @@ if (isset($_POST['add_name'])) { bb_die('Could not removed disallowed user'); } - $message .= $lang['DISALLOWED_DELETED'] . '

' . sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= trans('messages.DISALLOWED_DELETED') . '

' . sprintf(trans('messages.CLICK_RETURN_DISALLOWADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } @@ -68,7 +68,7 @@ $disallowed = OLD_DB()->sql_fetchrowset($result); $disallow_select = ''; $template->assign_block_vars('forum_auth', array( - 'CELL_TITLE' => $lang['SIMPLE_MODE'], + 'CELL_TITLE' => trans('messages.SIMPLE_MODE'), 'S_AUTH_LEVELS_SELECT' => $simple_auth, )); @@ -184,7 +184,7 @@ if (empty($forum_id)) { for ($k = 0, $kMax = count($forum_auth_levels); $k < $kMax; $k++) { $selected = ($forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k]) ? ' selected="selected"' : ''; - $custom_auth[$j] .= ''; + $custom_auth[$j] .= ''; } $custom_auth[$j] .= ' '; @@ -201,7 +201,7 @@ if (empty($forum_id)) { $adv_mode = empty($adv) ? '1' : '0'; $switch_mode = "admin_forumauth.php?f=$forum_id&adv=$adv_mode"; - $switch_mode_text = empty($adv) ? $lang['ADVANCED_MODE'] : $lang['SIMPLE_MODE']; + $switch_mode_text = empty($adv) ? trans('messages.ADVANCED_MODE') : trans('messages.SIMPLE_MODE'); $u_switch_mode = '' . $switch_mode_text . ''; $s_hidden_fields = ''; diff --git a/admin/admin_forumauth_list.php b/admin/admin_forumauth_list.php index bd7fec7cd..2b0efa830 100644 --- a/admin/admin_forumauth_list.php +++ b/admin/admin_forumauth_list.php @@ -26,13 +26,13 @@ $simple_auth_ary = [ ]; $simple_auth_types = [ - $lang['PUBLIC'], - $lang['REGISTERED'], - $lang['REGISTERED'] . ' [' . $lang['HIDDEN'] . ']', - $lang['PRIVATE'], - $lang['PRIVATE'] . ' [' . $lang['HIDDEN'] . ']', - $lang['MODERATORS'], - $lang['MODERATORS'] . ' [' . $lang['HIDDEN'] . ']', + trans('messages.PUBLIC'), + trans('messages.REGISTERED'), + trans('messages.REGISTERED') . ' [' . trans('messages.HIDDEN') . ']', + trans('messages.PRIVATE'), + trans('messages.PRIVATE') . ' [' . trans('messages.HIDDEN') . ']', + trans('messages.MODERATORS'), + trans('messages.MODERATORS') . ' [' . trans('messages.HIDDEN') . ']', ]; $forum_auth_fields = [ @@ -52,7 +52,7 @@ $forum_auth_fields = [ $field_names = []; foreach ($forum_auth_fields as $auth_type) { - $field_names[$auth_type] = $lang[strtoupper($auth_type)]; + $field_names[$auth_type] = trans('messages.' . strtoupper($auth_type)); } $forum_auth_levels = ['ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN']; @@ -146,7 +146,7 @@ if (isset($_POST['submit'])) { } $datastore->update('cat_forums'); - bb_die($lang['FORUM_AUTH_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_FORUMAUTH'], '', '')); + bb_die(trans('messages.FORUM_AUTH_UPDATED') . '

' . sprintf(trans('messages.CLICK_RETURN_FORUMAUTH'), '', '')); } // End of submit // @@ -218,8 +218,8 @@ if (empty($forum_id) && empty($cat_id)) { } } $template->assign_block_vars('cat_row.forum_row.forum_auth_data', array( - 'CELL_VALUE' => $lang['FORUM_' . $item_auth_level], - 'AUTH_EXPLAIN' => sprintf($lang[strtoupper('FORUM_AUTH_LIST_EXPLAIN_' . $forum_auth_fields[$k])], $lang[strtoupper('FORUM_AUTH_LIST_EXPLAIN_' . $item_auth_level)])) + 'CELL_VALUE' => trans('messages.FORUM_' . $item_auth_level), + 'AUTH_EXPLAIN' => sprintf(trans('messages.' . strtoupper('FORUM_AUTH_LIST_EXPLAIN_' . $forum_auth_fields[$k])), trans('messages.' . strtoupper('FORUM_AUTH_LIST_EXPLAIN_' . $item_auth_level)))) ); } } @@ -277,8 +277,8 @@ if (empty($forum_id) && empty($cat_id)) { } } $template->assign_block_vars('cat_row.forum_row.forum_auth_data', array( - 'CELL_VALUE' => $lang['FORUM_' . $item_auth_level], - 'AUTH_EXPLAIN' => sprintf($lang[strtoupper('FORUM_AUTH_LIST_EXPLAIN_' . $forum_auth_fields[$k])], $lang[strtoupper('FORUM_AUTH_LIST_EXPLAIN_' . $item_auth_level)])) + 'CELL_VALUE' => trans('messages.FORUM_' . $item_auth_level), + 'AUTH_EXPLAIN' => sprintf(trans('messages.' . strtoupper('FORUM_AUTH_LIST_EXPLAIN_' . $forum_auth_fields[$k])), trans('messages.' . strtoupper('FORUM_AUTH_LIST_EXPLAIN_' . $item_auth_level)))) ); } } @@ -293,7 +293,7 @@ if (empty($forum_id) && empty($cat_id)) { for ($k = 0, $kMax = count($forum_auth_levels); $k < $kMax; $k++) { $selected = (!empty($forum_rows) && $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k]) ? ' selected="selected"' : ''; - $custom_auth[$j] .= ''; + $custom_auth[$j] .= ''; } $custom_auth[$j] .= ''; diff --git a/admin/admin_forums.php b/admin/admin_forums.php index 45dd66e0d..d004f54cb 100644 --- a/admin/admin_forums.php +++ b/admin/admin_forums.php @@ -65,9 +65,9 @@ if ($mode) { if ($mode == 'editforum') { // $newmode determines if we are going to INSERT or UPDATE after posting? - $l_title = $lang['EDIT_FORUM']; + $l_title = trans('messages.EDIT_FORUM'); $newmode = 'modforum'; - $buttonvalue = $lang['UPDATE']; + $buttonvalue = trans('messages.UPDATE'); $forum_id = (int)$_GET[POST_FORUM_URL]; @@ -87,9 +87,9 @@ if ($mode) { $allow_porno_topic = $row['allow_porno_topic']; $self_moderated = $row['self_moderated']; } else { - $l_title = $lang['CREATE_FORUM']; + $l_title = trans('messages.CREATE_FORUM'); $newmode = 'createforum'; - $buttonvalue = $lang['CREATE_FORUM']; + $buttonvalue = trans('messages.CREATE_FORUM'); $forumdesc = ''; $forumstatus = FORUM_UNLOCKED; @@ -119,15 +119,15 @@ if ($mode) { $forumstatus == FORUM_LOCKED ? $forumlocked = 'selected="selected"' : $forumunlocked = 'selected="selected"'; - $statuslist = '\n'; - $statuslist .= '\n'; + $statuslist = '\n'; + $statuslist .= '\n'; $forum_display_sort_list = get_forum_display_sort_option($forum_display_sort, 'list', 'sort'); $forum_display_order_list = get_forum_display_sort_option($forum_display_order, 'list', 'order'); $s_hidden_fields = ''; - $s_parent = '\n'; + $s_parent = '\n'; $sel_forum = ($forum_parent && !isset($_REQUEST['forum_parent'])) ? $forum_id : $forum_parent; $s_parent .= sf_get_list('forum', $forum_id, $sel_forum); @@ -146,10 +146,10 @@ if ($mode) { 'S_PARENT_FORUM' => $s_parent, 'CAT_LIST_CLASS' => $forum_parent ? 'hidden' : '', 'SHOW_ON_INDEX_CLASS' => (!$forum_parent) ? 'hidden' : '', - 'TPL_SELECT' => get_select('forum_tpl', $forum_tpl_id, 'html', $lang['TEMPLATE_DISABLE']), - 'ALLOW_REG_TRACKER' => build_select('allow_reg_tracker', array($lang['DISALLOWED'] => 0, $lang['ALLOWED'] => 1), $allow_reg_tracker), - 'ALLOW_PORNO_TOPIC' => build_select('allow_porno_topic', array($lang['NONE'] => 0, $lang['YES'] => 1), $allow_porno_topic), - 'SELF_MODERATED' => build_select('self_moderated', array($lang['NONE'] => 0, $lang['YES'] => 1), $self_moderated), + 'TPL_SELECT' => get_select('forum_tpl', $forum_tpl_id, 'html', trans('messages.TEMPLATE_DISABLE')), + 'ALLOW_REG_TRACKER' => build_select('allow_reg_tracker', array(trans('messages.DISALLOWED') => 0, trans('messages.ALLOWED') => 1), $allow_reg_tracker), + 'ALLOW_PORNO_TOPIC' => build_select('allow_porno_topic', array(trans('messages.NONE') => 0, trans('messages.YES') => 1), $allow_porno_topic), + 'SELF_MODERATED' => build_select('self_moderated', array(trans('messages.NONE') => 0, trans('messages.YES') => 1), $self_moderated), 'L_FORUM_TITLE' => $l_title, @@ -218,7 +218,7 @@ if ($mode) { $datastore->update('cat_forums'); OLD_CACHE('bb_cache')->rm(); - bb_die($lang['FORUMS_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_FORUMADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.FORUMS_UPDATED') . '

' . sprintf(trans('messages.CLICK_RETURN_FORUMADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); break; @@ -305,9 +305,9 @@ if ($mode) { $datastore->update('cat_forums'); OLD_CACHE('bb_cache')->rm(); - $message = $lang['FORUMS_UPDATED'] . '

'; + $message = trans('messages.FORUMS_UPDATED') . '

'; $message .= $fix ? "$fix

" : ''; - $message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf(trans('messages.CLICK_RETURN_FORUMADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); break; @@ -334,7 +334,7 @@ if ($mode) { $datastore->update('cat_forums'); OLD_CACHE('bb_cache')->rm(); - bb_die($lang['FORUMS_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_FORUMADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.FORUMS_UPDATED') . '

' . sprintf(trans('messages.CLICK_RETURN_FORUMADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); break; @@ -354,7 +354,7 @@ if ($mode) { 'TPL_EDIT_CATEGORY' => true, 'CAT_TITLE' => htmlCHR($cat_info['cat_title']), 'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), - 'S_SUBMIT_VALUE' => $lang['UPDATE'], + 'S_SUBMIT_VALUE' => trans('messages.UPDATE'), 'S_FORUM_ACTION' => 'admin_forums.php', )); @@ -388,7 +388,7 @@ if ($mode) { $datastore->update('cat_forums'); OLD_CACHE('bb_cache')->rm(); - bb_die($lang['FORUMS_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_FORUMADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.FORUMS_UPDATED') . '

' . sprintf(trans('messages.CLICK_RETURN_FORUMADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); break; @@ -398,7 +398,7 @@ if ($mode) { // $forum_id = (int)$_GET['f']; - $move_to_options = ''; + $move_to_options = ''; $move_to_options .= sf_get_list('forum', $forum_id, 0); $foruminfo = get_info('forum', $forum_id); @@ -412,13 +412,13 @@ if ($mode) { 'TPL_DELETE_FORUM' => true, 'WHAT_TO_DELETE' => htmlCHR($foruminfo['forum_name']), - 'DELETE_TITLE' => $lang['FORUM_DELETE'], - 'CAT_FORUM_NAME' => $lang['FORUM_NAME'], + 'DELETE_TITLE' => trans('messages.FORUM_DELETE'), + 'CAT_FORUM_NAME' => trans('messages.FORUM_NAME'), 'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), 'S_FORUM_ACTION' => 'admin_forums.php', 'MOVE_TO_OPTIONS' => $move_to_options, - 'S_SUBMIT_VALUE' => $lang['MOVE_AND_DELETE'], + 'S_SUBMIT_VALUE' => trans('messages.MOVE_AND_DELETE'), )); break; @@ -474,7 +474,7 @@ if ($mode) { $datastore->update('cat_forums'); OLD_CACHE('bb_cache')->rm(); - bb_die($lang['FORUMS_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_FORUMADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.FORUMS_UPDATED') . '

' . sprintf(trans('messages.CLICK_RETURN_FORUMADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); break; @@ -488,9 +488,9 @@ if ($mode) { $row = OLD_DB()->fetch_row('SELECT COUNT(*) AS forums_count FROM ' . BB_FORUMS); if ($row['forums_count'] > 0) { - bb_die($lang['MUST_DELETE_FORUMS']); + bb_die(trans('messages.MUST_DELETE_FORUMS')); } else { - $template->assign_var('NOWHERE_TO_MOVE', $lang['NOWHERE_TO_MOVE']); + $template->assign_var('NOWHERE_TO_MOVE', trans('messages.NOWHERE_TO_MOVE')); } } @@ -503,13 +503,13 @@ if ($mode) { 'TPL_DELETE_FORUM' => true, 'WHAT_TO_DELETE' => htmlCHR($catinfo['cat_title']), - 'DELETE_TITLE' => $lang['CATEGORY_DELETE'], - 'CAT_FORUM_NAME' => $lang['CATEGORY'], + 'DELETE_TITLE' => trans('messages.CATEGORY_DELETE'), + 'CAT_FORUM_NAME' => trans('messages.CATEGORY'), 'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), 'S_FORUM_ACTION' => 'admin_forums.php', 'MOVE_TO_OPTIONS' => get_list('category', $cat_id, 0), - 'S_SUBMIT_VALUE' => $lang['MOVE_AND_DELETE'], + 'S_SUBMIT_VALUE' => trans('messages.MOVE_AND_DELETE'), )); break; @@ -540,9 +540,9 @@ if ($mode) { $datastore->update('cat_forums'); OLD_CACHE('bb_cache')->rm(); - $message = $lang['FORUMS_UPDATED'] . '

'; + $message = trans('messages.FORUMS_UPDATED') . '

'; $message .= $fix ? "$fix

" : ''; - $message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf(trans('messages.CLICK_RETURN_FORUMADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); break; @@ -648,7 +648,7 @@ if ($mode) { break; default: - bb_die($lang['NO_MODE']); + bb_die(trans('messages.NO_MODE')); break; } @@ -659,7 +659,7 @@ if (!$mode || $show_main_page) { 'TPL_FORUMS_LIST' => true, 'S_FORUM_ACTION' => 'admin_forums.php', - 'L_FORUM_TITLE' => $lang['FORUM_ADMIN_MAIN'], + 'L_FORUM_TITLE' => trans('messages.FORUM_ADMIN_MAIN'), )); $sql = 'SELECT cat_id, cat_title, cat_order FROM ' . BB_CATEGORIES . ' ORDER BY cat_order'; @@ -1033,8 +1033,6 @@ function get_orphan_sf() */ function fix_orphan_sf($orphan_sf_sql = '', $show_mess = false) { - global $lang; - $done_mess = ''; if (!$orphan_sf_sql) { @@ -1054,8 +1052,8 @@ function fix_orphan_sf($orphan_sf_sql = '', $show_mess = false) if ($show_mess) { $message = $done_mess . '

'; - $message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], '', '') . '

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf(trans('messages.CLICK_RETURN_FORUMADMIN'), '', '') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } } diff --git a/admin/admin_groups.php b/admin/admin_groups.php index 564132d67..eb199d292 100644 --- a/admin/admin_groups.php +++ b/admin/admin_groups.php @@ -22,7 +22,7 @@ attachment_quota_settings('group', isset($_POST['group_update']), $mode); if (!empty($_POST['edit']) || !empty($_POST['new'])) { if (!empty($_POST['edit'])) { if (!$row = get_group_data($group_id)) { - bb_die($lang['GROUP_NOT_EXIST']); + bb_die(trans('messages.GROUP_NOT_EXIST')); } $group_info = array( 'group_name' => $row['group_name'], @@ -58,7 +58,7 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) { 'GROUP_NAME' => stripslashes(htmlspecialchars($group_info['group_name'])), 'GROUP_DESCRIPTION' => stripslashes(htmlspecialchars($group_info['group_description'])), 'GROUP_MODERATOR' => replace_quote($group_info['group_mod_name']), - 'T_GROUP_EDIT_DELETE' => ($mode == 'newgroup') ? $lang['CREATE_NEW_GROUP'] : $lang['EDIT_GROUP'], + 'T_GROUP_EDIT_DELETE' => ($mode == 'newgroup') ? trans('messages.CREATE_NEW_GROUP') : trans('messages.EDIT_GROUP'), 'U_SEARCH_USER' => BB_ROOT . 'search.php?mode=searchuser', 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, @@ -73,14 +73,14 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) { } elseif (!empty($_POST['group_update'])) { if (!empty($_POST['group_delete'])) { if (!$group_info = get_group_data($group_id)) { - bb_die($lang['GROUP_NOT_EXIST']); + bb_die(trans('messages.GROUP_NOT_EXIST')); } // Delete Group delete_group($group_id); - $message = $lang['DELETED_GROUP'] . '

'; - $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') . '

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = trans('messages.DELETED_GROUP') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_GROUPSADMIN'), '', '') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } else { @@ -91,14 +91,14 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) { $group_moderator = $_POST['username'] ?? ''; if ($group_name === '') { - bb_die($lang['NO_GROUP_NAME']); + bb_die(trans('messages.NO_GROUP_NAME')); } elseif ($group_moderator === '') { - bb_die($lang['NO_GROUP_MODERATOR']); + bb_die(trans('messages.NO_GROUP_MODERATOR')); } $this_userdata = get_userdata($group_moderator, true); if (!$group_moderator = $this_userdata['user_id']) { - bb_die($lang['NO_GROUP_MODERATOR']); + bb_die(trans('messages.NO_GROUP_MODERATOR')); } $sql_ary = array( @@ -112,7 +112,7 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) { if ($mode == 'editgroup') { if (!$group_info = get_group_data($group_id)) { - bb_die($lang['GROUP_NOT_EXIST']); + bb_die(trans('messages.GROUP_NOT_EXIST')); } if ($group_info['group_moderator'] != $group_moderator) { @@ -131,9 +131,9 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) { // Update group's data OLD_DB()->query('UPDATE ' . BB_GROUPS . " SET $sql_args WHERE group_id = $group_id"); - $message = $lang['UPDATED_GROUP'] . '

'; - $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') . '

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = trans('messages.UPDATED_GROUP') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_GROUPSADMIN'), '', '') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } elseif ($mode == 'newgroup') { @@ -147,13 +147,13 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) { // Create user_group for group's moderator add_user_into_group($new_group_id, $group_moderator); - $message = $lang['ADDED_NEW_GROUP'] . '

'; - $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') . '

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = trans('messages.ADDED_NEW_GROUP') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_GROUPSADMIN'), '', '') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } else { - bb_die($lang['NO_GROUP_ACTION']); + bb_die(trans('messages.NO_GROUP_ACTION')); } } } else { diff --git a/admin/admin_log.php b/admin/admin_log.php index c88c16c20..097a2c143 100644 --- a/admin/admin_log.php +++ b/admin/admin_log.php @@ -66,7 +66,7 @@ if (!$mod = $datastore->get('moderators')) { array_deep($mod['moderators'], 'html_entity_decode'); array_deep($mod['admins'], 'html_entity_decode'); -$users = array($lang['ACTS_LOG_ALL_ACTIONS'] => $all_users) + array_flip($mod['moderators']) + array_flip($mod['admins']); +$users = array(trans('messages.ACTS_LOG_ALL_ACTIONS') => $all_users) + array_flip($mod['moderators']) + array_flip($mod['admins']); unset($mod); @@ -253,7 +253,7 @@ if ($log_rowset) { $datetime_href_s = url_arg($datetime_href_s, $daysback_key, 1); $template->assign_block_vars('log', array( - 'ACTION_DESC' => $lang['LOG_ACTION']['LOG_TYPE'][$log_type_flip[$row['log_type_id']]], + 'ACTION_DESC' => trans('messages.LOG_ACTION.LOG_TYPE.' . $log_type_flip[$row['log_type_id']]), 'ACTION_HREF_S' => url_arg($url, $type_key, $row['log_type_id']), 'USER_ID' => $row['log_user_id'], @@ -323,7 +323,7 @@ if ($log_rowset) { } // Select -$log_type_select = array($lang['ACTS_LOG_ALL_ACTIONS'] => $all_types) + $log_action->log_type_select; +$log_type_select = array(trans('messages.ACTS_LOG_ALL_ACTIONS') => $all_types) + $log_action->log_type_select; $template->assign_vars(array( 'LOG_COLSPAN' => 4, @@ -332,7 +332,7 @@ $template->assign_vars(array( 'DATETIME_VAL' => date('Y-m-d', $datetime_val), 'DAYSBACK_NAME' => $daysback_key, 'DAYSBACK_VAL' => $daysback_val, - 'FIRST_LOG_TIME' => $first_log_time ? date('Y-m-d', $first_log_time) : $lang['ACC_NONE'], + 'FIRST_LOG_TIME' => $first_log_time ? date('Y-m-d', $first_log_time) : trans('messages.ACC_NONE'), 'TITLE_MATCH_MAX' => $title_match_max_len, 'TITLE_MATCH_NAME' => $title_match_key, diff --git a/admin/admin_mass_email.php b/admin/admin_mass_email.php index 8c90f6b9e..e6df2b275 100644 --- a/admin/admin_mass_email.php +++ b/admin/admin_mass_email.php @@ -24,13 +24,13 @@ $errors = $user_id_sql = []; if (isset($_POST['submit'])) { if (!$subject) { - $errors[] = $lang['EMPTY_SUBJECT']; + $errors[] = trans('messages.EMPTY_SUBJECT'); } if (!$message) { - $errors[] = $lang['EMPTY_MESSAGE']; + $errors[] = trans('messages.EMPTY_MESSAGE'); } if (!$group_id) { - $errors[] = $lang['GROUP_NOT_EXIST']; + $errors[] = trans('messages.GROUP_NOT_EXIST'); } if (!$errors) { @@ -88,7 +88,7 @@ $sql = 'SELECT group_id, group_name ORDER BY group_name '; -$groups = array('-- ' . $lang['ALL_USERS'] . ' --' => -1); +$groups = array('-- ' . trans('messages.ALL_USERS') . ' --' => -1); foreach (OLD_DB()->fetch_rowset($sql) as $row) { $groups[$row['group_name']] = $row['group_id']; } diff --git a/admin/admin_ranks.php b/admin/admin_ranks.php index 1b58087c2..c50acff07 100644 --- a/admin/admin_ranks.php +++ b/admin/admin_ranks.php @@ -40,7 +40,7 @@ if ($mode != '') { if ($mode == 'edit') { if (empty($rank_id)) { - bb_die($lang['MUST_SELECT_RANK']); + bb_die(trans('messages.MUST_SELECT_RANK')); } $sql = 'SELECT * FROM ' . BB_RANKS . " WHERE rank_id = $rank_id"; @@ -76,7 +76,7 @@ if ($mode != '') { $rank_image = isset($_POST['rank_image']) ? trim($_POST['rank_image']) : ''; if ($rank_title == '') { - bb_die($lang['MUST_SELECT_RANK']); + bb_die(trans('messages.MUST_SELECT_RANK')); } // @@ -91,7 +91,7 @@ if ($mode != '') { if ($rank_id) { $sql = 'UPDATE ' . BB_USERS . " SET user_rank = 0 WHERE user_rank = $rank_id"; if (!$result = OLD_DB()->sql_query($sql)) { - bb_die($lang['NO_UPDATE_RANKS']); + bb_die(trans('messages.NO_UPDATE_RANKS')); } $sql = 'UPDATE ' . BB_RANKS . " @@ -100,19 +100,19 @@ if ($mode != '') { rank_style = '" . OLD_DB()->escape($rank_style) . "' WHERE rank_id = $rank_id"; - $message = $lang['RANK_UPDATED']; + $message = trans('messages.RANK_UPDATED'); } else { $sql = 'INSERT INTO ' . BB_RANKS . " (rank_title, rank_image, rank_style) VALUES ('" . OLD_DB()->escape($rank_title) . "', '" . OLD_DB()->escape($rank_image) . "', '" . OLD_DB()->escape($rank_style) . "')"; - $message = $lang['RANK_ADDED']; + $message = trans('messages.RANK_ADDED'); } if (!$result = OLD_DB()->sql_query($sql)) { bb_die('Could not update / insert into ranks table'); } - $message .= '

' . sprintf($lang['CLICK_RETURN_RANKADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= '

' . sprintf(trans('messages.CLICK_RETURN_RANKADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); $datastore->update('ranks'); @@ -137,14 +137,14 @@ if ($mode != '') { $sql = 'UPDATE ' . BB_USERS . " SET user_rank = 0 WHERE user_rank = $rank_id"; if (!$result = OLD_DB()->sql_query($sql)) { - bb_die($lang['NO_UPDATE_RANKS']); + bb_die(trans('messages.NO_UPDATE_RANKS')); } $datastore->update('ranks'); - bb_die($lang['RANK_REMOVED'] . '

' . sprintf($lang['CLICK_RETURN_RANKADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.RANK_REMOVED') . '

' . sprintf(trans('messages.CLICK_RETURN_RANKADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } else { - bb_die($lang['MUST_SELECT_RANK']); + bb_die(trans('messages.MUST_SELECT_RANK')); } } else { bb_die('Invalid mode'); diff --git a/admin/admin_rebuild_search.php b/admin/admin_rebuild_search.php index a8d24ad10..873e22733 100644 --- a/admin/admin_rebuild_search.php +++ b/admin/admin_rebuild_search.php @@ -16,7 +16,7 @@ if (!empty($setmodules)) { require __DIR__ . '/pagestart.php'; if (!IS_SUPER_ADMIN) { - bb_die($lang['NOT_ADMIN']); + bb_die(trans('messages.NOT_ADMIN')); } require INC_DIR . '/bbcode.php'; @@ -50,7 +50,7 @@ if (isset($_REQUEST['cancel_button'])) { "); } - bb_die(sprintf($lang['REBUILD_SEARCH_ABORTED'], $last_session_data['end_post_id']) . '

' . sprintf($lang['CLICK_RETURN_REBUILD_SEARCH'], '', '')); + bb_die(sprintf(trans('messages.REBUILD_SEARCH_ABORTED'), $last_session_data['end_post_id']) . '

' . sprintf(trans('messages.CLICK_RETURN_REBUILD_SEARCH'), '', '')); } // from which post to start processing @@ -98,13 +98,13 @@ if (isset($_REQUEST['time_limit'])) { $time_limit = (int)$_REQUEST['time_limit']; } else { $time_limit = $def_time_limit; - $time_limit_explain = $lang['TIME_LIMIT_EXPLAIN']; + $time_limit_explain = trans('messages.TIME_LIMIT_EXPLAIN'); // check for webserver timeout (IE returns null) if (isset($_SERVER['HTTP_KEEP_ALIVE'])) { // get webserver timeout $webserver_timeout = (int)$_SERVER['HTTP_KEEP_ALIVE']; - $time_limit_explain .= '
' . sprintf($lang['TIME_LIMIT_EXPLAIN_WEBSERVER'], $webserver_timeout); + $time_limit_explain .= '
' . sprintf(trans('messages.TIME_LIMIT_EXPLAIN_WEBSERVER'), $webserver_timeout); if ($time_limit > $webserver_timeout) { $time_limit = $webserver_timeout; @@ -118,7 +118,7 @@ $refresh_rate = isset($_REQUEST['refresh_rate']) ? (int)$_REQUEST['refresh_rate' // check if the user gave wrong input if ($mode == 'submit') { if (($session_posts_processing || $post_limit || $refresh_rate || $time_limit) <= 0) { - bb_die($lang['WRONG_INPUT'] . '

' . sprintf($lang['CLICK_RETURN_REBUILD_SEARCH'], '', '')); + bb_die(trans('messages.WRONG_INPUT') . '

' . sprintf(trans('messages.CLICK_RETURN_REBUILD_SEARCH'), '', '')); } } @@ -222,8 +222,8 @@ if ($mode == 'submit' || $mode == 'refresh') { $template->assign_vars(array('TPL_REBUILD_SEARCH_PROGRESS' => true)); $processing_messages = ''; - $processing_messages .= $timer_expired ? sprintf($lang['TIMER_EXPIRED'], TIMENOW - $start_time) : ''; - $processing_messages .= ($start == 0 && $clear_search) ? $lang['CLEARED_SEARCH_TABLES'] : ''; + $processing_messages .= $timer_expired ? sprintf(trans('messages.TIMER_EXPIRED'), TIMENOW - $start_time) : ''; + $processing_messages .= ($start == 0 && $clear_search) ? trans('messages.CLEARED_SEARCH_TABLES') : ''; // check if we have reached the end of our post processing $session_posts_processed = get_processed_posts('session'); @@ -238,10 +238,10 @@ if ($mode == 'submit' || $mode == 'refresh') { $form_parameters .= '&refresh_rate=' . $refresh_rate; $form_action = 'admin_rebuild_search.php' . '?mode=refresh' . $form_parameters; - $next_button = $lang['NEXT']; + $next_button = trans('messages.NEXT'); $progress_bar_img = $images['progress_bar']; - $processing_messages .= sprintf($lang['PROCESSING_NEXT_POSTS'], $post_limit); + $processing_messages .= sprintf(trans('messages.PROCESSING_NEXT_POSTS'), $post_limit); meta_refresh($form_action, $refresh_rate); @@ -253,11 +253,11 @@ if ($mode == 'submit' || $mode == 'refresh') { // end of processing $form_action = 'admin_rebuild_search.php'; - $next_button = $lang['FINISHED']; + $next_button = trans('messages.FINISHED'); $progress_bar_img = $images['progress_bar_full']; - $processing_messages .= ($session_posts_processed < $session_posts_processing) ? sprintf($lang['DELETED_POSTS'], $session_posts_processing - $session_posts_processed) : ''; - $processing_messages .= ($total_posts_processed == $total_posts) ? $lang['ALL_POSTS_PROCESSED'] : $lang['ALL_SESSION_POSTS_PROCESSED']; + $processing_messages .= ($session_posts_processed < $session_posts_processing) ? sprintf(trans('messages.DELETED_POSTS'), $session_posts_processing - $session_posts_processed) : ''; + $processing_messages .= ($total_posts_processed == $total_posts) ? trans('messages.ALL_POSTS_PROCESSED') : trans('messages.ALL_SESSION_POSTS_PROCESSED'); // if we have processed all the db posts we need to update the rebuild_status OLD_DB()->query('UPDATE ' . BB_SEARCH_REBUILD . ' SET @@ -274,7 +274,7 @@ if ($mode == 'submit' || $mode == 'refresh') { OLD_DB()->query("OPTIMIZE TABLE $table"); } - $processing_messages .= '
' . $lang['ALL_TABLES_OPTIMIZED']; + $processing_messages .= '
' . trans('messages.ALL_TABLES_OPTIMIZED'); } // calculate the percent @@ -315,17 +315,17 @@ if ($mode == 'submit' || $mode == 'refresh') { $template->assign_vars(array( 'L_NEXT' => $next_button, - 'L_TIME_LAST_POSTS_ADMIN' => sprintf($lang['TIME_LAST_POSTS'], $num_rows), + 'L_TIME_LAST_POSTS_ADMIN' => sprintf(trans('messages.TIME_LAST_POSTS'), $num_rows), - 'PROCESSING_POSTS' => sprintf($lang['PROCESSED_POST_IDS'], $start_post_id, $end_post_id), + 'PROCESSING_POSTS' => sprintf(trans('messages.PROCESSED_POST_IDS'), $start_post_id, $end_post_id), 'PROCESSING_MESSAGES' => $processing_messages, 'PROGRESS_BAR_IMG' => $progress_bar_img, - 'SESSION_DETAILS' => sprintf($lang['PROCESS_DETAILS'], $session_posts_processed - $num_rows + 1, $session_posts_processed, $session_posts_processing), - 'SESSION_PERCENT' => sprintf($lang['PERCENT_COMPLETED'], round($session_percent, 2)), + 'SESSION_DETAILS' => sprintf(trans('messages.PROCESS_DETAILS'), $session_posts_processed - $num_rows + 1, $session_posts_processed, $session_posts_processing), + 'SESSION_PERCENT' => sprintf(trans('messages.PERCENT_COMPLETED'), round($session_percent, 2)), - 'TOTAL_DETAILS' => sprintf($lang['PROCESS_DETAILS'], $total_posts_processed - $num_rows + 1, $total_posts_processed, $total_posts), - 'TOTAL_PERCENT' => sprintf($lang['PERCENT_COMPLETED'], round($total_percent, 2)), + 'TOTAL_DETAILS' => sprintf(trans('messages.PROCESS_DETAILS'), $total_posts_processed - $num_rows + 1, $total_posts_processed, $total_posts), + 'TOTAL_PERCENT' => sprintf(trans('messages.PERCENT_COMPLETED'), round($total_percent, 2)), 'LAST_CYCLE_TIME' => delta_time(TIMENOW), 'SESSION_TIME' => delta_time($last_session_data['start_time']), @@ -363,15 +363,15 @@ if ($mode == 'submit' || $mode == 'refresh') { // check our last status if ($last_session_data['rebuild_session_status'] == REBUILD_SEARCH_PROCESSED) { - $last_saved_processing = sprintf($lang['INFO_PROCESSING_STOPPED'], $last_saved_post_id, $total_posts_processed, $last_saved_date); + $last_saved_processing = sprintf(trans('messages.INFO_PROCESSING_STOPPED'), $last_saved_post_id, $total_posts_processed, $last_saved_date); $clear_search_disabled = 'disabled="disabled"'; $template->assign_block_vars('start_select_input', array()); } elseif ($last_session_data['rebuild_session_status'] == REBUILD_SEARCH_ABORTED) { - $last_saved_processing = sprintf($lang['INFO_PROCESSING_ABORTED'], $last_saved_post_id, $total_posts_processed, $last_saved_date); + $last_saved_processing = sprintf(trans('messages.INFO_PROCESSING_ABORTED'), $last_saved_post_id, $total_posts_processed, $last_saved_date); // check if the interrupted cycle has finished if (TIMENOW - $last_session_data['end_time'] < $last_session_data['last_cycle_time']) { - $last_saved_processing .= '
' . $lang['INFO_PROCESSING_ABORTED_SOON']; + $last_saved_processing .= '
' . trans('messages.INFO_PROCESSING_ABORTED_SOON'); } $clear_search_disabled = 'disabled="disabled"'; @@ -380,12 +380,12 @@ if ($mode == 'submit' || $mode == 'refresh') { // when finished if ($last_session_data['end_post_id'] < $max_post_id) { - $last_saved_processing = sprintf($lang['INFO_PROCESSING_FINISHED_NEW'], $last_saved_post_id, $total_posts_processed, $last_saved_date, $total_posts - $total_posts_processed); + $last_saved_processing = sprintf(trans('messages.INFO_PROCESSING_FINISHED_NEW'), $last_saved_post_id, $total_posts_processed, $last_saved_date, $total_posts - $total_posts_processed); $clear_search_disabled = 'disabled="disabled"'; $template->assign_block_vars('start_select_input', array()); } else { - $last_saved_processing = sprintf($lang['INFO_PROCESSING_FINISHED'], $total_posts, $last_saved_date); + $last_saved_processing = sprintf(trans('messages.INFO_PROCESSING_FINISHED'), $total_posts, $last_saved_date); $template->assign_block_vars('start_text_input', array()); } diff --git a/admin/admin_sitemap.php b/admin/admin_sitemap.php index 1d0f9a153..1f2ac52ba 100644 --- a/admin/admin_sitemap.php +++ b/admin/admin_sitemap.php @@ -39,8 +39,8 @@ if (!$result = OLD_DB()->sql_query($sql)) { } } -$s_mess = $lang['SITEMAP_CREATED'] . ': ' . bb_date($new['sitemap_time'], config('tp.post_date_format')) . ' ' . $lang['SITEMAP_AVAILABLE'] . ': ' . make_url('sitemap/sitemap.xml') . ''; -$message = file_exists(SITEMAP_DIR . '/sitemap.xml') ? $s_mess : $lang['SITEMAP_NOT_CREATED']; +$s_mess = trans('messages.SITEMAP_CREATED') . ': ' . bb_date($new['sitemap_time'], config('tp.post_date_format')) . ' ' . trans('messages.SITEMAP_AVAILABLE') . ': ' . make_url('sitemap/sitemap.xml') . ''; +$message = file_exists(SITEMAP_DIR . '/sitemap.xml') ? $s_mess : trans('messages.SITEMAP_NOT_CREATED'); $template->assign_vars(array( 'STATIC_SITEMAP' => $new['static_sitemap'], diff --git a/admin/admin_smilies.php b/admin/admin_smilies.php index 3fcc07668..b2894f7ca 100644 --- a/admin/admin_smilies.php +++ b/admin/admin_smilies.php @@ -109,10 +109,10 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) { } } - bb_die($lang['SMILEY_IMPORT_SUCCESS'] . '

' . sprintf($lang['CLICK_RETURN_SMILEADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.SMILEY_IMPORT_SUCCESS') . '

' . sprintf(trans('messages.CLICK_RETURN_SMILEADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } else { // Display the script to get the smile_pak cfg file - $smile_paks_select = ''; foreach ($smiley_paks as $key => $value) { if (!empty($value)) { $smile_paks_select .= ''; @@ -156,7 +156,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) { exit; } - bb_die(sprintf($lang['EXPORT_SMILES'], '', '') . '

' . sprintf($lang['CLICK_RETURN_SMILEADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(sprintf(trans('messages.EXPORT_SMILES'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_SMILEADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } elseif (isset($_POST['add']) || isset($_GET['add'])) { $filename_list = ''; for ($i = 0, $iMax = count($smiley_images); $i < $iMax; $i++) { @@ -186,7 +186,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) { } $datastore->update('smile_replacements'); - bb_die($lang['SMILEY_DEL_SUCCESS'] . '

' . sprintf($lang['CLICK_RETURN_SMILEADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.SMILEY_DEL_SUCCESS') . '

' . sprintf(trans('messages.CLICK_RETURN_SMILEADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); break; case 'edit': @@ -235,7 +235,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) { // If no code was entered complain if ($smile_code == '' || $smile_url == '') { - bb_die($lang['FIELDS_EMPTY']); + bb_die(trans('messages.FIELDS_EMPTY')); } // Convert < and > to proper htmlentities for parsing @@ -251,7 +251,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) { } $datastore->update('smile_replacements'); - bb_die($lang['SMILEY_EDIT_SUCCESS'] . '

' . sprintf($lang['CLICK_RETURN_SMILEADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.SMILEY_EDIT_SUCCESS') . '

' . sprintf(trans('messages.CLICK_RETURN_SMILEADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); break; case 'savenew': @@ -265,7 +265,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) { // If no code was entered complain if ($smile_code == '' || $smile_url == '') { - bb_die($lang['FIELDS_EMPTY']); + bb_die(trans('messages.FIELDS_EMPTY')); } // Convert < and > to proper htmlentities for parsing @@ -281,7 +281,7 @@ if (isset($_GET['import_pack']) || isset($_POST['import_pack'])) { } $datastore->update('smile_replacements'); - bb_die($lang['SMILEY_ADD_SUCCESS'] . '

' . sprintf($lang['CLICK_RETURN_SMILEADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.SMILEY_ADD_SUCCESS') . '

' . sprintf(trans('messages.CLICK_RETURN_SMILEADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); break; } } else { diff --git a/admin/admin_terms.php b/admin/admin_terms.php index adbdbdc6b..51f74733b 100644 --- a/admin/admin_terms.php +++ b/admin/admin_terms.php @@ -16,7 +16,7 @@ require INC_DIR . '/bbcode.php'; if (isset($_POST['post']) && config('tp.terms') != $_POST['message']) { bb_update_config(array('terms' => $_POST['message'])); - bb_die($lang['CONFIG_UPDATED']); + bb_die(trans('messages.CONFIG_UPDATED')); } $template->assign_vars(array( diff --git a/admin/admin_ug_auth.php b/admin/admin_ug_auth.php index 8c16fdecc..c34191a7c 100644 --- a/admin/admin_ug_auth.php +++ b/admin/admin_ug_auth.php @@ -49,7 +49,7 @@ if ($submit && $mode == 'user') { // Obtain relevant data for this user if (!$row = get_userdata($user_id)) { - bb_die($lang['NO_SUCH_USER']); + bb_die(trans('messages.NO_SUCH_USER')); } $this_user_level = $row['user_level']; @@ -81,9 +81,9 @@ if ($submit && $mode == 'user') { // Delete any entries in auth_access, they are not required if user is becoming an admin delete_permissions($group_id, $user_id); - $message = $lang['AUTH_UPDATED'] . '

'; - $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') . '

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = trans('messages.AUTH_UPDATED') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_USERAUTH'), '', '') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } // Make admin a user (if already admin) @@ -97,9 +97,9 @@ if ($submit && $mode == 'user') { delete_permissions($group_id, $user_id); - $message = $lang['AUTH_UPDATED'] . '

'; - $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') . '

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = trans('messages.AUTH_UPDATED') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_USERAUTH'), '', '') . '

'; + $message .= sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } @@ -124,10 +124,10 @@ if ($submit && $mode == 'user') { update_user_level($user_id); - $l_auth_return = ($mode == 'user') ? $lang['CLICK_RETURN_USERAUTH'] : $lang['CLICK_RETURN_GROUPAUTH']; - $message = $lang['AUTH_UPDATED'] . '

'; + $l_auth_return = ($mode == 'user') ? trans('messages.CLICK_RETURN_USERAUTH') : trans('messages.CLICK_RETURN_GROUPAUTH'); + $message = trans('messages.AUTH_UPDATED') . '

'; $message .= sprintf($l_auth_return, '', '') . '

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } @@ -136,7 +136,7 @@ if ($submit && $mode == 'user') { // elseif ($submit && $mode == 'group' && is_array($_POST['auth'])) { if (!$group_data = get_group_data($group_id)) { - bb_die($lang['GROUP_NOT_EXIST']); + bb_die(trans('messages.GROUP_NOT_EXIST')); } $auth = array(); @@ -153,10 +153,10 @@ elseif ($submit && $mode == 'group' && is_array($_POST['auth'])) { update_user_level('all'); - $l_auth_return = $lang['CLICK_RETURN_GROUPAUTH']; - $message = $lang['AUTH_UPDATED'] . '

'; + $l_auth_return = trans('messages.CLICK_RETURN_GROUPAUTH'); + $message = trans('messages.AUTH_UPDATED') . '

'; $message .= sprintf($l_auth_return, '', '') . '

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } @@ -174,7 +174,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { $this_userdata = get_userdata($user_id); } if (!$this_userdata) { - bb_die($lang['NO_SUCH_USER']); + bb_die(trans('messages.NO_SUCH_USER')); } if (!$forums = $datastore->get('cat_forums')) { @@ -211,7 +211,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { 'FORUM_NAME' => str_short($forums['forum_name_html'][$f_id], $max_forum_name_length), 'SF_SPACER' => $f_data['forum_parent'] ? HTML_SF_SPACER : '', 'IS_MODERATOR' => (bool)$auth_mod, - 'MOD_STATUS' => $auth_mod ? $lang['MODERATOR'] : $lang['NONE'], + 'MOD_STATUS' => $auth_mod ? trans('messages.MODERATOR') : trans('messages.NONE'), 'MOD_CLASS' => $auth_mod ? ($disabled ? 'yesDisabled' : 'yesMOD') : 'noMOD', 'AUTH_MOD_VAL' => $auth_mod ? 1 : 0, )); @@ -251,7 +251,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { foreach ($forum_auth_fields as $auth_type) { $template->assign_block_vars('acltype', array( - 'ACL_TYPE_NAME' => preg_replace('#(.{5})#u', "\\1
", $lang[strtoupper($auth_type)]), + 'ACL_TYPE_NAME' => preg_replace('#(.{5})#u', "\\1
", trans('messages.' . strtoupper($auth_type))), 'ACL_TYPE_BF' => $bf['forum_perm'][$auth_type], )); $s_column_span++; @@ -267,13 +267,13 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { $s_user_type = ($this_userdata['user_level'] == ADMIN) ? ' ' : ' '; @@ -282,10 +282,10 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { $template->assign_vars(array( 'TPL_AUTH_UG_MAIN' => true, 'USER_OR_GROUPNAME' => $this_userdata['username'], - 'USER_LEVEL' => $lang['USER_LEVEL'] . ' : ' . $s_user_type, - 'T_USER_OR_GROUPNAME' => $lang['USERNAME'], - 'T_AUTH_TITLE' => $lang['AUTH_CONTROL_USER'], - 'T_AUTH_EXPLAIN' => $lang['USER_AUTH_EXPLAIN'], + 'USER_LEVEL' => trans('messages.USER_LEVEL') . ' : ' . $s_user_type, + 'T_USER_OR_GROUPNAME' => trans('messages.USERNAME'), + 'T_AUTH_TITLE' => trans('messages.AUTH_CONTROL_USER'), + 'T_AUTH_EXPLAIN' => trans('messages.USER_AUTH_EXPLAIN'), 'S_COLUMN_SPAN' => $s_column_span, 'S_HIDDEN_FIELDS' => $s_hidden_fields, )); @@ -293,7 +293,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { $page_cfg['quirks_mode'] = true; if (!$group_data = get_group_data($group_id)) { - bb_die($lang['GROUP_NOT_EXIST']); + bb_die(trans('messages.GROUP_NOT_EXIST')); } if (!$forums = $datastore->get('cat_forums')) { @@ -326,7 +326,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { 'FORUM_NAME' => str_short($forums['forum_name_html'][$f_id], $max_forum_name_length), 'SF_SPACER' => $f_data['forum_parent'] ? HTML_SF_SPACER : '', 'IS_MODERATOR' => (bool)$auth_mod, - 'MOD_STATUS' => $auth_mod ? $lang['MODERATOR'] : $lang['NO'], + 'MOD_STATUS' => $auth_mod ? trans('messages.MODERATOR') : trans('messages.NO'), 'MOD_CLASS' => $auth_mod ? 'yesMOD' : 'noMOD', 'AUTH_MOD_VAL' => $auth_mod ? 1 : 0, )); @@ -366,7 +366,7 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { foreach ($forum_auth_fields as $auth_type) { $template->assign_block_vars('acltype', array( - 'ACL_TYPE_NAME' => preg_replace('#(.{5})#u', "\\1
", $lang[strtoupper($auth_type)]), + 'ACL_TYPE_NAME' => preg_replace('#(.{5})#u', "\\1
", trans('messages.' . strtoupper($auth_type))), 'ACL_TYPE_BF' => $bf['forum_perm'][$auth_type], )); $s_column_span++; @@ -382,10 +382,10 @@ if ($mode == 'user' && (!empty($_POST['username']) || $user_id)) { $template->assign_vars(array( 'TPL_AUTH_UG_MAIN' => true, - 'T_USER_OR_GROUPNAME' => $lang['GROUP_NAME'], + 'T_USER_OR_GROUPNAME' => trans('messages.GROUP_NAME'), 'USER_LEVEL' => false, - 'T_AUTH_TITLE' => $lang['AUTH_CONTROL_GROUP'], - 'T_AUTH_EXPLAIN' => $lang['GROUP_AUTH_EXPLAIN'], + 'T_AUTH_TITLE' => trans('messages.AUTH_CONTROL_GROUP'), + 'T_AUTH_EXPLAIN' => trans('messages.GROUP_AUTH_EXPLAIN'), 'USER_OR_GROUPNAME' => htmlCHR($group_data['group_name']), 'S_COLUMN_SPAN' => $s_column_span, 'S_HIDDEN_FIELDS' => $s_hidden_fields, diff --git a/admin/admin_user_ban.php b/admin/admin_user_ban.php index d46fe7f38..c25329282 100644 --- a/admin/admin_user_ban.php +++ b/admin/admin_user_ban.php @@ -23,7 +23,7 @@ if (isset($_POST['submit'])) { if (!empty($_POST['username'])) { $this_userdata = get_userdata($_POST['username'], true); if (!$this_userdata) { - bb_die($lang['NO_USER_ID_SPECIFIED']); + bb_die(trans('messages.NO_USER_ID_SPECIFIED')); } $user_list[] = $this_userdata['user_id']; @@ -165,7 +165,7 @@ if (isset($_POST['submit'])) { } } - bb_die($lang['BAN_UPDATE_SUCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_BANADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.BAN_UPDATE_SUCESSFUL') . '

' . sprintf(trans('messages.CLICK_RETURN_BANADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } else { $template->assign_vars(array( 'S_BANLIST_ACTION' => 'admin_user_ban.php', @@ -195,7 +195,7 @@ if (isset($_POST['submit'])) { } if ($select_userlist == '') { - $select_userlist = ''; + $select_userlist = ''; } $select_userlist = ''; @@ -226,11 +226,11 @@ if (isset($_POST['submit'])) { } if ($select_iplist == '') { - $select_iplist = ''; + $select_iplist = ''; } if ($select_emaillist == '') { - $select_emaillist = ''; + $select_emaillist = ''; } $select_iplist = ''; diff --git a/admin/admin_user_search.php b/admin/admin_user_search.php index 8bf9c633c..754dc9374 100644 --- a/admin/admin_user_search.php +++ b/admin/admin_user_search.php @@ -86,7 +86,7 @@ if (!isset($_REQUEST['dosearch'])) { $lastvisited_list = ''; foreach ($lastvisited as $days) { - $lastvisited_list .= ''; + $lastvisited_list .= ''; } $template->assign_vars(array( @@ -141,21 +141,21 @@ if (!isset($_REQUEST['dosearch'])) { case 'search_username': $username = $_REQUEST['username']; if (!$username) { - bb_die($lang['SEARCH_INVALID_USERNAME']); + bb_die(trans('messages.SEARCH_INVALID_USERNAME')); } break; case 'search_email': $email = $_REQUEST['email']; if (!$email) { - bb_die($lang['SEARCH_INVALID_EMAIL']); + bb_die(trans('messages.SEARCH_INVALID_EMAIL')); } break; case 'search_ip': $ip_address = $_REQUEST['ip_address']; if (!$ip_address) { - bb_die($lang['SEARCH_INVALID_IP']); + bb_die(trans('messages.SEARCH_INVALID_IP')); } break; @@ -165,21 +165,21 @@ if (!isset($_REQUEST['dosearch'])) { $date_month = $_REQUEST['date_month']; $date_year = $_REQUEST['date_year']; if (!($date_type || $date_day || $date_month || $date_year)) { - bb_die($lang['SEARCH_INVALID_DATE']); + bb_die(trans('messages.SEARCH_INVALID_DATE')); } break; case 'search_group': $group_id = $_REQUEST['group_id']; if (!$group_id) { - bb_die($lang['SEARCH_INVALID_GROUP']); + bb_die(trans('messages.SEARCH_INVALID_GROUP')); } break; case 'search_rank': $rank_id = $_REQUEST['rank_id']; if (!$rank_id) { - bb_die($lang['SEARCH_INVALID_RANK']); + bb_die(trans('messages.SEARCH_INVALID_RANK')); } break; @@ -187,7 +187,7 @@ if (!isset($_REQUEST['dosearch'])) { $postcount_type = $_REQUEST['postcount_type']; $postcount_value = $_REQUEST['postcount_value']; if (!$postcount_type || (!$postcount_value && $postcount_value != 0)) { - bb_die($lang['SEARCH_INVALID_POSTCOUNT']); + bb_die(trans('messages.SEARCH_INVALID_POSTCOUNT')); } break; @@ -195,7 +195,7 @@ if (!isset($_REQUEST['dosearch'])) { $userfield_type = $_REQUEST['userfield_type']; $userfield_value = $_REQUEST['userfield_value']; if (!$userfield_type || !$userfield_value) { - bb_die($lang['SEARCH_INVALID_USERFIELD']); + bb_die(trans('messages.SEARCH_INVALID_USERFIELD')); } break; @@ -203,35 +203,35 @@ if (!isset($_REQUEST['dosearch'])) { $lastvisited_days = $_REQUEST['lastvisited_days']; $lastvisited_type = $_REQUEST['lastvisited_type']; if (!$lastvisited_days || !$lastvisited_type) { - bb_die($lang['SEARCH_INVALID_LASTVISITED']); + bb_die(trans('messages.SEARCH_INVALID_LASTVISITED')); } break; case 'search_language': $language_type = $_REQUEST['language_type']; if (!$language_type) { - bb_die($lang['SEARCH_INVALID_LANGUAGE']); + bb_die(trans('messages.SEARCH_INVALID_LANGUAGE')); } break; case 'search_timezone': $timezone_type = $_REQUEST['timezone_type']; if (!$timezone_type && $timezone_type != 0) { - bb_die($lang['SEARCH_INVALID_TIMEZONE']); + bb_die(trans('messages.SEARCH_INVALID_TIMEZONE')); } break; case 'search_moderators': $moderators_forum = $_REQUEST['moderators_forum']; if (!$moderators_forum) { - bb_die($lang['SEARCH_INVALID_MODERATORS']); + bb_die(trans('messages.SEARCH_INVALID_MODERATORS')); } break; case 'search_misc': $misc = $_REQUEST['misc']; if (!$misc) { - bb_die($lang['SEARCH_INVALID']); + bb_die(trans('messages.SEARCH_INVALID')); } break; @@ -251,7 +251,7 @@ if (!isset($_REQUEST['dosearch'])) { case 'search_username': $base_url .= '&search_username=true&username=' . rawurlencode(stripslashes($username)); - $text = sprintf($lang['SEARCH_FOR_USERNAME'], strip_tags(htmlspecialchars(stripslashes($username)))); + $text = sprintf(trans('messages.SEARCH_FOR_USERNAME'), strip_tags(htmlspecialchars(stripslashes($username)))); $username = preg_replace('/\*/', '%', trim(strip_tags(strtolower($username)))); @@ -262,7 +262,7 @@ if (!isset($_REQUEST['dosearch'])) { } if ($username == '') { - bb_die($lang['SEARCH_INVALID_USERNAME']); + bb_die(trans('messages.SEARCH_INVALID_USERNAME')); } $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " WHERE {$lower_b}username{$lower_e} $op '" . OLD_DB()->escape($username) . "' AND user_id <> " . GUEST_UID; @@ -272,7 +272,7 @@ if (!isset($_REQUEST['dosearch'])) { case 'search_email': $base_url .= '&search_email=true&email=' . rawurlencode(stripslashes($email)); - $text = sprintf($lang['SEARCH_FOR_EMAIL'], strip_tags(htmlspecialchars(stripslashes($email)))); + $text = sprintf(trans('messages.SEARCH_FOR_EMAIL'), strip_tags(htmlspecialchars(stripslashes($email)))); $email = preg_replace('/\*/', '%', trim(strip_tags(strtolower($email)))); @@ -283,7 +283,7 @@ if (!isset($_REQUEST['dosearch'])) { } if ($email == '') { - bb_die($lang['SEARCH_INVALID_EMAIL']); + bb_die(trans('messages.SEARCH_INVALID_EMAIL')); } $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " WHERE {$lower_b}user_email{$lower_e} $op '" . OLD_DB()->escape($email) . "' AND user_id <> " . GUEST_UID; @@ -295,7 +295,7 @@ if (!isset($_REQUEST['dosearch'])) { $ip_address = trim($ip_address); - $text = sprintf($lang['SEARCH_FOR_IP'], strip_tags(htmlspecialchars(stripslashes($ip_address)))); + $text = sprintf(trans('messages.SEARCH_FOR_IP'), strip_tags(htmlspecialchars(stripslashes($ip_address)))); unset($users); $users = []; @@ -304,7 +304,7 @@ if (!isset($_REQUEST['dosearch'])) { $ip = encode_ip($ip_address); $users[] = $ip; } else { - bb_die($lang['SEARCH_INVALID_IP']); + bb_die(trans('messages.SEARCH_INVALID_IP')); } $ip_in_sql = $ip_like_sql = $ip_like_sql_flylast = $ip_like_sql_flyreg = ''; @@ -375,7 +375,7 @@ if (!isset($_REQUEST['dosearch'])) { } } if ($no_result_search == true) { - bb_die($lang['SEARCH_NO_RESULTS']); + bb_die(trans('messages.SEARCH_NO_RESULTS')); } $select_sql .= " WHERE u.user_id IN ($ip_users_sql)"; @@ -387,28 +387,28 @@ if (!isset($_REQUEST['dosearch'])) { $date_type = strtolower(trim($date_type)); if ($date_type != 'before' && $date_type != 'after') { - bb_die($lang['SEARCH_INVALID_DATE']); + bb_die(trans('messages.SEARCH_INVALID_DATE')); } $date_day = (int)$date_day; if (!preg_match('/^([1-9]|[0-2][0-9]|3[0-1])$/', $date_day)) { - bb_die($lang['SEARCH_INVALID_DAY']); + bb_die(trans('messages.SEARCH_INVALID_DAY')); } $date_month = (int)$date_month; if (!preg_match('/^(0?[1-9]|1[0-2])$/', $date_month)) { - bb_die($lang['SEARCH_INVALID_MONTH']); + bb_die(trans('messages.SEARCH_INVALID_MONTH')); } $date_year = (int)$date_year; if (!preg_match('/^(20[0-9]{2}|19[0-9]{2})$/', $date_year)) { - bb_die($lang['SEARCH_INVALID_YEAR']); + bb_die(trans('messages.SEARCH_INVALID_YEAR')); } - $text = sprintf($lang['SEARCH_FOR_DATE'], strip_tags(htmlspecialchars(stripslashes($date_type))), $date_year, $date_month, $date_day); + $text = sprintf(trans('messages.SEARCH_FOR_DATE'), strip_tags(htmlspecialchars(stripslashes($date_type))), $date_year, $date_month, $date_day); $time = mktime(0, 0, 0, $date_month, $date_day, $date_year); @@ -428,7 +428,7 @@ if (!isset($_REQUEST['dosearch'])) { $base_url .= '&search_group=true&group_id=' . rawurlencode($group_id); if (!$group_id) { - bb_die($lang['SEARCH_INVALID_GROUP']); + bb_die(trans('messages.SEARCH_INVALID_GROUP')); } $sql = 'SELECT group_name FROM ' . BB_GROUPS . " WHERE group_id = $group_id AND group_single_user = 0"; @@ -438,12 +438,12 @@ if (!isset($_REQUEST['dosearch'])) { } if (OLD_DB()->num_rows($result) == 0) { - bb_die($lang['SEARCH_INVALID_GROUP']); + bb_die(trans('messages.SEARCH_INVALID_GROUP')); } $group_name = OLD_DB()->sql_fetchrow($result); - $text = sprintf($lang['SEARCH_FOR_GROUP'], strip_tags(htmlspecialchars($group_name['group_name']))); + $text = sprintf(trans('messages.SEARCH_FOR_GROUP'), strip_tags(htmlspecialchars($group_name['group_name']))); $total_sql .= 'SELECT COUNT(u.user_id) AS total FROM ' . BB_USERS . ' AS u, ' . BB_USER_GROUP . " AS ug @@ -463,7 +463,7 @@ if (!isset($_REQUEST['dosearch'])) { $base_url .= '&search_rank=true&rank_id=' . rawurlencode($rank_id); if (!$rank_id) { - bb_die($lang['SEARCH_INVALID_RANK']); + bb_die(trans('messages.SEARCH_INVALID_RANK')); } $sql = 'SELECT rank_title FROM ' . BB_RANKS . " WHERE rank_id = $rank_id"; @@ -473,12 +473,12 @@ if (!isset($_REQUEST['dosearch'])) { } if (OLD_DB()->num_rows($result) == 0) { - bb_die($lang['SEARCH_INVALID_RANK']); + bb_die(trans('messages.SEARCH_INVALID_RANK')); } $rank_title = OLD_DB()->sql_fetchrow($result); - $text = sprintf($lang['SEARCH_FOR_RANK'], strip_tags(htmlspecialchars($rank_title['rank_title']))); + $text = sprintf(trans('messages.SEARCH_FOR_RANK'), strip_tags(htmlspecialchars($rank_title['rank_title']))); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " @@ -499,7 +499,7 @@ if (!isset($_REQUEST['dosearch'])) { case 'greater': $postcount_value = (int)$postcount_value; - $text = sprintf($lang['SEARCH_FOR_POSTCOUNT_GREATER'], $postcount_value); + $text = sprintf(trans('messages.SEARCH_FOR_POSTCOUNT_GREATER'), $postcount_value); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " @@ -512,7 +512,7 @@ if (!isset($_REQUEST['dosearch'])) { case 'lesser': $postcount_value = (int)$postcount_value; - $text = sprintf($lang['SEARCH_FOR_POSTCOUNT_LESSER'], $postcount_value); + $text = sprintf(trans('messages.SEARCH_FOR_POSTCOUNT_LESSER'), $postcount_value); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " @@ -531,10 +531,10 @@ if (!isset($_REQUEST['dosearch'])) { $range_end = (int)$range[1]; if ($range_begin > $range_end) { - bb_die($lang['SEARCH_INVALID_POSTCOUNT']); + bb_die(trans('messages.SEARCH_INVALID_POSTCOUNT')); } - $text = sprintf($lang['SEARCH_FOR_POSTCOUNT_RANGE'], $range_begin, $range_end); + $text = sprintf(trans('messages.SEARCH_FOR_POSTCOUNT_RANGE'), $range_begin, $range_end); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " @@ -548,7 +548,7 @@ if (!isset($_REQUEST['dosearch'])) { } else { $postcount_value = (int)$postcount_value; - $text = sprintf($lang['SEARCH_FOR_POSTCOUNT_EQUALS'], $postcount_value); + $text = sprintf(trans('messages.SEARCH_FOR_POSTCOUNT_EQUALS'), $postcount_value); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " @@ -560,7 +560,7 @@ if (!isset($_REQUEST['dosearch'])) { } break; default: - bb_die($lang['SEARCH_INVALID']); + bb_die(trans('messages.SEARCH_INVALID')); } break; @@ -578,42 +578,42 @@ if (!isset($_REQUEST['dosearch'])) { } if ($userfield_value == '') { - bb_die($lang['SEARCH_INVALID_USERFIELD']); + bb_die(trans('messages.SEARCH_INVALID_USERFIELD')); } $userfield_type = strtolower(trim($userfield_type)); switch ($userfield_type) { case 'icq': - $text = sprintf($lang['SEARCH_FOR_USERFIELD_ICQ'], $text); + $text = sprintf(trans('messages.SEARCH_FOR_USERFIELD_ICQ'), $text); $field = 'user_icq'; break; case 'skype': - $text = sprintf($lang['SEARCH_FOR_USERFIELD_SKYPE'], $text); + $text = sprintf(trans('messages.SEARCH_FOR_USERFIELD_SKYPE'), $text); $field = 'user_skype'; break; case 'twitter': - $text = sprintf($lang['SEARCH_FOR_USERFIELD_TWITTER'], $text); + $text = sprintf(trans('messages.SEARCH_FOR_USERFIELD_TWITTER'), $text); $field = 'user_twitter'; break; case 'website': - $text = sprintf($lang['SEARCH_FOR_USERFIELD_WEBSITE'], $text); + $text = sprintf(trans('messages.SEARCH_FOR_USERFIELD_WEBSITE'), $text); $field = 'user_website'; break; case 'location': - $text = sprintf($lang['SEARCH_FOR_USERFIELD_LOCATION'], $text); + $text = sprintf(trans('messages.SEARCH_FOR_USERFIELD_LOCATION'), $text); $field = 'user_from'; break; case 'interests': - $text = sprintf($lang['SEARCH_FOR_USERFIELD_INTERESTS'], $text); + $text = sprintf(trans('messages.SEARCH_FOR_USERFIELD_INTERESTS'), $text); $field = 'user_interests'; break; case 'occupation': - $text = sprintf($lang['SEARCH_FOR_USERFIELD_OCCUPATION'], $text); + $text = sprintf(trans('messages.SEARCH_FOR_USERFIELD_OCCUPATION'), $text); $field = 'user_occ'; break; default: - bb_die($lang['SEARCH_INVALID']); + bb_die(trans('messages.SEARCH_INVALID')); } $total_sql .= 'SELECT COUNT(user_id) AS total @@ -635,7 +635,7 @@ if (!isset($_REQUEST['dosearch'])) { switch ($lastvisited_type) { case 'in': - $text = sprintf($lang['SEARCH_FOR_LASTVISITED_INTHELAST'], $lastvisited_days, (($lastvisited_days > 1) ? $lang['DAYS'] : $lang['DAY'])); + $text = sprintf(trans('messages.SEARCH_FOR_LASTVISITED_INTHELAST'), $lastvisited_days, (($lastvisited_days > 1) ? trans('messages.DAYS') : trans('messages.DAY'))); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " @@ -646,7 +646,7 @@ if (!isset($_REQUEST['dosearch'])) { AND u.user_id <> " . GUEST_UID; break; case 'after': - $text = sprintf($lang['SEARCH_FOR_LASTVISITED_AFTERTHELAST'], $lastvisited_days, (($lastvisited_days > 1) ? $lang['DAYS'] : $lang['DAY'])); + $text = sprintf(trans('messages.SEARCH_FOR_LASTVISITED_AFTERTHELAST'), $lastvisited_days, (($lastvisited_days > 1) ? trans('messages.DAYS') : trans('messages.DAY'))); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " @@ -658,7 +658,7 @@ if (!isset($_REQUEST['dosearch'])) { break; default: - bb_die($lang['SEARCH_INVALID_LASTVISITED']); + bb_die(trans('messages.SEARCH_INVALID_LASTVISITED')); } break; @@ -668,10 +668,10 @@ if (!isset($_REQUEST['dosearch'])) { $language_type = strtolower(trim(stripslashes($language_type))); if ($language_type == '') { - bb_die($lang['SEARCH_INVALID_LANGUAGE']); + bb_die(trans('messages.SEARCH_INVALID_LANGUAGE')); } - $text = sprintf($lang['SEARCH_FOR_LANGUAGE'], strip_tags(htmlspecialchars($language_type))); + $text = sprintf(trans('messages.SEARCH_FOR_LANGUAGE'), strip_tags(htmlspecialchars($language_type))); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . " @@ -684,7 +684,7 @@ if (!isset($_REQUEST['dosearch'])) { case 'search_timezone': $base_url .= '&search_timezone=true&timezone_type=' . rawurlencode(stripslashes($timezone_type)); - $text = sprintf($lang['SEARCH_FOR_TIMEZONE'], strip_tags(htmlspecialchars(stripslashes($timezone_type)))); + $text = sprintf(trans('messages.SEARCH_FOR_TIMEZONE'), strip_tags(htmlspecialchars(stripslashes($timezone_type)))); $timezone_type = (int)$timezone_type; @@ -708,12 +708,12 @@ if (!isset($_REQUEST['dosearch'])) { } if (OLD_DB()->num_rows($result) == 0) { - bb_die($lang['SEARCH_INVALID_MODERATORS']); + bb_die(trans('messages.SEARCH_INVALID_MODERATORS')); } $forum_name = OLD_DB()->sql_fetchrow($result); - $text = sprintf($lang['SEARCH_FOR_MODERATORS'], htmlCHR($forum_name['forum_name'])); + $text = sprintf(trans('messages.SEARCH_FOR_MODERATORS'), htmlCHR($forum_name['forum_name'])); $total_sql .= 'SELECT COUNT(DISTINCT u.user_id) AS total FROM ' . BB_USERS . ' AS u, ' . BB_GROUPS . ' AS g, ' . BB_USER_GROUP . ' AS ug, ' . BB_AUTH_ACCESS . ' AS aa @@ -742,7 +742,7 @@ if (!isset($_REQUEST['dosearch'])) { switch ($misc) { case 'admins': - $text = $lang['SEARCH_FOR_ADMINS']; + $text = trans('messages.SEARCH_FOR_ADMINS'); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . ' @@ -753,7 +753,7 @@ if (!isset($_REQUEST['dosearch'])) { AND u.user_id <> ' . GUEST_UID; break; case 'mods': - $text = $lang['SEARCH_FOR_MODS']; + $text = trans('messages.SEARCH_FOR_MODS'); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . ' @@ -764,7 +764,7 @@ if (!isset($_REQUEST['dosearch'])) { AND u.user_id <> ' . GUEST_UID; break; case 'banned': - $text = $lang['SEARCH_FOR_BANNED']; + $text = trans('messages.SEARCH_FOR_BANNED'); $total_sql .= 'SELECT COUNT(u.user_id) AS total FROM ' . BB_USERS . ' AS u, ' . BB_BANLIST . ' AS b @@ -777,7 +777,7 @@ if (!isset($_REQUEST['dosearch'])) { break; case 'disabled': - $text = $lang['SEARCH_FOR_DISABLED']; + $text = trans('messages.SEARCH_FOR_DISABLED'); $total_sql .= 'SELECT COUNT(user_id) AS total FROM ' . BB_USERS . ' @@ -789,7 +789,7 @@ if (!isset($_REQUEST['dosearch'])) { break; default: - bb_die($lang['SEARCH_INVALID']); + bb_die(trans('messages.SEARCH_INVALID')); } } @@ -860,7 +860,7 @@ if (!isset($_REQUEST['dosearch'])) { $total_pages = OLD_DB()->sql_fetchrow($result); if ($total_pages['total'] == 0) { - bb_die($lang['SEARCH_NO_RESULTS']); + bb_die(trans('messages.SEARCH_NO_RESULTS')); } } $num_pages = ceil($total_pages['total'] / config('tp.topics_per_page')); @@ -868,20 +868,20 @@ if (!isset($_REQUEST['dosearch'])) { $pagination = ''; if ($page > 1) { - $pagination .= '' . $lang['PREVIOUS'] . ''; + $pagination .= '' . trans('messages.PREVIOUS') . ''; } if ($page < $num_pages) { - $pagination .= ($pagination == '') ? '' . $lang['NEXT'] . '' : ' | ' . $lang['NEXT'] . ''; + $pagination .= ($pagination == '') ? '' . trans('messages.NEXT') . '' : ' | ' . trans('messages.NEXT') . ''; } if ($num_pages > 2) { - $pagination .= '   '; + $pagination .= '   '; } $template->assign_vars(array( 'TPL_ADMIN_USER_SEARCH_RESULTS' => true, - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], $page, $num_pages), + 'PAGE_NUMBER' => sprintf(trans('messages.PAGE_OF'), $page, $num_pages), 'PAGINATION' => $pagination, - 'NEW_SEARCH' => sprintf($lang['SEARCH_USERS_NEW'], $text, $total_pages['total'], 'admin_user_search.php'), + 'NEW_SEARCH' => sprintf(trans('messages.SEARCH_USERS_NEW'), $text, $total_pages['total'], 'admin_user_search.php'), 'U_USERNAME' => ($sort == 'username') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=username&order=$order", 'U_EMAIL' => ($sort == 'user_email') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=user_email&order=$order", @@ -928,8 +928,8 @@ if (!isset($_REQUEST['dosearch'])) { 'JOINDATE' => bb_date($rowset[$i]['user_regdate']), 'LASTVISIT' => bb_date($rowset[$i]['user_lastvisit']), 'POSTS' => $rowset[$i]['user_posts'], - 'BAN' => (!isset($banned[$rowset[$i]['user_id']])) ? $lang['NOT_BANNED'] : $lang['BANNED'], - 'ABLED' => $rowset[$i]['user_active'] ? $lang['ENABLED'] : $lang['DISABLED'], + 'BAN' => (!isset($banned[$rowset[$i]['user_id']])) ? trans('messages.NOT_BANNED') : trans('messages.BANNED'), + 'ABLED' => $rowset[$i]['user_active'] ? trans('messages.ENABLED') : trans('messages.DISABLED'), 'U_VIEWPOSTS' => "../search.php?search_author=1&uid={$rowset[$i]['user_id']}", 'U_MANAGE' => '../profile.php?mode=editprofile&' . POST_USERS_URL . '=' . $rowset[$i]['user_id'] . '&admin=1', diff --git a/admin/admin_words.php b/admin/admin_words.php index 3207dd7ed..63a90962a 100644 --- a/admin/admin_words.php +++ b/admin/admin_words.php @@ -45,7 +45,7 @@ if ($mode != '') { $word = $word_info['word']; $replacement = $word_info['replacement']; } else { - bb_die($lang['NO_WORD_SELECTED']); + bb_die(trans('messages.NO_WORD_SELECTED')); } } @@ -62,18 +62,18 @@ if ($mode != '') { $replacement = trim(request_var('replacement', '')); if ($word == '' || $replacement == '') { - bb_die($lang['MUST_ENTER_WORD']); + bb_die(trans('messages.MUST_ENTER_WORD')); } if ($word_id) { $sql = 'UPDATE ' . BB_WORDS . " SET word = '" . OLD_DB()->escape($word) . "', replacement = '" . OLD_DB()->escape($replacement) . "' WHERE word_id = $word_id"; - $message = $lang['WORD_UPDATED']; + $message = trans('messages.WORD_UPDATED'); } else { $sql = 'INSERT INTO ' . BB_WORDS . " (word, replacement) VALUES ('" . OLD_DB()->escape($word) . "', '" . OLD_DB()->escape($replacement) . "')"; - $message = $lang['WORD_ADDED']; + $message = trans('messages.WORD_ADDED'); } if (!$result = OLD_DB()->sql_query($sql)) { @@ -81,7 +81,7 @@ if ($mode != '') { } OLD_CACHE('bb_cache')->rm('censored'); - $message .= '

' . sprintf($lang['CLICK_RETURN_WORDADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= '

' . sprintf(trans('messages.CLICK_RETURN_WORDADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', ''); bb_die($message); } elseif ($mode == 'delete') { @@ -96,9 +96,9 @@ if ($mode != '') { OLD_CACHE('bb_cache')->rm('censored'); - bb_die($lang['WORD_REMOVED'] . '

' . sprintf($lang['CLICK_RETURN_WORDADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + bb_die(trans('messages.WORD_REMOVED') . '

' . sprintf(trans('messages.CLICK_RETURN_WORDADMIN'), '', '') . '

' . sprintf(trans('messages.CLICK_RETURN_ADMIN_INDEX'), '', '')); } else { - bb_die($lang['NO_WORD_SELECTED']); + bb_die(trans('messages.NO_WORD_SELECTED')); } } } else { diff --git a/admin/index.php b/admin/index.php index ed1b87673..c683ca03c 100644 --- a/admin/index.php +++ b/admin/index.php @@ -34,7 +34,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') { ksort($module); foreach ($module as $cat => $action_array) { - $cat = (!empty($lang[$cat])) ? $lang[$cat] : preg_replace('/_/', ' ', $cat); + $cat = !empty(trans('messages.' . $cat)) ? trans('messages.' . $cat) : preg_replace('/_/', ' ', $cat); $template->assign_block_vars('catrow', array( 'ADMIN_CATEGORY' => $cat, @@ -46,7 +46,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') { foreach ($action_array as $action => $file) { $row_class = !($row_count % 2) ? 'row1' : 'row2'; - $action = (!empty($lang[$action])) ? $lang[$action] : preg_replace('/_/', ' ', $action); + $action = !empty(trans('messages.' . $action)) ? trans('messages.' . $action) : preg_replace('/_/', ' ', $action); $template->assign_block_vars('catrow.modulerow', array( 'ROW_CLASS' => $row_class, @@ -86,7 +86,7 @@ if (isset($_GET['pane']) && $_GET['pane'] == 'left') { $avatar_dir_size = humn_size($avatar_dir_size); } else { - $avatar_dir_size = $lang['NOT_AVAILABLE']; + $avatar_dir_size = trans('messages.NOT_AVAILABLE'); } if ((int)$posts_per_day > $total_posts) { diff --git a/admin/pagestart.php b/admin/pagestart.php index b3e7a6c62..0066d8b35 100644 --- a/admin/pagestart.php +++ b/admin/pagestart.php @@ -22,7 +22,7 @@ if (IS_GUEST) { } if (!IS_ADMIN) { - bb_die($lang['NOT_ADMIN']); + bb_die(trans('messages.NOT_ADMIN')); } if (!$userdata['session_admin']) { diff --git a/admin/stats/tr_stats.php b/admin/stats/tr_stats.php index 4ea6c72da..398079b8d 100644 --- a/admin/stats/tr_stats.php +++ b/admin/stats/tr_stats.php @@ -14,7 +14,7 @@ require BB_ROOT . 'common.php'; $user->session_start(); if (!IS_ADMIN) { - bb_die($lang['NOT_AUTHORISED']); + bb_die(trans('messages.NOT_AUTHORISED')); } $sql[] = 'SELECT count(*) FROM `' . BB_USERS . '` WHERE `user_lastvisit` < UNIX_TIMESTAMP()-2592000'; @@ -31,7 +31,7 @@ echo '

"; + echo ""; } echo '
{$lang['TR_STATS'][$i]}{$row[0]}
" . trans('messages.TR_STATS.' . $i) . "{$row[0]}
'; diff --git a/admin/stats/tracker.php b/admin/stats/tracker.php index eb7778d7c..658a3f342 100644 --- a/admin/stats/tracker.php +++ b/admin/stats/tracker.php @@ -14,7 +14,7 @@ require BB_ROOT . 'common.php'; $user->session_start(); if (!IS_ADMIN) { - bb_die($lang['NOT_AUTHORISED']); + bb_die(trans('messages.NOT_AUTHORISED')); } $peers_in_last_minutes = [30, 15, 5, 1]; diff --git a/ajax.php b/ajax.php index b491c79b3..3e750d301 100644 --- a/ajax.php +++ b/ajax.php @@ -22,9 +22,9 @@ $user->session_start(); // Exit if board is disabled via ON/OFF trigger or by admin if ($ajax->action != 'manage_admin') { if (config('tp.board_disable')) { - $ajax->ajax_die($lang['BOARD_DISABLE']); + $ajax->ajax_die(trans('messages.BOARD_DISABLE')); } elseif (file_exists(BB_DISABLED)) { - $ajax->ajax_die($lang['BOARD_DISABLE_CRON']); + $ajax->ajax_die(trans('messages.BOARD_DISABLE_CRON')); } } diff --git a/bootstrap.php b/bootstrap.php index ee23e5342..fadce70a7 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -159,5 +159,5 @@ $container->singleton('translator', function ($app) { }); $container->singleton('translation.loader', function ($app) { - return new FileLoader($app['files'], __DIR__ . '/../resources/lang'); + return new FileLoader($app['files'], __DIR__ . '/resources/lang'); }); diff --git a/callseed.php b/callseed.php index 058212a48..d85a780ca 100644 --- a/callseed.php +++ b/callseed.php @@ -21,10 +21,10 @@ $forum_id = $t_data['forum_id']; set_die_append_msg($forum_id, $topic_id); if ($t_data['seeders'] > 2) { - bb_die(sprintf($lang['CALLSEED_HAVE_SEED'], $t_data['seeders'])); + bb_die(sprintf(trans('messages.CALLSEED_HAVE_SEED'), $t_data['seeders'])); } elseif ($t_data['call_seed_time'] > (TIMENOW - 86400)) { $time_left = delta_time($t_data['call_seed_time'] + 86400, TIMENOW, 'days'); - bb_die(sprintf($lang['CALLSEED_MSG_SPAM'], $time_left)); + bb_die(sprintf(trans('messages.CALLSEED_MSG_SPAM'), $time_left)); } $ban_user_id = []; @@ -48,8 +48,8 @@ $user_list = OLD_DB()->fetch_rowset(" GROUP BY dl.user_id "); -$subject = sprintf($lang['CALLSEED_SUBJECT'], $t_data['topic_title']); -$message = sprintf($lang['CALLSEED_TEXT'], make_url(TOPIC_URL . $topic_id), $t_data['topic_title'], make_url(DOWNLOAD_URL . $t_data['attach_id'])); +$subject = sprintf(trans('messages.CALLSEED_SUBJECT'), $t_data['topic_title']); +$message = sprintf(trans('messages.CALLSEED_TEXT'), make_url(TOPIC_URL . $topic_id), $t_data['topic_title'], make_url(DOWNLOAD_URL . $t_data['attach_id'])); if ($user_list) { foreach ($user_list as $row) { @@ -68,12 +68,10 @@ if ($user_list) { OLD_DB()->query("UPDATE " . BB_BT_TORRENTS . " SET call_seed_time = " . TIMENOW . " WHERE topic_id = $topic_id"); meta_refresh(TOPIC_URL . $topic_id); -bb_die($lang['CALLSEED_MSG_OK']); +bb_die(trans('messages.CALLSEED_MSG_OK')); function topic_info($topic_id) { - global $lang; - $sql = " SELECT tor.poster_id, tor.forum_id, tor.attach_id, tor.call_seed_time, @@ -85,7 +83,7 @@ function topic_info($topic_id) "; if (!$torrent = OLD_DB()->fetch_row($sql)) { - bb_die($lang['TOPIC_POST_NOT_EXIST']); + bb_die(trans('messages.TOPIC_POST_NOT_EXIST')); } return $torrent; diff --git a/dl.php b/dl.php index 37102372c..fe47deda5 100644 --- a/dl.php +++ b/dl.php @@ -24,14 +24,14 @@ $thumbnail = request_var('thumb', 0); // Send file to browser function send_file_to_browser($attachment, $upload_dir) { - global $lang, $userdata; + global $userdata; $filename = ($upload_dir == '') ? $attachment['physical_filename'] : $upload_dir . '/' . $attachment['physical_filename']; $gotit = false; if (@!file_exists(@amod_realpath($filename))) { - bb_die($lang['ERROR_NO_ATTACHMENT'] . "

" . $filename . "

" . $lang['TOR_NOT_FOUND']); + bb_die(trans('messages.ERROR_NO_ATTACHMENT') . "

" . $filename . "

" . trans('messages.TOR_NOT_FOUND')); } else { $gotit = true; } @@ -67,7 +67,7 @@ function send_file_to_browser($attachment, $upload_dir) } readfile($filename); } else { - bb_die($lang['ERROR_NO_ATTACHMENT'] . "

" . $filename . "

" . $lang['TOR_NOT_FOUND']); + bb_die(trans('messages.ERROR_NO_ATTACHMENT') . "

" . $filename . "

" . trans('messages.TOR_NOT_FOUND')); } exit; @@ -81,11 +81,11 @@ $user->session_start(); set_die_append_msg(); if (!$download_id) { - bb_die($lang['NO_ATTACHMENT_SELECTED']); + bb_die(trans('messages.NO_ATTACHMENT_SELECTED')); } if ($attach_config['disable_mod'] && !IS_ADMIN) { - bb_die($lang['ATTACHMENT_FEATURE_DISABLED']); + bb_die(trans('messages.ATTACHMENT_FEATURE_DISABLED')); } $sql = 'SELECT * FROM ' . BB_ATTACHMENTS_DESC . ' WHERE attach_id = ' . (int)$download_id; @@ -95,7 +95,7 @@ if (!($result = OLD_DB()->sql_query($sql))) { } if (!($attachment = OLD_DB()->sql_fetchrow($result))) { - bb_die($lang['ERROR_NO_ATTACHMENT']); + bb_die(trans('messages.ERROR_NO_ATTACHMENT')); } $attachment['physical_filename'] = basename($attachment['physical_filename']); @@ -140,7 +140,7 @@ for ($i = 0; $i < $num_auth_pages && $authorised == false; $i++) { } if (!$authorised) { - bb_die($lang['SORRY_AUTH_VIEW_ATTACH']); + bb_die(trans('messages.SORRY_AUTH_VIEW_ATTACH')); } $datastore->rm('cat_forums'); @@ -159,7 +159,7 @@ for ($i = 0; $i < $num_rows; $i++) { // Disallowed if (!in_array($attachment['extension'], $allowed_extensions) && !IS_ADMIN) { - bb_die(sprintf($lang['EXTENSION_DISABLED_AFTER_POSTING'], $attachment['extension'])); + bb_die(sprintf(trans('messages.EXTENSION_DISABLED_AFTER_POSTING'), $attachment['extension'])); } $download_mode = (int)$download_mode[$attachment['extension']]; @@ -189,11 +189,11 @@ if (IS_GUEST && !bb_captcha('check')) { $redirect_url = $_POST['redirect_url'] ?? $_SERVER['HTTP_REFERER'] ?? '/'; $message = '
'; - $message .= $lang['CAPTCHA'] . ':'; + $message .= trans('messages.CAPTCHA') . ':'; $message .= '
' . bb_captcha('get') . '
'; $message .= ''; - $message .= '  '; - $message .= ''; + $message .= '  '; + $message .= ''; $message .= '
'; $template->assign_vars(array( diff --git a/dl_list.php b/dl_list.php index d47471712..4c59bfda0 100644 --- a/dl_list.php +++ b/dl_list.php @@ -73,7 +73,7 @@ if ($mode == 'dl_delete' && $topic_id) { $is_auth = auth_user(AUTH_ALL, $row['forum_id'], $userdata); if (!$is_auth['auth_mod']) { - bb_die($lang['NOT_MODERATOR']); + bb_die(trans('messages.NOT_MODERATOR')); } } @@ -84,7 +84,7 @@ if ($mode == 'dl_delete' && $topic_id) { ); print_confirmation(array( - 'QUESTION' => $lang['DL_LIST_DEL_CONFIRM'], + 'QUESTION' => trans('messages.DL_LIST_DEL_CONFIRM'), 'FORM_ACTION' => 'dl_list.php', 'HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), )); @@ -100,7 +100,7 @@ $req_topics_ary = $topics_ary = array(); // Get topics selected by user if ($mode == 'set_topics_dl_status') { if (!isset($_POST['dl_topics_id_list']) || !is_array($_POST['dl_topics_id_list'])) { - bb_die($lang['NONE_SELECTED']); + bb_die(trans('messages.NONE_SELECTED')); } foreach ($_POST['dl_topics_id_list'] as $topic_id) { diff --git a/feed.php b/feed.php index c23b4323d..ee6649e84 100644 --- a/feed.php +++ b/feed.php @@ -19,7 +19,7 @@ $id = $_POST['id'] ?? 0; $timecheck = TIMENOW - 600; if (!$mode) { - bb_simple_die($lang['ATOM_NO_MODE']); + bb_simple_die(trans('messages.ATOM_NO_MODE')); } if ($mode == 'get_feed_url' && ($type == 'f' || $type == 'u') && $id >= 0) { @@ -30,7 +30,7 @@ if ($mode == 'get_feed_url' && ($type == 'f' || $type == 'u') && $id >= 0) { if ($id == 0) { $forum_data = array(); } else { - bb_simple_die($lang['ATOM_ERROR'] . ' #1'); + bb_simple_die(trans('messages.ATOM_ERROR') . ' #1'); } } if (file_exists(config('tp.atom.path') . '/f/' . $id . '.atom') && filemtime(config('tp.atom.path') . '/f/' . $id . '.atom') > $timecheck) { @@ -40,17 +40,17 @@ if ($mode == 'get_feed_url' && ($type == 'f' || $type == 'u') && $id >= 0) { if (update_forum_feed($id, $forum_data)) { redirectToUrl(config('tp.atom.url') . '/f/' . $id . '.atom'); } else { - bb_simple_die($lang['ATOM_NO_FORUM']); + bb_simple_die(trans('messages.ATOM_NO_FORUM')); } } } if ($type == 'u') { // Check if the user has actually sent a user ID if ($id < 1) { - bb_simple_die($lang['ATOM_ERROR'] . ' #2'); + bb_simple_die(trans('messages.ATOM_ERROR') . ' #2'); } if (!$username = get_username($id)) { - bb_simple_die($lang['ATOM_ERROR'] . ' #3'); + bb_simple_die(trans('messages.ATOM_ERROR') . ' #3'); } if (file_exists(config('tp.atom.path') . '/u/' . floor($id / 5000) . '/' . ($id % 100) . '/' . $id . '.atom') && filemtime(config('tp.atom.path') . '/u/' . floor($id / 5000) . '/' . ($id % 100) . '/' . $id . '.atom') > $timecheck) { redirectToUrl(config('tp.atom.url') . '/u/' . floor($id / 5000) . '/' . ($id % 100) . '/' . $id . '.atom'); @@ -59,10 +59,10 @@ if ($mode == 'get_feed_url' && ($type == 'f' || $type == 'u') && $id >= 0) { if (update_user_feed($id, $username)) { redirectToUrl(config('tp.atom.url') . '/u/' . floor($id / 5000) . '/' . ($id % 100) . '/' . $id . '.atom'); } else { - bb_simple_die($lang['ATOM_NO_USER']); + bb_simple_die(trans('messages.ATOM_NO_USER')); } } } } else { - bb_simple_die($lang['ATOM_ERROR'] . ' #4'); + bb_simple_die(trans('messages.ATOM_ERROR') . ' #4'); } diff --git a/group.php b/group.php index 7f7a4dadf..47371d55c 100644 --- a/group.php +++ b/group.php @@ -20,13 +20,13 @@ $select_sort_mode = $select_sort_order = ''; function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$pm, &$email, &$www, &$user_time, &$avatar) { - global $lang, $images; + global $images; $from = (!empty($row['user_from'])) ? $row['user_from'] : ''; $joined = bb_date($row['user_regdate']); - $user_time = (!empty($row['user_time'])) ? bb_date($row['user_time']) : $lang['NONE']; + $user_time = (!empty($row['user_time'])) ? bb_date($row['user_time']) : trans('messages.NONE'); $posts = $row['user_posts'] ?: 0; - $pm = '' . $lang['SEND_PM_TXTB'] . ''; + $pm = '' . trans('messages.SEND_PM_TXTB') . ''; $avatar = get_avatar($row['user_id'], $row['avatar_ext_id'], !bf($row['user_opt'], 'user_opt', 'dis_avatar'), '', 50, 50); if (bf($row['user_opt'], 'user_opt', 'user_viewemail') || $group_mod) { @@ -37,7 +37,7 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$ } if ($row['user_website']) { - $www = '' . $lang['VISIT_WEBSITE_TXTB'] . ''; + $www = '' . trans('messages.VISIT_WEBSITE_TXTB') . ''; } else { $www = ''; } @@ -60,7 +60,7 @@ $is_moderator = false; if ($group_id) { if (!$group_info = get_group_data($group_id)) { - bb_die($lang['GROUP_NOT_EXIST']); + bb_die(trans('messages.GROUP_NOT_EXIST')); } if (!$group_info['group_id'] || !$group_info['group_moderator'] || !$group_info['moderator_name']) { bb_die("Invalid group data [group_id: $group_id]"); @@ -126,17 +126,16 @@ if (!$group_id) { function build_group($params) { - global $lang; - $options = ''; + foreach ($params as $name => $data) { $text = htmlCHR(str_short(rtrim($name), HTML_SELECT_MAX_LENGTH)); - $members = ($data['m']) ? $lang['MEMBERS_IN_GROUP'] . ': ' . $data['m'] : $lang['NO_GROUP_MEMBERS']; - $candidates = ($data['c']) ? $lang['PENDING_MEMBERS'] . ': ' . $data['c'] : $lang['NO_PENDING_GROUP_MEMBERS']; + $members = ($data['m']) ? trans('messages.MEMBERS_IN_GROUP') . ': ' . $data['m'] : trans('messages.NO_GROUP_MEMBERS'); + $candidates = ($data['c']) ? trans('messages.PENDING_MEMBERS') . ': ' . $data['c'] : trans('messages.NO_PENDING_GROUP_MEMBERS'); $options .= '
  • ' . $text . '
    • '; - $options .= ($data['rg']) ? '