From 5fbf8997145c0d2bf53f8329756483f7dfdf3605 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Tue, 31 Jul 2001 20:06:50 +0000 Subject: [PATCH] More compliance updates + select previous posts in viewtopic git-svn-id: file:///svn/phpbb/trunk@771 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/index.php | 2 +- phpBB/profile.php | 92 +++++++++++++---------- phpBB/templates/PSO/profile_add_body.tpl | 31 ++++---- phpBB/templates/PSO/profile_view_body.tpl | 26 +++---- 4 files changed, 80 insertions(+), 71 deletions(-) diff --git a/phpBB/index.php b/phpBB/index.php index a7c04f27f8..dc13581e40 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -306,7 +306,7 @@ if($total_categories = $db->sql_numrows($q_categories)) "LAST_POST" => $last_post, "MODERATORS" => $moderators_links, - "U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id&" . $forum_rows[$j]['forum_posts'])) + "U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) ); $count++; diff --git a/phpBB/profile.php b/phpBB/profile.php index a3ef9e2219..eeba6a7221 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -58,12 +58,17 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "body" => "profile_view_body.tpl", "jumpbox" => "jumpbox.tpl") ); + $jumpbox = make_jumpbox(); $template->assign_vars(array( + "L_GO" => $lang['Go'], + "L_JUMP_TO" => $lang['Jump_to'], + "L_SELECT_FORUM" => $lang['Select_forum'], "JUMPBOX_LIST" => $jumpbox, "SELECT_NAME" => POST_FORUM_URL) ); $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + // // End header // @@ -99,21 +104,21 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) // Replace the @ with 'at'. Some anti-spam mesures. $email_addr = str_replace("@", " at ", $profiledata['user_email']); $email = "$email_addr"; - $email_img = "\"""; + $email_img = "\"""; } else { $email = $lang['Hidden_email']; - $email_img = $lang['Hidden_email']; + $email_img = ""; } - $avatar_img = ( !empty($profiledata['user_avatar']) ) ? "" : " "; + $avatar_img = ( !empty($profiledata['user_avatar']) ) ? "\"\"" : " "; if($members[$i]['user_icq']) { - $icq_status_img = ""; + $icq_status_img = "\"\""; - $icq_add_img = "\"""; + $icq_add_img = "\"""; } else { @@ -121,18 +126,18 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $icq_add_img = " "; } - $aim_img = ($profiledata['user_aim']) ? "" : " "; + $aim_img = ($profiledata['user_aim']) ? "\""" : " "; - $msnm_img = ($profiledata['user_msnm']) ? "" : " "; + $msnm_img = ($profiledata['user_msnm']) ? "\""" : " "; - $yim_img = ($members[$i]['user_yim']) ? "" : " "; + $yim_img = ($members[$i]['user_yim']) ? "\""" : " "; - $search_img = "\"""; - $search = "" . $lang['Search_user_posts'] . ""; + $search_img = "\"""; + $search = "" . $lang['Search_user_posts'] . ""; - $www_img = ($profiledata['user_website']) ? "\""" : " "; + $www_img = ($profiledata['user_website']) ? "\""" : " "; - $pm_img = "\"""; + $pm_img = "\"""; $template->assign_vars(array( "USERNAME" => stripslashes($profiledata['username']), @@ -147,17 +152,17 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "SEARCH_IMG" => $search_img, "ICQ_ADD_IMG" => $icq_add_img, "ICQ_STATUS_IMG" => $icq_status_img, - "AIM" => ( ($profiledata['user_aim']) ? stripslashes($profiledata['user_aim']) : "" ), + "AIM" => ( ($profiledata['user_aim']) ? stripslashes($profiledata['user_aim']) : " " ), "AIM_IMG" => $aim_img, - "MSN" => ( ($profiledata['user_msnm']) ? stripslashes($profiledata['user_msnm']) : "" ), + "MSN" => ( ($profiledata['user_msnm']) ? stripslashes($profiledata['user_msnm']) : " " ), "MSN_IMG" => $msnm_img, - "YIM" => ( ($profiledata['user_yim']) ? stripslashes($profiledata['user_yim']) : "" ), + "YIM" => ( ($profiledata['user_yim']) ? stripslashes($profiledata['user_yim']) : " " ), "YIM_IMG" => $yim_img, - "WEBSITE" => ( ($profiledata['user_website']) ? stripslashes($profiledata['user_website']) : "" ), + "WEBSITE" => ( ($profiledata['user_website']) ? stripslashes($profiledata['user_website']) : " " ), "WEBSITE_IMG" => $www_img, - "LOCATION" => ( ($profiledatas['user_from']) ? stripslashes($profiledata['user_from']) : "" ), - "OCCUPATION" => ( ($profiledata['user_occ']) ? stripslashes($profiledata['user_occ']) : "" ), - "INTERESTS" => ( ($profiledata['user_interests']) ? stripslashes($profiledata['user_interests']) : "" ), + "LOCATION" => ( ($profiledatas['user_from']) ? stripslashes($profiledata['user_from']) : " " ), + "OCCUPATION" => ( ($profiledata['user_occ']) ? stripslashes($profiledata['user_occ']) : " " ), + "INTERESTS" => ( ($profiledata['user_interests']) ? stripslashes($profiledata['user_interests']) : " " ), "AVATAR_IMG" => $avatar_img, "L_VIEWING_PROFILE" => $lang['Viewing_profile_of'], @@ -176,8 +181,7 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "L_OCCUPATION" => $lang['Occupation'], "L_INTERESTS" => $lang['Interests'], - "U_SEARCH_USER" => append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1"), - "U_USER_WEBSITE" => stripslashes($profiledata['user_website']), + "U_SEARCH_USER" => append_sid("search.$phpEx?a=" . urlencode($profiledata['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1"), "S_PROFILE_ACTION" => append_sid("profile.$phpEx")) ); @@ -215,17 +219,22 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "body" => "agreement.tpl", "jumpbox" => "jumpbox.tpl") ); + $jumpbox = make_jumpbox(); $template->assign_vars(array( + "L_GO" => $lang['Go'], + "L_JUMP_TO" => $lang['Jump_to'], + "L_SELECT_FORUM" => $lang['Select_forum'], "JUMPBOX_LIST" => $jumpbox, "SELECT_NAME" => POST_FORUM_URL) ); $template->assign_var_from_handle("JUMPBOX", "jumpbox"); + $template->assign_vars(array( "COPPA" => $coppa, - "U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&agreed=true"), - "U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&agreed=true&coppa=true")) + "U_AGREE_OVER13" => append_sid("profile.$phpEx?mode=register&agreed=true"), + "U_AGREE_UNDER13" => append_sid("profile.$phpEx?mode=register&agreed=true&coppa=true")) ); $template->pparse("body"); @@ -803,10 +812,10 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $bbcode_status = ($board_config['allow_bbcode']) ? $lang['ON'] : $lang['OFF']; $smilies_status = ($board_config['allow_smilies']) ? $lang['ON'] : $lang['OFF']; - $s_hidden_fields = ''; + $s_hidden_fields = ''; if($mode == "editprofile") { - $s_hidden_fields .= ''; + $s_hidden_fields .= ''; } $template->set_filenames(array( @@ -816,6 +825,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) $jumpbox = make_jumpbox(); $template->assign_vars(array( + "L_GO" => $lang['Go'], + "L_JUMP_TO" => $lang['Jump_to'], + "L_SELECT_FORUM" => $lang['Select_forum'], "JUMPBOX_LIST" => $jumpbox, "SELECT_NAME" => POST_FORUM_URL) ); @@ -833,22 +845,22 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) "LOCATION" => stripslashes($location), "WEBSITE" => stripslashes($website), "SIGNATURE" => stripslashes(str_replace("
", "\n", $signature)), - "VIEW_EMAIL_YES" => ($viewemail) ? "CHECKED" : "", - "VIEW_EMAIL_NO" => (!$viewemail) ? "CHECKED" : "", - "HIDE_USER_YES" => (!$allowviewonline) ? "CHECKED" : "", - "HIDE_USER_NO" => ($allowviewonline) ? "CHECKED" : "", - "NOTIFY_PM_YES" => ($notifypm) ? "CHECKED" : "", - "NOTIFY_PM_NO" => (!$notifypm) ? "CHECKED" : "", - "ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "CHECKED" : "", - "ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "CHECKED" : "", - "ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? "CHECKED" : "", - "ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? "CHECKED" : "", - "ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? "CHECKED" : "", - "ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? "CHECKED" : "", - "ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? "CHECKED" : "", - "ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? "CHECKED" : "", + "VIEW_EMAIL_YES" => ($viewemail) ? "checked=\"checked\"" : "", + "VIEW_EMAIL_NO" => (!$viewemail) ? "checked=\"checked\"" : "", + "HIDE_USER_YES" => (!$allowviewonline) ? "checked=\"checked\"" : "", + "HIDE_USER_NO" => ($allowviewonline) ? "checked=\"checked\"" : "", + "NOTIFY_PM_YES" => ($notifypm) ? "checked=\"checked\"" : "", + "NOTIFY_PM_NO" => (!$notifypm) ? "checked=\"checked\"" : "", + "ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "checked=\"checked\"" : "", + "ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? "checked=\"checked\"" : "", + "ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? "checked=\"checked\"" : "", "ALLOW_AVATAR" => $board_config['allow_avatar_upload'], - "AVATAR" => ($user_avatar != "") ? "" : "", + "AVATAR" => ($user_avatar != "") ? "\"\"" : "", "AVATAR_SIZE" => $board_config['avatar_filesize'], "LANGUAGE_SELECT" => language_select($user_lang), "THEME_SELECT" => theme_select($user_theme), diff --git a/phpBB/templates/PSO/profile_add_body.tpl b/phpBB/templates/PSO/profile_add_body.tpl index e78c25efea..2c5b30afd8 100644 --- a/phpBB/templates/PSO/profile_add_body.tpl +++ b/phpBB/templates/PSO/profile_add_body.tpl @@ -1,33 +1,34 @@ - + +
{SITENAME} {L_INDEX}
- + - -
- - + - + - + - + - + @@ -62,7 +63,7 @@ - + @@ -123,8 +124,8 @@ @@ -134,13 +135,13 @@ - + - + @@ -155,8 +156,8 @@
{L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED}  + 		{L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED}
{L_USERNAME}: *
{L_USER_UNIQ}		{L_USERNAME}: *
{L_USER_UNIQ}
{L_EMAIL_ADDRESS}: *{L_EMAIL_ADDRESS}: *
{L_PASSWORD}: *
{L_PASSWORD_IF_CHANGED}		{L_PASSWORD}: *
{L_PASSWORD_IF_CHANGED}
{L_CONFIRM} {L_PASSWORD}: *
{L_PASSWORD_CONFIRM_IF_CHANGED}		{L_CONFIRM} {L_PASSWORD}: *
{L_PASSWORD_CONFIRM_IF_CHANGED}
{L_PROFILE_INFO}
{L_PROFILE_INFO_NOTICE}		{L_PROFILE_INFO}
{L_PROFILE_INFO_NOTICE}
{L_ICQ_NUMBER}:
{L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN}

