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

Made Files & Email work

Browse Source
This commit is contained in:
Shikiryu
2015-07-11 00:12:31 +02:00
parent 6eaf2f0176
commit 091dd4cf22
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,7 @@ class Email extends TransportAbstract
$this->to = $this->config['to'];
$this->from = $this->config['from'];
$this->encoding = $this->config['encoding'];
$this->subjet = $this->config['subject'];
$this->subject = $this->config['subject'];
$this->message = $this->config['message'];
$this->encoding = $this->config['encoding'];
}
@@ -229,25 +229,28 @@ class Email extends TransportAbstract
* Send the mail
*
* @see #mail
*
* @return bool
* @throws \Exception
*/
public function send() {
public function send()
{
// Checking files are selected
$zip = new \ZipArchive(); // Load zip library
$zip_name = time().".zip"; // Zip name
if($zip->open(TEMP_DIR.$zip_name, \ZIPARCHIVE::CREATE)==TRUE) {
if ($zip->open(TEMP_DIR.$zip_name, \ZIPARCHIVE::CREATE)==TRUE) {
if(!empty($this->files)) {
foreach($this->files as $file)
foreach($this->files as $file => $name)
{
$zip->addFile($file); // Adding files into zip
$zip->addFile($file, $name); // Adding files into zip
}
}
$zip->close();
}
} else {
throw new \Exception('Transport::Email::Can\'t zip the given backup.');
}
$this->files = array(TEMP_DIR.$zip_name=>dirname(__FILE__).'/bu/'.$zip_name);
$this->files = array(TEMP_DIR.$zip_name=>$zip_name);
$random_hash = md5(date('r', time()));
$headers = "From: " . $this->from . "\r\nReply-To: " . $this->from;
@@ -262,8 +265,6 @@ Content-Transfer-Encoding: 8bit
if(!empty($this->files))
foreach($this->files as $file => $name) {
$name = explode('/', $name);
$name = end($name);
$output .= "
--$random_hash
Content-Type: " . self::getMimeType($file) . "; name=" . $name . "