@@ -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 . '/src/phpMyFAQ/System.php'; |
|
23 | +require PMF_ROOT_DIR.'/src/phpMyFAQ/System.php'; |
|
24 | 24 | |
25 | 25 | $system = new phpMyFAQ\System(); |
26 | 26 |
@@ -93,7 +93,7 @@ |
||
93 | 93 | foreach ($_records as $_r) { |
94 | 94 | ++$i; |
95 | 95 | $output = ''; |
96 | - $output .= sprintf('%0'.strlen((string) $tot).'d', $i).'/'.$tot.'. Checking '.$_r['solution_id'].' ('.Utils::makeShorterText(strip_tags($_r['title']), 8).'):'; |
|
96 | + $output .= sprintf('%0'.strlen((string)$tot).'d', $i).'/'.$tot.'. Checking '.$_r['solution_id'].' ('.Utils::makeShorterText(strip_tags($_r['title']), 8).'):'; |
|
97 | 97 | $start = microtime(true); |
98 | 98 | if ($oLnk->getEntryState($_r['id'], $_r['lang'], true) === true) { |
99 | 99 | $output .= $oLnk->verifyArticleURL($_r['content'], $_r['id'], $_r['lang'], true); |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | <div class="row"> |
177 | 177 | <div class="col"> |
178 | 178 | <?php |
179 | - // We only support updates from 2.8+ |
|
179 | + // We only support updates from 2.8+ |
|
180 | 180 | if (version_compare($version, '2.8.0', '>')) { |
181 | 181 | printf( |
182 | 182 | '<div class="alert alert-success text-center" role="alert">Your current phpMyFAQ version: %s %s</div>', |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | if (file_exists(PMF_ROOT_DIR.'/config/database.php')) { |
219 | 219 | if (!copy(PMF_ROOT_DIR.'/config/database.php', PMF_ROOT_DIR.'/config/database.bak.php')) { |
220 | 220 | echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ../config/database.bak.php '. |
221 | - 'could not be written. Please correct this!</p>'; |
|
221 | + 'could not be written. Please correct this!</p>'; |
|
222 | 222 | } else { |
223 | 223 | $checkDatabaseSetupFile = true; |
224 | 224 | $updateMessages[] = 'A backup of your database configuration file has been made.'; |
@@ -699,7 +699,7 @@ discard block |
||
699 | 699 | printf('<span title="%s"><i aria-hidden="true" class="fas fa-circle"></i></span>', $executeQuery); |
700 | 700 | if (!$result) { |
701 | 701 | echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ once again '. |
702 | - 'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>'; |
|
702 | + 'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>'; |
|
703 | 703 | printf('<p class="error"><strong>DB error:</strong> %s</p>', $faqConfig->getDb()->error()); |
704 | 704 | printf('<code>%s</code>', htmlentities($executeQuery)); |
705 | 705 | System::renderFooter(); |
@@ -241,7 +241,7 @@ discard block |
||
241 | 241 | // Backup of config/elasticsearch.php if exists |
242 | 242 | if (file_exists(PMF_ROOT_DIR.'/config/elasticsearch.php')) { |
243 | 243 | if (!copy(PMF_ROOT_DIR.'/config/elasticsearch.php', PMF_ROOT_DIR.'/config/elasticsearch.bak.php')) { |
244 | - echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file ' . |
|
244 | + echo '<p class="alert alert-danger"><strong>Error:</strong> The backup file '. |
|
245 | 245 | '../config/elasticsearch.bak.php could not be written. Please correct this!</p>'; |
246 | 246 | } else { |
247 | 247 | $checkElasticsearchSetupFile = true; |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | $faqConfig->add('main.enableGzipCompression', 'true'); |
373 | 373 | |
374 | 374 | if ('sqlite3' === $DB['type']) { |
375 | - $query[] = 'ALTER TABLE ' . $prefix . 'faquser ADD COLUMN success INT(1) NULL DEFAULT 1'; |
|
375 | + $query[] = 'ALTER TABLE '.$prefix.'faquser ADD COLUMN success INT(1) NULL DEFAULT 1'; |
|
376 | 376 | } elseif ('pgsql' === $DB['type']) { |
377 | 377 | $query[] = 'ALTER TABLE '.$prefix.'faquser ADD success SMALLINT NULL DEFAULT 1'; |
378 | 378 | } else { |
@@ -535,8 +535,8 @@ discard block |
||
535 | 535 | // |
536 | 536 | if (version_compare($version, '2.9.6', '<')) { |
537 | 537 | if ($DB['type'] === 'mysqli') { |
538 | - $query[] = 'ALTER TABLE ' . $prefix . 'faqdata ADD FULLTEXT(keywords,thema,content);'; |
|
539 | - $query[] = 'ALTER TABLE ' . $prefix . 'faqquestions CHANGE COLUMN lang lang VARCHAR(5) AFTER id'; |
|
538 | + $query[] = 'ALTER TABLE '.$prefix.'faqdata ADD FULLTEXT(keywords,thema,content);'; |
|
539 | + $query[] = 'ALTER TABLE '.$prefix.'faqquestions CHANGE COLUMN lang lang VARCHAR(5) AFTER id'; |
|
540 | 540 | } |
541 | 541 | } |
542 | 542 |
@@ -58,8 +58,8 @@ |
||
58 | 58 | |
59 | 59 | $send2friendLink = sprintf('%sindex.php?action=faq&cat=%d&id=%d&artlang=%s', |
60 | 60 | $faqConfig->getDefaultUrl(), |
61 | - (int) $cat, |
|
62 | - (int) $id, |
|
61 | + (int)$cat, |
|
62 | + (int)$id, |
|
63 | 63 | urlencode($faqLanguage)); |
64 | 64 | |
65 | 65 |
@@ -376,8 +376,8 @@ |
||
376 | 376 | define('PMF_GET_KEY_NAME_LANGUAGE', 'lang'); |
377 | 377 | define('PMF_GET_KEY_NAME_SESSIONID', 'sid'); |
378 | 378 | // Misc parameters |
379 | -define('Language_EXPIRED_TIME', 3600); // 30 minutes |
|
380 | -define('PMF_SESSION_EXPIRED_TIME', 3600); // 30 minutes |
|
379 | +define('Language_EXPIRED_TIME', 3600); // 30 minutes |
|
380 | +define('PMF_SESSION_EXPIRED_TIME', 3600); // 30 minutes |
|
381 | 381 | define('PMF_REMEMBERME_EXPIRED_TIME', 1209600); // 2 weeks |
382 | 382 | |
383 | 383 | // |
@@ -71,7 +71,7 @@ |
||
71 | 71 | } |
72 | 72 | } else { |
73 | 73 | $user = CurrentUser::getFromCookie($faqConfig); |
74 | - if (! $user instanceof CurrentUser) { |
|
74 | + if (!$user instanceof CurrentUser) { |
|
75 | 75 | $user = CurrentUser::getFromSession($faqConfig); |
76 | 76 | } |
77 | 77 | } |
@@ -31,11 +31,11 @@ |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | $protocol = 'http'; |
34 | -if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){ |
|
34 | +if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') { |
|
35 | 35 | $protocol = 'https'; |
36 | 36 | } |
37 | -$parsed = parse_url($protocol . '://' . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME']); |
|
38 | -if (isset($parsed['host']) && strlen($parsed['host']) > 0 && is_dir(__DIR__ . '/' . $parsed['host'])) { |
|
39 | - define('PMF_MULTI_INSTANCE_CONFIG_DIR', __DIR__ . '/' . $parsed['host']); |
|
37 | +$parsed = parse_url($protocol.'://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']); |
|
38 | +if (isset($parsed['host']) && strlen($parsed['host']) > 0 && is_dir(__DIR__.'/'.$parsed['host'])) { |
|
39 | + define('PMF_MULTI_INSTANCE_CONFIG_DIR', __DIR__.'/'.$parsed['host']); |
|
40 | 40 | unset($parsed); |
41 | 41 | } |
@@ -688,8 +688,8 @@ discard block |
||
688 | 688 | |
689 | 689 | $message = array( |
690 | 690 | 'success' => trim($PMF_LANG['successMessage']). |
691 | - ' '. |
|
692 | - trim($PMF_LANG['msgRegThankYou']), |
|
691 | + ' '. |
|
692 | + trim($PMF_LANG['msgRegThankYou']), |
|
693 | 693 | ); |
694 | 694 | } |
695 | 695 | } else { |
@@ -791,7 +791,7 @@ discard block |
||
791 | 791 | $attached = Filter::filterInput(INPUT_POST, 'message', FILTER_SANITIZE_STRIPPED); |
792 | 792 | $mailto = Filter::filterInputArray(INPUT_POST, |
793 | 793 | array('mailto' => array('filter' => FILTER_VALIDATE_EMAIL, |
794 | - 'flags' => FILTER_REQUIRE_ARRAY | FILTER_NULL_ON_FAILURE, |
|
794 | + 'flags' => FILTER_REQUIRE_ARRAY | FILTER_NULL_ON_FAILURE, |
|
795 | 795 | ), |
796 | 796 | ) |
797 | 797 | ); |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | $mail->message = html_entity_decode( |
455 | 455 | $PMF_LANG['msgMailCheck'])."\n\n". |
456 | 456 | $faqConfig->get('main.titleFAQ').': '. |
457 | - $faqConfig->getDefaultUrl().'admin/?action=editentry&id=' . $recordId . '&lang=' . $faqLanguage; |
|
457 | + $faqConfig->getDefaultUrl().'admin/?action=editentry&id='.$recordId.'&lang='.$faqLanguage; |
|
458 | 458 | $result = $mail->send(); |
459 | 459 | unset($mail); |
460 | 460 | |
@@ -716,7 +716,7 @@ discard block |
||
716 | 716 | $votingData = array( |
717 | 717 | 'record_id' => $recordId, |
718 | 718 | 'vote' => $vote, |
719 | - 'user_ip' => $userIp, ); |
|
719 | + 'user_ip' => $userIp,); |
|
720 | 720 | |
721 | 721 | if (!$rating->getNumberOfVotings($recordId)) { |
722 | 722 | $rating->addVoting($votingData); |
@@ -853,7 +853,7 @@ discard block |
||
853 | 853 | |
854 | 854 | $userData = array( |
855 | 855 | 'display_name' => $author, |
856 | - 'email' => $email, ); |
|
856 | + 'email' => $email,); |
|
857 | 857 | $success = $user->setUserData($userData); |
858 | 858 | |
859 | 859 | if (0 !== strlen($password) && 0 !== strlen($confirm)) { |
@@ -888,10 +888,10 @@ discard block |
||
888 | 888 | |
889 | 889 | if ($loginExist && ($email == $user->getUserData('email'))) { |
890 | 890 | $consonants = array( |
891 | - 'b','c','d','f','g','h','j','k','l','m','n','p','r','s','t','v','w','x','y','z', |
|
891 | + 'b', 'c', 'd', 'f', 'g', 'h', 'j', 'k', 'l', 'm', 'n', 'p', 'r', 's', 't', 'v', 'w', 'x', 'y', 'z', |
|
892 | 892 | ); |
893 | 893 | $vowels = array( |
894 | - 'a','e','i','o','u', |
|
894 | + 'a', 'e', 'i', 'o', 'u', |
|
895 | 895 | ); |
896 | 896 | $newPassword = ''; |
897 | 897 | for ($i = 1; $i <= 4; ++$i) { |
@@ -215,7 +215,7 @@ |
||
215 | 215 | $tagName = trim($tagName); |
216 | 216 | if (Strings::strlen($tagName) > 0) { |
217 | 217 | if (!in_array(Strings::strtolower($tagName), |
218 | - array_map(array('String', 'strtolower'), $currentTags))) { |
|
218 | + array_map(array('String', 'strtolower'), $currentTags))) { |
|
219 | 219 | // Create the new tag |
220 | 220 | $newTagId = $this->config->getDb()->nextId(Db::getTablePrefix().'faqtags', 'tagging_id'); |
221 | 221 | $query = sprintf(" |