diff --git a/d_setting/conf.orig.php b/d_setting/conf.orig.php index 9e45ba67..e566e043 100644 --- a/d_setting/conf.orig.php +++ b/d_setting/conf.orig.php @@ -17,7 +17,13 @@ function newRootDB(){ $port = _port_; $encoding = 'utf8'; - return new MeekroDB($host,$user,$password,$dbName,$port,$encoding); + static $uDB = NULL; + + if($uDB === NULL){ + $uDB = new MeekroDB($host,$user,$password,$dbName,$port,$encoding); + } + + return $uDB; } function newMailObj(){ diff --git a/twe/d_setting/conf.orig.php b/twe/d_setting/conf.orig.php index 03fb571c..6d58362d 100644 --- a/twe/d_setting/conf.orig.php +++ b/twe/d_setting/conf.orig.php @@ -14,5 +14,11 @@ function newDB(){ $port = _port_; $encoding = 'utf8'; - return new MeekroDB($host,$user,$password,$dbName,$port,$encoding); + static $uDB = NULL; + + if($uDB === NULL){ + $uDB = new MeekroDB($host,$user,$password,$dbName,$port,$encoding); + } + + return $uDB; } \ No newline at end of file diff --git a/twe/func_message.php b/twe/func_message.php index 8a12ce21..c593bc46 100644 --- a/twe/func_message.php +++ b/twe/func_message.php @@ -66,11 +66,11 @@ function getRawMessage($mailbox, $limit=30, $fromTime=NULL){ $db = newDB(); //TODO: table 네임의 prefix를 처리할 수 있도록 개선 - $result = $db->query($sql, array( + $result = $db->query($sql, [ 'mailbox' => $mailbox, 'limit' => $limit, 'time' => $fromTime - )); + ]); return array_map(function ($row){ @@ -78,7 +78,25 @@ function getRawMessage($mailbox, $limit=30, $fromTime=NULL){ }, $result); } -function getMessage(){ +function getMessage($msgType, $limit=30, $fromTime=NULL){ + $genID = util::array_get($_SESSION['p_id'], NULL); + if($genID === NULL){ + return []; + } + + if($msgType === 'public'){ + return getRawMessage(9999, $limit, $fromTime); + } + else if($msgType === 'private'){ + return getRawMessage($genID, $limit, $fromTime); + } + else if($msgType === 'national'){ + + } + else{ + return []; + } + } @@ -87,7 +105,7 @@ function genList($connect) { $query = "select no,nation,level,msgindex,userlevel from general where user_id='{$_SESSION['p_id']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); - $you = array(); + $you = []; $query = "select msg{$me['msgindex']}_who as reply,msg{$me['msgindex']}_type as type from general where user_id='{$_SESSION['p_id']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");