diff --git a/i_entrance/j_icon_change.php b/i_entrance/j_icon_change.php index 398bc839..99371dfc 100644 --- a/i_entrance/j_icon_change.php +++ b/i_entrance/j_icon_change.php @@ -48,7 +48,7 @@ if(!is_uploaded_file($image['tmp_name'])) { $response['result'] = false; } elseif(!$newExt) { //확장자 검사 - $response['reason'] = 'jpg, gif, png 파일이 아닙니다!'; + $response['reason'] = 'webp, jpg, gif, png 파일이 아닙니다!'; $response['result'] = false; } elseif($image['size'] > 30720) { //파일크기 검사 @@ -70,7 +70,7 @@ if(!is_uploaded_file($image['tmp_name'])) { //이미지 저장 while(true){ - $newPicName = dechex(rand(0x000000f,0xfffffff)).$newExt; + $newPicName = dechex(rand(0x000000f,0xfffffff)).$newExt; $dest = AppConf::getUserIconPathFS().'/'.$newPicName; if(file_exists($dest)){ continue; diff --git a/i_entrance/j_set_userlist.php b/i_entrance/j_set_userlist.php index 931d1ae9..04c6905a 100644 --- a/i_entrance/j_set_userlist.php +++ b/i_entrance/j_set_userlist.php @@ -90,18 +90,18 @@ if($action == 'scrub_icon'){ $cnt = 0; - foreach(glob(AppConf::getUserIconPathFS().'/*.{jpg,png,gif}', GLOB_BRACE) as $filepath){ + foreach(glob(AppConf::getUserIconPathFS().'/*.{webp,jpg,png,gif}', GLOB_BRACE) as $filepath){ $filename = basename($filepath); - + if (array_key_exists($filename, $usedIcon)) { continue; } - + $mtime = filemtime($filepath); if($mtime > $deleteUntil){ continue; } - + @unlink($filepath); $cnt++; } @@ -115,8 +115,8 @@ if($action == 'scrub_icon'){ if($action == 'scrub_old_user'){ $deleteUntil = TimeUtil::nowAddMinutes(-60*24*30*6); $targetUser = []; - $members = $db->query('SELECT member.no, max(member_log.date) as loginDate from member - left join member_log on member.`NO` = member_log.member_no and + $members = $db->query('SELECT member.no, max(member_log.date) as loginDate from member + left join member_log on member.`NO` = member_log.member_no and (member_log.action_type="login" or member_log.action_type="reg") group by member.no'); foreach($members as $member){ if($member['loginDate'] === null){ @@ -186,7 +186,7 @@ if($action == 'delete'){ } if($action == 'reset_pw'){ - + $newPassword = Util::randomStr(6); $tmpPassword = Util::hashPassword(RootDB::getGlobalSalt(), $newPassword); $newSalt = bin2hex(random_bytes(8)); diff --git a/i_entrance/user_info.php b/i_entrance/user_info.php index b7d74229..07dd373a 100644 --- a/i_entrance/user_info.php +++ b/i_entrance/user_info.php @@ -138,7 +138,7 @@ require(__DIR__.'/../vendor/autoload.php');
-
+