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

Noted HTML,BBCode,Smilies status for signatures

Browse source 
git-svn-id: file:///svn/phpbb/trunk@733 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-07-23 16:43:10 +00:00
parent 5cea36a3b6
commit 273314d0be
7 changed files with 40 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/language/lang_english.php
View file

@ -373,6 +373,11 @@ $lang['Public_view_email'] = "Always show my Email Address";
$lang['password_if_changed'] = "You only need to supply a password if you want to change it";
$lang['password_confirm_if_changed'] = "You only need to confirm your password if you changed it above";
$lang['is'] = "is"; // follows HTML or BBCode
$lang['are'] = "are"; // follows Smilies
$lang['OFF'] = "OFF";
$lang['ON'] = "ON";
$lang['Avatar'] = "Avatar";
$lang['Avatar_explain'] = "Displays a small graphic image below your details in posts. Only one image can be displayed at a time, its width can be no greater than " . $board_config['avatar_max_width'] . " pixels, a height no greater than " . $board_config['avatar_max_height'] . " pixels and a file size no more than " . (round($board_config['avatar_filesize'] / 1024)) . " kB.";
$lang['Upload_Avatar_file'] = "Upload Avatar from your machine";

19
phpBB/posting.php
View file

@ -487,6 +487,7 @@ if( ($mode == "newtopic" || $mode == "reply") && $topic_status == TOPIC_UNLOCKED
if($db->sql_query($sql, END_TRANSACTION))
{
setcookie('phpbb2_' . $forum_id . '_' . $new_topic_id, '', 0, $cookiepath, $cookiedomain, $cookiesecure);
//
// If we get here the post has been inserted successfully.
//
@ -1076,7 +1077,7 @@ $message_input = '<textarea name="message" rows="10" cols="40" wrap="virtual">'.
if($board_config['allow_html'])
{
$html_status = $lang['HTML'] . $lang['is_ON'];
$html_status = $lang['ON'];
$html_toggle = '<input type="checkbox" name="disable_html" ';
if($disable_html)
{
@ -1086,12 +1087,12 @@ if($board_config['allow_html'])
}
else
{
$html_status = $lang['HTML'] . $lang['is_OFF'];
$html_status = $lang['OFF'];
}
if($board_config['allow_bbcode'])
{
$bbcode_status = $lang['BBCode'] . $lang['is_ON'];
$bbcode_status = $lang['ON'];
$bbcode_toggle = '<input type="checkbox" name="disable_bbcode" ';
if($disable_bbcode)
{
@ -1101,11 +1102,12 @@ if($board_config['allow_bbcode'])
}
else
{
$bbcode_status = $lang['BBCode'] . $lang['is_OFF'];
$bbcode_status = $lang['OFF'];
}
if($board_config['allow_smilies'])
{
$smilies_status = $lang['ON'];
$smile_toggle = '<input type="checkbox" name="disable_smile" ';
if($disable_smilies)
{
@ -1113,6 +1115,11 @@ if($board_config['allow_smilies'])
}
$smile_toggle .= "> " . $lang['Disable'] . $lang['Smilies'] . $lang['in_this_post'];
}
else
{
$smilies_status = $lang['OFF'];
}
$sig_toggle = '<input type="checkbox" name="attach_sig" ';
if($attach_sig)
@ -1216,6 +1223,7 @@ $template->assign_vars(array(
"MESSAGE_INPUT" => $message_input,
"HTML_STATUS" => $html_status,
"HTML_TOGGLE" => $html_toggle,
"SMILIES_STATUS" => $smilies_status,
"SMILE_TOGGLE" => $smile_toggle,
"SIG_TOGGLE" => $sig_toggle,
"NOTIFY_TOGGLE" => $notify_toggle,
@ -1232,6 +1240,9 @@ $template->assign_vars(array(
"L_CANCEL" => $lang['Cancel_post'],
"L_CONFIRM_DELETE" => $lang['Confirm_delete'],
"L_POST_A" => $post_a,
"L_HTML_IS" => $lang['HTML'] . " " . $lang['is'],
"L_BBCODE_IS" => $lang['BBCode'] . " " . $lang['is'],
"L_SMILIES_ARE" => $lang['Smilies'] . " " . $lang['are'],
"S_TOPIC_ID" => $topic_id,

11
phpBB/profile.php
View file

@ -950,6 +950,10 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
$selected_template = $board_config['default_template'];
}
$html_status = ($board_config['allow_html']) ? $lang['ON'] : $lang['OFF'];
$bbcode_status = ($board_config['allow_bbcode']) ? $lang['ON'] : $lang['OFF'];
$smilies_status = ($board_config['allow_smilies']) ? $lang['ON'] : $lang['OFF'];
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '"><input type="hidden" name="agreed" value="true"><input type="hidden" name="coppa" value="' . $coppa . '">';
if($mode == "editprofile")
{
@ -1002,6 +1006,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
"TIMEZONE_SELECT" => tz_select($user_timezone),
"DATE_FORMAT" => stripslashes($user_dateformat),
"TEMPLATE_SELECT" => template_select($user_template),
"HTML_STATUS" => $html_status,
"BBCODE_STATUS" => $bbcode_status,
"SMILIES_STATUS" => $smilies_status,
"L_PASSWORD_IF_CHANGED" => ($mode == "editprofile") ? $lang['password_if_changed'] : "",
"L_PASSWORD_CONFIRM_IF_CHANGED" => ($mode == "editprofile") ? $lang['password_confirm_if_changed'] : "",
@ -1053,6 +1060,10 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
"L_CONFIRM" => $lang['Confirm'],
"L_EMAIL_ADDRESS" => $lang['Email_address'],
"L_HTML_IS" => $lang['HTML'] . " " . $lang['is'],
"L_BBCODE_IS" => $lang['BBCode'] . " " . $lang['is'],
"L_SMILIES_ARE" => $lang['Smilies'] . " " . $lang['are'],
"S_ALLOW_AVATAR_UPLOAD" => $board_config['allow_avatar_upload'],
"S_ALLOW_AVATAR_LOCAL" => $board_config['allow_avatar_local'],
"S_ALLOW_AVATAR_REMOTE" => $board_config['allow_avatar_remote'],

2
phpBB/templates/Default/posting_body.tpl
View file

@ -47,7 +47,7 @@ function addBBcode(bbCode)
</tr>
<tr class="tablebody">
<td bgcolor="#DDDDDD">{L_MESSAGE_BODY}<br><br>
{HTML_STATUS}<br>{BBCODE_STATUS}</td>
{L_HTML_IS} <u>{HTML_STATUS}</u><br>{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br>{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></td>
<td bgcolor="#CCCCCC">
<table border="0" with="100%">
<tr><td>{MESSAGE_INPUT}</td>

2
phpBB/templates/Default/profile_add_body.tpl
View file

@ -59,7 +59,7 @@
<td bgcolor="#CCCCCC"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}"></td>
</tr>
<tr class="tablebody">
<td bgcolor="#DDDDDD"><b>{L_SIGNATURE}:</b><br><font style="{font-size: 8pt;}">{L_SIGNATURE_EXPLAIN}</font></td>
<td bgcolor="#DDDDDD"><b>{L_SIGNATURE}:</b><br><font style="{font-size: 8pt;}">{L_SIGNATURE_EXPLAIN}<br><br>{L_HTML_IS} <u>{HTML_STATUS}</u><br>{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br>{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></font></td>
<td bgcolor="#CCCCCC"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td>
</tr>
<tr class="tableheader">

25
phpBB/templates/PSO/posting_body.tpl
View file

@ -11,42 +11,27 @@ function insertCode(formObj, selectObj)
formObj.message.value += selectObj.options[selectObj.selectedIndex].value;
return;
}
function submit_check_alert(formObj)
{
<!--
if(formObj.elements["delete"] == "defined")
{
if(formObj.elements["delete"].checked)
{
result = confirm("{L_CONFIRM_DELETE}");
if(!result)
{
return false;
}
}
}
//-->
return true;
}
//-->
</script>
<table width="80%" cellpadding="1" cellspacing="0" border="0" align="center">
<tr><form action="{S_POST_ACTION}" method="POST" onSubmit="return submit_check_alert(this);">
<tr><form action="{S_POST_ACTION}" method="POST">
<td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
<tr>
<th class="secondary" colspan="2"><b>{L_POST_A}</b></td>
<td class="cat" colspan="2"><span class="cattitle"><b>{L_POST_A}</b></span></td>
</tr>
<!-- IF $S_ANON_USER eq TRUE -->
<tr>
<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
<td class="row2">{USERNAME_INPUT}</td>
</tr>
<!-- ENDIF -->
<tr>
<td class="row1"><span class="gen"><b>{L_SUBJECT}</b></span></td>
<td class="row2"><span class="courier">{SUBJECT_INPUT}</span></td>
</tr>
<tr>
<td class="row1"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br><br><span class="gensmall">{HTML_STATUS}<br>{BBCODE_STATUS}</span></td>
<td class="row1"><span class="gen"><b>{L_MESSAGE_BODY}</b></span><br><br><span class="gensmall">{L_HTML_IS} <u>{HTML_STATUS}</u><br>{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br>{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td><span class="gen">{MESSAGE_INPUT}</span></td>

2
phpBB/templates/PSO/profile_add_body.tpl
View file

@ -62,7 +62,7 @@
<td class="row2"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}"></td>
</tr>
<tr>
<td class="row1"><span class="gen">{L_SIGNATURE}:</b></span><br /><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_SIGNATURE_EXPLAIN}</span></td>
<td class="row1"><span class="gen">{L_SIGNATURE}:</b></span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br><br>{L_HTML_IS} <u>{HTML_STATUS}</u><br>{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br>{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
<td class="row2"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td>
</tr>
<tr>