Issue 3873

[friendica-addons.git] / tumblr / tumblr.php

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 50530401d223df7fd8091d755e77ba8e8ed7b826..0a22d143a6ca25baade190ceb743ac03bfb1458d 100644 (file)
--- 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)
@@ -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 != "") && ($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,9 +268,9 @@ 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']));
 
        }
 
@@ -289,11 +292,11 @@ function tumblr_post_local(&$a, &$b) {
                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 ($b['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;
        }
 
@@ -322,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) {
@@ -405,8 +408,8 @@ function tumblr_send(&$a,&$b) {
                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);