mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-25 18:13:28 +01:00
Code Issues Releases Wiki Activity

[ticket/15342] Small improvements to storage

Browse Source 
PHPBB3-15342
This commit is contained in:
Rubén Calvo 2018-06-09 16:37:57 +02:00
parent 28c0db86cf
commit cc7178a6e0
3 changed files with 15 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_database.php
View File

@ -189,6 +189,8 @@ class acp_database
fclose($fp);
$storage->track_file($file);
// Remove file from tmp
@unlink($temp_dir . '/' . $file);

1
phpBB/phpbb/attachment/upload.php
View File

@ -248,6 +248,7 @@ class upload
$fp = fopen($destination, 'rb');
$this->storage->write_stream($destination_name, $fp);
fclose($fp);
$this->storage->track_file($destination_name);
}
else
{

52
phpBB/phpbb/storage/storage.php
View File

@ -96,15 +96,8 @@ class storage
*/
public function put_contents($path, $content)
{
try
{
$this->get_adapter()->put_contents($path, $content);
$this->track_file($path);
}
catch (\Exception $e)
{
throw $e;
}
$this->get_adapter()->put_contents($path, $content);
$this->track_file($path);
}
/**
@ -144,15 +137,8 @@ class storage
*/
public function delete($path)
{
try
{
$this->get_adapter()->delete($path);
$this->untrack_file($path);
}
catch (\Exception $e)
{
throw $e;
}
$this->get_adapter()->delete($path);
$this->untrack_file($path);
}
/**
@ -166,16 +152,9 @@ class storage
*/
public function rename($path_orig, $path_dest)
{
try
{
$this->get_adapter()->rename($path_orig, $path_dest);
$this->untrack_file($path_orig);
$this->track_file($path_dest);
}
catch (\Exception $e)
{
throw $e;
}
$this->get_adapter()->rename($path_orig, $path_dest);
$this->untrack_file($path_orig);
$this->track_file($path_dest);
}
/**
@ -189,15 +168,8 @@ class storage
*/
public function copy($path_orig, $path_dest)
{
try
{
$this->get_adapter()->copy($path_orig, $path_dest);
$this->track_file($path_dest);
}
catch (\Exception $e)
{
throw $e;
}
$this->get_adapter()->copy($path_orig, $path_dest);
$this->track_file($path_dest);
}
/**
@ -231,6 +203,7 @@ class storage
/**
* Writes a new file using a stream.
* You have to track file after use this method
*
* @param string $path The target file
* @param resource $resource The resource
@ -244,7 +217,6 @@ class storage
if ($adapter instanceof stream_interface)
{
$adapter->write_stream($path, $resource);
$this->track_file($path); // Not sure if here, or after close the file
}
else
{
@ -337,9 +309,9 @@ class storage
FROM ' . $this->storage_table . "
WHERE storage = '" . $this->get_name() . "'";
$result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result);
$total = (int) $this->db->sql_fetchfield('total');
$this->db->sql_freeresult($result);
return $row['total'];
return $row;
}
}