aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2001-07-09 22:35:17 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2001-07-09 22:35:17 +0000
commitfe189c90de14068d29e994ffee5caf2e13e74fa3 (patch)
treee5cf79fd45876f5b0dbb4e9687c475ba9654734b /phpBB
parenta03286497495918fb735170fc3cba72ec8a236ef (diff)
downloadforums-fe189c90de14068d29e994ffee5caf2e13e74fa3.tar
forums-fe189c90de14068d29e994ffee5caf2e13e74fa3.tar.gz
forums-fe189c90de14068d29e994ffee5caf2e13e74fa3.tar.bz2
forums-fe189c90de14068d29e994ffee5caf2e13e74fa3.tar.xz
forums-fe189c90de14068d29e994ffee5caf2e13e74fa3.zip
Fixed bug in posting (forum_topics was incremented on replies, not just new topics)
One click lock/unlock/delete works for modcp. git-svn-id: file:///svn/phpbb/trunk@609 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/modcp.php227
-rw-r--r--phpBB/posting.php8
-rw-r--r--phpBB/viewtopic.php2
3 files changed, 125 insertions, 112 deletions
diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index ebbad6badd..8d94828556 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -132,94 +132,94 @@ switch($mode)
if($HTTP_POST_VARS['preform_op'])
{
$topics = $HTTP_POST_VARS['preform_op'];
- $sql = "SELECT post_id FROM ".POSTS_TABLE." WHERE ";
- $delete_topics = "DELETE FROM ".TOPICS_TABLE." WHERE ";
- for($x = 0; $x < count($topics); $x++)
- {
- if($x > 0)
- {
- $sql .= " OR ";
- $delete_topics .= " OR ";
- }
- $sql .= "topic_id = ".$topics[$x];
- $delete_topics .= "topic_id = ".$topics[$x];
- }
- $topics_removed = $x;
-
- if(!$result = $db->sql_query($sql))
+ }
+ else
+ {
+ $topics = array($HTTP_GET_VARS[POST_TOPIC_URL]);
+ }
+
+ $sql = "SELECT post_id FROM ".POSTS_TABLE." WHERE ";
+ $delete_topics = "DELETE FROM ".TOPICS_TABLE." WHERE ";
+ for($x = 0; $x < count($topics); $x++)
+ {
+ if($x > 0)
{
- message_die(GENERAL_ERROR, "Could not get posts lists for deletion!", "Error", __LINE__, __FILE__, $sql);
+ $sql .= " OR ";
+ $delete_topics .= " OR ";
}
- $num_posts = $db->sql_numrows($result);
- $rowset = $db->sql_fetchrowset($result);
- $delete_posts = "DELETE FROM ".POSTS_TABLE." WHERE ";
- $delete_text = "DELETE FROM ".POSTS_TEXT_TABLE." WHERE ";
- for($x = 0; $x < $num_posts; $x++)
+ $sql .= "topic_id = ".$topics[$x];
+ $delete_topics .= "topic_id = ".$topics[$x];
+ }
+ $topics_removed = $x;
+
+ if(!$result = $db->sql_query($sql))
+ {
+ message_die(GENERAL_ERROR, "Could not get posts lists for deletion!", "Error", __LINE__, __FILE__, $sql);
+ }
+ $num_posts = $db->sql_numrows($result);
+ $rowset = $db->sql_fetchrowset($result);
+ $delete_posts = "DELETE FROM ".POSTS_TABLE." WHERE ";
+ $delete_text = "DELETE FROM ".POSTS_TEXT_TABLE." WHERE ";
+ for($x = 0; $x < $num_posts; $x++)
+ {
+ if($x > 0)
{
- if($x > 0)
- {
- $delete_posts .= " OR ";
- $delete_text .= " OR ";
- }
- $delete_posts .= "post_id = ".$rowset[$x]['post_id'];
- $delete_text .= "post_id = ".$rowset[$x]['post_id'];
+ $delete_posts .= " OR ";
+ $delete_text .= " OR ";
}
- $posts_removed = $x;
+ $delete_posts .= "post_id = ".$rowset[$x]['post_id'];
+ $delete_text .= "post_id = ".$rowset[$x]['post_id'];
+ }
+ $posts_removed = $x;
+
+ if(!$result = $db->sql_query($delete_text, BEGIN_TRANSACTION))
+ {
+ message_die(GENERAL_ERROR, "Could not delete posts text!", "Error", __LINE__, __FILE__, $delete_text);
+ }
- if(!$result = $db->sql_query($delete_text, BEGIN_TRANSACTION))
- {
- message_die(GENERAL_ERROR, "Could not delete posts text!", "Error", __LINE__, __FILE__, $delete_text);
- }
+ if(!$result = $db->sql_query($delete_posts))
+ {
+ message_die(GENERAL_ERROR, "Could not delete posts!", "Error", __LINE__, __FILE__, $delete_posts);
+ }
- if(!$result = $db->sql_query($delete_posts))
- {
- message_die(GENERAL_ERROR, "Could not delete posts!", "Error", __LINE__, __FILE__, $delete_posts);
- }
-
- if(!$result = $db->sql_query($delete_topics))
- {
- message_die(GENERAL_ERROR, "Could not delete topics!", "Error", __LINE__, __FILE__, $delete_topics);
- }
+ if(!$result = $db->sql_query($delete_topics))
+ {
+ message_die(GENERAL_ERROR, "Could not delete topics!", "Error", __LINE__, __FILE__, $delete_topics);
+ }
+
+ if(SQL_LAYER != "mysql")
+ {
+ $update_index = "UPDATE ".FORUMS_TABLE."
+ SET forum_topics = forum_topics - $topics_removed,
+ forum_posts = forum_posts - $posts_removed,
+ forum_last_post_id = (select max(post_id) FROM ".POSTS_TABLE."
+ WHERE forum_id = $forum_id) WHERE forum_id = $forum_id";
- if(SQL_LAYER != "mysql")
- {
- $update_index = "UPDATE ".FORUMS_TABLE."
- SET forum_topics = forum_topics - $topics_removed,
- forum_posts = forum_posts - $posts_removed,
- forum_last_post_id = (select max(post_id) FROM ".POSTS_TABLE."
- WHERE forum_id = $forum_id) WHERE forum_id = $forum_id";
-
- if(!$result = $db->sql_query($update_index, END_TRANSACTION))
- {
- message_die(GENERAL_ERROR, "Could not update index!", "Error", __LINE__, __FILE__, $delete_topics);
- }
- }
- else
+ if(!$result = $db->sql_query($update_index, END_TRANSACTION))
{
- $sql = "select max(post_id) AS last_post FROM ".POSTS_TABLE." WHERE forum_id = $forum_id";
- if(!$result = $db->sql_query($sql))
- {
- message_die(GENERAL_ERROR, "Could not get last post id", "Error", __LINE__, __FILE__, $sql);
- }
- $last_post = $db->sql_fetchrowset($result);
- $update_index = "UPDATE ".FORUMS_TABLE."
- SET forum_topics = forum_topics - $topics_removed,
- forum_posts = forum_posts - $posts_removed,
- forum_last_post_id = ".$last_post[0]['last_post']." WHERE forum_id = $forum_id";
- if(!$result = $db->sql_query($update_index, END_TRANSACTION))
- {
- message_die(GENERAL_ERROR, "Could not update index!", "Error", __LINE__, __FILE__, $update_index);
- }
+ message_die(GENERAL_ERROR, "Could not update index!", "Error", __LINE__, __FILE__, $delete_topics);
}
-
- $msg = $lang['Topics_Removed'] . "<br />" . "<a href=\"".append_sid("modcp.$phpEx?".POST_FORUM_URL."=$forum_id")."\">". $lang['Click'] . " " . $lang['Here'] ."</a> " . $lang['Return_to_modcp'];
- message_die(GENERAL_MESSAGE, $msg);
-
}
else
{
- echo "Here";
+ $sql = "select max(post_id) AS last_post FROM ".POSTS_TABLE." WHERE forum_id = $forum_id";
+ if(!$result = $db->sql_query($sql))
+ {
+ message_die(GENERAL_ERROR, "Could not get last post id", "Error", __LINE__, __FILE__, $sql);
+ }
+ $last_post = $db->sql_fetchrowset($result);
+ $update_index = "UPDATE ".FORUMS_TABLE."
+ SET forum_topics = forum_topics - $topics_removed,
+ forum_posts = forum_posts - $posts_removed,
+ forum_last_post_id = ".$last_post[0]['last_post']." WHERE forum_id = $forum_id";
+ if(!$result = $db->sql_query($update_index, END_TRANSACTION))
+ {
+ message_die(GENERAL_ERROR, "Could not update index!", "Error", __LINE__, __FILE__, $update_index);
+ }
}
+
+ $msg = $lang['Topics_Removed'] . "<br />" . "<a href=\"".append_sid("modcp.$phpEx?".POST_FORUM_URL."=$forum_id")."\">". $lang['Click'] . " " . $lang['Here'] ."</a> " . $lang['Return_to_modcp'];
+ message_die(GENERAL_MESSAGE, $msg);
break;
case 'move':
@@ -230,53 +230,62 @@ switch($mode)
if($HTTP_POST_VARS['preform_op'])
{
$topics = $HTTP_POST_VARS['preform_op'];
- $sql = "UPDATE " . TOPICS_TABLE . " SET topic_status = " . TOPIC_LOCKED . " WHERE ";
- for($x = 0; $x < count($topics); $x++)
- {
- if($x > 0)
- {
- $sql .= " OR ";
- }
- $sql .= "topic_id = " . $topics[$x];
- }
-
- if(!$result = $db->sql_query($sql))
- {
- message_die(GENERAL_ERROR, "Coule not update topics table!", "Error", __LINE__, __FILE__, $sql);
- }
- else
+ }
+ else
+ {
+ $topics = array($HTTP_GET_VARS[POST_TOPIC_URL]);
+ }
+
+ $sql = "UPDATE " . TOPICS_TABLE . " SET topic_status = " . TOPIC_LOCKED . " WHERE ";
+ for($x = 0; $x < count($topics); $x++)
+ {
+ if($x > 0)
{
- $msg = $lang['Topics_Locked'] . "<br />" . "<a href=\"".append_sid("modcp.$phpEx?".POST_FORUM_URL."=$forum_id")."\">". $lang['Click'] . " " . $lang['Here'] ."</a> " . $lang['Return_to_modcp'];
- message_die(GENERAL_MESSAGE, $msg);
+ $sql .= " OR ";
}
+ $sql .= "topic_id = " . $topics[$x];
}
-
+
+ if(!$result = $db->sql_query($sql))
+ {
+ message_die(GENERAL_ERROR, "Coule not update topics table!", "Error", __LINE__, __FILE__, $sql);
+ }
+ else
+ {
+ $msg = $lang['Topics_Locked'] . "<br />" . "<a href=\"".append_sid("modcp.$phpEx?".POST_FORUM_URL."=$forum_id")."\">". $lang['Click'] . " " . $lang['Here'] ."</a> " . $lang['Return_to_modcp'];
+ message_die(GENERAL_MESSAGE, $msg);
+ }
+
break;
case 'unlock':
if($HTTP_POST_VARS['preform_op'])
{
$topics = $HTTP_POST_VARS['preform_op'];
- $sql = "UPDATE " . TOPICS_TABLE . " SET topic_status = " . TOPIC_UNLOCKED . " WHERE ";
- for($x = 0; $x < count($topics); $x++)
- {
- if($x > 0)
- {
- $sql .= " OR ";
- }
- $sql .= "topic_id = " . $topics[$x];
- }
+ }
+ else
+ {
+ $topics = array($HTTP_GET_VARS[POST_TOPIC_URL]);
+ }
- if(!$result = $db->sql_query($sql))
- {
- message_die(GENERAL_ERROR, "Coule not update topics table!", "Error", __LINE__, __FILE__, $sql);
- }
- else
+ $sql = "UPDATE " . TOPICS_TABLE . " SET topic_status = " . TOPIC_UNLOCKED . " WHERE ";
+ for($x = 0; $x < count($topics); $x++)
+ {
+ if($x > 0)
{
- $msg = $lang['Topics_Unlocked'] . "<br />" . "<a href=\"".append_sid("modcp.$phpEx?".POST_FORUM_URL."=$forum_id")."\">". $lang['Click'] . " " . $lang['Here'] ."</a> " . $lang['Return_to_modcp'];
- message_die(GENERAL_MESSAGE, $msg);
+ $sql .= " OR ";
}
+ $sql .= "topic_id = " . $topics[$x];
}
+ if(!$result = $db->sql_query($sql))
+ {
+ message_die(GENERAL_ERROR, "Coule not update topics table!", "Error", __LINE__, __FILE__, $sql);
+ }
+ else
+ {
+ $msg = $lang['Topics_Unlocked'] . "<br />" . "<a href=\"".append_sid("modcp.$phpEx?".POST_FORUM_URL."=$forum_id")."\">". $lang['Click'] . " " . $lang['Here'] ."</a> " . $lang['Return_to_modcp'];
+ message_die(GENERAL_MESSAGE, $msg);
+ }
break;
default:
diff --git a/phpBB/posting.php b/phpBB/posting.php
index d22b388e7d..33daaf61cc 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -329,8 +329,12 @@ if($mode == "newtopic" || $mode == "reply")
if($db->sql_query($sql))
{
$sql = "UPDATE " . FORUMS_TABLE . "
- SET forum_last_post_id = $new_post_id, forum_posts = forum_posts + 1, forum_topics = forum_topics + 1
- WHERE forum_id = $forum_id";
+ SET forum_last_post_id = $new_post_id, forum_posts = forum_posts + 1";
+ if($mode == "newtopic")
+ {
+ $sql .= ", forum_topics = forum_topics + 1";
+ }
+ $sql .= " WHERE forum_id = $forum_id";
if($db->sql_query($sql))
{
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index a59cf31268..816ba5e014 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -455,7 +455,7 @@ if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN)
$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=move"). "\"><img src=\"images/topic_move.gif\" alt = \"" . $lang['Move_topic'] . "\" border=\"0\"></a>&nbsp;&nbsp;";
- if($forum_row[0]['topic_status'] == UNLOCKED)
+ if($forum_row[0]['topic_status'] == TOPIC_UNLOCKED)
{
$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=lock") . "\"><img src=\"images/topic_lock.gif\" alt = \"" . $lang['Lock_topic'] . "\" border=\"0\"></a>&nbsp;&nbsp;";
}
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-19 00:44:27 +0000