@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | $this->pdf->setCategory($categoryId); |
98 | 98 | $this->pdf->setCategories($this->category->categoryName); |
99 | 99 | $this->pdf->SetCreator( |
100 | - $this->_config->get('main.titleFAQ') . |
|
101 | - ' - powered by phpMyFAQ ' . |
|
100 | + $this->_config->get('main.titleFAQ'). |
|
101 | + ' - powered by phpMyFAQ '. |
|
102 | 102 | $this->_config->get('main.currentVersion') |
103 | 103 | ); |
104 | 104 | |
@@ -137,27 +137,27 @@ discard block |
||
137 | 137 | $tags = $this->tags->getAllTagsById($faq['id']); |
138 | 138 | } |
139 | 139 | |
140 | - $this->pdf->WriteHTML('<h2 align="center">' . $faq['topic'] . '</h2>', true); |
|
140 | + $this->pdf->WriteHTML('<h2 align="center">'.$faq['topic'].'</h2>', true); |
|
141 | 141 | $this->pdf->Ln(10); |
142 | 142 | |
143 | 143 | $this->pdf->SetFont($this->pdf->getCurrentFont(), '', 12); |
144 | 144 | $this->pdf->WriteHTML(trim($faq['content'])); |
145 | 145 | $this->pdf->Ln(10); |
146 | 146 | |
147 | - if (! empty($faq['keywords'])) { |
|
147 | + if (!empty($faq['keywords'])) { |
|
148 | 148 | $this->pdf->Ln(); |
149 | - $this->pdf->Write(5, $PMF_LANG['msgNewContentKeywords'] . ' ' . $faq['keywords']); |
|
149 | + $this->pdf->Write(5, $PMF_LANG['msgNewContentKeywords'].' '.$faq['keywords']); |
|
150 | 150 | } |
151 | 151 | if (isset($tags) && 0 !== count($tags)) { |
152 | 152 | $this->pdf->Ln(); |
153 | - $this->pdf->Write(5, $PMF_LANG['ad_entry_tags'] . ': ' . implode(', ', $tags)); |
|
153 | + $this->pdf->Write(5, $PMF_LANG['ad_entry_tags'].': '.implode(', ', $tags)); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | $this->pdf->Ln(); |
157 | 157 | $this->pdf->Ln(); |
158 | 158 | $this->pdf->Write( |
159 | 159 | 5, |
160 | - $PMF_LANG['msgLastUpdateArticle'] . PMF_Date::createIsoDate($faq['lastmodified']) |
|
160 | + $PMF_LANG['msgLastUpdateArticle'].PMF_Date::createIsoDate($faq['lastmodified']) |
|
161 | 161 | ); |
162 | 162 | } |
163 | 163 | } |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | // Default filename: FAQ-<id>-<language>.pdf |
186 | 186 | if (empty($filename)) { |
187 | - $filename = 'FAQ-' . $faqData['id'] . '-' . $faqData['lang'] . '.pdf'; |
|
187 | + $filename = 'FAQ-'.$faqData['id'].'-'.$faqData['lang'].'.pdf'; |
|
188 | 188 | } |
189 | 189 | |
190 | 190 | $this->pdf->setFaq($faqData); |
@@ -195,27 +195,27 @@ discard block |
||
195 | 195 | // Set any item |
196 | 196 | $this->pdf->SetTitle($faqData['title']); |
197 | 197 | $this->pdf->SetCreator( |
198 | - $this->_config->get('main.titleFAQ') . |
|
199 | - ' - powered by phpMyFAQ ' . |
|
198 | + $this->_config->get('main.titleFAQ'). |
|
199 | + ' - powered by phpMyFAQ '. |
|
200 | 200 | $this->_config->get('main.currentVersion') |
201 | 201 | ); |
202 | 202 | $this->pdf->AddPage(); |
203 | 203 | $this->pdf->SetFont($this->pdf->getCurrentFont(), '', 12); |
204 | 204 | $this->pdf->SetDisplayMode('real'); |
205 | 205 | $this->pdf->Ln(); |
206 | - $this->pdf->WriteHTML('<h1 align="center">' . $faqData['title'] . '</h1>', true); |
|
206 | + $this->pdf->WriteHTML('<h1 align="center">'.$faqData['title'].'</h1>', true); |
|
207 | 207 | $this->pdf->Ln(); |
208 | 208 | $this->pdf->Ln(); |
209 | 209 | $this->pdf->WriteHTML(str_replace('../', '', $faqData['content']), true); |
210 | 210 | $this->pdf->Ln(); |
211 | 211 | $this->pdf->Ln(); |
212 | 212 | $this->pdf->SetFont($this->pdf->getCurrentFont(), '', 11); |
213 | - $this->pdf->Write(5, $PMF_LANG['ad_entry_solution_id'] . ': #' . $faqData['solution_id']); |
|
213 | + $this->pdf->Write(5, $PMF_LANG['ad_entry_solution_id'].': #'.$faqData['solution_id']); |
|
214 | 214 | $this->pdf->SetAuthor($faqData['author']); |
215 | 215 | $this->pdf->Ln(); |
216 | - $this->pdf->Write(5, $PMF_LANG['msgAuthor'] . ': ' . $faqData['author']); |
|
216 | + $this->pdf->Write(5, $PMF_LANG['msgAuthor'].': '.$faqData['author']); |
|
217 | 217 | $this->pdf->Ln(); |
218 | - $this->pdf->Write(5, $PMF_LANG['msgLastUpdateArticle'] . $faqData['date']); |
|
218 | + $this->pdf->Write(5, $PMF_LANG['msgLastUpdateArticle'].$faqData['date']); |
|
219 | 219 | |
220 | 220 | return $this->pdf->Output($filename); |
221 | 221 | } |
@@ -80,13 +80,13 @@ |
||
80 | 80 | $faqdata = $this->faq->get(FAQ_QUERY_TYPE_EXPORT_XHTML, $categoryId, $downwards, $language); |
81 | 81 | $version = $this->_config->get('main.currentVersion'); |
82 | 82 | $comment = sprintf('XHTML output by phpMyFAQ %s | Date: %s', |
83 | - $version, |
|
84 | - PMF_Date::createIsoDate(date("YmdHis"))); |
|
83 | + $version, |
|
84 | + PMF_Date::createIsoDate(date("YmdHis"))); |
|
85 | 85 | |
86 | 86 | $this->xml->startDocument('1.0', 'utf-8'); |
87 | 87 | $this->xml->writeDtd('html', |
88 | - '-//W3C//DTD XHTML 1.0 Transitional//EN', |
|
89 | - 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'); |
|
88 | + '-//W3C//DTD XHTML 1.0 Transitional//EN', |
|
89 | + 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'); |
|
90 | 90 | $this->xml->startElement('html'); |
91 | 91 | $this->xml->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml'); |
92 | 92 | $this->xml->writeAttribute('xml:lang', $language); |
@@ -115,10 +115,10 @@ |
||
115 | 115 | $this->xml->startElement('p'); |
116 | 116 | $this->xml->writeCdata(html_entity_decode($data['content'], ENT_QUOTES, 'UTF-8')); |
117 | 117 | $this->xml->endElement(); |
118 | - $this->xml->writeElement('p', $PMF_LANG['msgAuthor'] . ': ' .$data['author_email']); |
|
118 | + $this->xml->writeElement('p', $PMF_LANG['msgAuthor'].': '.$data['author_email']); |
|
119 | 119 | $this->xml->writeElement( |
120 | 120 | 'p', |
121 | - $PMF_LANG['msgLastUpdateArticle'] . PMF_Date::createIsoDate($data['lastmodified']) |
|
121 | + $PMF_LANG['msgLastUpdateArticle'].PMF_Date::createIsoDate($data['lastmodified']) |
|
122 | 122 | ); |
123 | 123 | |
124 | 124 | $lastCategory = $data['category_id']; |
@@ -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 | } |
42 | 42 | \ No newline at end of file |
@@ -20,10 +20,10 @@ discard block |
||
20 | 20 | |
21 | 21 | if (!defined('IS_VALID_PHPMYFAQ')) { |
22 | 22 | $protocol = 'http'; |
23 | - if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){ |
|
23 | + if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') { |
|
24 | 24 | $protocol = 'https'; |
25 | 25 | } |
26 | - header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME'])); |
|
26 | + header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])); |
|
27 | 27 | exit(); |
28 | 28 | } |
29 | 29 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $sitemap->setUser($current_user); |
41 | 41 | $sitemap->setGroups($current_groups); |
42 | 42 | |
43 | -$tpl->parse ( |
|
43 | +$tpl->parse( |
|
44 | 44 | 'writeContent', |
45 | 45 | array( |
46 | 46 | 'writeLetters' => $sitemap->getAllFirstLetters(), |
@@ -48,10 +48,10 @@ discard block |
||
48 | 48 | |
49 | 49 | define('IS_VALID_PHPMYFAQ', null); |
50 | 50 | |
51 | - require PMF_ROOT_DIR. '/inc/Bootstrap.php'; |
|
51 | + require PMF_ROOT_DIR.'/inc/Bootstrap.php'; |
|
52 | 52 | |
53 | 53 | // Preload English strings |
54 | - require_once PMF_ROOT_DIR . '/lang/language_en.php'; |
|
54 | + require_once PMF_ROOT_DIR.'/lang/language_en.php'; |
|
55 | 55 | |
56 | 56 | if ((LANGCODE != 'en') && PMF_Language::isASupportedLanguage(LANGCODE)) { |
57 | 57 | // Overwrite English strings with the ones we have in the current language |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $_records = $faq->faqRecords; |
80 | 80 | $tot = count($_records); |
81 | 81 | $end = microtime(true); |
82 | - $output .= ' #'.$tot.', done in '.round($end - $start, 4).' sec.'.($isRequestedByWebLocalhost ? '' : "\n");; |
|
82 | + $output .= ' #'.$tot.', done in '.round($end - $start, 4).' sec.'.($isRequestedByWebLocalhost ? '' : "\n"); ; |
|
83 | 83 | $output .= ($isRequestedByWebLocalhost ? '' : "\n"); |
84 | 84 | if ($isRequestedByWebLocalhost) { |
85 | 85 | echo '<pre>'; |
@@ -19,10 +19,10 @@ discard block |
||
19 | 19 | |
20 | 20 | if (!defined('IS_VALID_PHPMYFAQ')) { |
21 | 21 | $protocol = 'http'; |
22 | - if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){ |
|
22 | + if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') { |
|
23 | 23 | $protocol = 'https'; |
24 | 24 | } |
25 | - header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME'])); |
|
25 | + header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])); |
|
26 | 26 | exit(); |
27 | 27 | } |
28 | 28 | |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | $tpl->parse( |
80 | 80 | 'writeContent', |
81 | 81 | array( |
82 | - 'categoryHeader' => $PMF_LANG['msgEntriesIn'] . $catName, |
|
82 | + 'categoryHeader' => $PMF_LANG['msgEntriesIn'].$catName, |
|
83 | 83 | 'categoryDescription' => $catDescription, |
84 | 84 | 'categoryFaqsHeader' => $PMF_LANG['msgEntries'], |
85 | 85 | 'categoryContent' => $records, |
@@ -367,8 +367,8 @@ |
||
367 | 367 | define('PMF_GET_KEY_NAME_LANGUAGE', 'lang'); |
368 | 368 | define('PMF_GET_KEY_NAME_SESSIONID', 'sid'); |
369 | 369 | // Misc parameters |
370 | -define('PMF_LANGUAGE_EXPIRED_TIME', 3600); // 30 minutes |
|
371 | -define('PMF_SESSION_EXPIRED_TIME', 3600); // 30 minutes |
|
370 | +define('PMF_LANGUAGE_EXPIRED_TIME', 3600); // 30 minutes |
|
371 | +define('PMF_SESSION_EXPIRED_TIME', 3600); // 30 minutes |
|
372 | 372 | define('PMF_REMEMBERME_EXPIRED_TIME', 1209600); // 2 weeks |
373 | 373 | |
374 | 374 | // |
@@ -40,7 +40,7 @@ |
||
40 | 40 | $dateEnd = PMF_Filter::filterInput(INPUT_POST, 'dateEnd', FILTER_SANITIZE_STRING); |
41 | 41 | $question = PMF_Filter::filterInput(INPUT_POST, 'question', FILTER_SANITIZE_STRING); |
42 | 42 | $categories = PMF_Filter::filterInputArray(INPUT_POST, array('rubrik' => array('filter' => FILTER_VALIDATE_INT, |
43 | - 'flags' => FILTER_REQUIRE_ARRAY))); |
|
43 | + 'flags' => FILTER_REQUIRE_ARRAY))); |
|
44 | 44 | $record_lang = PMF_Filter::filterInput(INPUT_POST, 'lang', FILTER_SANITIZE_STRING); |
45 | 45 | $tags = PMF_Filter::filterInput(INPUT_POST, 'tags', FILTER_SANITIZE_STRING); |
46 | 46 | $active = PMF_Filter::filterInput(INPUT_POST, 'active', FILTER_SANITIZE_STRING); |
@@ -21,10 +21,10 @@ discard block |
||
21 | 21 | |
22 | 22 | if (!defined('IS_VALID_PHPMYFAQ')) { |
23 | 23 | $protocol = 'http'; |
24 | - if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){ |
|
24 | + if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') { |
|
25 | 25 | $protocol = 'https'; |
26 | 26 | } |
27 | - header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME'])); |
|
27 | + header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])); |
|
28 | 28 | exit(); |
29 | 29 | } |
30 | 30 | |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | ($user->perm->checkRight($user->getUserId(), 'editbt') || $user->perm->checkRight($user->getUserId(), 'addbt')) || |
37 | 37 | 'saveentry' === $do && $user->perm->checkRight($user->getUserId(), 'editbt')) { |
38 | 38 | |
39 | - $user = PMF_User_CurrentUser::getFromSession($faqConfig); |
|
39 | + $user = PMF_User_CurrentUser::getFromSession($faqConfig); |
|
40 | 40 | |
41 | 41 | $dateStart = PMF_Filter::filterInput(INPUT_POST, 'dateStart', FILTER_SANITIZE_STRING); |
42 | 42 | $dateEnd = PMF_Filter::filterInput(INPUT_POST, 'dateEnd', FILTER_SANITIZE_STRING); |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | 'email' => $email, |
90 | 90 | 'comment' => (!is_null($comment) ? 'y' : 'n'), |
91 | 91 | 'date' => empty($date) ? date('YmdHis') : str_replace(array('-', ':', ' '), '', $date), |
92 | - 'dateStart' => (empty($dateStart) ? '00000000000000' : str_replace('-', '', $dateStart) . '000000'), |
|
93 | - 'dateEnd' => (empty($dateEnd) ? '99991231235959' : str_replace('-', '', $dateEnd) . '235959'), |
|
92 | + 'dateStart' => (empty($dateStart) ? '00000000000000' : str_replace('-', '', $dateStart).'000000'), |
|
93 | + 'dateEnd' => (empty($dateEnd) ? '99991231235959' : str_replace('-', '', $dateEnd).'235959'), |
|
94 | 94 | 'linkState' => '', |
95 | 95 | 'linkDateCheck' => 0 |
96 | 96 | ); |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $faq->addCategoryRelations($categories['rubrik'], $record_id, $recordData['lang']); |
145 | 145 | |
146 | 146 | if ($tags != '') { |
147 | - $tagging->saveTags($record_id, explode(',',$tags)); |
|
147 | + $tagging->saveTags($record_id, explode(',', $tags)); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | $faq->addPermission('user', $record_id, $restricted_users); |
@@ -72,9 +72,9 @@ |
||
72 | 72 | </a> | |
73 | 73 | <?php print $date->format(date('Y-m-d H:i', $faqcomment['date'])); ?> | |
74 | 74 | <a href="<?php printf("../?action=artikel&cat=%d&id=%d&artlang=%s", |
75 | - $faqcomment['category_id'], |
|
76 | - $faqcomment['record_id'], |
|
77 | - $LANGCODE); ?>"> |
|
75 | + $faqcomment['category_id'], |
|
76 | + $faqcomment['record_id'], |
|
77 | + $LANGCODE); ?>"> |
|
78 | 78 | <?php print $faq->getRecordTitle($faqcomment['record_id']); ?> |
79 | 79 | </a> |
80 | 80 | </span><br/> |
@@ -19,10 +19,10 @@ |
||
19 | 19 | |
20 | 20 | if (!defined('IS_VALID_PHPMYFAQ')) { |
21 | 21 | $protocol = 'http'; |
22 | - if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){ |
|
22 | + if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') { |
|
23 | 23 | $protocol = 'https'; |
24 | 24 | } |
25 | - header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME'])); |
|
25 | + header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME'])); |
|
26 | 26 | exit(); |
27 | 27 | } |
28 | 28 |