diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index f85ac1343..4e951dbc5 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -635,7 +635,7 @@ INSERT INTO `bb_config` VALUES ('record_online_date', '1211477508');
INSERT INTO `bb_config` VALUES ('record_online_users', '2');
INSERT INTO `bb_config` VALUES ('require_activation', '0');
INSERT INTO `bb_config` VALUES ('sendmail_fix', '0');
-INSERT INTO `bb_config` VALUES ('seed_bonus_enabled', '0');
+INSERT INTO `bb_config` VALUES ('seed_bonus_enabled', '1');
INSERT INTO `bb_config` VALUES ('seed_bonus_release', '');
INSERT INTO `bb_config` VALUES ('seed_bonus_points', '');
INSERT INTO `bb_config` VALUES ('seed_bonus_tor_size', '0');
diff --git a/upload/admin/admin_ug_auth.php b/upload/admin/admin_ug_auth.php
index fb558e4c5..7cd363c06 100644
--- a/upload/admin/admin_ug_auth.php
+++ b/upload/admin/admin_ug_auth.php
@@ -86,7 +86,7 @@ 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_USERAUTH'], '', '') .'
';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '');
bb_die($message);
@@ -105,7 +105,7 @@ 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_USERAUTH'], '', '') .'
';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '');
bb_die($message);
@@ -136,7 +136,7 @@ if ($submit && $mode == 'user')
$l_auth_return = ($mode == 'user') ? $lang['CLICK_RETURN_USERAUTH'] : $lang['CLICK_RETURN_GROUPAUTH'];
$message = $lang['AUTH_UPDATED'] .'
';
- $message .= sprintf($l_auth_return, '', '') .'
';
+ $message .= sprintf($l_auth_return, '', '') .'
';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '');
bb_die($message);
@@ -169,7 +169,7 @@ else if ($submit && $mode == 'group' && is_array(@$_POST['auth']))
$l_auth_return = $lang['CLICK_RETURN_GROUPAUTH'];
$message = $lang['AUTH_UPDATED'] .'
';
- $message .= sprintf($l_auth_return, '', '') .'
';
+ $message .= sprintf($l_auth_return, '', '') .'
';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '');
bb_die($message);
diff --git a/upload/config.php b/upload/config.php
index 49ff873d5..c957f13d7 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -51,8 +51,8 @@ if (!defined('BB_ROOT')) die(basename(__FILE__));
$bb_cfg = $tr_cfg = $page_cfg = array();
// Increase number of revision after update
-$bb_cfg['tp_version'] = '2.4 (RC)';
-$bb_cfg['tp_release_state'] = 'R398';
+$bb_cfg['tp_version'] = '2.4 RC';
+$bb_cfg['tp_release_state'] = 'R399';
$bb_cfg['tp_release_date'] = '13-04-2012';
// Database
@@ -258,7 +258,6 @@ define('ADMIN_TPL_DIR', TEMPLATES_DIR .'/admin/');
$bb_cfg['tpl_name'] = 'default';
$bb_cfg['stylesheet'] = 'main.css';
-$bb_cfg['theme_css'] = 'theme_default.css';
$bb_cfg['show_sidebar1_on_every_page'] = false;
$bb_cfg['show_sidebar2_on_every_page'] = false;
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 044d57868..02dfe8ea9 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1231,13 +1231,13 @@ function show_bt_userdata ($user_id)
'TD_UL' => humn_size($btu['up_today']),
'TD_REL' => humn_size($btu['up_release_today']),
'TD_BONUS' => humn_size($btu['up_bonus_today']),
- 'TD_POINTS' => $btu['points_today'],
+ 'TD_POINTS' => ($btu['auth_key']) ? $btu['points_today'] : '0.00',
'YS_DL' => humn_size($btu['down_yesterday']),
'YS_UL' => humn_size($btu['up_yesterday']),
'YS_REL' => humn_size($btu['up_release_yesterday']),
'YS_BONUS' => humn_size($btu['up_bonus_yesterday']),
- 'YS_POINTS' => $btu['points_yesterday'],
+ 'YS_POINTS' => ($btu['auth_key']) ? $btu['points_yesterday'] : '0.00',
'SPEED_UP' => humn_size($btu['speed_up'], 0, 'KB') .'/s',
'SPEED_DOWN' => humn_size($btu['speed_down'], 0, 'KB') .'/s',
@@ -1553,7 +1553,6 @@ function setup_style ()
// AdminCP works only with default template
$tpl_dir_name = defined('IN_ADMIN') ? 'default' : basename($bb_cfg['tpl_name']);
$stylesheet = defined('IN_ADMIN') ? 'main.css' : basename($bb_cfg['stylesheet']);
- $theme_css = defined('IN_ADMIN') ? 'admin.css' : basename($bb_cfg['theme_css']);
$template = new Template(TEMPLATES_DIR . $tpl_dir_name);
$css_dir = BB_ROOT . basename(TEMPLATES_DIR) ."/$tpl_dir_name/css/";
@@ -1562,7 +1561,6 @@ function setup_style ()
'BB_ROOT' => BB_ROOT,
'SPACER' => BB_ROOT .'images/spacer.gif',
'STYLESHEET' => $css_dir . $stylesheet,
- 'THEME_CSS' => ($theme_css) ? $css_dir . $theme_css : '',
'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'],
));
@@ -2850,7 +2848,9 @@ function profile_url($data)
$user_rank = !empty($data['user_rank']) ? $data['user_rank'] : 0;
if(isset($ranks[$user_rank]))
- {
$title = $ranks[$user_rank]['rank_title'];
$style = $ranks[$user_rank]['rank_style'];
+ {
+ $title = $ranks[$user_rank]['rank_title'];
+ $style = $ranks[$user_rank]['rank_style'];
}
if(empty($title)) $title = $lang['USER'];
if(empty($style)) $style = 'colorUser';
diff --git a/upload/includes/ucp/usercp_bonus.php b/upload/includes/ucp/usercp_bonus.php
index 917cf7f9d..e2bb3a106 100644
--- a/upload/includes/ucp/usercp_bonus.php
+++ b/upload/includes/ucp/usercp_bonus.php
@@ -28,7 +28,7 @@ if (isset($_POST['bonus_id']))
$upload = $upload_row[$id]*1024*1024*1024;
$points = $price_row[$id];
- if($userdata['user_points'] <= $points)
+ if($userdata['user_points'] < $points)
{
meta_refresh('index.php', 5);
diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl
index 8a636cb3b..9fc8d03fe 100644
--- a/upload/templates/default/page_header.tpl
+++ b/upload/templates/default/page_header.tpl
@@ -437,7 +437,7 @@ $(document).ready(function() {
·
{L_FORGOTTEN_PASSWORD}