From 6dfe76ba17181c8f30059ebe17cc92d7a19b1879 Mon Sep 17 00:00:00 2001 From: pherum83 Date: Wed, 27 Jul 2011 22:08:15 +0000 Subject: [PATCH] r171 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit чистка админки git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@171 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/admin/admin_attachments.php | 52 ----------------- upload/admin/admin_board.php | 7 +-- upload/admin/admin_bt_tracker_cfg.php | 2 - upload/admin/admin_cron.php | 4 +- upload/admin/admin_disallow.php | 10 +--- upload/admin/admin_extensions.php | 12 ---- upload/admin/admin_forum_prune.php | 4 -- upload/admin/admin_forumauth.php | 13 +---- upload/admin/admin_forumauth_list.php | 31 +--------- upload/admin/admin_forums.php | 16 +----- upload/admin/admin_log.php | 16 ------ upload/admin/admin_mass_email.php | 4 +- upload/admin/admin_ranks.php | 7 --- upload/admin/admin_rebuild_search.php | 6 +- upload/admin/admin_reports.php | 49 +++------------- upload/admin/admin_smilies.php | 23 -------- upload/admin/admin_topic_templates.php | 2 - upload/admin/admin_user_ban.php | 11 ---- upload/admin/admin_user_search.php | 33 +---------- upload/admin/admin_words.php | 6 -- upload/admin/index.php | 22 +------- upload/admin/xs_cache.php | 23 -------- upload/admin/xs_config.php | 23 -------- upload/admin/xs_frameset.php | 23 -------- upload/admin/xs_include.php | 34 +---------- upload/admin/xs_index.php | 23 -------- upload/common.php | 23 ++++---- upload/config.php | 2 +- upload/language/lang_english/lang_admin.php | 32 +---------- upload/language/lang_russian/lang_admin.php | 27 +-------- upload/templates/admin/admin_attach_cp.tpl | 8 +-- upload/templates/admin/admin_attachments.tpl | 56 +++++++++---------- .../templates/admin/admin_bt_tracker_cfg.tpl | 2 +- upload/templates/admin/admin_disallow.tpl | 12 ++-- upload/templates/admin/admin_extensions.tpl | 16 +++--- upload/templates/admin/admin_forum_prune.tpl | 6 +- upload/templates/admin/admin_forumauth.tpl | 8 +-- .../templates/admin/admin_forumauth_list.tpl | 8 +-- upload/templates/admin/admin_forums.tpl | 20 +++---- upload/templates/admin/admin_mass_email.tpl | 4 +- upload/templates/admin/admin_ranks.tpl | 10 ++-- .../templates/admin/admin_rebuild_search.tpl | 4 +- upload/templates/admin/admin_smilies.tpl | 18 +++--- .../templates/admin/admin_topic_templates.tpl | 4 +- upload/templates/admin/admin_user_ban.tpl | 12 ++-- upload/templates/admin/admin_user_search.tpl | 54 +++++++++--------- upload/templates/admin/admin_words.tpl | 8 +-- upload/templates/admin/index.tpl | 4 +- .../templates/default/report_config_body.tpl | 2 +- .../default/report_module_edit_body.tpl | 14 ++--- .../templates/default/report_modules_body.tpl | 6 +- .../default/report_reason_edit_body.tpl | 4 +- 52 files changed, 179 insertions(+), 641 deletions(-) diff --git a/upload/admin/admin_attachments.php b/upload/admin/admin_attachments.php index e1c781125..720b59c44 100644 --- a/upload/admin/admin_attachments.php +++ b/upload/admin/admin_attachments.php @@ -400,36 +400,6 @@ if ($mode == 'manage') $template->assign_vars(array( 'TPL_ATTACH_MANAGE' => true, - - 'L_MANAGE_TITLE' => $lang['ATTACH_SETTINGS'], - 'L_MANAGE_EXPLAIN' => $lang['MANAGE_ATTACHMENTS_EXPLAIN'], - 'L_ATTACHMENT_SETTINGS' => $lang['ATTACH_SETTINGS'], - 'L_ATTACHMENT_FILESIZE_SETTINGS' => $lang['ATTACH_FILESIZE_SETTINGS'], - 'L_ATTACHMENT_NUMBER_SETTINGS' => $lang['ATTACH_NUMBER_SETTINGS'], - 'L_ATTACHMENT_OPTIONS_SETTINGS' => $lang['ATTACH_OPTIONS_SETTINGS'], - 'L_ATTACHMENT_FTP_SETTINGS' => $lang['FTP_INFO'], - 'L_NO_FTP_EXTENSIONS' => $lang['NO_FTP_EXTENSIONS_INSTALLED'], - 'L_UPLOAD_DIR' => $lang['UPLOAD_DIRECTORY'], - 'L_UPLOAD_DIR_EXPLAIN' => $lang['UPLOAD_DIRECTORY_EXPLAIN'], - 'L_ATTACHMENT_IMG_PATH' => $lang['ATTACH_IMG_PATH'], - 'L_IMG_PATH_EXPLAIN' => $lang['ATTACH_IMG_PATH_EXPLAIN'], - 'L_ATTACHMENT_TOPIC_ICON' => $lang['ATTACH_TOPIC_ICON'], - 'L_TOPIC_ICON_EXPLAIN' => $lang['ATTACH_TOPIC_ICON_EXPLAIN'], - 'L_DISPLAY_ORDER' => $lang['ATTACH_DISPLAY_ORDER'], - 'L_DISPLAY_ORDER_EXPLAIN' => $lang['ATTACH_DISPLAY_ORDER_EXPLAIN'], - 'L_MAX_FILESIZE' => $lang['MAX_FILESIZE_ATTACH'], - 'L_MAX_FILESIZE_EXPLAIN' => $lang['MAX_FILESIZE_ATTACH_EXPLAIN'], - 'L_PM_ATTACH' => $lang['PM_ATTACHMENTS'], - 'L_PM_ATTACH_EXPLAIN' => $lang['PM_ATTACHMENTS_EXPLAIN'], - 'L_ATTACHMENT_FTP_PATH' => $lang['ATTACH_FTP_PATH'], - 'L_ATTACHMENT_FTP_USER' => $lang['FTP_USERNAME'], - 'L_ATTACHMENT_FTP_PASS' => $lang['FTP_PASSWORD'], - 'L_ATTACHMENT_FTP_PATH_EXPLAIN' => $lang['ATTACH_FTP_PATH_EXPLAIN'], - 'L_ATTACHMENT_FTP_SERVER' => $lang['FTP_SERVER'], - 'L_ATTACHMENT_FTP_SERVER_EXPLAIN' => $lang['FTP_SERVER_EXPLAIN'], - 'L_DOWNLOAD_PATH' => $lang['FTP_DOWNLOAD_PATH'], - 'L_DOWNLOAD_PATH_EXPLAIN' => $lang['FTP_DOWNLOAD_PATH_EXPLAIN'], - 'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=manage'), 'S_FILESIZE' => $select_size_mode, 'S_FILESIZE_QUOTA' => $select_quota_size_mode, @@ -531,35 +501,18 @@ if ($mode == 'cats') $template->assign_vars(array( 'TPL_ATTACH_SPECIAL_CATEGORIES' => true, - - 'L_MANAGE_CAT_TITLE' => $lang['MANAGE_CATEGORIES'], - 'L_MANAGE_CAT_EXPLAIN' => $lang['MANAGE_CATEGORIES_EXPLAIN'], - 'L_SETTINGS_CAT_STREAM' => $lang['SETTINGS_CAT_STREAMS'], - 'L_CREATE_THUMBNAIL' => $lang['IMAGE_CREATE_THUMBNAIL'], - 'L_CREATE_THUMBNAIL_EXPLAIN' => $lang['IMAGE_CREATE_THUMBNAIL_EXPLAIN'], - 'L_MIN_THUMB_FILESIZE' => $lang['IMAGE_MIN_THUMB_FILESIZE'], - 'L_MIN_THUMB_FILESIZE_EXPLAIN' => $lang['IMAGE_MIN_THUMB_FILESIZE_EXPLAIN'], - 'L_IMAGICK_PATH' => $lang['IMAGE_IMAGICK_PATH'], - 'L_IMAGICK_PATH_EXPLAIN' => $lang['IMAGE_IMAGICK_PATH_EXPLAIN'], - 'L_SEARCH_IMAGICK' => $lang['IMAGE_SEARCH_IMAGICK'], - 'IMAGE_MAX_HEIGHT' => $new_attach['img_max_height'], 'IMAGE_MAX_WIDTH' => $new_attach['img_max_width'], - 'IMAGE_LINK_HEIGHT' => $new_attach['img_link_height'], 'IMAGE_LINK_WIDTH' => $new_attach['img_link_width'], 'IMAGE_MIN_THUMB_FILESIZE' => $new_attach['img_min_thumb_filesize'], 'IMAGE_IMAGICK_PATH' => $new_attach['img_imagick'], - 'DISPLAY_INLINED_YES' => $display_inlined_yes, 'DISPLAY_INLINED_NO' => $display_inlined_no, - 'CREATE_THUMBNAIL_YES' => $create_thumbnail_yes, 'CREATE_THUMBNAIL_NO' => $create_thumbnail_no, - 'USE_GD2_YES' => $use_gd2_yes, 'USE_GD2_NO' => $use_gd2_no, - 'S_ASSIGNED_GROUP_IMAGES' => implode(', ', $s_assigned_group_images), 'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=cats')) ); @@ -854,13 +807,8 @@ if ($mode == 'quota') $template->assign_vars(array( 'TPL_ATTACH_QUOTA' => true, - - 'L_MANAGE_QUOTAS_TITLE' => $lang['MANAGE_QUOTAS'], - 'L_SIZE' => $lang['MAX_FILESIZE_ATTACH'], 'MAX_FILESIZE' => $max_add_filesize, - 'S_FILESIZE' => size_select('add_size_select', $size), - 'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=quota')) ); diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index 92ed102d2..d256f6dc4 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -14,8 +14,7 @@ require(INC_DIR .'functions_selects.php'); // // Pull all config data // -$sql = "SELECT * - FROM " . BB_CONFIG; +$sql = "SELECT * FROM " . BB_CONFIG; if(!$result = DB()->sql_query($sql)) { message_die(CRITICAL_ERROR, "Could not query config information in admin_board", "", __LINE__, __FILE__, $sql); @@ -63,8 +62,8 @@ $disable_board_no = ( !$new['board_disable'] ) ? "checked=\"checked\"" : ""; $bbcode_yes = ( $new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; $bbcode_no = ( !$new['allow_bbcode'] ) ? "checked=\"checked\"" : ""; -$activation_none = ( $new['require_activation'] == USER_ACTIVATION_NONE ) ? "checked=\"checked\"" : ""; -$activation_user = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : ""; +$activation_none = ( $new['require_activation'] == USER_ACTIVATION_NONE ) ? "checked=\"checked\"" : ""; +$activation_user = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : ""; $activation_admin = ( $new['require_activation'] == USER_ACTIVATION_ADMIN ) ? "checked=\"checked\"" : ""; $confirm_yes = ($new['enable_confirm']) ? 'checked="checked"' : ''; diff --git a/upload/admin/admin_bt_tracker_cfg.php b/upload/admin/admin_bt_tracker_cfg.php index b19179d6b..379df0ded 100644 --- a/upload/admin/admin_bt_tracker_cfg.php +++ b/upload/admin/admin_bt_tracker_cfg.php @@ -51,8 +51,6 @@ set_tpl_vars ($default_cfg_num, $tr_cfg); set_tpl_vars_lang ($default_cfg_num); $template->assign_vars(array( - 'L_CONFIGURATION_TITLE' => $lang['TRACKER_CFG_TITLE'], - 'IGNORE_REPORTED_IP' => $bb_cfg['ignore_reported_ip'], 'ANNOUNCE_INTERVAL' => $bb_cfg['announce_interval'], 'PASSKEY_KEY' => $bb_cfg['passkey_key'], diff --git a/upload/admin/admin_cron.php b/upload/admin/admin_cron.php index 15896d559..ef7e7f1dc 100644 --- a/upload/admin/admin_cron.php +++ b/upload/admin/admin_cron.php @@ -38,9 +38,7 @@ require(INC_DIR .'functions_admin_torrent.php'); require(INC_DIR .'functions_admin_cron.php'); if ($mode == 'list') { - $sql = "SELECT * - FROM ". BB_CRON ." - ORDER BY cron_id"; + $sql = "SELECT * FROM ". BB_CRON ." ORDER BY cron_id"; if( !$result1 = DB()->sql_query($sql) ) { diff --git a/upload/admin/admin_disallow.php b/upload/admin/admin_disallow.php index 68f5f0323..0a19801eb 100644 --- a/upload/admin/admin_disallow.php +++ b/upload/admin/admin_disallow.php @@ -62,8 +62,7 @@ else if( isset($_POST['delete_name']) ) // // Grab the current list of disallowed usernames... // -$sql = "SELECT * - FROM " . BB_DISALLOW; +$sql = "SELECT * FROM " . BB_DISALLOW; $result = DB()->sql_query($sql); if( !$result ) { @@ -95,13 +94,6 @@ $disallow_select .= ''; $template->assign_vars(array( "S_DISALLOW_SELECT" => $disallow_select, "S_FORM_ACTION" => append_sid("admin_disallow.php"), - - "L_DISALLOW_TITLE" => $lang['DISALLOW_CONTROL'], - "L_DELETE_DISALLOW" => $lang['DELETE_DISALLOW_TITLE'], - "L_DELETE_EXPLAIN" => $lang['DELETE_DISALLOW_EXPLAIN'], - "L_ADD" => $lang['ADD_DISALLOW'], - "L_ADD_DISALLOW" => $lang['ADD_DISALLOW_TITLE'], - "L_ADD_EXPLAIN" => $lang['ADD_DISALLOW_EXPLAIN'], )); print_page('admin_disallow.tpl', 'admin'); diff --git a/upload/admin/admin_extensions.php b/upload/admin/admin_extensions.php index 4973e10b8..2d7ec5cf5 100644 --- a/upload/admin/admin_extensions.php +++ b/upload/admin/admin_extensions.php @@ -216,10 +216,6 @@ if ($mode == 'extensions') // Extensions $template->assign_vars(array( 'TPL_ATTACH_EXTENSIONS' => true, - - 'L_EXTENSIONS_TITLE' => $lang['MANAGE_EXTENSIONS'], - 'L_EXTENSIONS_EXPLAIN' => $lang['MANAGE_EXTENSIONS_EXPLAIN'], - 'S_CANCEL_ACTION' => append_sid("admin_extensions.php?mode=extensions"), 'S_ATTACH_ACTION' => append_sid("admin_extensions.php?mode=extensions")) ); @@ -453,15 +449,8 @@ if ($mode == 'groups') $template->assign_vars(array( 'TPL_ATTACH_EXTENSION_GROUPS' => true, - - 'L_EXTENSION_GROUPS_TITLE' => $lang['MANAGE_EXTENSION_GROUPS'], - 'L_EXTENSION_GROUPS_EXPLAIN' => $lang['MANAGE_EXTENSION_GROUPS_EXPLAIN'], - 'L_MAX_FILESIZE' => $lang['MAX_GROUPS_FILESIZE'], - 'L_FORUM_PERMISSIONS' => $lang['EXT_GROUP_PERMISSIONS'], - 'ADD_GROUP_NAME' => ( isset($submit) ) ? @$extension_group : '', 'MAX_FILESIZE' => $max_add_filesize, - 'S_FILESIZE' => size_select('add_size_select', $size), 'S_ADD_DOWNLOAD_MODE' => download_select('add_download_mode'), 'S_SELECT_CAT' => category_select('add_category'), @@ -723,7 +712,6 @@ if ($e_mode == 'perm' && $group) $template->assign_vars(array( 'TPL_ATTACH_EXTENSION_GROUPS_PERMISSIONS' => true, - 'L_GROUP_PERMISSIONS_TITLE' => sprintf($lang['GROUP_PERMISSIONS_TITLE_ADMIN'], trim($group_name)), 'A_PERM_ACTION' => append_sid("admin_extensions.php?mode=groups&e_mode=perm&e_group=$group")) ); diff --git a/upload/admin/admin_forum_prune.php b/upload/admin/admin_forum_prune.php index 246cb5a02..2e59ae5ef 100644 --- a/upload/admin/admin_forum_prune.php +++ b/upload/admin/admin_forum_prune.php @@ -60,10 +60,6 @@ if (isset($_REQUEST['submit'])) } $template->assign_vars(array( - 'L_PRUNE_RESULT' => $lang['PRUNE_SUCCESS'], - 'L_PRUNE_EXPLAIN' => $lang['FORUM_PRUNE_EXPLAIN'], - 'L_PRUNE_TOPICS' => $lang['PRUNE_TOPICS_NOT_POSTED'], - 'PRUNED_TOTAL' => $pruned_total, 'S_PRUNE_ACTION' => basename(__FILE__), 'SEL_FORUM' => get_forum_select('admin', 'f[]', null, 65, 16, '', $all_forums), diff --git a/upload/admin/admin_forumauth.php b/upload/admin/admin_forumauth.php index d3867e1ff..401b5c0ed 100644 --- a/upload/admin/admin_forumauth.php +++ b/upload/admin/admin_forumauth.php @@ -24,7 +24,7 @@ $forum_auth_fields = array( 'auth_announce', ); -// View Read Reply Edit Delete Vote Poll PostAttach DownAttach PostTopic Sticky Announce +// View Read Reply Edit Delete Vote Poll PostAttach DownAttach PostTopic Sticky Announce $simple_auth_ary = array( /* Public */ 0 => array(AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_ALL, AUTH_ALL, AUTH_MOD, AUTH_MOD), // Public /* Reg */ 1 => array(AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD), // Registered @@ -147,11 +147,6 @@ if (empty($forum_id)) // Output the selection table if no forum id was specified $template->assign_vars(array( 'TPL_AUTH_SELECT_FORUM' => true, - - 'L_AUTH_TITLE' => $lang['AUTH_CONTROL_FORUM'], - 'L_AUTH_EXPLAIN' => $lang['FORUM_AUTH_EXPLAIN'], - 'L_AUTH_SELECT' => $lang['SELECT_A_FORUM'], - 'S_AUTH_ACTION' => "admin_forumauth.php", 'S_AUTH_SELECT' => get_forum_select('admin', 'f', null, 80), )); @@ -249,14 +244,8 @@ else $template->assign_vars(array( 'TPL_EDIT_FORUM_AUTH' => true, - 'FORUM_NAME' => htmlCHR($forum_name), - - 'L_AUTH_TITLE' => $lang['AUTH_CONTROL_FORUM'], - 'L_AUTH_EXPLAIN' => $lang['FORUM_AUTH_EXPLAIN'], - 'U_SWITCH_MODE' => $u_switch_mode, - 'S_FORUMAUTH_ACTION' => "admin_forumauth.php", 'S_COLUMN_SPAN' => $s_column_span, 'S_HIDDEN_FIELDS' => $s_hidden_fields, diff --git a/upload/admin/admin_forumauth_list.php b/upload/admin/admin_forumauth_list.php index 6c900cd24..4fb9d424d 100644 --- a/upload/admin/admin_forumauth_list.php +++ b/upload/admin/admin_forumauth_list.php @@ -1,27 +1,5 @@ array(AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_ALL), // Public /* Reg */ 1 => array(AUTH_ALL, AUTH_ALL, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_MOD, AUTH_MOD, AUTH_REG, AUTH_REG, AUTH_REG, AUTH_REG), // Registered @@ -224,9 +202,6 @@ if( empty($forum_id) && empty($cat_id) ) // $template->assign_vars(array( 'TPL_AUTH_FORUM_LIST' => true, - - 'L_AUTH_TITLE' => $lang['PERMISSIONS_LIST'], - 'L_AUTH_EXPLAIN' => $lang['FORUM_AUTH_LIST_EXPLAIN'], 'S_COLUMN_SPAN' => count($forum_auth_fields)+1, )); @@ -383,10 +358,6 @@ else $template->assign_vars(array( 'TPL_AUTH_CAT' => true, 'CAT_NAME' => htmlCHR($cat_name), - - 'L_AUTH_TITLE' => $lang['AUTH_CONTROL_CATEGORY'], - 'L_AUTH_EXPLAIN' => $lang['CAT_AUTH_LIST_EXPLAIN'], - 'S_FORUMAUTH_ACTION' => append_sid("admin_forumauth_list.php"), 'S_COLUMN_SPAN' => count($forum_auth_fields)+1, 'S_HIDDEN_FIELDS' => $s_hidden_fields) diff --git a/upload/admin/admin_forums.php b/upload/admin/admin_forums.php index cdad8442d..a81074e66 100644 --- a/upload/admin/admin_forums.php +++ b/upload/admin/admin_forums.php @@ -150,16 +150,11 @@ if ($mode) 'S_PRUNE_ENABLED' => $prune_enabled, 'SHOW_ON_INDEX' => $show_on_index, - 'L_SHOW_ON_INDEX' => $lang['SF_SHOW_ON_INDEX'], - 'L_PARENT_FORUM' => $lang['SF_PARENT_FORUM'], 'S_PARENT_FORUM' => $s_parent, 'CAT_LIST_CLASS' => ($forum_parent) ? 'hidden' : '', 'SHOW_ON_INDEX_CLASS' => (!$forum_parent) ? 'hidden' : '', 'L_FORUM_TITLE' => $l_title, - 'L_FORUM_EXPLAIN' => $lang['FORUM_EDIT_DELETE_EXPLAIN'], - 'L_FORUM_DESCRIPTION' => $lang['FORUM_DESC'], - 'L_AUTO_PRUNE' => $lang['FORUM_PRUNING'], 'PRUNE_DAYS' => $prune_days, 'FORUM_NAME' => htmlCHR($forumname), @@ -371,10 +366,7 @@ if ($mode) $template->assign_vars(array( 'TPL_EDIT_CATEGORY' => true, - 'CAT_TITLE' => htmlCHR($cat_info['cat_title']), - 'L_EDIT_CAT' => $lang['EDIT_CATEGORY'], - 'L_EDIT_CAT_EXPL' => $lang['EDIT_CATEGORY_EXPLAIN'], 'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), 'S_SUBMIT_VALUE' => $lang['UPDATE'], 'S_FORUM_ACTION' => "admin_forums.php", @@ -439,8 +431,6 @@ if ($mode) 'WHAT_TO_DELETE' => htmlCHR($foruminfo['forum_name']), 'DELETE_TITLE' => $lang['FORUM_DELETE'], - 'L_DELETE_EXPL' => $lang['FORUM_DELETE_EXPLAIN'], - 'L_MOVE_CONTENTS' => $lang['MOVE_CONTENTS'], 'CAT_FORUM_NAME' => $lang['FORUM_NAME'], 'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), @@ -546,7 +536,6 @@ if ($mode) 'WHAT_TO_DELETE' => htmlCHR($catinfo['cat_title']), 'DELETE_TITLE' => $lang['CATEGORY_DELETE'], - 'L_DELETE_EXPL' => $lang['FORUM_DELETE_EXPLAIN'], 'CAT_FORUM_NAME' => $lang['CATEGORY'], 'S_HIDDEN_FIELDS' => build_hidden_fields($hidden_fields), @@ -724,10 +713,7 @@ if (!$mode || $show_main_page) 'TPL_FORUMS_LIST' => true, 'S_FORUM_ACTION' => append_sid("admin_forums.php"), - 'L_FORUM_TITLE' => $lang['FORUM_ADMIN_MAIN'], - 'L_FORUM_EXPLAIN' => $lang['FORUM_ADMIN_EXPLAIN'], - 'L_EDIT' => 'edit', //$lang['EDIT'], - 'L_RESYNC' => 'sync', //$lang['RESYNC'] + 'L_FORUM_TITLE' => $lang['FORUM_ADMIN_MAIN'] )); $sql = "SELECT cat_id, cat_title, cat_order diff --git a/upload/admin/admin_log.php b/upload/admin/admin_log.php index 5590da6c2..972d4cf93 100644 --- a/upload/admin/admin_log.php +++ b/upload/admin/admin_log.php @@ -385,22 +385,6 @@ $order_options = ''; $template->assign_vars(array( 'LOG_COLSPAN' => 4, - 'L_NO_MATCH' => $lang['NO_MATCH'], - 'L_ADM_LOG_ALL_ACTIONS' => $lang['ACTS_LOG_ALL_ACTIONS'], - 'L_ADM_LOG_SEARCH_OPTIONS' => $lang['ACTS_LOG_SEARCH_OPTIONS'], - 'L_ADM_LOG_FORUM' => $lang['ACTS_LOG_FORUM'], - 'L_ADM_LOG_ACTION' => $lang['ACTS_LOG_ACTION'], - 'L_ADM_LOG_USER' => $lang['ACTS_LOG_USER'], - 'L_ADM_LOG_LOGS_FROM' => $lang['ACTS_LOG_LOGS_FROM'], - 'L_ADM_LOG_FIRST' => $lang['ACTS_LOG_FIRST'], - 'L_ADM_LOG_DAYS_BACK' => $lang['ACTS_LOG_DAYS_BACK'], - 'L_ADM_LOG_TOPIC_MATCH' => $lang['ACTS_LOG_TOPIC_MATCH'], - 'L_ADM_LOG_SORT_BY' => $lang['ACTS_LOG_SORT_BY'], - 'L_ADM_LOG_ACTION' => $lang['ACTS_LOG_LOGS_ACTION'], - 'L_ADM_LOG_USERNAME' => $lang['ACTS_LOG_USERNAME'], - 'L_ADM_LOG_TIME' => $lang['ACTS_LOG_TIME'], - 'L_ADM_LOG_INFO' => $lang['ACTS_LOG_INFO'], - 'DATETIME_NAME' => $datetime_key, 'DATETIME_VAL' => date('Y-m-d', $datetime_val), 'DAYSBACK_NAME' => $daysback_key, diff --git a/upload/admin/admin_mass_email.php b/upload/admin/admin_mass_email.php index 53b839a12..0b284b5d7 100644 --- a/upload/admin/admin_mass_email.php +++ b/upload/admin/admin_mass_email.php @@ -150,9 +150,7 @@ require(PAGE_HEADER); $template->assign_vars(array( 'MESSAGE' => $message, 'SUBJECT' => $subject, - - 'L_EMAIL_EXPLAIN' => $lang['MASS_EMAIL_EXPLAIN'], - 'L_EMAIL_SUBJECT' => $lang['SUBJECT'], + 'L_NOTICE' => @$notice, 'S_USER_ACTION' => append_sid('admin_mass_email.php'), diff --git a/upload/admin/admin_ranks.php b/upload/admin/admin_ranks.php index b4240ed77..8d660dfe2 100644 --- a/upload/admin/admin_ranks.php +++ b/upload/admin/admin_ranks.php @@ -89,8 +89,6 @@ if( $mode != "" ) "IMAGE" => ( @$rank_info['rank_image'] ) ? $rank_info['rank_image'] : "images/ranks/rank_image.gif", "IMAGE_DISPLAY" => ( @$rank_info['rank_image'] ) ? '' : "", - "L_RANKS_TEXT" => $lang['RANKS_EXPLAIN'], - "S_RANK_ACTION" => append_sid("admin_ranks.php"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); @@ -233,11 +231,6 @@ else $template->assign_vars(array( 'TPL_RANKS_LIST' => true, - - "L_RANKS_TEXT" => $lang['RANKS_EXPLAIN'], - "L_RANK" => $lang['RANK_TITLE'], - "L_ADD_RANK" => $lang['ADD_NEW_RANK'], - "S_RANKS_ACTION" => append_sid("admin_ranks.php")) ); diff --git a/upload/admin/admin_rebuild_search.php b/upload/admin/admin_rebuild_search.php index 316227527..c98b7b745 100644 --- a/upload/admin/admin_rebuild_search.php +++ b/upload/admin/admin_rebuild_search.php @@ -335,11 +335,7 @@ 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_BEGINNING' => $lang['TIME_FROM_THE_BEGINNING'], - - 'L_ESTIMATED_VALUES' => $lang['INFO_ESTIMATED_VALUES'], + 'L_TIME_LAST_POSTS_ADMIN' => sprintf($lang['TIME_LAST_POSTS'], $num_rows), 'PROCESSING_POSTS' => sprintf($lang['PROCESSED_POST_IDS'], $start_post_id, $end_post_id), 'PROCESSING_MESSAGES' => $processing_messages, diff --git a/upload/admin/admin_reports.php b/upload/admin/admin_reports.php index 3a4249ea3..e7c020994 100644 --- a/upload/admin/admin_reports.php +++ b/upload/admin/admin_reports.php @@ -13,8 +13,8 @@ define('IN_PHPBB', true); define('BB_ROOT', './../'); require("./pagestart.php"); -require(BB_ROOT . "includes/functions_report.php"); -require(BB_ROOT . "includes/functions_report_admin.php"); +require(INC_DIR . "functions_report.php"); +require(INC_DIR . "functions_report_admin.php"); $return_links = array( 'index' => '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''), @@ -80,8 +80,7 @@ if ($mode == 'config') 'REPORT_NEW_WINDOW_ON' => ($bb_cfg['report_new_window']) ? ' checked="checked"' : '', 'REPORT_NEW_WINDOW_OFF' => (!$bb_cfg['report_new_window']) ? ' checked="checked"' : '', - 'L_CONFIGURATION_TITLE' => $lang['REPORTS'] . ': ' . $lang['CONFIGURATION'], - 'L_CONFIGURATION_EXPLAIN' => $lang['REPORT_CONFIG_EXPLAIN']) + 'L_CONFIGURATION_TITLE' => $lang['REPORTS'] . ': ' . $lang['CONFIGURATION']) ); print_page('report_config_body.tpl'); @@ -127,20 +126,11 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $hidden_fields, - 'MODULE_TITLE' => $module_info['title'], 'MODULE_EXPLAIN' => $module_info['explain'], 'MODULE_NOTIFY_ON' => ($report_module->data['report_module_notify']) ? ' checked="checked"' : '', 'MODULE_NOTIFY_OFF' => (!$report_module->data['report_module_notify']) ? ' checked="checked"' : '', - 'MODULE_PRUNE' => $report_module->data['report_module_prune'], - - 'L_EDIT_MODULE' => $lang['EDIT_REPORT_MODULE'], - 'L_AUTH_WRITE' => $lang['WRITE'], - 'L_AUTH_VIEW' => $lang['VIEW'], - 'L_AUTH_NOTIFY' => $lang['REPORT_NOTIFY'], - 'L_AUTH_NOTIFY_EXPLAIN' => $lang['REPORT_AUTH_NOTIFY_EXPLAIN'], - 'L_AUTH_DELETE' => $lang['DELETE'], - 'L_AUTH_DELETE_EXPLAIN' => $lang['REPORT_AUTH_DELETE_EXPLAIN']) + 'MODULE_PRUNE' => $report_module->data['report_module_prune']) ); // @@ -232,14 +222,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $hidden_fields, - - 'REASON_DESC' => $report_reason['report_reason_desc'], - - 'L_EDIT_REASON' => $lang['EDIT_REASON'], - 'L_REASON_DESC' => $lang['FORUM_DESC'], - 'L_REASON_DESC_EXPLAIN' => $lang['REASON_DESC_EXPLAIN'], - 'L_SUBMIT' => $lang['SUBMIT'], - 'L_CANCEL' => $lang['CANCEL']) + 'REASON_DESC' => $report_reason['report_reason_desc']) ); print_page('report_reason_edit_body.tpl'); @@ -341,11 +324,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) $template->assign_vars(array( 'S_HIDDEN_FIELDS' => $hidden_fields, - - 'REASON_DESC' => (isset($reason_desc)) ? stripslashes($reason_desc) : '', - - 'L_EDIT_REASON' => $lang['ADD_REASON'], - 'L_REASON_DESC' => $lang['FORUM_DESC']) + 'REASON_DESC' => (isset($reason_desc)) ? stripslashes($reason_desc) : '') ); print_page('report_reason_edit_body.tpl'); @@ -486,15 +465,7 @@ else if (isset($_POST['module']) || isset($_GET['module'])) 'MODULE_EXPLAIN' => $module_info['explain'], 'MODULE_NOTIFY_ON' => ($bb_cfg['report_notify']) ? ' checked="checked"' : '', 'MODULE_NOTIFY_OFF' => (!$bb_cfg['report_notify']) ? ' checked="checked"' : '', - 'MODULE_PRUNE' => 0, - - 'L_EDIT_MODULE' => $lang['INSTALL_REPORT_MODULE'], - 'L_AUTH_WRITE' => $lang['WRITE'], - 'L_AUTH_VIEW' => $lang['VIEW'], - 'L_AUTH_NOTIFY' => $lang['REPORT_NOTIFY'], - 'L_AUTH_NOTIFY_EXPLAIN' => $lang['REPORT_AUTH_NOTIFY_EXPLAIN'], - 'L_AUTH_DELETE' => $lang['DELETE'], - 'L_AUTH_DELETE_EXPLAIN' => $lang['REPORT_AUTH_DELETE_EXPLAIN']) + 'MODULE_PRUNE' => 0) ); // @@ -521,11 +492,7 @@ else $report_modules = report_modules(); $template->assign_vars(array( - 'L_REPORTS_TITLE' => $lang['REPORTS'] . ': ' . $lang['MODULES_REASONS'], - 'L_REPORTS_EXPLAIN' => $lang['REPORT_ADMIN_EXPLAIN'], - - 'L_REPORT_COUNT' => $lang['REPORTS'], - 'L_INSTALL' => $lang['INSTALL2']) + 'L_REPORTS_TITLE' => $lang['REPORTS'] . ': ' . $lang['MODULES_REASONS']) ); $report_counts = report_counts_obtain(); diff --git a/upload/admin/admin_smilies.php b/upload/admin/admin_smilies.php index 3c97bc303..f22bce2b6 100644 --- a/upload/admin/admin_smilies.php +++ b/upload/admin/admin_smilies.php @@ -171,11 +171,6 @@ if( isset($_GET['import_pack']) || isset($_POST['import_pack']) ) $template->assign_vars(array( 'TPL_SMILE_IMPORT' => true, - "L_SMILEY_EXPLAIN" => $lang['SMILEY_IMPORT_INST'], - "L_SELECT_LBL" => $lang['CHOOSE_SMILE_PAK'], - "L_CONFLICTS" => $lang['SMILE_CONFLICTS'], - "L_DEL_EXISTING" => $lang['DEL_EXISTING_SMILEYS'], - "S_SMILEY_ACTION" => append_sid("admin_smilies.php"), "S_SMILE_SELECT" => $smile_paks_select, "S_HIDDEN_FIELDS" => $hidden_vars) @@ -234,12 +229,7 @@ else if( isset($_POST['add']) || isset($_GET['add']) ) $template->assign_vars(array( 'TPL_SMILE_EDIT' => true, - - "L_SMILEY_EXPLAIN" => $lang['SMILE_DESC'], - "L_SMILEY_EMOTION" => $lang['SMILEY_EMOT'], - "SMILEY_IMG" => BB_ROOT . $bb_cfg['smilies_path'] . '/' . $smiley_images[0], - "S_SMILEY_ACTION" => append_sid("admin_smilies.php"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list, @@ -309,15 +299,9 @@ else if ( $mode != "" ) $template->assign_vars(array( 'TPL_SMILE_EDIT' => true, - "SMILEY_CODE" => $smile_data['code'], "SMILEY_EMOTICON" => $smile_data['emoticon'], - - "L_SMILEY_EXPLAIN" => $lang['SMILE_DESC'], - "L_SMILEY_EMOTION" => $lang['SMILEY_EMOT'], - "SMILEY_IMG" => BB_ROOT . $bb_cfg['smilies_path'] . '/' . $smiley_edit_img, - "S_SMILEY_ACTION" => append_sid("admin_smilies.php"), "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list, @@ -434,13 +418,6 @@ else $template->assign_vars(array( 'TPL_SMILE_MAIN' => true, - - "L_SMILEY_TEXT" => $lang['SMILE_DESC'], - "L_SMILEY_ADD" => $lang['SMILE_ADD'], - "L_EMOT" => $lang['EMOTION'], - "L_IMPORT_PACK" => $lang['IMPORT_SMILE_PACK'], - "L_EXPORT_PACK" => $lang['EXPORT_SMILE_PACK'], - "S_HIDDEN_FIELDS" => @$s_hidden_fields, "S_SMILEY_ACTION" => append_sid("admin_smilies.php")) ); diff --git a/upload/admin/admin_topic_templates.php b/upload/admin/admin_topic_templates.php index 90c1ebf58..e9758757f 100644 --- a/upload/admin/admin_topic_templates.php +++ b/upload/admin/admin_topic_templates.php @@ -81,8 +81,6 @@ foreach ($forums as $i => $forum) } $template->assign_vars(array( - 'L_ADMIN_TITLE' => $lang['RELEASE_TEMPLATES'], - 'L_ADMIN_TEXT' => $lang['RELEASE_EXP'], 'S_ACTION' => append_sid("admin_topic_templates.php"), )); diff --git a/upload/admin/admin_user_ban.php b/upload/admin/admin_user_ban.php index 9e044f708..2cb94bef4 100644 --- a/upload/admin/admin_user_ban.php +++ b/upload/admin/admin_user_ban.php @@ -298,17 +298,9 @@ if ( isset($_POST['submit']) ) else { $template->assign_vars(array( - 'L_BAN_TITLE' => $lang['BAN_CONTROL'], - 'L_IP_OR_HOSTNAME' => $lang['IP_HOSTNAME'], - 'S_BANLIST_ACTION' => append_sid("admin_user_ban.php")) ); - $template->assign_vars(array( - 'L_BAN_USER' => $lang['BAN_USERNAME'], - 'L_BAN_USER_EXPLAIN' => $lang['BAN_USERNAME_EXPLAIN']) - ); - $userban_count = 0; $ipban_count = 0; $emailban_count = 0; @@ -389,9 +381,6 @@ else $select_emaillist = ''; $template->assign_vars(array( - 'L_UNBAN_USER' => $lang['UNBAN_USERNAME'], - 'L_UNBAN_USER_EXPLAIN' => $lang['UNBAN_USERNAME_EXPLAIN'], - 'U_SEARCH_USER' => append_sid("./../search.php?mode=searchuser"), 'S_UNBAN_USERLIST_SELECT' => $select_userlist, 'S_UNBAN_IPLIST_SELECT' => $select_iplist, diff --git a/upload/admin/admin_user_search.php b/upload/admin/admin_user_search.php index 8aca1c119..3bf5d044d 100644 --- a/upload/admin/admin_user_search.php +++ b/upload/admin/admin_user_search.php @@ -106,33 +106,7 @@ if(!isset($_POST['dosearch'])&&!isset($_GET['dosearch'])) $template->assign_vars(array( 'TPL_ADMIN_USER_SEARCH_MAIN' => true, - - 'L_USER_SEARCH' => $lang['SEARCH_USERS_ADVANCED'], - 'L_SEARCH_EXPLAIN' => $lang['SEARCH_USERS_EXPLAIN'], - 'L_USERNAME_EXPLAIN' => $lang['SEARCH_USERNAME_EXPLAIN'], - 'L_EMAIL' => $lang['EMAIL_ADDRESS'], - 'L_EMAIL_EXPLAIN' => $lang['SEARCH_EMAIL_EXPLAIN'], - 'L_IP' => $lang['IP_ADDRESS'], - 'L_IP_EXPLAIN' => $lang['SEARCH_IP_EXPLAIN'], - 'L_USERS_JOINED' => $lang['SEARCH_USERS_JOINED'], - 'L_REGEX' => $lang['REGULAR_EXPRESSION'], - 'L_JOIN_DATE_EXPLAIN' => $lang['SEARCH_USERS_JOINED_EXPLAIN'], - 'L_SEARCH_USERS_GROUPS_EXPLAIN' => $lang['SEARCH_USERS_GROUPS_EXPLAIN'], - 'L_ADMINS' => $lang['ADMINISTRATORS'], - 'L_POSTCOUNT_EXPLAIN' => $lang['SEARCH_USERS_POSTCOUNT_EXPLAIN'], - 'L_GREATERTHAN' => $lang['GREATER_THAN'], - 'L_LESSERTHAN' => $lang['LESS_THAN'], - 'L_USERFIELD_EXPLAIN' => $lang['SEARCH_USERS_USERFIELD_EXPLAIN'], - 'L_LASTVISITED' => $lang['SEARCH_USERS_LASTVISITED'], - 'L_LASTVISITED_EXPLAIN' => $lang['SEARCH_USERS_LASTVISITED_EXPLAIN'], - 'L_LANGUAGE' => $lang['BOARD_LANG'], - 'L_LANGUAGE_EXPLAIN' => $lang['SEARCH_USERS_LANGUAGE_EXPLAIN'], - 'L_TIMEZONE_EXPLAIN' => $lang['SEARCH_USERS_TIMEZONE_EXPLAIN'], - 'L_STYLE' => $lang['BOARD_STYLE'], - 'L_STYLE_EXPLAIN' => $lang['SEARCH_USERS_STYLE_EXPLAIN'], - 'L_MODERATORS_OF_EXPLAIN' => $lang['SEARCH_USERS_MODERATORS_EXPLAIN'], - 'L_MISC_EXPLAIN' => $lang['SEARCH_USERS_MISC_EXPLAIN'], - + 'YEAR' => date("Y"), 'MONTH' => date("m"), 'DAY' => date("d"), @@ -1269,11 +1243,6 @@ else $template->assign_vars(array( 'TPL_ADMIN_USER_SEARCH_RESULTS' => true, - 'L_USER_SEARCH' => $lang['SEARCH_USERS_ADVANCED'], - 'L_EMAIL' => $lang['EMAIL_ADDRESS'], - 'L_JOINDATE' => $lang['JOINED'], - 'L_LASTVISIT' => $lang['LAST_VISIT'], - 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], $page, $num_pages), 'PAGINATION' => $pagination, 'NEW_SEARCH' => sprintf($lang['SEARCH_USERS_NEW'],$text, $total_pages['total'],append_sid("admin_user_search.php")), diff --git a/upload/admin/admin_words.php b/upload/admin/admin_words.php index 818d9a9c7..413722442 100644 --- a/upload/admin/admin_words.php +++ b/upload/admin/admin_words.php @@ -65,9 +65,6 @@ if( $mode != "" ) "WORD" => $word, "REPLACEMENT" => $replacement, - "L_WORDS_TEXT" => $lang['WORDS_EXPLAIN'], - "L_WORD_CENSOR" => $lang['EDIT_WORD_CENSOR'], - "S_WORDS_ACTION" => append_sid("admin_words.php"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); @@ -146,9 +143,6 @@ else $template->assign_vars(array( 'TPL_ADMIN_WORDS_LIST' => true, - "L_WORDS_TEXT" => $lang['WORDS_EXPLAIN'], - "L_ADD_WORD" => $lang['ADD_NEW_WORD'], - "S_WORDS_ACTION" => append_sid("admin_words.php"), "S_HIDDEN_FIELDS" => '') ); diff --git a/upload/admin/index.php b/upload/admin/index.php index 17e3483a0..8fe3df312 100644 --- a/upload/admin/index.php +++ b/upload/admin/index.php @@ -24,9 +24,6 @@ if( isset($_GET['pane']) && $_GET['pane'] == 'left' ) $template->assign_vars(array( 'TPL_ADMIN_NAVIGATE' => true, - - "L_FRAME_NO_SUPPORT" => $lang['IDX_BROWSER_NSP_FRAME'], - "U_FORUM_INDEX" => append_sid("../index.php"), "U_ADMIN_INDEX" => append_sid("index.php?pane=right")) ); @@ -52,7 +49,6 @@ if( isset($_GET['pane']) && $_GET['pane'] == 'left' ) $template->assign_block_vars("catrow.modulerow", array( "ROW_CLASS" => $row_class, - "ADMIN_MODULE" => $action, "U_ADMIN_MODULE" => append_sid($file)) ); @@ -64,10 +60,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' ) { $template->assign_vars(array( 'TPL_ADMIN_MAIN' => true, - - "L_LAST_UPDATE" => $lang['LAST_UPDATED'], - "L_DB_SIZE" => $lang['DATABASE_SIZE']) - ); + )); // // Get forum statistics @@ -97,11 +90,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' ) } @closedir($avatar_dir); - // - // This bit of code translates the avatar directory size into human readable format - // Borrowed the code from the PHP.net annoted manual, origanally written by: - // Jesse (jesse@jess.on.ca) - // + if($avatar_dir_size >= 1048576) { $avatar_dir_size = round($avatar_dir_size / 1048576 * 100) / 100 . " MB"; @@ -350,17 +339,10 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' ) "STARTED" => bb_date($onlinerow_guest[$i]['session_start'], 'H:i'), "LASTUPDATE" => bb_date($onlinerow_guest[$i]['session_time'], 'H:i'), "IP_ADDRESS" => $guest_ip, - "U_WHOIS_IP" => "http://ip-whois.net/ip_geo.php?ip=$guest_ip", )); } } - else - { - $template->assign_vars(array( - "L_NO_GUESTS_BROWSING" => $lang['NO_USERS_BROWSING']) - ); - } } else { diff --git a/upload/admin/xs_cache.php b/upload/admin/xs_cache.php index 5ae244c89..374bce819 100644 --- a/upload/admin/xs_cache.php +++ b/upload/admin/xs_cache.php @@ -1,28 +1,5 @@ 'none', # none, string, int (тип перевичного ключа для шардинга) 'shard_val' => 0, # для string - кол. начальных символов, для int - делитель (будет использован остаток от деления) ); - var $engine = 'SQLite DB'; + var $engine = 'SQLite'; var $dbh = null; var $connected = false; var $shard_val = false; @@ -1439,19 +1439,20 @@ function sql_dbg_enabled () function short_query ($sql, $esc_html = false) { - $max_len = 2500; - $sql = str_compact($sql); + $max_len = 100; + $sql = str_compact($sql); - if (empty($_COOKIE['sql_log_full'])) - { - if (strlen($sql) > $max_len) - { - $sql = substr($sql, 0, $max_len-500) .' [...cut...] '. substr($sql, -480); - } - } + if (empty($_COOKIE['sql_log_full'])) + { + if (mb_strlen($sql, 'UTF-8') > $max_len) + { + $sql = mb_substr($sql, 0, 50) .' [...cut...] '. mb_substr($sql, -50); + } + } - return ($esc_html) ? htmlCHR($sql, true) : $sql; + return ($esc_html) ? htmlCHR($sql, true) : $sql; } + // Functions function utime () { diff --git a/upload/config.php b/upload/config.php index a3469bbd8..3313db73f 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.0.2'; -$bb_cfg['tp_release_state'] = 'TP II r170'; +$bb_cfg['tp_release_state'] = 'TP II r171'; $bb_cfg['tp_release_date'] = '28-07-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger diff --git a/upload/language/lang_english/lang_admin.php b/upload/language/lang_english/lang_admin.php index d51b1f1f6..853085876 100644 --- a/upload/language/lang_english/lang_admin.php +++ b/upload/language/lang_english/lang_admin.php @@ -1,33 +1,5 @@ {L_ATTACH_SEARCH_QUERY} - {L_FILE_NAME}:
{L_SEARCH_WILDCARD_EXPLAIN} + {L_FILENAME}:
{L_SEARCH_WILDCARD_EXPLAIN} @@ -198,10 +198,10 @@ - - + + - + diff --git a/upload/templates/admin/admin_attachments.tpl b/upload/templates/admin/admin_attachments.tpl index 5d40bc57f..ae31bd864 100644 --- a/upload/templates/admin/admin_attachments.tpl +++ b/upload/templates/admin/admin_attachments.tpl @@ -2,9 +2,9 @@ -

