thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Filter.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
      *
      * @return mixed
      */
-    public static function filterInput ($type, $variableName, $filter, $default = null)
+    public static function filterInput($type, $variableName, $filter, $default = null)
     {
         $return = filter_input($type, $variableName, $filter);
         return (is_null($return) || $return === false) ? $default : $return;
@@ -58,7 +58,7 @@ 
      *
      * @return mixed
      */
-    public static function filterInputArray ($type, Array $definition)
+    public static function filterInputArray($type, Array $definition)
     {
         return filter_input_array($type, $definition);
     }
@@ -72,7 +72,7 @@ 
      *
      * @return mixed
      */
-    public static function filterVar ($variable, $filter, $default = null)
+    public static function filterVar($variable, $filter, $default = null)
     {
         $return = filter_var($variable, $filter);
         return ($return === false) ? $default : $return;
@@ -88,7 +88,7 @@ 
         $urlData      = [];
         $cleanUrlData = [];
 
-        if (! isset($_SERVER['QUERY_STRING'])) {
+        if (!isset($_SERVER['QUERY_STRING'])) {
             return '';
         }
 

phpmyfaq/inc/PMF/Session.php

Indentation +2 added lines, -2 removed lines

@@ -175,8 +175,8 @@
         $result = $this->_config->getDb()->query($query);
 
         if ($result) {
-        	$res       = $this->_config->getDb()->fetchObject($result);
-        	$timestamp = $res->time;
+            $res       = $this->_config->getDb()->fetchObject($result);
+            $timestamp = $res->time;
         }
 
         return $timestamp;

Spacing +11 added lines, -11 removed lines

@@ -111,7 +111,7 @@ 
 
             if (0 == $bots && false == $banned) {
                 if (!isset($sid)) {
-                    $sid = $this->_config->getDb()->nextId(PMF_Db::getTablePrefix() . 'faqsessions', 'sid');
+                    $sid = $this->_config->getDb()->nextId(PMF_Db::getTablePrefix().'faqsessions', 'sid');
                     // Sanity check: force the session cookie to contains the current $sid
                     if (!is_null($sidc) && (!$sidc != $sid)) {
                         self::setCookie(self::PMF_COOKIE_NAME_SESSIONID, $sid);
@@ -132,20 +132,20 @@ 
                     $this->_config->getDb()->query($query);
                 }
 
-                $data = $sid.';' . 
-                        str_replace(';', ',', $action) . ';' . 
-                        $id . ';' . 
-                        $remoteAddr . ';' .
-                        str_replace(';', ',', isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '') . ';' .
-                        str_replace(';', ',', isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '') . ';' . 
-                        str_replace(';', ',', urldecode($_SERVER['HTTP_USER_AGENT'])) . ';' . 
-                        $_SERVER['REQUEST_TIME'] . ";\n";
-                $file = './data/tracking' . date('dmY');
+                $data = $sid.';'. 
+                        str_replace(';', ',', $action).';'. 
+                        $id.';'. 
+                        $remoteAddr.';'.
+                        str_replace(';', ',', isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '').';'.
+                        str_replace(';', ',', isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '').';'. 
+                        str_replace(';', ',', urldecode($_SERVER['HTTP_USER_AGENT'])).';'. 
+                        $_SERVER['REQUEST_TIME'].";\n";
+                $file = './data/tracking'.date('dmY');
 
                 if (is_writeable($file)) {
                     file_put_contents($file, $data, FILE_APPEND);
                 } else {
-                    throw new PMF_Exception('Cannot write to ' . $file);
+                    throw new PMF_Exception('Cannot write to '.$file);
                 }
             }
         }

phpmyfaq/inc/PMF/HttpStreamer.php

Spacing +2 added lines, -2 removed lines

@@ -207,7 +207,7 @@ 
 
         // Set the correct HTTP headers:
         // 1. Prevent proxies&browsers caching
-        $this->response->headers->set("Last-Modified", gmdate("D, d M Y H:i:s") . " GMT");
+        $this->response->headers->set("Last-Modified", gmdate("D, d M Y H:i:s")." GMT");
         $this->response->headers->set("Expires", "0");
         $this->response->headers->set("Cache-Control", "private, no-store, no-cache, must-revalidate, post-check=0, pre-check=0");
         $this->response->headers->set("Pragma", "no-cache");
@@ -220,7 +220,7 @@ 
             $this->response->headers->set("Content-Type", $mimeType);
         }
         // RFC2616, �19.5.1: $filename must be a quoted-string
-        $this->response->headers->set("Content-Disposition", $this->disposition."; filename=\"" . PMF_Export::getExportTimestamp() . "_" . $filename."\"");
+        $this->response->headers->set("Content-Disposition", $this->disposition."; filename=\"".PMF_Export::getExportTimestamp()."_".$filename."\"");
         if (!empty($description)) {
             $this->response->headers->set("Content-Description", $description);
         }

phpmyfaq/inc/PMF/System.php

Spacing +9 added lines, -9 removed lines

@@ -154,9 +154,9 @@ 
     {
         $templates = [];
 
-        foreach (new DirectoryIterator(PMF_ROOT_DIR . '/assets/template') as $item) {
+        foreach (new DirectoryIterator(PMF_ROOT_DIR.'/assets/template') as $item) {
             $basename = $item->getBasename();
-            if (! $item->isDot() && $item->isDir()) {
+            if (!$item->isDot() && $item->isDir()) {
                 $templates[$basename] = (PMF_Template::getTplSetName() === $basename ? true : false);
             }
         }
@@ -307,7 +307,7 @@ 
      */
     public function checkphpMyFAQInstallation()
     {
-        if (is_file(PMF_ROOT_DIR . '/config/database.php')) {
+        if (is_file(PMF_ROOT_DIR.'/config/database.php')) {
             return false;
         } else {
             return true;
@@ -367,7 +367,7 @@ 
             foreach ($files as $file) {
 
             if ('php' === pathinfo($file->getFilename(), PATHINFO_EXTENSION) &&
-                ! preg_match('#/tests/#', $file->getPath())
+                !preg_match('#/tests/#', $file->getPath())
             ) {
                 $current = str_replace($path, '', $file->getPathname());
 
@@ -379,7 +379,7 @@ 
             }
 
         } catch (UnexpectedValueException $e) {
-            $hashes[$current . ' failed'] = $e->getMessage();
+            $hashes[$current.' failed'] = $e->getMessage();
         }
 
         return json_encode($hashes);
@@ -409,12 +409,12 @@ 
     public function cleanInstallation()
     {
         // Remove './config/database.php' file: no need of prompt anything to the user
-        if (file_exists(PMF_ROOT_DIR . '/config/database.php')) {
-            @unlink(PMF_ROOT_DIR . '/config/database.php');
+        if (file_exists(PMF_ROOT_DIR.'/config/database.php')) {
+            @unlink(PMF_ROOT_DIR.'/config/database.php');
         }
         // Remove './config/ldap.php' file: no need of prompt anything to the user
-        if (file_exists(PMF_ROOT_DIR . '/config/ldap.php')) {
-            @unlink(PMF_ROOT_DIR . '/config/ldap.php');
+        if (file_exists(PMF_ROOT_DIR.'/config/ldap.php')) {
+            @unlink(PMF_ROOT_DIR.'/config/ldap.php');
         }
     }
 

phpmyfaq/inc/PMF/Ldap.php

Spacing +8 added lines, -8 removed lines

@@ -106,7 +106,7 @@ 
         $this->base = $ldapBase;
         $this->ds   = ldap_connect($ldapServer, $ldapPort);
 
-        if (! $this->ds) {
+        if (!$this->ds) {
             $this->error = sprintf(
                 'Unable to connect to LDAP server (Error: %s)',
                 ldap_error($this->ds)
@@ -118,7 +118,7 @@ 
         // optionally set Bind version
         if (isset($this->_ldapConfig['ldap_options'])) {
             foreach ($this->_ldapConfig['ldap_options'] as $key => $value) {
-                if (! ldap_set_option($this->ds, constant($key), $value)) {
+                if (!ldap_set_option($this->ds, constant($key), $value)) {
                     $this->errno = ldap_errno($this->ds);
                     $this->error = sprintf(
                         'Unable to set LDAP option "%s" to "%s" (Error: %s).',
@@ -137,7 +137,7 @@ 
             $ldapBind = ldap_bind($this->ds, $ldapUser, $ldapPassword);
         }
 
-        if (! $ldapBind) {
+        if (!$ldapBind) {
             $this->errno = ldap_errno($this->ds);
             $this->error = sprintf(
                 'Unable to bind to LDAP server (Error: %s).',
@@ -209,7 +209,7 @@ 
      *
      * @return string
      */
-    private function getLdapData ($username, $data)
+    private function getLdapData($username, $data)
     {
         if (!array_key_exists($data, $this->_ldapConfig['ldap_mapping'])) {
             $this->error = sprintf(
@@ -274,7 +274,7 @@ 
         );
         $sr = ldap_search($this->ds, $this->base, $filter);
 
-        if (! $sr) {
+        if (!$sr) {
             $this->errno = ldap_errno($this->ds);
             $this->error = sprintf(
                 'Unable to search for "%s" (Error: %s)',
@@ -285,7 +285,7 @@ 
 
         $entryId = ldap_first_entry($this->ds, $sr);
 
-        if (! $entryId) {
+        if (!$entryId) {
             $this->errno = ldap_errno($this->ds);
             $this->error = sprintf(
                 'Cannot get the value(s). Error: %s',
@@ -306,8 +306,8 @@ 
     public function quote($string)
     {
         return str_replace(
-            array( '\\', ' ', '*', '(', ')' ),
-            array( '\\5c', '\\20', '\\2a', '\\28', '\\29' ),
+            array('\\', ' ', '*', '(', ')'),
+            array('\\5c', '\\20', '\\2a', '\\28', '\\29'),
             $string
         );
     }

phpmyfaq/ajaxresponse.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 if (PMF_Language::isASupportedLanguage($ajaxLanguage)) {
     $languageCode = trim($ajaxLanguage);
-    require_once 'lang/language_' . $languageCode . '.php';
+    require_once 'lang/language_'.$languageCode.'.php';
 } else {
     $languageCode = 'en';
     require_once 'lang/language_en.php';

phpmyfaq/main.php

Spacing +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@ 
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     $protocol = 'http';
-    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON'){
+    if (isset($_SERVER['HTTPS']) && strtoupper($_SERVER['HTTPS']) === 'ON') {
         $protocol = 'https';
     }
-    header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['SCRIPT_NAME']));
+    header('Location: '.$protocol.'://'.$_SERVER['HTTP_HOST'].dirname($_SERVER['SCRIPT_NAME']));
     exit();
 }
 
@@ -37,9 +37,9 @@ 
     $showAllNews      = sprintf('<a href="?%s">%s</a>', $sids, $PMF_LANG['newsShowCurrent']);
     $archived         = true;
 } else {
-    $writeNewsHeader .= ' ' . $PMF_LANG['msgNews'];
+    $writeNewsHeader .= ' '.$PMF_LANG['msgNews'];
     if ($faqConfig->get('main.enableRssFeeds')) {
-        $writeNewsRSS = '&nbsp;<a href="feed/news/rss.php" target="_blank">' .
+        $writeNewsRSS = '&nbsp;<a href="feed/news/rss.php" target="_blank">'.
             '<i class="fa fa-rss"></i></a>';
     }
     $showAllNews = sprintf('<a href="?%snewsid=0">%s</a>', $sids, $PMF_LANG['newsShowArchive']);

phpmyfaq/setup/update.php

Indentation +7 added lines, -7 removed lines

@@ -104,8 +104,8 @@ 
                 if (version_compare($version, '2.8.0-alpha2', '>=')) {
                     if (! $faqConfig->get('main.maintenanceMode')) {
                         echo '<p class="alert alert-warning"><strong>Warning!</strong> Your phpMyFAQ installation is ' .
-                             'not in maintenance mode, you should enable the maintenance mode in your administration ' .
-                             'backend before running the update!</p>';
+                                'not in maintenance mode, you should enable the maintenance mode in your administration ' .
+                                'backend before running the update!</p>';
                     }
                 }
                 ?>
@@ -213,7 +213,7 @@ 
     if (file_exists(PMF_ROOT_DIR . '/config/database.php')) {
         if (!copy(PMF_ROOT_DIR . '/config/database.php', PMF_ROOT_DIR . '/config/database.bak.php')) {
             echo "<p class=\"alert alert-danger\"><strong>Error:</strong> The backup file ../config/database.bak.php " .
-                  "could not be written. Please correct this!</p>";
+                    "could not be written. Please correct this!</p>";
         } else {
             $checkDatabaseSetupFile = true;
         }
@@ -223,7 +223,7 @@ 
     if (file_exists(PMF_ROOT_DIR . '/config/ldap.php')) {
         if (!copy(PMF_ROOT_DIR . '/config/ldap.php', PMF_ROOT_DIR . '/config/ldap.bak.php')) {
             echo "<p class=\"alert alert-error\"><strong>Error:</strong> The backup file ../config/ldap.bak.php " .
-                  "could not be written. Please correct this!</p>";
+                    "could not be written. Please correct this!</p>";
         } else {
             $checkLdapSetupFile = true;
         }
@@ -665,8 +665,8 @@ 
             if (!$result) {
                 echo "</div>";
                 echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ ' .
-                      'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.' .
-                      '</p>';
+                        'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.' .
+                        '</p>';
                 printf(
                     '<p class="alert alert-danger"><strong>DB error:</strong> %s</p>',
                     $faqConfig->getDb()->error()
@@ -833,7 +833,7 @@ 
             printf('<span title="%s">.</span>', $executeQuery);
             if (!$result) {
                 echo '<p class="alert alert-danger"><strong>Error:</strong> Please install your version of phpMyFAQ once again ' .
-                      'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
+                        'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
                 printf('<p class="error"><strong>DB error:</strong> %s</p>', $faqConfig->getDb()->error());
                 printf('<code>%s</code>', htmlentities($executeQuery));
                 PMF_System::renderFooter();

Spacing +123 added lines, -123 removed lines

@@ -31,20 +31,20 @@ 
     die("Sorry, but you need PHP 5.4.4 or later!"); // Die hard because of "use"
 }
 
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 $step    = PMF_Filter::filterInput(INPUT_GET, 'step', FILTER_VALIDATE_INT, 1);
 $version = PMF_Filter::filterInput(INPUT_POST, 'version', FILTER_SANITIZE_STRING);
 $query   = [];
 
 if (file_exists(PMF_ROOT_DIR.'/inc/data.php')) {
-    require PMF_ROOT_DIR . '/inc/data.php'; // before 2.6.0-alpha
+    require PMF_ROOT_DIR.'/inc/data.php'; // before 2.6.0-alpha
 } else {
-    if (!file_exists(PMF_ROOT_DIR . '/config/database.php')) {
+    if (!file_exists(PMF_ROOT_DIR.'/config/database.php')) {
         header("Location: setup.php");
         exit();
     }
-    require PMF_ROOT_DIR . '/config/database.php'; // after 2.6.0-alpha
+    require PMF_ROOT_DIR.'/config/database.php'; // after 2.6.0-alpha
 }
 ?>
 <!doctype html>
@@ -102,9 +102,9 @@ 
                 <?php
                 $version = $faqConfig->get('main.currentVersion');
                 if (version_compare($version, '2.8.0-alpha2', '>=')) {
-                    if (! $faqConfig->get('main.maintenanceMode')) {
-                        echo '<p class="alert alert-warning"><strong>Warning!</strong> Your phpMyFAQ installation is ' .
-                             'not in maintenance mode, you should enable the maintenance mode in your administration ' .
+                    if (!$faqConfig->get('main.maintenanceMode')) {
+                        echo '<p class="alert alert-warning"><strong>Warning!</strong> Your phpMyFAQ installation is '.
+                             'not in maintenance mode, you should enable the maintenance mode in your administration '.
                              'backend before running the update!</p>';
                     }
                 }
@@ -210,9 +210,9 @@ 
 
     // The backup an existing config/database.php
     // 2.6+ updates
-    if (file_exists(PMF_ROOT_DIR . '/config/database.php')) {
-        if (!copy(PMF_ROOT_DIR . '/config/database.php', PMF_ROOT_DIR . '/config/database.bak.php')) {
-            echo "<p class=\"alert alert-danger\"><strong>Error:</strong> The backup file ../config/database.bak.php " .
+    if (file_exists(PMF_ROOT_DIR.'/config/database.php')) {
+        if (!copy(PMF_ROOT_DIR.'/config/database.php', PMF_ROOT_DIR.'/config/database.bak.php')) {
+            echo "<p class=\"alert alert-danger\"><strong>Error:</strong> The backup file ../config/database.bak.php ".
                   "could not be written. Please correct this!</p>";
         } else {
             $checkDatabaseSetupFile = true;
@@ -220,9 +220,9 @@ 
     }
 
     // The backup an existing LDAP configuration file
-    if (file_exists(PMF_ROOT_DIR . '/config/ldap.php')) {
-        if (!copy(PMF_ROOT_DIR . '/config/ldap.php', PMF_ROOT_DIR . '/config/ldap.bak.php')) {
-            echo "<p class=\"alert alert-error\"><strong>Error:</strong> The backup file ../config/ldap.bak.php " .
+    if (file_exists(PMF_ROOT_DIR.'/config/ldap.php')) {
+        if (!copy(PMF_ROOT_DIR.'/config/ldap.php', PMF_ROOT_DIR.'/config/ldap.bak.php')) {
+            echo "<p class=\"alert alert-error\"><strong>Error:</strong> The backup file ../config/ldap.bak.php ".
                   "could not be written. Please correct this!</p>";
         } else {
             $checkLdapSetupFile = true;
@@ -328,32 +328,32 @@ 
         $faqConfig->add('socialnetworks.enableFacebookSupport', 'false');
 
         // Migrate faqquestion table to new structure
-        switch($DB['type']) {
+        switch ($DB['type']) {
             case 'pgsql':
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions RENAME COLUMN ask_username TO username";
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions RENAME COLUMN ask_usermail TO email";
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions RENAME COLUMN ask_rubrik TO category_id";
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions RENAME COLUMN ask_content TO question";
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions RENAME COLUMN ask_date TO created";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions RENAME COLUMN ask_username TO username";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions RENAME COLUMN ask_usermail TO email";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions RENAME COLUMN ask_rubrik TO category_id";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions RENAME COLUMN ask_content TO question";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions RENAME COLUMN ask_date TO created";
                 break;
             case 'mssql':
             case 'sqlsrv':
-                $query[] = "EXEC sp_RENAME '" . PMF_Db::getTablePrefix() . "faqquestions.ask_username', 'username', 'COLUMN'";
-                $query[] = "EXEC sp_RENAME '" . PMF_Db::getTablePrefix() . "faqquestions.ask_usermail', 'email', 'COLUMN'";
-                $query[] = "EXEC sp_RENAME '" . PMF_Db::getTablePrefix() . "faqquestions.ask_rubrik', 'category_id', 'COLUMN'";
-                $query[] = "EXEC sp_RENAME '" . PMF_Db::getTablePrefix() . "faqquestions.ask_content', 'question', 'COLUMN'";
-                $query[] = "EXEC sp_RENAME '" . PMF_Db::getTablePrefix() . "faqquestions.ask_date', 'created', 'COLUMN'";
+                $query[] = "EXEC sp_RENAME '".PMF_Db::getTablePrefix()."faqquestions.ask_username', 'username', 'COLUMN'";
+                $query[] = "EXEC sp_RENAME '".PMF_Db::getTablePrefix()."faqquestions.ask_usermail', 'email', 'COLUMN'";
+                $query[] = "EXEC sp_RENAME '".PMF_Db::getTablePrefix()."faqquestions.ask_rubrik', 'category_id', 'COLUMN'";
+                $query[] = "EXEC sp_RENAME '".PMF_Db::getTablePrefix()."faqquestions.ask_content', 'question', 'COLUMN'";
+                $query[] = "EXEC sp_RENAME '".PMF_Db::getTablePrefix()."faqquestions.ask_date', 'created', 'COLUMN'";
                 break;
             case 'mysqli':
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions CHANGE ask_username username VARCHAR(100) NOT NULL";
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions CHANGE ask_usermail email VARCHAR(100) NOT NULL";
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions CHANGE ask_rubrik category_id INT(11) NOT NULL";
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions CHANGE ask_content question TEXT NOT NULL";
-                $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions CHANGE ask_date created VARCHAR(20) NOT NULL";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions CHANGE ask_username username VARCHAR(100) NOT NULL";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions CHANGE ask_usermail email VARCHAR(100) NOT NULL";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions CHANGE ask_rubrik category_id INT(11) NOT NULL";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions CHANGE ask_content question TEXT NOT NULL";
+                $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions CHANGE ask_date created VARCHAR(20) NOT NULL";
                 break;
             case 'sqlite':
                 $query[] = "BEGIN TRANSACTION";
-                $query[] = "CREATE TEMPORARY TABLE " . PMF_Db::getTablePrefix() . "faqquestions_temp (
+                $query[] = "CREATE TEMPORARY TABLE ".PMF_Db::getTablePrefix()."faqquestions_temp (
                                 id int(11) NOT NULL,
                                 username varchar(100) NOT NULL,
                                 email varchar(100) NOT NULL,
@@ -362,9 +362,9 @@ 
                                 created varchar(20) NOT NULL,
                                 is_visible char(1) default 'Y',
                                 PRIMARY KEY (id))";
-                $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqquestions_temp SELECT * FROM " . PMF_Db::getTablePrefix() . "faqquestions";
-                $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faqquestions";
-                $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqquestions (
+                $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqquestions_temp SELECT * FROM ".PMF_Db::getTablePrefix()."faqquestions";
+                $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faqquestions";
+                $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqquestions (
                                 id int(11) NOT NULL,
                                 username varchar(100) NOT NULL,
                                 email varchar(100) NOT NULL,
@@ -373,42 +373,42 @@ 
                                 created varchar(20) NOT NULL,
                                 is_visible char(1) default 'Y',
                                 PRIMARY KEY (id))";
-                $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqquestions SELECT * FROM " . PMF_Db::getTablePrefix() . "faqquestions_temp";
-                $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faqquestions_temp";
+                $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqquestions SELECT * FROM ".PMF_Db::getTablePrefix()."faqquestions_temp";
+                $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faqquestions_temp";
                 $query[] = "COMMIT";
                 break;
         }
 
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faqright (right_id, name, description, for_users, for_groups) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description, for_users, for_groups) VALUES
             (34, 'addattachment', 'Right to add attachments', 1, 1)";
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faqright (right_id, name, description, for_users, for_groups) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description, for_users, for_groups) VALUES
             (35, 'editattachment', 'Right to edit attachments', 1, 1)";
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faqright (right_id, name, description, for_users, for_groups) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description, for_users, for_groups) VALUES
             (36, 'delattachment', 'Right to delete attachments', 1, 1)";
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faqright (right_id, name, description, for_users, for_groups) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description, for_users, for_groups) VALUES
             (37, 'dlattachment', 'Right to download attachments', 1, 1)";
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 34)";
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 35)";
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 36)";
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 37)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 34)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 35)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 36)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 37)";
     }
 
     //
     // UPDATES FROM 2.7.0-alpha2
     //
     if (version_compare($version, '2.7.0-alpha2', '<')) {
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faqright (right_id, name, description, for_users, for_groups) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description, for_users, for_groups) VALUES
             (38, 'reports', 'Right to generate reports', 1, 1)";
-        $query[] = "INSERT INTO ". PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 38)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 38)";
     }
 
     //
     // UPDATES FROM 2.7.0-beta
     //
     if (version_compare($version, '2.7.0-beta', '<')) {
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'search.numberSearchTerms'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'search.numberSearchTerms'
             WHERE config_name = 'main.numberSearchTerms'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'search.useAjaxSearchOnStartpage'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'search.useAjaxSearchOnStartpage'
             WHERE config_name = 'main.useAjaxSearchOnStartpage'";
     }
 
@@ -426,39 +426,39 @@ 
     // UPDATES FROM 2.7.0-RC
     //
     if (version_compare($version, '2.7.0-RC', '<')) {
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.numberOfRecordsPerPage'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.numberOfRecordsPerPage'
             WHERE config_name = 'main.numberOfRecordsPerPage'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.numberOfShownNewsEntries'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.numberOfShownNewsEntries'
             WHERE config_name = 'main.numberOfShownNewsEntries'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.orderingPopularFaqs'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.orderingPopularFaqs'
             WHERE config_name = 'main.orderingPopularFaqs'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.disableAttachments'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.disableAttachments'
             WHERE config_name = 'main.disableAttachments'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.maxAttachmentSize'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.maxAttachmentSize'
             WHERE config_name = 'main.maxAttachmentSize'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.attachmentsPath'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.attachmentsPath'
             WHERE config_name = 'main.attachmentsPath'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.attachmentsStorageType'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.attachmentsStorageType'
             WHERE config_name = 'main.attachmentsStorageType'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.enableAttachmentEncryption'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.enableAttachmentEncryption'
             WHERE config_name = 'main.enableAttachmentEncryption'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'records.defaultAttachmentEncKey'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'records.defaultAttachmentEncKey'
             WHERE config_name = 'main.defaultAttachmentEncKey'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'security.permLevel'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'security.permLevel'
             WHERE config_name = 'main.permLevel'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'security.ipCheck'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'security.ipCheck'
             WHERE config_name = 'main.ipCheck'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'security.enableLoginOnly'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'security.enableLoginOnly'
             WHERE config_name = 'main.enableLoginOnly'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'security.ldapSupport'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'security.ldapSupport'
             WHERE config_name = 'main.ldapSupport'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'security.bannedIPs'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'security.bannedIPs'
             WHERE config_name = 'main.bannedIPs'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'security.ssoSupport'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'security.ssoSupport'
             WHERE config_name = 'main.ssoSupport'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'security.ssoLogoutRedirect'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'security.ssoLogoutRedirect'
             WHERE config_name = 'main.ssoLogoutRedirect'";
-        $query[] = "UPDATE ". PMF_Db::getTablePrefix() . "faqconfig SET config_name = 'security.useSslForLogins'
+        $query[] = "UPDATE ".PMF_Db::getTablePrefix()."faqconfig SET config_name = 'security.useSslForLogins'
             WHERE config_name = 'main.useSslForLogins'";
     }
 
@@ -483,15 +483,15 @@ 
     //
     if (version_compare($version, '2.8.0-alpha', '<')) {
 
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqright (right_id, name, description, for_users, for_groups) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description, for_users, for_groups) VALUES
             (39, 'addfaq', 'Right to add FAQs in frontend', 1, 1)";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 39)";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqright (right_id, name, description, for_users, for_groups) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 39)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description, for_users, for_groups) VALUES
             (40, 'addquestion', 'Right to add questions in frontend', 1, 1)";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 40)";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqright (right_id, name, description, for_users, for_groups) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 40)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description, for_users, for_groups) VALUES
             (41, 'addcomment', 'Right to add comments in frontend', 1, 1)";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 41)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 41)";
 
         $faqConfig->add('cache.varnishEnable', 'false');
         $faqConfig->add('cache.varnishHost', '127.0.0.1');
@@ -503,7 +503,7 @@ 
 
         if ('sqlite' === $DB['type']) {
             $query[] = "BEGIN TRANSACTION";
-            $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqquestions_temp (
+            $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqquestions_temp (
                                 id int(11) NOT NULL,
                                 username varchar(100) NOT NULL,
                                 email varchar(100) NOT NULL,
@@ -512,9 +512,9 @@ 
                                 created varchar(20) NOT NULL,
                                 is_visible char(1) default 'Y',
                                 PRIMARY KEY (id))";
-            $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqquestions_temp SELECT * FROM " . PMF_Db::getTablePrefix() . "faqquestions";
-            $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faqquestions";
-            $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqquestions (
+            $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqquestions_temp SELECT * FROM ".PMF_Db::getTablePrefix()."faqquestions";
+            $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faqquestions";
+            $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqquestions (
                                 id int(11) NOT NULL,
                                 username varchar(100) NOT NULL,
                                 email varchar(100) NOT NULL,
@@ -524,39 +524,39 @@ 
                                 is_visible char(1) default 'Y',
                                 answer_id INT NOT NULL DEFAULT 0,
                                 PRIMARY KEY (id))";
-            $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqquestions SELECT id, username, email, category_id, question, created, is_visible, 0 FROM " . PMF_Db::getTablePrefix() . "faqquestions_temp";
-            $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faqquestions_temp";
+            $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqquestions SELECT id, username, email, category_id, question, created, is_visible, 0 FROM ".PMF_Db::getTablePrefix()."faqquestions_temp";
+            $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faqquestions_temp";
             $query[] = "COMMIT";
         } elseif ('sqlite3' === $DB['type']) {
-            $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions ADD COLUMN answer_id INT NOT NULL DEFAULT 0";
+            $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions ADD COLUMN answer_id INT NOT NULL DEFAULT 0";
         } else {
-            $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faqquestions ADD answer_id INT NOT NULL DEFAULT 0";
+            $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faqquestions ADD answer_id INT NOT NULL DEFAULT 0";
         }
 
         $faqConfig->add('records.enableCloseQuestion', 'false');
         $faqConfig->add('records.enableDeleteQuestion', 'false');
 
-        $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faquserlogin_temp (
+        $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faquserlogin_temp (
             login varchar(128) NOT NULL,
             pass varchar(80) NOT NULL,
             PRIMARY KEY (login))";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquserlogin_temp SELECT * FROM " . PMF_Db::getTablePrefix() . "faquserlogin";
-        $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faquserlogin";
-        $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faquserlogin (
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquserlogin_temp SELECT * FROM ".PMF_Db::getTablePrefix()."faquserlogin";
+        $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faquserlogin";
+        $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faquserlogin (
             login varchar(128) NOT NULL,
             pass varchar(80) NOT NULL,
             PRIMARY KEY (login))";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquserlogin SELECT * FROM " . PMF_Db::getTablePrefix() . "faquserlogin_temp";
-        $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faquserlogin_temp";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquserlogin SELECT * FROM ".PMF_Db::getTablePrefix()."faquserlogin_temp";
+        $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faquserlogin_temp";
     }
 
     //
     // UPDATES FROM 2.8.0-alpha2
     //
     if (version_compare($version, '2.8.0-alpha2', '<')) {
-        switch($DB['type']) {
+        switch ($DB['type']) {
             case 'pgsql':
-                $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqinstances (
+                $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqinstances (
                     id int4 NOT NULL,
                     url VARCHAR(255) NOT NULL,
                     instance VARCHAR(255) NOT NULL,
@@ -564,7 +564,7 @@ 
                     created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
                     modified TIMESTAMP NOT NULL,
                     PRIMARY KEY (id))";
-                $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqinstances_config (
+                $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqinstances_config (
                     instance_id int4 NOT NULL,
                     config_name VARCHAR(255) NOT NULL default '',
                     config_value VARCHAR(255) DEFAULT NULL,
@@ -574,7 +574,7 @@ 
             case 'sqlsrv':
             case 'sqlite':
             case 'sqlite3':
-                $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqinstances (
+                $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqinstances (
                     id INT NOT NULL,
                     url VARCHAR(255) NOT NULL,
                     instance VARCHAR(255) NOT NULL,
@@ -582,14 +582,14 @@ 
                     created DATETIME NOT NULL,
                     modified DATETIME NOT NULL,
                     PRIMARY KEY (id))";
-                $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqinstances_config (
+                $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqinstances_config (
                     instance_id INT NOT NULL,
                     config_name VARCHAR(255) NOT NULL default '',
                     config_value VARCHAR(255) DEFAULT NULL,
                     PRIMARY KEY (instance_id, config_name))";
                 break;
             case 'mysqli':
-                $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqinstances (
+                $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqinstances (
                     id INT(11) NOT NULL,
                     url VARCHAR(255) NOT NULL,
                     instance VARCHAR(255) NOT NULL,
@@ -597,7 +597,7 @@ 
                     created TIMESTAMP DEFAULT 0,
                     modified TIMESTAMP ON UPDATE CURRENT_TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
                     PRIMARY KEY (id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci";
-                $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faqinstances_config (
+                $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faqinstances_config (
                     instance_id INT(11) NOT NULL,
                     config_name VARCHAR(255) NOT NULL default '',
                     config_value VARCHAR(255) DEFAULT NULL,
@@ -605,19 +605,19 @@ 
                 break;
         }
 
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqright (right_id, name, description) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description) VALUES
             (42, 'editinstances', 'Right to edit multi-site instances')";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 42)";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqright (right_id, name, description) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 42)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description) VALUES
             (43, 'addinstances', 'Right to add multi-site instances')";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 43)";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqright (right_id, name, description) VALUES
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 43)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description) VALUES
             (44, 'delinstances', 'Right to delete multi-site instances')";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 44)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 44)";
 
         if ('sqlite' === $DB['type']) {
             $query[] = "BEGIN TRANSACTION";
-            $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faquser_temp (
+            $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faquser_temp (
                                 user_id INT(11) NOT NULL,
                                 login VARCHAR(25) NOT NULL,
                                 session_id VARCHAR(150) NULL,
@@ -628,9 +628,9 @@ 
                                 auth_source VARCHAR(100) NULL,
                                 member_since TIMESTAMP(14) NULL,
                                 PRIMARY KEY(user_id))";
-            $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_temp SELECT * FROM " . PMF_Db::getTablePrefix() . "faquser";
-            $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faquser";
-            $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faquser (
+            $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_temp SELECT * FROM ".PMF_Db::getTablePrefix()."faquser";
+            $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faquser";
+            $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faquser (
                                 user_id INT(11) NOT NULL,
                                 login VARCHAR(25) NOT NULL,
                                 session_id VARCHAR(150) NULL,
@@ -642,13 +642,13 @@ 
                                 member_since TIMESTAMP(14) NULL,
                                 remember_me VARCHAR(150) NULL,
                                 PRIMARY KEY(user_id))";
-            $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser SELECT user_id, login, session_id, session_timestamp, ip, account_status, last_login, auth_source, member_since, '' FROM " . PMF_Db::getTablePrefix() . "faquser_temp";
-            $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faquser_temp";
+            $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser SELECT user_id, login, session_id, session_timestamp, ip, account_status, last_login, auth_source, member_since, '' FROM ".PMF_Db::getTablePrefix()."faquser_temp";
+            $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faquser_temp";
             $query[] = "COMMIT";
         } elseif ('sqlite3' === $DB['type']) {
-            $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faquser ADD COLUMN remember_me VARCHAR(150) NULL";
+            $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faquser ADD COLUMN remember_me VARCHAR(150) NULL";
         } else {
-            $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faquser ADD remember_me VARCHAR(150) NULL";
+            $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faquser ADD remember_me VARCHAR(150) NULL";
         }
     }
 
@@ -659,13 +659,13 @@ 
         foreach ($query as $key => $executeQuery) {
             $result = $faqConfig->getDb()->query($executeQuery);
             echo '.';
-            if (!($key % 100)) {
+            if (!($key%100)) {
                 echo '<br />';
             }
             if (!$result) {
                 echo "</div>";
-                echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ ' .
-                      'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.' .
+                echo '<p class="alert alert-danger"><strong>Error:</strong> Please update your version of phpMyFAQ '.
+                      'once again or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.'.
                       '</p>';
                 printf(
                     '<p class="alert alert-danger"><strong>DB error:</strong> %s</p>',
@@ -679,7 +679,7 @@ 
             }
             usleep(10000);
             $count++;
-            if (!($count % 10)) {
+            if (!($count%10)) {
                 ob_flush();
             }
         }
@@ -719,10 +719,10 @@ 
     //
     if (version_compare($version, '2.8.0-alpha3', '<')) {
 
-        $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faqlinkverifyrules";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faqright (right_id, name, description) VALUES
+        $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faqlinkverifyrules";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faqright (right_id, name, description) VALUES
             (45, 'export', 'Right to export the complete FAQ')";
-        $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_right (user_id, right_id) VALUES (1, 45)";
+        $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_right (user_id, right_id) VALUES (1, 45)";
 
     }
 
@@ -770,7 +770,7 @@ 
 
         if ('sqlite' === $DB['type']) {
             $query[] = "BEGIN TRANSACTION";
-            $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faquser_temp (
+            $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faquser_temp (
                                 user_id INT(11) NOT NULL,
                                 login VARCHAR(25) NOT NULL,
                                 session_id VARCHAR(150) NULL,
@@ -781,9 +781,9 @@ 
                                 auth_source VARCHAR(100) NULL,
                                 member_since TIMESTAMP(14) NULL,
                                 PRIMARY KEY(user_id))";
-            $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser_temp SELECT * FROM " . PMF_Db::getTablePrefix() . "faquser";
-            $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faquser";
-            $query[] = "CREATE TABLE " . PMF_Db::getTablePrefix() . "faquser (
+            $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser_temp SELECT * FROM ".PMF_Db::getTablePrefix()."faquser";
+            $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faquser";
+            $query[] = "CREATE TABLE ".PMF_Db::getTablePrefix()."faquser (
                                 user_id INT(11) NOT NULL,
                                 login VARCHAR(25) NOT NULL,
                                 session_id VARCHAR(150) NULL,
@@ -796,13 +796,13 @@ 
                                 remember_me VARCHAR(150) NULL,
                                 success INT(1) NULL DEFAULT 1,
                                 PRIMARY KEY(user_id))";
-            $query[] = "INSERT INTO " . PMF_Db::getTablePrefix() . "faquser SELECT user_id, login, session_id, session_timestamp, ip, account_status, last_login, auth_source, member_since, '' FROM " . PMF_Db::getTablePrefix() . "faquser_temp";
-            $query[] = "DROP TABLE " . PMF_Db::getTablePrefix() . "faquser_temp";
+            $query[] = "INSERT INTO ".PMF_Db::getTablePrefix()."faquser SELECT user_id, login, session_id, session_timestamp, ip, account_status, last_login, auth_source, member_since, '' FROM ".PMF_Db::getTablePrefix()."faquser_temp";
+            $query[] = "DROP TABLE ".PMF_Db::getTablePrefix()."faquser_temp";
             $query[] = "COMMIT";
         } elseif ('sqlite3' === $DB['type']) {
-            $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faquser ADD COLUMN success INT(1) NULL DEFAULT 1";
+            $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faquser ADD COLUMN success INT(1) NULL DEFAULT 1";
         } else {
-            $query[] = "ALTER TABLE " . PMF_Db::getTablePrefix() . "faquser ADD success INT(1) NULL DEFAULT 1";
+            $query[] = "ALTER TABLE ".PMF_Db::getTablePrefix()."faquser ADD success INT(1) NULL DEFAULT 1";
         }
     }
 
@@ -832,7 +832,7 @@ 
             $result = $faqConfig->getDb()->query($executeQuery);
             printf('<span title="%s">.</span>', $executeQuery);
             if (!$result) {
-                echo '<p class="alert alert-danger"><strong>Error:</strong> Please install your version of phpMyFAQ once again ' .
+                echo '<p class="alert alert-danger"><strong>Error:</strong> Please install your version of phpMyFAQ once again '.
                       'or send us a <a href="http://bugs.phpmyfaq.de" target="_blank">bug report</a>.</p>';
                 printf('<p class="error"><strong>DB error:</strong> %s</p>', $faqConfig->getDb()->error());
                 printf('<code>%s</code>', htmlentities($executeQuery));
@@ -854,13 +854,13 @@ 
         }
     }
     // Remove 'setup.php' file
-    if (is_writeable(__DIR__ . '/setup.php') && @unlink(__DIR__ . '/setup.php')) {
+    if (is_writeable(__DIR__.'/setup.php') && @unlink(__DIR__.'/setup.php')) {
         echo "<p class=\"alert alert-success\">The file <em>./setup/index.php</em> was deleted automatically.</p>\n";
     } else {
         echo "<p class=\"alert alert-danger\">Please delete the file <em>./setup/index.php</em> manually.</p>\n";
     }
     // Remove 'update.php' file
-    if (is_writeable(__DIR__ . '/update.php') && @unlink(__DIR__ . '/update.php')) {
+    if (is_writeable(__DIR__.'/update.php') && @unlink(__DIR__.'/update.php')) {
         echo "<p class=\"alert alert-success\">The file <em>./setup/update.php</em> was deleted automatically.</p>\n";
     } else {
         echo "<p class=\"alert alert-danger\">Please delete the file <em>./setup/update.php</em> manually.</p>\n";

phpmyfaq/setup/attachment.php

Indentation +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
 /*        case PMF_Attachment_Migration::MIGRATION_TYPE3:
         case PMF_Attachment_Migration::MIGRATION_TYPE4:*/
             $options['defaultKey'] = PMF_Filter::filterInput(INPUT_POST,
-                                                             'defaultKey',
-                                                             FILTER_SANITIZE_STRING);                                 
+                                                                'defaultKey',
+                                                                FILTER_SANITIZE_STRING);                                 
             break;
             
         default:

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 //
 // Check if config/database.php exist -> if not, redirect to installer
 //
-if (!file_exists(PMF_ROOT_DIR . '/config/database.php')) {
+if (!file_exists(PMF_ROOT_DIR.'/config/database.php')) {
     header("Location: ".str_replace('admin/index.php', '', $_SERVER['SCRIPT_NAME']).'setup/index.php');
     exit();
 }
@@ -33,7 +33,7 @@ 
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 ?>
 <!DOCTYPE html>
@@ -81,13 +81,13 @@ 
         if ($migration->doMigrate($migrationType, $options)) {
             print '<br><h2 style="color: green;">Success</h2>';
         } else {
-            print '<span style="color: red">Errors:</span><br>' . implode('<br>', $migration->getErrors());
+            print '<span style="color: red">Errors:</span><br>'.implode('<br>', $migration->getErrors());
             showForm();
         }
         
         $warnings = $migration->getWarnings();
-        if(!empty($warnings)) {
-            echo '<span style="color: yellow">Warnings:</span><br>' . implode('<br>', $migration->getWarnings());
+        if (!empty($warnings)) {
+            echo '<span style="color: yellow">Warnings:</span><br>'.implode('<br>', $migration->getWarnings());
         }
     }