github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 06:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r351

Browse source 
фикс Бета-тестер или не зря их держем (: git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@351 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2012-02-02 03:57:20 +00:00
commit ab5b86e9d0
3 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
upload/admin/admin_board.php
View file

@ -3,8 +3,8 @@
// ACP Header - START // ACP Header - START
if (!empty($setmodules)) if (!empty($setmodules))
{ {
$module['General']['Configuration'] = basename(__FILE__) .'?mode=config';; $module['General']['Configuration'] = basename(__FILE__) .'?mode=config';
$module['Mods']['Configuration'] = basename(__FILE__) .'?mode=config_mods';; $module['Mods']['Configuration'] = basename(__FILE__) .'?mode=config_mods';
return; return;
} }
require('./pagestart.php'); require('./pagestart.php');
@ -15,8 +15,8 @@ require(INC_DIR .'functions_selects.php');
$mode = isset($_GET['mode']) ? $_GET['mode'] : ''; $mode = isset($_GET['mode']) ? $_GET['mode'] : '';
$return_links = array( $return_links = array(
'index' => '<br /><br />'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="'. append_sid('index.php?pane=right') . '">', '</a>'), 'index' => '<br /><br />'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="'. append_sid('index.php?pane=right') . '">', '</a>'),
'config' => '<br /><br />'. sprintf($lang['CLICK_RETURN_CONFIG'], '<a href="' . append_sid('admin_board.php?mode=config') . '">', '</a>'), 'config' => '<br /><br />'. sprintf($lang['CLICK_RETURN_CONFIG'], '<a href="' . append_sid('admin_board.php?mode=config') . '">', '</a>'),
'config_mods' => '<br /><br />'. sprintf($lang['CLICK_RETURN_CONFIG_MODS'], '<a href="'. append_sid('admin_board.php?mode=config_mods') . '">', '</a>') 'config_mods' => '<br /><br />'. sprintf($lang['CLICK_RETURN_CONFIG_MODS'], '<a href="'. append_sid('admin_board.php?mode=config_mods') . '">', '</a>')
); );
@ -53,7 +53,7 @@ else
bb_update_config(array($config_name => $new[$config_name])); bb_update_config(array($config_name => $new[$config_name]));
} }
} }
if( isset($_POST['submit']) ) if( isset($_POST['submit']) )
{ {
if ($mode == 'config') if ($mode == 'config')
@ -73,7 +73,7 @@ switch($mode)
$template->assign_vars(array( $template->assign_vars(array(
'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config_mods'), 'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config_mods'),
'CONFIG_MODS' => true, 'CONFIG_MODS' => true,
'REPORTS_ENABLED' => $new['reports_enabled'], 'REPORTS_ENABLED' => $new['reports_enabled'],
'GOLD_SILVER_ENABLED' => $new['gold_silver_enabled'], 'GOLD_SILVER_ENABLED' => $new['gold_silver_enabled'],
'GALLERY_ENABLED' => $new['gallery_enabled'], 'GALLERY_ENABLED' => $new['gallery_enabled'],
@ -95,23 +95,23 @@ switch($mode)
'WHOIS_INFO' => $new['whois_info'], 'WHOIS_INFO' => $new['whois_info'],
)); ));
break; break;
default: default:
$template->assign_vars(array( $template->assign_vars(array(
'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config'), 'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config'),
'CONFIG' => true, 'CONFIG' => true,
'SITENAME' => htmlCHR($new['sitename']), 'SITENAME' => htmlCHR($new['sitename']),
'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']), 'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']),
'DISABLE_BOARD' => ($new['board_disable']) ? true : false, 'DISABLE_BOARD' => ($new['board_disable']) ? true : false,
'ACTIVATION_NONE' => USER_ACTIVATION_NONE, 'ACTIVATION_NONE' => USER_ACTIVATION_NONE,
'ACTIVATION_NONE_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : '', 'ACTIVATION_NONE_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : '',
'ACTIVATION_USER' => USER_ACTIVATION_SELF, 'ACTIVATION_USER' => USER_ACTIVATION_SELF,
'ACTIVATION_USER_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : '', 'ACTIVATION_USER_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : '',
'ACTIVATION_ADMIN' => USER_ACTIVATION_ADMIN, 'ACTIVATION_ADMIN' => USER_ACTIVATION_ADMIN,
'ACTIVATION_ADMIN_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : '', 'ACTIVATION_ADMIN_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : '',
'VISUAL_CONFIRM' => ($new['enable_confirm']) ? true : false, 'VISUAL_CONFIRM' => ($new['enable_confirm']) ? true : false,
'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false, 'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false,
'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'], 'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'],
@ -158,6 +158,5 @@ switch($mode)
)); ));
break; break;
} }
print_page('admin_board.tpl', 'admin'); print_page('admin_board.tpl', 'admin');

2
upload/config.php
View file

@ -63,7 +63,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.4 (beta)'; $bb_cfg['tp_version'] = '2.4 (beta)';
$bb_cfg['tp_release_state'] = 'R350'; $bb_cfg['tp_release_state'] = 'R351';
$bb_cfg['tp_release_date'] = '02-02-2012'; $bb_cfg['tp_release_date'] = '02-02-2012';
// Database // Database

6
upload/modcp.php
View file

@ -255,7 +255,7 @@ switch ($mode)
$datastore->enqueue('latest_news'); $datastore->enqueue('latest_news');
$datastore->update('latest_news'); $datastore->update('latest_news');
} }
$net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id'])); $net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id']));
if(isset($net_forums[$forum_id]) && $bb_cfg['show_network_news'] && $result) if(isset($net_forums[$forum_id]) && $bb_cfg['show_network_news'] && $result)
{ {
@ -291,7 +291,7 @@ switch ($mode)
$datastore->enqueue('latest_news'); $datastore->enqueue('latest_news');
$datastore->update('latest_news'); $datastore->update('latest_news');
} }
$net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id'])); $net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id']));
if((isset($news_forums[$forum_id]) || isset($news_forums[$new_forum_id])) && $bb_cfg['show_network_news'] && $result) if((isset($news_forums[$forum_id]) || isset($news_forums[$new_forum_id])) && $bb_cfg['show_network_news'] && $result)
{ {
@ -474,7 +474,7 @@ switch ($mode)
do do
{ {
$user_id_sql .= (($user_id_sql != '') ? ', ' : '') . intval($row['poster_id']); $user_id_sql .= (($user_id_sql != '') ? ', ' : '') . intval($row['poster_id']);
$post_id_sql .= (($post_id_sql != '') ? ', ' : '') . intval($row['post_id']);; $post_id_sql .= (($post_id_sql != '') ? ', ' : '') . intval($row['post_id']);
} }
while ($row = DB()->sql_fetchrow($result)); while ($row = DB()->sql_fetchrow($result));