thorsten / phpMyFAQ

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

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 
 define('COPYRIGHT', '&copy; 2001-2014 <a href="http://www.phpmyfaq.de/">phpMyFAQ Team</a> | Follow us on <a href="http://twitter.com/phpMyFAQ">Twitter</a> | All rights reserved.');
 define('PMF_ROOT_DIR', dirname(dirname(__FILE__)));
-define('PMF_INCLUDE_DIR', PMF_ROOT_DIR . '/inc');
+define('PMF_INCLUDE_DIR', PMF_ROOT_DIR.'/inc');
 define('IS_VALID_PHPMYFAQ', null);
 
 if (version_compare(PHP_VERSION, '5.4.4') < 0) {
@@ -36,7 +36,7 @@ 
 
 use Symfony\Component\ClassLoader\UniversalClassLoader;
 
-if (! defined('DEBUG')) {
+if (!defined('DEBUG')) {
     define('DEBUG', true);
 }
 
@@ -47,17 +47,17 @@ 
 session_name('phpmyfaq-setup');
 session_start();
 
-require PMF_ROOT_DIR . '/config/constants.php';
+require PMF_ROOT_DIR.'/config/constants.php';
 
 //
 // Setting up PSR-0 autoloader for Symfony Components
 //
-require PMF_INCLUDE_DIR . '/libs/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+require PMF_INCLUDE_DIR.'/libs/Symfony/Component/ClassLoader/UniversalClassLoader.php';
 
 $loader = new UniversalClassLoader();
-$loader->registerNamespace('Symfony', PMF_INCLUDE_DIR . '/libs');
+$loader->registerNamespace('Symfony', PMF_INCLUDE_DIR.'/libs');
 $loader->registerPrefix('PMF_', PMF_INCLUDE_DIR);
-$loader->registerPrefix('Twig_', PMF_INCLUDE_DIR . '/libs');
+$loader->registerPrefix('Twig_', PMF_INCLUDE_DIR.'/libs');
 $loader->register();
 
 //
@@ -72,7 +72,7 @@ 
 // Initializing Twig
 //
 $twig = new Twig_Environment(
-    new Twig_Loader_Filesystem(PMF_ROOT_DIR . '/setup/assets/twig')
+    new Twig_Loader_Filesystem(PMF_ROOT_DIR.'/setup/assets/twig')
 );
 
 $tplLayoutVars = array(

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']).'install/setup.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());
         }
     }
     

phpmyfaq/admin/category.showstructure.php

Spacing +3 added lines, -3 removed lines

@@ -20,10 +20,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();
 }
 
@@ -92,7 +92,7 @@ 
 
         // category translated in this language?
         if ($cat['lang'] != $LANGCODE) {
-            $currentRow['catname'] .= ' (' . $languageCodes[strtoupper($cat['lang'])] . ')';
+            $currentRow['catname'] .= ' ('.$languageCodes[strtoupper($cat['lang'])].')';
         }
 
         // get languages in use for categories

phpmyfaq/admin/footer.php

Indentation +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     $templateVars['wysiwygActive'] = false;
 
     $twig->loadTemplate('footer.twig')
-         ->display($templateVars);
+            ->display($templateVars);
 
     unset($templateVars, $wysiwygActions);
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -20,21 +20,21 @@ 
 
 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();
 }
 
 $templateVars = array(
     'PMF_LANG'            => $PMF_LANG,
     'debugInformation'    => DEBUG ? $faqConfig->getDb()->log() : '',
-    'formAction'          => 'index.php' . (isset($action) ? '?action=' . $action : ''),
+    'formAction'          => 'index.php'.(isset($action) ? '?action='.$action : ''),
     'isAuthenticated'     => isset($auth),
     'languageSelector'    => PMF_Language::selectLanguages($LANGCODE, true),
     'pmfVersion'          => $faqConfig->get('main.currentVersion'),
-    'sessionKeepaliveUrl' => 'session.keepalive.php?lang=' . $LANGCODE,
+    'sessionKeepaliveUrl' => 'session.keepalive.php?lang='.$LANGCODE,
     'userDisplayName'     => isset($user) ? $user->userdata->get('display_name') : '',
     'userId'              => isset($user) ? $user->userdata->get('user_id') : ''
 );
