NULL -> null

This commit is contained in:
2018-03-24 12:38:03 +09:00
parent ec3d0c5f68
commit 6f186125e3
9 changed files with 14 additions and 14 deletions
+2 -2
View File
@@ -33,9 +33,9 @@ function getRootDB(){
$port = _tK_port_;
$encoding = 'utf8';
static $uDB = NULL;
static $uDB = null;
if($uDB === NULL){
if($uDB === null){
$uDB = new MeekroDB($host,$user,$password,$dbName,$port,$encoding);
$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
}
+1 -1
View File
@@ -186,7 +186,7 @@ function toInt($val, $force=false){
if(is_numeric($val)){
return intval($val);//
}
if($val === 'NULL' || $val === 'null'){
if(strtolower($val) === 'null'){
return null;
}
+2 -2
View File
@@ -14,9 +14,9 @@ function getDB(){
$port = _tK_port_;
$encoding = 'utf8';
static $uDB = NULL;
static $uDB = null;
if($uDB === NULL){
if($uDB === null){
$uDB = new MeekroDB($host,$user,$password,$dbName,$port,$encoding);
$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
}
+1 -1
View File
@@ -1343,7 +1343,7 @@ function pushHistory($history) {
function getRawLog($path, $count, $line_length, $skin){
//TODO: tail과 유사한 형태로 처리할 수 있는게 나을 듯. 그 이전에 파일 로그는 좀... ㅜㅜ
if(!file_exists($path)){
return NULL;
return null;
}
$fp = fopen($path, 'r');
+4 -4
View File
@@ -54,11 +54,11 @@ function getSingleMessage($messageID){
return [true, $messageInfo];
}
function getRawMessage($mailbox, $msgType, $limit=30, $fromSeq=NULL){
function getRawMessage($mailbox, $msgType, $limit=30, $fromSeq=null){
$sql = 'select * from `message` where `mailbox` = %i_mailbox and `type` = %s_type and `valid_until` > now()';
if($fromSeq !== NULL){
if($fromSeq !== null){
$sql .= ' and `id` > %i_id';
}
$sql .= ' ORDER BY `id` desc';
@@ -80,9 +80,9 @@ function getRawMessage($mailbox, $msgType, $limit=30, $fromSeq=NULL){
}, $result);
}
function getMessage($msgType, $nationID=null, $limit=30, $fromSeq=NULL){
function getMessage($msgType, $nationID=null, $limit=30, $fromSeq=null){
$generalID = getGeneralID(false);
if($generalID === NULL){
if($generalID === null){
return [];
}
+1 -1
View File
@@ -89,7 +89,7 @@ function commandButton() {
$generalID = getGeneralID();
if($generalID === NULL){
if($generalID === null){
return '';
}
$db = getDB();
+1 -1
View File
@@ -132,7 +132,7 @@ if($destMailbox == 9999) {
$destUser = $db->queryFirstRow('select `no`,`name`,`nation` from `general` where `no` = %s',$destMailbox);
if($destUser == NULL || empty($destUser)){
if($destUser == null || empty($destUser)){
returnJson([
'result' => false,
'reason' => '존재하지 않는 유저입니다.',
+1 -1
View File
@@ -230,7 +230,7 @@ function toInt($val, $force=false){
if(is_numeric($val)){
return intval($val);//
}
if($val === 'NULL' || $val === 'null'){
if($val === 'null' || $val === 'null'){
return null;
}
+1 -1
View File
@@ -21,7 +21,7 @@
>
<tbody><tr>
<td width="64px" height="64px">
<?php if ($src['iconPath'] !== NULL): ?>
<?php if ($src['iconPath'] !== null): ?>
<img src="<?=$this->e(urlencode($src['iconPath']))?>">
<?php else: ?>
<img src="/image/default.jpg"> <?php /*NOTE: image 폴더는 어느 단에서 다뤄야하는가? */?>