mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/14168] Use attachment manager instead of separate classes

Browse Source 
PHPBB3-14168
This commit is contained in:
Marc Alexander
2015-10-12 11:34:11 +02:00
parent a0167ad410
commit 49312f05f8
12 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acp/acp_attachments.php
View File

@@ -39,8 +39,8 @@ class acp_attachments
/** @var \phpbb\filesystem\filesystem_interface */
protected $filesystem;
/** @var \phpbb\attachment\delete */
protected $attachment_delete;
/** @var \phpbb\attachment\manager */
protected $attachment_manager;
public $id;
public $u_action;
@@ -58,7 +58,7 @@ class acp_attachments
$this->user = $user;
$this->phpbb_container = $phpbb_container;
$this->filesystem = $phpbb_filesystem;
$this->attachment_delete = $phpbb_container->get('attachment.delete');
$this->attachment_manager = $phpbb_container->get('attachment.manager');
$user->add_lang(array('posting', 'viewtopic', 'acp/attachments'));
@@ -926,11 +926,11 @@ class acp_attachments
$delete_files = array();
while ($row = $db->sql_fetchrow($result))
{
$this->attachment_delete->unlink_attachment($row['physical_filename'], 'file');
$this->attachment_manager->unlink($row['physical_filename'], 'file');
if ($row['thumbnail'])
{
$this->attachment_delete->unlink_attachment($row['physical_filename'], 'thumbnail');
$this->attachment_manager->unlink($row['physical_filename'], 'thumbnail');
}
$delete_files[$row['attach_id']] = $row['real_filename'];
@@ -1095,7 +1095,7 @@ class acp_attachments
}
$db->sql_freeresult($result);
if ($num_deleted = $this->attachment_delete->delete('attach', $delete_files))
if ($num_deleted = $this->attachment_manager->delete('attach', $delete_files))
{
if (sizeof($delete_files) != $num_deleted)
{

8
phpBB/includes/acp/acp_forums.php
View File

@@ -1809,10 +1809,10 @@ class acp_forums
}
$db->sql_freeresult($result);
/** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('topic', $topic_ids, false);
unset($attachment_delete);
/** @var \phpbb\attachment\manager $attachment_manager */
$attachment_manager = $phpbb_container->get('attachment.manager');
$attachment_manager->delete('topic', $topic_ids, false);
unset($attachment_manager);
// Delete shadow topics pointing to topics in this forum
delete_topic_shadows($forum_id);

16
phpBB/includes/acp/acp_users.php
View File

@@ -543,10 +543,10 @@ class acp_users
if (confirm_box(true))
{
/** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('user', $user_id);
unset($attachment_delete);
/** @var \phpbb\attachment\manager $attachment_manager */
$attachment_manager = $phpbb_container->get('attachment.manager');
$attachment_manager->delete('user', $user_id);
unset($attachment_manager);
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_DEL_ATTACH', false, array($user_row['username']));
trigger_error($user->lang['USER_ATTACHMENTS_REMOVED'] . adm_back_link($this->u_action . '&u=' . $user_id));
@@ -2129,10 +2129,10 @@ class acp_users
}
$db->sql_freeresult($result);
/** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('attach', $marked);
unset($attachment_delete);
/** @var \phpbb\attachment\manager $attachment_manager */
$attachment_manager = $phpbb_container->get('attachment.manager');
$attachment_manager->delete('attach', $marked);
unset($attachment_manager);
$message = (sizeof($log_attachments) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED'];