github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-20 21:33:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

r399

Browse source 
немного чистки и фиксов git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@399 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2012-04-13 19:49:36 +00:00
commit 7c9edaa7c7
6 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install/sql/mysql.sql
View file

@ -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 ('record_online_users', '2');
INSERT INTO `bb_config` VALUES ('require_activation', '0'); INSERT INTO `bb_config` VALUES ('require_activation', '0');
INSERT INTO `bb_config` VALUES ('sendmail_fix', '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_release', '');
INSERT INTO `bb_config` VALUES ('seed_bonus_points', ''); INSERT INTO `bb_config` VALUES ('seed_bonus_points', '');
INSERT INTO `bb_config` VALUES ('seed_bonus_tor_size', '0'); INSERT INTO `bb_config` VALUES ('seed_bonus_tor_size', '0');

8
upload/admin/admin_ug_auth.php
View file

@ -86,7 +86,7 @@ if ($submit && $mode == 'user')
delete_permissions($group_id, $user_id); delete_permissions($group_id, $user_id);
$message = $lang['AUTH_UPDATED'] .'<br /><br />'; $message = $lang['AUTH_UPDATED'] .'<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '<a href="admin_ug_auth.php?mode=$mode">', '</a>') .'<br /><br />'; $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '<a href="admin_ug_auth.php?mode='. $mode .'">', '</a>') .'<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'); $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message); bb_die($message);
@ -105,7 +105,7 @@ if ($submit && $mode == 'user')
delete_permissions($group_id, $user_id); delete_permissions($group_id, $user_id);
$message = $lang['AUTH_UPDATED'] .'<br /><br />'; $message = $lang['AUTH_UPDATED'] .'<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '<a href="admin_ug_auth.php?mode=$mode">', '</a>') .'<br /><br />'; $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '<a href="admin_ug_auth.php?mode='. $mode .'">', '</a>') .'<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'); $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message); bb_die($message);
@ -136,7 +136,7 @@ if ($submit && $mode == 'user')
$l_auth_return = ($mode == 'user') ? $lang['CLICK_RETURN_USERAUTH'] : $lang['CLICK_RETURN_GROUPAUTH']; $l_auth_return = ($mode == 'user') ? $lang['CLICK_RETURN_USERAUTH'] : $lang['CLICK_RETURN_GROUPAUTH'];
$message = $lang['AUTH_UPDATED'] .'<br /><br />'; $message = $lang['AUTH_UPDATED'] .'<br /><br />';
$message .= sprintf($l_auth_return, '<a href="admin_ug_auth.php?mode=$mode">', '</a>') .'<br /><br />'; $message .= sprintf($l_auth_return, '<a href="admin_ug_auth.php?mode='. $mode .'">', '</a>') .'<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'); $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message); bb_die($message);
@ -169,7 +169,7 @@ else if ($submit && $mode == 'group' && is_array(@$_POST['auth']))
$l_auth_return = $lang['CLICK_RETURN_GROUPAUTH']; $l_auth_return = $lang['CLICK_RETURN_GROUPAUTH'];
$message = $lang['AUTH_UPDATED'] .'<br /><br />'; $message = $lang['AUTH_UPDATED'] .'<br /><br />';
$message .= sprintf($l_auth_return, '<a href="admin_ug_auth.php?mode=$mode">', '</a>') .'<br /><br />'; $message .= sprintf($l_auth_return, '<a href="admin_ug_auth.php?mode='. $mode .'">', '</a>') .'<br /><br />';
$message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'); $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>');
bb_die($message); bb_die($message);

5
upload/config.php
View file

@ -51,8 +51,8 @@ if (!defined('BB_ROOT')) die(basename(__FILE__));
$bb_cfg = $tr_cfg = $page_cfg = array(); $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 (RC)'; $bb_cfg['tp_version'] = '2.4 RC';
$bb_cfg['tp_release_state'] = 'R398'; $bb_cfg['tp_release_state'] = 'R399';
$bb_cfg['tp_release_date'] = '13-04-2012'; $bb_cfg['tp_release_date'] = '13-04-2012';
// Database // Database
@ -258,7 +258,6 @@ define('ADMIN_TPL_DIR', TEMPLATES_DIR .'/admin/');
$bb_cfg['tpl_name'] = 'default'; $bb_cfg['tpl_name'] = 'default';
$bb_cfg['stylesheet'] = 'main.css'; $bb_cfg['stylesheet'] = 'main.css';
$bb_cfg['theme_css'] = 'theme_default.css';
$bb_cfg['show_sidebar1_on_every_page'] = false; $bb_cfg['show_sidebar1_on_every_page'] = false;
$bb_cfg['show_sidebar2_on_every_page'] = false; $bb_cfg['show_sidebar2_on_every_page'] = false;

