X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Foauth.php;h=3d4533d3e0061da5a4a8e1af01d9c2d0629ee82a;hb=e6463c8af6af247c9555bf2677a6aa75a4721d62;hp=103d4c2fa9458a306f4f37e1600f8d493595678a;hpb=06c9330c5e0f5822cbd1695a50b01fb391a2984d;p=friendica.git diff --git a/include/oauth.php b/include/oauth.php index 103d4c2fa9..3d4533d3e0 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -1,8 +1,8 @@ - * + * */ define('REQUEST_TOKEN_DURATION', 300); @@ -15,15 +15,15 @@ class FKOAuthDataStore extends OAuthDataStore { function gen_token(){ return md5(base64_encode(pack('N6', mt_rand(), mt_rand(), mt_rand(), mt_rand(), mt_rand(), uniqid()))); } - + function lookup_consumer($consumer_key) { logger(__function__.":".$consumer_key); //echo "
"; var_dump($consumer_key); killme(); - + $r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'", dbesc($consumer_key) ); - if (count($r)) + if (dbm::is_result($r)) return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']); return null; } @@ -35,7 +35,7 @@ class FKOAuthDataStore extends OAuthDataStore { dbesc($token_type), dbesc($token) ); - if (count($r)){ + if (dbm::is_result($r)){ $ot=new OAuthToken($r[0]['id'],$r[0]['secret']); $ot->scope=$r[0]['scope']; $ot->expires = $r[0]['expires']; @@ -52,7 +52,7 @@ class FKOAuthDataStore extends OAuthDataStore { dbesc($nonce), intval($timestamp) ); - if (count($r)) + if (dbm::is_result($r)) return new OAuthToken($r[0]['id'],$r[0]['secret']); return null; } @@ -129,14 +129,14 @@ class FKOAuth1 extends OAuthServer { $this->add_signature_method(new OAuthSignatureMethod_PLAINTEXT()); $this->add_signature_method(new OAuthSignatureMethod_HMAC_SHA1()); } - + function loginUser($uid){ logger("FKOAuth1::loginUser $uid"); $a = get_app(); - $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1", + $r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1", intval($uid) ); - if(count($r)){ + if (dbm::is_result($r)){ $record = $r[0]; } else { logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG); @@ -148,8 +148,9 @@ class FKOAuth1 extends OAuthServer { $_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme'); $_SESSION['authenticated'] = 1; $_SESSION['page_flags'] = $record['page-flags']; - $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname']; + $_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $record['nickname']; $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; + $_SESSION["allow_api"] = true; //notice( t("Welcome back ") . $record['username'] . EOL); $a->user = $record; @@ -161,12 +162,12 @@ class FKOAuth1 extends OAuthServer { $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); - if(count($r)) { + if (dbm::is_result($r)) { $a->contact = $r[0]; $a->cid = $r[0]['id']; $_SESSION['cid'] = $a->cid; } - q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1", + q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d", dbesc(datetime_convert()), intval($_SESSION['uid']) ); @@ -218,7 +219,7 @@ class FKOAuth2 extends OAuth2 { $r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'", dbesc($oauth_token)); - if (count($r)) + if (dbm::is_result($r)) return $r[0]; return null; } @@ -246,7 +247,7 @@ class FKOAuth2 extends OAuth2 { $r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'", dbesc($code)); - if (count($r)) + if (dbm::is_result($r)) return $r[0]; return null; }