Shikiryu/Shikiryu_Backup
1
0
Fork 0
mirror of https://github.com/Chouchen/Shikiryu_Backup.git synced 2021-06-30 16:02:14 +02:00
Code Issues Packages Releases Wiki Activity

Correction after some tests

Browse Source
This commit is contained in:
Shikiryu
2015-07-10 23:13:46 +02:00
parent 05dd396eac
commit 6eaf2f0176
9 changed files with 99 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/code/Transport/Email.php
View File

@@ -2,6 +2,8 @@
namespace Shikiryu\Backup\Transport;
use Shikiryu\Backup\Backup\BackupAbstract;
class Email extends TransportAbstract
{
@@ -141,10 +143,10 @@ class Email extends TransportAbstract
}
/**
* @param Shikiryu_Backup_Abstract $backup
* @param BackupAbstract $backup
*/
public function __construct(Shikiryu_Backup_Abstract $backup) {
parent::__construct($backup);
public function __construct(BackupAbstract $backup, array $config) {
parent::__construct($backup, $config);
$this->setFiles($this->backup->getFilesToBackup());
$this->setStreams($this->backup->getStreamsToBackup());
$this->to = $this->config['to'];
@@ -233,9 +235,9 @@ class Email extends TransportAbstract
public function send() {
// Checking files are selected
$zip = new ZipArchive(); // Load zip library
$zip = new \ZipArchive(); // Load zip library
$zip_name = time().".zip"; // Zip name
if($zip->open(dirname(__FILE__).'/bu/'.$zip_name, ZIPARCHIVE::CREATE)==TRUE) {
if($zip->open(TEMP_DIR.$zip_name, \ZIPARCHIVE::CREATE)==TRUE) {
if(!empty($this->files)) {
foreach($this->files as $file)
{
@@ -245,7 +247,7 @@ class Email extends TransportAbstract
$zip->close();
}
$this->files = array(dirname(__FILE__).'/bu/'.$zip_name=>dirname(__FILE__).'/bu/'.$zip_name);
$this->files = array(TEMP_DIR.$zip_name=>dirname(__FILE__).'/bu/'.$zip_name);
$random_hash = md5(date('r', time()));
$headers = "From: " . $this->from . "\r\nReply-To: " . $this->from;
@@ -259,8 +261,9 @@ Content-Transfer-Encoding: 8bit
" . $this->message . "\r\n";
if(!empty($this->files))
foreach($this->files as $file=>$name) {
$name = end(explode('/', $name));
foreach($this->files as $file => $name) {
$name = explode('/', $name);
$name = end($name);
$output .= "
--$random_hash
Content-Type: " . self::getMimeType($file) . "; name=" . $name . "