{L_HTML_IS} {HTML_STATUS}
{L_BBCODE_IS} {BBCODE_STATUS}
{L_SMILIES_ARE} {SMILIES_STATUS}		{L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN}

{L_HTML_IS} {HTML_STATUS}
{L_BBCODE_IS} {BBCODE_STATUS}
{L_SMILIES_ARE} {SMILIES_STATUS}
- - + +
{L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
{AVATAR}
 {L_DELETE_AVATAR}		{L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
{AVATAR}
 {L_DELETE_AVATAR}
{L_UPLOAD_AVATAR_URL}:
{L_UPLOAD_AVATAR_URL_EXPLAIN}		{L_UPLOAD_AVATAR_URL}:
{L_UPLOAD_AVATAR_URL_EXPLAIN}
{L_LINK_REMOTE_AVATAR}:
{L_LINK_REMOTE_AVATAR_EXPLAIN}		{L_LINK_REMOTE_AVATAR}:
{L_LINK_REMOTE_AVATAR_EXPLAIN}
{S_HIDDEN_FIELDS}  
+ + diff --git a/phpBB/templates/PSO/profile_view_body.tpl b/phpBB/templates/PSO/profile_view_body.tpl index 04ddefa618..cf9e8d2aa8 100644 --- a/phpBB/templates/PSO/profile_view_body.tpl +++ b/phpBB/templates/PSO/profile_view_body.tpl @@ -8,7 +8,7 @@ - + @@ -32,39 +32,33 @@ - +
{L_VIEWING_PROFILE} {USERNAME}{L_VIEWING_PROFILE} {USERNAME}
{L_USERNAME}:     [ {PERCENTAGE} {L_OF_TOTAL} / {POSTS_PER_DAY} {L_PER_DAY}]     {SEARCH_IMG}{SEARCH_IMG}
{L_CONTACT}: - - - - - - -
{EMAIL_IMG}     {PM_IMG}
+ {PM_IMG} {EMAIL_IMG} {L_ICQ_NUMBER}: - {ICQ_IMG} + {ICQ_IMG} {L_AIM}: - {AIM_IMG} + {AIM_IMG} {L_MESSENGER}: - {MSN_IMG} + {MSN_IMG} {L_YAHOO}: - {YIM_IMG} + {YIM_IMG} {L_WEBSITE}: - {WEBSITE_IMG} + {WEBSITE_IMG} {L_LOCATION}: @@ -82,9 +76,11 @@ +
+ - +
{S_TIMEZONE}{JUMPBOX}{JUMPBOX}