mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 06:55:25 +02:00
Code Issues Releases Wiki Activity

Moved agreement text to lang_main

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1590 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-12-15 16:51:04 +00:00
parent 10983563b3
commit 0e78572ee9
3 changed files with 52 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/language/lang_english/lang_main.php
View File

@ -178,6 +178,8 @@ $lang['Forgotten_password'] = "I forgot my password";
$lang['Log_me_in'] = "Log me on automatically each visit";
$lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password";
//
// Index page
@ -541,6 +543,13 @@ $lang['Account_active_admin'] = "The account has now been activated";
$lang['Reactivate'] = "Reactivate your account!";
$lang['COPPA'] = "Your account has been created but has to be approved, please check your email for details.";
$lang['Registration'] = "Registration Agreement Terms";
$lang['Reg_agreement'] = "While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.";
$lang['Agree_under_13'] = "I Agree to these terms and am <b>under</b> 13 years of age";
$lang['Agree_over_13'] = "I Agree to these terms and am <b>over</b> 13 years of age";
$lang['Agree_not'] = "I do not agree to these terms";
$lang['Wrong_activation'] = "The activation key you supplied does not match any in the database";
$lang['Send_password'] = "Send me a new password";
$lang['Password_updated'] = "A new password has been created, please check your email for details on how to activate it";
@ -859,7 +868,7 @@ $lang['days_long'][6] = "Saturday";
$lang['days_short'][0] = "Sun";
$lang['days_short'][1] = "Mon";
$lang['days_short'][2] = "Tue";
$lang['days_short'][3] = "Web";
$lang['days_short'][3] = "Wed";
$lang['days_short'][4] = "Thu";
$lang['days_short'][5] = "Fri";
$lang['days_short'][6] = "Sat";
@ -902,10 +911,8 @@ $lang['Critical_Error'] = "Critical Error";
$lang['An_error_occured'] = "An Error Occurred";
$lang['A_critical_error'] = "A Critical Error Occurred";
$lang['Error_login'] = "You have specified an incorrect or inactive username or an invalid password";
//
// That's all Folks!
// -------------------------------------------------
?>
?>

51
phpBB/profile.php
View File

