Merge branch 'master' of github.com:ArtemD/SpeedFreak

[speedfreak] / Server / application / models / user.php

diff --git a/Server/application/models/user.php b/Server/application/models/user.php
index 30723bc..749d0dc 100644 (file)
--- a/Server/application/models/user.php
+++ b/Server/application/models/user.php
@@ -82,7 +82,7 @@ class User_Model extends Model {
      * @return bool Returns True if user exists and false otherwise
      */
     private function user_exists($username, $email){
-       if ($this->db->query("SELECT id FROM users WHERE username=? OR email='?'",
+       if ($this->db->query("SELECT id FROM users WHERE username='?' OR email='?'",
                           $username, $email)->count()>0)
               return true;
            else
@@ -106,7 +106,7 @@ class User_Model extends Model {
      * @return integer|bool User id if successful or false
      */
     public function get_id($username){
-        $result = $this->db->query("SELECT id FROM users WHERE username=?", $username);
+        $result = $this->db->query("SELECT id FROM users WHERE username='?'", $username);
                if ($result->count()>0)
            return $result[0]->id;
         else
@@ -138,7 +138,7 @@ class User_Model extends Model {
         // hash password
         $password = $this->hash($password);
         
-        if ($this->db->query("SELECT id FROM users WHERE username = ? AND password = ?",
+        if ($this->db->query("SELECT id FROM users WHERE username='?' AND password='?'",
                              $username, $password)->count()>0)
             return true;
         else