mirror/blessing-skin-server
2
0
Fork 1
mirror of https://github.com/bs-community/blessing-skin-server.git synced 2024-12-15 06:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

use awesome Carbon instead of awful strtotime()

Browse Source
This commit is contained in:
printempw 2016-10-16 21:30:40 +08:00
parent 0aa68aeb58
commit 923b048e4f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Models/User.php
View File

@ -2,8 +2,9 @@
namespace App\Models; namespace App\Models;
use Option;
use Utils; use Utils;
use Option;
use Carbon\Carbon;
class User class User
{ {
@ -191,17 +192,17 @@ class User
public function canCheckIn($return_remaining_time = false) public function canCheckIn($return_remaining_time = false)
{ {
// convert to timestamp // convert to timestamp
$last_sign_timestamp = strtotime($this->getLastSignTime()); $last_sign_at = strtotime($this->getLastSignTime());
$zero_timestamp_today = strtotime(date('Y-m-d',time()));
$zero_timestamp_tomorrow = strtotime(date('Y-m-d',strtotime('+1 day')));
if (Option::get('sign_after_zero') == "1") { if (Option::get('sign_after_zero') == "1") {
$remaining_time = ($zero_timestamp_tomorrow - time()) / 3600; $remaining_time = (Carbon::tomorrow()->timestamp - time()) / 3600;
return $return_remaining_time ? round($remaining_time) : ($last_sign_timestamp <= $zero_timestamp_today); $can_check_in = $last_sign_at <= Carbon::today()->timestamp;
} else { } else {
$remaining_time = ($last_sign_timestamp + Option::get('sign_gap_time') * 3600 - time()) / 3600; $remaining_time = ($last_sign_at + Option::get('sign_gap_time') * 3600 - time()) / 3600;
return $return_remaining_time ? round($remaining_time) : ($remaining_time <= 0); $can_check_in = $remaining_time <= 0;
} }
return $return_remaining_time ? round($remaining_time) : $can_check_in;
} }
public function getLastSignTime() public function getLastSignTime()