Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
7611ef32
Commit
7611ef32
authored
Jun 30, 2014
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4117 from creocoder/apps-advanced-common-user-code-style-fixes
[skip-ci] Advanced app `User` model code style fixes
parents
a42e550c
fed61f7d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
User.php
apps/advanced/common/models/User.php
+4
-10
No files found.
apps/advanced/common/models/User.php
View file @
7611ef32
<?php
namespace
common\models
;
use
Yii
;
use
yii\base\NotSupportedException
;
use
yii\behaviors\TimestampBehavior
;
use
yii\db\ActiveRecord
;
use
Yii
;
use
yii\web\IdentityInterface
;
/**
...
...
@@ -25,7 +26,6 @@ class User extends ActiveRecord implements IdentityInterface
{
const
STATUS_DELETED
=
0
;
const
STATUS_ACTIVE
=
10
;
const
ROLE_USER
=
10
;
/**
...
...
@@ -42,13 +42,7 @@ class User extends ActiveRecord implements IdentityInterface
public
function
behaviors
()
{
return
[
'timestamp'
=>
[
'class'
=>
'yii\behaviors\TimestampBehavior'
,
'attributes'
=>
[
ActiveRecord
::
EVENT_BEFORE_INSERT
=>
[
'created_at'
,
'updated_at'
],
ActiveRecord
::
EVENT_BEFORE_UPDATE
=>
[
'updated_at'
],
],
],
TimestampBehavior
::
className
(),
];
}
...
...
@@ -101,7 +95,7 @@ class User extends ActiveRecord implements IdentityInterface
*/
public
static
function
findByPasswordResetToken
(
$token
)
{
$expire
=
\
Yii
::
$app
->
params
[
'user.passwordResetTokenExpire'
];
$expire
=
Yii
::
$app
->
params
[
'user.passwordResetTokenExpire'
];
$parts
=
explode
(
'_'
,
$token
);
$timestamp
=
(
int
)
end
(
$parts
);
if
(
$timestamp
+
$expire
<
time
())
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment