diff --git a/upload/config.php b/upload/config.php index 078bbc9f9..b24ec8a15 100644 --- a/upload/config.php +++ b/upload/config.php @@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 pre-stable'; -$bb_cfg['tp_release_date'] = '21-12-2012'; -$bb_cfg['tp_release_state'] = 'R482'; +$bb_cfg['tp_release_date'] = '07-01-2013'; +$bb_cfg['tp_release_state'] = 'R483'; // Database $charset = 'utf8'; @@ -65,7 +65,7 @@ $pconnect = false; // Настройка баз данных ['db']['srv_name'] => (array) srv_cfg; // порядок параметров srv_cfg (хост, название базы, пользователь, пароль, charset, pconnect); -$bb_cfg['db']['db1'] = array('localhost', 'dbase', 'user', 'pass', $charset, $pconnect); +$bb_cfg['db']['db1'] = array('localhost', 'demo_port32', 'demo_port32', 'demo_port32', $charset, $pconnect); //$bb_cfg['db']['db2'] = array('localhost2', 'dbase2', 'user2', 'pass2', $charset, $pconnect); //$bb_cfg['db']['db3'] = array('localhost3', 'dbase3', 'user2', 'pass3', $charset, $pconnect); diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 9a450da44..ffe586fc1 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -140,6 +140,8 @@ $lang['MODERATOR'] = 'Moderator'; $lang['MODERATORS'] = 'Moderators'; $lang['TERMS'] = 'Terms'; $lang['NOTHING_HAS_CHANGED'] = 'Nothing has changed'; +$lang['AUTOCOMPLETE'] = "Password generate"; +$lang['YOUR_NEW_PASSWORD'] = "Your are new password:"; // // Stats block text diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 9ec587c81..98ffd1142 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1654,6 +1654,8 @@ $lang['TERMS_ON'] = 'Я согласен с этими условиями $lang['TERMS_OFF'] = 'Я не согласен с этими условиями'; $lang['JAVASCRIPT_ON_REGISTER'] = 'Для регистрации необходимо включить JavaScript'; $lang['REGISTERED_IN_TIME'] = "В данный момент регистрация закрыта

вы можете зарегистрироваться с 01:00 до 17:00 MSK (сейчас ". date('H:i') ." MSK)

Приносим извинения за это временное неудобство"; +$lang['AUTOCOMPLETE'] = "Сгенерировать пароль"; +$lang['YOUR_NEW_PASSWORD'] = "Ваш пароль: "; // Debug diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css index ce22a40a5..9f9f2d303 100644 --- a/upload/templates/default/css/main.css +++ b/upload/templates/default/css/main.css @@ -1357,6 +1357,49 @@ span.YTLink a.postLink{ .mcTd2C{ color:#262e37;} .mcTd1W{ background:#751717 !important; border:1px solid #5e0000; text-shadow:0 0 10px #200000;} .mcTd2W{ color:#3e0000;} - - \ No newline at end of file +span#autocomplete { + cursor: pointer; + color: #006699; + font: 12px Arial,sans-serif; +} + +div#autocomplete_popup { + position: fixed; + z-index: 999; + width: 300px; + height: 100px; + background: #FFFFFF; + text-align: center; + display: none; + border: 1px solid #B7C0C5; +} + +div#autocomplete_popup div.relative { + position: relative; + width: 300px; + height: 100px; +} + +div#autocomplete_popup div.title { + background: url("../images/cellpic1.gif") repeat-x scroll 0 0 #1C508C; + color: #D5E4EC; + font-size: 11px; + font-weight: bold; + padding: 6px 8px 7px; +} + +div#autocomplete_popup div.close { + position: absolute; + right: 6px; + cursor: pointer; + top: 2px; + color: red; + font-weight: bold; +} + +div#autocomplete_popup input { + font-size: 16px; + margin: 20px 0 0; + width: 83px; +} \ No newline at end of file diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl index eaa699ae3..05c4e62b7 100644 --- a/upload/templates/default/usercp_register.tpl +++ b/upload/templates/default/usercp_register.tpl @@ -1,29 +1,64 @@ - + ajax.callback.user_register = function (data) { + $('#' + data.mode).html(data.html); + }; + /** @Author: dimka3210 + * @Desc: Method autocomplete password + */ + var array_for_rand_pass = ["a", "A", "b", "B", "c", "C", "d", "D", "e", "E", "f", "F", "g", "G", "h", "H", "i", "I", "j", "J", "k", "K", "l", "L", "m", "M", "n", "N", "o", "O", "p", "P", "q", "Q", "r", "R", "s", "S", "t", "T", "u", "U", "v", "V", "w", "W", "x", "X", "y", "Y", "z", "Z", 0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + var array_rand = function (array) { + var array_length = array.length; + var result = Math.random() * array_length; + return Math.floor(result); + + }; + jQuery(document).ready(function () { + jQuery("span#autocomplete").click(function () { + var string_result = ""; // Empty string + for (var i = 1; i <= 8; i++) { + string_result += array_for_rand_pass[array_rand(array_for_rand_pass)]; + } + + var _popup_left = (Math.ceil(window.screen.availWidth / 2) - 150); + var _popup_top = (Math.ceil(window.screen.availHeight / 2) - 50); + jQuery("div#autocomplete_popup").css({ + left:_popup_left + "px", + top:_popup_top + "px" + }).show(1000); + + jQuery("input#pass, input#pass_confirm, div#autocomplete_popup input").each(function () { + jQuery(this).val(string_result); + }); + }); + }); + +
+
+
x
+
{L_YOUR_NEW_PASSWORD}
+ +
+

