From 5d92668456208906b5ad06cbe9086ec48baa1327 Mon Sep 17 00:00:00 2001
From: Yuan Chiu <chyuaner@gmail.com>
Date: Thu, 21 Aug 2014 13:46:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=20DBUser:=20=E5=B8=B6=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E8=AE=8A=E6=95=B8=E5=90=8D=E7=A8=B1=E5=92=8C=E5=AF=A6=E9=9A=9B?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9A=84=E8=AE=8A=E6=95=B8=E5=90=8D=E7=A8=B1?=
 =?UTF-8?q?=E6=B2=92=E5=B0=8D=E5=88=B0=20->?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/lib/Database/DBUser.php | 22 +++++++++++++++++++++-
 tests/Database/DBUserTest.php  |  7 +++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/htdocs/lib/Database/DBUser.php b/htdocs/lib/Database/DBUser.php
index afec946..fb6e693 100644
--- a/htdocs/lib/Database/DBUser.php
+++ b/htdocs/lib/Database/DBUser.php
@@ -51,7 +51,7 @@ class DBUser extends Database {
             
             $query = $this->connDB->prepare($sqlString);
             $query->bindParam(":id", $uId);
-            $query->bindParam(":passwd", $uPassword);
+            $query->bindParam(":passwd", $password);
             $query->bindParam(":gid", $gId);
             $query->bindParam(":cid", $cId);
             $query->bindParam(":enable", $enable);
@@ -69,6 +69,26 @@ class DBUser extends Database {
                 
     }
     
+    /**
+     * 查詢一位使用者帳號資料
+     * @param string $uId 使用者名稱
+     * @return array 使用者資料 (TODO 格式待補)
+     */ 
+    public function queryUser($uId) {
+        
+        $sqlString = "SELECT * FROM ".$db->table('User')." WHERE `UID` = :uid";
+		
+		$query = $this->prepare($sqlString);
+		$query->bindParam(':uid',$this->thisUID);
+		$query->execute();
+		
+		$result = $query->fetchAll();
+		$this->infoArray = $result;
+		return $this->infoArray;
+        
+        // TODO unTested
+    }
+    
     /**
      * 移除一位使用者
      * @param string $uId 使用者名稱
diff --git a/tests/Database/DBUserTest.php b/tests/Database/DBUserTest.php
index de9a4ec..9b6ef1b 100644
--- a/tests/Database/DBUserTest.php
+++ b/tests/Database/DBUserTest.php
@@ -41,7 +41,6 @@ class DBUserTest extends \PHPUnit_Framework_TestCase
         $this->db->insertUser($uId, $uPassword, $gId, $cId, $enable,
                               $l_mode, $m_mode, 
                               $nickName, $realName, $email, $memo);
-        
     }
     
     /**
@@ -53,9 +52,13 @@ class DBUserTest extends \PHPUnit_Framework_TestCase
         $this->db->deleteUser($uId);
     }
     
+    /**
+     * 測試時要填的資料
+     */ 
     public function userDataProvider(){
         return array(
-            array('yuan', 'pass123', 'admin', null, true, 'harf-line-learn', 1, '元兒～', 'Yuan Chiu', 'chyuaner@gmail.com', null)
+            array('yuan_unittest', 'pass123', 'admin', null, true, 'harf-line-learn', 1, '元兒～', 'Yuan Chiu', 'chyuaner@gmail.com', null),
+            array('eee_unittest', 'qqqssss', 'admin', null, 1, 'harf-line-learn', '1', 'sss', 'Yuan Chiu', 'chyuanesr@gmail.com', null)
         );
     }
 }
\ No newline at end of file