diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index 24ecc3dee..09e198e25 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -3,7 +3,8 @@ // ACP Header - START if (!empty($setmodules)) { - $module['General']['Configuration'] = basename(__FILE__); + $module['General']['Configuration'] = basename(__FILE__) .'?mode=config';; + $module['Mods']['Configuration'] = basename(__FILE__) .'?mode=config_mods';; return; } require('./pagestart.php'); @@ -11,6 +12,14 @@ require('./pagestart.php'); require(INC_DIR .'functions_selects.php'); +$mode = isset($_GET['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'], '', '') +); + // // Pull all config data // @@ -44,76 +53,112 @@ else bb_update_config(array($config_name => $new[$config_name])); } } - + if( isset($_POST['submit']) ) { - $message = $lang['CONFIG_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_CONFIG'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); - - message_die(GENERAL_MESSAGE, $message); - } + if ($mode == 'config') + { + message_die(GENERAL_MESSAGE, $lang['CONFIG_UPDATED'] . $return_links['config'] . $return_links['index']); + } + elseif ($mode == 'config_mods') + { + message_die(GENERAL_MESSAGE, $lang['CONFIG_UPDATED'] . $return_links['config_mods'] . $return_links['index']); + } + } } -// -// Escape any quotes in the site description for proper display in the text -// box on the admin page -// - -$template->assign_vars(array( - 'S_CONFIG_ACTION' => append_sid('admin_board.php'), - - 'SITENAME' => htmlCHR($new['sitename']), - 'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']), - 'DISABLE_BOARD' => ($new['board_disable']) ? true : false, +switch($mode) +{ + case 'config_mods': + $template->assign_vars(array( + 'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config_mods'), + 'CONFIG_MODS' => true, + + 'REPORTS_ENABLED' => $new['reports_enabled'], + 'GOLD_SILVER_ENABLED' => $new['gold_silver_enabled'], + 'GALLERY_ENABLED' => $new['gallery_enabled'], + 'PIC_DIR' => $new['pic_dir'], + 'PIC_MAX_SIZE' => $new['pic_max_size'], + 'AUTO_DELETE_POSTED_PICS' => $new['auto_delete_posted_pics'], + 'MAGNET_LINKS_ENABLED' => $new['magnet_links_enabled'], + 'GENDER' => $new['gender'], + 'CALLSEED' => $new['callseed'], + 'TOR_STATS' => $new['tor_stats'], + 'SHOW_LATEST_NEWS' => $new['show_latest_news'], + 'MAX_NEWS_TITLE' => $new['max_news_title'], + 'LATEST_NEWS_COUNT' => $new['latest_news_count'], + 'LATEST_NEWS_FORUM_ID' => $new['latest_news_forum_id'], + 'SHOW_NETWORK_NEWS' => $new['show_network_news'], + 'MAX_NET_TITLE' => $new['max_net_title'], + 'NETWORK_NEWS_COUNT' => $new['network_news_count'], + 'NETWORK_NEWS_FORUM_ID' => $new['network_news_forum_id'], + 'WHOIS_INFO' => $new['whois_info'], + )); + break; - 'ACTIVATION_NONE' => USER_ACTIVATION_NONE, - 'ACTIVATION_NONE_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : '', - 'ACTIVATION_USER' => USER_ACTIVATION_SELF, - 'ACTIVATION_USER_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : '', - 'ACTIVATION_ADMIN' => USER_ACTIVATION_ADMIN, - 'ACTIVATION_ADMIN_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : '', + default: + //case 'config': + $template->assign_vars(array( + 'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config'), + 'CONFIG' => true, + + 'SITENAME' => htmlCHR($new['sitename']), + 'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']), + 'DISABLE_BOARD' => ($new['board_disable']) ? true : false, - 'VISUAL_CONFIRM' => ($new['enable_confirm']) ? true : false, - 'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false, - 'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'], - 'BOARD_EMAIL_FORM' => ($new['board_email_form']) ? true : false, - 'MAX_POLL_OPTIONS' => $new['max_poll_options'], - 'FLOOD_INTERVAL' => $new['flood_interval'], - 'TOPICS_PER_PAGE' => $new['topics_per_page'], - 'POSTS_PER_PAGE' => $new['posts_per_page'], - 'HOT_TOPIC' => $new['hot_threshold'], - 'LANG_SELECT' => language_select($new['default_lang'], 'default_lang', 'language'), - 'DEFAULT_DATEFORMAT' => $new['default_dateformat'], - 'TIMEZONE_SELECT' => tz_select($new['board_timezone'], 'board_timezone'), - 'PRIVMSG_DISABLE' => ($new['privmsg_disable']) ? false : true, - 'INBOX_LIMIT' => $new['max_inbox_privmsgs'], - 'SENTBOX_LIMIT' => $new['max_sentbox_privmsgs'], - 'SAVEBOX_LIMIT' => $new['max_savebox_privmsgs'], - 'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'], - 'LOGIN_RESET_TIME' => $new['login_reset_time'], - 'PRUNE_ENABLE' => ($new['prune_enable']) ? true : false, - 'ALLOW_BBCODE' => ($new['allow_bbcode']) ? true : false, - 'ALLOW_SMILIES' => ($new['allow_smilies']) ? true : false, - 'ALLOW_SIG' => ($new['allow_sig']) ? true : false, - 'SIG_SIZE' => $new['max_sig_chars'], - 'ALLOW_NAMECHANGE' => ($new['allow_namechange']) ? true : false, - 'ALLOW_AVATARS_LOCAL' => ($new['allow_avatar_local']) ? true : false, - 'ALLOW_AVATAR_REMOTE' => ($new['allow_avatar_remote']) ? true : false, - 'ALLOW_AVATAR_UPLOAD' => ($new['allow_avatar_upload']) ? true : false, - 'AVATAR_FILESIZE' => $new['avatar_filesize'], - 'AVATAR_MAX_HEIGHT' => $new['avatar_max_height'], - 'AVATAR_MAX_WIDTH' => $new['avatar_max_width'], - 'AVATAR_PATH' => $new['avatar_path'], - 'AVATAR_GALLERY_PATH' => $new['avatar_gallery_path'], - 'SMILIES_PATH' => $new['smilies_path'], - 'INBOX_PRIVMSGS' => $new['max_inbox_privmsgs'], - 'SENTBOX_PRIVMSGS' => $new['max_sentbox_privmsgs'], - 'SAVEBOX_PRIVMSGS' => $new['max_savebox_privmsgs'], - 'EMAIL_FROM' => $new['board_email'], - 'EMAIL_SIG' => $new['board_email_sig'], - 'SMTP_DELIVERY' => ($new['smtp_delivery']) ? true : false, - 'SMTP_HOST' => $new['smtp_host'], - 'SMTP_USERNAME' => $new['smtp_username'], - 'SMTP_PASSWORD' => $new['smtp_password'], -)); - -print_page('admin_board.tpl', 'admin'); \ No newline at end of file + 'ACTIVATION_NONE' => USER_ACTIVATION_NONE, + 'ACTIVATION_NONE_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : '', + 'ACTIVATION_USER' => USER_ACTIVATION_SELF, + 'ACTIVATION_USER_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : '', + 'ACTIVATION_ADMIN' => USER_ACTIVATION_ADMIN, + 'ACTIVATION_ADMIN_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : '', + + 'VISUAL_CONFIRM' => ($new['enable_confirm']) ? true : false, + 'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false, + 'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'], + 'BOARD_EMAIL_FORM' => ($new['board_email_form']) ? true : false, + 'MAX_POLL_OPTIONS' => $new['max_poll_options'], + 'FLOOD_INTERVAL' => $new['flood_interval'], + 'TOPICS_PER_PAGE' => $new['topics_per_page'], + 'POSTS_PER_PAGE' => $new['posts_per_page'], + 'HOT_TOPIC' => $new['hot_threshold'], + 'LANG_SELECT' => language_select($new['default_lang'], 'default_lang', 'language'), + 'DEFAULT_DATEFORMAT' => $new['default_dateformat'], + 'TIMEZONE_SELECT' => tz_select($new['board_timezone'], 'board_timezone'), + 'PRIVMSG_DISABLE' => ($new['privmsg_disable']) ? false : true, + 'INBOX_LIMIT' => $new['max_inbox_privmsgs'], + 'SENTBOX_LIMIT' => $new['max_sentbox_privmsgs'], + 'SAVEBOX_LIMIT' => $new['max_savebox_privmsgs'], + 'MAX_LOGIN_ATTEMPTS' => $new['max_login_attempts'], + 'LOGIN_RESET_TIME' => $new['login_reset_time'], + 'PRUNE_ENABLE' => ($new['prune_enable']) ? true : false, + 'ALLOW_BBCODE' => ($new['allow_bbcode']) ? true : false, + 'ALLOW_SMILIES' => ($new['allow_smilies']) ? true : false, + 'ALLOW_SIG' => ($new['allow_sig']) ? true : false, + 'SIG_SIZE' => $new['max_sig_chars'], + 'ALLOW_NAMECHANGE' => ($new['allow_namechange']) ? true : false, + 'ALLOW_AVATARS_LOCAL' => ($new['allow_avatar_local']) ? true : false, + 'ALLOW_AVATAR_REMOTE' => ($new['allow_avatar_remote']) ? true : false, + 'ALLOW_AVATAR_UPLOAD' => ($new['allow_avatar_upload']) ? true : false, + 'AVATAR_FILESIZE' => $new['avatar_filesize'], + 'AVATAR_MAX_HEIGHT' => $new['avatar_max_height'], + 'AVATAR_MAX_WIDTH' => $new['avatar_max_width'], + 'AVATAR_PATH' => $new['avatar_path'], + 'AVATAR_GALLERY_PATH' => $new['avatar_gallery_path'], + 'NO_AVATAR' => $new['no_avatar'], + 'SMILIES_PATH' => $new['smilies_path'], + 'INBOX_PRIVMSGS' => $new['max_inbox_privmsgs'], + 'SENTBOX_PRIVMSGS' => $new['max_sentbox_privmsgs'], + 'SAVEBOX_PRIVMSGS' => $new['max_savebox_privmsgs'], + 'EMAIL_FROM' => $new['board_email'], + 'EMAIL_SIG' => $new['board_email_sig'], + 'SMTP_DELIVERY' => ($new['smtp_delivery']) ? true : false, + 'SMTP_HOST' => $new['smtp_host'], + 'SMTP_USERNAME' => $new['smtp_username'], + 'SMTP_PASSWORD' => $new['smtp_password'], + )); + break; +} + +print_page('admin_board.tpl', 'admin'); + \ No newline at end of file diff --git a/upload/admin/admin_reports.php b/upload/admin/admin_reports.php index dad71176c..ca408da11 100644 --- a/upload/admin/admin_reports.php +++ b/upload/admin/admin_reports.php @@ -2,26 +2,25 @@ if (!empty($setmodules)) { - $file = basename(__FILE__); if($bb_cfg['reports_enabled']){ - $module['Reports']['Modules_reasons'] = $file; - $module['Reports']['Configuration'] = "$file?mode=config";} + $module['Mods']['REPORTS'] = basename(__FILE__) .'?mode=config';} return; } -require("./pagestart.php"); -require(INC_DIR . "functions_report.php"); -require(INC_DIR . "functions_report_admin.php"); +require('./pagestart.php'); + +require(INC_DIR . 'functions_report.php'); +require(INC_DIR . 'functions_report_admin.php'); $return_links = array( - 'index' => '

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

' . sprintf($lang['CLICK_RETURN_REPORT_CONFIG'], '', ''), - 'admin' => '

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

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

'. sprintf($lang['CLICK_RETURN_REPORT_CONFIG'], '', ''), + 'admin' => '

'. sprintf($lang['CLICK_RETURN_REPORT_ADMIN'], '', '') ); -$redirect_url = append_sid("admin/admin_reports.php", true); +$redirect_url = append_sid('admin/admin_reports.php', true); -$template->assign_var('S_REPORT_ACTION', append_sid("admin_reports.php")); +$template->assign_var('S_REPORT_ACTION', append_sid('admin_reports.php')); if (isset($_POST['mode']) || isset($_GET['mode'])) { @@ -80,7 +79,7 @@ if ($mode == 'config') 'L_CONFIGURATION_TITLE' => $lang['REPORTS'] . ': ' . $lang['CONFIGURATION']) ); - print_page('report_config_body.tpl'); + print_page('report_config_body.tpl', 'admin'); } } else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) @@ -138,7 +137,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) report_auth_select('auth_notify', $report_module->data['auth_notify']); report_auth_select('auth_delete', $report_module->data['auth_delete'], array(REPORT_AUTH_MOD, REPORT_AUTH_CONFIRM, REPORT_AUTH_ADMIN)); - print_page('report_module_edit_body.tpl'); + print_page('report_module_edit_body.tpl', 'admin'); break; // @@ -150,7 +149,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) $temp_url = append_sid("admin_reports.php?mode=reasons&" . POST_CAT_URL . "=$module_id"); $return_links['reasons'] = '

