PHP 7.X produces A non-numeric value encountered in \includes\date_functions.inc...

[fa-stable.git] / includes / archive.inc

diff --git a/includes/archive.inc b/includes/archive.inc
index 696903f9b807ad091ecd7d2f2727c5f62aefd2af..b1a81001eb1d5fe10c51d01f4fcf79aa99356071 100644 (file)
--- a/includes/archive.inc
+++ b/includes/archive.inc
@@ -16,7 +16,7 @@
 
 class archive
 {
-       function archive($name)
+       function __construct($name)
        {
                $this->options = array (
                        'basedir' => ".",
@@ -238,9 +238,9 @@ class archive
 
 class tar_file extends archive
 {
-       function tar_file($name)
+       function __construct($name)
        {
-               $this->archive($name);
+               parent::__construct($name);
                $this->options['type'] = "tar";
        }
 
@@ -324,7 +324,7 @@ class tar_file extends archive
                        {
                                $temp = unpack("a100name/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1type/a100symlink/a6magic/a2temp/a32temp/a32temp/a8temp/a8temp/a155prefix/a12temp", $block);
                                $file = array (
-                                       'name' => $temp['prefix'] . $temp['name'],
+                                       'name' => rtrim($temp['prefix']) . rtrim($temp['name']),
                                        'stat' => array (
                                                2 => octdec($temp['mode']),
                                                4 => octdec($temp['uid']),
@@ -428,9 +428,9 @@ class tar_file extends archive
 
 class gzip_file extends tar_file
 {
-       function gzip_file($name)
+       function __construct($name)
        {
-               $this->tar_file($name);
+               parent::__construct($name);
                $this->options['type'] = "gzip";
        }
 
@@ -463,4 +463,3 @@ class gzip_file extends tar_file
        }
 }
 
-?>
\ No newline at end of file