thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Helper/Search.php

Spacing +6 added lines, -6 removed lines

@@ -113,7 +113,7 @@ 
     {
         return sprintf(
             '<a class="searchplugin" href="#" onclick="window.external.AddSearchProvider(\'%s\'); return false;">%s</a>',
-            $this->_config->get('main.referenceURL') . '/opensearch.php',
+            $this->_config->get('main.referenceURL').'/opensearch.php',
             $this->translation['opensearch_plugin_install']
         );
     }
@@ -240,8 +240,8 @@ 
         $confPerPage  = $this->_config->get('records.numberOfRecordsPerPage');
         $numOfResults = $resultSet->getNumberOfResults();
         
-        $totalPages = ceil($numOfResults / $confPerPage);
-        $lastPage   = $currentPage * $confPerPage;
+        $totalPages = ceil($numOfResults/$confPerPage);
+        $lastPage   = $currentPage*$confPerPage;
         $firstPage  = $lastPage - $confPerPage;
         if ($lastPage > $numOfResults) {
             $lastPage = $numOfResults;
@@ -260,7 +260,7 @@ 
                     $this->translation['msgPage'],
                     $currentPage,
                     $this->translation['msgVoteFrom'],
-                    $this->plurals->GetMsg('plmsgPagesTotal',$totalPages)
+                    $this->plurals->GetMsg('plmsgPagesTotal', $totalPages)
                 );
             }
             
@@ -376,7 +376,7 @@ 
                 $oLink->itemTitle  = $result->question;
                 $oLink->text       = $result->question;
                 $oLink->tooltip    = $result->question;
-                $html .= '<li>' . $oLink->toHtmlAnchor() . '</li>';
+                $html .= '<li>'.$oLink->toHtmlAnchor().'</li>';
             }
             $html .= '</ul>';
         }
@@ -406,6 +406,6 @@ 
             }
         }
         
-        return $html . '</ul>';
+        return $html.'</ul>';
     }
 }
\ No newline at end of file

Indentation +4 added lines, -4 removed lines

@@ -293,10 +293,10 @@
                 
                 if (PMF_String::strlen($searchItems[0]) > 1) {
                     foreach ($searchItems as $item) {
-                         if (PMF_String::strlen($item) > 2) {
-                             $question      = PMF_Utils::setHighlightedString($question, $item);
-                             $answerPreview = PMF_Utils::setHighlightedString($answerPreview, $item);
-                         }
+                            if (PMF_String::strlen($item) > 2) {
+                                $question      = PMF_Utils::setHighlightedString($question, $item);
+                                $answerPreview = PMF_Utils::setHighlightedString($answerPreview, $item);
+                            }
                     }
                 }
                 

phpmyfaq/inc/PMF/Export/Xml.php

Indentation +2 added lines, -2 removed lines

@@ -76,8 +76,8 @@
         $faqdata = $this->faq->get(FAQ_QUERY_TYPE_EXPORT_XML, $categoryId, $downwards, $language);
         $version = $this->_config->get('main.currentVersion');
         $comment = sprintf('XML output by phpMyFAQ %s | Date: %s', 
-          $version, 
-          PMF_Date::createIsoDate(date("YmdHis")));
+            $version, 
+            PMF_Date::createIsoDate(date("YmdHis")));
         
         $this->xml->startDocument('1.0', 'utf-8', 'yes');
         $this->xml->writeComment($comment);

phpmyfaq/inc/PMF/Export/Pdf/Wrapper.php

Spacing +15 added lines, -15 removed lines

@@ -29,18 +29,18 @@ 
  * path to TCPDF
  *
  */
-define('K_PATH_MAIN', PMF_INCLUDE_DIR . '/libs/tcpdf/');
+define('K_PATH_MAIN', PMF_INCLUDE_DIR.'/libs/tcpdf/');
 
 /**
  * path for PDF fonts
  * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
  */
