makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

More minor changes

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3004 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-11-01 15:40:22 +00:00
parent ab669d0f04
commit ac0c0f5247
4 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/functions_posting.php
View file

@ -46,7 +46,7 @@ class parse_message
// Message length check
if (!strlen($message) || ($config['max_post_chars'] && strlen($message) > intval($config['max_post_chars'])))
{
$warn_msg .= ( !strlen($message) ) ? $user->lang['Too_few_chars'] . '<br />' : $user->lang['Too_many_chars'] . '<br />';
$warn_msg .= (($warn_msg != '') ? '<br />' : '') . (!strlen($message)) ? $user->lang['Too_few_chars'] : $user->lang['Too_many_chars'];
}
// Smiley check
@ -66,7 +66,7 @@ class parse_message
if ($match > intval($config['max_post_smilies']))
{
$warn_msg .= $user->lang['Too_many_smilies'] . '<br />';
$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $user->lang['Too_many_smilies'];
break;
}
}
@ -82,11 +82,11 @@ class parse_message
return $warn_msg;
}
$warn_msg .= $this->html($message, $html);
$warn_msg .= $this->bbcode($message, $bbcode, $uid);
$warn_msg .= $this->emoticons($message, $smilies);
$warn_msg .= $this->magic_url($message, $url);
$warn_msg .= $this->attach($_FILE);
$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->html($message, $html);
$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->bbcode($message, $bbcode, $uid);
$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->emoticons($message, $smilies);
$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->magic_url($message, $url);
$warn_msg .= (($warn_msg != '') ? '<br />' : '') . $this->attach($_FILE);
return $warn_msg;
}

2
phpBB/language/en/lang_main.php
View file

@ -232,6 +232,7 @@ $lang = array_merge($lang, array(
'Edit_delete_post' => 'Edit/Delete this post',
'View_IP' => 'View IP of poster',
'Delete_post' => 'Delete this post',
'Delete_post_warn' => 'Once deleted the post cannot be recovered',
'wrote' => 'wrote',
'Quote' => 'Quote',
'Code' => 'Code',
@ -275,6 +276,7 @@ $lang = array_merge($lang, array(
'Empty_subject' => 'You must specify a subject when posting a new topic',
'To_long_subject' => 'The subject is too long it must be 60 characters or less',
'Empty_message' => 'You must enter a message when posting',
'Too_few_chars' => 'Your message contains too few characters',
'Too_many_chars' => 'Your message contains too many characters',
'Too_many_smilies' => 'Your message contains too many emoticons',
'Forum_locked' => 'This forum is locked you cannot post, reply to or edit topics',

3
phpBB/posting.php
View file

@ -628,7 +628,7 @@ $template->assign_vars(array(
'TOPIC_TITLE' => ($mode != 'post') ? $topic_title : '',
'USERNAME' => $post_username,
'SUBJECT' => (!empty($topic_title)) ? $topic_title : $post_subject,
'MESSAGE' => $post_text,
'MESSAGE' => trim($post_text),
'HTML_STATUS' => ($html_status) ? $user->lang['HTML_is_ON'] : $user->lang['HTML_is_OFF'],
'BBCODE_STATUS' => ($bbcode_status) ? sprintf($user->lang['BBCode_is_ON'], '<a href="' . "faq.$phpEx$SID&amp;mode=bbcode" . '" target="_phpbbcode">', '</a>') : sprintf($user->lang['BBCode_is_OFF'], '<a href="' . "faq.$phpEx$SID&amp;mode=bbcode" . '" target="_phpbbcode">', '</a>'),
'SMILIES_STATUS' => ($smilies_status) ? $user->lang['Smilies_are_ON'] : $user->lang['Smilies_are_OFF'],
@ -657,6 +657,7 @@ $template->assign_vars(array(
'L_ATTACH_SIGNATURE' => $user->lang['Attach_signature'],
'L_NOTIFY_ON_REPLY' => $user->lang['Notify'],
'L_DELETE_POST' => $user->lang['Delete_post'],
'L_DELETE_WARN' => $user->lang['Delete_post_warn'],
'L_NONE' => $user->lang['None'],
'L_EMPTY_MESSAGE' => $user->lang['Empty_message'],
'L_BBCODE_CLOSE_TAGS' => $user->lang['Close_Tags'],

23
phpBB/templates/subSilver/posting_body.html
View file

@ -1,6 +1,6 @@
<!-- INCLUDE overall_header.html -->
<script language="JavaScript" type="text/javascript">
<script language="javascript" type="text/javascript">
<!--
// Define the bbCode tags
@ -22,30 +22,19 @@ a_help = "{L_BBCODE_A_HELP}";
s_help = "{L_BBCODE_S_HELP}";
f_help = "{L_BBCODE_F_HELP}";
function checkForm() {
formErrors = false;
function checkForm()
{
if (document.post.message.value.length < 2) {
formErrors = "{L_EMPTY_MESSAGE}";
}
if (formErrors) {
alert(formErrors);
alert('{L_EMPTY_MESSAGE}');
return false;
} else {
bbstyle(-1);
//document.post.preview.disabled = true;
//document.post.submit.disabled = true;
//document.post.save.disabled = true;
//document.post.cancel.disabled = true;
return true;
}
}
//-->
</script>
<script language="JavaScript" src="templates/subSilver/editor.js"></script>
<script language="javascript" type="text/javascript" src="templates/subSilver/editor.js"></script>
<form action="{S_POST_ACTION}" method="post" name="post" onsubmit="return checkForm(this)"><table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
@ -74,7 +63,7 @@ function checkForm() {
<!-- IF S_DELETE_ALLOWED -->
<tr>
<td class="row1"><span class="gen"><b>{L_DELETE_POST}</b></span></td>
<td class="row2"><input type="checkbox" name="delete" /> {L_DELETE_WARN}</td>
<td class="row2"><input type="checkbox" name="delete" /> <span class="gensmall">[ {L_DELETE_WARN} ]</span></td>
</tr>
<!-- ENDIF -->
<!-- IF S_DISPLAY_USERNAME -->