{L_MANAGE_CAT_TITLE}

+

{L_MANAGE_CATEGORIES}

-

{L_MANAGE_CAT_EXPLAIN}

+

{L_MANAGE_CATEGORIES_EXPLAIN}


@@ -18,11 +18,11 @@ - + - + @@ -31,7 +31,7 @@ - + @@ -43,7 +43,7 @@ - +
#{L_FILE_NAME}{L_FILE_COMMENT_CP}{L_FILENAME}{L_FILE_COMMENT} {L_EXTENSION}{L_SIZE_IN_KB}{L_SIZE} {L_DOWNLOADS} {L_POST_TIME} {L_POSTED_IN_TOPIC}
{L_CREATE_THUMBNAIL}
{L_CREATE_THUMBNAIL_EXPLAIN}		{L_IMAGE_CREATE_THUMBNAIL}
{L_IMAGE_CREATE_THUMBNAIL_EXPLAIN}		 {L_YES}   {L_NO}
{L_MIN_THUMB_FILESIZE}
{L_MIN_THUMB_FILESIZE_EXPLAIN}		{L_IMAGE_MIN_THUMB_FILESIZE}
{L_IMAGE_MIN_THUMB_FILESIZE_EXPLAIN}		 {L_BYTES}
{L_IMAGICK_PATH}
{L_IMAGICK_PATH_EXPLAIN}		{L_IMAGE_IMAGICK_PATH}
{L_IMAGE_IMAGICK_PATH_EXPLAIN}
x
{S_HIDDEN_FIELDS}      {S_HIDDEN_FIELDS}      
@@ -54,30 +54,30 @@ -

