Asymptix / Framework

classes/db/access/User.php

Spacing +9 added lines, -9 removed lines

@@ -108,9 +108,9 @@ 
      * Updates login time.
      */
     public function updateLoginTime() {
-        $query = "UPDATE " . self::TABLE_NAME . "
+        $query = "UPDATE ".self::TABLE_NAME."
                      SET last_login_time = NOW()
-                   WHERE " . self::ID_FIELD_NAME . " = ?";
+                   WHERE " . self::ID_FIELD_NAME." = ?";
         DBCore::doUpdateQuery($query, "i", array($this->id));
     }
 
@@ -176,8 +176,8 @@ 
      */
     public function getAvatarPath($icon = false) {
         $currentAvatarFileName = $this->avatar;
-        if (!empty($currentAvatarFileName) && file_exists(Config::DIR_AVATARS . $currentAvatarFileName)) {
-            return Config::DIR_AVATARS . $currentAvatarFileName;
+        if (!empty($currentAvatarFileName) && file_exists(Config::DIR_AVATARS.$currentAvatarFileName)) {
+            return Config::DIR_AVATARS.$currentAvatarFileName;
         }
         if ($icon) {
             return "img/user_avatar.png";
@@ -194,14 +194,14 @@ 
      */
     public function updateAvatar($newAvatarFileName) {
         $currentAvatarFileName = $this->avatar;
-        if (!empty($currentAvatarFileName) && file_exists(Config::DIR_AVATARS . $currentAvatarFileName)) {
-            unlink(Config::DIR_AVATARS . $currentAvatarFileName);
+        if (!empty($currentAvatarFileName) && file_exists(Config::DIR_AVATARS.$currentAvatarFileName)) {
+            unlink(Config::DIR_AVATARS.$currentAvatarFileName);
         }
 
-        if (file_exists(Config::DIR_AVATARS . $newAvatarFileName)) {
-            $query = "UPDATE " . self::TABLE_NAME
+        if (file_exists(Config::DIR_AVATARS.$newAvatarFileName)) {
+            $query = "UPDATE ".self::TABLE_NAME
                     . " SET avatar = ?"
-                    . " WHERE " . self::ID_FIELD_NAME . " = ?";
+                    . " WHERE ".self::ID_FIELD_NAME." = ?";
             if (DBCore::doUpdateQuery($query, "si", array(
                 $newAvatarFileName,
                 $this->id

classes/db/Settings.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     );
 
     public function save() {
-        $query = "INSERT INTO " . self::TABLE_NAME . " (setting_id, value) VALUES (?, ?)
+        $query = "INSERT INTO ".self::TABLE_NAME." (setting_id, value) VALUES (?, ?)
                   ON DUPLICATE KEY UPDATE value = ?";
         return DBCore::doUpdateQuery($query, "sss", array(
             $this->id,

framework/mail/Email.php

Spacing +6 added lines, -6 removed lines

@@ -88,12 +88,12 @@ 
      *           delivery, FALSE otherwise.
      */
     protected function sendMail($email, $subject, $message, $format = self::FORMAT_TEXT, $replyTo = "") {
-        $headers = "From: " . $this->fromName . " <" . $this->fromEmail . ">\r\n";
-        $headers.= "Reply-To: " . $replyTo . "\r\n";
+        $headers = "From: ".$this->fromName." <".$this->fromEmail.">\r\n";
+        $headers .= "Reply-To: ".$replyTo."\r\n";
 
         if ($format == self::FORMAT_HTML) {
-            $headers.= "MIME-Version: 1.0\r\n";
-            $headers.= "Content-type: text/html; charset=utf-8\r\n";
+            $headers .= "MIME-Version: 1.0\r\n";
+            $headers .= "Content-type: text/html; charset=utf-8\r\n";
         }
 
         /*
@@ -149,9 +149,9 @@ 
         $_EMAIL = $params;
 
         ob_start();
-        include($this->tplFolder . $languageCode . "/" . $template . ".tpl.php");
+        include($this->tplFolder.$languageCode."/".$template.".tpl.php");
         if (!empty($this->signatureTpl)) {
-            include($this->tplFolder . $languageCode . "/" . $this->signatureTpl);
+            include($this->tplFolder.$languageCode."/".$this->signatureTpl);
         }
         $message = ob_get_contents();
         ob_end_clean();

framework/app/Controller.php

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
     }
 
     protected function init() {
-        $action = 'action' . ucfirst(
+        $action = 'action'.ucfirst(
             preg_replace_callback(
                 "#_([a-z])#",
-                function ($matches) {
+                function($matches) {
                     return strtoupper($matches[1]);
                 },
                 $this->route->action

framework/tools/logging/Logger.php

Spacing +2 added lines, -2 removed lines

@@ -158,10 +158,10 @@
 
                 return;
             case (self::TO_FILE):
-                $message = "({$type}) " . $message;
+                $message = "({$type}) ".$message;
 
                 if (strpos($message, "{{time}}") === false) {
-                    $message = "{{time}} " . $message;
+                    $message = "{{time}} ".$message;
                 }
                 if (is_null($time)) {
                     $time = time();

framework/tools/logging/LogDBObject.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             $time = time();
         }
 
-        $query = "INSERT INTO " . self::TABLE_NAME . " (type, message, count, last_seen) VALUES (?, ?, 1, ?)
+        $query = "INSERT INTO ".self::TABLE_NAME." (type, message, count, last_seen) VALUES (?, ?, 1, ?)
                   ON DUPLICATE KEY UPDATE count = count + 1, last_seen = ?";
         try {
             return DBCore::doUpdateQuery($query, "ssss", [

framework/web/Http.php

Spacing +24 added lines, -24 removed lines

@@ -27,16 +27,16 @@ 
     public static function http_redirect($url, $params = [], $session = false) {
         $paramsString = "";
         foreach ($params as $key => $value) {
-            $paramsString.= "&" . $key . "=" . $value;
+            $paramsString .= "&".$key."=".$value;
         }
         if ($session) {
-            $paramsString.= "&" . session_name() . "=" . session_id();
+            $paramsString .= "&".session_name()."=".session_id();
         }
         $paramsString = substr($paramsString, 1);
         if ($paramsString) {
-            $paramsString = "?" . $paramsString;
+            $paramsString = "?".$paramsString;
         }
-        header("Location: " . $url . $paramsString);
+        header("Location: ".$url.$paramsString);
         exit();
     }
 
@@ -68,9 +68,9 @@ 
                 }
             }
             if (function_exists("http_redirect")) {
-                http_redirect("http://" . $_SERVER['SERVER_NAME'] . "/" . $url);
+                http_redirect("http://".$_SERVER['SERVER_NAME']."/".$url);
             } else {
-                self::http_redirect("http://" . $_SERVER['SERVER_NAME'] . "/" . $url);
+                self::http_redirect("http://".$_SERVER['SERVER_NAME']."/".$url);
             }
         }
     }
@@ -131,24 +131,24 @@ 
             $urlParts['path'] = '/';
         }
 
-        $sock = fsockopen($urlParts['host'], (isset($urlParts['port']) ? (int) $urlParts['port'] : 80), $errno, $errstr, 30);
+        $sock = fsockopen($urlParts['host'], (isset($urlParts['port']) ? (int)$urlParts['port'] : 80), $errno, $errstr, 30);
         if (!$sock) {
             throw new HttpException("$errstr ($errno)");
         }
 
-        $request = "HEAD " . $urlParts['path'] . (isset($urlParts['query']) ? '?' . $urlParts['query'] : '') . " HTTP/1.1\r\n";
-        $request.= 'Host: ' . $urlParts['host'] . "\r\n";
-        $request.= "Connection: Close\r\n\r\n";
+        $request = "HEAD ".$urlParts['path'].(isset($urlParts['query']) ? '?'.$urlParts['query'] : '')." HTTP/1.1\r\n";
+        $request .= 'Host: '.$urlParts['host']."\r\n";
+        $request .= "Connection: Close\r\n\r\n";
         fwrite($sock, $request);
         $response = '';
         while (!feof($sock)) {
-            $response.= fread($sock, 8192);
+            $response .= fread($sock, 8192);
         }
         fclose($sock);
 
         if (preg_match('/^Location: (.+?)$/m', $response, $matches)) {
             if (substr($matches[1], 0, 1) == "/") {
-                return $urlParts['scheme'] . "://" . $urlParts['host'] . trim($matches[1]);
+                return $urlParts['scheme']."://".$urlParts['host'].trim($matches[1]);
             }
 
             return trim($matches[1]);
@@ -208,7 +208,7 @@ 
             if (is_array($val)) {
                 $val = implode(',', $val);
             }
-            $postParams[] = $key . '=' . urlencode($val);
+            $postParams[] = $key.'='.urlencode($val);
         }
         $postString = implode('&', $postParams);
 
@@ -220,29 +220,29 @@ 
 
         // Data goes in the path for a GET request
         if ($type == self::GET) {
-            $parts['path'].= '?' . $postString;
+            $parts['path'] .= '?'.$postString;
         }
 
-        $request = "$type " . $parts['path'] . " HTTP/1.1\r\n";
-        $request.= "Host: " . $parts['host'] . "\r\n";
+        $request = "$type ".$parts['path']." HTTP/1.1\r\n";
+        $request .= "Host: ".$parts['host']."\r\n";
 
         if ($type == self::POST) {
-            $request.= "Content-Type: application/x-www-form-urlencoded\r\n";
-            $request.= "Content-Length: " . strlen($postString) . "\r\n";
+            $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
+            $request .= "Content-Length: ".strlen($postString)."\r\n";
         }
-        $request.= "Connection: Close\r\n";
-        $request.= "\r\n";
+        $request .= "Connection: Close\r\n";
+        $request .= "\r\n";
 
         // Data goes in the request body for a POST request
         if ($type == self::POST && isset($postString)) {
-            $request.= $postString;
+            $request .= $postString;
         }
 
         fwrite($sock, $request);
 
         $response = "";
         while (!feof($sock) && $result = fgets($sock)) {
-            $response.= $result;
+            $response .= $result;
         }
 
         fclose($sock);
@@ -282,7 +282,7 @@ 
                 header('HTTP/1.0 404 Not Found', true, 404);
                 break;
             default:
-                throw new HttpException("Invalid HTTP status code '" . $code . "'");
+                throw new HttpException("Invalid HTTP status code '".$code."'");
         }
         if (!is_null($path)) {
             include($path);
@@ -308,7 +308,7 @@ 
 
             return self::forceHttpStatus($code, $path);
         }
-        throw new HttpException("Invalid HTTP class method '" . $name . "'");
+        throw new HttpException("Invalid HTTP class method '".$name."'");
     }
 
 }

framework/web/Browser.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
          * Detect browser version number
          */
         $identifiers[] = $browserShortName;
-        self::$pattern = '#(?<browser>' . implode('|', $identifiers) .
+        self::$pattern = '#(?<browser>'.implode('|', $identifiers).
                 ')[/ ]+(?<version>[0-9.|a-zA-Z.]*)#';
         if (!preg_match_all(self::$pattern, $userAgent, $matches)) {
             // we have no matching number just continue

framework/web/Request.php

Spacing +2 added lines, -2 removed lines

@@ -210,7 +210,7 @@ 
         if (isset($_FIELDS[$fieldName])) {
             $_FIELDS[$fieldName] = $fieldValue;
         } else {
-            throw new \Exception("No field '" . $fieldName . "' in global fields list.");
+            throw new \Exception("No field '".$fieldName."' in global fields list.");
         }
     }
 
@@ -248,7 +248,7 @@ 
                     $_FIELDS[$fieldName] = (bool)$_FIELDS[$fieldName];
             }
         } else {
-            throw new \Exception("No field '" . $fieldName . "' in global fields list.");
+            throw new \Exception("No field '".$fieldName."' in global fields list.");
         }
     }