Asymptix / Framework

framework/helpers/Naming.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
                             break;
                         }
                         $array = &$array[$key];
-                    } elseif(isset($array[$key])) { // last element
+                    } elseif (isset($array[$key])) { // last element
                         unset($array[$key]);
                     }
                 }

framework/core/Messages.php

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
      */
     public static function reorderMessages()
     {
-        uasort(self::$messages, function ($a, $b) {
+        uasort(self::$messages, function($a, $b) {
             return $a->type <= $b->type;
         });
     }

classes/Email.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
         return $this->sendNotification(
             Config::EMAIL_ADMIN,
-            "New user signup: '" . $user->username . "'",
+            "New user signup: '".$user->username."'",
             $_LANG->code,
             "signup_admin_email",
             array(
@@ -54,7 +54,7 @@ 
         global $_LANG;
 
         if (!Validator::isEmail($user->email)) {
-            throw new \Exception("Invalid email: '" . $user->email . "'");
+            throw new \Exception("Invalid email: '".$user->email."'");
         }
 
         return $this->sendNotification(

classes/db/tools/ErrorLog.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
         if ($type === 0) {
             $errorTypes[] = "E_LOG_INFO";
         } else {
-            for ($i = 0; $i < 15;  $i++) {
+            for ($i = 0; $i < 15; $i++) {
                 $errorType = self::friendlyErrorType($type & pow(2, $i));
                 if (!empty($errorType)) {
                     $errorTypes[] = $errorType;
@@ -45,7 +45,7 @@ 
             }
         }
 
-        $query = "INSERT INTO " . self::TABLE_NAME . " (type, error_type, called, script, line, message, count, last_seen) VALUES (?, ?, ?, ?, ?, ?, 1, ?)
+        $query = "INSERT INTO ".self::TABLE_NAME." (type, error_type, called, script, line, message, count, last_seen) VALUES (?, ?, ?, ?, ?, ?, 1, ?)
                   ON DUPLICATE KEY UPDATE count = count + 1, last_seen = ?";
         try {
             return DBCore::doUpdateQuery($query, "isssisss", array(
@@ -57,7 +57,7 @@ 
     }
 
     private static function friendlyErrorType($type) {
-        switch($type) {
+        switch ($type) {
             case E_ERROR: // 1
                 return 'E_ERROR';
             case E_WARNING: // 2

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/mail/POP.php

Spacing +6 added lines, -6 removed lines

@@ -58,10 +58,10 @@ 
             fgets($sock, 1024);
 
             // Connection accepted
-            fwrite($sock, "USER " . $username . "\r\n");
+            fwrite($sock, "USER ".$username."\r\n");
             $userresponse = fgets($sock, 1024);
             if ($userresponse[0] == "+") { // User accepted
-                fwrite($sock, "PASS " . $password . "\r\n");
+                fwrite($sock, "PASS ".$password."\r\n");
                 $passresponse = fgets($sock, 1024);
                 if ($passresponse[0] != "+") { // Wrong password
                     $passresponse = str_replace("\r", "", str_replace("\n", "", $passresponse));
@@ -72,12 +72,12 @@ 
                 }
             } else { // Invalid username
                 throw new POPServerException(
-                    "Username '" . $username . "' not accepted.", 1
+                    "Username '".$username."' not accepted.", 1
                 );
             }
         } else {
             throw new POPServerException(
-                "Unable to Connect to " . $host . ". Network Problems could be responsible.", 2
+                "Unable to Connect to ".$host.". Network Problems could be responsible.", 2
             );
         }
         $this->connection = $sock;
@@ -357,8 +357,8 @@ 
         $ret = $L2 = $L3 = null;
         for ($i = 0; $i < $len; $i++) {
             if (isset($avar[$i]) && isset($avar[$i][0]) && isset($avar[$i][1]) && isset($avar[$i][2])) {
-                $L2 = $avar[$i][0] . $avar[$i][1];
-                $L3 = $avar[$i][0] . $avar[$i][1] . $avar[$i][2];
+                $L2 = $avar[$i][0].$avar[$i][1];
+                $L3 = $avar[$i][0].$avar[$i][1].$avar[$i][2];
                 if ($L2 != "  " && $L3 != "Rec" && $L2 != "") {
                     $avar2 = explode(":", $avar[$i]);
                     $temp = str_replace("$avar2[0]:", "", $avar[$i]);

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