mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
[ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
PHPBB3-6712
This commit is contained in:
parent
d1bd5962c7
commit
5254ec2795
2 changed files with 22 additions and 11 deletions
|
@ -2611,16 +2611,27 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
|
||||||
return $url;
|
return $url;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/**
|
||||||
* Handle topic bumping
|
* Handle topic bumping
|
||||||
|
* @param int $forum_id The ID of the forum the topic is being bumped belongs to
|
||||||
|
* @param int $topic_id The ID of the topic is being bumping
|
||||||
|
* @param array $post_data Passes some topic parameters:
|
||||||
|
* - 'topic_title'
|
||||||
|
* - 'topic_last_post_id'
|
||||||
|
* - 'topic_last_poster_id'
|
||||||
|
* - 'topic_last_post_subject'
|
||||||
|
* - 'topic_last_poster_name'
|
||||||
|
* - 'topic_last_poster_colour'
|
||||||
|
* @param int $bump_time The time at which topic was bumped, usually it is a current time as obtained via time().
|
||||||
|
* @return string An URL to the bumped topic, example: ./viewtopic.php?forum_id=1&topic_id=2&p=3#p3
|
||||||
*/
|
*/
|
||||||
function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
|
function phpbb_bump_topic($forum_id, $topic_id, $post_data, $bump_time = false)
|
||||||
{
|
{
|
||||||
global $config, $db, $user, $phpEx, $phpbb_root_path;
|
global $config, $db, $user, $phpEx, $phpbb_root_path;
|
||||||
|
|
||||||
if ($current_time === false)
|
if ($bump_time === false)
|
||||||
{
|
{
|
||||||
$current_time = time();
|
$bump_time = time();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Begin bumping
|
// Begin bumping
|
||||||
|
@ -2628,14 +2639,14 @@ function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
|
||||||
|
|
||||||
// Update the topic's last post post_time
|
// Update the topic's last post post_time
|
||||||
$sql = 'UPDATE ' . POSTS_TABLE . "
|
$sql = 'UPDATE ' . POSTS_TABLE . "
|
||||||
SET post_time = $current_time
|
SET post_time = $bump_time
|
||||||
WHERE post_id = {$post_data['topic_last_post_id']}
|
WHERE post_id = {$post_data['topic_last_post_id']}
|
||||||
AND topic_id = $topic_id";
|
AND topic_id = $topic_id";
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
|
||||||
// Sync the topic's last post time, the rest of the topic's last post data isn't changed
|
// Sync the topic's last post time, the rest of the topic's last post data isn't changed
|
||||||
$sql = 'UPDATE ' . TOPICS_TABLE . "
|
$sql = 'UPDATE ' . TOPICS_TABLE . "
|
||||||
SET topic_last_post_time = $current_time,
|
SET topic_last_post_time = $bump_time,
|
||||||
topic_bumped = 1,
|
topic_bumped = 1,
|
||||||
topic_bumper = " . $user->data['user_id'] . "
|
topic_bumper = " . $user->data['user_id'] . "
|
||||||
WHERE topic_id = $topic_id";
|
WHERE topic_id = $topic_id";
|
||||||
|
@ -2646,7 +2657,7 @@ function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
|
||||||
SET forum_last_post_id = " . $post_data['topic_last_post_id'] . ",
|
SET forum_last_post_id = " . $post_data['topic_last_post_id'] . ",
|
||||||
forum_last_poster_id = " . $post_data['topic_last_poster_id'] . ",
|
forum_last_poster_id = " . $post_data['topic_last_poster_id'] . ",
|
||||||
forum_last_post_subject = '" . $db->sql_escape($post_data['topic_last_post_subject']) . "',
|
forum_last_post_subject = '" . $db->sql_escape($post_data['topic_last_post_subject']) . "',
|
||||||
forum_last_post_time = $current_time,
|
forum_last_post_time = $bump_time,
|
||||||
forum_last_poster_name = '" . $db->sql_escape($post_data['topic_last_poster_name']) . "',
|
forum_last_poster_name = '" . $db->sql_escape($post_data['topic_last_poster_name']) . "',
|
||||||
forum_last_poster_colour = '" . $db->sql_escape($post_data['topic_last_poster_colour']) . "'
|
forum_last_poster_colour = '" . $db->sql_escape($post_data['topic_last_poster_colour']) . "'
|
||||||
WHERE forum_id = $forum_id";
|
WHERE forum_id = $forum_id";
|
||||||
|
@ -2654,17 +2665,17 @@ function bump_topic($forum_id, $topic_id, $post_data, $current_time = false)
|
||||||
|
|
||||||
// Update bumper's time of the last posting to prevent flood
|
// Update bumper's time of the last posting to prevent flood
|
||||||
$sql = 'UPDATE ' . USERS_TABLE . "
|
$sql = 'UPDATE ' . USERS_TABLE . "
|
||||||
SET user_lastpost_time = $current_time
|
SET user_lastpost_time = $bump_time
|
||||||
WHERE user_id = " . $user->data['user_id'];
|
WHERE user_id = " . $user->data['user_id'];
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
|
||||||
$db->sql_transaction('commit');
|
$db->sql_transaction('commit');
|
||||||
|
|
||||||
// Mark this topic as posted to
|
// Mark this topic as posted to
|
||||||
markread('post', $forum_id, $topic_id, $current_time);
|
markread('post', $forum_id, $topic_id, $bump_time);
|
||||||
|
|
||||||
// Mark this topic as read
|
// Mark this topic as read
|
||||||
markread('topic', $forum_id, $topic_id, $current_time);
|
markread('topic', $forum_id, $topic_id, $bump_time);
|
||||||
|
|
||||||
// Update forum tracking info
|
// Update forum tracking info
|
||||||
if ($config['load_db_lastread'] && $user->data['is_registered'])
|
if ($config['load_db_lastread'] && $user->data['is_registered'])
|
||||||
|
|
|
@ -321,7 +321,7 @@ if ($mode == 'bump')
|
||||||
if ($bump_time = bump_topic_allowed($forum_id, $post_data['topic_bumped'], $post_data['topic_last_post_time'], $post_data['topic_poster'], $post_data['topic_last_poster_id'])
|
if ($bump_time = bump_topic_allowed($forum_id, $post_data['topic_bumped'], $post_data['topic_last_post_time'], $post_data['topic_poster'], $post_data['topic_last_poster_id'])
|
||||||
&& check_link_hash(request_var('hash', ''), "topic_{$post_data['topic_id']}"))
|
&& check_link_hash(request_var('hash', ''), "topic_{$post_data['topic_id']}"))
|
||||||
{
|
{
|
||||||
$meta_url = bump_topic($forum_id, $topic_id, $post_data, $current_time);
|
$meta_url = phpbb_bump_topic($forum_id, $topic_id, $post_data, $current_time);
|
||||||
meta_refresh(3, $meta_url);
|
meta_refresh(3, $meta_url);
|
||||||
|
|
||||||
$message = $user->lang['TOPIC_BUMPED'] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $meta_url . '">', '</a>');
|
$message = $user->lang['TOPIC_BUMPED'] . '<br /><br />' . sprintf($user->lang['VIEW_MESSAGE'], '<a href="' . $meta_url . '">', '</a>');
|
||||||
|
|
Loading…
Add table
Reference in a new issue