@ -456,6 +456,11 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
$template->assign_vars(array(
"COPPA" => $coppa,
"REGISTRATION" => $lang['Registration'],
"AGREEMENT" => $lang['Reg_agreement'],
"AGREE_OVER_13" => $lang['Agree_over_13'],
"AGREE_UNDER_13" => $lang['Agree_under_13'],
"DO_NOT_AGREE" => $lang['Agree_not'],
"U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&amp;agreed=true"),
"U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&amp;agreed=true&amp;coppa=true"))
@ -523,6 +528,28 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
$user_avatar = ( empty($user_avatar_loc) && $mode == "editprofile" ) ? $userdata['user_avatar'] : "";
$user_avatar_type = ( empty($user_avatar_loc) && $mode == "editprofile" ) ? $userdata['user_avatar_type'] : "";
if( isset($HTTP_POST_VARS['avatargallery']) || isset($HTTP_POST_VARS['submitavatar']) || isset($HTTP_POST_VARS['cancelavatar']) )
{
$username = stripslashes($username);
$email = stripslashes($email);
$password = "";
$password_confirm = "";
$icq = stripslashes($icq);
$aim = stripslashes($aim);
$msn = stripslashes($msn);
$yim = stripslashes($yim);
$website = stripslashes($website);
$location = stripslashes($location);
$occupation = stripslashes($occupation);
$interests = stripslashes($interests);
$signature = stripslashes($signature);
$user_lang = stripslashes($user_lang);
$user_dateformat = stripslashes($user_dateformat);
}
}
if( isset($HTTP_POST_VARS['submit']) )
@ -1383,17 +1410,17 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
$s_hidden_vars = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
$s_hidden_vars .= '<input type="hidden" name="user_id" value="' . $user_id . '" />';
$s_hidden_vars .= '<input type="hidden" name="username" value="' . addslashes($username) . '" />';
$s_hidden_vars .= '<input type="hidden" name="email" value="' . addslashes($email) . '" />';
$s_hidden_vars .= '<input type="hidden" name="icq" value="' . addslashes($icq) . '" />';
$s_hidden_vars .= '<input type="hidden" name="aim" value="' . addslashes($aim) . '" />';
$s_hidden_vars .= '<input type="hidden" name="msn" value="' . addslashes($msn) . '" />';
$s_hidden_vars .= '<input type="hidden" name="yim" value="' . addslashes($yim) . '" />';
$s_hidden_vars .= '<input type="hidden" name="website" value="' . addslashes($website) . '" />';
$s_hidden_vars .= '<input type="hidden" name="location" value="' . addslashes($location) . '" />';
$s_hidden_vars .= '<input type="hidden" name="occupation" value="' . addslashes($occupation) . '" />';
$s_hidden_vars .= '<input type="hidden" name="interests" value="' . addslashes($interests) . '" />';
$s_hidden_vars .= '<input type="hidden" name="signature" value="' . addslashes($signature) . '" />';
$s_hidden_vars .= '<input type="hidden" name="username" value="' . $username . '" />';
$s_hidden_vars .= '<input type="hidden" name="email" value="' . $email . '" />';
$s_hidden_vars .= '<input type="hidden" name="icq" value="' . $icq . '" />';
$s_hidden_vars .= '<input type="hidden" name="aim" value="' . $aim . '" />';
$s_hidden_vars .= '<input type="hidden" name="msn" value="' . $msn . '" />';
$s_hidden_vars .= '<input type="hidden" name="yim" value="' . $yim . '" />';
$s_hidden_vars .= '<input type="hidden" name="website" value="' . $website . '" />';
$s_hidden_vars .= '<input type="hidden" name="location" value="' . $location . '" />';
$s_hidden_vars .= '<input type="hidden" name="occupation" value="' . $occupation . '" />';
$s_hidden_vars .= '<input type="hidden" name="interests" value="' . $interests . '" />';
$s_hidden_vars .= '<input type="hidden" name="signature" value="' . $signature . '" />';
$s_hidden_vars .= '<input type="hidden" name="viewemail" value="' . $viewemail . '" />';
$s_hidden_vars .= '<input type="hidden" name="notifypm" value="' . $notifypm . '" />';
$s_hidden_vars .= '<input type="hidden" name="popup_pm" value="' . $popuppm . '" />';
@ -1406,7 +1433,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
$s_hidden_vars .= '<input type="hidden" name="style" value="' . $user_style . '" />';
$s_hidden_vars .= '<input type="hidden" name="language" value="' . $user_lang . '" />';
$s_hidden_vars .= '<input type="hidden" name="timezone" value="' . $user_timezone . '" />';
$s_hidden_vars .= '<input type="hidden" name="dateformat" value="' . addslashes($user_dateformat) . '" />';
$s_hidden_vars .= '<input type="hidden" name="dateformat" value="' . $user_dateformat . '" />';
$template->assign_vars(array(
"L_AVATAR_GALLERY" => $lang['Avatar_gallery'],

44
phpBB/templates/subSilver/agreement.tpl
View File

@ -7,53 +7,13 @@
<table width="100%" border="0" cellspacing="1" cellpadding="3" class="forumline">
<tr>
<th valign="middle" class="thHead" height="25"><span class="tableTitle">{SITENAME}
- Forums Registration Agreement</span></th>
- {REGISTRATION}</span></th>
</tr>
<tr>
<td align="center" class="row1">
<table width="80%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td><span class="genmed"><br />
While the administrators and moderators of this forum will attempt
to remove or edit any generally objectionable material as quickly
as possible, it is impossible to review every message. Therefore you
acknowledge that all posts made to these forums express the views
and opinions of the author and not the administrators, moderators
or webmaster (except for posts by these people) and hence will not
be held liable.<br />
<br />
You agree not to post any abusive, obscene, vulgar, slanderous, hateful,
threatening, sexually-orientated or any other material that may violate
any applicable laws. Doing so may lead to you being immediately and
permanently banned (and your service provider being informed). The
IP address of all posts is recorded to aid in enforcing these conditions.
You agree that the webmaster, administrator and moderators of this
forum have the right to remove, edit, move or close any topic at any
time should they see fit. As a user you agree to any information you
have entered above being stored in a database. While this information
will not be disclosed to any third party without your consent the
webmaster, administrator and moderators cannot be held responsible
for any hacking attempt that may lead to the data being compromised.<br />
<br />
This forum system uses cookies to store information on your local
computer. These cookies do not contain any of the information you
have entered above, they serve only to improve your viewing pleasure.
The email address is used only for confirming your registration details
and password (and for sending new passwords should you forget your
current one).<br />
<br />
By clicking Register below you agree to be bound by these conditions.<br />
<br />
<br />
<div align="center"><a href="{U_AGREE_OVER13}" class="genmed">I Agree to these terms
(and am over 13 years of age)</a><br />
<br />
<a href="{U_AGREE_UNDER13}" class="genmed">I Agree to these terms (and am <b>under</b>
13 years of age)</a><br />
<br />
<a href="{U_INDEX}" class="genmed">I do not agree to these terms</a></div>
<br />
</span></td>
<td><span class="genmed"><br />{AGREEMENT}<br /><br /><br /><div align="center"><a href="{U_AGREE_OVER13}" class="genmed">{AGREE_OVER_13}</a><br /><br /><a href="{U_AGREE_UNDER13}" class="genmed">{AGREE_UNDER_13}</a><br /><br /><a href="{U_INDEX}" class="genmed">{DO_NOT_AGREE}</a></div><br /></span></td>
</tr>
</table>
</td>