Исправление ошибки SEED_COUNT (благодарность Phoenix за предложенный способ решения). Переименование пользователя-гостя. Упрощение логики файла подключения модулей профиля. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@540 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08 2013-08-07 21:12:38 +00:00
commit d9ec260167
6 changed files with 18 additions and 24 deletions

View file

@ -1469,7 +1469,7 @@ CREATE TABLE IF NOT EXISTS `bb_users` (
-- Дамп данных таблицы `bb_users` -- Дамп данных таблицы `bb_users`
-- --
INSERT INTO `bb_users` VALUES (-1, 0, 'Anonymous', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 0, '0', 0, 5, 0.00, '', 0, 0, 0, 0, 0, '', 0, 0, 0, 0, '', '', '', '', '', '', '', '', '', '', '', 0, 0, 'default'); INSERT INTO `bb_users` VALUES (-1, 0, 'Guest', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 0, '0', 0, 5, 0.00, '', 0, 0, 0, 0, 0, '', 0, 0, 0, 0, '', '', '', '', '', '', '', '', '', '', '', 0, 0, 'default');
INSERT INTO `bb_users` VALUES (2, 1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 0, 0, '0', 0, '0', 1, 1, 4.00, '', 0, 0, 0, 304, 1, '', 1, 0, 0, 0, 'admin@admin.com', '', '', '', '', '', '', '', '', '', '', 0, 0, 'default'); INSERT INTO `bb_users` VALUES (2, 1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 0, 0, '0', 0, '0', 1, 1, 4.00, '', 0, 0, 0, 304, 1, '', 1, 0, 0, 0, 'admin@admin.com', '', '', '', '', '', '', '', '', '', '', 0, 0, 'default');
INSERT INTO `bb_users` VALUES (-746, 0, 'bot', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 0, '0', 0, 0, 0.00, '', 0, 0, 0, 144, 0, 'bot.gif', 1, 0, 0, 0, 'bot@bot.bot', '', '', '', '', '', '', '', '', '', '', 0, 0, 'default'); INSERT INTO `bb_users` VALUES (-746, 0, 'bot', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 0, '0', 0, 0, 0.00, '', 0, 0, 0, 144, 0, 'bot.gif', 1, 0, 0, 0, 'bot@bot.bot', '', '', '', '', '', '', '', '', '', '', 0, 0, 'default');

View file

@ -602,4 +602,5 @@ $template->assign_vars(array(
'SEED_EXIST' => ($seeders || defined('SEEDER_EXIST')), 'SEED_EXIST' => ($seeders || defined('SEEDER_EXIST')),
'LEECH_EXIST' => ($leechers || defined('LEECHER_EXIST')), 'LEECH_EXIST' => ($leechers || defined('LEECHER_EXIST')),
'TOR_HELP_LINKS' => $bb_cfg['tor_help_links'], 'TOR_HELP_LINKS' => $bb_cfg['tor_help_links'],
'CALL_SEED' => ($bb_cfg['callseed'] && $tor_reged && !isset($bb_cfg['tor_no_tor_act'][$tor_info['tor_status']])),
)); ));

View file

@ -55,8 +55,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.5 (unstable)'; $bb_cfg['tp_version'] = '2.5 (unstable)';
$bb_cfg['tp_release_date'] = '07-08-2013'; $bb_cfg['tp_release_date'] = '08-08-2013';
$bb_cfg['tp_release_state'] = 'R539'; $bb_cfg['tp_release_state'] = 'R540';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';

View file

@ -1,18 +1,14 @@
<?php <?php
define('IN_FORUM', true);
define('IN_PROFILE', true); define('IN_PROFILE', true);
define('BB_SCRIPT', 'profile'); define('BB_SCRIPT', 'profile');
define('BB_ROOT', './'); define('BB_ROOT', './');
require(BB_ROOT . "common.php"); require(BB_ROOT . 'common.php');
// Start session management // Start session management
$user->session_start(); $user->session_start();
// session id check $mode = (string) @$_REQUEST['mode'];
$sid = request_var('sid', '');
$mode = request_var('mode', '');
$mode = htmlspecialchars($mode);
switch ($mode) switch ($mode)
{ {
@ -22,10 +18,7 @@ switch ($mode)
case 'register': case 'register':
case 'editprofile': case 'editprofile':
if (IS_GUEST && $mode == 'editprofile' ) if (IS_GUEST && $mode == 'editprofile') login_redirect();
{
login_redirect();
}
require(INC_DIR . 'ucp/usercp_register.php'); require(INC_DIR . 'ucp/usercp_register.php');
break; break;

View file

@ -237,7 +237,7 @@ $(document).ready(function(){
<!-- IF DL_BUT_CANCEL --><input type="submit" name="dl_set_cancel" value="{L_DL_CANCEL}" class="liteoption" /><!-- ENDIF --> <!-- IF DL_BUT_CANCEL --><input type="submit" name="dl_set_cancel" value="{L_DL_CANCEL}" class="liteoption" /><!-- ENDIF -->
</form> </form>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF $bb_cfg['callseed'] && not SEED_COUNT --><form action="callseed.php?t={TOPIC_ID}" method="post"><input type="submit" value="{L_CALLSEED}" class="liteoption" />&nbsp;</form><!-- ENDIF --> <!-- IF CALL_SEED --><form action="callseed.php?t={TOPIC_ID}" method="post"><input type="submit" value="{L_CALLSEED}" class="liteoption" />&nbsp;</form><!-- ENDIF -->
&nbsp; &nbsp;
</td> </td>
</tr> </tr>