extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* EPL S3: fix not working upload of backups

Browse Source
This commit is contained in:
ralf 2024-01-08 12:13:50 +02:00
parent 94670fcf83
commit 9844a78b34
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
api/src/Db/Backup.php
View File

@ -1239,18 +1239,30 @@ class Backup
* Move uploaded file to backup-directory * Move uploaded file to backup-directory
* *
* @param array $file values for keys "tmp_name", "name", "size" * @param array $file values for keys "tmp_name", "name", "size"
* @return ?string success message or null on error * @return string success or error message
*/ */
public function upload(array $file) : ?string public function upload(array $file) : string
{ {
if (move_uploaded_file($file['tmp_name'], $filename = $this->backup_dir . '/' . basename($file['name']))) if (is_uploaded_file($file['tmp_name']) && ($src=fopen($file['tmp_name'], 'r')) &&
($dst=fopen($filename = $this->backup_dir . '/' . basename($file['name']), 'w')) &&
stream_copy_to_stream($src, $dst) !== false && fclose($dst))
{ {
$msg = lang("succesfully uploaded file %1", $filename . ', ' . $msg = lang("succesfully uploaded file %1", $filename . ', ' .
sprintf('%3.1f MB (%d)', $file['size'] / (1024 * 1024), $file['size'])) . sprintf('%3.1f MB (%d)', $file['size'] / (1024 * 1024), $file['size'])) .
', md5=' . md5_file($file['tmp_name']) . ', sha1=' . sha1_file($file['tmp_name']); ', md5=' . md5_file($file['tmp_name']) . ', sha1=' . sha1_file($file['tmp_name']);
$this->log($filename, $msg);
} }
return $msg ?? null; else
{
$msg = lang('Error uploading your backup!');
}
if (isset($src))
{
fclose($src);
}
$this->log($filename, $msg);
return $msg;
} }
/** /**

1
setup/lang/egw_de.lang
View File

@ -324,6 +324,7 @@ error in group-creation !!! setup de Fehler beim Anlegen der Gruppen !!!
error listing "dn=%1"! setup de Fehler beim Auflisten von "DN=%1"! error listing "dn=%1"! setup de Fehler beim Auflisten von "DN=%1"!
error modifying dn=%1: %2='%3'! setup de Fehler beim Ändern von DN=%1: %2='%3'! error modifying dn=%1: %2='%3'! setup de Fehler beim Ändern von DN=%1: %2='%3'!
error searching "dn=%1" for "%2"! setup de Fehler beim Suchen von "DN=%1" nach "%2"! error searching "dn=%1" for "%2"! setup de Fehler beim Suchen von "DN=%1" nach "%2"!
error uploading your backup! setup de Fehler beim Hochladen Ihres Backups!
every setup de Alle every setup de Alle
export has been completed! setup de Export ist abgeschlossen! export has been completed! setup de Export ist abgeschlossen!
failed to mount backup directory! setup de Konnte Datensicherungsverzeichnis nicht mounten! failed to mount backup directory! setup de Konnte Datensicherungsverzeichnis nicht mounten!

1
setup/lang/egw_en.lang
View File

@ -324,6 +324,7 @@ error in group-creation !!! setup en Error in group creation!
error listing "dn=%1"! setup en Error listing "DN=%1"! error listing "dn=%1"! setup en Error listing "DN=%1"!
error modifying dn=%1: %2='%3'! setup en Error modifying DN=%1: %2='%3'! error modifying dn=%1: %2='%3'! setup en Error modifying DN=%1: %2='%3'!
error searching "dn=%1" for "%2"! setup en Error searching "DN=%1" for "%2"! error searching "dn=%1" for "%2"! setup en Error searching "DN=%1" for "%2"!
error uploading your backup! setup en Error uploading your backup!
every setup en Every every setup en Every
export has been completed! setup en Export has been completed! export has been completed! setup en Export has been completed!
failed to mount backup directory! setup en Failed to mount Backup directory! failed to mount backup directory! setup en Failed to mount Backup directory!