@@ -50,7 +50,7 @@ 
 
 if (isset($auth) && in_array($action, $wysiwygActions) && $faqConfig->get('main.enableWysiwygEditor')) {
     $templateVars['wysiwygActive']     = true;
-    $templateVars['tinyMceContentCss'] = '../assets/template/' . PMF_Template::getTplSetName() . '/css/style.css';
+    $templateVars['tinyMceContentCss'] = '../assets/template/'.PMF_Template::getTplSetName().'/css/style.css';
     $templateVars['tinyMceLanguage']   = PMF_Language::isASupportedTinyMCELanguage($LANGCODE) ? $LANGCODE : 'en';
     if (('addnews' == $action || 'editnews' == $action)) {
         $templateVars['tinyMceElements'] = 'news';

phpmyfaq/admin/backup.export.php

Spacing +10 added lines, -10 removed lines

@@ -27,7 +27,7 @@ 
 //
 // Bootstrapping
 //
-require PMF_ROOT_DIR . '/inc/Bootstrap.php';
+require PMF_ROOT_DIR.'/inc/Bootstrap.php';
 
 $action = PMF_Filter::filterInput(INPUT_GET, 'action', FILTER_SANITIZE_STRING);
 
@@ -47,7 +47,7 @@ 
 if ($user->perm->checkRight($user->getUserId(), 'backup')) {
 
     $tables       = $tableNames = $faqConfig->getDb()->getTableNames(PMF_Db::getTablePrefix());
-    $tablePrefix  = (PMF_Db::getTablePrefix() !== '') ? PMF_Db::getTablePrefix() . '.phpmyfaq' : 'phpmyfaq';
+    $tablePrefix  = (PMF_Db::getTablePrefix() !== '') ? PMF_Db::getTablePrefix().'.phpmyfaq' : 'phpmyfaq';
     $tableNames   = '';
     $majorVersion = substr($faqConfig->get('main.currentVersion'), 0, 3);
     $dbHelper     = new PMF_DB_Helper($faqConfig);
@@ -55,24 +55,24 @@ 
     switch ($action) {
         case 'backup_content' :
             foreach ($tables as $table) {
-                if ((PMF_Db::getTablePrefix() . 'faqadminlog' == trim($table)) || (PMF_Db::getTablePrefix() . 'faqsessions' == trim($table))) {
+                if ((PMF_Db::getTablePrefix().'faqadminlog' == trim($table)) || (PMF_Db::getTablePrefix().'faqsessions' == trim($table))) {
                     continue;
                 }
-                $tableNames .= $table . ' ';
+                $tableNames .= $table.' ';
             }
             break;
         case 'backup_logs' :
             foreach ($tables as $table) {
-                if ((PMF_Db::getTablePrefix() . 'faqadminlog' == trim($table)) || (PMF_Db::getTablePrefix() . 'faqsessions' == trim($table))) {
-                    $tableNames .= $table . ' ';
+                if ((PMF_Db::getTablePrefix().'faqadminlog' == trim($table)) || (PMF_Db::getTablePrefix().'faqsessions' == trim($table))) {
+                    $tableNames .= $table.' ';
                 }
             }
             break;
     }
 
-    $text[] = "-- pmf" . $majorVersion . ": " . $tableNames;
+    $text[] = "-- pmf".$majorVersion.": ".$tableNames;
     $text[] = "-- DO NOT REMOVE THE FIRST LINE!";
-    $text[] = "-- pmftableprefix: " . PMF_Db::getTablePrefix();
+    $text[] = "-- pmftableprefix: ".PMF_Db::getTablePrefix();
     $text[] = "-- DO NOT REMOVE THE LINES ABOVE!";
     $text[] = "-- Otherwise this backup will be broken.";
 
@@ -86,7 +86,7 @@ 
             header($header);
             foreach (explode(' ', $tableNames) as $table) {
                 print implode("\r\n", $text);
-                $text = $dbHelper->buildInsertQueries("SELECT * FROM " . $table, $table);
+                $text = $dbHelper->buildInsertQueries("SELECT * FROM ".$table, $table);
             }
             break;
         case 'backup_logs' :
@@ -98,7 +98,7 @@ 
             header($header);
             foreach (explode(' ', $tableNames) as $table) {
                 print implode("\r\n", $text);
-                $text = $dbHelper->buildInsertQueries("SELECT * FROM " . $table, $table);
+                $text = $dbHelper->buildInsertQueries("SELECT * FROM ".$table, $table);
             }
             break;
     }

phpmyfaq/admin/stat.browser.php

Spacing +5 added lines, -5 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();
 }
 
@@ -30,8 +30,8 @@ 
 
     $perpage   = 50;
     $day       = PMF_Filter::filterInput(INPUT_POST, 'day', FILTER_VALIDATE_INT);
-    $firstHour = mktime (0, 0, 0, date('m', $day), date('d', $day), date('Y', $day));
-    $lastHour  = mktime (23, 59, 59, date('m', $day), date('d', $day), date('Y', $day));
+    $firstHour = mktime(0, 0, 0, date('m', $day), date('d', $day), date('Y', $day));
+    $lastHour  = mktime(23, 59, 59, date('m', $day), date('d', $day), date('Y', $day));
     
     $session     = new PMF_Session($faqConfig);
     $sessiondata = $session->getSessionsbyDate($firstHour, $lastHour);
@@ -40,7 +40,7 @@ 
         <header class="row">
             <div class="col-lg-12">
                 <h2 class="page-header">
-                    <i class="fa fa-tasks"></i> <?php echo $PMF_LANG['ad_sess_session'] . ' ' . date("Y-m-d", $day); ?>
+                    <i class="fa fa-tasks"></i> <?php echo $PMF_LANG['ad_sess_session'].' '.date("Y-m-d", $day); ?>
                 </h2>
             </div>
         </header>

phpmyfaq/admin/category.translate.php

Spacing +2 added lines, -2 removed lines

@@ -20,10 +20,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();
 }
 

phpmyfaq/admin/stat.search.php

Spacing +9 added lines, -9 removed lines

@@ -20,10 +20,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();
 }
 ?>
@@ -47,9 +47,9 @@ 
 
     $perpage = 15;
     $pages   = PMF_Filter::filterInput(INPUT_GET, 'pages', FILTER_VALIDATE_INT);
-    $page    = PMF_Filter::filterInput(INPUT_GET, 'page' , FILTER_VALIDATE_INT, 1);
+    $page    = PMF_Filter::filterInput(INPUT_GET, 'page', FILTER_VALIDATE_INT, 1);
     
-    $search        = new PMF_Search($faqConfig);
+    $search = new PMF_Search($faqConfig);
 
     if ('truncatesearchterms' === $action) {
         if ($search->deleteAllSearchTerms()) {
@@ -63,10 +63,10 @@ 
     $searchesList  = $search->getMostPopularSearches($searchesCount + 1, true);
 
     if (is_null($pages)) {
-        $pages = round((count($searchesList) + ($perpage / 3)) / $perpage, 0);
+        $pages = round((count($searchesList) + ($perpage/3))/$perpage, 0);
     }
     
-    $start = ($page - 1) * $perpage;
+    $start = ($page - 1)*$perpage;
     $ende  = $start + $perpage;
 
     $baseUrl = sprintf(
@@ -106,7 +106,7 @@ 
     $counter = $displayedCounter = 0;
     $self    = substr(__FILE__, strlen($_SERVER['DOCUMENT_ROOT']));
 
-    foreach($searchesList as $searchItem) {
+    foreach ($searchesList as $searchItem) {
 
         if ($displayedCounter >= $perpage) {
             $displayedCounter++;
@@ -119,10 +119,10 @@ 
         }
         $displayedCounter++;
         
-        $num = round(($searchItem['number']*100 / $searchesCount), 2);
+        $num = round(($searchItem['number']*100/$searchesCount), 2);
 ?>
                     <tr class="row_search_id_<?php echo $searchItem['id'] ?>">
-                        <td><?php echo PMF_String::htmlspecialchars($searchItem['searchterm']);  ?></td>
+                        <td><?php echo PMF_String::htmlspecialchars($searchItem['searchterm']); ?></td>
                         <td><?php echo $searchItem['number'] ?></td>
                         <td><?php echo $languageCodes[PMF_String::strtoupper($searchItem['lang'])] ?></td>
                         <td><meter max="100" value="<?php echo $num; ?>"></td>