{L_MANAGE_TITLE}

+

{L_ATTACH_SETTINGS}

-

{L_MANAGE_EXPLAIN}

+

{L_MANAGE_ATTACHMENTS_EXPLAIN}


- + - + - + - + - + - + - + @@ -119,7 +119,7 @@ - + @@ -130,14 +130,14 @@ - + - + @@ -146,18 +146,18 @@ - + - + - + - + @@ -165,21 +165,21 @@ - + - + - + - + @@ -194,7 +194,7 @@ -

{L_MANAGE_QUOTAS_TITLE}

+

{L_MANAGE_QUOTAS}

{L_MANAGE_QUOTAS_EXPLAIN}


@@ -202,7 +202,7 @@
{L_ATTACHMENT_SETTINGS}{L_ATTACH_SETTINGS}
{L_UPLOAD_DIR}
{L_UPLOAD_DIR_EXPLAIN}		{L_UPLOAD_DIRECTORY}
{L_UPLOAD_DIRECTORY_EXPLAIN}
{L_ATTACHMENT_IMG_PATH}
{L_IMG_PATH_EXPLAIN}		{L_ATTACH_IMG_PATH}
{L_ATTACH_IMG_PATH_EXPLAIN}
{L_ATTACHMENT_TOPIC_ICON}
{L_TOPIC_ICON_EXPLAIN}		{L_ATTACH_TOPIC_ICON}
{L_ATTACH_TOPIC_ICON_EXPLAIN}
{L_DISPLAY_ORDER}
{L_DISPLAY_ORDER_EXPLAIN}		{L_ATTACH_DISPLAY_ORDER}
{L_ATTACH_DISPLAY_ORDER_EXPLAIN}		 @@ -89,10 +89,10 @@
{L_ATTACHMENT_FILESIZE_SETTINGS}{L_ATTACH_FILESIZE_SETTINGS}
{L_MAX_FILESIZE}
{L_MAX_FILESIZE_EXPLAIN}		{L_MAX_FILESIZE_ATTACH}
{L_MAX_FILESIZE_ATTACH_EXPLAIN}		 {S_FILESIZE}
{L_ATTACHMENT_NUMBER_SETTINGS}{L_ATTACH_NUMBER_SETTINGS}
{L_MAX_ATTACHMENTS}
{L_MAX_ATTACHMENTS_EXPLAIN}
{L_ATTACHMENT_OPTIONS_SETTINGS}{L_ATTACH_OPTIONS_SETTINGS}
{L_DISABLE_MOD}
{L_DISABLE_MOD_EXPLAIN}		 {L_YES}   {L_NO}
{L_PM_ATTACH}
{L_PM_ATTACH_EXPLAIN}		{L_PM_ATTACHMENTS}
{L_PM_ATTACHMENTS_EXPLAIN}		 {L_YES}   {L_NO}
{L_YES}   {L_NO}
{L_ATTACHMENT_FTP_SETTINGS}{L_FTP_INFO}
{L_ATTACHMENT_FTP_SERVER}
{L_ATTACHMENT_FTP_SERVER_EXPLAIN}		{L_FTP_SERVER}
{L_FTP_SERVER_EXPLAIN}
{L_ATTACHMENT_FTP_PATH}
{L_ATTACHMENT_FTP_PATH_EXPLAIN}		{L_ATTACH_FTP_PATH}
{L_ATTACH_FTP_PATH_EXPLAIN}
{L_DOWNLOAD_PATH}
{L_DOWNLOAD_PATH_EXPLAIN}		{L_FTP_DOWNLOAD_PATH}
{L_FTP_DOWNLOAD_PATH_EXPLAIN}
{L_YES}   {L_NO}
{L_ATTACHMENT_FTP_USER}{L_FTP_USERNAME}
{L_ATTACHMENT_FTP_PASS}{L_FTP_PASSWORD}
{L_ATTACHMENT_FTP_SETTINGS}{L_FTP_INFO}
{L_NO_FTP_EXTENSIONS}{L_NO_FTP_EXTENSIONS_INSTALLED}
- diff --git a/upload/templates/admin/admin_bt_tracker_cfg.tpl b/upload/templates/admin/admin_bt_tracker_cfg.tpl index 073bc6dda..8f8e4e940 100644 --- a/upload/templates/admin/admin_bt_tracker_cfg.tpl +++ b/upload/templates/admin/admin_bt_tracker_cfg.tpl @@ -1,4 +1,4 @@ -

