aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_posting.php17
-rw-r--r--phpBB/posting.php49
-rw-r--r--phpBB/templates/subSilver/posting_attach_body.html1
-rw-r--r--phpBB/templates/subSilver/posting_body.html2
-rw-r--r--phpBB/templates/subSilver/posting_poll_body.html1
-rw-r--r--phpBB/templates/subSilver/posting_preview.html1
-rw-r--r--phpBB/templates/subSilver/posting_smilies.html2
-rw-r--r--phpBB/templates/subSilver/posting_topic_review.html1
-rw-r--r--phpBB/viewtopic.php12
9 files changed, 43 insertions, 43 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 24284032ea..c5a45cffa3 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -30,20 +30,17 @@ function generate_smilies($mode)
if ($mode == 'window')
{
- $page_title = $user->lang['TOPIC_REVIEW'] . " - $topic_title";
- include($phpbb_root_path . 'includes/page_header.'.$phpEx);
+ page_header($user->lang['SMILIES'] . ' - ' . $topic_title);
$template->set_filenames(array(
'body' => 'posting_smilies.html')
);
}
- $where_sql = ($mode == 'inline') ? 'WHERE display_on_posting = 1 ' : '';
- $sql = "SELECT emoticon, code, smile_url, smile_width, smile_height
- FROM " . SMILIES_TABLE . "
- $where_sql
- ORDER BY smile_order";
-
+ $sql = 'SELECT emoticon, code, smile_url, smile_width, smile_height
+ FROM ' . SMILIES_TABLE .
+ (($mode == 'inline') ? ' WHERE display_on_posting = 1 ' : '') . '
+ ORDER BY smile_order';
$result = $db->sql_query($sql);
$num_smilies = 0;
@@ -83,7 +80,7 @@ function generate_smilies($mode)
if ($mode == 'window')
{
- include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
+ page_footer();
}
}
@@ -922,7 +919,7 @@ function submit_post($mode, $message, $subject, $username, $topic_type, $bbcode_
'poll_title' => stripslashes($poll['poll_title']),
'poll_start' => ($poll['poll_start']) ? $poll['poll_start'] : $current_time,
'poll_max_options' => $poll['poll_max_options'],
- 'poll_length' => $poll['poll_length'] * 3600)
+ 'poll_length' => $poll['poll_length'] * 86400)
);
}
diff --git a/phpBB/posting.php b/phpBB/posting.php
index d1de009998..79a07a4f78 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -21,8 +21,6 @@
// TODO for 2.2:
//
-// * topic review additions -> quoting from previous posts ?
-// * check for reply since started posting upon submission and display of 'between-posts' to allow re-defining of post
// * hidden form element containing sid to prevent remote posting - Edwin van Vliet
// * bbcode parsing -> see functions_posting.php
// * multichoice polls
@@ -64,7 +62,7 @@ if (($delete) && (!$preview) && (!$refresh) && ($submit))
}
// Was cancel pressed? If so then redirect to the appropriate page
-if ( ($cancel) || ((time() - $lastclick) < 2) )
+if ($cancel || time() - $lastclick < 2)
{
$redirect = ($post_id) ? "viewtopic.$phpEx$SID&p=" . $post_id . "#" . $post_id : (($topic_id) ? "viewtopic.$phpEx$SID&t=" . $topic_id : (($forum_id) ? "viewforum.$phpEx$SID&f=" . $forum_id : "index.$phpEx$SID"));
redirect($redirect);
@@ -72,9 +70,7 @@ if ( ($cancel) || ((time() - $lastclick) < 2) )
// What is all this following SQL for? Well, we need to know
// some basic information in all cases before we do anything.
-$forum_validate = false;
-$topic_validate = false;
-$post_validate = false;
+$forum_validate = $topic_validate = $post_validate = false;
// Easier validation
$forum_fields = array('forum_name' => 's', 'parent_id' => 'i', 'forum_parents' => 's', 'forum_status' => 'i', 'forum_type' => 'i', 'enable_icons' => 'i');
@@ -236,8 +232,8 @@ if ($sql != '')
$db->sql_freeresult($result);
}
- $message_parser->filename_data['filecomment'] = ( isset($_POST['filecomment']) ) ? trim( strip_tags($_POST['filecomment'])) : '';
- $message_parser->filename_data['filename'] = ( $_FILES['fileupload']['name'] != 'none' ) ? trim($_FILES['fileupload']['name']) : '';
+ $message_parser->filename_data['filecomment'] = (isset($_POST['filecomment'])) ? trim(strip_tags($_POST['filecomment'])) : '';
+ $message_parser->filename_data['filename'] = ($_FILES['fileupload']['name'] != 'none') ? trim($_FILES['fileupload']['name']) : '';
// Get Attachment Data
$message_parser->attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array();
@@ -387,12 +383,12 @@ if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['
$user_update_sql .= ($user_update_sql != '') ? ', user_posts = user_posts - 1' : 'user_posts = user_posts - 1';
}
- $sql = "SELECT p.post_id, p.poster_id, p.post_username, u.username
- FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u
- WHERE p.topic_id = " . $topic_id . "
+ $sql = 'SELECT p.post_id, p.poster_id, p.post_username, u.username
+ FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
+ WHERE p.topic_id = ' . $topic_id . '
AND p.poster_id = u.user_id
AND p.post_approved = 1
- ORDER BY p.post_time DESC";
+ ORDER BY p.post_time DESC';
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
@@ -407,7 +403,7 @@ if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['
);
}
- $post_data['next_post_id'] = intval($row['post_id']);
+ $post_data['next_post_id'] = $row['post_id'];
// Update Forum, Topic and User with the gathered Informations
if ($forum_update_sql != '')
@@ -533,12 +529,12 @@ if ($submit || $preview || $refresh)
if ($poll_delete && (($mode == 'edit' && !empty($poll_options) && empty($poll_last_vote) && $poster_id == $user->data['user_id'] && $perm['u_delete']) || $perm['m_delete']))
{
// Delete Poll
- $sql = "DELETE FROM " . POLL_OPTIONS_TABLE . "
- WHERE topic_id = " . $topic_id;
+ $sql = 'DELETE FROM ' . POLL_OPTIONS_TABLE . '
+ WHERE topic_id = ' . $topic_id;
$db->sql_query($sql);
- $sql = "DELETE FROM " . POLL_VOTES_TABLE . "
- WHERE topic_id = " . $topic_id;
+ $sql = 'DELETE FROM ' . POLL_VOTES_TABLE . '
+ WHERE topic_id = ' . $topic_id;
$db->sql_query($sql);
$topic_sql = array(
@@ -568,7 +564,7 @@ if ($submit || $preview || $refresh)
$current_time = time();
// If replying/quoting and last post id has changed
- // give user option of continuing submit or return to post
+ // give user option to continu submit or return to post
// notify and show user the post made between his request and the final submit
if (($mode == 'reply' || $mode == 'quote') && $topic_cur_post_id != $topic_last_post_id)
{
@@ -584,13 +580,13 @@ if ($submit || $preview || $refresh)
}
// Go ahead and pull all data for the remaining posts
- $sql = "SELECT u.username, u.user_id, p.*
- FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u
- WHERE p.topic_id = $topic_id
+ $sql = 'SELECT u.username, u.user_id, p.*
+ FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
+ WHERE p.topic_id = ' . $topic_id . '
AND p.poster_id = u.user_id
- AND p.post_id > " . $topic_cur_post_id . "
+ AND p.post_id > ' . $topic_cur_post_id . '
AND p.post_approved = 1
- ORDER BY p.post_time DESC";
+ ORDER BY p.post_time DESC';
$result = $db->sql_query_limit($sql, $config['posts_per_page']);
if ($row = $db->sql_fetchrow($result))
@@ -627,7 +623,7 @@ if ($submit || $preview || $refresh)
'POST_SUBJECT' => $post_subject,
'MESSAGE' => nl2br($message),
- 'S_ROW_COUNT' => $i++)
+ 'S_ROW_COUNT' => $i++)
);
}
while ($row = $db->sql_fetchrow($result));
@@ -662,10 +658,9 @@ if ($submit || $preview || $refresh)
if ($mode != 'edit' && !$preview && !$refresh && !$perm['f_ignoreflood'])
{
// Flood check
- $where_sql = ($user->data['user_id'] == ANONYMOUS) ? "poster_ip = '$user->ip'" : 'poster_id = ' . $user->data['user_id'];
$sql = "SELECT MAX(post_time) AS last_post_time
FROM " . POSTS_TABLE . "
- WHERE " . $where_sql;
+ WHERE " . (($user->data['user_id'] == ANONYMOUS) ? "poster_ip = '" . $user->ip . "'" : "poster_id = " . $user->data['user_id']);
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result))
@@ -915,7 +910,7 @@ if ( ($mode == 'post') || (($mode == 'edit') && ($post_id == $topic_first_post_i
$topic_types = array(
'sticky' => array('const' => POST_STICKY, 'lang' => 'POST_STICKY'),
'announce' => array('const' => POST_ANNOUNCE, 'lang' => 'POST_ANNOUNCEMENT')
-// 'global_announce' => array('const' => POST_GLOBAL_ANNOUNCE, 'lang' => 'POST_GLOBAL_ANNOUNCE')
+// 'global' => array('const' => POST_GLOBAL, 'lang' => 'POST_GLOBAL')
);
foreach ($topic_types as $auth_key => $topic_value)
diff --git a/phpBB/templates/subSilver/posting_attach_body.html b/phpBB/templates/subSilver/posting_attach_body.html
index ed34716b92..fbf5816245 100644
--- a/phpBB/templates/subSilver/posting_attach_body.html
+++ b/phpBB/templates/subSilver/posting_attach_body.html
@@ -1,3 +1,4 @@
+<!-- $Id$ -->
<tr>
<th colspan="2">{L_ADD_ATTACHMENT}</th>
diff --git a/phpBB/templates/subSilver/posting_body.html b/phpBB/templates/subSilver/posting_body.html
index 6b0dd6d8a3..a9a7a68b36 100644
--- a/phpBB/templates/subSilver/posting_body.html
+++ b/phpBB/templates/subSilver/posting_body.html
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
<!-- INCLUDE overall_header.html -->
<script language="javascript" type="text/javascript">
diff --git a/phpBB/templates/subSilver/posting_poll_body.html b/phpBB/templates/subSilver/posting_poll_body.html
index a016a0162d..56234cb341 100644
--- a/phpBB/templates/subSilver/posting_poll_body.html
+++ b/phpBB/templates/subSilver/posting_poll_body.html
@@ -1,3 +1,4 @@
+<!-- $Id$ -->
<tr>
<th colspan="2">{L_ADD_POLL}</th>
diff --git a/phpBB/templates/subSilver/posting_preview.html b/phpBB/templates/subSilver/posting_preview.html
index 0fcb8e91a9..f7cbe85505 100644
--- a/phpBB/templates/subSilver/posting_preview.html
+++ b/phpBB/templates/subSilver/posting_preview.html
@@ -1,3 +1,4 @@
+<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1" cellpadding="4" border="0">
<tr>
diff --git a/phpBB/templates/subSilver/posting_smilies.html b/phpBB/templates/subSilver/posting_smilies.html
index 1f7cb346e7..793e4a2c14 100644
--- a/phpBB/templates/subSilver/posting_smilies.html
+++ b/phpBB/templates/subSilver/posting_smilies.html
@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+
<!-- INCLUDE simple_header.html -->
<script language="javascript" type="text/javascript">
diff --git a/phpBB/templates/subSilver/posting_topic_review.html b/phpBB/templates/subSilver/posting_topic_review.html
index f45be07ca4..e39de1f795 100644
--- a/phpBB/templates/subSilver/posting_topic_review.html
+++ b/phpBB/templates/subSilver/posting_topic_review.html
@@ -1,3 +1,4 @@
+<!-- $Id$ -->
<!-- IF S_DISPLAY_INLINE -->
<table class="tablebg" border="0" cellpadding="3" cellspacing="1" width="100%">
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 903aacfd48..23339deb7d 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -477,9 +477,9 @@ $template->assign_vars(array(
if (!empty($poll_start))
{
$sql = 'SELECT *
- FROM ' . POLL_OPTIONS_TABLE . "
- WHERE topic_id = $topic_id
- ORDER BY poll_option_id";
+ FROM ' . POLL_OPTIONS_TABLE . '
+ WHERE topic_id = ' . $topic_id . '
+ ORDER BY poll_option_id';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
@@ -491,9 +491,9 @@ if (!empty($poll_start))
if ($user->data['user_id'] != ANONYMOUS)
{
$sql = 'SELECT poll_option_id
- FROM ' . POLL_VOTES_TABLE . "
- WHERE topic_id = $topic_id
- AND vote_user_id = " . $user->data['user_id'];
+ FROM ' . POLL_VOTES_TABLE . '
+ WHERE topic_id = ' . $topic_id . '
+ AND vote_user_id = ' . $user->data['user_id'];
$result = $db->sql_query($sql);
$voted_id = array();
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-15 12:55:20 +0000