Version 3.6.2

wp-media · Oct 17, 2018 · 548c692 · 548c692
1 parent a62ff1f
commit 548c692
Show file tree

Hide file tree

Showing 20 changed files with 346 additions and 340 deletions.
diff --git a/backwpup.php b/backwpup.php
@@ -5,7 +5,7 @@
  * Description: WordPress Backup Plugin
  * Author: Inpsyde GmbH
  * Author URI: http://inpsyde.com
- * Version: 3.6.1
+ * Version: 3.6.2
  * Text Domain: backwpup
  * Domain Path: /languages/
  * Network: true

diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,13 @@
 == Changelog ==
+= Version 3.6.2 =
+Release Date: Oct 17, 2018
+
+* Fixed: Not recognized file extensions get an additional underscore in the file name in zip file
+* Fixed: Backup archive file have dot folder contains all web root files
+* Fixed: Ftp destination downloader repetitively open a new handler for the source file causing corrupted backup.
+
 = Version 3.6.1 =
-Release Date: Oct 08, 2018
+Release Date: Sep 25, 2018
 
 * Fixed: Backup doesn't handle special characters correctly
 * Fixed: Use of function that doesn't exists prior to 4.9

diff --git a/inc/class-create-archive.php b/inc/class-create-archive.php
@@ -336,16 +336,6 @@ public function add_file( $file_name, $name_in_archive = '' ) {
 			$name_in_archive = $file_name;
 		}
 
