|
|
@@ -13,7 +13,7 @@
|
|
|
|
|
|
// Version information...
|
|
|
define('SMF_VERSION', '2.1 Alpha 1');
|
|
|
-define('SMF_LANG_VERSION', '2.0');
|
|
|
+define('SMF_LANG_VERSION', '2.1');
|
|
|
|
|
|
$GLOBALS['required_php_version'] = '5.1.0';
|
|
|
$GLOBALS['required_mysql_version'] = '4.0.18';
|
|
|
@@ -984,6 +984,9 @@ function WelcomeLogin()
|
|
|
$boarddir . '/Settings_bak.php',
|
|
|
);
|
|
|
|
|
|
+ require_once($sourcedir . '/Security.php');
|
|
|
+ createToken('login');
|
|
|
+
|
|
|
// Check the cache directory.
|
|
|
$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
|
|
|
if (!file_exists($cachedir_temp))
|
|
|
@@ -3639,7 +3642,8 @@ function template_welcome_message()
|
|
|
<script type="text/javascript" src="http://www.simplemachines.org/smf/current-version.js?version=' . SMF_VERSION . '"></script>
|
|
|
<script type="text/javascript" src="', $settings['default_theme_url'], '/scripts/sha1.js"></script>
|
|
|
<h3>', sprintf($txt['upgrade_ready_proceed'], SMF_VERSION), '</h3>
|
|
|
- <form action="', $upcontext['form_url'], '" method="post" name="upform" id="upform" ', empty($upcontext['disable_login_hashing']) ? ' onsubmit="hashLoginPassword(this, \'' . $upcontext['rid'] . '\');"' : '', '>
|
|
|
+ <form action="', $upcontext['form_url'], '" method="post" name="upform" id="upform" ', empty($upcontext['disable_login_hashing']) ? ' onsubmit="hashLoginPassword(this, \'' . $upcontext['rid'] . '\', \'' . (!empty($context['login_token']) ? $context['login_token'] : '') . '\');"' : '', '>
|
|
|
+ <input type="hidden" name="', $context['login_token_var'], '" value="', $context['login_token'], '" />
|
|
|
<div id="version_warning" style="margin: 2ex; padding: 2ex; border: 2px dashed #a92174; color: black; background-color: #fbbbe2; display: none;">
|
|
|
<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
|
|
|
<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br />
|
emanuele