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);

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Attachment collection class 
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Attachment
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2010-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2010-12-13
- */
+     * Attachment collection class 
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Attachment
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2010-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2010-12-13
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

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);
         

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * File handler class
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Attachment
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2009-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-08-21
- */
+     * File handler class
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Attachment
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2009-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-08-21
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

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);
         }
         

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Attachment handler class for files stored in filesystem 
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Attachment
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2009-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-08-21
- */
+     * Attachment handler class for files stored in filesystem 
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Attachment
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2009-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-08-21
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Language.php

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
@@ -208,12 +208,12 @@ 
     {
         global $languageCodes;
         
-        $search    = array("language_" , ".php");
+        $search    = array("language_", ".php");
         $languages = $languageFiles = array();
         
         $dir = new DirectoryIterator(PMF_LANGUAGE_DIR);
         foreach ($dir as $fileinfo) {
-            if (! $fileinfo->isDot()) {
+            if (!$fileinfo->isDot()) {
                 $languageFiles[] = strtoupper(
                     str_replace($search, '', trim($fileinfo->getFilename()))
                 );
@@ -248,21 +248,21 @@ 
         global $languageCodes;
         
         $onChange  = ($submitOnChange ? ' onchange="this.form.submit();"' : '');
-        $output    = '<select class="language" name="' . $id . '" id="' . $id . '" size="1"' . $onChange . ">\n";
+        $output    = '<select class="language" 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;
@@ -283,24 +283,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;
@@ -335,7 +335,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'
         );
     }
     

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);
             }

Indentation +18 added lines, -18 removed lines

@@ -1,23 +1,23 @@
 <?php
 /**
- * Manages all language stuff
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Language
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Matteo scaramuccia <matteo@phpmyfaq.de>
- * @author    Aurimas Fišeras <aurimas@gmail.com>
- * @copyright 2009-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-05-14
- */
+     * Manages all language stuff
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Language
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Matteo scaramuccia <matteo@phpmyfaq.de>
+     * @author    Aurimas Fišeras <aurimas@gmail.com>
+     * @copyright 2009-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-05-14
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Provides methods for password encryption using hash().
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Enc
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2012-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2012-01-04
- */
+     * Provides methods for password encryption using hash().
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Enc
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2012-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2012-01-04
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

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 +22 added lines, -22 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Pagination handler class
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   PMF_Pagination
- * @author    Anatoliy Belsky <ab@php.net>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2009-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-09-27
- */
+     * Pagination handler class
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   PMF_Pagination
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2009-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-09-27
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -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)
     {

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The string wrapper class using single byte string functions 
- *
- * PHP Version 5.3.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   String
- * @author    Anatoliy Belsky <ab@php.net>
- * @copyright 2009-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2009-04-06
- */
+     * The string wrapper class using single byte string functions 
+     *
+     * PHP Version 5.3.0
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   String
+     * @author    Anatoliy Belsky <ab@php.net>
+     * @copyright 2009-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2009-04-06
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Installer.php

Spacing +48 added lines, -48 removed lines

@@ -389,13 +389,13 @@ 
             PMF_System::renderFooter();
         }
 
