[Phpbb-checkins] CVS: phpBB2 profile.php,1.171,1.172

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv17022

Modified Files:
	profile.php 
Log Message:
Fix display of HTML, BBCode, Smilies status next to signature to reflect global + user settings

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -r1.171 -r1.172
*** profile.php	2002/01/24 03:19:36	1.171
--- profile.php	2002/01/25 02:37:04	1.172
***************
*** 386,390 ****
  			"L_INTERESTS" => $lang['Interests'],
  
! 			"U_SEARCH_USER" => append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=posts"),
  
  			"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
--- 386,390 ----
  			"L_INTERESTS" => $lang['Interests'],
  
! 			"U_SEARCH_USER" => append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username'])),
  
  			"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
***************
*** 1462,1469 ****
  			}
  
- 			$html_status =  ($userdata['user_allowhtml']) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
- 			$bbcode_status = ($userdata['user_allowbbcode']) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
- 			$smilies_status = ($userdata['user_allowsmile']) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
- 
  			$signature = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $signature);
  
--- 1462,1465 ----
***************
*** 1501,1504 ****
--- 1497,1504 ----
  			}
  
+ 			$html_status =  ( $userdata['user_allowhtml'] && $board_config['allow_html'] ) ? $lang['HTML_is_ON'] : $lang['HTML_is_OFF'];
+ 			$bbcode_status = ( $userdata['user_allowbbcode'] && $board_config['allow_bbcode']  ) ? $lang['BBCode_is_ON'] : $lang['BBCode_is_OFF'];
+ 			$smilies_status = ( $userdata['user_allowsmile'] && $board_config['allow_smilies']  ) ? $lang['Smilies_are_ON'] : $lang['Smilies_are_OFF'];
+ 
  			include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
***************
*** 1547,1568 ****
  				"WEBSITE" => $website,
  				"SIGNATURE" => str_replace("<br />", "\n", $signature),
! 				"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\"" : "",
! 				"POPUP_PM_YES" => ($popuppm) ? "checked=\"checked\"" : "",
! 				"POPUP_PM_NO" => (!$popuppm) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "checked=\"checked\"" : "",
! 				"ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "checked=\"checked\"" : "",
! 				"NOTIFY_REPLY_YES" => ($notifyreply) ? "checked=\"checked\"" : "",
! 				"NOTIFY_REPLY_NO" => (!$notifyreply) ? "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" => $avatar_img,
--- 1547,1568 ----
  				"WEBSITE" => $website,
  				"SIGNATURE" => str_replace("<br />", "\n", $signature),
! 				"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"' : '',
! 				"POPUP_PM_YES" => ($popuppm) ? 'checked="checked"' : '',
! 				"POPUP_PM_NO" => (!$popuppm) ? 'checked="checked"' : '',
! 				"ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? 'checked="checked"' : '',
! 				"ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? 'checked="checked"' : '',
! 				"NOTIFY_REPLY_YES" => ($notifyreply) ? 'checked="checked"' : '',
! 				"NOTIFY_REPLY_NO" => (!$notifyreply) ? '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" => $avatar_img,