{L_CONFIGURATION_TITLE}

+

{L_TRACKER_CFG_TITLE}

diff --git a/upload/templates/admin/admin_disallow.tpl b/upload/templates/admin/admin_disallow.tpl index 0622d6419..308c7db19 100644 --- a/upload/templates/admin/admin_disallow.tpl +++ b/upload/templates/admin/admin_disallow.tpl @@ -1,5 +1,5 @@ -

{L_DISALLOW_TITLE}

+

{L_DISALLOW_CONTROL}

{L_DISALLOW_EXPLAIN}


@@ -10,17 +10,17 @@ - + - - + + - + - + diff --git a/upload/templates/admin/admin_extensions.tpl b/upload/templates/admin/admin_extensions.tpl index 7f5a20023..3d056273f 100644 --- a/upload/templates/admin/admin_extensions.tpl +++ b/upload/templates/admin/admin_extensions.tpl @@ -2,15 +2,15 @@ -

{L_EXTENSIONS_TITLE}

+

{L_MANAGE_EXTENSIONS}

-

{L_EXTENSIONS_EXPLAIN}

+

{L_MANAGE_EXTENSIONS_EXPLAIN}


{L_MANAGE_QUOTAS_TITLE} + {L_MANAGE_QUOTAS}
{L_ADD_DISALLOW}{L_ADD_DISALLOW_TITLE}

