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

r204

Browse source 
git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@204 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2011-08-12 15:56:35 +00:00
commit af6eaaed1c
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
upload/ajax/user_register.php
View file

@ -2,7 +2,7 @@
if (!defined('IN_AJAX')) die(basename(__FILE__)); if (!defined('IN_AJAX')) die(basename(__FILE__));
global $bb_cfg, $lang; global $bb_cfg, $lang, $userdata;
$mode = (string) $this->request['mode']; $mode = (string) $this->request['mode'];
@ -48,7 +48,8 @@ switch($mode)
} }
else else
{ {
$html = '<img src="./images/good.gif"> <span class="seedmed bold">'.$lang['CHOOSE_PASS_OK'].'</span>'; $text = (IS_GUEST) ? $lang['CHOOSE_PASS_REG_OK'] : $lang['CHOOSE_PASS_OK'];
$html = '<img src="./images/good.gif"> <span class="seedmed bold">'.$text.'</span>';
} }
} }
break; break;

2
upload/includes/functions.php
View file

@ -2598,7 +2598,7 @@ function get_title_match_topics ($title_match_sql, $limit = 500, $forum_ids = ar
{ {
$sphinx->SetMatchMode(SPH_MATCH_PHRASE); $sphinx->SetMatchMode(SPH_MATCH_PHRASE);
} }
if ($result = $sphinx->Query($title_match_sql, 'topics', $userdata['username'] .' ('. USER_IP .')')) if ($result = $sphinx->Query($title_match_sql, 'topics', $userdata['username'] .' ('. CLIENT_IP .')'))
{ {
if (!empty($result['matches'])) if (!empty($result['matches']))
{ {

3
upload/language/lang_english/lang_main.php
View file

@ -1587,7 +1587,8 @@ $lang['CHOOSE_A_NAME'] = 'You should choose a name';
$lang['CHOOSE_E_MAIL'] = 'You must specify the e-mail'; $lang['CHOOSE_E_MAIL'] = 'You must specify the e-mail';
$lang['CHOOSE_PASS'] = 'Field for the password must not be empty!'; $lang['CHOOSE_PASS'] = 'Field for the password must not be empty!';
$lang['CHOOSE_PASS_ERR'] = 'Entered passwords do not match'; $lang['CHOOSE_PASS_ERR'] = 'Entered passwords do not match';
$lang['CHOOSE_PASS_OK'] = 'Passwords match, you can proceed with the registration.'; $lang['CHOOSE_PASS_OK'] = 'Passwords match';
$lang['CHOOSE_PASS_REG_OK'] = 'Passwords match, you can proceed with the registration';
$lang['EMAILER_DISABLED'] = 'Sorry, this feature is temporarily not working'; $lang['EMAILER_DISABLED'] = 'Sorry, this feature is temporarily not working';
$lang['TERMS_ON'] = 'I agree with these terms and conditions'; $lang['TERMS_ON'] = 'I agree with these terms and conditions';
$lang['TERMS_OFF'] = 'I do not agree to these terms'; $lang['TERMS_OFF'] = 'I do not agree to these terms';

3
upload/language/lang_russian/lang_main.php
View file

@ -1595,7 +1595,8 @@ $lang['CHOOSE_PASSWORD'] = 'Вы должны указать пароль';
$lang['CHOOSE_PASS'] = 'Поля для ввода пароля не должны быть пустыми!'; $lang['CHOOSE_PASS'] = 'Поля для ввода пароля не должны быть пустыми!';
$lang['CHOOSE_PASS_ERR'] = 'Введённые пароли не совпадают'; $lang['CHOOSE_PASS_ERR'] = 'Введённые пароли не совпадают';
$lang['CHOOSE_PASS_ERR_20'] = 'Пароль должен быть не длиннее 20 символов'; $lang['CHOOSE_PASS_ERR_20'] = 'Пароль должен быть не длиннее 20 символов';
$lang['CHOOSE_PASS_OK'] = 'Пароли совпадают, можете продолжить регистрацию.'; $lang['CHOOSE_PASS_OK'] = 'Пароли совпадают';
$lang['CHOOSE_PASS_REG_OK'] = 'Пароли совпадают, можете продолжить регистрацию';
$lang['CHOOSE_PASS_FAILED'] = 'Для изменения пароля вы должны правильно указать текущий пароль'; $lang['CHOOSE_PASS_FAILED'] = 'Для изменения пароля вы должны правильно указать текущий пароль';
$lang['EMAILER_DISABLED'] = 'Извините, эта функция временно не работает'; $lang['EMAILER_DISABLED'] = 'Извините, эта функция временно не работает';
$lang['TERMS_ON'] = 'Я <b>согласен</b> с этими условиями'; $lang['TERMS_ON'] = 'Я <b>согласен</b> с этими условиями';