@@ -71,9 +71,9 @@ |
||
71 | 71 | </a> | |
72 | 72 | <?php echo $date->format(date('Y-m-d H:i', $faqcomment['date'])) ?> | |
73 | 73 | <a href="<?php printf('../?action=artikel&cat=%d&id=%d&artlang=%s', |
74 | - $faqcomment['category_id'], |
|
75 | - $faqcomment['record_id'], |
|
76 | - $LANGCODE) ?>"> |
|
74 | + $faqcomment['category_id'], |
|
75 | + $faqcomment['record_id'], |
|
76 | + $LANGCODE) ?>"> |
|
77 | 77 | <?php echo $faq->getRecordTitle($faqcomment['record_id']) ?> |
78 | 78 | </a> |
79 | 79 | </span><br/> |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | if (!is_dir(PMF_ROOT_DIR.'/images')) { |
67 | 67 | echo '<p class="alert alert-danger">'.sprintf($PMF_LANG['ad_dir_missing'], '/images').'</p>'; |
68 | 68 | } else { |
69 | - $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(PMF_ROOT_DIR . '/images/')); |
|
69 | + $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(PMF_ROOT_DIR.'/images/')); |
|
70 | 70 | foreach ($files as $file) { |
71 | 71 | if ($file->isDir() || !in_array($file->getExtension(), $allowedExtensions)) { |
72 | 72 | continue; |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | $path = str_replace(dirname(__DIR__).'/', '', $file->getPath()); |
75 | 75 | printf( |
76 | 76 | '<div class="mce-file" data-src="%s"><img src="%s" class="mce-file-preview">%s</div>', |
77 | - $faqConfig->getDefaultUrl() . $path . '/' . $file->getFilename(), |
|
78 | - $faqConfig->getDefaultUrl() . $path . '/' . $file->getFilename(), |
|
79 | - $path . '/' . $file->getFilename() |
|
77 | + $faqConfig->getDefaultUrl().$path.'/'.$file->getFilename(), |
|
78 | + $faqConfig->getDefaultUrl().$path.'/'.$file->getFilename(), |
|
79 | + $path.'/'.$file->getFilename() |
|
80 | 80 | ); |
81 | 81 | } |
82 | 82 | } |
@@ -73,21 +73,21 @@ |
||
73 | 73 | $search |
74 | 74 | ->setTable(PMF_Db::getTablePrefix().'faqdata AS fd') |
75 | 75 | ->setResultColumns( |
76 | - [ |
|
77 | - 'fd.id AS id', |
|
78 | - 'fd.lang AS lang', |
|
79 | - 'fcr.category_id AS category_id', |
|
80 | - 'fd.thema AS question', |
|
81 | - 'fd.content AS answer', |
|
82 | - 'fd.keywords AS keywords' |
|
83 | - ] |
|
76 | + [ |
|
77 | + 'fd.id AS id', |
|
78 | + 'fd.lang AS lang', |
|
79 | + 'fcr.category_id AS category_id', |
|
80 | + 'fd.thema AS question', |
|
81 | + 'fd.content AS answer', |
|
82 | + 'fd.keywords AS keywords' |
|
83 | + ] |
|
84 | 84 | ) |
85 | 85 | ->setJoinedTable(PMF_Db::getTablePrefix().'faqcategoryrelations AS fcr') |
86 | 86 | ->setJoinedColumns( |
87 | - [ |
|
87 | + [ |
|
88 | 88 | 'fd.id = fcr.record_id', |
89 | 89 | 'fd.lang = fcr.record_lang', |
90 | - ] |
|
90 | + ] |
|
91 | 91 | ) |
92 | 92 | ->setConditions( |
93 | 93 | [ |
@@ -105,9 +105,12 @@ discard block |
||
105 | 105 | <?php echo $PMF_LANG['msgEdit'] ?> |
106 | 106 | </a> |
107 | 107 | </td> |
108 | - <?php else: ?> |
|
108 | + <?php else { |
|
109 | + : ?> |
|
109 | 110 | <td><?php echo $PMF_LANG['msgEdit'] ?></td> |
110 | - <?php endif; ?> |
|
111 | + <?php endif; |
|
112 | +} |
|
113 | +?> |
|
111 | 114 | <?php if ($user->perm->checkRight($user->getUserId(), 'deltranslation') && $showActions): ?> |
112 | 115 | <td> |
113 | 116 | <a class="btn btn-danger" href="javascript: del('<?php echo $lang ?>');" > |
@@ -115,9 +118,12 @@ discard block |
||
115 | 118 | <?php echo $PMF_LANG['msgDelete'] ?> |
116 | 119 | </a> |
117 | 120 | </td> |
118 | - <?php else: ?> |
|
121 | + <?php else { |
|
122 | + : ?> |
|
119 | 123 | <td><?php echo $PMF_LANG['msgDelete'] ?></td> |
120 | - <?php endif; ?> |
|
124 | + <?php endif; |
|
125 | +} |
|
126 | +?> |
|
121 | 127 | <?php if ($user->perm->checkRight($user->getUserId(), 'edittranslation') && $showActions): ?> |
122 | 128 | <td> |
123 | 129 | <a class="btn btn-success" href="javascript: sendToTeam('<?php echo $lang ?>');" > |
@@ -125,14 +131,20 @@ discard block |
||
125 | 131 | <?php echo $PMF_LANG['msgTransToolSendToTeam'] ?> |
126 | 132 | </a> |
127 | 133 | </td> |
128 | - <?php else: ?> |
|
134 | + <?php else { |
|
135 | + : ?> |
|
129 | 136 | <td><?php echo $PMF_LANG['msgTransToolSendToTeam'] ?></td> |
130 | - <?php endif; ?> |
|
137 | + <?php endif; |
|
138 | +} |
|
139 | +?> |
|
131 | 140 | <?php if ($isLangFileWritable): ?> |
132 | 141 | <td><i aria-hidden="true" class="fa fa-ok-circle"></i> <?php echo $PMF_LANG['msgYes'] ?></td> |
133 | - <?php else: ?> |
|
142 | + <?php else { |
|
143 | + : ?> |
|
134 | 144 | <td><i aria-hidden="true" class="fa fa-ban-circle"></i> <?php echo $PMF_LANG['msgNo'] ?></td> |
135 | - <?php endif; ?> |
|
145 | + <?php endif; |
|
146 | +} |
|
147 | +?> |
|
136 | 148 | <td> |
137 | 149 | <?php echo $percents ?>% |
138 | 150 | <meter value="<?php echo $percents ?>" max="100" min="0" title="<?php echo $percents ?>%"> |
@@ -51,7 +51,7 @@ |
||
51 | 51 | * @param array $headers |
52 | 52 | * @param string $body |
53 | 53 | * |
54 | - * @return bool True if successful, false otherwise. |
|
54 | + * @return integer True if successful, false otherwise. |
|
55 | 55 | */ |
56 | 56 | public function send($recipients, Array $headers, $body) |
57 | 57 | { |
@@ -18,7 +18,7 @@ |
||
18 | 18 | exit(); |
19 | 19 | } |
20 | 20 | |
21 | -require __DIR__ . '/../../libs/swiftmailer/swift_required.php'; |
|
21 | +require __DIR__.'/../../libs/swiftmailer/swift_required.php'; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * Class PMF_Mail_SwiftSMTP |
@@ -36,41 +36,41 @@ 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; |
|
41 | + $uploadDir = PMF_ROOT_DIR . '/images/'; |
|
42 | + $uploadFile = basename($_FILES['upload']['name']); |
|
43 | + $isUploaded = false; |
|
44 | + $height = $width = 0; |
|
45 | 45 | |
46 | - if ($csrfOkay) { |
|
47 | - if (is_uploaded_file($uploadedFile['tmp_name']) && |
|
48 | - $uploadedFile['size'] < $faqConfig->get('records.maxAttachmentSize') |
|
49 | - ) { |
|
46 | + if ($csrfOkay) { |
|
47 | + if (is_uploaded_file($uploadedFile['tmp_name']) && |
|
48 | + $uploadedFile['size'] < $faqConfig->get('records.maxAttachmentSize') |
|
49 | + ) { |
|
50 | 50 | |
51 | - $info = getimagesize($uploadedFile['tmp_name']); |
|
51 | + $info = getimagesize($uploadedFile['tmp_name']); |
|
52 | 52 | |
53 | - if (false === $info) { |
|
54 | - $isUploaded = false; |
|
55 | - } |
|
56 | - |
|
57 | - if (($info[2] !== IMAGETYPE_GIF) && |
|
58 | - ($info[2] !== IMAGETYPE_JPEG) && |
|
59 | - ($info[2] !== IMAGETYPE_PNG)) { |
|
60 | - $isUploaded = false; |
|
61 | - } else { |
|
62 | - $isUploaded = true; |
|
63 | - } |
|
53 | + if (false === $info) { |
|
54 | + $isUploaded = false; |
|
55 | + } |
|
64 | 56 | |
65 | - if ($info) { |
|
66 | - list($width, $height) = $info; |
|
67 | - if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) { |
|
68 | - $isUploaded = true; |
|
69 | - } else { |
|
57 | + if (($info[2] !== IMAGETYPE_GIF) && |
|
58 | + ($info[2] !== IMAGETYPE_JPEG) && |
|
59 | + ($info[2] !== IMAGETYPE_PNG)) { |
|
70 | 60 | $isUploaded = false; |
61 | + } else { |
|
62 | + $isUploaded = true; |
|
71 | 63 | } |
72 | - } |
|
73 | - ?> |
|
64 | + |
|
65 | + if ($info) { |
|
66 | + list($width, $height) = $info; |
|
67 | + if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) { |
|
68 | + $isUploaded = true; |
|
69 | + } else { |
|
70 | + $isUploaded = false; |
|
71 | + } |
|
72 | + } |
|
73 | + ?> |
|
74 | 74 | <script> |
75 | 75 | window.parent.window.pmfImageUpload.uploadFinished({ |
76 | 76 | filename: '<?php echo $faqConfig->getDefaultUrl() . 'images/' . $uploadFile ?>', |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | }); |
82 | 82 | </script> |
83 | 83 | <?php |
84 | - } else { |
|
85 | - ?> |
|
84 | + } else { |
|
85 | + ?> |
|
86 | 86 | <script> |
87 | 87 | window.parent.window.pmfImageUpload.uploadFinished({ |
88 | 88 | filename: '', |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | }); |
94 | 94 | </script> |
95 | 95 | <?php |
96 | - } |
|
97 | - } else { |
|
98 | - ?> |
|
96 | + } |
|
97 | + } else { |
|
98 | + ?> |
|
99 | 99 | <script> |
100 | 100 | window.parent.window.pmfImageUpload.uploadFinished({ |
101 | 101 | filename: '', |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | }); |
107 | 107 | </script> |
108 | 108 | <?php |
109 | - } |
|
109 | + } |
|
110 | 110 | |
111 | - break; |
|
111 | + break; |
|
112 | 112 | } |
113 | 113 | \ No newline at end of file |
@@ -38,7 +38,7 @@ 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; |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | |
65 | 65 | if ($info) { |
66 | 66 | list($width, $height) = $info; |
67 | - if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir . $uploadFile)) { |
|
67 | + if (move_uploaded_file($uploadedFile['tmp_name'], $uploadDir.$uploadFile)) { |
|
68 | 68 | $isUploaded = true; |
69 | 69 | } else { |
70 | 70 | $isUploaded = false; |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | ?> |
74 | 74 | <script> |
75 | 75 | window.parent.window.pmfImageUpload.uploadFinished({ |
76 | - filename: '<?php echo $faqConfig->getDefaultUrl() . 'images/' . $uploadFile ?>', |
|
76 | + filename: '<?php echo $faqConfig->getDefaultUrl().'images/'.$uploadFile ?>', |
|
77 | 77 | result: '<?php echo $isUploaded ? 'file_uploaded' : 'error' ?>', |
78 | 78 | resultCode: '<?php echo $isUploaded ? 'success' : 'failed' ?>', |
79 | 79 | height: <?php echo $height ?>, |