@@ -38,7 +38,6 @@ |
||
38 | 38 | * @author Anatoliy Belsky <[email protected]> |
39 | 39 | * @copyright 2009-2015 phpMyFAQ Team |
40 | 40 | * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
41 | - |
|
42 | 41 | * @link http://www.phpmyfaq.de |
43 | 42 | * @since 2009-04-06 |
44 | 43 | */ |
@@ -335,6 +335,6 @@ |
||
335 | 335 | */ |
336 | 336 | private static function appendU($str) |
337 | 337 | { |
338 | - return ((string) $str).'u'; |
|
338 | + return ((string)$str).'u'; |
|
339 | 339 | } |
340 | 340 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | * |
64 | 64 | * @param string $language |
65 | 65 | * |
66 | - * @return PMF_String_Basic |
|
66 | + * @return PMF_String_UTF8ToLatinConvertable |
|
67 | 67 | */ |
68 | 68 | public static function getInstance($language = 'en') |
69 | 69 | { |
@@ -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); |
@@ -38,7 +38,6 @@ |
||
38 | 38 | * @author Anatoliy Belsky <[email protected]> |
39 | 39 | * @copyright 2009-2015 phpMyFAQ Team |
40 | 40 | * @license http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0 |
41 | - |
|
42 | 41 | * @link http://www.phpmyfaq.de |
43 | 42 | * @since 2009-04-06 |
44 | 43 | */ |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | // 2.5 versions only |
161 | 161 | if (version_compare($version, '2.6.0-alpha', '<') && !is_writeable('../template')) { |
162 | 162 | echo '<p class="alert alert-danger text-center"><strong>Please change the directory ../template '. |
163 | - 'and its contents writable (777 on Linux/UNIX).</strong></p>'; |
|
163 | + 'and its contents writable (777 on Linux/UNIX).</strong></p>'; |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | // We only support updates from 2.6+ |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | if (file_exists(PMF_ROOT_DIR.'/config/database.php')) { |
207 | 207 | if (!copy(PMF_ROOT_DIR.'/config/database.php', PMF_ROOT_DIR.'/config/database.bak.php')) { |
208 | 208 | echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ../config/database.bak.php '. |
209 | - 'could not be written. Please correct this!</p>'; |
|
209 | + 'could not be written. Please correct this!</p>'; |
|
210 | 210 | } else { |
211 | 211 | $checkDatabaseSetupFile = true; |
212 | 212 | } |
@@ -574,8 +574,8 @@ discard block |
||
574 | 574 | if (!$result) { |
575 | 575 | echo '</div>'; |
576 | 576 | echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ '. |
577 | - 'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'. |
|
578 | - '</p>'; |
|
577 | + 'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'. |
|
578 | + '</p>'; |
|
579 | 579 | printf( |
580 | 580 | '<p class="alert alert-danger"><strong>DB error:</strong> %s</p>', |
581 | 581 | $faqConfig->getDb()->error() |
@@ -851,7 +851,7 @@ discard block |
||
851 | 851 | printf('<span title="%s"><i class="fa fa-circle"></i></span>', $executeQuery); |
852 | 852 | if (!$result) { |
853 | 853 | echo '<p class="alert alert-danger"><strong>Error:</strong> Please install your version of phpMyFAQ once again '. |
854 | - 'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>'; |
|
854 | + 'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>'; |
|
855 | 855 | printf('<p class="error"><strong>DB error:</strong> %s</p>', $faqConfig->getDb()->error()); |
856 | 856 | printf('<code>%s</code>', htmlentities($executeQuery)); |
857 | 857 | PMF_System::renderFooter(); |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | // Backup of config/elasticsearch.php if exists |
232 | 232 | if (file_exists(PMF_ROOT_DIR.'/config/elasticsearch.php')) { |
233 | 233 | if (!copy(PMF_ROOT_DIR.'/config/elasticsearch.php', PMF_ROOT_DIR.'/config/elasticsearch.bak.php')) { |
234 | - echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ' . |
|
234 | + echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file '. |
|
235 | 235 | '../config/elasticsearch.bak.php could not be written. Please correct this!</p>'; |
236 | 236 | } else { |
237 | 237 | $checkElasticsearchSetupFile = true; |
@@ -599,7 +599,7 @@ discard block |
||
599 | 599 | foreach ($query as $key => $executeQuery) { |
600 | 600 | $result = $faqConfig->getDb()->query($executeQuery); |
601 | 601 | echo '.'; |
602 | - if (!($key % 100)) { |
|
602 | + if (!($key%100)) { |
|
603 | 603 | echo '<br />'; |
604 | 604 | } |
605 | 605 | if (!$result) { |
@@ -619,7 +619,7 @@ discard block |
||
619 | 619 | } |
620 | 620 | usleep(10000); |
621 | 621 | ++$count; |
622 | - if (!($count % 10)) { |
|
622 | + if (!($count%10)) { |
|
623 | 623 | ob_flush(); |
624 | 624 | } |
625 | 625 | } |
@@ -713,7 +713,7 @@ discard block |
||
713 | 713 | $faqConfig->add('main.enableGzipCompression', 'true'); |
714 | 714 | |
715 | 715 | if ('sqlite3' === $DB['type']) { |
716 | - $query[] = 'ALTER TABLE ' . $prefix . 'faquser ADD COLUMN success INT(1) NULL DEFAULT 1'; |
|
716 | + $query[] = 'ALTER TABLE '.$prefix.'faquser ADD COLUMN success INT(1) NULL DEFAULT 1'; |
|
717 | 717 | } elseif ('pgsql' === $DB['type']) { |
718 | 718 | $query[] = 'ALTER TABLE '.$prefix.'faquser ADD success SMALLINT NULL DEFAULT 1'; |
719 | 719 | } else { |
@@ -395,12 +395,12 @@ |
||
395 | 395 | public function update(Array $newConfigs) |
396 | 396 | { |
397 | 397 | $runtimeConfigs = [ |
398 | - 'core.database', // PMF_DB_Driver |
|
399 | - 'core.instance', // PMF_Instance |
|
400 | - 'core.language', // Language |
|
401 | - 'core.ldap', // PMF_Ldap |
|
402 | - 'core.ldapConfig', // $PMF_LDAP |
|
403 | - 'core.elasticsearch', // Elasticsearch\Client |
|
398 | + 'core.database', // PMF_DB_Driver |
|
399 | + 'core.instance', // PMF_Instance |
|
400 | + 'core.language', // Language |
|
401 | + 'core.ldap', // PMF_Ldap |
|
402 | + 'core.ldapConfig', // $PMF_LDAP |
|
403 | + 'core.elasticsearch', // Elasticsearch\Client |
|
404 | 404 | 'core.elasticsearchConfig' // $PMF_ES |
405 | 405 | ]; |
406 | 406 |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | public function createIndex() |
93 | 93 | { |
94 | 94 | $this->client->indices()->create($this->getParams()); |
95 | - return $this->putMapping();; |
|
95 | + return $this->putMapping(); ; |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | 'categories' => $faq['category_id'] |
178 | 178 | ]; |
179 | 179 | |
180 | - if ($i % 1000 == 0) { |
|
180 | + if ($i%1000 == 0) { |
|
181 | 181 | $responses = $this->client->bulk($params); |
182 | 182 | $params = ['body' => []]; |
183 | 183 | unset($responses); |