Issue 3873

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

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 097bac18599b1c4c3a29365a3d9f4692d54ff7e7..984ab4b4677d9393e637b157eba4551280e35c6f 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -9,6 +9,9 @@
 
 define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
 require_once('mod/share.php');
 require_once('mod/parse_url.php');
 require_once('include/text.php');
@@ -39,9 +42,9 @@ function fromgplus_addon_settings(&$a,&$s) {
        if (count($result) > 0)
                return;
 
-       $enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
-       $keywords_checked = (intval(get_pconfig(local_user(), 'fromgplus', 'keywords')) ? ' checked="checked"' : '');
-       $account = get_pconfig(local_user(),'fromgplus','account');
+       $enable_checked = (intval(PConfig::get(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
+       $keywords_checked = (intval(PConfig::get(local_user(), 'fromgplus', 'keywords')) ? ' checked="checked"' : '');
+       $account = PConfig::get(local_user(),'fromgplus','account');
 
        $s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
        $s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t('Google+ Mirror').'</h3>';
@@ -76,11 +79,11 @@ function fromgplus_addon_settings_post(&$a,&$b) {
                return;
 
        if($_POST['fromgplus-submit']) {
-               set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
+               PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
                $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
-               set_pconfig(local_user(),'fromgplus','enable', $enable);
+               PConfig::set(local_user(),'fromgplus','enable', $enable);
                $keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0);
-               set_pconfig(local_user(),'fromgplus', 'keywords', $keywords);
+               PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
 
                if (!$enable)
                        del_pconfig(local_user(),'fromgplus','lastdate');
@@ -94,20 +97,20 @@ function fromgplus_plugin_admin(&$a, &$o){
 
         $o = replace_macros($t, array(
                 '$submit' => t('Save Settings'),
-                '$key' => array('key', t('Key'), trim(get_config('fromgplus', 'key')), t('')),
+                '$key' => array('key', t('Key'), trim(Config::get('fromgplus', 'key')), t('')),
         ));
 }
 
 function fromgplus_plugin_admin_post(&$a){
         $key = ((x($_POST,'key')) ? trim($_POST['key']) : '');
-        set_config('fromgplus','key',$key);
+        Config::set('fromgplus','key',$key);
         info( t('Settings updated.'). EOL );
 }
 
 function fromgplus_cron($a,$b) {
-       $last = get_config('fromgplus','last_poll');
+       $last = Config::get('fromgplus','last_poll');
 
-        $poll_interval = intval(get_config('fromgplus','poll_interval'));
+        $poll_interval = intval(Config::get('fromgplus','poll_interval'));
         if(! $poll_interval)
                 $poll_interval = FROMGPLUS_DEFAULT_POLL_INTERVAL;
 
@@ -124,7 +127,7 @@ function fromgplus_cron($a,$b) {
         $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fromgplus' AND `k` = 'enable' AND `v` = '1' ORDER BY RAND() ");
         if(count($r)) {
                 foreach($r as $rr) {
-                       $account = get_pconfig($rr['uid'],'fromgplus','account');
+                       $account = PConfig::get($rr['uid'],'fromgplus','account');
                        if ($account) {
                        logger('fromgplus: fetching for user '.$rr['uid']);
                                fromgplus_fetch($a, $rr['uid']);
@@ -134,7 +137,7 @@ function fromgplus_cron($a,$b) {
 
         logger('fromgplus: cron_end');
 
-       set_config('fromgplus','last_poll', time());
+       Config::set('fromgplus','last_poll', time());
 }
 
 function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
@@ -338,7 +341,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 
                                // Add Keywords to page link
                                $data = parseurl_getsiteinfo_cached($pagedata["url"], true);
-                               if (isset($data["keywords"]) && get_pconfig($uid, 'fromgplus', 'keywords')) {
+                               if (isset($data["keywords"]) && PConfig::get($uid, 'fromgplus', 'keywords')) {
                                        $pagedata["keywords"] = $data["keywords"];
                                }
                                break;
@@ -429,8 +432,8 @@ function fromgplus_fetch($a, $uid) {
        // Special blank to identify postings from the googleplus connector
        $blank = html_entity_decode("&#x00A0;", ENT_QUOTES, 'UTF-8');
 
-       $account = get_pconfig($uid,'fromgplus','account');
-       $key = get_config('fromgplus','key');
+       $account = PConfig::get($uid,'fromgplus','account');
+       $key = Config::get('fromgplus','key');
 
        $result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
        //$result = file_get_contents("google.txt");
@@ -438,7 +441,7 @@ function fromgplus_fetch($a, $uid) {
 
        $activities = json_decode($result);
 
-       $initiallastdate = get_pconfig($uid,'fromgplus','lastdate');
+       $initiallastdate = PConfig::get($uid,'fromgplus','lastdate');
 
        $first_time = ($initiallastdate == "");
 
@@ -463,7 +466,7 @@ function fromgplus_fetch($a, $uid) {
                if ($lastdate < strtotime($item->published))
                        $lastdate = strtotime($item->published);
 
-               set_pconfig($uid,'fromgplus','lastdate', $lastdate);
+               PConfig::set($uid,'fromgplus','lastdate', $lastdate);
 
                if ($first_time)
                        continue;
@@ -505,7 +508,7 @@ function fromgplus_fetch($a, $uid) {
                                case "activity":
                                        $post = fromgplus_html2bbcode($item->annotation)."\n";
 
-                                       if (!intval(get_config('system','old_share'))) {
+                                       if (!intval(Config::get('system','old_share'))) {
 
                                                if (function_exists("share_header"))
                                                        $post .= share_header($item->object->actor->displayName, $item->object->actor->url,
@@ -555,5 +558,5 @@ function fromgplus_fetch($a, $uid) {
                }
        }
        if ($lastdate != 0)
-               set_pconfig($uid,'fromgplus','lastdate', $lastdate);
+               PConfig::set($uid,'fromgplus','lastdate', $lastdate);
 }