@@ -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 |
@@ -661,14 +661,14 @@ |
||
661 | 661 | $PMF_LANG['ad_entry_visibility'] = 'Objavi?'; |
662 | 662 | |
663 | 663 | // added v2.0.0 - 2006-01-02 by Lars |
664 | -$PMF_LANG['ad_user_error_password'] = "Molimo unesite lozinku. "; |
|
665 | -$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Lozinke se ne poklapaju. "; |
|
666 | -$PMF_LANG['ad_user_error_loginInvalid'] = "Unešeno korisničko ime nije nađeno."; |
|
667 | -$PMF_LANG['ad_user_error_noEmail'] = "Unesite važeću email adresu. "; |
|
668 | -$PMF_LANG['ad_user_error_noRealName'] = "Unesite Vaše pravo ime. "; |
|
669 | -$PMF_LANG['ad_user_error_delete'] = "Korisnički nalog ne može biti izbrisan. "; |
|
670 | -$PMF_LANG['ad_user_error_noId'] = "Nije priložen ID. "; |
|
671 | -$PMF_LANG['ad_user_error_protectedAccount'] = "Korisnički nalog je zaštićen. "; |
|
664 | +$PMF_LANG['ad_user_error_password'] = "Molimo unesite lozinku. "; |
|
665 | +$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Lozinke se ne poklapaju. "; |
|
666 | +$PMF_LANG['ad_user_error_loginInvalid'] = "Unešeno korisničko ime nije nađeno."; |
|
667 | +$PMF_LANG['ad_user_error_noEmail'] = "Unesite važeću email adresu. "; |
|
668 | +$PMF_LANG['ad_user_error_noRealName'] = "Unesite Vaše pravo ime. "; |
|
669 | +$PMF_LANG['ad_user_error_delete'] = "Korisnički nalog ne može biti izbrisan. "; |
|
670 | +$PMF_LANG['ad_user_error_noId'] = "Nije priložen ID. "; |
|
671 | +$PMF_LANG['ad_user_error_protectedAccount'] = "Korisnički nalog je zaštićen. "; |
|
672 | 672 | $PMF_LANG['ad_user_deleteUser'] = "Obriši korisnika"; |
673 | 673 | $PMF_LANG['ad_user_status'] = "Status:"; |
674 | 674 | $PMF_LANG['ad_user_lastModified'] = "zadnji put menjano:"; |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | /** |
105 | 105 | * Returns all available first letters. |
106 | 106 | * |
107 | - * @return array |
|
107 | + * @return string |
|
108 | 108 | * |
109 | 109 | * @since 2007-03-30 |
110 | 110 | * |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | * |
213 | 213 | * @param string $letter Letter |
214 | 214 | * |
215 | - * @return array |
|
215 | + * @return string |
|
216 | 216 | * |
217 | 217 | * @since 2007-03-30 |
218 | 218 | * |
@@ -18,9 +18,9 @@ |
||
18 | 18 | * @since 2012-04-11 |
19 | 19 | */ |
20 | 20 | |
21 | -define('PMF_ROOT_DIR', dirname(__DIR__) . '/phpmyfaq'); |
|
21 | +define('PMF_ROOT_DIR', dirname(__DIR__).'/phpmyfaq'); |
|
22 | 22 | |
23 | -require PMF_ROOT_DIR . '/inc/PMF/System.php'; |
|
23 | +require PMF_ROOT_DIR.'/inc/PMF/System.php'; |
|
24 | 24 | |
25 | 25 | $system = new PMF_System(); |
26 | 26 |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function setCategoryId($categoryId) |
86 | 86 | { |
87 | - $this->categoryId = (int) $categoryId; |
|
87 | + $this->categoryId = (int)$categoryId; |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | /** |
@@ -159,8 +159,8 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function searchDatabase($searchTerm, $allLanguages = true) |
161 | 161 | { |
162 | - $fdTable = PMF_Db::getTablePrefix() . 'faqdata AS fd'; |
|
163 | - $fcrTable = PMF_Db::getTablePrefix() . 'faqcategoryrelations'; |
|
162 | + $fdTable = PMF_Db::getTablePrefix().'faqdata AS fd'; |
|
163 | + $fcrTable = PMF_Db::getTablePrefix().'faqcategoryrelations'; |
|
164 | 164 | $condition = ['fd.active' => "'yes'"]; |
165 | 165 | $search = PMF_Search_Factory::create($this->_config, ['database' => PMF_Db::getType()]); |
166 | 166 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | if ($this->getCategory() instanceof PMF_Category) { |
169 | 169 | $children = $this->getCategory()->getChildNodes($this->getCategoryId()); |
170 | 170 | $selectedCategory = array( |
171 | - $fcrTable.'.category_id' => array_merge((array) $this->getCategoryId(), $children), |
|
171 | + $fcrTable.'.category_id' => array_merge((array)$this->getCategoryId(), $children), |
|
172 | 172 | ); |
173 | 173 | } else { |
174 | 174 | $selectedCategory = array( |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | } |
180 | 180 | |
181 | 181 | if ((!$allLanguages) && (!is_numeric($searchTerm))) { |
182 | - $selectedLanguage = array('fd.lang' => "'" . $this->_config->getLanguage()->getLanguage() . "'"); |
|
182 | + $selectedLanguage = array('fd.lang' => "'".$this->_config->getLanguage()->getLanguage()."'"); |
|
183 | 183 | $condition = array_merge($selectedLanguage, $condition); |
184 | 184 | } |
185 | 185 | |
@@ -188,13 +188,13 @@ discard block |
||
188 | 188 | 'fd.id AS id', |
189 | 189 | 'fd.lang AS lang', |
190 | 190 | 'fd.solution_id AS solution_id', |
191 | - $fcrTable . '.category_id AS category_id', |
|
191 | + $fcrTable.'.category_id AS category_id', |
|
192 | 192 | 'fd.thema AS question', |
193 | 193 | 'fd.content AS answer')) |
194 | 194 | ->setJoinedTable($fcrTable) |
195 | 195 | ->setJoinedColumns(array( |
196 | - 'fd.id = ' . $fcrTable . '.record_id', |
|
197 | - 'fd.lang = ' . $fcrTable . '.record_lang' |
|
196 | + 'fd.id = '.$fcrTable.'.record_id', |
|
197 | + 'fd.lang = '.$fcrTable.'.record_lang' |
|
198 | 198 | )) |
199 | 199 | ->setConditions($condition); |
200 | 200 | |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | $i = 0; |
340 | 340 | while ($row = $this->_config->getDb()->fetchObject($result)) { |
341 | 341 | if ($i < $numResults) { |
342 | - $searchResult[] = (array) $row; |
|
342 | + $searchResult[] = (array)$row; |
|
343 | 343 | } |
344 | 344 | ++$i; |
345 | 345 | } |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | |
363 | 363 | $result = $this->_config->getDb()->query($sql); |
364 | 364 | |
365 | - return (int) $this->_config->getDb()->fetchObject($result)->count; |
|
365 | + return (int)$this->_config->getDb()->fetchObject($result)->count; |
|
366 | 366 | } |
367 | 367 | |
368 | 368 | /** |