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

[ticket/11044] Minor adjustments as per PR comments

Browse source 
Changed private to protected, renamed check_name to unique_filename.

PHPBB3-11044
This commit is contained in:
Fyorl 2012-08-05 11:29:02 +01:00
parent 70d9c02aae
commit 3390712ed7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
phpBB/includes/functions_compress.php
View file

@ -26,7 +26,7 @@ class compress
/** /**
* @var array * @var array
*/ */
private $filelist = array(); protected $filelist = array();
/** /**
* Add file to archive * Add file to archive
@ -132,11 +132,12 @@ class compress
* returns a new, unique name. * returns a new, unique name.
* *
* @param string $name The filename * @param string $name The filename
* @return string A unique string * @return string A unique filename
*/ */
private function check_name($name) protected function unique_filename($name)
{
if (isset($this->filelist[$name]))
{ {
if (isset($this->filelist[$name])) {
$this->filelist[$name]++; $this->filelist[$name]++;
return $name . '.' . $this->filelist[$name]; return $name . '.' . $this->filelist[$name];
} }
@ -384,7 +385,7 @@ class compress_zip extends compress
function data($name, $data, $is_dir = false, $stat) function data($name, $data, $is_dir = false, $stat)
{ {
$name = str_replace('\\', '/', $name); $name = str_replace('\\', '/', $name);
$name = $this->check_name($name); $name = $this->unique_filename($name);
$hexdtime = pack('V', $this->unix_to_dos_time($stat[9])); $hexdtime = pack('V', $this->unix_to_dos_time($stat[9]));
@ -657,7 +658,7 @@ class compress_tar extends compress
*/ */
function data($name, $data, $is_dir = false, $stat) function data($name, $data, $is_dir = false, $stat)
{ {
$name = $this->check_name($name); $name = $this->unique_filename($name);
$this->wrote = true; $this->wrote = true;
$fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && @extension_loaded('zlib')) ? 'gzwrite' : 'fwrite');