{L_USERNAME}

{L_ADD_EXPLAIN}
 

{L_USERNAME}

{L_ADD_DISALLOW_EXPLAIN}
 
{L_DELETE_DISALLOW}{L_DELETE_DISALLOW_TITLE}

{L_USERNAME}

{L_DELETE_EXPLAIN}

{L_USERNAME}

{L_DELETE_DISALLOW_EXPLAIN}
 {S_DISALLOW_SELECT} 
- @@ -60,15 +60,15 @@ {GROUP_PERMISSIONS_BOX} -

{L_EXTENSION_GROUPS_TITLE}

+

{L_MANAGE_EXTENSION_GROUPS}

-

{L_EXTENSION_GROUPS_EXPLAIN}

+

{L_MANAGE_EXTENSION_GROUPS_EXPLAIN}


{L_EXTENSIONS_TITLE} + {L_MANAGE_EXTENSIONS}
- @@ -107,7 +107,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/upload/templates/admin/admin_forum_prune.tpl b/upload/templates/admin/admin_forum_prune.tpl index f00b4e64c..92e1b2178 100644 --- a/upload/templates/admin/admin_forum_prune.tpl +++ b/upload/templates/admin/admin_forum_prune.tpl @@ -2,7 +2,7 @@

{L_FORUM_PRUNE}