10
upload/includes/functions.php
View file

@ -1231,13 +1231,13 @@ function show_bt_userdata ($user_id)
'TD_UL' => humn_size($btu['up_today']), 'TD_UL' => humn_size($btu['up_today']),
'TD_REL' => humn_size($btu['up_release_today']), 'TD_REL' => humn_size($btu['up_release_today']),
'TD_BONUS' => humn_size($btu['up_bonus_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_DL' => humn_size($btu['down_yesterday']),
'YS_UL' => humn_size($btu['up_yesterday']), 'YS_UL' => humn_size($btu['up_yesterday']),
'YS_REL' => humn_size($btu['up_release_yesterday']), 'YS_REL' => humn_size($btu['up_release_yesterday']),
'YS_BONUS' => humn_size($btu['up_bonus_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_UP' => humn_size($btu['speed_up'], 0, 'KB') .'/s',
'SPEED_DOWN' => humn_size($btu['speed_down'], 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 // AdminCP works only with default template
$tpl_dir_name = defined('IN_ADMIN') ? 'default' : basename($bb_cfg['tpl_name']); $tpl_dir_name = defined('IN_ADMIN') ? 'default' : basename($bb_cfg['tpl_name']);
$stylesheet = defined('IN_ADMIN') ? 'main.css' : basename($bb_cfg['stylesheet']); $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); $template = new Template(TEMPLATES_DIR . $tpl_dir_name);
$css_dir = BB_ROOT . basename(TEMPLATES_DIR) ."/$tpl_dir_name/css/"; $css_dir = BB_ROOT . basename(TEMPLATES_DIR) ."/$tpl_dir_name/css/";
@ -1562,7 +1561,6 @@ function setup_style ()
'BB_ROOT' => BB_ROOT, 'BB_ROOT' => BB_ROOT,
'SPACER' => BB_ROOT .'images/spacer.gif', 'SPACER' => BB_ROOT .'images/spacer.gif',
'STYLESHEET' => $css_dir . $stylesheet, 'STYLESHEET' => $css_dir . $stylesheet,
'THEME_CSS' => ($theme_css) ? $css_dir . $theme_css : '',
'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'], '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; $user_rank = !empty($data['user_rank']) ? $data['user_rank'] : 0;
if(isset($ranks[$user_rank])) 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($title)) $title = $lang['USER'];
if(empty($style)) $style = 'colorUser'; if(empty($style)) $style = 'colorUser';

2
upload/includes/ucp/usercp_bonus.php
View file

@ -28,7 +28,7 @@ if (isset($_POST['bonus_id']))
$upload = $upload_row[$id]*1024*1024*1024; $upload = $upload_row[$id]*1024*1024*1024;
$points = $price_row[$id]; $points = $price_row[$id];
if($userdata['user_points'] <= $points) if($userdata['user_points'] < $points)
{ {
meta_refresh('index.php', 5); meta_refresh('index.php', 5);

2
upload/templates/default/page_header.tpl
View file

@ -437,7 +437,7 @@ $(document).ready(function() {
<form action="{S_LOGIN_ACTION}" method="post"> <form action="{S_LOGIN_ACTION}" method="post">
{L_USERNAME}: <input type="text" name="login_username" size="12" tabindex="1" accesskey="l" /> {L_USERNAME}: <input type="text" name="login_username" size="12" tabindex="1" accesskey="l" />
{L_PASSWORD}: <input type="password" name="login_password" size="12" tabindex="2" /> {L_PASSWORD}: <input type="password" name="login_password" size="12" tabindex="2" />
<label title="{L_AUTO_LOGIN}"><input type="checkbox" name="autologin" value="1" tabindex="3" />{L_REMEMBER}</label>&nbsp; <label title="{L_AUTO_LOGIN}"><input type="checkbox" name="autologin" value="1" tabindex="3" checked="checked" />{L_REMEMBER}</label>&nbsp;
<input type="submit" name="login" value="{L_LOGIN}" tabindex="4" /> <input type="submit" name="login" value="{L_LOGIN}" tabindex="4" />
</form> &#0183; </form> &#0183;
<a href="{U_SEND_PASSWORD}">{L_FORGOTTEN_PASSWORD}</a> <a href="{U_SEND_PASSWORD}">{L_FORGOTTEN_PASSWORD}</a>