removed linkFiles property, replaced file uploader

Author: kostant85

examples/form.php

@@ -43,6 +43,12 @@
 	'port'     => 587,
 ];
 
+$fileManager = new FileManager([
+        'uploadPath' => __DIR__ . '/attachments',
+        'uploadUrl' => $_SERVER['HTTP_ORIGIN'] . '/attachments',
+    ]
+);
+
 $message = [
 	'from'    => ['hello@justcoded.co.uk' => 'FROM NAME'],
 	'to'      => ['kostant21@yahoo.com' => 'TO NAME'],
@@ -51,7 +57,7 @@
 	'subject' => 'Contact request from {name}',
 	'bodyTemplate'    => __DIR__ . '/template-html.php',
 	'altBodyTemplate' => __DIR__ . '/template-plain.php',
-    'attachments' => FileManager::prepareUpload([
+    'attachments' => $fileManager->upload([
         'cv_file', 'image_file'
     ])
 ];

examples/template-html.php

@@ -13,15 +13,9 @@
 <p>User IP address: <?php echo @$_SERVER['REMOTE_ADDR']; ?></p>
 <p>Browser: <?php echo @$_SERVER['HTTP_USER_AGENT']; ?></p>
 
-<?php if (count($links) > 0): ?>
-    <ul>
-        <?php foreach ($links as $link): ?>
-            <li>
-                <a href="<?php echo $link->getPath() ?>"><?php echo $link->getName() ?> </a>
-            </li>
-        <?php endforeach; ?>
-    </ul>
-<?php endif; ?>
+{cv_file}
+
+{image_file}
 
 </body>
 </html>

src/DataObjects/File.php

@@ -35,6 +35,16 @@ class File extends DataObject
      */
     public $uniqName;
 
+    /**
+     * @var string
+     */
+    public $uploadUrl;
+
+    /**
+     * @var string
+     */
+    public $uploadPath;
+
     /**
      * File constructor.
      * @param array $config
@@ -53,4 +63,9 @@ public function getExtension()
     {
         return pathinfo($this->name, PATHINFO_EXTENSION);
     }
+
+    public function __toString()
+    {
+        return $this->uploadUrl;
+    }
 }

src/DataObjects/MailMessage.php

@@ -66,11 +66,6 @@ class MailMessage extends DataObject
      */
 	protected $files = [];
 
-    /**
-     * @var array
-     */
-	protected $fileLinks = [];
-
 	/**
 	 * Message constructor.
 	 *
@@ -166,7 +161,7 @@ public function getBody()
 		if (!empty($this->body)) {
 			return $this->body;
 		} elseif (!empty($this->bodyTemplate)) {
-			return render_template($this->bodyTemplate, $this->tokens, $this->fileLinks);
+			return render_template($this->bodyTemplate, $this->tokens);
 		} else {
 			return null;
 		}
@@ -180,32 +175,17 @@ public function getAltBody()
 		if (!empty($this->altBody)) {
 			return $this->altBody;
 		} else {
-			return render_template($this->altBodyTemplate, $this->tokens, $this->fileLinks);
+			return render_template($this->altBodyTemplate, $this->tokens);
 		}
 	}
 
 	public function setFiles()
     {
-        $uploadFolder = $this->getFullPathOfUploadFolder();
-
-        if (!file_exists($uploadFolder)) {
-            mkdir($uploadFolder, 0777, true);
-        }
-
         foreach ($this->attachments as $file)
         {
             /** @var File $file */
-            $path = $this->getFullPathOfUploadFolder() . DIRECTORY_SEPARATOR . $file->uniqName;
-            @chmod($path, 0666 & ~umask());
-
-            if (move_uploaded_file($file->tmp_name, $path)) {
-
-                if ($file->size > self::ATTACHMENTS_SIZE_LIMIT) {
-                    $domainPath = $_SERVER['HTTP_ORIGIN'] . $this->getWebUploadFolder() .DIRECTORY_SEPARATOR . $file->uniqName;
-                    $this->addFileLink([$domainPath => $file->name]);
-                } else {
-                    $this->addFile([$path => $file->name]);
-                }
+            if (!$file->size > self::ATTACHMENTS_SIZE_LIMIT) {
+                $this->addFile([$file->uploadPath => $file->name]);
             }
         }
 
@@ -228,43 +208,4 @@ protected function addFile($data)
         $this->files[] = new EmailAttachment($data);
     }
 
-    /**
-     * @param $data
-     */
-    protected function addFileLink($data)
-    {
-        $this->fileLinks[] = new EmailAttachment($data);
-    }
-
-    /**
-     * @return array
-     */
-    public function getFileLinks()
-    {
-        return $this->fileLinks;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFullPathOfUploadFolder()
-    {
-        return __DIR__ . $this->getUploadFolder();
-    }
-
-    /**
-     * @return string
-     */
-    protected function getUploadFolder()
-    {
-        return '/../../examples' . $this->getWebUploadFolder();
-    }
-
-    /**
-     * @return string
-     */
-    protected function getWebUploadFolder()
-    {
-        return '/attachments';
-    }
 }

src/FileManager/FileManager.php

@@ -7,16 +7,40 @@
 
 class FileManager extends DataObject
 {
-    public static function prepareUpload(array $fields)
+    /**
+     * @var string
+     */
+    protected $uploadPath;
+
+    /**
+     * @var string
+     */
+    protected $uploadUrl;
+
+    public function upload(array $fields)
     {
-        $files = [];
+        if (!is_dir($this->uploadPath)) {
+            mkdir($this->uploadPath, 0777, true);
+        }
 
+        $files = [];
         foreach ($fields as $field) {
-            $file = $_FILES[$field];
+            if (array_key_exists($field, $_FILES)) {
+                $fileField = $_FILES[$field];
+                $file = new File($fileField);
+
+                $name = preg_replace('/[^\00-\255]+/u', '', $file->name);
+                $name = str_replace('"', '', trim($name));
+                /** @var File $file */
+                $path = realpath($this->uploadPath) . '/' . $name . $file->uniqName;
+
+                if ($file->error == 0 && move_uploaded_file($file->tmp_name, $path)) {
 
-            if ($file['error'] == 0) {
-                $files[] = new File($file);
-                $_POST[$field] = $files;
+                    $file->uploadUrl = $this->uploadUrl . '/' . $name . $file->uniqName;
+                    $file->uploadPath = $path;
+                    $_POST[$field] = $file;
+                    $files[] = $file;
+                }
             }
         }
 

src/FormHandler.php

@@ -3,9 +3,9 @@
 namespace JustCoded\FormHandler;
 
 
-use JustCoded\FormHandler\DataObjects\File;
 use JustCoded\FormHandler\Handlers\HandlerInterface;
 use Valitron\Validator;
+use JustCoded\FormHandler\Validator\File as FileValidator;
 
 class FormHandler
 {
@@ -60,21 +60,7 @@ public function validate($data)
 		$this->formFields = $data;
 		$v                = new Validator($data);
 
-        $v::addRule('file', function($field, $value, array $params, array $fields) {
-            /**
-             * @var File $file
-             */
-            $file = $value[0];
-
-            if ($file->size >= $this->rules['rules']['file']['allowSize']) {
-                return false;
-            } elseif (! in_array($file->getExtension(), $this->rules['rules']['file']['allowType'])) {
-                return false;
-            }
-
-            return true;
-        }, 'file error');
-
+		$v = FileValidator::validate($v, $this->rules);
 		// create rules from input array.
 		foreach ($this->rules['rules'] as $key => $params) {
 			$rule = $v->rule($key, $params['fields']);

src/Validator/File.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace JustCoded\FormHandler\Validator;
+
+use Valitron\Validator;
+use JustCoded\FormHandler\DataObjects\File as FileValidator;
+
+class File
+{
+    public static function validate(Validator $v, $rules)
+    {
+        $allowSize = $rules['rules']['file']['allowSize'];
+        $allowType = $rules['rules']['file']['allowType'];
+
+        $v::addRule('file', function($field, $value, array $params, array $fields) use ($allowSize, $allowType) {
+            /**
+             * @var FileValidator $value
+             */
+            if ($value->size >= $allowSize) {
+                return false;
+            } elseif (! in_array($value->getExtension(), $allowType)) {
+                return false;
+            }
+
+            return true;
+        }, 'File error. ' . 'Max file size: ' . $allowSize . ' bytes. Allowable extensions: ' . implode(",", $allowType));
+
+        return $v;
+    }
+}

src/functions.php

@@ -1,7 +1,7 @@
 <?php
 
 if (! function_exists('render_template')) {
-	function render_template($template, $data, $links)
+	function render_template($template, $data)
 	{
 		if (! is_file($template)) {
 			throw new Exception('Unable to find template file: ' . $template);