thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Instance/Master.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * The main phpMyFAQ instances class for instance masters
- *
- * 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_Instance
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2012-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2012-03-31
- */
+     * The main phpMyFAQ instances class for instance masters
+     *
+     * 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_Instance
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2012-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2012-03-31
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

phpmyfaq/inc/PMF/String/Abstract.php

Indentation +24 added lines, -24 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 /**
- * Abstract parent for the string wrapper classes 
- *
- * 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-2015 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
- */
+     * Abstract parent for the string wrapper classes 
+     *
+     * 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-2015 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();
@@ -73,14 +73,14 @@ 
             return mb_detect_encoding($str, 'UTF-8', true);
         } else {
             $regex = '/^([\x00-\x7f]|'
-                   . '[\xc2-\xdf][\x80-\xbf]|'
-                   . '\xe0[\xa0-\xbf][\x80-\xbf]|'
-                   . '[\xe1-\xec][\x80-\xbf]{2}|'
-                   . '\xed[\x80-\x9f][\x80-\xbf]|'
-                   . '[\xee-\xef][\x80-\xbf]{2}|'
-                   . '\xf0[\x90-\xbf][\x80-\xbf]{2}|'
-                   . '[\xf1-\xf3][\x80-\xbf]{3}|'
-                   . '\xf4[\x80-\x8f][\x80-\xbf]{2})*$/';
+                    . '[\xc2-\xdf][\x80-\xbf]|'
+                    . '\xe0[\xa0-\xbf][\x80-\xbf]|'
+                    . '[\xe1-\xec][\x80-\xbf]{2}|'
+                    . '\xed[\x80-\x9f][\x80-\xbf]|'
+                    . '[\xee-\xef][\x80-\xbf]{2}|'
+                    . '\xf0[\x90-\xbf][\x80-\xbf]{2}|'
+                    . '[\xf1-\xf3][\x80-\xbf]{3}|'
+                    . '\xf4[\x80-\x8f][\x80-\xbf]{2})*$/';
             return preg_match($regex, $str) === 1;
         }
     }

phpmyfaq/inc/PMF/String/Basic.php

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

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/Installer.php

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

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" />',

phpmyfaq/inc/PMF/Captcha.php

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

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

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * phpMyFAQ MySQL (ext/mysql) search classes
- *
- * 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_Search_Database
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2010-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2010-06-06
- */
+     * phpMyFAQ MySQL (ext/mysql) search classes
+     *
+     * 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_Search_Database
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2010-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2010-06-06
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

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

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * phpMyFAQ SQlite based search classes
- *
- * 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_Search_Database
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2012-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2012-12-26
- */
+     * phpMyFAQ SQlite based search classes
+     *
+     * 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_Search_Database
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2012-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2012-12-26
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * phpMyFAQ MySQL (ext/mysqli) search classes
- *
- * 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_Search_Database
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2010-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2010-06-06
- */
+     * phpMyFAQ MySQL (ext/mysqli) search classes
+     *
+     * 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_Search_Database
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2010-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2010-06-06
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();

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

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

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * phpMyFAQ SQlite based search classes
- *
- * 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_Search_Database
- * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
- * @copyright 2010-2015 phpMyFAQ Team
- * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
- * @link      http://www.phpmyfaq.de
- * @since     2010-07-05
- */
+     * phpMyFAQ SQlite based search classes
+     *
+     * 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_Search_Database
+     * @author    Thorsten Rinne <thorsten@phpmyfaq.de>
+     * @copyright 2010-2015 phpMyFAQ Team
+     * @license   http://www.mozilla.org/MPL/2.0/ Mozilla Public License Version 2.0
+     * @link      http://www.phpmyfaq.de
+     * @since     2010-07-05
+     */
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     exit();