@@ -38,31 +38,31 @@ discard block |
||
38 | 38 | $this->allowedMimetypes = $allowedMimetypes; |
39 | 39 | } |
40 | 40 | |
41 | - /** |
|
42 | - * $current_uri String actual uri of the file |
|
43 | - * $dest_folder String future uri of the file starting from web/upload folder |
|
44 | - * $lifetime DateTime lifetime of the file. If time goes over this limit, the file will be deleted. |
|
45 | - **/ |
|
46 | - public function upload(File $file, $dest_folder = '', \DateTime $lifetime = null) |
|
47 | - { |
|
41 | + /** |
|
42 | + * $current_uri String actual uri of the file |
|
43 | + * $dest_folder String future uri of the file starting from web/upload folder |
|
44 | + * $lifetime DateTime lifetime of the file. If time goes over this limit, the file will be deleted. |
|
45 | + **/ |
|
46 | + public function upload(File $file, $dest_folder = '', \DateTime $lifetime = null) |
|
47 | + { |
|
48 | 48 | //preparing dir name |
49 | 49 | $dest_folder = date('Ymd').'/'.date('G').'/'.$dest_folder; |
50 | 50 | |
51 | 51 | //checking mimetypes |
52 | 52 | $mimeTypePassed = false; |
53 | 53 | foreach ($this->allowedMimetypes as $mimeType) { |
54 | - if (preg_match('@'.$mimeType.'@', $file->getMimeType())) { |
|
55 | - $mimeTypePassed = true; |
|
56 | - } |
|
54 | + if (preg_match('@'.$mimeType.'@', $file->getMimeType())) { |
|
55 | + $mimeTypePassed = true; |
|
56 | + } |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | if (!$mimeTypePassed) { |
60 | - throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes)); |
|
60 | + throw new InvalidMimeTypeException('Only following filetypes are allowed : '.implode(', ', $this->allowedMimetypes)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $fs = new Filesystem(); |
64 | 64 | if (!$fs->exists($this->uploadDir.$dest_folder)) { |
65 | - $fs->mkdir($this->uploadDir.$dest_folder); |
|
65 | + $fs->mkdir($this->uploadDir.$dest_folder); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $em = $this->entityManager; |
@@ -85,27 +85,27 @@ discard block |
||
85 | 85 | // Checking for a media with the same name |
86 | 86 | $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($dest_folder.$filename); |
87 | 87 | if (count($mediaExists) === 0) { |
88 | - $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename); |
|
88 | + $mediaExists = $fs->exists($this->uploadDir.$dest_folder.$filename); |
|
89 | 89 | } |
90 | 90 | |
91 | 91 | // If there's one, we try to generate a new name |
92 | 92 | $extension = $file->getExtension(); |
93 | 93 | if (empty($extension)) { |
94 | - $extension = $file->guessExtension(); |
|
94 | + $extension = $file->guessExtension(); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | if (count($mediaExists) > 0) { |
98 | - $filename = basename($filename, '.'.$extension); |
|
99 | - |
|
100 | - $i = 1; |
|
101 | - do { |
|
102 | - $media->setName($filename.'-'.$i++.'.'.$extension); |
|
103 | - $media->setUri($dest_folder.$media->getName()); |
|
104 | - $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri()); |
|
105 | - } while (count($mediaExists) > 0); |
|
98 | + $filename = basename($filename, '.'.$extension); |
|
99 | + |
|
100 | + $i = 1; |
|
101 | + do { |
|
102 | + $media->setName($filename.'-'.$i++.'.'.$extension); |
|
103 | + $media->setUri($dest_folder.$media->getName()); |
|
104 | + $mediaExists = $this->entityManager->getRepository('AlpixelMediaBundle:Media')->findOneByUri($media->getUri()); |
|
105 | + } while (count($mediaExists) > 0); |
|
106 | 106 | } else { |
107 | - $media->setName($filename.'.'.$extension); |
|
108 | - $media->setUri($dest_folder.$media->getName()); |
|
107 | + $media->setName($filename.'.'.$extension); |
|
108 | + $media->setUri($dest_folder.$media->getName()); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | $file->move($this->uploadDir.$dest_folder, $media->getName()); |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $em->flush(); |
120 | 120 | |
121 | 121 | return $media; |
122 | - } |
|
122 | + } |
|
123 | 123 | |
124 | 124 | public function cleanup() |
125 | 125 | { |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | public function __construct(EntityManager $entityManager, $uploadDir, $allowedMimetypes) |
32 | 32 | { |
33 | 33 | $this->entityManager = $entityManager; |
34 | - if(substr($uploadDir, -1) !== '/') { |
|
34 | + if (substr($uploadDir, -1) !== '/') { |
|
35 | 35 | $uploadDir = $uploadDir.'/'; |
36 | 36 | } |
37 | 37 | $this->uploadDir = $uploadDir; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | // Sanitizing the filename |
73 | 73 | $slugify = new Slugify(); |
74 | - if($file instanceof UploadedFile) { |
|
74 | + if ($file instanceof UploadedFile) { |
|
75 | 75 | $filename = $slugify->slugify($file->getClientOriginalName()); |
76 | 76 | } else { |
77 | 77 | $filename = $slugify->slugify($file->getFilename()); |