-

{L_PRUNE_EXPLAIN}

+

{L_FORUM_PRUNE_EXPLAIN}

@@ -26,7 +26,7 @@ - + @@ -37,7 +37,7 @@ diff --git a/upload/templates/admin/admin_forumauth.tpl b/upload/templates/admin/admin_forumauth.tpl index 3ba6e9117..04c474383 100644 --- a/upload/templates/admin/admin_forumauth.tpl +++ b/upload/templates/admin/admin_forumauth.tpl @@ -1,6 +1,6 @@ -

{L_AUTH_TITLE}

+

{L_AUTH_CONTROL_FORUM}

-

{L_AUTH_EXPLAIN}

+

{L_FORUM_AUTH_EXPLAIN}


@@ -13,7 +13,7 @@
{L_EXTENSION_GROUPS_TITLE} + {L_MANAGE_EXTENSION_GROUPS}
 {L_ALLOWED}   {L_DOWNLOAD_MODE}   {L_UPLOAD_ICON}  {L_MAX_FILESIZE}  {L_MAX_GROUPS_FILESIZE}   {L_ALLOWED_FORUMS}   {L_DELETE} 
{grouprow.S_DOWNLOAD_MODE} {grouprow.S_FILESIZE}{L_FORUM_PERMISSIONS}{L_EXT_GROUP_PERMISSIONS}
{L_PRUNE_RESULT}{L_PRUNE_SUCCESSf}
-

