@@ -36,47 +36,47 @@ discard block |
||
36 | 36 | } |
37 | 37 | switch ($ajaxAction) { |
38 | 38 | |
39 | - case 'upload': |
|
39 | + case 'upload': |
|
40 | 40 | |
41 | - $uploadDir = PMF_ROOT_DIR . '/images/'; |
|
42 | - $uploadFile = basename($_FILES['upload']['name']); |
|
43 | - $isUploaded = false; |
|
44 | - $height = $width = 0; |
|
45 | - $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ]; |
|
41 | + $uploadDir = PMF_ROOT_DIR . '/images/'; |
|
42 | + $uploadFile = basename($_FILES['upload']['name']); |
|
43 | + $isUploaded = false; |
|
44 | + $height = $width = 0; |
|
45 | + $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ]; |
|
46 | 46 | |
47 | - if ($csrfOkay) { |
|
48 | - if (is_uploaded_file($uploadedFile['tmp_name']) && |
|
49 | - $uploadedFile['size'] < $faqConfig->get('records.maxAttachmentSize') |
|
50 | - ) { |
|
47 | + if ($csrfOkay) { |
|
48 | + if (is_uploaded_file($uploadedFile['tmp_name']) && |
|
49 | + $uploadedFile['size'] < $faqConfig->get('records.maxAttachmentSize') |
|
50 | + ) { |
|
51 | 51 | |
52 | - $fileInfo = getimagesize($uploadedFile['tmp_name']); |
|
53 | - $fileExtension = strtolower(pathinfo($uploadFile, PATHINFO_EXTENSION)); |
|
52 | + $fileInfo = getimagesize($uploadedFile['tmp_name']); |
|
53 | + $fileExtension = strtolower(pathinfo($uploadFile, PATHINFO_EXTENSION)); |
|
54 | 54 | |
55 | - if (false === $fileInfo) { |
|
56 | - $isUploaded = false; |
|
57 | - } |
|
58 | - |
|
59 | - if (($fileInfo[2] !== IMAGETYPE_GIF) && |
|
60 | - ($fileInfo[2] !== IMAGETYPE_JPEG) && |
|
61 | - ($fileInfo[2] !== IMAGETYPE_PNG)) { |
|
62 | - $isUploaded = false; |
|
63 | - } else { |
|
64 | - $isUploaded = true; |
|
65 | - } |
|
66 | - |
|
67 | - if (!in_array($fileExtension, $validFileExtensions)) { |
|
68 | - $isUploaded = false; |
|
69 | - } |
|
55 | + if (false === $fileInfo) { |
|
56 | + $isUploaded = false; |
|
57 | + } |
|
70 | 58 | |
71 | - if ($fileInfo && $isUploaded) { |
|
72 | - list($width, $height) = $fileInfo; |
|
73 | - if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) { |
|
74 | - $isUploaded = true; |
|
59 | + if (($fileInfo[2] !== IMAGETYPE_GIF) && |
|
60 | + ($fileInfo[2] !== IMAGETYPE_JPEG) && |
|
61 | + ($fileInfo[2] !== IMAGETYPE_PNG)) { |
|
62 | + $isUploaded = false; |
|
75 | 63 | } else { |
64 | + $isUploaded = true; |
|
65 | + } |
|
66 | + |
|
67 | + if (!in_array($fileExtension, $validFileExtensions)) { |
|
76 | 68 | $isUploaded = false; |
77 | 69 | } |
78 | - } |
|
79 | - ?> |
|
70 | + |
|
71 | + if ($fileInfo && $isUploaded) { |
|
72 | + list($width, $height) = $fileInfo; |
|
73 | + if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) { |
|
74 | + $isUploaded = true; |
|
75 | + } else { |
|
76 | + $isUploaded = false; |
|
77 | + } |
|
78 | + } |
|
79 | + ?> |
|
80 | 80 | <script> |
81 | 81 | window.parent.window.pmfImageUpload.uploadFinished({ |
82 | 82 | filename: '<?php echo $faqConfig->getDefaultUrl() . 'images/' . $uploadFile ?>', |
@@ -87,8 +87,8 @@ discard block |
||
87 | 87 | }); |
88 | 88 | </script> |
89 | 89 | <?php |
90 | - } else { |
|
91 | - ?> |
|
90 | + } else { |
|
91 | + ?> |
|
92 | 92 | <script> |
93 | 93 | window.parent.window.pmfImageUpload.uploadFinished({ |
94 | 94 | filename: '', |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | }); |
100 | 100 | </script> |
101 | 101 | <?php |
102 | - } |
|
103 | - } else { |
|
104 | - ?> |
|
102 | + } |
|
103 | + } else { |
|
104 | + ?> |
|
105 | 105 | <script> |
106 | 106 | window.parent.window.pmfImageUpload.uploadFinished({ |
107 | 107 | filename: '', |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | }); |
113 | 113 | </script> |
114 | 114 | <?php |
115 | - } |
|
115 | + } |
|
116 | 116 | |
117 | - break; |
|
117 | + break; |
|
118 | 118 | } |
119 | 119 | \ No newline at end of file |
@@ -38,11 +38,11 @@ discard block |
||
38 | 38 | |
39 | 39 | case 'upload': |
40 | 40 | |
41 | - $uploadDir = PMF_ROOT_DIR . '/images/'; |
|
41 | + $uploadDir = PMF_ROOT_DIR.'/images/'; |
|
42 | 42 | $uploadFile = basename($_FILES['upload']['name']); |
43 | 43 | $isUploaded = false; |
44 | 44 | $height = $width = 0; |
45 | - $validFileExtensions = [ 'gif', 'jpg', 'jpeg', 'png' ]; |
|
45 | + $validFileExtensions = ['gif', 'jpg', 'jpeg', 'png']; |
|
46 | 46 | |
47 | 47 | if ($csrfOkay) { |
48 | 48 | if (is_uploaded_file($uploadedFile['tmp_name']) && |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | if ($fileInfo && $isUploaded) { |
72 | 72 | list($width, $height) = $fileInfo; |
73 | - if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) { |
|
73 | + if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir.$uploadFile)) { |
|
74 | 74 | $isUploaded = true; |
75 | 75 | } else { |
76 | 76 | $isUploaded = false; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | ?> |
80 | 80 | <script> |
81 | 81 | window.parent.window.pmfImageUpload.uploadFinished({ |
82 | - filename: '<?php echo $faqConfig->getDefaultUrl() . 'images/' . $uploadFile ?>', |
|
82 | + filename: '<?php echo $faqConfig->getDefaultUrl().'images/'.$uploadFile ?>', |
|
83 | 83 | result: '<?php echo $isUploaded ? 'file_uploaded' : 'error' ?>', |
84 | 84 | resultCode: '<?php echo $isUploaded ? 'success' : 'failed' ?>', |
85 | 85 | height: <?php echo $height ?>, |