-        if (! function_exists('date_default_timezone_set')) {
+        if (!function_exists('date_default_timezone_set')) {
             echo '<p class="alert alert-error">Sorry, but setting a default timezone doesn\'t work in your environment!</p>';
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkDatabase()) {
-            echo '<p class="alert alert-error">No supported database detected! Please install one of the following' .
+        if (!$this->_system->checkDatabase()) {
+            echo '<p class="alert alert-error">No supported database detected! Please install one of the following'.
                 ' database systems and enable the corresponding PHP extension in php.ini:</p>';
             echo '<ul>';
             foreach ($this->_system->getSupportedDatabases() as $database) {
@@ -405,8 +405,8 @@ 
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkRequiredExtensions()) {
-            echo '<p class="alert alert-error">The following extensions are missing! Please enable the PHP extension(s) in ' .
+        if (!$this->_system->checkRequiredExtensions()) {
+            echo '<p class="alert alert-error">The following extensions are missing! Please enable the PHP extension(s) in '.
                 'php.ini.</p>';
             echo '<ul>';
             foreach ($this->_system->getMissingExtensions() as $extension) {
@@ -416,18 +416,18 @@ 
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkRegisterGlobals()) {
+        if (!$this->_system->checkRegisterGlobals()) {
             echo '<p class="alert alert-error">Please disable register_globals!</p>';
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkMagicQuotesGpc()) {
+        if (!$this->_system->checkMagicQuotesGpc()) {
             echo '<p class="alert alert-error">Please disable magic_quotes_gpc!</p>';
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkphpMyFAQInstallation()) {
-            echo '<p class="alert alert-error">It seems you\'re already running a version of phpMyFAQ. Please use the ' .
+        if (!$this->_system->checkphpMyFAQInstallation()) {
+            echo '<p class="alert alert-error">It seems you\'re already running a version of phpMyFAQ. Please use the '.
                 '<a href="update.php">update script</a>.</p>';
             PMF_System::renderFooter();
         }
@@ -440,7 +440,7 @@ 
      */
     public function checkPreUpgrade()
     {
-        if (! $this->checkMinimumPhpVersion()) {
+        if (!$this->checkMinimumPhpVersion()) {
             printf(
                 '<p class="alert alert-error">Sorry, but you need PHP %s or later!</p>',
                 PMF_System::VERSION_MINIMUM_PHP
@@ -448,18 +448,18 @@ 
             PMF_System::renderFooter();
         }
 
-        if (! is_readable(PMF_ROOT_DIR . '/inc/data.php') && ! is_readable(PMF_ROOT_DIR . '/config/database.php')) {
-            echo '<p class="alert alert-error">It seems you never run a version of phpMyFAQ.<br />' .
+        if (!is_readable(PMF_ROOT_DIR.'/inc/data.php') && !is_readable(PMF_ROOT_DIR.'/config/database.php')) {
+            echo '<p class="alert alert-error">It seems you never run a version of phpMyFAQ.<br />'.
                 'Please use the <a href="setup.php">install script</a>.</p>';
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkRegisterGlobals()) {
+        if (!$this->_system->checkRegisterGlobals()) {
             echo '<p class="alert alert-error">Please disable register_globals!</p>';
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkMagicQuotesGpc()) {
+        if (!$this->_system->checkMagicQuotesGpc()) {
             echo '<p class="alert alert-error">Please disable magic_quotes_gpc!</p>';
             PMF_System::renderFooter();
         }
@@ -502,7 +502,7 @@ 
                 echo "<li>$dir</li>\n";
             }
             printf(
-                '</ul><p class="alert alert-error">Please create %s manually and/or change access to chmod 775 (or ' .
+                '</ul><p class="alert alert-error">Please create %s manually and/or change access to chmod 775 (or '.
                     'greater if necessary).</p>',
                 (1 < $numDirs) ? 'them' : 'it'
             );
@@ -519,26 +519,26 @@ 
     public function checkNoncriticalSettings()
     {
         if ((@ini_get('safe_mode') == 'On' || @ini_get('safe_mode') === 1)) {
-            echo '<p class="alert alert-error">The PHP safe mode is enabled. You may have problems when phpMyFAQ tries to write ' .
+            echo '<p class="alert alert-error">The PHP safe mode is enabled. You may have problems when phpMyFAQ tries to write '.
                 ' in some directories.</p>';
         }
-        if (! extension_loaded('gd')) {
-            echo '<p class="alert alert-error">You don\'t have GD support enabled in your PHP installation. Please enable GD ' .
+        if (!extension_loaded('gd')) {
+            echo '<p class="alert alert-error">You don\'t have GD support enabled in your PHP installation. Please enable GD '.
                 'support in your php.ini file otherwise you can\'t use Captchas for spam protection.</p>';
         }
-        if (! function_exists('imagettftext')) {
-            echo '<p class="alert alert-error">You don\'t have Freetype support enabled in the GD extension of your PHP ' .
-                'installation. Please enable Freetype support in GD extension otherwise the Captchas for spam ' .
+        if (!function_exists('imagettftext')) {
+            echo '<p class="alert alert-error">You don\'t have Freetype support enabled in the GD extension of your PHP '.
+                'installation. Please enable Freetype support in GD extension otherwise the Captchas for spam '.
                 'protection will be quite easy to break.</p>';
         }
-        if (! extension_loaded('curl') || ! extension_loaded('openssl')) {
-            echo '<p class="alert alert-error">You don\'t have cURL and/or OpenSSL support enabled in your PHP installation. ' .
-                'Please enable cURL and/or OpenSSL support in your php.ini file otherwise you can\'t use the Twitter ' .
+        if (!extension_loaded('curl') || !extension_loaded('openssl')) {
+            echo '<p class="alert alert-error">You don\'t have cURL and/or OpenSSL support enabled in your PHP installation. '.
+                'Please enable cURL and/or OpenSSL support in your php.ini file otherwise you can\'t use the Twitter '.
                 ' support.</p>';
         }
-        if (! extension_loaded('fileinfo')) {
-            echo '<p class="alert alert-error">You don\'t have Fileinfo support enabled in your PHP installation. ' .
-                'Please enable Fileinfo support in your php.ini file otherwise you can\'t use our backup/restore ' .
+        if (!extension_loaded('fileinfo')) {
+            echo '<p class="alert alert-error">You don\'t have Fileinfo support enabled in your PHP installation. '.
+                'Please enable Fileinfo support in your php.ini file otherwise you can\'t use our backup/restore '.
                 'functionality.</p>';
         }
     }
@@ -573,7 +573,7 @@ 
         $dbSetup['dbType'] = PMF_Filter::filterInput(INPUT_POST, 'sql_type', FILTER_SANITIZE_STRING);
         if (!is_null($dbSetup['dbType'])) {
             $dbSetup['dbType'] = trim($dbSetup['dbType']);
-            if (! file_exists(PMF_ROOT_DIR . '/install/' . $dbSetup['dbType'] . '.sql.php')) {
+            if (!file_exists(PMF_ROOT_DIR.'/install/'.$dbSetup['dbType'].'.sql.php')) {
                 printf(
                     '<p class="alert alert-error"><strong>Error:</strong> Invalid server type: %s</p>',
                     $dbSetup['dbType']
@@ -586,25 +586,25 @@ 
         }
 
         $dbSetup['dbServer'] = PMF_Filter::filterInput(INPUT_POST, 'sql_server', FILTER_SANITIZE_STRING);
-        if (is_null($dbSetup['dbServer']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbServer']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             echo "<p class=\"alert alert-error\"><strong>Error:</strong> Please add a database server.</p>\n";
             PMF_System::renderFooter(true);
         }
 
         $dbSetup['dbUser'] = PMF_Filter::filterInput(INPUT_POST, 'sql_user', FILTER_SANITIZE_STRING);
-        if (is_null($dbSetup['dbUser']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbUser']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             echo "<p class=\"alert alert-error\"><strong>Error:</strong> Please add a database username.</p>\n";
             PMF_System::renderFooter(true);
         }
 
         $dbSetup['dbPassword'] = PMF_Filter::filterInput(INPUT_POST, 'sql_passwort', FILTER_UNSAFE_RAW);
-        if (is_null($dbSetup['dbPassword']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbPassword']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             // Password can be empty...
             $dbSetup['dbPassword'] = '';
         }
 
         $dbSetup['dbDatabaseName'] = PMF_Filter::filterInput(INPUT_POST, 'sql_db', FILTER_SANITIZE_STRING);
-        if (is_null($dbSetup['dbDatabaseName']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbDatabaseName']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             echo "<p class=\"alert alert-error\"><strong>Error:</strong> Please add a database name.</p>\n";
             PMF_System::renderFooter(true);
         }
@@ -658,7 +658,7 @@ 
             $ldapSetup['ldapPassword'] = PMF_Filter::filterInput(INPUT_POST, 'ldap_password', FILTER_SANITIZE_STRING, '');
 
             // check LDAP connection
-            require PMF_ROOT_DIR . "/inc/PMF/Ldap.php";
+            require PMF_ROOT_DIR."/inc/PMF/Ldap.php";
             $ldap = new PMF_Ldap($configuration);
             $ldap->connect(
                 $ldapSetup['ldapServer'],
@@ -668,7 +668,7 @@ 
                 $ldapSetup['ldapPassword']
             );
             if (!$ldap) {
-                echo "<p class=\"alert alert-error\"><strong>LDAP Error:</strong> " . $ldap->error() . "</p>\n";
+                echo "<p class=\"alert alert-error\"><strong>LDAP Error:</strong> ".$ldap->error()."</p>\n";
                 PMF_System::renderFooter(true);
             }
         }
@@ -694,12 +694,12 @@ 
         }
 
         if (strlen($password) <= 5 || strlen($password_retyped) <= 5) {
-            echo '<p class="alert alert-error"><strong>Error:</strong> Your password and retyped password are too short.' .
+            echo '<p class="alert alert-error"><strong>Error:</strong> Your password and retyped password are too short.'.
                 ' Please set your password and your retyped password with a minimum of 6 characters.</p>';
             PMF_System::renderFooter(true);
         }
         if ($password != $password_retyped) {
-            echo '<p class="alert alert-error"><strong>Error:</strong> Your password and retyped password are not equal.' .
+            echo '<p class="alert alert-error"><strong>Error:</strong> Your password and retyped password are not equal.'.
                 ' Please check your password and your retyped password.</p>';
             PMF_System::renderFooter(true);
         }
@@ -713,7 +713,7 @@ 
         $instanceSetup->setRootDir(PMF_ROOT_DIR);
 
         // Write the DB variables in database.php
-        if (! $instanceSetup->createDatabaseFile($dbSetup)) {
+        if (!$instanceSetup->createDatabaseFile($dbSetup)) {
             echo "<p class=\"alert alert-error\"><strong>Error:</strong> Setup cannot write to ./config/database.php.</p>";
             $this->_system->cleanInstallation();
             PMF_System::renderFooter(true);
@@ -721,7 +721,7 @@ 
 
         // check LDAP if available
         if (extension_loaded('ldap') && !is_null($ldapEnabled)) {
-            if (! $instanceSetup->createLdapFile($ldapSetup, '')) {
+            if (!$instanceSetup->createLdapFile($ldapSetup, '')) {
                 echo "<p class=\"alert alert-error\"><strong>Error:</strong> Setup cannot write to ./config/ldap.php.</p>";
                 $this->_system->cleanInstallation();
                 PMF_System::renderFooter(true);
@@ -729,7 +729,7 @@ 
         }
 
         // connect to the database using config/database.php
-        require PMF_ROOT_DIR . '/config/database.php';
+        require PMF_ROOT_DIR.'/config/database.php';
         $db = PMF_Db::factory($dbSetup['dbType']);
         $db->connect($DB['server'], $DB['user'], $DB['password'], $DB['db']);
         if (!$db) {
@@ -738,15 +738,15 @@ 
             PMF_System::renderFooter(true);
         }
 
-        require PMF_ROOT_DIR . '/install/' . $dbSetup['dbType'] . '.sql.php'; // CREATE TABLES
-        require PMF_ROOT_DIR . '/install/stopwords.sql.php';  // INSERTs for stopwords
+        require PMF_ROOT_DIR.'/install/'.$dbSetup['dbType'].'.sql.php'; // CREATE TABLES
+        require PMF_ROOT_DIR.'/install/stopwords.sql.php'; // INSERTs for stopwords
 
         $this->_system->setDatabase($db);
 
         echo '<p>';
 
         // Erase any table before starting creating the required ones
-        if (! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (!PMF_System::isSqlite($dbSetup['dbType'])) {
             $this->_system->dropTables($uninst);
         }
 
@@ -765,7 +765,7 @@ 
             }
             usleep(2500);
             $count++;
-            if (!($count % 10)) {
+            if (!($count%10)) {
                 echo '| ';
             }
         }
@@ -787,8 +787,8 @@ 
 
         // add admin account and rights
         $admin = new PMF_User($configuration);
-        if (! $admin->createUser($loginname, $password, 1)) {
-            echo "<p class=\"alert alert-error\"><strong>Fatal installation error:</strong> " .
+        if (!$admin->createUser($loginname, $password, 1)) {
+            echo "<p class=\"alert alert-error\"><strong>Fatal installation error:</strong> ".
                 "Couldn't create the admin user.</p>\n";
             $this->_system->cleanInstallation();
             PMF_System::renderFooter(true);
@@ -812,7 +812,7 @@ 
         $instanceData = array(
             'url'      => $link->getSystemUri($_SERVER['SCRIPT_NAME']),
             'instance' => $link->getSystemRelativeUri('install/setup.php'),
-            'comment'  => 'phpMyFAQ ' . PMF_System::getVersion()
+            'comment'  => 'phpMyFAQ '.PMF_System::getVersion()
         );
         $faqInstance = new PMF_Instance($configuration);
         $faqInstance->addInstance($instanceData);
@@ -837,7 +837,7 @@ 
             echo "<p class=\"alert alert-error\">Please delete the file <em>./install/setup.php</em> manually.</p>\n";
         }
         // Remove 'update.php' file
-        if (@unlink(dirname($_SERVER['PATH_TRANSLATED']) . '/update.php')) {
+        if (@unlink(dirname($_SERVER['PATH_TRANSLATED']).'/update.php')) {
             echo "<p class=\"alert alert-success\">The file <em>./install/update.php</em> was deleted automatically.</p>\n";
         } else {
             echo "<p class=\"alert alert-error\">Please delete the file <em>./install/update.php</em> manually.</p>\n";
@@ -853,7 +853,7 @@ 
     {
         $q = new PMF_Questionnaire_Data($this->_mainConfig);
         $options = $q->get();
-        echo '<dl>' . PHP_EOL;
+        echo '<dl>'.PHP_EOL;
         array_walk($options, 'data_printer');
         printf(
             '</dl><input type="hidden" name="systemdata" value="%s" />',

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The Installer class installs phpMyFAQ. Classy.
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   Installer
- * @author    Florian Anderiasch <florian@phpmyfaq.net>
- * @copyright 2002-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2012-08-27
- */
+     * The Installer class installs phpMyFAQ. Classy.
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   Installer
+     * @author    Florian Anderiasch <florian@phpmyfaq.net>
+     * @copyright 2002-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2012-08-27
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/Captcha.php

Spacing +13 added lines, -13 removed lines

@@ -255,7 +255,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;
             }
@@ -349,16 +349,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 = array(); // fore char color
@@ -374,28 +374,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);
             }
         }
 
@@ -455,7 +455,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()) {
@@ -573,6 +573,6 @@ 
      */
     private function getFonts()
     {
-        return glob(PMF_INCLUDE_DIR . '/fonts/*.ttf');
+        return glob(PMF_INCLUDE_DIR.'/fonts/*.ttf');
     }
 }

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 +24 added lines, -24 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 /**
- * The phpMyFAQ Captcha class
- *
- * PHP Version 5.3
- *
- * This Source Code Form is subject to the terms of the Mozilla Public License,
- * v. 2.0. If a copy of the MPL was not distributed with this file, You can
- * obtain one at http://mozilla.org/MPL/2.0/.
- *
- * @category  phpMyFAQ
- * @package   PMF_Captcha
- * @author    Thomas Zeithaml <seo@annatom.de>
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
- * @copyright 2006-2016 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2006-02-04
- */
+     * The phpMyFAQ Captcha class
+     *
+     * PHP Version 5.3
+     *
+     * This Source Code Form is subject to the terms of the Mozilla Public License,
+     * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+     * obtain one at http://mozilla.org/MPL/2.0/.
+     *
+     * @category  phpMyFAQ
+     * @package   PMF_Captcha
+     * @author    Thomas Zeithaml <seo@annatom.de>
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @author    Matteo Scaramuccia <matteo@scaramuccia.com>
+     * @copyright 2006-2016 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2006-02-04
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();
@@ -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);