{L_PRUNE_TOPICS} {L_DAYS}

+

{L_PRUNE_TOPICS_NOT_POSTED} {L_DAYS}
- + - + diff --git a/upload/templates/admin/admin_forumauth_list.tpl b/upload/templates/admin/admin_forumauth_list.tpl index 55404bd40..73abfdd5c 100644 --- a/upload/templates/admin/admin_forumauth_list.tpl +++ b/upload/templates/admin/admin_forumauth_list.tpl @@ -2,9 +2,9 @@ -

{L_AUTH_TITLE}

+

{L_AUTH_CONTROL_CATEGORY}

-

{L_AUTH_EXPLAIN}

+

{L_FORUM_AUTH_LIST_EXPLAIN}


{L_AUTH_SELECT}{L_SELECT_A_FORUM}
@@ -41,7 +41,7 @@
{L_AUTH_TITLE}{L_AUTH_CONTROL_FORUM}
@@ -36,9 +36,9 @@ -

{L_AUTH_TITLE}

+

{L_PERMISSIONS_LIST}

-

{L_AUTH_EXPLAIN}

+

{L_CAT_AUTH_LIST_EXPLAIN}

{L_CATEGORY} : {CAT_NAME}

diff --git a/upload/templates/admin/admin_forums.tpl b/upload/templates/admin/admin_forums.tpl index a5b1a898c..4e4bc8988 100644 --- a/upload/templates/admin/admin_forums.tpl +++ b/upload/templates/admin/admin_forums.tpl @@ -19,7 +19,7 @@ function toggle_cat_list (val)

