diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-24 15:59:03 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-24 15:59:03 -0700 |
| commit | d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653 (patch) | |
| tree | 20c715f196dbbca6cc8b54d426ca98ac3d1792d1 /include/oauth.php | |
| parent | 52e38d7c24d9e2517e4691a0f2548a695e7806da (diff) | |
| parent | 13546167877322afa274a2540656f525e55d3b48 (diff) | |
| download | volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.tar.gz volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.tar.bz2 volse-hubzilla-d9061fd09ecdb4fe94ac6b2b99e8f35f613ad653.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/oauth.php')
| -rw-r--r-- | include/oauth.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/oauth.php b/include/oauth.php index ec754db95..a9509c68e 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -75,12 +75,12 @@ class FKOAuthDataStore extends OAuthDataStore { $k = $consumer; } - $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d)", + $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', %d)", dbesc($key), dbesc($sec), dbesc($k), 'request', - intval(REQUEST_TOKEN_DURATION)); + time()+intval(REQUEST_TOKEN_DURATION)); if (!$r) return null; return new OAuthToken($key,$sec); @@ -104,12 +104,12 @@ class FKOAuthDataStore extends OAuthDataStore { $key = $this->gen_token(); $sec = $this->gen_token(); - $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d, %d)", + $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, %d)", dbesc($key), dbesc($sec), dbesc($consumer->key), 'access', - intval(ACCESS_TOKEN_DURATION), + time()+intval(ACCESS_TOKEN_DURATION), intval($uverifier)); if ($r) |