' . sprintf($lang['CLICK_RETURN_REPORT_REASONS'], '', ''); - $redirect_url = append_sid("admin/admin_reports.php?mode=reasons&" . POST_CAT_URL . "=$module_id", true); + $redirect_url = append_sid('admin/admin_reports.php?mode=reasons&' . POST_CAT_URL . "=$module_id", true); if (isset($_POST[POST_REPORT_REASON_URL]) || isset($_GET[POST_REPORT_REASON_URL])) { @@ -222,7 +221,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) 'REASON_DESC' => $report_reason['report_reason_desc']) ); - print_page('report_reason_edit_body.tpl'); + print_page('report_reason_edit_body.tpl', 'admin'); break; // @@ -324,7 +323,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) 'REASON_DESC' => (isset($reason_desc)) ? stripslashes($reason_desc) : '') ); - print_page('report_reason_edit_body.tpl'); + print_page('report_reason_edit_body.tpl', 'admin'); break; case '': @@ -336,10 +335,10 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) $template->assign_block_vars('report_reasons', array( 'DESC' => $reason_desc, - 'U_EDIT' => append_sid("admin_reports.php?mode[]=reasons&" . POST_CAT_URL . "=$module_id&mode[]=edit&" . POST_REPORT_REASON_URL . "=$reason_id"), - 'U_MOVE_UP' => append_sid("admin_reports.php?mode[]=reasons&" . POST_CAT_URL . "=$module_id&mode[]=up&" . POST_REPORT_REASON_URL . "=$reason_id"), - 'U_MOVE_DOWN' => append_sid("admin_reports.php?mode[]=reasons&" . POST_CAT_URL . "=$module_id&mode[]=down&" . POST_REPORT_REASON_URL . "=$reason_id"), - 'U_DELETE' => append_sid("admin_reports.php?mode[]=reasons&" . POST_CAT_URL . "=$module_id&mode[]=delete&" . POST_REPORT_REASON_URL . "=$reason_id")) + 'U_EDIT' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=edit&" . POST_REPORT_REASON_URL . "=$reason_id"), + 'U_MOVE_UP' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=up&" . POST_REPORT_REASON_URL . "=$reason_id"), + 'U_MOVE_DOWN' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=down&" . POST_REPORT_REASON_URL . "=$reason_id"), + 'U_DELETE' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=delete&" . POST_REPORT_REASON_URL . "=$reason_id")) ); } } @@ -349,11 +348,11 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) } $template->assign_vars(array( - 'U_ADD_REASON' => append_sid("admin_reports.php?mode[]=reasons&" . POST_CAT_URL . "=$module_id&mode[]=add"), - 'U_MODULES' => append_sid("admin_reports.php")) - ); + 'U_ADD_REASON' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=add"), + 'U_MODULES' => append_sid('admin_reports.php') + )); - print_page('report_module_reasons_body.tpl'); + print_page('report_module_reasons_body.tpl', 'admin'); break; default: @@ -407,7 +406,7 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) print_confirmation(array( 'CONFIRM_TITLE' => $lang['UNINSTALL_REPORT_MODULE'], 'QUESTION' => $lang['UNINSTALL_REPORT_MODULE_EXPLAIN'], - 'FORM_ACTION' => "admin_reports.php", + 'FORM_ACTION' => 'admin_reports.php', 'HIDDEN_FIELDS' => $hidden_fields, )); break; @@ -473,7 +472,7 @@ else if (isset($_POST['module']) || isset($_GET['module'])) report_auth_select('auth_notify', REPORT_AUTH_MOD); report_auth_select('auth_delete', REPORT_AUTH_CONFIRM, array(REPORT_AUTH_MOD, REPORT_AUTH_CONFIRM, REPORT_AUTH_ADMIN)); - print_page('report_module_edit_body.tpl'); + print_page('report_module_edit_body.tpl', 'admin'); break; default: @@ -511,12 +510,12 @@ else 'MODULE_EXPLAIN' => $module_info['explain'], 'REPORT_COUNT' => $report_counts[$report_module->id], - 'U_EDIT' => append_sid("admin_reports.php?mode=edit&" . POST_CAT_URL . '=' . $report_module->id), - 'U_REASONS' => append_sid("admin_reports.php?mode=reasons&" . POST_CAT_URL . '=' . $report_module->id), - 'U_MOVE_UP' => append_sid("admin_reports.php?mode=up&" . POST_CAT_URL . '=' . $report_module->id), - 'U_MOVE_DOWN' => append_sid("admin_reports.php?mode=down&" . POST_CAT_URL . '=' . $report_module->id), - 'U_SYNC' => append_sid("admin_reports.php?mode=sync&" . POST_CAT_URL . '=' . $report_module->id), - 'U_UNINSTALL' => append_sid("admin_reports.php?mode=uninstall&" . POST_CAT_URL . '=' . $report_module->id)) + 'U_EDIT' => append_sid('admin_reports.php?mode=edit&' . POST_CAT_URL . '=' . $report_module->id), + 'U_REASONS' => append_sid('admin_reports.php?mode=reasons&' . POST_CAT_URL . '=' . $report_module->id), + 'U_MOVE_UP' => append_sid('admin_reports.php?mode=up&' . POST_CAT_URL . '=' . $report_module->id), + 'U_MOVE_DOWN' => append_sid('admin_reports.php?mode=down&' . POST_CAT_URL . '=' . $report_module->id), + 'U_SYNC' => append_sid('admin_reports.php?mode=sync&' . POST_CAT_URL . '=' . $report_module->id), + 'U_UNINSTALL' => append_sid('admin_reports.php?mode=uninstall&' . POST_CAT_URL . '=' . $report_module->id)) ); // @@ -549,7 +548,7 @@ else 'MODULE_EXPLAIN' => $module_info['explain'], 'REPORT_COUNT' => '-', - 'U_INSTALL' => append_sid("admin_reports.php?mode=install&module=" . $report_module->data['module_name'])) + 'U_INSTALL' => append_sid('admin_reports.php?mode=install&module=' . $report_module->data['module_name'])) ); } @@ -558,7 +557,7 @@ else $template->assign_block_vars('inactive_modules.switch_no_modules', array()); } - print_page('report_modules_body.tpl'); + print_page('report_modules_body.tpl', 'admin'); break; default: diff --git a/upload/admin/admin_topic_templates.php b/upload/admin/admin_topic_templates.php index 412203bfd..17a7b387e 100644 --- a/upload/admin/admin_topic_templates.php +++ b/upload/admin/admin_topic_templates.php @@ -3,7 +3,7 @@ // ACP Header - START if (!empty($setmodules)) { - $module['TorrentPier']['Release_Templates'] = basename(__FILE__); + $module['Mods']['Release_Templates'] = basename(__FILE__); return; } require('./pagestart.php'); diff --git a/upload/config.php b/upload/config.php index d3e4fd6c6..f2ef42cb1 100644 --- a/upload/config.php +++ b/upload/config.php @@ -63,8 +63,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.4 (beta)'; -$bb_cfg['tp_release_state'] = 'R346'; -$bb_cfg['tp_release_date'] = '01-02-2012'; +$bb_cfg['tp_release_state'] = 'R347'; +$bb_cfg['tp_release_date'] = '02-02-2012'; // Database $charset = 'utf8'; @@ -537,49 +537,8 @@ $bb_cfg['captcha'] = array( 'img_path' => BB_PATH .'/images/captcha/', # without '/' ); -// Advanced Report Hack -$bb_cfg['reports_enabled'] = true; - -// Gold/Silver releases -$bb_cfg['gold_silver_enabled'] = true; - -// Gallery -$bb_cfg['gallery_enabled'] = true; -$bb_cfg['pic_dir'] = 'pictures/'; -$bb_cfg['pic_max_size'] = 3*1024*1024; // 3 MB -$bb_cfg['auto_delete_posted_pics'] = true; // Delete pictures while delete post? - -// Magnet links -$bb_cfg['magnet_links_enabled'] = true; - -// No avatar -$bb_cfg['no_avatar'] = 'images/avatars/gallery/noavatar.png'; - // Birthday $bb_cfg['birthday']['enabled'] = true; $bb_cfg['birthday']['max_user_age'] = 99; $bb_cfg['birthday']['min_user_age'] = 10; $bb_cfg['birthday']['check_day'] = 7; - -// Gender -$bb_cfg['gender'] = true; - -// CallSeed -$bb_cfg['callseed'] = false; - -// Tracker stats -$bb_cfg['tor_stats'] = true; - -// News -$bb_cfg['show_latest_news'] = true; -$bb_cfg['max_news_title'] = 50; -$bb_cfg['latest_news_count'] = 5; -$bb_cfg['latest_news_forum_id'] = '1'; // (string) 1,2,3... - -// Network News -$bb_cfg['show_network_news'] = true; -$bb_cfg['max_net_title'] = 50; -$bb_cfg['network_news_count'] = 5; -$bb_cfg['network_news_forum_id'] = '2'; // (string) 1,2,3... - -$bb_cfg['whois_info'] = 'http://ip-whois.net/ip_geo.php?ip='; \ No newline at end of file diff --git a/upload/language/lang_english/lang_admin.php b/upload/language/lang_english/lang_admin.php index 6622a053b..ff64f3c1d 100644 --- a/upload/language/lang_english/lang_admin.php +++ b/upload/language/lang_english/lang_admin.php @@ -4,6 +4,8 @@ $lang['GENERAL'] = 'General Admin'; $lang['USERS'] = 'User Admin'; $lang['GROUPS'] = 'Group Admin'; $lang['FORUMS'] = 'Forum Admin'; +$lang['MODS'] = 'Modifications'; +$lang['TORRENTPIER'] = 'Product configuration'; $lang['CONFIGURATION'] = 'Configuration'; $lang['PERMISSIONS'] = 'Permissions'; @@ -213,7 +215,11 @@ $lang['CLICK_RETURN_BANADMIN'] = 'Click %sHere%s to return to Ban Control'; $lang['GENERAL_CONFIG'] = 'General Configuration'; $lang['CONFIG_EXPLAIN'] = 'The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side.'; -$lang['CLICK_RETURN_CONFIG'] = 'Click %sHere%s to return to General Configuration'; +$lang['CONFIG_MODS'] = 'Configuration modifications'; +$lang['MODS_EXPLAIN'] = 'This form allows you to adjust the modifications'; + +$lang['CLICK_RETURN_CONFIG'] = '%sClick Here to return to General Configuration%s'; +$lang['CLICK_RETURN_CONFIG_MODS'] = '%sBack to the settings modifications%s'; $lang['GENERAL_SETTINGS'] = 'General Board Settings'; $lang['SITE_NAME'] = 'Site name'; @@ -580,6 +586,7 @@ $lang['TEMPLATE'] = 'Template'; // // Reports (need to translate!) // +$lang['REPORT'] = 'Reports'; $lang['REPORT_CONFIG_EXPLAIN'] = 'On this page you can change the general configuration of the report feature.'; $lang['REPORT_SUBJECT_AUTH'] = 'Individual permissions'; $lang['REPORT_SUBJECT_AUTH_EXPLAIN'] = 'If this setting is enabled, moderators can only view reports they can edit. For example a post report will be hidden if the user isn\'t a moderator of the forum the post belongs to.'; @@ -649,3 +656,11 @@ $lang['REPORTS'] = 'Reports'; // Reports [END] // +// +// Mods +// +$lang['MAX_NEWS_TITLE'] = 'Max. length of the news'; +$lang['NEWS_COUNT'] = 'How many news show'; +$lang['NEWS_FORUM_ID'] = 'From what forums to display
Of the several forums raises, separated by commas. Example 1,2,3
'; +$lang['NOAVATAR'] = 'No avatar'; +$lang['WHOIS_INFO'] = 'Information about IP address'; diff --git a/upload/language/lang_russian/lang_admin.php b/upload/language/lang_russian/lang_admin.php index 357ab7a5c..3c9dc9ec9 100644 --- a/upload/language/lang_russian/lang_admin.php +++ b/upload/language/lang_russian/lang_admin.php @@ -4,6 +4,8 @@ $lang['GENERAL'] = 'Общие настройки'; $lang['USERS'] = 'Пользователи'; $lang['GROUPS'] = 'Группы'; $lang['FORUMS'] = 'Форумы'; +$lang['MODS'] = 'Модификации'; +$lang['TORRENTPIER'] = 'Технические настройки'; $lang['CONFIGURATION'] = 'Конфигурация'; $lang['PERMISSIONS'] = 'Права доступа'; @@ -214,7 +216,11 @@ $lang['CLICK_RETURN_BANADMIN'] = '%sВернуться к чёрным спис $lang['GENERAL_CONFIG'] = 'Общие настройки'; $lang['CONFIG_EXPLAIN'] = 'Эта форма позволит вам изменить общие настройки форумов. Для управления пользователями и отдельными форумами используйте соответствующие ссылки слева.'; +$lang['CONFIG_MODS'] = 'Настройки модификаций'; +$lang['MODS_EXPLAIN'] = 'Эта форма позволит вам изменить настройки модификаций.'; + $lang['CLICK_RETURN_CONFIG'] = '%sВернуться к общим настройкам%s'; +$lang['CLICK_RETURN_CONFIG_MODS'] = '%sВернуться к настройкам модификаций%s'; $lang['GENERAL_SETTINGS'] = 'Общие настройки форумов'; $lang['SITE_NAME'] = 'Название сайта'; @@ -605,7 +611,7 @@ $lang['INSTALL2'] = 'Установить'; $lang['INACTIVE_MODULES'] = 'Неактивные модули'; $lang['NO_MODULES_INACTIVE'] = 'Нет неактивных модулей'; $lang['REPORT_MODULE_NOT_EXISTS'] = 'Выбранный модель не существует.'; -$lang['CLICK_RETURN_REPORT_ADMIN'] = '%sНажмите%s для возврата к настройкам Модулей & Причин.'; +$lang['CLICK_RETURN_REPORT_ADMIN'] = '%sНажмите%s для возврата к настройкам Модулей и Причин.'; $lang['BACK_MODULES'] = 'Назад к модулям'; $lang['REPORT_REASON'] = 'Причина написания сообщения'; @@ -647,3 +653,12 @@ $lang['REPORTS'] = 'Нарушения'; // // Reports [END] // + +// +// Mods +// +$lang['MAX_NEWS_TITLE'] = 'Макс. длинна новости'; +$lang['NEWS_COUNT'] = 'Сколько показывать новостей'; +$lang['NEWS_FORUM_ID'] = 'Из каких форумов выводить
Из нескольких форумов выводите, через запятую. Например 1,2,3
'; +$lang['NOAVATAR'] = 'Нет аватара'; +$lang['WHOIS_INFO'] = 'Информация о IP адресе'; diff --git a/upload/templates/admin/admin_board.tpl b/upload/templates/admin/admin_board.tpl index 8c350f1e8..75c45ce41 100644 --- a/upload/templates/admin/admin_board.tpl +++ b/upload/templates/admin/admin_board.tpl @@ -1,9 +1,13 @@ - +