-		// Remove reserved chars.
-		$dirname = dirname( $name_in_archive );
-		// Basename without problems with locale.
-		if ( ! in_array( $dirname, array( '.', '..' ), true ) ) {
-			$name_in_archive = str_replace( $dirname, '', $name_in_archive );
-		}
-
-		$name_in_archive = trim( $name_in_archive, '/' );
-		$name_in_archive = trailingslashit( $dirname ) . sanitize_file_name( $name_in_archive );
-
 		switch ( $this->method ) {
 			case 'gz':
 				if ( ! is_resource( $this->filehandler ) ) {

diff --git a/inc/class-destination-ftp-downloader.php b/inc/class-destination-ftp-downloader.php
@@ -95,6 +95,10 @@ public function calculate_size() {
 	 */
 	private function source_file_handler( $start_byte ) {
 
+		if ( is_resource( $this->source_file_handler ) ) {
+			return;
+		}
+
 		$ctx = stream_context_create( array( 'ftp' => array( 'resume_pos' => $start_byte ) ) );
 		$url = $this->ftp_resource->getURL( $this->data->source_file_path(), false, $ctx );
 

diff --git a/inc/class-destination-s3-downloader.php b/inc/class-destination-s3-downloader.php
@@ -34,6 +34,11 @@ final class BackWPup_Destination_S3_Downloader implements BackWPup_Destination_D
 	 */
 	private $s3_client;
 
+	/**
+	 * @var resource
+	 */
+	private $local_file_handler;
+
 	/**
 	 * BackWPup_Destination_S3_Downloader constructor
 	 *

diff --git a/languages/backwpup-de_DE.po b/languages/backwpup-de_DE.po
@@ -264,10 +264,10 @@ msgstr "Passwort:"
 #: inc/class-destination-ftp-downloader.php:89
 #: inc/class-destination-s3-downloader.php:63
 #: inc/Pro/class-destination-gdrive-downloader.php:102
-#: inc/class-destination-ftp-downloader.php:122
+#: inc/class-destination-ftp-downloader.php:126
 #: inc/class-destination-folder-downloader.php:137
 #: inc/class-destination-dropbox-downloader.php:104
-#: inc/class-destination-s3-downloader.php:107
+#: inc/class-destination-s3-downloader.php:112
 msgid "File could not be opened for writing."
 msgstr "Kann die Zieldatei nicht zum Schreiben öffnen."
 
@@ -279,7 +279,7 @@ msgstr "Kann die Zieldatei nicht zum Schreiben öffnen."
 #: inc/Pro/class-destination-gdrive-downloader.php:74
 #: inc/class-destination-ftp-downloader.php:72
 #: inc/class-destination-dropbox-downloader.php:72
-#: inc/class-destination-s3-downloader.php:78
+#: inc/class-destination-s3-downloader.php:83
 msgid "Could not write data to file."
 msgstr "Kann nicht in die Datei schreiben."
 
@@ -1185,7 +1185,7 @@ msgstr "Kann Archivdatei nicht öffnen"
 #. translators: The $1 is the tecnical error string from pclzip.
 #: inc/class-create-archive.php:233
 #: inc/class-create-archive.php:518
-#: inc/class-create-archive.php:524
+#: inc/class-create-archive.php:514
 msgid "PclZip archive add error: %s"
 msgstr "Fehler beim Hinzufügen zum PclZip-Archive: %s"
 
@@ -1203,15 +1203,15 @@ msgstr "Datei %s existiert nicht oder ist nicht lesbar"
 #: inc/class-create-archive.php:378
 #: inc/class-create-archive.php:582
 #: inc/class-create-archive.php:591
-#: inc/class-create-archive.php:357
-#: inc/class-create-archive.php:384
-#: inc/class-create-archive.php:588
-#: inc/class-create-archive.php:597
+#: inc/class-create-archive.php:347
+#: inc/class-create-archive.php:374
+#: inc/class-create-archive.php:578
+#: inc/class-create-archive.php:587
 msgid "This archive method can only add one file"
 msgstr "Diese Archiv-Methode kann nur eine einzige Datei sichern"
 
 #: inc/class-create-archive.php:446
-#: inc/class-create-archive.php:452
+#: inc/class-create-archive.php:442
 msgid "ZIP archive cannot be closed correctly"
 msgstr "ZIP Archiv kann nicht korrekt geschlossen werden"
 
@@ -1220,75 +1220,75 @@ msgstr "ZIP Archiv kann nicht korrekt geschlossen werden"
 #: inc/class-create-archive.php:477
 #: inc/class-create-archive.php:494
 #: inc/class-create-archive.php:611
-#: inc/class-create-archive.php:483
-#: inc/class-create-archive.php:500
-#: inc/class-create-archive.php:617
+#: inc/class-create-archive.php:473
+#: inc/class-create-archive.php:490
+#: inc/class-create-archive.php:607
 msgid "Cannot add \"%s\" to zip archive!"
 msgstr "\"%s\" kann dem ZIP-Archiv nicht hinzugefügt werden!"
 
 #: inc/class-create-archive.php:548
-#: inc/class-create-archive.php:554
+#: inc/class-create-archive.php:544
 msgid "Folder name cannot be empty"
 msgstr "Der Verzeichnisname darf nicht leer sein"
 
 #. translators: $1 is the folder name
 #: inc/class-create-archive.php:559
-#: inc/class-create-archive.php:565
+#: inc/class-create-archive.php:555
 msgctxt "Folder path to add to archive"
 msgid "Folder %s does not exist or is not readable"
 msgstr "Verzeichnis %s existiert nicht oder ist nicht lesbar"
 
 #. translators. $1 is the status returned by a call to a ZipArchive method.
 #: inc/class-create-archive.php:643
-#: inc/class-create-archive.php:649
+#: inc/class-create-archive.php:639
 msgctxt "Text of ZipArchive status Message"
 msgid "ZipArchive returns status: %s"
 msgstr "Das Zip-Archiv antwortet den Status: %s"
 
 #. translators: $1 is the file name.
 #: inc/class-create-archive.php:691
-#: inc/class-create-archive.php:697
+#: inc/class-create-archive.php:687
 msgid "File name \"%1$s\" is too long to be saved correctly in %2$s archive!"
 msgstr "Dateiname \"%1$s\" ist zu lang, um korrekt im %2$s Archiv zu speichern!"
 
 #. translators: $1 is the file name to use in the archive.
 #: inc/class-create-archive.php:703
-#: inc/class-create-archive.php:709
+#: inc/class-create-archive.php:699
 msgid "File path \"%1$s\" is too long to be saved correctly in %2$s archive!"
 msgstr "Dateipfad \"%1$s\" ist zu lang, um korrekt in %2$s Archiv zu speichern!"
 
 #: inc/class-create-archive.php:745
-#: inc/class-create-archive.php:751
+#: inc/class-create-archive.php:741
 msgid "Cannot open source file %s for archiving. Writing an empty file."
 msgstr "Kann Quelldatei %s nicht zum Archivieren öffnen. Schreibe eine leere Datei."
 
 #. translators: $1 is the name of the folder. $2 is the archive name.
 #: inc/class-create-archive.php:807
-#: inc/class-create-archive.php:813
+#: inc/class-create-archive.php:803
 msgid "Folder name \"%1$s\" is too long to be saved correctly in %2$s archive!"
 msgstr "Verzeichnisname \"%1$s\" ist zu lang, um ihn korrekt im %2$s Archiv zu speichern!"
 
 #. translators: $1 is the name of the folder. $2 is the archive name.
 #: inc/class-create-archive.php:822
-#: inc/class-create-archive.php:828
+#: inc/class-create-archive.php:818
 msgid "Folder path \"%1$s\" is too long to be saved correctly in %2$s archive!"
 msgstr "Verzeichnispfad \"%1$s\" ist zu lang, um ihn korrekt im %2$s Archiv zu speichern!"
 
 #: inc/class-create-archive.php:890
-#: inc/class-create-archive.php:896
+#: inc/class-create-archive.php:886
 msgid "If %s will be added to your backup archive, the archive will be too large for operations with this PHP Version. You might want to consider splitting the backup job in multiple jobs with less files each."
 msgstr "Wenn %s zum Backup-Archiv hinzugefügt wird, wird das Archiv zu groß für Operationen mit dieser PHP-Version sein. Du solltest diesen Auftrag in mehrere Aufträge aufteilen, die weniger Dateien je Auftrag haben."
 
 #: inc/class-create-archive.php:968
 #: inc/class-create-archive.php:969
-#: inc/class-create-archive.php:974
-#: inc/class-create-archive.php:975
+#: inc/class-create-archive.php:964
+#: inc/class-create-archive.php:965
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. translators: $1 is the filename to add into the archive.
 #: inc/class-create-archive.php:1000
-#: inc/class-create-archive.php:1006
+#: inc/class-create-archive.php:996
 msgid "Cannot open source file %s."
 msgstr "Konnte Quelldatei %s zum Archivieren nicht öffnen."
 
@@ -1525,7 +1525,7 @@ msgstr[0] "Eine Sicherungsdatei gelöscht"
 msgstr[1] "%d Sicherungsdateien gelöscht"
 
 #: inc/class-destination-ftp-downloader.php:81
-#: inc/class-destination-ftp-downloader.php:104
+#: inc/class-destination-ftp-downloader.php:108
 msgid "Cannot open FTP file for download."
 msgstr "Kann die Datei auf dem FTP Server nicht zum Herunterladen öffnen."
 
@@ -4902,7 +4902,7 @@ msgstr ""
 msgid "<strong>Note</strong>: Would you like faster, more streamlined support? Pro users can contact BackWPup from right within the plugin."
 msgstr ""
 
-#: inc/class-destination-s3-downloader.php:71
+#: inc/class-destination-s3-downloader.php:76
 msgid "Could not write data to file. Empty source file."
 msgstr ""
 

diff --git a/languages/backwpup-de_DE_formal.po b/languages/backwpup-de_DE_formal.po
@@ -264,10 +264,10 @@ msgstr "Passwort:"
 #: inc/class-destination-ftp-downloader.php:89
 #: inc/class-destination-s3-downloader.php:63
 #: inc/Pro/class-destination-gdrive-downloader.php:102
-#: inc/class-destination-ftp-downloader.php:122
+#: inc/class-destination-ftp-downloader.php:126
 #: inc/class-destination-folder-downloader.php:137
 #: inc/class-destination-dropbox-downloader.php:104
-#: inc/class-destination-s3-downloader.php:107
+#: inc/class-destination-s3-downloader.php:112
 msgid "File could not be opened for writing."
 msgstr "Kann die Zieldatei nicht zum Schreiben öffnen."
 
@@ -279,7 +279,7 @@ msgstr "Kann die Zieldatei nicht zum Schreiben öffnen."
 #: inc/Pro/class-destination-gdrive-downloader.php:74
 #: inc/class-destination-ftp-downloader.php:72
 #: inc/class-destination-dropbox-downloader.php:72
-#: inc/class-destination-s3-downloader.php:78
+#: inc/class-destination-s3-downloader.php:83
 msgid "Could not write data to file."
 msgstr "Daten konnten nicht in den Ordner geschrieben werden."
 
@@ -1185,7 +1185,7 @@ msgstr "Kann Archivdatei nicht öffnen"
 #. translators: The $1 is the tecnical error string from pclzip.
 #: inc/class-create-archive.php:233
 #: inc/class-create-archive.php:518
-#: inc/class-create-archive.php:524
+#: inc/class-create-archive.php:514
 msgid "PclZip archive add error: %s"
 msgstr "Fehler beim Hinzufügen zum PclZip-Archiv: %s"
 
@@ -1203,15 +1203,15 @@ msgstr "Datei %s existiert nicht oder ist nicht lesbar"
 #: inc/class-create-archive.php:378
 #: inc/class-create-archive.php:582
 #: inc/class-create-archive.php:591
-#: inc/class-create-archive.php:357
-#: inc/class-create-archive.php:384
-#: inc/class-create-archive.php:588
-#: inc/class-create-archive.php:597
+#: inc/class-create-archive.php:347
+#: inc/class-create-archive.php:374
+#: inc/class-create-archive.php:578
+#: inc/class-create-archive.php:587
 msgid "This archive method can only add one file"
 msgstr "Diese Archiv-Methode kann nur eine einzige Datei sichern"
 
 #: inc/class-create-archive.php:446
-#: inc/class-create-archive.php:452
+#: inc/class-create-archive.php:442
 msgid "ZIP archive cannot be closed correctly"
 msgstr "ZIP Archiv kann nicht richtig geschlossen werden"
 
@@ -1220,75 +1220,75 @@ msgstr "ZIP Archiv kann nicht richtig geschlossen werden"
 #: inc/class-create-archive.php:477
 #: inc/class-create-archive.php:494
 #: inc/class-create-archive.php:611
-#: inc/class-create-archive.php:483
-#: inc/class-create-archive.php:500
-#: inc/class-create-archive.php:617
+#: inc/class-create-archive.php:473
+#: inc/class-create-archive.php:490
+#: inc/class-create-archive.php:607
 msgid "Cannot add \"%s\" to zip archive!"
 msgstr "\"%s\" kann dem ZIP-Archiv nicht hinzugefügt werden!"
 
 #: inc/class-create-archive.php:548
-#: inc/class-create-archive.php:554
+#: inc/class-create-archive.php:544
 msgid "Folder name cannot be empty"
 msgstr "Der Verzeichnisname darf nicht leer sein"
 
 #. translators: $1 is the folder name
 #: inc/class-create-archive.php:559
-#: inc/class-create-archive.php:565
+#: inc/class-create-archive.php:555
 msgctxt "Folder path to add to archive"
 msgid "Folder %s does not exist or is not readable"
 msgstr "Verzeichnis %s existiert nicht oder ist nicht lesbar"
 
 #. translators. $1 is the status returned by a call to a ZipArchive method.
 #: inc/class-create-archive.php:643
-#: inc/class-create-archive.php:649
+#: inc/class-create-archive.php:639
 msgctxt "Text of ZipArchive status Message"
 msgid "ZipArchive returns status: %s"
 msgstr "Das Zip-Archiv liefert den Status: %s"
 
 #. translators: $1 is the file name.
 #: inc/class-create-archive.php:691
-#: inc/class-create-archive.php:697
+#: inc/class-create-archive.php:687
 msgid "File name \"%1$s\" is too long to be saved correctly in %2$s archive!"
 msgstr "Dateiname \"%1$s\" ist zu lang, um korrekt im %2$s Archiv zu speichern!"
 
 #. translators: $1 is the file name to use in the archive.
 #: inc/class-create-archive.php:703
-#: inc/class-create-archive.php:709
+#: inc/class-create-archive.php:699
 msgid "File path \"%1$s\" is too long to be saved correctly in %2$s archive!"
 msgstr "Dateipfad \"%1$s\" ist zu lang, um korrekt in %2$s Archiv zu speichern!"
 
 #: inc/class-create-archive.php:745
-#: inc/class-create-archive.php:751
+#: inc/class-create-archive.php:741
 msgid "Cannot open source file %s for archiving. Writing an empty file."
 msgstr "Kann Quelldatei %s nicht zum Archivieren öffnen. Erstelle eine leere Datei."
 
 #. translators: $1 is the name of the folder. $2 is the archive name.
 #: inc/class-create-archive.php:807
-#: inc/class-create-archive.php:813
+#: inc/class-create-archive.php:803
 msgid "Folder name \"%1$s\" is too long to be saved correctly in %2$s archive!"
 msgstr "Verzeichnisname \"%1$s\" ist zu lang, um ihn im %2$s Archiv korrekt zu speichern!"
 
 #. translators: $1 is the name of the folder. $2 is the archive name.
 #: inc/class-create-archive.php:822
-#: inc/class-create-archive.php:828
+#: inc/class-create-archive.php:818
 msgid "Folder path \"%1$s\" is too long to be saved correctly in %2$s archive!"
 msgstr "Verzeichnispfad \"%1$s\" ist zu lang um ihn korrekt im %2$s Archiv zu speichern!"
 
 #: inc/class-create-archive.php:890
-#: inc/class-create-archive.php:896
+#: inc/class-create-archive.php:886
 msgid "If %s will be added to your backup archive, the archive will be too large for operations with this PHP Version. You might want to consider splitting the backup job in multiple jobs with less files each."
 msgstr "Wenn %s zum Backup-Archiv hinzugefügt wird, wird das Archiv zu groß für Operationen mit dieser PHP-Version sein. Sie sollten den Auftrag in mehrere Aufträge mit weniger Dateien je Auftrag aufteilen."
 
 #: inc/class-create-archive.php:968
 #: inc/class-create-archive.php:969
-#: inc/class-create-archive.php:974
-#: inc/class-create-archive.php:975
+#: inc/class-create-archive.php:964
+#: inc/class-create-archive.php:965
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #. translators: $1 is the filename to add into the archive.
 #: inc/class-create-archive.php:1000
-#: inc/class-create-archive.php:1006
+#: inc/class-create-archive.php:996
 msgid "Cannot open source file %s."
 msgstr "Konnte Quelle %s nicht öffnen."
 
@@ -1525,7 +1525,7 @@ msgstr[0] "Eine Sicherungsdatei gelöscht"
 msgstr[1] "%d Sicherungsdateien gelöscht"
 
 #: inc/class-destination-ftp-downloader.php:81
-#: inc/class-destination-ftp-downloader.php:104
+#: inc/class-destination-ftp-downloader.php:108
 msgid "Cannot open FTP file for download."
 msgstr "Die Datei auf dem FTP Server kann nicht zum Herunterladen geöffnet werden."
 
@@ -4902,7 +4902,7 @@ msgstr ""
 msgid "<strong>Note</strong>: Would you like faster, more streamlined support? Pro users can contact BackWPup from right within the plugin."
 msgstr ""
 
-#: inc/class-destination-s3-downloader.php:71
+#: inc/class-destination-s3-downloader.php:76
 msgid "Could not write data to file. Empty source file."
 msgstr ""