diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 78a71c9b2a..ddce69b9a2 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -102,6 +102,13 @@ $template->set_filenames(array( $template->assign_vars(array( "S_CONFIG_ACTION" => append_sid("admin_board.$phpEx"), "SITENAME" => $new['sitename'], + "L_YES" => $lang['Yes'], + "L_NO" => $lang['No'], + "L_CONFIGURATION_TITLE" => $lang['General_Config'], + "L_CONFIGURATION_EXPLAIN" => $lang['Config_explain'], + "L_GENERAL_SETTINGS" => $lang['General_settings'], + "L_SITE_NAME" => $lang['Site_name'], + "L_ACCT_ACTIVATION" => $lang['Acct_activation'], "ACTIVATION_NONE" => USER_ACTIVATION_NONE, "ACTIVATION_NONE_CHECKED" => $activation_none, "ACTIVATION_USER" => USER_ACTIVATION_SELF, @@ -148,7 +155,9 @@ $template->assign_vars(array( "EMAIL_SIG" => $new['board_email_sig'], "SMTP_YES" => $smtp_yes, "SMTP_NO" => $smtp_no, - "SMTP_HOST" => $new['smtp_host']) + "SMTP_HOST" => $new['smtp_host'], + "COPPA_MAIL" => $new['coppa_mail'], + "COPPA_FAX" => $new['coppa_fax']) ); $template->pparse("body"); diff --git a/phpBB/db/mysql_basic.sql b/phpBB/db/mysql_basic.sql index ce52b05bf8..7fa9606d02 100644 --- a/phpBB/db/mysql_basic.sql +++ b/phpBB/db/mysql_basic.sql @@ -47,6 +47,8 @@ INSERT INTO phpbb_config VALUES ('default_dateformat','D M d, Y g:i a'); INSERT INTO phpbb_config VALUES ('board_timezone','0'); INSERT INTO phpbb_config VALUES ('prune_enable','1'); INSERT INTO phpbb_config VALUES ('gzip_compress','1'); +INSERT INTO phpbb_config VALUES ('coppa_fax', '(555) 555-5555'); +INSERT INTO phpbb_config VALUES ('coppa_mail', 'Jimbo Jones, 1234 Fake St, Fakeville USA, 12345'); # -- Categories diff --git a/phpBB/language/email/coppa_welcome_inactive_english.tpl b/phpBB/language/email/coppa_welcome_inactive_english.tpl new file mode 100755 index 0000000000..dfa2b459a5 --- /dev/null +++ b/phpBB/language/email/coppa_welcome_inactive_english.tpl @@ -0,0 +1,50 @@ +{WELCOME_MSG} + +In compliance with the COPPA act your account is currently inactive. + +Please print this message out and have your parent or guardian sign and date it. Then fax it to: + +{FAX_INFO} + +OR mail it to: + +{MAIL_INFO} + +------------------------------ CUT HERE ------------------------------ +Permission to Participate at {SITENAME} + +Username: {USERNAME} +Password: {PASSWORD} +Email: {EMAIL_ADDRESS} + +ICQ Number: {ICQ} +AIM Address: {AIM} +MSN Messenger: {MSN} +Yahoo Messenger: {YIM} +Web Site: {WEB_SITE} +From: {FROM} +Occupation: {OCC} +Interests: {INTERESTS} + +I HAVE REVIEWED THE INFORMATION PROVIDED BY MY CHILD AND HEREBY GRANT PERMISSION TO {SITENAME} TO STORE THIS INFORMATION. +I UNDERSTAND THIS INFORMATION CAN BE CHANGED AT ANY TIME BY ENTERING A PASSWORD. +I UNDERSTAND THAT MAY REQUEST FOR THIS INFORMATION TO BE REMOVED FROM {SITENAME} AT ANY TIME. + + +Parent or Guardian +(print your name here): _____________________ + +(sign here): __________________ + +Date: _______________ + +------------------------------ CUT HERE ------------------------------ + + +Once the administrator has recived the above form via fax or regular mail your account will be activated. + +Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. + +Thank you for registering. + +{EMAIL_SIG} \ No newline at end of file diff --git a/phpBB/profile.php b/phpBB/profile.php index cebec6366f..81572e15ef 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -259,22 +259,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) if( !empty($profiledata['user_icq']) ) { - $icq_status_img = "\"\""; + $icq_status_img = "\"\""; - // - // This cannot stay like this, it needs a 'proper' solution, eg a separate - // template for overlaying the ICQ icon, or we just do away with the icq status - // display (which is after all somewhat a pain in the rear :D - // - if( $theme['template_name'] == "subSilver" ) - { - $icq_add_img = '
' . $icq_status_img . '' . $lang['ICQ'] . '
'; - $icq_status_img = ""; - } - else - { - $icq_add_img = "\"""; - } + $icq_add_img = "\"""; } else { @@ -971,6 +958,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) else if( $coppa ) { $message = $lang['COPPA']; + $email_template = "coppa_welcome_inactive"; } else { @@ -978,48 +966,71 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $email_template = "user_welcome"; } - if( !$coppa ) + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; + + $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + + $emailer->use_template($email_template); + $emailer->email_address($email); + $emailer->set_subject($lang['Welcome_subject']); + $emailer->extra_headers($email_headers); + + if($coppa) { - include($phpbb_root_path . 'includes/emailer.'.$phpEx); - $emailer = new emailer($board_config['smtp_delivery']); - - $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; - - $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); - - $emailer->use_template($email_template); - $emailer->email_address($email); - $emailer->set_subject($lang['Welcome_subject']); - $emailer->extra_headers($email_headers); - $emailer->assign_vars(array( "WELCOME_MSG" => $lang['Welcome_subject'], "USERNAME" => $username, "PASSWORD" => $password_confirm, "EMAIL_SIG" => str_replace("
", "\n", "-- \n" . $board_config['board_email_sig']), + "U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey", + "FAX_INFO" => $board_config['coppa_fax'], + "MAIL_INFO" => $board_config['coppa_mail'], + "EMAIL_ADDRESS" => $email, + "ICQ" => $icq, + "AIM" => $aim, + "YIM" => $yim, + "MSN" => $msn, + "WEB_SITE" => $website, + "FROM" => $location, + "OCC" => $occupation, + "INTERESTS" => $interests, + "SITENAME" => $board_config['sitename'])); + } + else + { + $emailer->assign_vars(array( + "WELCOME_MSG" => $lang['Welcome_subject'], + "USERNAME" => $username, + "PASSWORD" => $password_confirm, + "EMAIL_SIG" => str_replace("
", "\n", "-- \n" . $board_config['board_email_sig']), + + "U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey") + ); + } + + $emailer->send(); + $emailer->reset(); + + if( $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) + { + $emailer->use_template("admin_activate"); + $emailer->email_address($board_config['board_email']); + $emailer->set_subject($lang['New_account_subject']); + $emailer->extra_headers($email_headers); + + $emailer->assign_vars(array( + "WELCOME_MSG" => $lang['Welcome_subject'], + "USERNAME" => $username, + "EMAIL_SIG" => str_replace("
", "\n", "-- \n" . $board_config['board_email_sig']), + "U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey") ); $emailer->send(); $emailer->reset(); - - if( $board_config['require_activation'] == USER_ACTIVATION_ADMIN ) - { - $emailer->use_template("admin_activate"); - $emailer->email_address($board_config['board_email']); - $emailer->set_subject($lang['New_account_subject']); - $emailer->extra_headers($email_headers); - - $emailer->assign_vars(array( - "WELCOME_MSG" => $lang['Welcome_subject'], - "USERNAME" => $username, - "EMAIL_SIG" => str_replace("
", "\n", "-- \n" . $board_config['board_email_sig']), - - "U_ACTIVATE" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/profile.$phpEx?mode=activate&act_key=$user_actkey") - ); - $emailer->send(); - $emailer->reset(); - } } $template->assign_vars(array( diff --git a/phpBB/templates/PSO/admin/admin_config_body.tpl b/phpBB/templates/PSO/admin/admin_config_body.tpl index bec837c356..100b03ea2b 100644 --- a/phpBB/templates/PSO/admin/admin_config_body.tpl +++ b/phpBB/templates/PSO/admin/admin_config_body.tpl @@ -139,6 +139,17 @@ SMTP Server + + COPPA Settings + + + FAX Number + + + + Mailing Address
Signed COPPA agreements will be mailed here + + {S_HIDDEN_FIELDS} diff --git a/phpBB/templates/subSilver/admin/admin_config_body.tpl b/phpBB/templates/subSilver/admin/admin_config_body.tpl index bec837c356..baf19aeba4 100644 --- a/phpBB/templates/subSilver/admin/admin_config_body.tpl +++ b/phpBB/templates/subSilver/admin/admin_config_body.tpl @@ -139,10 +139,22 @@ SMTP Server + + COPPA Settings + + + FAX Number + + + + Mailing Address
Signed COPPA agreements will be mailed here + + {S_HIDDEN_FIELDS} +