thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Attachment/Collection.php

Spacing +2 added lines, -2 removed lines

@@ -79,8 +79,8 @@
                 fa.record_id = fd.id
             GROUP BY
                 fa.id",
-            PMF_Db::getTablePrefix() . 'faqattachment',
-            PMF_Db::getTablePrefix() . 'faqdata'
+            PMF_Db::getTablePrefix().'faqattachment',
+            PMF_Db::getTablePrefix().'faqdata'
         );
 
         $result = $this->config->getDb()->query($query);

phpmyfaq/inc/PMF/Attachment/Filesystem/File.php

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
         $this->handle = @fopen($this->path, $this->mode);
         
         if (!is_resource($this->handle)) {
-            throw new PMF_Attachment_Filesystem_File_Exception('Could not open file: ' . $this->path);
+            throw new PMF_Attachment_Filesystem_File_Exception('Could not open file: '.$this->path);
         }
     }
     
@@ -151,7 +151,7 @@ 
     {
         $retval = false;
         
-        if(in_array($mode, array(self::MODE_WRITE, self::MODE_READ, self::MODE_APPEND))) {
+        if (in_array($mode, array(self::MODE_WRITE, self::MODE_READ, self::MODE_APPEND))) {
             fclose($this->handle);
             $this->handle = fopen($this->path, $mode);
         

phpmyfaq/inc/PMF/Attachment/File.php

Spacing +5 added lines, -5 removed lines

@@ -49,10 +49,10 @@ 
         $subDirNameLength = 5;
         
         for ($i = 0; $i < $subDirCount; $i++) {
-            $retval .= DIRECTORY_SEPARATOR . substr($fsHash, $i*$subDirNameLength, $subDirNameLength);
+            $retval .= DIRECTORY_SEPARATOR.substr($fsHash, $i*$subDirNameLength, $subDirNameLength);
         }
         
-        $retval .= DIRECTORY_SEPARATOR . substr($fsHash, $i*$subDirNameLength);
+        $retval .= DIRECTORY_SEPARATOR.substr($fsHash, $i*$subDirNameLength);
         
         return $retval;
     }
@@ -193,9 +193,9 @@ 
         
         if ($headers) {
             $disposition = 'attachment' == $disposition ? 'attachment' : 'inline';
-            header('Content-Type: ' . $this->mimeType, true);
-            header('Content-Length: ' . $this->filesize, true);
-            header("Content-Disposition: $disposition; filename=\"{$this->filename}\"" , true);
+            header('Content-Type: '.$this->mimeType, true);
+            header('Content-Length: '.$this->filesize, true);
+            header("Content-Disposition: $disposition; filename=\"{$this->filename}\"", true);
             header("Content-MD5: {$this->realHash}", true);
         }
         

phpmyfaq/inc/PMF/Language.php

Braces +3 added lines, -1 removed lines

@@ -364,7 +364,9 @@
             if (count($matches[1])) {
                 $languages = array_combine($matches[1], $matches[4]);
                 foreach ($languages as $lang => $val) {
-                    if ($val === '') $languages[$lang] = 1;
+                    if ($val === '') {
+                        $languages[$lang] = 1;
+                    }
                 }
                 arsort($languages, SORT_NUMERIC);
             }

Spacing +20 added lines, -20 removed lines

@@ -132,33 +132,33 @@ 
 
         // Get language from: _POST, _GET, _COOKIE, phpMyFAQ configuration and the automatic language detection
         $_lang['post'] = PMF_Filter::filterInput(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
-        if (!is_null($_lang['post']) && !self::isASupportedLanguage($_lang['post']) ) {
+        if (!is_null($_lang['post']) && !self::isASupportedLanguage($_lang['post'])) {
             $_lang['post'] = null;
         }
         // Get the user language
         $_lang['get'] = PMF_Filter::filterInput(INPUT_GET, 'lang', FILTER_SANITIZE_STRING);
-        if (!is_null($_lang['get']) && !self::isASupportedLanguage($_lang['get']) ) {
+        if (!is_null($_lang['get']) && !self::isASupportedLanguage($_lang['get'])) {
             $_lang['get'] = null;
         }
         // Get the faq record language
         $_lang['artget'] = PMF_Filter::filterInput(INPUT_GET, 'artlang', FILTER_SANITIZE_STRING);
-        if (!is_null($_lang['artget']) && !self::isASupportedLanguage($_lang['artget']) ) {
+        if (!is_null($_lang['artget']) && !self::isASupportedLanguage($_lang['artget'])) {
             $_lang['artget'] = null;
         }
         // Get the language from the session
-        if (isset($_SESSION['pmf_lang']) && self::isASupportedLanguage($_SESSION['pmf_lang']) ) {
+        if (isset($_SESSION['pmf_lang']) && self::isASupportedLanguage($_SESSION['pmf_lang'])) {
             $_lang['session'] = trim($_SESSION['pmf_lang']);
         }
         
         // Get the language from the config
         if (isset($configLanguage)) {
             $confLangCode = str_replace(array("language_", ".php"), "", $configLanguage);
-            if (self::isASupportedLanguage($confLangCode) ) {
+            if (self::isASupportedLanguage($confLangCode)) {
                 $_lang['config'] = $confLangCode;
             }
         }
         // Detect the browser's language
-        if ((true === $configDetection) && self::isASupportedLanguage($this->acceptedLanguage) ) {
+        if ((true === $configDetection) && self::isASupportedLanguage($this->acceptedLanguage)) {
             $_lang['detection'] = strtolower($this->acceptedLanguage);
         }
         // Select the language
@@ -206,12 +206,12 @@ 
     {
         global $languageCodes;
         
-        $search    = array("language_" , ".php");
+        $search    = array("language_", ".php");
         $languages = $languageFiles = [];
         
         $dir = new DirectoryIterator(PMF_LANGUAGE_DIR);
         foreach ($dir as $fileinfo) {
-            if (! $fileinfo->isDot()) {
+            if (!$fileinfo->isDot()) {
                 $languageFiles[] = strtoupper(
                     str_replace($search, '', trim($fileinfo->getFilename()))
                 );
@@ -246,21 +246,21 @@ 
         global $languageCodes;
         
         $onChange  = ($submitOnChange ? ' onchange="this.form.submit();"' : '');
-        $output    = '<select class="form-control" name="' . $id . '" id="' . $id . '" size="1"' . $onChange . ">\n";
+        $output    = '<select class="form-control" name="'.$id.'" id="'.$id.'" size="1"'.$onChange.">\n";
         $languages = self::getAvailableLanguages();
         
         if (count($languages) > 0) {
             foreach ($languages as $lang => $value) {
-                if (! in_array($lang, $excludedLanguages)) {
-                    $output .= "\t" . '<option value="' . $lang . '"';
+                if (!in_array($lang, $excludedLanguages)) {
+                    $output .= "\t".'<option value="'.$lang.'"';
                     if ($lang == $default) {
                         $output .= ' selected="selected"';
                     }
-                    $output .= '>' . $value . "</option>\n";
+                    $output .= '>'.$value."</option>\n";
                 }
             }
         } else {
-            $output .= "\t<option value=\"en\">" . $languageCodes["EN"] . "</option>";
+            $output .= "\t<option value=\"en\">".$languageCodes["EN"]."</option>";
         }
         $output .= "</select>\n";
         return $output;
@@ -281,24 +281,24 @@ 
             if ($onlyThisLang) {
                 if (strtolower($key) == $lang) {
                     if ($fileLanguageValue) {
-                        $output .= "\t<option value=\"language_" . strtolower($lang) . ".php\"";
+                        $output .= "\t<option value=\"language_".strtolower($lang).".php\"";
                     } else {
-                        $output .= "\t<option value=\"" . strtolower($lang) . "\"";
+                        $output .= "\t<option value=\"".strtolower($lang)."\"";
                     }
                     $output .= " selected=\"selected\"";
-                    $output .= ">" . $value . "</option>\n";
+                    $output .= ">".$value."</option>\n";
                     break;
                 }
             } else {
                 if ($fileLanguageValue) {
-                    $output .= "\t<option value=\"language_" . strtolower($key) . ".php\"";
+                    $output .= "\t<option value=\"language_".strtolower($key).".php\"";
                 } else {
-                    $output .= "\t<option value=\"" . strtolower($key) . "\"";
+                    $output .= "\t<option value=\"".strtolower($key)."\"";
                 }
                 if (strtolower($key) == $lang) {
                     $output .= " selected=\"selected\"";
                 }
-                $output .= ">" . $value . "</option>\n";
+                $output .= ">".$value."</option>\n";
             }
         }
         return $output;
@@ -333,7 +333,7 @@ 
     public static function isASupportedTinyMCELanguage($langcode)
     {
         return file_exists(
-            PMF_ROOT_DIR . '/admin/editor/langs/' . $langcode . '.js'
+            PMF_ROOT_DIR.'/admin/editor/langs/'.$langcode.'.js'
         );
     }
     

phpmyfaq/inc/PMF/Enc/Hash.php

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
      */
     public function encrypt($str)
     {
-        return hash('sha256', $str . $this->salt);
+        return hash('sha256', $str.$this->salt);
     }
 }
\ No newline at end of file

phpmyfaq/inc/PMF/Pagination.php

Spacing +4 added lines, -4 removed lines

@@ -259,7 +259,7 @@ 
         
         if (!empty($url)) {
             $match = array();
-            if (PMF_String::preg_match('$&(amp;|)' . $this->pageParamName . '=(\d+)$', $url, $match)) {
+            if (PMF_String::preg_match('$&(amp;|)'.$this->pageParamName.'=(\d+)$', $url, $match)) {
                 $page = isset($match[2]) ? $match[2] : $page;
             }
         }
@@ -275,8 +275,8 @@ 
     public function render()
     {
         $content   = array();
-        $pages     = ceil($this->total / $this->perPage);
-        $adjacents = floor($this->adjacents / 2) >= 1 ? floor($this->adjacents / 2) : 1;
+        $pages     = ceil($this->total/$this->perPage);
+        $adjacents = floor($this->adjacents/2) >= 1 ? floor($this->adjacents/2) : 1;
         
         for ($page = 1; $page <= $pages; $page++) {
             
@@ -360,7 +360,7 @@ 
 
         } else {
 
-            $cleanedUrl = PMF_String::preg_replace(array('$&(amp;|)' . $this->pageParamName . '=(\d+)$'), '', $url);
+            $cleanedUrl = PMF_String::preg_replace(array('$&(amp;|)'.$this->pageParamName.'=(\d+)$'), '', $url);
             $url        = sprintf('%s&amp;%s=%d', $cleanedUrl, $this->pageParamName, $page);
 
         }

Indentation +5 added lines, -5 removed lines

@@ -218,23 +218,23 @@
         }
        
         if (isset($options['firstPageLinkTpl'])) {
-           $this->firstPageLinkTpl = $options['firstPageLinkTpl'];
+            $this->firstPageLinkTpl = $options['firstPageLinkTpl'];
         }
         
         if (isset($options['lastPageLinkTpl'])) {
-           $this->lastPageLinkTpl = $options['lastPageLinkTpl'];
+            $this->lastPageLinkTpl = $options['lastPageLinkTpl'];
         }
         
         if (isset($options['layoutTpl'])) {
-           $this->layoutTpl = $options['layoutTpl'];
+            $this->layoutTpl = $options['layoutTpl'];
         }
         
         if (isset($options['pageParamName'])) {
-           $this->pageParamName = $options['pageParamName'];
+            $this->pageParamName = $options['pageParamName'];
         }
 
         if (isset($options['seoName'])) {
-           $this->seoName = $options['seoName'];
+            $this->seoName = $options['seoName'];
         }
 
         if (isset($options['useRewrite']) && isset($options['rewriteUrl'])) {

phpmyfaq/inc/PMF/String/Basic.php

Spacing +3 added lines, -3 removed lines

@@ -160,7 +160,7 @@ 
      */
     public function strstr($haystack, $needle, $part = false)
     {
-        return strstr($haystack, $needle, (boolean) $part);
+        return strstr($haystack, $needle, (boolean)$part);
     }
     
     /**
@@ -262,7 +262,7 @@ 
      *
      * @return array|string
      */
-    public function preg_replace_callback($pattern, $callback, $subject, $limit= -1, &$count = 0)
+    public function preg_replace_callback($pattern, $callback, $subject, $limit = -1, &$count = 0)
     {
         return preg_replace_callback($pattern, $callback, $subject, $limit, $count);
     }
@@ -278,7 +278,7 @@ 
      *
      * @return array|string|null
      */
-    public function preg_replace($pattern, $replacement, $subject, $limit= -1, &$count = 0)
+    public function preg_replace($pattern, $replacement, $subject, $limit = -1, &$count = 0)
     {
         return preg_replace($pattern, $replacement, $subject, $limit, $count);
     }

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
      * @param string  $needle   Needle
      * @param boolean $part     Part
      *
-     * @return string|false
+     * @return string
      */
     public function strstr($haystack, $needle, $part = false)
     {

phpmyfaq/inc/PMF/Captcha.php

Braces +1 added lines, -2 removed lines

@@ -329,8 +329,7 @@
                 if ($nextline < 1) {
                     $nextline = 2;
                 }
-            }
-            else {
+            } else {
                 $nextline += rand(1, 7);
             }
             $w1 += rand(-4, 4);

Indentation +6 added lines, -6 removed lines

@@ -466,10 +466,10 @@ 
     }
 
     /**
-    * Save the Captcha
-    *
-    * @return   boolean
-    */
+     * Save the Captcha
+     *
+     * @return   boolean
+     */
     private function saveCaptcha()
     {
         $select = sprintf("
@@ -479,8 +479,8 @@ 
                %sfaqcaptcha 
            WHERE 
                id = '%s'",
-           PMF_Db::getTablePrefix(),
-           $this->code
+            PMF_Db::getTablePrefix(),
+            $this->code
         );
         
         $result = $this->_config->getDb()->query($select);

Spacing +14 added lines, -14 removed lines

@@ -217,7 +217,7 @@ 
 
         if (function_exists('imagejpeg')) {
             $response->headers->set('Content-Type', 'image/jpeg');
-            $quality = (int) $this->quality;
+            $quality = (int)$this->quality;
             $response->setCallback(function() use ($img, $quality) {
                 imagejpeg($img, null, $quality);
             });
@@ -268,7 +268,7 @@ 
             $captchaCode = str_replace("0", "O", $captchaCode);
         }
         // Sanity check
-        for ($i = 0; $i < PMF_String::strlen( $captchaCode ); $i++) {
+        for ($i = 0; $i < PMF_String::strlen($captchaCode); $i++) {
             if (!in_array($captchaCode[$i], $this->letters)) {
                 return false;
             }
@@ -362,16 +362,16 @@ 
     {
         $len = PMF_String::strlen($this->code);
         $w1  = 15;
-        $w2  = $this->width / ($len + 1);
+        $w2  = $this->width/($len + 1);
 
         for ($p = 0; $p < $len; $p++) {
             $letter = $this->code[$p];
             if (count($this->fonts) > 0) {
                 $font = $this->fonts[rand(0, count($this->fonts) - 1)];
             }
-            $size = rand(20, $this->height / 2.2);
+            $size = rand(20, $this->height/2.2);
             $rotation = rand(-23, 23);
-            $y   = rand($size + 3, $this->height-5);
+            $y   = rand($size + 3, $this->height - 5);
             // $w1 += rand(- $this->width / 90, $this->width / 40 );
             $x   = $w1 + $w2*$p;
             $c1 = []; // fore char color
@@ -387,28 +387,28 @@ 
             } while ($c1['b'] == $this->_backgroundColor['b']);
             $c1 = imagecolorallocate($this->img, $c1['r'], $c1['g'], $c1['b']);
             do {
-                $c2['r'] = ($c1['r'] < 100 ? $c1['r'] * 2 : mt_rand(30, 199));
+                $c2['r'] = ($c1['r'] < 100 ? $c1['r']*2 : mt_rand(30, 199));
             } while (($c2['r'] == $this->_backgroundColor['r']) && ($c2['r'] == $c1['r']));
             do {
-                $c2['g'] = ($c1['g'] < 100 ? $c1['g'] * 2 : mt_rand(30, 199));
+                $c2['g'] = ($c1['g'] < 100 ? $c1['g']*2 : mt_rand(30, 199));
             } while (($c2['g'] == $this->_backgroundColor['g']) && ($c2['g'] == $c1['g']));
             do {
-                $c2['b'] = ($c1['b'] < 100 ? $c1['b'] * 2 : mt_rand(30, 199));
+                $c2['b'] = ($c1['b'] < 100 ? $c1['b']*2 : mt_rand(30, 199));
             } while (($c2['b'] == $this->_backgroundColor['b']) && ($c2['b'] == $c1['b']));
             $c2 = imagecolorallocate($this->img, $c2['r'], $c2['g'], $c2['b']);
             // Add the letter
             if (function_exists('imagettftext') && (count($this->fonts) > 0)) {
-                imagettftext($this->img, $size, $rotation, $x + 2, $y,     $c2, $font, $letter);
+                imagettftext($this->img, $size, $rotation, $x + 2, $y, $c2, $font, $letter);
                 imagettftext($this->img, $size, $rotation, $x + 1, $y + 1, $c2, $font, $letter);
-                imagettftext($this->img, $size, $rotation, $x,     $y-2,   $c1, $font, $letter);
+                imagettftext($this->img, $size, $rotation, $x, $y - 2, $c1, $font, $letter);
             } else {
                 $size = 5;
                 $c3 = imagecolorallocate($this->img, 0, 0, 255);
                 $x = 20;
                 $y = 12;
                 $s = 30;
-                imagestring($this->img, $size, $x + 1 + ($s * $p), $y+1, $letter, $c3);
-                imagestring($this->img, $size, $x + ($s * $p),     $y,   $letter, $c1);
+                imagestring($this->img, $size, $x + 1 + ($s*$p), $y + 1, $letter, $c3);
+                imagestring($this->img, $size, $x + ($s*$p), $y, $letter, $c1);
             }
         }
 
@@ -468,7 +468,7 @@ 
 
         // Create the captcha code
         for ($i = 1; $i <= $caplength; $i++) {
-            $j = floor(rand(0,34));
+            $j = floor(rand(0, 34));
             $this->code .= $this->letters[$j];
         }
         if (!$this->saveCaptcha()) {
@@ -571,6 +571,6 @@ 
      */
     private function getFonts()
     {
-        return glob(PMF_INCLUDE_DIR . '/fonts/*.ttf');
+        return glob(PMF_INCLUDE_DIR.'/fonts/*.ttf');
     }
 }

phpmyfaq/inc/PMF/Search/Database/Mysqli.php

Spacing +5 added lines, -5 removed lines

@@ -60,9 +60,9 @@ 
         } else {
             $enableRelevance = $this->_config->get('search.enableRelevance');
 
-            $columns    =  $this->getResultColumns();
+            $columns    = $this->getResultColumns();
             $columns   .= ($enableRelevance) ? $this->getMatchingColumnsAsResult($searchTerm) : '';
-            $orderBy    = ($enableRelevance) ? 'ORDER BY ' . $this->getMatchingOrder() . ' DESC' : '';
+            $orderBy    = ($enableRelevance) ? 'ORDER BY '.$this->getMatchingOrder().' DESC' : '';
             $chars      = array(
                 "\xe2\x80\x98",
                 "\xe2\x80\x99",
@@ -140,7 +140,7 @@ 
                 $this->_config->getDb()->escape($searchterm),
                 substr(strstr($matchColumn, '.'), 1));
 
-                $resultColumns .= ', ' . $column;
+                $resultColumns .= ', '.$column;
         }
 
         return $resultColumns;
@@ -160,11 +160,11 @@ 
         $order = '';
 
         foreach ($list as $field) {
-            $string = '(rel_' . $field . '*' . $count .')';
+            $string = '(rel_'.$field.'*'.$count.')';
             if (empty($order)) {
                 $order .= $string;
             } else {
-                $order .= '+' . $string;
+                $order .= '+'.$string;
             }
             $count--;
         }