From c59c44aeff25f451f9e9caee722168b8d1135074 Mon Sep 17 00:00:00 2001 From: "torrent.rus.ec@gmail.com" Date: Mon, 11 Jul 2011 12:53:58 +0000 Subject: [PATCH] r94 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс дампа базы (добавление полей для пола и скайпа), фикс языковой переменной, фикс регистрации и редактирования профиля git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@94 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- install/sql/mysql.sql | 8 ++-- upload/config.php | 2 +- upload/includes/ucp/usercp_register.php | 53 ++++++---------------- upload/language/lang_english/lang_main.php | 2 +- 4 files changed, 22 insertions(+), 43 deletions(-) diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql index 7f927c4ae..c8c883cc5 100644 --- a/install/sql/mysql.sql +++ b/install/sql/mysql.sql @@ -1377,7 +1377,9 @@ CREATE TABLE IF NOT EXISTS `bb_users` ( `user_rank` int(11) NOT NULL default '0', `user_avatar` varchar(100) NOT NULL default '', `user_avatar_type` tinyint(4) NOT NULL default '0', + `user_gender` tinyint(1) NOT NULL default '0', `user_email` varchar(255) NOT NULL default '', + `user_skype` varchar(32) NOT NULL default '', `user_icq` varchar(15) NOT NULL default '', `user_website` varchar(100) NOT NULL default '', `user_from` varchar(100) NOT NULL default '', @@ -1399,9 +1401,9 @@ CREATE TABLE IF NOT EXISTS `bb_users` ( -- Дамп данных таблицы `bb_users` -- -INSERT INTO `bb_users` VALUES (-1, 0, 'Anonymous', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 1309421220, '0', 0, 5, '0.00', '', 0, 0, 0, 220, 0, '', 0, '', '', '', '', '', '', '', '', '', 0, '', 0); -INSERT INTO `bb_users` VALUES (2, 1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 0, 0, '0', 1309421220, '0', 1, 1, '+4.00', '', 0, 0, 0, 0, 1, '', 1, 'admin@admin.com', '', '', '', '', '', '', '', '', 0, '', 0); -INSERT INTO `bb_users` VALUES (-746, 0, 'bot', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 1309421220, '0', 0, 0, '0.00', '', 0, 0, 0, 148, 0, 'bot.gif', 1, 'bot@bot.bot', '', '', '', '', '', '', '', '', 0, '', 0); +INSERT INTO `bb_users` VALUES (-1, 0, 'Anonymous', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 1309421220, '0', 0, 5, '0.00', '', 0, 0, 0, 220, 0, '', 0, 0, '', '', '', '', '', '', '', '', '', '', 0, '', 0); +INSERT INTO `bb_users` VALUES (2, 1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 0, 0, '0', 1309421220, '0', 1, 1, '+4.00', '', 0, 0, 0, 304, 1, '', 1, 1, 'admin@admin.com', '', '', '', '', '', '', '', '', '', 0, '', 0); +INSERT INTO `bb_users` VALUES (-746, 0, 'bot', 'd41d8cd98f00b204e9800998ecf8427e', 0, 0, '0', 1309421220, '0', 0, 0, '0.00', '', 0, 0, 0, 148, 0, 'bot.gif', 1, 0, 'bot@bot.bot', '', '', '', '', '', '', '', '', '', 0, '', 0); -- -------------------------------------------------------- diff --git a/upload/config.php b/upload/config.php index 3148b071a..93faeb6f9 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.0.2'; -$bb_cfg['tp_release_state'] = 'TP II r92'; +$bb_cfg['tp_release_state'] = 'TP II r94'; $bb_cfg['tp_release_date'] = '11-07-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index 0c6227e93..f151226f1 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -199,43 +199,20 @@ foreach ($profile_fields as $field => $can_edit) * Имя (edit, reg) */ case 'username': - if ($can_edit) - { - $username = !empty($_POST['username']) ? clean_username($_POST['username']) : $pr_data['username']; - if ($submit) - { - if ($mode == 'register') - { - if (empty($username)) - { - $errors[] = 'Вы должны выбрать имя'; - } - if (!$errors AND $err = validate_username($username)) - { - $errors[] = $err; - } + $username = !empty($_POST['username']) ? clean_username($_POST['username']) : $pr_data['username']; - $db_data['username'] = $username; - } - else - { - if ($username != $pr_data['username']) - { - if (!$errors AND $err = validate_username($username)) - { - $errors[] = $err; - } - $db_data['username'] = $username; - } - } - } - $tp_data['CAN_EDIT_USERNAME'] = true; - $tp_data['USERNAME'] = $username; - } - else + if ($submit) { - $tp_data['USERNAME'] = $pr_data['username']; + if (!$errors AND $err = validate_username($username)) + { + $errors[] = $err; + } + if($can_edit && $username != $pr_data['username'] || $mode == 'register') + { $pr_data['username'] = $username; + $db_data['username'] = $username; } } + $tp_data['CAN_EDIT_USERNAME'] = $can_edit; + $tp_data['USERNAME'] = $pr_data['username']; break; /** @@ -749,10 +726,10 @@ if ($submit && !$errors) 'SITENAME' => $bb_cfg['sitename'], 'WELCOME_MSG' => sprintf($lang['WELCOME_SUBJECT'], $bb_cfg['sitename']), 'USERNAME' => html_entity_decode($username), - 'PASSWORD' => $password_confirm, + 'PASSWORD' => $new_pass, 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $bb_cfg['board_email_sig']), - 'U_ACTIVATE' => make_url('profile.php?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) + 'U_ACTIVATE' => make_url('profile.php?mode=activate&' . POST_USERS_URL . '=' . $new_user_id . '&act_key=' . $db_data['user_actkey']) )); $emailer->send(); @@ -771,7 +748,7 @@ if ($submit && !$errors) 'USERNAME' => html_entity_decode($username), 'EMAIL_SIG' => str_replace('
', "\n", "-- \n" . $bb_cfg['board_email_sig']), - 'U_ACTIVATE' => make_url('profile.php?mode=activate&' . POST_USERS_URL . '=' . $user_id . '&act_key=' . $user_actkey) + 'U_ACTIVATE' => make_url('profile.php?mode=activate&' . POST_USERS_URL . '=' . $new_user_id . '&act_key=' . $db_data['user_actkey']) )); $emailer->send(); $emailer->reset(); @@ -858,7 +835,7 @@ if ($submit && !$errors) else { meta_refresh(append_sid("index.php"), 10); - bb_die($lang['PROFILE_UPDATED'] . '

'.$lang['RETURN_PROFILE'].'

' . sprintf($lang['Click_return_index'], '', '')); + bb_die($lang['PROFILE_UPDATED'] . '

'.$lang['RETURN_PROFILE'].'

' . sprintf($lang['CLICK_RETURN_INDEX'], '', '')); } } else diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 6be610067..df0b8f1db 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -598,7 +598,7 @@ $lang['SELECT_FROM_GALLERY'] = 'Select Avatar from gallery'; $lang['VIEW_AVATAR_GALLERY'] = 'Show gallery'; $lang['SELECT_AVATAR'] = 'Select avatar'; -$lang['RETURN_PROFILE'] = 'Cancel avatar'; +$lang['RETURN_PROFILE'] = 'Return to profile'; $lang['SELECT_CATEGORY'] = 'Select category'; $lang['DELETE_IMAGE'] = 'Delete Image';