makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removing minimum times from registration

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8408 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-02-27 15:10:52 +00:00
parent 0a37e9a929
commit 38c636deb5
5 changed files with 5 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
phpBB/includes/ucp/ucp_register.php
View file

@ -43,14 +43,6 @@ class ucp_register
$submit = (isset($_POST['submit'])) ? true : false; $submit = (isset($_POST['submit'])) ? true : false;
$change_lang = request_var('change_lang', ''); $change_lang = request_var('change_lang', '');
$user_lang = request_var('lang', $user->lang_name); $user_lang = request_var('lang', $user->lang_name);
// not so fast, buddy
if (!check_form_key('ucp_register', false, '', false, $config['min_time_reg'])
&& !check_form_key('ucp_register_terms', false, '', false, $config['min_time_terms']))
{
$agreed = false;
}
if ($agreed) if ($agreed)
{ {
@ -92,7 +84,7 @@ class ucp_register
$error = $cp_data = $cp_error = array(); $error = $cp_data = $cp_error = array();
//
if (!$agreed || ($coppa === false && $config['coppa_enable']) || ($coppa && !$config['coppa_enable'])) if (!$agreed || ($coppa === false && $config['coppa_enable']) || ($coppa && !$config['coppa_enable']))
{ {
$add_lang = ($change_lang) ? '&change_lang=' . urlencode($change_lang) : ''; $add_lang = ($change_lang) ? '&change_lang=' . urlencode($change_lang) : '';
@ -142,7 +134,6 @@ class ucp_register
'S_REGISTRATION' => true, 'S_REGISTRATION' => true,
'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields), 'S_HIDDEN_FIELDS' => build_hidden_fields($s_hidden_fields),
'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang . $add_coppa), 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register' . $add_lang . $add_coppa),
'S_TIME' => 1000 * ((int) $config['min_time_terms']),
) )
); );
} }
@ -201,7 +192,10 @@ class ucp_register
'tz' => array('num', false, -14, 14), 'tz' => array('num', false, -14, 14),
'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'),
)); ));
if (!check_form_key('ucp_register'))
{
$error[] = $user->lang['FORM_INVALID'];
}
// Replace "error" strings with their real, localised form // Replace "error" strings with their real, localised form
$error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error);
@ -544,7 +538,6 @@ class ucp_register
'S_COPPA' => $coppa, 'S_COPPA' => $coppa,
'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), 'S_UCP_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
'S_TIME' => 1000 * ((int) $config['min_time_reg']),
) )
); );

21
phpBB/styles/prosilver/template/ucp_agreement.html
View file

@ -1,26 +1,5 @@
<!-- INCLUDE overall_header.html --> <!-- INCLUDE overall_header.html -->
<script type="text/javascript" defer="defer" >
// <![CDATA[
function disable(disabl, name)
{
document.getElementById(name).disabled = disabl;
if (disabl)
{
document.getElementById(name).className = 'button1 disabled';
}
else
{
document.getElementById(name).className = 'button1 enabled';
}
}
<!-- IF S_TIME -->
onload_functions.push('disable(true, "agreed")');
setInterval('disable(false, "agreed")', {S_TIME});
<!-- ENDIF -->
// ]]>
</script>
<!-- IF S_SHOW_COPPA or S_REGISTRATION --> <!-- IF S_SHOW_COPPA or S_REGISTRATION -->

18
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -11,24 +11,6 @@
document.forms['register'].submit.click(); document.forms['register'].submit.click();
} }
function disable(disabl, name)
{
document.getElementById(name).disabled = disabl;
if (disabl)
{
document.getElementById(name).className = 'button1 disabled';
}
else
{
document.getElementById(name).className = 'button1 enabled';
}
}
<!-- IF S_TIME -->
onload_functions.push('disable(true, "submit")');
setInterval('disable(false, "submit")', {S_TIME});
<!-- ENDIF -->
// ]]> // ]]>
</script> </script>

24
phpBB/styles/subsilver2/template/ucp_agreement.html
View file

@ -1,30 +1,6 @@
<!-- INCLUDE overall_header.html --> <!-- INCLUDE overall_header.html -->
<script type="text/javascript" defer="defer" >
// <![CDATA[
var old_func = window.onload;
function disable(disabl)
{
document.getElementById("agreed").disabled = disabl;
}
function disable_and_handle()
{
if (old_func)
{
old_func();
}
disable(true);
}
<!-- IF S_TIME -->
window.onload = disable_and_handle;
setInterval("disable(false)", {S_TIME});
<!-- ENDIF -->
// ]]>
</script>
<!-- IF S_SHOW_COPPA or S_REGISTRATION --> <!-- IF S_SHOW_COPPA or S_REGISTRATION -->

20
phpBB/styles/subsilver2/template/ucp_register.html
View file

@ -11,26 +11,6 @@
document.forms['register'].submit.click(); document.forms['register'].submit.click();
} }
var old_func = window.onload;
function disable(disabl)
{
document.getElementById("submit").disabled = disabl;
}
function disable_and_handle()
{
if (old_func)
{
old_func();
}
disable(true);
}
<!-- IF S_TIME -->
window.onload = disable_and_handle;
setInterval("disable(false)", {S_TIME});
<!-- ENDIF -->
// ]]> // ]]>
</script> </script>