@@ -1868,16 +1868,16 @@ discard block |
||
1868 | 1868 | return true; |
1869 | 1869 | } |
1870 | 1870 | |
1871 | - /** |
|
1872 | - * Returns the visibility of a question. |
|
1873 | - * |
|
1874 | - * @param int $questionId |
|
1875 | - * |
|
1876 | - * @return string |
|
1877 | - */ |
|
1878 | - public function getVisibilityOfQuestion($questionId) |
|
1879 | - { |
|
1880 | - $query = sprintf(" |
|
1871 | + /** |
|
1872 | + * Returns the visibility of a question. |
|
1873 | + * |
|
1874 | + * @param int $questionId |
|
1875 | + * |
|
1876 | + * @return string |
|
1877 | + */ |
|
1878 | + public function getVisibilityOfQuestion($questionId) |
|
1879 | + { |
|
1880 | + $query = sprintf(" |
|
1881 | 1881 | SELECT |
1882 | 1882 | is_visible |
1883 | 1883 | FROM |
@@ -1891,15 +1891,15 @@ discard block |
||
1891 | 1891 | $this->_config->getLanguage()->getLanguage() |
1892 | 1892 | ); |
1893 | 1893 | |
1894 | - $result = $this->_config->getDb()->query($query); |
|
1895 | - if ($this->_config->getDb()->numRows($result) > 0) { |
|
1896 | - $row = $this->_config->getDb()->fetchObject($result); |
|
1894 | + $result = $this->_config->getDb()->query($query); |
|
1895 | + if ($this->_config->getDb()->numRows($result) > 0) { |
|
1896 | + $row = $this->_config->getDb()->fetchObject($result); |
|
1897 | 1897 | |
1898 | - return $row->is_visible; |
|
1899 | - } |
|
1898 | + return $row->is_visible; |
|
1899 | + } |
|
1900 | 1900 | |
1901 | - return; |
|
1902 | - } |
|
1901 | + return; |
|
1902 | + } |
|
1903 | 1903 | |
1904 | 1904 | /** |
1905 | 1905 | * Sets the visibility of a question. |
@@ -2455,7 +2455,7 @@ discard block |
||
2455 | 2455 | 'answer_id' => $row->answer_id, |
2456 | 2456 | 'is_visible' => $row->is_visible, |
2457 | 2457 | ); |
2458 | - } |
|
2458 | + } |
|
2459 | 2459 | } |
2460 | 2460 | |
2461 | 2461 | return $questions; |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | * This function returns all not expired records from the given record ids. |
493 | 493 | * |
494 | 494 | * @param array $recordIds Array of record ids |
495 | - * @param string $orderby Order by |
|
495 | + * @param string $orderBy Order by |
|
496 | 496 | * @param string $sortBy Sort by |
497 | 497 | * |
498 | 498 | * @return string |
@@ -1165,7 +1165,7 @@ discard block |
||
1165 | 1165 | * @param int $record_id Record id |
1166 | 1166 | * @param string $language Language |
1167 | 1167 | * |
1168 | - * @return int |
|
1168 | + * @return boolean |
|
1169 | 1169 | */ |
1170 | 1170 | public function addCategoryRelations(Array $categories, $record_id, $language) |
1171 | 1171 | { |
@@ -1660,7 +1660,7 @@ discard block |
||
1660 | 1660 | * @param int $record_id Record id |
1661 | 1661 | * @param string $record_lang Record language |
1662 | 1662 | * |
1663 | - * @return array |
|
1663 | + * @return boolean |
|
1664 | 1664 | */ |
1665 | 1665 | public function addNewRevision($record_id, $record_lang) |
1666 | 1666 | { |
@@ -2654,7 +2654,7 @@ discard block |
||
2654 | 2654 | * Build a logic sequence, for a WHERE statement, of those category IDs |
2655 | 2655 | * children of the provided category ID, if any. |
2656 | 2656 | * |
2657 | - * @param $nCatid |
|
2657 | + * @param integer $nCatid |
|
2658 | 2658 | * @param $logicOp |
2659 | 2659 | * @param $oCat |
2660 | 2660 | * |
@@ -2680,14 +2680,14 @@ discard block |
||
2680 | 2680 | /** |
2681 | 2681 | * Build the SQL query for retrieving faq records according to the constraints provided. |
2682 | 2682 | * |
2683 | - * @param $QueryType |
|
2684 | - * @param $nCatid |
|
2685 | - * @param $bDownwards |
|
2686 | - * @param $lang |
|
2687 | - * @param $date |
|
2683 | + * @param string $QueryType |
|
2684 | + * @param integer $nCatid |
|
2685 | + * @param boolean $bDownwards |
|
2686 | + * @param string $lang |
|
2687 | + * @param string $date |
|
2688 | 2688 | * @param $faqid |
2689 | 2689 | * |
2690 | - * @return array |
|
2690 | + * @return string |
|
2691 | 2691 | */ |
2692 | 2692 | private function _getSQLQuery($QueryType, $nCatid, $bDownwards, $lang, $date, $faqid = 0) |
2693 | 2693 | { |
@@ -28,17 +28,17 @@ discard block |
||
28 | 28 | * SQL constants definitions |
29 | 29 | */ |
30 | 30 | define('FAQ_SQL_ACTIVE_YES', 'yes'); |
31 | -define('FAQ_SQL_ACTIVE_NO', 'no'); |
|
31 | +define('FAQ_SQL_ACTIVE_NO', 'no'); |
|
32 | 32 | |
33 | 33 | /* |
34 | 34 | * Query type definitions |
35 | 35 | */ |
36 | -define('FAQ_QUERY_TYPE_DEFAULT', 'faq_default'); |
|
37 | -define('FAQ_QUERY_TYPE_APPROVAL', 'faq_approval'); |
|
38 | -define('FAQ_QUERY_TYPE_EXPORT_PDF', 'faq_export_pdf'); |
|
36 | +define('FAQ_QUERY_TYPE_DEFAULT', 'faq_default'); |
|
37 | +define('FAQ_QUERY_TYPE_APPROVAL', 'faq_approval'); |
|
38 | +define('FAQ_QUERY_TYPE_EXPORT_PDF', 'faq_export_pdf'); |
|
39 | 39 | define('FAQ_QUERY_TYPE_EXPORT_XHTML', 'faq_export_xhtml'); |
40 | -define('FAQ_QUERY_TYPE_EXPORT_XML', 'faq_export_xml'); |
|
41 | -define('FAQ_QUERY_TYPE_RSS_LATEST', 'faq_rss_latest'); |
|
40 | +define('FAQ_QUERY_TYPE_EXPORT_XML', 'faq_export_xml'); |
|
41 | +define('FAQ_QUERY_TYPE_RSS_LATEST', 'faq_rss_latest'); |
|
42 | 42 | |
43 | 43 | /* |
44 | 44 | * Sorting type definitions |
@@ -379,12 +379,12 @@ discard block |
||
379 | 379 | |
380 | 380 | $result = $this->_config->getDb()->query($query); |
381 | 381 | $num = $this->_config->getDb()->numRows($result); |
382 | - $pages = (int) ceil($num / $numPerPage); |
|
382 | + $pages = (int)ceil($num/$numPerPage); |
|
383 | 383 | |
384 | 384 | if ($page == 1) { |
385 | 385 | $first = 0; |
386 | 386 | } else { |
387 | - $first = $page * $numPerPage - $numPerPage; |
|
387 | + $first = $page*$numPerPage - $numPerPage; |
|
388 | 388 | } |
389 | 389 | |
390 | 390 | if ($num > 0) { |
@@ -565,12 +565,12 @@ discard block |
||
565 | 565 | $result = $this->_config->getDb()->query($query); |
566 | 566 | |
567 | 567 | $num = $this->_config->getDb()->numRows($result); |
568 | - $pages = ceil($num / $this->_config->get('records.numberOfRecordsPerPage')); |
|
568 | + $pages = ceil($num/$this->_config->get('records.numberOfRecordsPerPage')); |
|
569 | 569 | |
570 | 570 | if ($page == 1) { |
571 | 571 | $first = 0; |
572 | 572 | } else { |
573 | - $first = ($page * $this->_config->get('records.numberOfRecordsPerPage')) - $this->_config->get('records.numberOfRecordsPerPage'); |
|
573 | + $first = ($page*$this->_config->get('records.numberOfRecordsPerPage')) - $this->_config->get('records.numberOfRecordsPerPage'); |
|
574 | 574 | } |
575 | 575 | |
576 | 576 | if ($num > 0) { |
@@ -1368,7 +1368,7 @@ discard block |
||
1368 | 1368 | AND |
1369 | 1369 | lang = '%s'", |
1370 | 1370 | PMF_Db::getTablePrefix(), |
1371 | - (int) $faqId, |
|
1371 | + (int)$faqId, |
|
1372 | 1372 | $this->_config->getDb()->escape($faqLang) |
1373 | 1373 | ); |
1374 | 1374 | |
@@ -2441,7 +2441,7 @@ discard block |
||
2441 | 2441 | 'category_id' => $row->category_id, |
2442 | 2442 | 'question' => $row->question, |
2443 | 2443 | 'created' => $row->created, |
2444 | - 'is_visible' => $row->is_visible, ); |
|
2444 | + 'is_visible' => $row->is_visible,); |
|
2445 | 2445 | } |
2446 | 2446 | } |
2447 | 2447 | |
@@ -2597,7 +2597,7 @@ discard block |
||
2597 | 2597 | 'revision_id' => $row->revision_id, |
2598 | 2598 | 'user' => $row->usr, |
2599 | 2599 | 'date' => $row->datum, |
2600 | - 'changelog' => $row->what, ); |
|
2600 | + 'changelog' => $row->what,); |
|
2601 | 2601 | } |
2602 | 2602 | } |
2603 | 2603 | |
@@ -2897,13 +2897,13 @@ discard block |
||
2897 | 2897 | $mode, |
2898 | 2898 | PMF_Db::getTablePrefix(), |
2899 | 2899 | $mode, |
2900 | - (int) $recordId); |
|
2900 | + (int)$recordId); |
|
2901 | 2901 | |
2902 | 2902 | $result = $this->_config->getDb()->query($query); |
2903 | 2903 | |
2904 | 2904 | if ($this->_config->getDb()->numRows($result) > 0) { |
2905 | 2905 | while (($row = $this->_config->getDb()->fetchObject($result))) { |
2906 | - $permissions[] = (int) $row->permission; |
|
2906 | + $permissions[] = (int)$row->permission; |
|
2907 | 2907 | } |
2908 | 2908 | } |
2909 | 2909 | |
@@ -2997,7 +2997,7 @@ discard block |
||
2997 | 2997 | $oLink->itemTitle = $title; |
2998 | 2998 | $oLink->text = $title; |
2999 | 2999 | $oLink->tooltip = $title; |
3000 | - $listItem = '<li>' . $oLink->toHtmlAnchor() . '</li>'; |
|
3000 | + $listItem = '<li>'.$oLink->toHtmlAnchor().'</li>'; |
|
3001 | 3001 | |
3002 | 3002 | $output .= $listItem; |
3003 | 3003 | } |
@@ -3153,7 +3153,7 @@ discard block |
||
3153 | 3153 | $lang |
3154 | 3154 | ); |
3155 | 3155 | |
3156 | - $retval = (bool) $this->_config->getDb()->query($update); |
|
3156 | + $retval = (bool)$this->_config->getDb()->query($update); |
|
3157 | 3157 | } |
3158 | 3158 | |
3159 | 3159 | return $retval; |
@@ -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 |