Asymptix / Framework

framework/db/DBPreparedQuery.php

Indentation +2 added lines, -2 removed lines

@@ -139,9 +139,9 @@
             $typeByValue = DBField::getType($value);
             if ($typeByValue != 's') {
                 if ($type != $typeByValue && !(
-                       ($type == 'd' && $typeByValue == 'i') || // We can put integer as double
+                        ($type == 'd' && $typeByValue == 'i') || // We can put integer as double
                        ($type == 's' && $typeByValue == 'i') // We can put integer as string
-                   )
+                    )
                 ) {
                     throw new DBCoreException(
                         "Invalid query parameters types string ('" . $value .

Spacing +22 added lines, -22 removed lines

@@ -80,7 +80,7 @@ 
      */
     public function prepareConditions() {
         if (!empty($this->conditions)) {
-            $this->query.= " WHERE ";
+            $this->query .= " WHERE ";
             $this->sqlPushValues($this->conditions, " AND ");
         }
     }
@@ -90,14 +90,14 @@ 
      */
     public function prepareOrder() {
         if (!empty($this->order)) {
-            $this->query.= " ORDER BY";
+            $this->query .= " ORDER BY";
             if (is_array($this->order)) {
                 foreach ($this->order as $fieldName => $ord) {
-                    $this->query.= " " . $fieldName . " " . $ord . ",";
+                    $this->query .= " ".$fieldName." ".$ord.",";
                 }
                 $this->query = substr($this->query, 0, strlen($this->query) - 1);
             } elseif (is_string($this->order)) {
-                $this->query.= " " . $this->order;
+                $this->query .= " ".$this->order;
             }
         }
     }
@@ -112,13 +112,13 @@ 
         $count = null;
         if (!is_null($this->limit)) {
             if (Tools::isInteger($this->limit)) {
-                $this->query.= " LIMIT " . $this->limit;
+                $this->query .= " LIMIT ".$this->limit;
                 $count = $this->limit;
             } elseif (is_array($this->limit) && count($this->limit) == 2) {
                 $offset = $this->limit[0];
                 $count = $this->limit[1];
                 if (Tools::isInteger($offset) && Tools::isInteger($count)) {
-                    $this->query.= " LIMIT " . $offset . ", " . $count;
+                    $this->query .= " LIMIT ".$offset.", ".$count;
                 } else {
                     throw new DBCoreException("Invalid LIMIT param in select() method.");
                 }
@@ -223,7 +223,7 @@ 
 
             if (!in_array($type, ['i', 'd', 's', 'b'])) {
                 throw new DBCoreException(
-                    "Invalid query parameters types string (type '" . $type .
+                    "Invalid query parameters types string (type '".$type.
                     "' is undefined, only 'i', 'd', 's' and 'b' types are acceptable)"
                 );
             }
@@ -236,8 +236,8 @@ 
                    )
                 ) {
                     throw new DBCoreException(
-                        "Invalid query parameters types string ('" . $value .
-                        "' is not '" . $type . "' type but '" . $typeByValue . "' detected)"
+                        "Invalid query parameters types string ('".$value.
+                        "' is not '".$type."' type but '".$typeByValue."' detected)"
                     );
                 }
             } else { // in case if we try send non-string parameters as a string value
@@ -245,21 +245,21 @@ 
                     case 'i':
                         if (!(Tools::isNumeric($value) && ((string)(int)$value === $value))) {
                             throw new DBCoreException(
-                                "Invalid query parameters types string ('" . $value . "' is not '" . $type . ")"
+                                "Invalid query parameters types string ('".$value."' is not '".$type.")"
                             );
                         }
                         break;
                     case 'd':
                         if (!Tools::isDoubleString($value)) {
                             throw new DBCoreException(
-                                "Invalid query parameters types string ('" . $value . "' is not '" . $type . ")"
+                                "Invalid query parameters types string ('".$value."' is not '".$type.")"
                             );
                         }
                         break;
                     case 'b':
                         if (!in_array(strtolower($value), ['true', 'false'])) {
                             throw new DBCoreException(
-                                "Invalid query parameters types string ('" . $value . "' is not '" . $type . ")"
+                                "Invalid query parameters types string ('".$value."' is not '".$type.")"
                             );
                         }
                         break;
@@ -291,7 +291,7 @@ 
         $chunks = [];
         foreach (array_keys($fieldsList) as $fieldName) {
             if ($fieldName != $idFieldName) {
-                $chunks[] = "`" . $fieldName . "` = ?";
+                $chunks[] = "`".$fieldName."` = ?";
             }
         }
 
@@ -310,7 +310,7 @@ 
         $chunks = [];
         foreach ($fieldsList as $fieldName => $fieldValue) {
             if ($fieldName != $idFieldName) {
-                $chunks[]= "`" . $fieldName . "` = '" . $fieldValue . "'";
+                $chunks[] = "`".$fieldName."` = '".$fieldValue."'";
             }
         }
 
@@ -334,11 +334,11 @@ 
         foreach ($fieldsList as $fieldName => $fieldValue) {
             if ($fieldName != $idFieldName) {
                 if (Tools::isDouble($fieldValue)) {
-                    $typesString.= "d";
+                    $typesString .= "d";
                 } elseif (Tools::isInteger($fieldValue)) {
-                    $typesString.= "i";
+                    $typesString .= "i";
                 } else {
-                    $typesString.= "s";
+                    $typesString .= "s";
                 }
             }
         }
@@ -359,7 +359,7 @@ 
         $type = DBField::castType($type);
         $typesString = "";
         while ($length > 0) {
-            $typesString.= $type;
+            $typesString .= $type;
             $length--;
         }
 
@@ -378,8 +378,8 @@ 
         foreach ($values as $fieldName => $fieldValue) {
             if (!is_array($fieldValue)) {
                 if (!is_null($fieldValue)) {
-                    $chunks[] = $fieldName . " = ?";
-                    $this->types.= DBField::getType($fieldValue);
+                    $chunks[] = $fieldName." = ?";
+                    $this->types .= DBField::getType($fieldValue);
                     $this->params[] = $fieldValue;
                 } else {
                     $chunks[] = $fieldName;
@@ -390,12 +390,12 @@ 
 
                 $chunks[] = $condition;
                 foreach ($localParams as $param) {
-                    $this->types.= DBField::getType($param);
+                    $this->types .= DBField::getType($param);
                     $this->params[] = $param;
                 }
             }
         }
-        $this->query.= implode($separator, $chunks);
+        $this->query .= implode($separator, $chunks);
     }
 
 }

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/db/DBSelector.php

Indentation +3 added lines, -3 removed lines

@@ -101,8 +101,8 @@ 
      */
     public function selectDBObject($debug = false) {
         $query = "SELECT * FROM " . $this->dbObject->getTableName()
-               . ($this->conditions != "" ? " WHERE " . $this->conditions : "")
-               . " LIMIT 1";
+                . ($this->conditions != "" ? " WHERE " . $this->conditions : "")
+                . " LIMIT 1";
 
         if (!$debug) {
             $stmt = DBCore::doSelectQuery($query);
@@ -183,7 +183,7 @@ 
      */
     public function selectDBObjects($debug = false) {
         $query = "SELECT" . ($this->unique ? " DISTINCT" : "")
-               . " * FROM " . $this->dbObject->getTableName();
+                . " * FROM " . $this->dbObject->getTableName();
 
         if ($this->conditions != "") {
             $query .= " WHERE " . $this->conditions;

Spacing +30 added lines, -30 removed lines

@@ -61,8 +61,8 @@ 
             $classNamespaceParts = explode("\\", $this->className);
             if ($className != $classNamespaceParts[count($classNamespaceParts) - 1]) {
                 throw new DBSelectorException(
-                    "Invalid DB object classname '" . $className . "' in method name. " .
-                    "Valid classname is '" . $this->className . "'"
+                    "Invalid DB object classname '".$className."' in method name. ".
+                    "Valid classname is '".$this->className."'"
                 );
             }
         }
@@ -100,8 +100,8 @@ 
      * @return DBObject
      */
     public function selectDBObject($debug = false) {
-        $query = "SELECT * FROM " . $this->dbObject->getTableName()
-               . ($this->conditions != "" ? " WHERE " . $this->conditions : "")
+        $query = "SELECT * FROM ".$this->dbObject->getTableName()
+               . ($this->conditions != "" ? " WHERE ".$this->conditions : "")
                . " LIMIT 1";
 
         if (!$debug) {
@@ -131,14 +131,14 @@ 
      * @return DBObject
      */
     public function selectDBObjectByField($fieldName, $fieldValue, $debug = false) {
-        $query = "SELECT * FROM " . $this->dbObject->getTableName() . " WHERE " . $fieldName . " = ?";
+        $query = "SELECT * FROM ".$this->dbObject->getTableName()." WHERE ".$fieldName." = ?";
 
         if ($this->conditions != "") {
-            $query .= " AND " . $this->conditions;
+            $query .= " AND ".$this->conditions;
         }
 
-        $query.= $this->getQueryOrderSQL();
-        $query.= " LIMIT 1";
+        $query .= $this->getQueryOrderSQL();
+        $query .= " LIMIT 1";
 
         $fieldType = DBField::getType($fieldValue);
         if (!$debug) {
@@ -182,15 +182,15 @@ 
      * @return array<DBObject>
      */
     public function selectDBObjects($debug = false) {
-        $query = "SELECT" . ($this->unique ? " DISTINCT" : "")
-               . " * FROM " . $this->dbObject->getTableName();
+        $query = "SELECT".($this->unique ? " DISTINCT" : "")
+               . " * FROM ".$this->dbObject->getTableName();
 
         if ($this->conditions != "") {
-            $query .= " WHERE " . $this->conditions;
+            $query .= " WHERE ".$this->conditions;
         }
 
-        $query.= $this->getQueryOrderSQL();
-        $query.= $this->getQueryLimitSQL();
+        $query .= $this->getQueryOrderSQL();
+        $query .= $this->getQueryLimitSQL();
 
         if (!$debug) {
             $stmt = DBCore::doSelectQuery($query);
@@ -219,15 +219,15 @@ 
      * @return array<DBObject>
      */
     public function selectDBObjectsByField($fieldName, $fieldValue, $debug = false) {
-        $query = "SELECT * FROM " . $this->dbObject->getTableName();
-        $query .= " WHERE " . $fieldName . " = ?";
+        $query = "SELECT * FROM ".$this->dbObject->getTableName();
+        $query .= " WHERE ".$fieldName." = ?";
 
         if ($this->conditions != "") {
-            $query .= " AND " . $this->conditions;
+            $query .= " AND ".$this->conditions;
         }
 
-        $query.= $this->getQueryOrderSQL();
-        $query.= $this->getQueryLimitSQL();
+        $query .= $this->getQueryOrderSQL();
+        $query .= $this->getQueryLimitSQL();
 
         $fieldType = DBField::getType($fieldValue);
         if (!$debug) {
@@ -253,10 +253,10 @@ 
      * @return int Number of records.
      */
     public function count() {
-        $query = "SELECT count(*) FROM " . $this->dbObject->getTableName();
+        $query = "SELECT count(*) FROM ".$this->dbObject->getTableName();
 
         if ($this->conditions != "") {
-            $query .= " WHERE " . $this->conditions;
+            $query .= " WHERE ".$this->conditions;
         }
 
         return DBCore::selectSingleValue($query);
@@ -268,10 +268,10 @@ 
      * @return int Number of records.
      */
     public function max() {
-        $query = "SELECT max(`" . $this->field . "`) FROM " . $this->dbObject->getTableName();
+        $query = "SELECT max(`".$this->field."`) FROM ".$this->dbObject->getTableName();
 
         if ($this->conditions != "") {
-            $query .= " WHERE " . $this->conditions;
+            $query .= " WHERE ".$this->conditions;
         }
 
         return DBCore::selectSingleValue($query);
@@ -283,10 +283,10 @@ 
      * @return int Number of records.
      */
     public function min() {
-        $query = "SELECT min(`" . $this->field . "`) FROM " . $this->dbObject->getTableName();
+        $query = "SELECT min(`".$this->field."`) FROM ".$this->dbObject->getTableName();
 
         if ($this->conditions != "") {
-            $query .= " WHERE " . $this->conditions;
+            $query .= " WHERE ".$this->conditions;
         }
 
         return DBCore::selectSingleValue($query);
@@ -299,10 +299,10 @@ 
      */
     private function getQueryOrderSQL() {
         if ($this->order != "") {
-            return (" ORDER BY " . $this->order);
+            return (" ORDER BY ".$this->order);
         }
 
-        return (" ORDER BY " . $this->dbObject->getIdFieldName() . " DESC");
+        return (" ORDER BY ".$this->dbObject->getIdFieldName()." DESC");
     }
 
     /**
@@ -313,10 +313,10 @@ 
     private function getQueryLimitSQL() {
         if ($this->count !== "all") {
             if ($this->offset > 0) {
-                return (" LIMIT " . $this->offset . "," . $this->count);
+                return (" LIMIT ".$this->offset.",".$this->count);
             }
 
-            return (" LIMIT " . $this->count);
+            return (" LIMIT ".$this->count);
         }
 
         return "";
@@ -365,7 +365,7 @@ 
         elseif (preg_match("#^selectAll([A-Z]{1}[[:alpha:]]+)s#", $methodName, $matches)) {
             $this->validateClassName(preg_replace("#ie$#", "y", $matches[1]));
 
-            $this->order = "`" . $this->dbObject->getIdFieldName() . "` DESC";
+            $this->order = "`".$this->dbObject->getIdFieldName()."` DESC";
             if (isset($methodParams[0])) {
                 $this->order = (string)$methodParams[0];
             }
@@ -412,7 +412,7 @@ 
             case ("get"):
                 return $this->getFieldValue($fieldName);
             default:
-                throw new DBSelectorException("No method with name '" . $methodName . "'");
+                throw new DBSelectorException("No method with name '".$methodName."'");
         }
     }
 }

framework/mail/POP.php

Doc Comments +7 added lines, -5 removed lines

@@ -98,7 +98,8 @@ 
     /**
      * Delete message from POP server.
      *
-     * @return int $messageId Id of the message.
+     * @param integer $messageId
+     * @return string $messageId Id of the message.
      *
      * @return string Response string.
      */
@@ -111,7 +112,7 @@ 
     /**
      * Count messages in POP server.
      *
-     * @return type
+     * @return integer
      */
     public function countMessages() {
         fwrite($this->connection, "STAT\r\n");
@@ -124,7 +125,7 @@ 
     /**
      * Return message header.
      *
-     * @return int $messageNumber Number of the message.
+     * @return string $messageNumber Number of the message.
      *
      * @return string
      */
@@ -159,9 +160,10 @@ 
     /**
      * Return message by number.
      *
-     * @return int $messageNumber Number of the message
+     * @param integer $messageNumber
+     * @return false|string $messageNumber Number of the message
      *
-     * @return string
+     * @return false|string
      */
     public function getMessage($messageNumber) {
         fwrite($this->connection, "RETR $messageNumber\r\n");

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

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