{PAGE_TITLE}

{T_INDEX}

- - - + + + - + - + @@ -38,33 +73,49 @@ document.write(''); - + - - + + - + - - + + - + - + @@ -91,28 +142,28 @@ document.write(''); - + - + - + - + - + @@ -129,15 +180,15 @@ document.write(''); @@ -147,7 +198,8 @@ ajax.callback.posts = function(data){ @@ -155,29 +207,37 @@ ajax.callback.posts = function(data){ @@ -185,22 +245,26 @@ ajax.callback.posts = function(data){ - + @@ -210,13 +274,14 @@ ajax.callback.posts = function(data){ @@ -228,14 +293,16 @@ ajax.callback.posts = function(data){ @@ -243,27 +310,27 @@ ajax.callback.posts = function(data){ - + - + - + @@ -272,25 +339,29 @@ ajax.callback.posts = function(data){
{L_USERNAME}: *{USERNAME} - {USERNAME} +
{L_EMAIL}: *
{L_EMAIL_EXPLAIN}
readonly="readonly" style="color: gray;" /> - {L_EMAIL}: *
{L_EMAIL_EXPLAIN}
+ 		+ readonly="readonly" style="color: gray;" /> +
{L_CURRENT_PASSWORD}: *
{L_CONFIRM_PASSWORD_EXPLAIN}
{L_NEW_PASSWORD}: *
{L_PASSWORD_IF_CHANGED}
{L_PASSWORD}: *		  {L_PASSWORD_LONG}{L_NEW_PASSWORD}: *
{L_PASSWORD_IF_CHANGED}
{L_PASSWORD}: * + 		 ◄  {L_PASSWORD_LONG}
{L_CONFIRM_PASSWORD}: *
{L_PASSWORD_CONFIRM_IF_CHANGED}
 - +
{L_CONFIRM_CODE}:{CAPTCHA_HTML} {CAPTCHA_HTML} +
ICQ:
{L_SKYPE}:
{L_WEBSITE}:
{L_OCCUPATION}:
{L_INTERESTS}:
{L_LOCATION}: -
+
- +
{L_PUBLIC_VIEW_EMAIL}: -    - +    +
{L_HIDE_USER}: -    - +    +
{L_DENY_VISITORS}: -    - +    +
{L_ALWAYS_NOTIFY}:
{L_ALWAYS_NOTIFY_EXPLAIN}
 -    - +    +
{L_NOTIFY_ON_PRIVMSG}: -    - +    +
{L_HIDE_PORN_FORUMS}: -    - +    +
{L_DATE_FORMAT}:
{L_DATE_FORMAT_EXPLAIN}
- - - - + + + +
{L_AVATAR_DISABLE} -

{L_CURRENT_IMAGE}

-

{USER_AVATAR}

-
{L_AVATAR_DISABLE} +

{L_CURRENT_IMAGE}

+ +

{USER_AVATAR}

+
- - - - + + + +
{AVATAR_EXPLAIN} -

{L_CURRENT_IMAGE}

-

{USER_AVATAR}

-

-
{AVATAR_EXPLAIN} +

{L_CURRENT_IMAGE}

+ +

{USER_AVATAR}

+ +

+
{L_UPLOAD_AVATAR_FILE}: - - + +
{L_UPLOAD_AVATAR_URL}:
{L_UPLOAD_AVATAR_URL_EXPLAIN}
{L_LINK_REMOTE_AVATAR}:
{L_LINK_REMOTE_AVATAR_EXPLAIN}
{L_AVATAR_GALLERY}:
-
-
- {L_USER_AGREEMENT_HEAD} -
- -
-

-
-
+
+
+ {L_USER_AGREEMENT_HEAD} +
+ +
+

+

+
+
+
-
-    - -
+
+    + + +