aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_admin.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-09-19 15:39:43 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-09-19 15:39:43 +0000
commite12fce5f3d74d97b93b5a5931e59f9ddc2355a77 (patch)
tree657715e9aea129e4160e9b04fdafcaff3d229bc6 /phpBB/includes/functions_admin.php
parenta2a9b8b7ab5769f65ea38bd1effdfba8f706cbb2 (diff)
downloadforums-e12fce5f3d74d97b93b5a5931e59f9ddc2355a77.tar
forums-e12fce5f3d74d97b93b5a5931e59f9ddc2355a77.tar.gz
forums-e12fce5f3d74d97b93b5a5931e59f9ddc2355a77.tar.bz2
forums-e12fce5f3d74d97b93b5a5931e59f9ddc2355a77.tar.xz
forums-e12fce5f3d74d97b93b5a5931e59f9ddc2355a77.zip
Correctly delete message attachments. (Bug #23755) Also revamped and simplified delete_attachments() - it looks like we did not touch it for a long long time.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8890 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
-rw-r--r--phpBB/includes/functions_admin.php206
1 files changed, 85 insertions, 121 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 0f5f10265f..96deda9f3f 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -791,8 +791,8 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
/**
* Delete Attachments
*
-* @param string $mode can be: post|topic|attach|user
-* @param mixed $ids can be: post_ids, topic_ids, attach_ids, user_ids
+* @param string $mode can be: post|message|topic|attach|user
+* @param mixed $ids can be: post_ids, message_ids, topic_ids, attach_ids, user_ids
* @param bool $resync set this to false if you are deleting posts or topics
*/
function delete_attachments($mode, $ids, $resync = true)
@@ -814,42 +814,55 @@ function delete_attachments($mode, $ids, $resync = true)
return false;
}
- $sql_id = ($mode == 'user') ? 'poster_id' : (($mode == 'post') ? 'post_msg_id' : (($mode == 'topic') ? 'topic_id' : 'attach_id'));
+ switch ($mode)
+ {
+ case 'post':
+ case 'message':
+ $sql_id = 'post_msg_id';
+ break;
- $post_ids = $topic_ids = $physical = array();
+ case 'topic':
+ $sql_id = 'topic_id';
+ break;
- // Collect post and topics ids for later use
- if ($mode == 'attach' || $mode == 'user' || ($mode == 'topic' && $resync))
- {
- $sql = 'SELECT post_msg_id as post_id, topic_id, physical_filename, thumbnail, filesize
- FROM ' . ATTACHMENTS_TABLE . '
- WHERE ' . $db->sql_in_set($sql_id, $ids);
- $result = $db->sql_query($sql);
+ case 'user':
+ $sql_id = 'poster_id';
+ break;
- while ($row = $db->sql_fetchrow($result))
- {
- $post_ids[] = $row['post_id'];
- $topic_ids[] = $row['topic_id'];
- $physical[] = array('filename' => $row['physical_filename'], 'thumbnail' => $row['thumbnail'], 'filesize' => $row['filesize']);
- }
- $db->sql_freeresult($result);
+ case 'attach':
+ default:
+ $sql_id = 'attach_id';
+ $mode = 'attach';
+ break;
}
- if ($mode == 'post')
- {
- $sql = 'SELECT topic_id, physical_filename, thumbnail, filesize
+ $post_ids = $message_ids = $topic_ids = $physical = array();
+
+ // Collect post and topic ids for later use if we need to touch remaining entries (if resync is enabled)
+ $sql = 'SELECT post_msg_id, topic_id, in_message, physical_filename, thumbnail, filesize, is_orphan
FROM ' . ATTACHMENTS_TABLE . '
- WHERE ' . $db->sql_in_set('post_msg_id', $ids) . '
- AND in_message = 0';
- $result = $db->sql_query($sql);
+ WHERE ' . $db->sql_in_set($sql_id, $ids);
+ $result = $db->sql_query($sql);
- while ($row = $db->sql_fetchrow($result))
+ while ($row = $db->sql_fetchrow($result))
+ {
+ // We only need to store post/message/topic ids if resync is enabled and the file is not orphaned
+ if ($resync && !$row['is_orphan'])
{
- $topic_ids[] = $row['topic_id'];
- $physical[] = array('filename' => $row['physical_filename'], 'thumbnail' => $row['thumbnail'], 'filesize' => $row['filesize']);
+ if (!$row['in_message'])
+ {
+ $post_ids[] = $row['post_msg_id'];
+ $topic_ids[] = $row['topic_id'];
+ }
+ else
+ {
+ $message_ids[] = $row['post_msg_id'];
+ }
}
- $db->sql_freeresult($result);
+
+ $physical[] = array('filename' => $row['physical_filename'], 'thumbnail' => $row['thumbnail'], 'filesize' => $row['filesize'], 'is_orphan' => $row['is_orphan']);
}
+ $db->sql_freeresult($result);
// Delete attachments
$sql = 'DELETE FROM ' . ATTACHMENTS_TABLE . '
@@ -866,8 +879,9 @@ function delete_attachments($mode, $ids, $resync = true)
$space_removed = $files_removed = 0;
foreach ($physical as $file_ary)
{
- if (phpbb_unlink($file_ary['filename'], 'file', true))
+ if (phpbb_unlink($file_ary['filename'], 'file', true) && !$file_ary['is_orphan'])
{
+ // Only non-orphaned files count to the file size
$space_removed += $file_ary['filesize'];
$files_removed++;
}
@@ -877,121 +891,71 @@ function delete_attachments($mode, $ids, $resync = true)
phpbb_unlink($file_ary['filename'], 'thumbnail', true);
}
}
- set_config('upload_dir_size', $config['upload_dir_size'] - $space_removed, true);
- set_config('num_files', $config['num_files'] - $files_removed, true);
- if ($mode == 'topic' && !$resync)
+ if ($space_removed || $files_removed)
{
- return $num_deleted;
+ set_config('upload_dir_size', $config['upload_dir_size'] - $space_removed, true);
+ set_config('num_files', $config['num_files'] - $files_removed, true);
}
- if ($mode == 'post')
+ // If we do not resync, we do not need to adjust any message, post, topic or user entries
+ if (!$resync)
{
- $post_ids = $ids;
+ return $num_deleted;
}
+
+ // No more use for the original ids
unset($ids);
+ // Now, we need to resync posts, messages, topics. We go through every one of them
$post_ids = array_unique($post_ids);
+ $message_ids = array_unique($message_ids);
$topic_ids = array_unique($topic_ids);
- // Update post indicators
+ // Update post indicators for posts now no longer having attachments
if (sizeof($post_ids))
{
- if ($mode == 'post' || $mode == 'topic')
- {
- $sql = 'UPDATE ' . POSTS_TABLE . '
- SET post_attachment = 0
- WHERE ' . $db->sql_in_set('post_id', $post_ids);
- $db->sql_query($sql);
- }
-
- if ($mode == 'user' || $mode == 'attach')
- {
- $remaining = array();
-
- $sql = 'SELECT post_msg_id
- FROM ' . ATTACHMENTS_TABLE . '
- WHERE ' . $db->sql_in_set('post_msg_id', $post_ids) . '
- AND in_message = 0';
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $remaining[] = $row['post_msg_id'];
- }
- $db->sql_freeresult($result);
-
- $unset_ids = array_diff($post_ids, $remaining);
-
- if (sizeof($unset_ids))
- {
- $sql = 'UPDATE ' . POSTS_TABLE . '
- SET post_attachment = 0
- WHERE ' . $db->sql_in_set('post_id', $unset_ids);
- $db->sql_query($sql);
- }
-
- $remaining = array();
-
- $sql = 'SELECT post_msg_id
- FROM ' . ATTACHMENTS_TABLE . '
- WHERE ' . $db->sql_in_set('post_msg_id', $post_ids) . '
- AND in_message = 1';
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $remaining[] = $row['post_msg_id'];
- }
- $db->sql_freeresult($result);
-
- $unset_ids = array_diff($post_ids, $remaining);
+ $sql = 'UPDATE ' . POSTS_TABLE . '
+ SET post_attachment = 0
+ WHERE ' . $db->sql_in_set('post_id', $post_ids);
+ $db->sql_query($sql);
+ }
- if (sizeof($unset_ids))
- {
- $sql = 'UPDATE ' . PRIVMSGS_TABLE . '
- SET message_attachment = 0
- WHERE ' . $db->sql_in_set('msg_id', $unset_ids);
- $db->sql_query($sql);
- }
- }
+ // Update message table if messages are affected
+ if (sizeof($message_ids))
+ {
+ $sql = 'UPDATE ' . PRIVMSGS_TABLE . '
+ SET message_attachment = 0
+ WHERE ' . $db->sql_in_set('msg_id', $message_ids);
+ $db->sql_query($sql);
}
+ // Now update the topics. This is a bit trickier, because there could be posts still having attachments within the topic
if (sizeof($topic_ids))
{
- // Update topic indicator
- if ($mode == 'topic')
+ // Just check which topics are still having an assigned attachment not orphaned by querying the attachments table (much less entries expected)
+ $sql = 'SELECT topic_id
+ FROM ' . ATTACHMENTS_TABLE . '
+ WHERE ' . $db->sql_in_set('topic_id', $topic_ids) . '
+ AND is_orphan = 0';
+ $result = $db->sql_query($sql);
+
+ $remaining_ids = array();
+ while ($row = $db->sql_fetchrow($result))
{
- $sql = 'UPDATE ' . TOPICS_TABLE . '
- SET topic_attachment = 0
- WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
- $db->sql_query($sql);
+ $remaining_ids[] = $row['topic_id'];
}
+ $db->sql_freeresult($result);
- if ($mode == 'post' || $mode == 'user' || $mode == 'attach')
- {
- $remaining = array();
+ // Now only unset those ids remaining
+ $topic_ids = array_diff($topic_ids, $remaining_ids);
- $sql = 'SELECT topic_id
- FROM ' . ATTACHMENTS_TABLE . '
+ if (sizeof($topic_ids))
+ {
+ $sql = 'UPDATE ' . TOPICS_TABLE . '
+ SET topic_attachment = 0
WHERE ' . $db->sql_in_set('topic_id', $topic_ids);
- $result = $db->sql_query($sql);
-
- while ($row = $db->sql_fetchrow($result))
- {
- $remaining[] = $row['topic_id'];
- }
- $db->sql_freeresult($result);
-
- $unset_ids = array_diff($topic_ids, $remaining);
-
- if (sizeof($unset_ids))
- {
- $sql = 'UPDATE ' . TOPICS_TABLE . '
- SET topic_attachment = 0
- WHERE ' . $db->sql_in_set('topic_id', $unset_ids);
- $db->sql_query($sql);
- }
+ $db->sql_query($sql);
}
}