-define('K_PATH_FONTS', K_PATH_MAIN . 'fonts/');
+define('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
 
 /**
  * cache directory for temporary files (full path)
  */
-define('K_PATH_CACHE', PMF_ROOT_DIR . '/images/');
+define('K_PATH_CACHE', PMF_ROOT_DIR.'/images/');
 
 /**
  * cache directory for temporary files (url path)
@@ -50,12 +50,12 @@ 
 /**
  * images directory
  */
-define('K_PATH_IMAGES', K_PATH_MAIN . 'images/');
+define('K_PATH_IMAGES', K_PATH_MAIN.'images/');
 
 /**
  * blank image
  */
-define('K_BLANK_IMAGE', K_PATH_IMAGES . '_blank.png');
+define('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
 
 /**
  * page format
@@ -180,9 +180,9 @@ 
 /**
  * reduction factor for small font
  */
-define('K_SMALL_RATIO', 2 / 3);
+define('K_SMALL_RATIO', 2/3);
 
-require K_PATH_MAIN . '/tcpdf.php';
+require K_PATH_MAIN.'/tcpdf.php';
 
 /**
  * @category  phpMyFAQ
@@ -350,7 +350,7 @@ 
         
         $title = html_entity_decode($title, ENT_QUOTES, 'utf-8');
         
-        $this->SetTextColor(0,0,0);
+        $this->SetTextColor(0, 0, 0);
         $this->SetFont($this->currentFont, 'B', 18);
         $this->MultiCell(0, 9, $title, 0, 'C', 0);        
         $this->SetMargins(PDF_MARGIN_LEFT, $this->getLastH() + 5, PDF_MARGIN_RIGHT);
@@ -376,13 +376,13 @@ 
         );
         
         $currentTextColor = $this->TextColor;
-        $this->SetTextColor(0,0,0);
+        $this->SetTextColor(0, 0, 0);
         $this->SetY(-25);
         $this->SetFont($this->currentFont, '', 10);
-        $this->Cell(0, 10, $PMF_LANG['ad_gen_page'] . ' ' . $this->getAliasNumPage() . ' / ' . $this->getAliasNbPages(), 0, 0, 'C');
+        $this->Cell(0, 10, $PMF_LANG['ad_gen_page'].' '.$this->getAliasNumPage().' / '.$this->getAliasNbPages(), 0, 0, 'C');
         $this->SetY(-20);
         $this->SetFont($this->currentFont, 'B', 8);
-        $this->Cell(0, 10, $footer,0,1,"C");
+        $this->Cell(0, 10, $footer, 0, 1, "C");
         if ($this->enableBookmarks == false) {
             $this->SetY(-15);
             $this->SetFont($this->currentFont, '', 8);
@@ -390,14 +390,14 @@ 
             if (is_array($this->faq) && !empty($this->faq)) {
                 $baseUrl .= '?action=artikel&';
                 if (array_key_exists($this->category, $this->categories)) {
-                    $baseUrl .= 'cat=' . $this->categories[$this->category]['id'];
+                    $baseUrl .= 'cat='.$this->categories[$this->category]['id'];
                 } else {
                     $baseUrl .= 'cat=0';
                 }
                 $baseUrl .= '&id='.$this->faq['id'];
                 $baseUrl .= '&artlang='.$this->faq['lang'];
             }
-            $url    = $this->_config->get('main.referenceURL') . $baseUrl;
+            $url    = $this->_config->get('main.referenceURL').$baseUrl;
             $urlObj = new PMF_Link($url, $this->_config);
             $urlObj->itemTitle = $this->question;
             $_url = str_replace('&', '&', $urlObj->toString());
@@ -429,7 +429,7 @@ 
         $this->SetFont($this->currentFont, '', 12);
 
         // Render TOC
-        $this->addTOC(1, $this->currentFont, '.', $PMF_LANG['msgTableOfContent'], 'B', array(128,0,0));
+        $this->addTOC(1, $this->currentFont, '.', $PMF_LANG['msgTableOfContent'], 'B', array(128, 0, 0));
         $this->endTOCPage();
     }
 
@@ -505,7 +505,7 @@ 
     public function Image($file, $x = '', $y = '', $w = 0, $h = 0, $type = '', $link = '', $align = '', $resize = false, $dpi = 300, $palign = '', $ismask = false, $imgmask = false, $border = 0, $fitbox = false, $hidden = false, $fitonpage = false, $alt = false, $altimgs = array())
     {
         if (!strpos($file, 'data:image/png;base64,') === false) {
-            $file = '@' . base64_decode(
+            $file = '@'.base64_decode(
                 chunk_split(str_replace(' ', '+', str_replace('data:image/png;base64,', '', $file)))
             );
         }

Indentation +4 added lines, -4 removed lines

@@ -199,10 +199,10 @@
 class PMF_Export_Pdf_Wrapper extends TCPDF
 {
     /**
-    * With or without bookmarks
-    *
-    * @var boolean
-    */
+     * With or without bookmarks
+     *
+     * @var boolean
+     */
     public $enableBookmarks = false;
     
     /**

phpmyfaq/inc/PMF/Export/Pdf.php

Spacing +14 added lines, -14 removed lines

@@ -97,8 +97,8 @@ 
         $this->pdf->setCategory($categoryId);
         $this->pdf->setCategories($this->category->categoryName);
         $this->pdf->SetCreator(
-            $this->_config->get('main.titleFAQ') .
-            ' - powered by phpMyFAQ ' .
+            $this->_config->get('main.titleFAQ').
+            ' - powered by phpMyFAQ '.
             $this->_config->get('main.currentVersion')
         );
 
@@ -137,27 +137,27 @@ 
                         $tags = $this->tags->getAllTagsById($faq['id']);
                     }
 
-                    $this->pdf->WriteHTML('<h2 align="center">' . $faq['topic'] . '</h2>', true);
+                    $this->pdf->WriteHTML('<h2 align="center">'.$faq['topic'].'</h2>', true);
                     $this->pdf->Ln(10);
 
                     $this->pdf->SetFont($this->pdf->getCurrentFont(), '', 12);
                     $this->pdf->WriteHTML(trim($faq['content']));
                     $this->pdf->Ln(10);
 
-                    if (! empty($faq['keywords'])) {
+                    if (!empty($faq['keywords'])) {
                         $this->pdf->Ln();
-                        $this->pdf->Write(5, $PMF_LANG['msgNewContentKeywords'] . ' ' . $faq['keywords']);
+                        $this->pdf->Write(5, $PMF_LANG['msgNewContentKeywords'].' '.$faq['keywords']);
                     }
                     if (isset($tags) && 0 !== count($tags)) {
                         $this->pdf->Ln();
-                        $this->pdf->Write(5, $PMF_LANG['ad_entry_tags'] . ': ' . implode(', ', $tags));
+                        $this->pdf->Write(5, $PMF_LANG['ad_entry_tags'].': '.implode(', ', $tags));
                     }
 
                     $this->pdf->Ln();
                     $this->pdf->Ln();
                     $this->pdf->Write(
                         5,
-                        $PMF_LANG['msgLastUpdateArticle'] . PMF_Date::createIsoDate($faq['lastmodified'])
+                        $PMF_LANG['msgLastUpdateArticle'].PMF_Date::createIsoDate($faq['lastmodified'])
                     );
                 }
             }
@@ -184,7 +184,7 @@ 
 
         // Default filename: FAQ-<id>-<language>.pdf
         if (empty($filename)) {
-            $filename = 'FAQ-' . $faqData['id'] . '-' . $faqData['lang'] . '.pdf';
+            $filename = 'FAQ-'.$faqData['id'].'-'.$faqData['lang'].'.pdf';
         }
 
         $this->pdf->setFaq($faqData);
@@ -195,27 +195,27 @@ 
         // Set any item
         $this->pdf->SetTitle($faqData['title']);
         $this->pdf->SetCreator(
-            $this->_config->get('main.titleFAQ') .
-            ' - powered by phpMyFAQ ' .
+            $this->_config->get('main.titleFAQ').
+            ' - powered by phpMyFAQ '.
             $this->_config->get('main.currentVersion')
         );
         $this->pdf->AddPage();
         $this->pdf->SetFont($this->pdf->getCurrentFont(), '', 12);
         $this->pdf->SetDisplayMode('real');
         $this->pdf->Ln();
-        $this->pdf->WriteHTML('<h1 align="center">' . $faqData['title'] . '</h1>', true);
+        $this->pdf->WriteHTML('<h1 align="center">'.$faqData['title'].'</h1>', true);
         $this->pdf->Ln();
         $this->pdf->Ln();
         $this->pdf->WriteHTML(str_replace('../', '', $faqData['content']), true);
         $this->pdf->Ln();
         $this->pdf->Ln();
         $this->pdf->SetFont($this->pdf->getCurrentFont(), '', 11);
-        $this->pdf->Write(5, $PMF_LANG['ad_entry_solution_id'] . ': #' . $faqData['solution_id']);
+        $this->pdf->Write(5, $PMF_LANG['ad_entry_solution_id'].': #'.$faqData['solution_id']);
         $this->pdf->SetAuthor($faqData['author']);
         $this->pdf->Ln();
-        $this->pdf->Write(5, $PMF_LANG['msgAuthor'] . ': ' . $faqData['author']);
+        $this->pdf->Write(5, $PMF_LANG['msgAuthor'].': '.$faqData['author']);
         $this->pdf->Ln();
-        $this->pdf->Write(5, $PMF_LANG['msgLastUpdateArticle'] . $faqData['date']);
+        $this->pdf->Write(5, $PMF_LANG['msgLastUpdateArticle'].$faqData['date']);
 
         return $this->pdf->Output($filename);
     }

phpmyfaq/inc/PMF/Export/Xhtml.php

Indentation +4 added lines, -4 removed lines

@@ -80,13 +80,13 @@
         $faqdata = $this->faq->get(FAQ_QUERY_TYPE_EXPORT_XHTML, $categoryId, $downwards, $language);
         $version = $this->_config->get('main.currentVersion');
         $comment = sprintf('XHTML output by phpMyFAQ %s | Date: %s', 
-          $version, 
-          PMF_Date::createIsoDate(date("YmdHis")));
+            $version, 
+            PMF_Date::createIsoDate(date("YmdHis")));
         
         $this->xml->startDocument('1.0', 'utf-8');
         $this->xml->writeDtd('html', 
-                             '-//W3C//DTD XHTML 1.0 Transitional//EN', 
-                             'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd');
+                                '-//W3C//DTD XHTML 1.0 Transitional//EN', 
+                                'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd');
         $this->xml->startElement('html');
         $this->xml->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
         $this->xml->writeAttribute('xml:lang', $language);

Spacing +2 added lines, -2 removed lines

@@ -115,10 +115,10 @@
                 $this->xml->startElement('p');
                 $this->xml->writeCdata(html_entity_decode($data['content'], ENT_QUOTES, 'UTF-8'));
                 $this->xml->endElement();
-                $this->xml->writeElement('p', $PMF_LANG['msgAuthor'] . ': ' .$data['author_email']);
+                $this->xml->writeElement('p', $PMF_LANG['msgAuthor'].': '.$data['author_email']);
                 $this->xml->writeElement(
                     'p',
-                    $PMF_LANG['msgLastUpdateArticle'] . PMF_Date::createIsoDate($data['lastmodified'])
+                    $PMF_LANG['msgLastUpdateArticle'].PMF_Date::createIsoDate($data['lastmodified'])
                 );
                 
                 $lastCategory = $data['category_id'];

phpmyfaq/multisite/multisite.php

Spacing +4 added lines, -4 removed lines

@@ -31,11 +31,11 @@
 }
 
 $protocol = 'http';
-if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
     $protocol = 'https';
 }
-$parsed = parse_url($protocol . '://' . $_SERVER['SERVER_NAME'] . $_SERVER['SCRIPT_NAME']);
-if (isset($parsed['host']) && strlen($parsed['host']) > 0 && is_dir(__DIR__ . '/' . $parsed['host'])) {
-    define('PMF_MULTI_INSTANCE_CONFIG_DIR', __DIR__ . '/' . $parsed['host']);
+$parsed = parse_url($protocol.'://'.$_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']);
+if (isset($parsed['host']) && strlen($parsed['host']) > 0 && is_dir(__DIR__.'/'.$parsed['host'])) {
+    define('PMF_MULTI_INSTANCE_CONFIG_DIR', __DIR__.'/'.$parsed['host']);
     unset($parsed);
 }
\ No newline at end of file

phpmyfaq/cron.verifyurls.php

Spacing +3 added lines, -3 removed lines

@@ -48,10 +48,10 @@ 
     
     define('IS_VALID_PHPMYFAQ', null);
     
-    require PMF_ROOT_DIR. '/inc/Bootstrap.php';
+    require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
     // Preload English strings
-    require_once PMF_ROOT_DIR . '/lang/language_en.php';
+    require_once PMF_ROOT_DIR.'/lang/language_en.php';
 
     if ((LANGCODE != 'en') && PMF_Language::isASupportedLanguage(LANGCODE)) {
         // Overwrite English strings with the ones we have in the current language
@@ -79,7 +79,7 @@ 
     $_records = $faq->faqRecords;
     $tot      = count($_records);
     $end      = microtime(true);
-    $output  .= ' #'.$tot.', done in '.round($end - $start, 4).' sec.'.($isRequestedByWebLocalhost ? '' : "\n");;
+    $output  .= ' #'.$tot.', done in '.round($end - $start, 4).' sec.'.($isRequestedByWebLocalhost ? '' : "\n"); ;
     $output  .= ($isRequestedByWebLocalhost ? '' : "\n");
     if ($isRequestedByWebLocalhost) {
         echo '<pre>';

phpmyfaq/open.php

Spacing +3 added lines, -3 removed lines

@@ -19,16 +19,16 @@
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
 $faqsession->userTracking('open_questions', 0);
 
-$tpl->parse (
+$tpl->parse(
     'writeContent',
     array(
         'msgOpenQuestions'   => $PMF_LANG['msgOpenQuestions'],

phpmyfaq/api.php

Spacing +3 added lines, -3 removed lines

@@ -52,9 +52,9 @@ 
 // Set language
 //
 if (PMF_Language::isASupportedLanguage($language)) {
-    require PMF_LANGUAGE_DIR . '/language_' . $language . '.php';
+    require PMF_LANGUAGE_DIR.'/language_'.$language.'.php';
 } else {
-    require PMF_LANGUAGE_DIR . '/language_en.php';
+    require PMF_LANGUAGE_DIR.'/language_en.php';
 }
 $faqConfig->setLanguage($Language);
 
@@ -94,7 +94,7 @@ 
 
         $searchString  = PMF_Filter::filterInput(INPUT_GET, 'q', FILTER_SANITIZE_STRIPPED);
         $searchResults = $search->search($searchString, false);
-        $url           = $faqConfig->get('main.referenceURL') . '/index.php?action=artikel&cat=%d&id=%d&artlang=%s';
+        $url           = $faqConfig->get('main.referenceURL').'/index.php?action=artikel&cat=%d&id=%d&artlang=%s';
 
         $faqSearchResult->reviewResultset($searchResults);
 

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-
 use PMF\Helper\ResponseWrapper;
 
 //