thorsten / phpMyFAQ

phpmyfaq/inc/PMF/Helper/Tags.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 
         return sprintf(
             '<a class="btn tag" href="?action=search&amp;tagging_id=%s">%s (%d)</a> ',
-            implode(',', $this->getTaggingIds()) . ',' . $tagId,
+            implode(',', $this->getTaggingIds()).','.$tagId,
             $tagName,
             $relevance
         );

phpmyfaq/inc/PMF/Helper/AdminMenuBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -101,13 +101,13 @@ 
         if (isset($PMF_LANG[$caption])) {
             $caption = $PMF_LANG[$caption];
         } else {
-            $caption = 'No string for ' . $caption;
+            $caption = 'No string for '.$caption;
         }
         
         $this->entries[] = array(
             'caption' => $caption,
             'isActive' => $active == $action,
-            'linkUrl' => ($action != '') ? '?action=' . $action : ''
+            'linkUrl' => ($action != '') ? '?action='.$action : ''
         );
     }
 
@@ -145,9 +145,9 @@ 
      */
     private function evaluatePermission($restrictions)
     {
-        if (false !== strpos ($restrictions, '+')) {
+        if (false !== strpos($restrictions, '+')) {
             $retval = false;
-            foreach (explode('+',$restrictions) as $_restriction) {
+            foreach (explode('+', $restrictions) as $_restriction) {
                 $retval = $retval || $this->evaluatePermission($_restriction);
                 if ($retval) {
                     break;

Braces +3 added lines, -2 removed lines

@@ -187,8 +187,9 @@
         // check user rights, set them TRUE
         $allUserRights = $user->perm->getAllUserRights($user->getUserId());
         foreach ($allRights as $right) {
-            if (in_array($right['right_id'], $allUserRights))
-                $this->permission[$right['name']] = true;
+            if (in_array($right['right_id'], $allUserRights)) {
+                            $this->permission[$right['name']] = true;
+            }
         }
     }
 

phpmyfaq/inc/PMF/Helper/Http.php

Spacing +2 added lines, -2 removed lines

@@ -64,11 +64,11 @@
     public function addHeader()
     {
         header('Expires: Thu, 07 Apr 1977 14:47:00 GMT');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, must-revalidate');
         header('Cache-Control: post-check=0, pre-check=0', false);
         header('Pragma: no-cache');
         header('Vary: Negotiate,Accept');
-        header('Content-type: ' . $this->contentType);
+        header('Content-type: '.$this->contentType);
     }
 }
\ No newline at end of file

phpmyfaq/inc/PMF/Installer.php

Spacing +45 added lines, -45 removed lines

@@ -395,12 +395,12 @@ 
             );
         }
 
-        if (! function_exists('date_default_timezone_set')) {
+        if (!function_exists('date_default_timezone_set')) {
             $errors[] = 'Sorry, but setting a default timezone doesn\'t work in your environment!';
         }
 
-        if (! $this->_system->checkDatabase()) {
-            $dbError = "No supported database detected! Please install one of the following database systems and " .
+        if (!$this->_system->checkDatabase()) {
+            $dbError = "No supported database detected! Please install one of the following database systems and ".
                         "enable the corresponding PHP extension in php.ini:";
             $dbError .= "<ul>";
             foreach ($this->_system->getSupportedDatabases() as $database) {
@@ -410,7 +410,7 @@ 
             $errors[] = $dbError;
         }
 
-        if (! $this->_system->checkRequiredExtensions()) {
+        if (!$this->_system->checkRequiredExtensions()) {
             $extError  = "The following extensions are missing! Please enable the PHP extension(s) in php.ini.";
             $extError .= "<ul>";
             foreach ($this->_system->getMissingExtensions() as $extension) {
@@ -420,16 +420,16 @@ 
             $errors[] = $extError;
         }
 
-        if (! $this->_system->checkRegisterGlobals()) {
+        if (!$this->_system->checkRegisterGlobals()) {
             $errors[] = "Please disable register_globals!";
         }
 
-        if (! $this->_system->checkMagicQuotesGpc()) {
+        if (!$this->_system->checkMagicQuotesGpc()) {
             $errors[] = "Please disable magic_quotes_gpc!";
         }
 
-        if (! $this->_system->checkphpMyFAQInstallation()) {
-            $errors[] = "It seems you're already running a version of phpMyFAQ. Please use the " .
+        if (!$this->_system->checkphpMyFAQInstallation()) {
+            $errors[] = "It seems you're already running a version of phpMyFAQ. Please use the ".
                         "<a href=\"update.php\">update script</a>.";
         }
 
@@ -443,7 +443,7 @@ 
      */
     public function checkPreUpgrade()
     {
-        if (! $this->checkMinimumPhpVersion()) {
+        if (!$this->checkMinimumPhpVersion()) {
             printf(
                 '<p class="alert alert-danger">Sorry, but you need PHP %s or later!</p>',
                 PMF_System::VERSION_MINIMUM_PHP
@@ -451,18 +451,18 @@ 
             PMF_System::renderFooter();
         }
 
-        if (! is_readable(PMF_ROOT_DIR . '/config/database.php')) {
-            echo '<p class="alert alert-error">It seems you never run a version of phpMyFAQ.<br />' .
+        if (!is_readable(PMF_ROOT_DIR.'/config/database.php')) {
+            echo '<p class="alert alert-error">It seems you never run a version of phpMyFAQ.<br />'.
                 'Please use the <a href="setup.php">install script</a>.</p>';
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkRegisterGlobals()) {
+        if (!$this->_system->checkRegisterGlobals()) {
             echo '<p class="alert alert-danger">Please disable register_globals!</p>';
             PMF_System::renderFooter();
         }
 
-        if (! $this->_system->checkMagicQuotesGpc()) {
+        if (!$this->_system->checkMagicQuotesGpc()) {
             echo '<p class="alert alert-danger">Please disable magic_quotes_gpc!</p>';
             PMF_System::renderFooter();
         }
@@ -524,24 +524,24 @@ 
         $errors = array();
 
         if ((@ini_get('safe_mode') == 'On' || @ini_get('safe_mode') === 1)) {
-            $errors[] = "The PHP safe mode is enabled. You may have problems when phpMyFAQ tries to write in some " .
+            $errors[] = "The PHP safe mode is enabled. You may have problems when phpMyFAQ tries to write in some ".
                         "directories.";
         }
-        if (! extension_loaded('gd')) {
-            $errors[] = "You don't have GD support enabled in your PHP installation. Please enable GD support in " .
+        if (!extension_loaded('gd')) {
+            $errors[] = "You don't have GD support enabled in your PHP installation. Please enable GD support in ".
                         "your php.ini file otherwise you can't use Captchas for spam protection.";
         }
-        if (! function_exists('imagettftext')) {
-            $errors[] = "You don't have Freetype support enabled in the GD extension of your PHP installation. " .
-                        "Please enable Freetype support in GD extension otherwise the Captchas for spam protection " .
+        if (!function_exists('imagettftext')) {
+            $errors[] = "You don't have Freetype support enabled in the GD extension of your PHP installation. ".
+                        "Please enable Freetype support in GD extension otherwise the Captchas for spam protection ".
                         "will be quite easy to break.";
         }
-        if (! extension_loaded('curl') || ! extension_loaded('openssl')) {
-            $errors[] = "You don't have cURL and/or OpenSSL support enabled in your PHP installation. Please enable " .
+        if (!extension_loaded('curl') || !extension_loaded('openssl')) {
+            $errors[] = "You don't have cURL and/or OpenSSL support enabled in your PHP installation. Please enable ".
                         "cURL and/or OpenSSL support in your php.ini file otherwise you can't use the Twitter support.";
         }
-        if (! extension_loaded('fileinfo')) {
-            $errors[] = "You don't have Fileinfo support enabled in your PHP installation. Please enable Fileinfo " .
+        if (!extension_loaded('fileinfo')) {
+            $errors[] = "You don't have Fileinfo support enabled in your PHP installation. Please enable Fileinfo ".
                         "support in your php.ini file otherwise you can't use our backup/restore functionality.";
         }
         return $errors;
@@ -577,7 +577,7 @@ 
         $dbSetup['dbType'] = PMF_Filter::filterInput(INPUT_POST, 'sql_type', FILTER_SANITIZE_STRING);
         if (!is_null($dbSetup['dbType'])) {
             $dbSetup['dbType'] = trim($dbSetup['dbType']);
-            if (! file_exists(PMF_ROOT_DIR . '/setup/assets/sql/' . $dbSetup['dbType'] . '.sql.php')) {
+            if (!file_exists(PMF_ROOT_DIR.'/setup/assets/sql/'.$dbSetup['dbType'].'.sql.php')) {
                 printf(
                     '<p class="alert alert-danger"><strong>Error:</strong> Invalid server type: %s</p>',
                     $dbSetup['dbType']
@@ -590,31 +590,31 @@ 
         }
 
         $dbSetup['dbServer'] = PMF_Filter::filterInput(INPUT_POST, 'sql_server', FILTER_SANITIZE_STRING);
-        if (is_null($dbSetup['dbServer']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbServer']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             echo "<p class=\"alert alert-danger\"><strong>Error:</strong> Please add a database server.</p>\n";
             PMF_System::renderFooter(true);
         }
 
         $dbSetup['dbPort'] = PMF_Filter::filterInput(INPUT_POST, 'sql_port', FILTER_VALIDATE_INT);
-        if (is_null($dbSetup['dbPort']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbPort']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             echo "<p class=\"alert alert-error\"><strong>Error:</strong> Please add a valid database port.</p>\n";
             PMF_System::renderFooter(true);
         }
 
         $dbSetup['dbUser'] = PMF_Filter::filterInput(INPUT_POST, 'sql_user', FILTER_SANITIZE_STRING);
-        if (is_null($dbSetup['dbUser']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbUser']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             echo "<p class=\"alert alert-danger\"><strong>Error:</strong> Please add a database username.</p>\n";
             PMF_System::renderFooter(true);
         }
 
         $dbSetup['dbPassword'] = PMF_Filter::filterInput(INPUT_POST, 'sql_passwort', FILTER_UNSAFE_RAW);
-        if (is_null($dbSetup['dbPassword']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbPassword']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             // Password can be empty...
             $dbSetup['dbPassword'] = '';
         }
 
         $dbSetup['dbDatabaseName'] = PMF_Filter::filterInput(INPUT_POST, 'sql_db', FILTER_SANITIZE_STRING);
-        if (is_null($dbSetup['dbDatabaseName']) && ! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (is_null($dbSetup['dbDatabaseName']) && !PMF_System::isSqlite($dbSetup['dbType'])) {
             echo "<p class=\"alert alert-danger\"><strong>Error:</strong> Please add a database name.</p>\n";
             PMF_System::renderFooter(true);
         }
@@ -668,7 +668,7 @@ 
             $ldapSetup['ldapPassword'] = PMF_Filter::filterInput(INPUT_POST, 'ldap_password', FILTER_SANITIZE_STRING, '');
 
             // check LDAP connection
-            require PMF_ROOT_DIR . "/inc/PMF/Ldap.php";
+            require PMF_ROOT_DIR."/inc/PMF/Ldap.php";
             $ldap = new PMF_Ldap($configuration);
             $ldap->connect(
                 $ldapSetup['ldapServer'],
@@ -678,7 +678,7 @@ 
                 $ldapSetup['ldapPassword']
             );
             if (!$ldap) {
-                echo "<p class=\"alert alert-danger\"><strong>LDAP Error:</strong> " . $ldap->error() . "</p>\n";
+                echo "<p class=\"alert alert-danger\"><strong>LDAP Error:</strong> ".$ldap->error()."</p>\n";
                 PMF_System::renderFooter(true);
             }
         }
@@ -704,12 +704,12 @@ 
         }
 
         if (strlen($password) <= 5 || strlen($password_retyped) <= 5) {
-            echo '<p class="alert alert-danger"><strong>Error:</strong> Your password and retyped password are too short.' .
+            echo '<p class="alert alert-danger"><strong>Error:</strong> Your password and retyped password are too short.'.
                 ' Please set your password and your retyped password with a minimum of 6 characters.</p>';
             PMF_System::renderFooter(true);
         }
         if ($password != $password_retyped) {
-            echo '<p class="alert alert-danger"><strong>Error:</strong> Your password and retyped password are not equal.' .
+            echo '<p class="alert alert-danger"><strong>Error:</strong> Your password and retyped password are not equal.'.
                 ' Please check your password and your retyped password.</p>';
             PMF_System::renderFooter(true);
         }
@@ -723,7 +723,7 @@ 
         $instanceSetup->setRootDir(PMF_ROOT_DIR);
 
         // Write the DB variables in database.php
-        if (! $instanceSetup->createDatabaseFile($dbSetup)) {
+        if (!$instanceSetup->createDatabaseFile($dbSetup)) {
             echo "<p class=\"alert alert-danger\"><strong>Error:</strong> Setup cannot write to ./config/database.php.</p>";
             $this->_system->cleanInstallation();
             PMF_System::renderFooter(true);
@@ -731,7 +731,7 @@ 
 
         // check LDAP if available
         if (extension_loaded('ldap') && !is_null($ldapEnabled)) {
-            if (! $instanceSetup->createLdapFile($ldapSetup, '')) {
+            if (!$instanceSetup->createLdapFile($ldapSetup, '')) {
                 echo "<p class=\"alert alert-danger\"><strong>Error:</strong> Setup cannot write to ./config/ldap.php.</p>";
                 $this->_system->cleanInstallation();
                 PMF_System::renderFooter(true);
@@ -739,7 +739,7 @@ 
         }
 
         // connect to the database using config/database.php
-        require PMF_ROOT_DIR . '/config/database.php';
+        require PMF_ROOT_DIR.'/config/database.php';
         $db = PMF_Db::factory($dbSetup['dbType']);
         $db->connect($DB['server'], $DB['user'], $DB['password'], $DB['db']);
         if (!$db) {
@@ -748,15 +748,15 @@ 
             PMF_System::renderFooter(true);
         }
 
-        require PMF_ROOT_DIR . '/setup/assets/sql/' . $dbSetup['dbType'] . '.sql.php'; // CREATE TABLES
-        require PMF_ROOT_DIR . '/setup/assets/sql/stopwords.sql.php';  // INSERTs for stopwords
+        require PMF_ROOT_DIR.'/setup/assets/sql/'.$dbSetup['dbType'].'.sql.php'; // CREATE TABLES
+        require PMF_ROOT_DIR.'/setup/assets/sql/stopwords.sql.php'; // INSERTs for stopwords
 
         $this->_system->setDatabase($db);
 
         echo '<p>';
 
         // Erase any table before starting creating the required ones
-        if (! PMF_System::isSqlite($dbSetup['dbType'])) {
+        if (!PMF_System::isSqlite($dbSetup['dbType'])) {
             $this->_system->dropTables($uninst);
         }
 
@@ -775,7 +775,7 @@ 
             }
             usleep(2500);
             $count++;
-            if (!($count % 10)) {
+            if (!($count%10)) {
                 echo '| ';
             }
         }
@@ -797,9 +797,9 @@ 
 
         // add admin account and rights
         $admin = new PMF_User($configuration);
-        if (! $admin->createUser($loginname, $password, 1)) {
+        if (!$admin->createUser($loginname, $password, 1)) {
             printf(
-                "<p class=\"alert alert-danger\"><strong>Fatal installation error:</strong><br>" .
+                "<p class=\"alert alert-danger\"><strong>Fatal installation error:</strong><br>".
                 "Couldn't create the admin user: %s</p>\n",
                 $admin->error()
             );
@@ -825,7 +825,7 @@ 
         $instanceData = array(
             'url'      => $link->getSystemUri($_SERVER['SCRIPT_NAME']),
             'instance' => $link->getSystemRelativeUri('setup/index.php'),
-            'comment'  => 'phpMyFAQ ' . PMF_System::getVersion()
+            'comment'  => 'phpMyFAQ '.PMF_System::getVersion()
         );
         $faqInstance = new PMF_Instance($configuration);
         $faqInstance->addInstance($instanceData);
@@ -850,7 +850,7 @@ 
             echo "<p class=\"alert alert-danger\">Please delete the file <em>./setup/index.php</em> manually.</p>\n";
         }
         // Remove 'update.php' file
-        if (@unlink(dirname($_SERVER['PATH_TRANSLATED']) . '/update.php')) {
+        if (@unlink(dirname($_SERVER['PATH_TRANSLATED']).'/update.php')) {
             echo "<p class=\"alert alert-success\">The file <em>./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";
@@ -867,7 +867,7 @@ 
     public function renderLanguageOptions(Array $languageCodes)
     {
         $options = '';
-        if ($dir = @opendir(PMF_ROOT_DIR . '/lang')) {
+        if ($dir = @opendir(PMF_ROOT_DIR.'/lang')) {
             while ($dat = @readdir($dir)) {
                 if (substr($dat, -4) == '.php') {
                     $options .= sprintf('<option value="%s"', $dat);

phpmyfaq/inc/PMF/Services.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
         return sprintf(
             'https://twitter.com/share?url=%s&text=%s',
             urlencode($link->toString()),
-            $this->getQuestion() . urlencode(' | ' . $url)
+            $this->getQuestion().urlencode(' | '.$url)
         );
     }
 

phpmyfaq/inc/PMF/DB/Pdo/Mysql.php

Spacing +2 added lines, -2 removed lines

@@ -47,10 +47,10 @@
     public function connect($host, $user, $password, $database = '')
     {
         try {
-            $this->conn = new PDO('mysql:host=' . $host . ';dbname=' . $database . ';charset=UTF8', $user, $password);
+            $this->conn = new PDO('mysql:host='.$host.';dbname='.$database.';charset=UTF8', $user, $password);
             $this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         } catch (PDOException $e) {
-            PMF_Db::errorPage('Database connection failed: ' . $e->getMessage());
+            PMF_Db::errorPage('Database connection failed: '.$e->getMessage());
         }
 
 

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