{L_GENERAL_CONFIG}

{L_CONFIG_EXPLAIN}


+{L_GENERAL_CONFIG} · +{L_CONFIG_MODS} +

+
{S_HIDDEN_FIELDS} @@ -223,6 +227,10 @@

{L_AVATAR_GALLERY_PATH}

{L_AVATAR_GALLERY_PATH_EXPLAIN}
+ +

{L_NOAVATAR}

+ + {L_EMAIL_SETTINGS} @@ -253,6 +261,121 @@

{L_SMTP_PASSWORD}

{L_SMTP_PASSWORD_EXPLAIN}
+ + + + +

{L_CONFIG_MODS}

+ +

{L_MODS_EXPLAIN}

+
+ +{L_GENERAL_CONFIG} · +{L_CONFIG_MODS} +

+ + +{S_HIDDEN_FIELDS} + + +++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_CONFIG_MODS}

{L_REPORT_MODULE}

 +    + +

{L_GOLD} / {L_SILVER}

 +    + +

{L_MAGNET}

 +    + +

{L_GENDER}

 +    + +

{L_CALLSEED}

 +    + +

{L_SPMODE_FULL}

 +    + +

{L_WHOIS_INFO}

{L_LATEST_NEWS}

{L_LATEST_NEWS}

 +    + +

