X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tumblr%2Ftumblr.php;h=0a22d143a6ca25baade190ceb743ac03bfb1458d;hb=800d15e40a4497299784e9fe8802fc5dffdcb751;hp=619ff16e807f43611f6b7af7c963adca9372da99;hpb=86b958e7962a3f22b50f504e836f37b57269dc9f;p=friendica-addons.git

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 619ff16e..0a22d143 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -11,6 +11,9 @@
 require_once('library/OAuth1.php');
 require_once('addon/tumblr/tumblroauth/tumblroauth.php');
 
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
 function tumblr_install() {
 	register_hook('post_local',           'addon/tumblr/tumblr.php', 'tumblr_post_local');
 	register_hook('notifier_normal',      'addon/tumblr/tumblr.php', 'tumblr_send');
@@ -60,16 +63,16 @@ function tumblr_plugin_admin(&$a, &$o){
         $o = replace_macros($t, array(
                 '$submit' => t('Save Settings'),
                                                                 // name, label, value, help, [extra values]
-                '$consumer_key' => array('consumer_key', t('Consumer Key'),  get_config('tumblr', 'consumer_key' ), ''),
-                '$consumer_secret' => array('consumer_secret', t('Consumer Secret'),  get_config('tumblr', 'consumer_secret' ), ''),
+                '$consumer_key' => array('consumer_key', t('Consumer Key'),  Config::get('tumblr', 'consumer_key' ), ''),
+                '$consumer_secret' => array('consumer_secret', t('Consumer Secret'),  Config::get('tumblr', 'consumer_secret' ), ''),
         ));
 }
 
 function tumblr_plugin_admin_post(&$a){
         $consumer_key     =       ((x($_POST,'consumer_key'))              ? notags(trim($_POST['consumer_key']))   : '');
         $consumer_secret =       ((x($_POST,'consumer_secret'))   ? notags(trim($_POST['consumer_secret'])): '');
-        set_config('tumblr','consumer_key',$consumer_key);
-        set_config('tumblr','consumer_secret',$consumer_secret);
+        Config::set('tumblr','consumer_key',$consumer_key);
+        Config::set('tumblr','consumer_secret',$consumer_secret);
         info( t('Settings updated.'). EOL );
 }
 
@@ -81,8 +84,8 @@ function tumblr_connect($a) {
 	//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
 
 	// Define the needed keys
-	$consumer_key = get_config('tumblr','consumer_key');
-	$consumer_secret = get_config('tumblr','consumer_secret');
+	$consumer_key = Config::get('tumblr','consumer_key');
+	$consumer_secret = Config::get('tumblr','consumer_secret');
 
 	// The callback URL is the script that gets called after the user authenticates with tumblr
 	// In this example, it would be the included callback.php
@@ -131,8 +134,8 @@ function tumblr_callback($a) {
 	//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
 
 	// Define the needed keys
-	$consumer_key = get_config('tumblr','consumer_key');
-	$consumer_secret = get_config('tumblr','consumer_secret');
+	$consumer_key = Config::get('tumblr','consumer_key');
+	$consumer_secret = Config::get('tumblr','consumer_secret');
 
 	// Once the user approves your app at Tumblr, they are sent back to this script.
 	// This script is passed two parameters in the URL, oauth_token (our Request Token)
@@ -143,7 +146,7 @@ function tumblr_callback($a) {
 	// It'll need our Consumer Key and Secret as well as our Request Token and Secret
 	$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $_SESSION['request_token'], $_SESSION['request_token_secret']);
 
-	// Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL. 
+	// Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL.
 	$access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);
 
 	// We're done with the Request Token and Secret so let's remove those.
@@ -158,8 +161,8 @@ function tumblr_callback($a) {
 	}
 
 	// What's next?  Now that we have an Access Token and Secret, we can make an API call.
-	set_pconfig(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
-	set_pconfig(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
+	PConfig::set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
+	PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
 
 	$o = t("You are now authenticated to tumblr.");
 	$o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
@@ -170,9 +173,9 @@ function tumblr_jot_nets(&$a,&$b) {
 	if(! local_user())
 		return;
 
-	$tmbl_post = get_pconfig(local_user(),'tumblr','post');
+	$tmbl_post = PConfig::get(local_user(),'tumblr','post');
 	if(intval($tmbl_post) == 1) {
-		$tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default');
+		$tmbl_defpost = PConfig::get(local_user(),'tumblr','post_by_default');
 		$selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
 		$b .= '<div class="profile-jot-net"><input type="checkbox" name="tumblr_enable"' . $selected . ' value="1" /> '
 			. t('Post to Tumblr') . '</div>';
@@ -191,11 +194,11 @@ function tumblr_settings(&$a,&$s) {
 
 	/* Get the current state of our config variables */
 
-	$enabled = get_pconfig(local_user(),'tumblr','post');
+	$enabled = PConfig::get(local_user(),'tumblr','post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
 	$css = (($enabled) ? '' : '-disabled');
 
-	$def_enabled = get_pconfig(local_user(),'tumblr','post_by_default');
+	$def_enabled = PConfig::get(local_user(),'tumblr','post_by_default');
 
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
@@ -223,15 +226,15 @@ function tumblr_settings(&$a,&$s) {
 	$s .= '<input id="tumblr-bydefault" type="checkbox" name="tumblr_bydefault" value="1" ' . $def_checked . '/>';
 	$s .= '</div><div class="clear"></div>';
 
-	$oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token");
-	$oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret");
+	$oauth_token = PConfig::get(local_user(), "tumblr", "oauth_token");
+	$oauth_token_secret = PConfig::get(local_user(), "tumblr", "oauth_token_secret");
 
 	$s .= '<div id="tumblr-page-wrapper">';
-	if (($oauth_token != "") and ($oauth_token_secret != "")) {
+	if (($oauth_token != "") && ($oauth_token_secret != "")) {
 
-		$page = get_pconfig(local_user(),'tumblr','page');
-		$consumer_key = get_config('tumblr','consumer_key');
-		$consumer_secret = get_config('tumblr','consumer_secret');
+		$page = PConfig::get(local_user(),'tumblr','page');
+		$consumer_key = Config::get('tumblr','consumer_key');
+		$consumer_secret = Config::get('tumblr','consumer_secret');
 
 		$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
 
@@ -265,39 +268,46 @@ function tumblr_settings_post(&$a,&$b) {
 
 	if(x($_POST,'tumblr-submit')) {
 
-		set_pconfig(local_user(),'tumblr','post',intval($_POST['tumblr']));
-		set_pconfig(local_user(),'tumblr','page',$_POST['tumblr_page']);
-		set_pconfig(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault']));
+		PConfig::set(local_user(),'tumblr','post',intval($_POST['tumblr']));
+		PConfig::set(local_user(),'tumblr','page',$_POST['tumblr_page']);
+		PConfig::set(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault']));
 
 	}
 
 }
 
-function tumblr_post_local(&$a,&$b) {
+function tumblr_post_local(&$a, &$b) {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
-	if($b['edit'])
+	if ($b['edit']) {
 		return;
+	}
 
-	if((! local_user()) || (local_user() != $b['uid']))
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
+	}
 
-	if($b['private'] || $b['parent'])
+	if ($b['private'] || $b['parent']) {
 		return;
+	}
 
-	$tmbl_post   = intval(get_pconfig(local_user(),'tumblr','post'));
+	$tmbl_post   = intval(PConfig::get(local_user(),'tumblr','post'));
 
 	$tmbl_enable = (($tmbl_post && x($_REQUEST,'tumblr_enable')) ? intval($_REQUEST['tumblr_enable']) : 0);
 
-	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'tumblr','post_by_default')))
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'tumblr','post_by_default'))) {
 		$tmbl_enable = 1;
+	}
 
-	if(! $tmbl_enable)
+	if (!$tmbl_enable) {
 		return;
+	}
 
-	if(strlen($b['postopts']))
+	if (strlen($b['postopts'])) {
 		$b['postopts'] .= ',';
+	}
+
 	$b['postopts'] .= 'tumblr';
 }
 
@@ -315,9 +325,9 @@ function tumblr_send(&$a,&$b) {
 	if($b['parent'] != $b['id'])
 		return;
 
-	$oauth_token = get_pconfig($b['uid'], "tumblr", "oauth_token");
-	$oauth_token_secret = get_pconfig($b['uid'], "tumblr", "oauth_token_secret");
-	$page = get_pconfig($b['uid'], "tumblr", "page");
+	$oauth_token = PConfig::get($b['uid'], "tumblr", "oauth_token");
+	$oauth_token_secret = PConfig::get($b['uid'], "tumblr", "oauth_token_secret");
+	$page = PConfig::get($b['uid'], "tumblr", "page");
 	$tmbl_blog = 'blog/'.$page.'/post';
 
 	if($oauth_token && $oauth_token_secret && $tmbl_blog) {
@@ -350,7 +360,7 @@ function tumblr_send(&$a,&$b) {
 		if (!isset($siteinfo["type"]))
 			$siteinfo["type"] = "";
 
-		if (($title == "") AND isset($siteinfo["title"]))
+		if (($title == "") && isset($siteinfo["title"]))
 			$title = $siteinfo["title"];
 
 		if (isset($siteinfo["text"]))
@@ -391,15 +401,15 @@ function tumblr_send(&$a,&$b) {
 				break;
 		}
 
-		if (isset($params['caption']) AND (trim($title) != ""))
+		if (isset($params['caption']) && (trim($title) != ""))
 			$params['caption'] = '<h1>'.$title."</h1>".
 						"<p>".$params['caption']."</p>";
 
 		if (trim($params['caption']) == "")
 			$params['caption'] = bbcode("[quote]".$siteinfo["description"]."[/quote]", false, false, 4);
 
-		$consumer_key = get_config('tumblr','consumer_key');
-		$consumer_secret = get_config('tumblr','consumer_secret');
+		$consumer_key = Config::get('tumblr','consumer_key');
+		$consumer_secret = Config::get('tumblr','consumer_secret');
 
 		$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);