From eb56544d1d25a7a2d94715feb8a840f709687301 Mon Sep 17 00:00:00 2001
From: Yuan Chiu <chyuaner@gmail.com>
Date: Tue, 29 Jul 2014 12:01:10 -0700
Subject: [PATCH] Fix Database class

---
 htdocs/lib/Database/Database.php |  9 +++++++--
 htdocs/lib/Database/MySQLDB.php  | 11 +++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/lib/Database/Database.php b/htdocs/lib/Database/Database.php
index da13683..54d2b96 100644
--- a/htdocs/lib/Database/Database.php
+++ b/htdocs/lib/Database/Database.php
@@ -15,7 +15,8 @@ use UElearning\Database\Exception;
 /**
  * 資料庫操作抽象類別
  * 
- * 請根據一個資料表創建一個類別，並繼承此類別。所有對於資料表的操作（包含查詢、新增、修改、刪除），一律使用新創已繼承的類別物件。
+ * 請根據一個資料表創建一個類別，並繼承此類別。
+ * 所有對於資料表的操作（包含查詢、新增、修改、刪除），一律使用新創已繼承的類別物件。
  * 
  * 基本的操作方式例如:
  * 
@@ -136,7 +137,11 @@ abstract class Database {
         
         // 檢查是否有支援所設定的DBMS
         if($this->db_type == 'mysql') {
-            $this->connDB = new MySQLDB($this->db_name, $this->db_host, $this->db_port, $this->db_user, $this->db_passwd);
+            $this->connDB = new MySQLDB($this->db_name
+                                        , $this->db_host
+                                        , $this->db_port
+                                        , $this->db_user
+                                        , $this->db_passwd);
         }
         else {
             throw new Exception\DatabaseNoSupportException($this->db_type);
diff --git a/htdocs/lib/Database/MySQLDB.php b/htdocs/lib/Database/MySQLDB.php
index daa8fa7..8f6035d 100644
--- a/htdocs/lib/Database/MySQLDB.php
+++ b/htdocs/lib/Database/MySQLDB.php
@@ -33,12 +33,13 @@ class MySQLDB extends PDO {
      * @since 3.0.0
      */
     public function __construct($dbname, $host, $port, $user, $passwd){
-        parent::__construct("mysql:dbname=".$dbname.";host:".$host."port=".$port.";
-                             charset=utf8", DB_USER, DB_PASS);
+        parent::__construct('mysql:dbname='.$dbname
+                            .';host:'.$host.';port='.$port
+                            .';charset=utf8', DB_USER, DB_PASS);
 
         //配合PHP< 5.3.6 PDO沒有charset用的
         //參考: http://gdfan1114.wordpress.com/2013/06/24/php-5-3-6-%E7%89%88-pdo-%E9%85%8D%E5%90%88%E5%AD%98%E5%8F%96%E8%B3%87%E6%96%99%E5%BA%AB%E6%99%82%E7%9A%84%E4%B8%AD%E6%96%87%E5%95%8F%E9%A1%8C/
-        $this->exec("set names utf8");
+        $this->exec('set names utf8');
         
     }
 
@@ -58,7 +59,9 @@ class MySQLDB extends PDO {
     public function ErrorMsg(){
         $err = parent ::errorinfo();
         if( $err[0]!='00000' ){
-            return array('errorCode'=>$err[0],'number'=>$err[1],'message'=>$err[2]);
+            return array('errorCode'=>$err[0]
+                         ,'number'=>$err[1]
+                         ,'message'=>$err[2]);
         }else{
             return null;
         }