{L_FORUM_TITLE}

-

{L_FORUM_EXPLAIN}

+

{L_FORUM_EDIT_DELETE_EXPLAIN}


@@ -35,11 +35,11 @@ function toggle_cat_list (val) - + - + @@ -47,7 +47,7 @@ function toggle_cat_list (val) - + @@ -55,7 +55,7 @@ function toggle_cat_list (val) - + - + @@ -237,7 +237,7 @@ function updateButton() - + diff --git a/upload/templates/admin/admin_smilies.tpl b/upload/templates/admin/admin_smilies.tpl index c169cc996..93d04c62e 100644 --- a/upload/templates/admin/admin_smilies.tpl +++ b/upload/templates/admin/admin_smilies.tpl @@ -4,7 +4,7 @@

{L_SMILEY_TITLE}

-

{L_SMILEY_TEXT}

+

{L_SMILE_DESC}


@@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - +
{L_FORUM_DESCRIPTION}{L_FORUM_DESC}
{L_PARENT_FORUM}{L_SF_PARENT_FORUM}
{L_SHOW_ON_INDEX}{L_SF_SHOW_ON_INDEX}
{L_AUTO_PRUNE}{L_FORUM_PRUNING} @@ -87,9 +87,9 @@ function toggle_cat_list (val) -

{L_EDIT_CAT}

+

{L_EDIT_CATEGORY}

-

{L_EDIT_CAT_EXPL}

+

{L_EDIT_CATEGORY_EXPLAIN}


@@ -99,7 +99,7 @@ function toggle_cat_list (val)
- + - + diff --git a/upload/templates/admin/admin_ranks.tpl b/upload/templates/admin/admin_ranks.tpl index 5179eea84..090bddbbd 100644 --- a/upload/templates/admin/admin_ranks.tpl +++ b/upload/templates/admin/admin_ranks.tpl @@ -4,7 +4,7 @@

{L_RANKS_TITLE}

-

{L_RANKS_TEXT}

+

{L_RANKS_EXPLAIN}


@@ -50,15 +50,15 @@

{L_RANKS_TITLE}

-

{L_RANKS_TEXT}

+

{L_RANKS_EXPLAIN}


{L_EDIT_CAT}{L_EDIT_CATEGORY}
@@ -120,7 +120,7 @@ function toggle_cat_list (val)

{DELETE_TITLE}

-

{L_DELETE_EXPL}

+

{L_FORUM_DELETE_EXPLAIN}


@@ -177,7 +177,7 @@ function hl (id, on)

{L_FORUM_TITLE}

-

{L_FORUM_EXPLAIN}

+

{L_FORUM_EDIT_DELETE_EXPLAIN}


diff --git a/upload/templates/admin/admin_mass_email.tpl b/upload/templates/admin/admin_mass_email.tpl index a7d9f0154..ebfd50ddf 100644 --- a/upload/templates/admin/admin_mass_email.tpl +++ b/upload/templates/admin/admin_mass_email.tpl @@ -1,7 +1,7 @@

{L_EMAIL}

-

{L_EMAIL_EXPLAIN}

+

{L_MASS_EMAIL_EXPLAIN}


@@ -15,7 +15,7 @@ 		{S_GROUP_SELECT}
{L_EMAIL_SUBJECT}{L_SUBJECT}
- - + + @@ -72,7 +72,7 @@
{L_RANK}Image{L_RANK_TITLE}{L_RANK_IMAGE} {L_EDIT} {L_DELETE}
- +
diff --git a/upload/templates/admin/admin_rebuild_search.tpl b/upload/templates/admin/admin_rebuild_search.tpl index 2768fd3ca..dc1261acc 100644 --- a/upload/templates/admin/admin_rebuild_search.tpl +++ b/upload/templates/admin/admin_rebuild_search.tpl @@ -204,7 +204,7 @@ function updateButton()
{L_TIME_LAST_POSTS_ADMIN}  {LAST_CYCLE_TIME}{L_TIME_BEGINNING} {L_TIME_FROM_THE_BEGINNING}  {SESSION_TIME}
{L_ESTIMATED_VALUES}{L_INFO_ESTIMATED_VALUES}
{L_CODE} {L_SMILE}{L_EMOT}{L_EMOTION} {L_ACTION}
        
@@ -41,7 +41,7 @@

{L_SMILEY_TITLE}

-

{L_SMILEY_EXPLAIN}

+

{L_SMILEY_IMPORT_INST}