@@ -77,20 +77,20 @@ |
||
77 | 77 | $search |
78 | 78 | ->setTable(PMF_Db::getTablePrefix().'faqdata AS fd') |
79 | 79 | ->setResultColumns( |
80 | - [ |
|
80 | + [ |
|
81 | 81 | 'fd.id AS id', |
82 | 82 | 'fd.lang AS lang', |
83 | 83 | 'fcr.category_id AS category_id', |
84 | 84 | 'fd.thema AS question', |
85 | 85 | 'fd.content AS answer', |
86 | - ] |
|
86 | + ] |
|
87 | 87 | ) |
88 | 88 | ->setJoinedTable(PMF_Db::getTablePrefix().'faqcategoryrelations AS fcr') |
89 | 89 | ->setJoinedColumns( |
90 | - [ |
|
90 | + [ |
|
91 | 91 | 'fd.id = fcr.record_id', |
92 | 92 | 'fd.lang = fcr.record_lang', |
93 | - ] |
|
93 | + ] |
|
94 | 94 | ) |
95 | 95 | ->setConditions( |
96 | 96 | [ |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | public function setCategoryId($categoryId) |
88 | 88 | { |
89 | - $this->categoryId = (int) $categoryId; |
|
89 | + $this->categoryId = (int)$categoryId; |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | */ |
110 | 110 | public function search($searchTerm, $allLanguages = true) |
111 | 111 | { |
112 | - $fdTable = PMF_Db::getTablePrefix() . 'faqdata AS fd'; |
|
113 | - $fcrTable = PMF_Db::getTablePrefix() . 'faqcategoryrelations'; |
|
112 | + $fdTable = PMF_Db::getTablePrefix().'faqdata AS fd'; |
|
113 | + $fcrTable = PMF_Db::getTablePrefix().'faqcategoryrelations'; |
|
114 | 114 | $condition = ['fd.active' => "'yes'"]; |
115 | 115 | $search = PMF_Search_Factory::create($this->_config, ['database' => PMF_Db::getType()]); |
116 | 116 | |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | if ($this->getCategory() instanceof PMF_Category) { |
119 | 119 | $children = $this->getCategory()->getChildNodes($this->getCategoryId()); |
120 | 120 | $selectedCategory = array( |
121 | - $fcrTable.'.category_id' => array_merge((array) $this->getCategoryId(), $children), |
|
121 | + $fcrTable.'.category_id' => array_merge((array)$this->getCategoryId(), $children), |
|
122 | 122 | ); |
123 | 123 | } else { |
124 | 124 | $selectedCategory = array( |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | if ((!$allLanguages) && (!is_numeric($searchTerm))) { |
132 | - $selectedLanguage = array('fd.lang' => "'" . $this->_config->getLanguage()->getLanguage() . "'"); |
|
132 | + $selectedLanguage = array('fd.lang' => "'".$this->_config->getLanguage()->getLanguage()."'"); |
|
133 | 133 | $condition = array_merge($selectedLanguage, $condition); |
134 | 134 | } |
135 | 135 | |
@@ -138,13 +138,13 @@ discard block |
||
138 | 138 | 'fd.id AS id', |
139 | 139 | 'fd.lang AS lang', |
140 | 140 | 'fd.solution_id AS solution_id', |
141 | - $fcrTable . '.category_id AS category_id', |
|
141 | + $fcrTable.'.category_id AS category_id', |
|
142 | 142 | 'fd.thema AS question', |
143 | 143 | 'fd.content AS answer')) |
144 | 144 | ->setJoinedTable($fcrTable) |
145 | 145 | ->setJoinedColumns(array( |
146 | - 'fd.id = ' . $fcrTable . '.record_id', |
|
147 | - 'fd.lang = ' . $fcrTable . '.record_lang' |
|
146 | + 'fd.id = '.$fcrTable.'.record_id', |
|
147 | + 'fd.lang = '.$fcrTable.'.record_lang' |
|
148 | 148 | )) |
149 | 149 | ->setConditions($condition); |
150 | 150 | |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | $i = 0; |
259 | 259 | while ($row = $this->_config->getDb()->fetchObject($result)) { |
260 | 260 | if ($i < $numResults) { |
261 | - $searchResult[] = (array) $row; |
|
261 | + $searchResult[] = (array)$row; |
|
262 | 262 | } |
263 | 263 | ++$i; |
264 | 264 | } |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | |
282 | 282 | $result = $this->_config->getDb()->query($sql); |
283 | 283 | |
284 | - return (int) $this->_config->getDb()->fetchObject($result)->count; |
|
284 | + return (int)$this->_config->getDb()->fetchObject($result)->count; |
|
285 | 285 | } |
286 | 286 | |
287 | 287 | /** |
@@ -216,6 +216,6 @@ |
||
216 | 216 | $score += $object->relevance_keywords; |
217 | 217 | } |
218 | 218 | |
219 | - return round($score / 3 * 100); |
|
219 | + return round($score/3*100); |
|
220 | 220 | } |
221 | 221 | } |
@@ -87,7 +87,7 @@ |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | foreach ($botBlacklist as $bot) { |
90 | - if ((bool) PMF_String::strstr($agent, $bot)) { |
|
90 | + if ((bool)PMF_String::strstr($agent, $bot)) { |
|
91 | 91 | ++$bots; |
92 | 92 | } |
93 | 93 | } |
@@ -77,14 +77,14 @@ |
||
77 | 77 | return mb_detect_encoding($str, 'UTF-8', true); |
78 | 78 | } else { |
79 | 79 | $regex = '/^([\x00-\x7f]|' |
80 | - .'[\xc2-\xdf][\x80-\xbf]|' |
|
81 | - .'\xe0[\xa0-\xbf][\x80-\xbf]|' |
|
82 | - .'[\xe1-\xec][\x80-\xbf]{2}|' |
|
83 | - .'\xed[\x80-\x9f][\x80-\xbf]|' |
|
84 | - .'[\xee-\xef][\x80-\xbf]{2}|' |
|
85 | - .'\xf0[\x90-\xbf][\x80-\xbf]{2}|' |
|
86 | - .'[\xf1-\xf3][\x80-\xbf]{3}|' |
|
87 | - .'\xf4[\x80-\x8f][\x80-\xbf]{2})*$/'; |
|
80 | + .'[\xc2-\xdf][\x80-\xbf]|' |
|
81 | + .'\xe0[\xa0-\xbf][\x80-\xbf]|' |
|
82 | + .'[\xe1-\xec][\x80-\xbf]{2}|' |
|
83 | + .'\xed[\x80-\x9f][\x80-\xbf]|' |
|
84 | + .'[\xee-\xef][\x80-\xbf]{2}|' |
|
85 | + .'\xf0[\x90-\xbf][\x80-\xbf]{2}|' |
|
86 | + .'[\xf1-\xf3][\x80-\xbf]{3}|' |
|
87 | + .'\xf4[\x80-\x8f][\x80-\xbf]{2})*$/'; |
|
88 | 88 | |
89 | 89 | return preg_match($regex, $str) === 1; |
90 | 90 | } |
@@ -427,8 +427,8 @@ discard block |
||
427 | 427 | $users = $faqsession->getUsersOnline(); |
428 | 428 | $totUsers = $users[0] + $users[1]; |
429 | 429 | $usersOnline = $plr->getMsg('plmsgUserOnline', $totUsers).' | '. |
430 | - $plr->getMsg('plmsgGuestOnline', $users[0]). |
|
431 | - $plr->getMsg('plmsgRegisteredOnline', $users[1]); |
|
430 | + $plr->getMsg('plmsgGuestOnline', $users[0]). |
|
431 | + $plr->getMsg('plmsgRegisteredOnline', $users[1]); |
|
432 | 432 | } else { |
433 | 433 | $usersOnline = ''; |
434 | 434 | } |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | 'switchLanguages' => PMF_Language::selectLanguages($LANGCODE, true), |
485 | 485 | 'userOnline' => $usersOnline, |
486 | 486 | 'copyright' => 'powered by <a href="http://www.phpmyfaq.de" target="_blank">phpMyFAQ</a> '. |
487 | - $faqConfig->get('main.currentVersion'), |
|
487 | + $faqConfig->get('main.currentVersion'), |
|
488 | 488 | 'registerUser' => $faqConfig->get('security.enableRegistration') ? '<a href="?action=register">'.$PMF_LANG['msgRegistration'].'</a>' : '', |
489 | 489 | 'sendPassword' => '<a href="?action=password">'.$PMF_LANG['lostPassword'].'</a>', |
490 | 490 | 'msgFullName' => $PMF_LANG['ad_user_loggedin'].$user->getLogin(), |
@@ -475,7 +475,7 @@ discard block |
||
475 | 475 | 'dir' => $PMF_LANG['dir'], |
476 | 476 | 'writeSendAdress' => '?'.$sids.'action=search', |
477 | 477 | 'searchBox' => $PMF_LANG['msgSearch'], |
478 | - 'categoryId' => ($cat === 0) ? '%' : (int) $cat, |
|
478 | + 'categoryId' => ($cat === 0) ? '%' : (int)$cat, |
|
479 | 479 | 'headerCategories' => $PMF_LANG['msgFullCategories'], |
480 | 480 | 'msgCategory' => $PMF_LANG['msgCategory'], |
481 | 481 | 'msgExportAllFaqs' => $PMF_LANG['msgExportAllFaqs'], |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | array( |
520 | 520 | 'writeSendAdress' => '?'.$sids.'action=search', |
521 | 521 | 'searchBox' => $PMF_LANG['msgSearch'], |
522 | - 'categoryId' => ($cat === 0) ? '%' : (int) $cat, |
|
522 | + 'categoryId' => ($cat === 0) ? '%' : (int)$cat, |
|
523 | 523 | 'msgSearch' => sprintf( |
524 | 524 | '<a class="help" href="%sindex.php?action=search">%s</a>', |
525 | 525 | $faqSystem->getSystemUri($faqConfig), |
@@ -554,7 +554,7 @@ discard block |
||
554 | 554 | 'allCategories' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'showcat.html">'.$PMF_LANG['msgShowAllCategories'].'</a>', |
555 | 555 | 'faqOverview' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'overview.html">'.$PMF_LANG['faqOverview'].'</a>', |
556 | 556 | 'showSitemap' => '<a href="'.$faqSystem->getSystemUri($faqConfig).'sitemap/A/'.$LANGCODE.'.html">'.$PMF_LANG['msgSitemap'].'</a>', |
557 | - 'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.html', ); |
|
557 | + 'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.html',); |
|
558 | 558 | } else { |
559 | 559 | $tplNavigation = array( |
560 | 560 | 'msgSearch' => '<a href="index.php?'.$sids.'action=search">'.$PMF_LANG['msgAdvancedSearch'].'</a>', |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | 'faqOverview' => '<a href="index.php?'.$sids.'action=overview">'.$PMF_LANG['faqOverview'].'</a>', |
569 | 569 | 'backToHome' => '<a href="index.php?'.$sids.'">'.$PMF_LANG['msgHome'].'</a>', |
570 | 570 | 'showSitemap' => '<a href="index.php?'.$sids.'action=sitemap&lang='.$LANGCODE.'">'.$PMF_LANG['msgSitemap'].'</a>', |
571 | - 'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.php', ); |
|
571 | + 'opensearch' => $faqSystem->getSystemUri($faqConfig).'opensearch.php',); |
|
572 | 572 | } |
573 | 573 | |
574 | 574 | $tplNavigation['faqHome'] = $faqConfig->getDefaultUrl(); |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | ); |
663 | 663 | } else { |
664 | 664 | $tpl->parseBlock('rightBox', 'latestEntriesListError', array( |
665 | - 'errorMsgLatest' => $latestEntriesParams['error'], ) |
|
665 | + 'errorMsgLatest' => $latestEntriesParams['error'],) |
|
666 | 666 | ); |
667 | 667 | } |
668 | 668 |
@@ -664,14 +664,14 @@ |
||
664 | 664 | $PMF_LANG['ad_entry_visibility'] = 'Objavi?'; |
665 | 665 | |
666 | 666 | // added v2.0.0 - 2006-01-02 by Lars |
667 | -$PMF_LANG['ad_user_error_password'] = "Molimo unesite lozinku. "; |
|
668 | -$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Lozinke se ne poklapaju. "; |
|
669 | -$PMF_LANG['ad_user_error_loginInvalid'] = "Unešeno korisničko ime nije nađeno."; |
|
670 | -$PMF_LANG['ad_user_error_noEmail'] = "Unesite važeću email adresu. "; |
|
671 | -$PMF_LANG['ad_user_error_noRealName'] = "Unesite Vaše pravo ime. "; |
|
672 | -$PMF_LANG['ad_user_error_delete'] = "Korisnički nalog ne može biti izbrisan. "; |
|
673 | -$PMF_LANG['ad_user_error_noId'] = "Nije priložen ID. "; |
|
674 | -$PMF_LANG['ad_user_error_protectedAccount'] = "Korisnički nalog je zaštićen. "; |
|
667 | +$PMF_LANG['ad_user_error_password'] = "Molimo unesite lozinku. "; |
|
668 | +$PMF_LANG['ad_user_error_passwordsDontMatch'] = "Lozinke se ne poklapaju. "; |
|
669 | +$PMF_LANG['ad_user_error_loginInvalid'] = "Unešeno korisničko ime nije nađeno."; |
|
670 | +$PMF_LANG['ad_user_error_noEmail'] = "Unesite važeću email adresu. "; |
|
671 | +$PMF_LANG['ad_user_error_noRealName'] = "Unesite Vaše pravo ime. "; |
|
672 | +$PMF_LANG['ad_user_error_delete'] = "Korisnički nalog ne može biti izbrisan. "; |
|
673 | +$PMF_LANG['ad_user_error_noId'] = "Nije priložen ID. "; |
|
674 | +$PMF_LANG['ad_user_error_protectedAccount'] = "Korisnički nalog je zaštićen. "; |
|
675 | 675 | $PMF_LANG['ad_user_deleteUser'] = "Obriši korisnika"; |
676 | 676 | $PMF_LANG['ad_user_status'] = "Status:"; |
677 | 677 | $PMF_LANG['ad_user_lastModified'] = "zadnji put menjano:"; |
@@ -111,7 +111,7 @@ |
||
111 | 111 | } |
112 | 112 | } |
113 | 113 | |
114 | - uasort($relatedTags, function ($a, $b) { |
|
114 | + uasort($relatedTags, function($a, $b) { |
|
115 | 115 | return ($b - $a); |
116 | 116 | } |
117 | 117 | ); |
@@ -47,8 +47,8 @@ |
||
47 | 47 | |
48 | 48 | $send2friendLink = sprintf('%sindex.php?action=artikel&cat=%d&id=%d&artlang=%s', |
49 | 49 | $faqConfig->getDefaultUrl(), |
50 | - (int) $cat, |
|
51 | - (int) $id, |
|
50 | + (int)$cat, |
|
51 | + (int)$id, |
|
52 | 52 | urlencode($artlang)); |
53 | 53 | |
54 | 54 | $captchaHelper = new PMF_Helper_Captcha($faqConfig); |