makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14168] No longer use deprecated functions in core files

Browse source 
PHPBB3-14168
This commit is contained in:
Marc Alexander 2015-09-23 10:43:33 +02:00
parent 0478631389
commit 98ebbbdca2
7 changed files with 42 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/acp/acp_attachments.php
View file

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

7
phpBB/includes/acp/acp_forums.php
View file

@ -1788,7 +1788,7 @@ class acp_forums
*/ */
function delete_forum_content($forum_id) function delete_forum_content($forum_id)
{ {
global $db, $config, $phpbb_root_path, $phpEx, $phpbb_dispatcher; global $db, $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
@ -1809,7 +1809,10 @@ class acp_forums
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
delete_attachments('topic', $topic_ids, false); /** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('topic', $topic_ids, false);
unset($attachment_delete);
// Delete shadow topics pointing to topics in this forum // Delete shadow topics pointing to topics in this forum
delete_topic_shadows($forum_id); delete_topic_shadows($forum_id);

10
phpBB/includes/acp/acp_users.php
View file

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

5
phpBB/includes/functions_admin.php
View file

@ -1024,7 +1024,10 @@ function delete_posts($where_type, $where_ids, $auto_sync = true, $posted_sync =
$search->index_remove($post_ids, $poster_ids, $forum_ids); $search->index_remove($post_ids, $poster_ids, $forum_ids);
delete_attachments('post', $post_ids, false); /** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('post', $post_ids, false);
unset($attachment_delete);
/** /**
* Perform additional actions during post(s) deletion * Perform additional actions during post(s) deletion

20
phpBB/includes/functions_privmsgs.php
View file

@ -1153,12 +1153,10 @@ function delete_pm($user_id, $msg_ids, $folder_id)
if (sizeof($delete_ids)) if (sizeof($delete_ids))
{ {
// Check if there are any attachments we need to remove // Check if there are any attachments we need to remove
if (!function_exists('delete_attachments')) /** @var \phpbb\attachment\delete $attachment_delete */
{ $attachment_delete = $phpbb_container->get('attachment.delete');
include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); $attachment_delete->delete('message', $delete_ids, false);
} unset($attachment_delete);
delete_attachments('message', $delete_ids, false);
$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . ' $sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
WHERE ' . $db->sql_in_set('msg_id', $delete_ids); WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
@ -1363,12 +1361,10 @@ function phpbb_delete_users_pms($user_ids)
if (!empty($delete_ids)) if (!empty($delete_ids))
{ {
// Check if there are any attachments we need to remove // Check if there are any attachments we need to remove
if (!function_exists('delete_attachments')) /** @var \phpbb\attachment\delete $attachment_delete */
{ $attachment_delete = $phpbb_container->get('attachment.delete');
include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); $attachment_delete->delete('message', $delete_ids, false);
} unset($attachment_delete);
delete_attachments('message', $delete_ids, false);
$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . ' $sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
WHERE ' . $db->sql_in_set('msg_id', $delete_ids); WHERE ' . $db->sql_in_set('msg_id', $delete_ids);

9
phpBB/includes/message_parser.php
View file

@ -1643,6 +1643,9 @@ class parse_message extends bbcode_firstpass
if ($index !== false && !empty($this->attachment_data[$index])) if ($index !== false && !empty($this->attachment_data[$index]))
{ {
/** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
// delete selected attachment // delete selected attachment
if ($this->attachment_data[$index]['is_orphan']) if ($this->attachment_data[$index]['is_orphan'])
{ {
@ -1657,11 +1660,11 @@ class parse_message extends bbcode_firstpass
if ($row) if ($row)
{ {
phpbb_unlink($row['physical_filename'], 'file'); $attachment_delete->unlink_attachment($row['physical_filename'], 'file');
if ($row['thumbnail']) if ($row['thumbnail'])
{ {
phpbb_unlink($row['physical_filename'], 'thumbnail'); $attachment_delete->unlink_attachment($row['physical_filename'], 'thumbnail');
} }
$db->sql_query('DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $this->attachment_data[$index]['attach_id']); $db->sql_query('DELETE FROM ' . ATTACHMENTS_TABLE . ' WHERE attach_id = ' . (int) $this->attachment_data[$index]['attach_id']);
@ -1669,7 +1672,7 @@ class parse_message extends bbcode_firstpass
} }
else else
{ {
delete_attachments('attach', array(intval($this->attachment_data[$index]['attach_id']))); $attachment_delete->delete('attach', $this->attachment_data[$index]['attach_id']);
} }
unset($this->attachment_data[$index]); unset($this->attachment_data[$index]);

10
phpBB/includes/ucp/ucp_attachments.php
View file

@ -70,12 +70,10 @@ class ucp_attachments
if (confirm_box(true)) if (confirm_box(true))
{ {
if (!function_exists('delete_attachments')) /** @var \phpbb\attachment\delete $attachment_delete */
{ $attachment_delete = $phpbb_container->get('attachment.delete');
include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); $attachment_delete->delete('attach', $delete_ids);
} unset($attachment_delete);
delete_attachments('attach', $delete_ids);
meta_refresh(3, $this->u_action); meta_refresh(3, $this->u_action);
$message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>'); $message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');