{L_MAX_NEWS_TITLE}

{L_NEWS_COUNT}

{L_NEWS_FORUM_ID}

{L_NETWORK_NEWS}

{L_NETWORK_NEWS}

 +    + +

{L_MAX_NEWS_TITLE}

{L_NEWS_COUNT}

{L_NEWS_FORUM_ID}

   diff --git a/upload/templates/default/report_config_body.tpl b/upload/templates/admin/report_config_body.tpl similarity index 100% rename from upload/templates/default/report_config_body.tpl rename to upload/templates/admin/report_config_body.tpl diff --git a/upload/templates/default/report_module_edit_body.tpl b/upload/templates/admin/report_module_edit_body.tpl similarity index 100% rename from upload/templates/default/report_module_edit_body.tpl rename to upload/templates/admin/report_module_edit_body.tpl diff --git a/upload/templates/default/report_module_reasons_body.tpl b/upload/templates/admin/report_module_reasons_body.tpl similarity index 100% rename from upload/templates/default/report_module_reasons_body.tpl rename to upload/templates/admin/report_module_reasons_body.tpl diff --git a/upload/templates/default/report_modules_body.tpl b/upload/templates/admin/report_modules_body.tpl similarity index 100% rename from upload/templates/default/report_modules_body.tpl rename to upload/templates/admin/report_modules_body.tpl diff --git a/upload/templates/default/report_reason_edit_body.tpl b/upload/templates/admin/report_reason_edit_body.tpl similarity index 100% rename from upload/templates/default/report_reason_edit_body.tpl rename to upload/templates/admin/report_reason_edit_body.tpl