X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fapi.php;h=69d7311a0b80572e2c76feb8ead8d1254cc07f01;hb=c54a2c1e83822f6e043b449468570d2c9ed3ab3a;hp=caa1cba2a6625e13d1f85029342bd87814337fd5;hpb=ace8f753ac81caaf3385c4c37b58551a8b10fdfd;p=friendica.git

diff --git a/mod/api.php b/mod/api.php
index caa1cba2a6..69d7311a0b 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -1,8 +1,14 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Module\Login;
+
 require_once('include/api.php');
 
-function oauth_get_client($request){
+function oauth_get_client($request)
+{
 
 
 	$params = $request->get_parameters();
@@ -11,66 +17,65 @@ function oauth_get_client($request){
 	$r = q("SELECT `clients`.*
 			FROM `clients`, `tokens`
 			WHERE `clients`.`client_id`=`tokens`.`client_id`
-			AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'",
-			dbesc($token));
+			AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", dbesc($token));
 
-	if (!dbm::is_result($r))
+	if (!DBM::is_result($r))
 		return null;
 
 	return $r[0];
 }
 
-function api_post(&$a) {
-
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+function api_post(App $a)
+{
+	if (!local_user()) {
+		notice(t('Permission denied.') . EOL);
 		return;
 	}
 
-	if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
-		notice( t('Permission denied.') . EOL);
+	if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+		notice(t('Permission denied.') . EOL);
 		return;
 	}
-
 }
 
-function api_content(&$a) {
-	if ($a->cmd=='api/oauth/authorize'){
+function api_content(App $a)
+{
+	if ($a->cmd == 'api/oauth/authorize') {
 		/*
 		 * api/oauth/authorize interact with the user. return a standard page
 		 */
 
 		$a->page['template'] = "minimal";
 
-
 		// get consumer/client from request token
 		try {
 			$request = OAuthRequest::from_request();
-		} catch(Exception $e) {
-			echo "<pre>"; var_dump($e); killme();
+		} catch (Exception $e) {
+			echo "<pre>";
+			var_dump($e);
+			killme();
 		}
 
-
-		if (x($_POST,'oauth_yes')){
-
+		if (x($_POST, 'oauth_yes')) {
 			$app = oauth_get_client($request);
-			if (is_null($app)) return "Invalid request. Unknown token.";
+			if (is_null($app)) {
+				return "Invalid request. Unknown token.";
+			}
 			$consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
 
-			$verifier = md5($app['secret'].local_user());
-			set_config("oauth", $verifier, local_user());
+			$verifier = md5($app['secret'] . local_user());
+			Config::set("oauth", $verifier, local_user());
 
-
-			if ($consumer->callback_url!=null) {
+			if ($consumer->callback_url != null) {
 				$params = $request->get_parameters();
-				$glue="?";
-				if (strstr($consumer->callback_url,$glue)) $glue="?";
-				goaway($consumer->callback_url.$glue."oauth_token=".OAuthUtil::urlencode_rfc3986($params['oauth_token'])."&oauth_verifier=".OAuthUtil::urlencode_rfc3986($verifier));
+				$glue = "?";
+				if (strstr($consumer->callback_url, $glue)) {
+					$glue = "?";
+				}
+				goaway($consumer->callback_url . $glue . "oauth_token=" . OAuthUtil::urlencode_rfc3986($params['oauth_token']) . "&oauth_verifier=" . OAuthUtil::urlencode_rfc3986($verifier));
 				killme();
 			}
 
-
-
 			$tpl = get_markup_template("oauth_authorize_done.tpl");
 			$o = replace_macros($tpl, array(
 				'$title' => t('Authorize application connection'),
@@ -79,35 +84,29 @@ function api_content(&$a) {
 			));
 
 			return $o;
-
-
 		}
 
-
-		if (! local_user()) {
+		if (!local_user()) {
 			/// @TODO We need login form to redirect to this page
-			notice( t('Please login to continue.') . EOL );
-			return login(false,$request->get_parameters());
+			notice(t('Please login to continue.') . EOL);
+			return Login::form($a->query_string, false, $request->get_parameters());
 		}
 		//FKOAuth1::loginUser(4);
 
 		$app = oauth_get_client($request);
-		if (is_null($app)) return "Invalid request. Unknown token.";
-
-
-
+		if (is_null($app)) {
+			return "Invalid request. Unknown token.";
+		}
 
 		$tpl = get_markup_template('oauth_authorize.tpl');
 		$o = replace_macros($tpl, array(
 			'$title' => t('Authorize application connection'),
 			'$app' => $app,
 			'$authorize' => t('Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?'),
-			'$yes'	=> t('Yes'),
-			'$no'	=> t('No'),
+			'$yes' => t('Yes'),
+			'$no' => t('No'),
 		));
 
-		//echo "<pre>"; var_dump($app); killme();
-
 		return $o;
 	}