]> git.mxchange.org Git - friendica-addons.git/blobdiff - twitter/twitter.php
Issue 3873
[friendica-addons.git] / twitter / twitter.php
index 52c99c2976bc875f825df4c139c65a4a8f40a379..dcfbeeb35a003f130a24d6234e70e5001d30cf2c 100644 (file)
@@ -32,7 +32,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
+
 /*   Twitter Plugin for Friendica
  *
  *   Author: Tobias Diekershoff
@@ -63,6 +63,9 @@
 require_once('include/enotify.php');
 require_once("include/socgraph.php");
 
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 function twitter_install() {
@@ -103,7 +106,7 @@ function twitter_uninstall() {
 }
 
 function twitter_check_item_notification($a, &$notification_data) {
-       $own_id = get_pconfig($notification_data["uid"], 'twitter', 'own_id');
+       $own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
 
        $own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
                        intval($notification_data["uid"]),
@@ -118,7 +121,7 @@ function twitter_follow($a, &$contact) {
 
        logger("twitter_follow: Check if contact is twitter contact. ".$contact["url"], LOGGER_DEBUG);
 
-       if (!strstr($contact["url"], "://twitter.com") AND !strstr($contact["url"], "@twitter.com"))
+       if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com"))
                return;
 
        // contact seems to be a twitter contact, so continue
@@ -127,10 +130,10 @@ function twitter_follow($a, &$contact) {
 
        $uid = $a->user["uid"];
 
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
        require_once("addon/twitter/codebird.php");
 
@@ -157,11 +160,11 @@ function twitter_jot_nets(&$a,&$b) {
        if(! local_user())
                return;
 
-       $tw_post = get_pconfig(local_user(),'twitter','post');
+       $tw_post = PConfig::get(local_user(),'twitter','post');
        if(intval($tw_post) == 1) {
-               $tw_defpost = get_pconfig(local_user(),'twitter','post_by_default');
+               $tw_defpost = PConfig::get(local_user(),'twitter','post_by_default');
                $selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
-               $b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> ' 
+               $b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
                        . t('Post to Twitter') . '</div>';
        }
 }
@@ -194,27 +197,27 @@ function twitter_settings_post ($a,$post) {
                //  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
                logger('got a Twitter PIN');
                require_once('library/twitteroauth.php');
-               $ckey    = get_config('twitter', 'consumerkey');
-               $csecret = get_config('twitter', 'consumersecret');
+               $ckey    = Config::get('twitter', 'consumerkey');
+               $csecret = Config::get('twitter', 'consumersecret');
                //  the token and secret for which the PIN was generated were hidden in the settings
                //  form as token and token2, we need a new connection to Twitter using these token
                //  and secret to request a Access Token with the PIN
                $connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
                $token   = $connection->getAccessToken( $_POST['twitter-pin'] );
                //  ok, now that we have the Access Token, save them in the user config
-               set_pconfig(local_user(),'twitter', 'oauthtoken',  $token['oauth_token']);
-               set_pconfig(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
-               set_pconfig(local_user(),'twitter', 'post', 1);
+               PConfig::set(local_user(),'twitter', 'oauthtoken',  $token['oauth_token']);
+               PConfig::set(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
+               PConfig::set(local_user(),'twitter', 'post', 1);
                //  reload the Addon Settings page, if we don't do it see Bug #42
                goaway($a->get_baseurl().'/settings/connectors');
        } else {
                //  if no PIN is supplied in the POST variables, the user has changed the setting
                //  to post a tweet for every new __public__ posting to the wall
-               set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
-               set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
-               set_pconfig(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
-               set_pconfig(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
-               set_pconfig(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
+               PConfig::set(local_user(),'twitter','post',intval($_POST['twitter-enable']));
+               PConfig::set(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
+               PConfig::set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
+               PConfig::set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
+               PConfig::set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
 
                if (!intval($_POST['twitter-mirror']))
                        del_pconfig(local_user(),'twitter','lastid');
@@ -231,19 +234,19 @@ function twitter_settings(&$a,&$s) {
         * 2) If no OAuthtoken & stuff is present, generate button to get some
         * 3) Checkbox for "Send public notices (140 chars only)
         */
-       $ckey    = get_config('twitter', 'consumerkey' );
-       $csecret = get_config('twitter', 'consumersecret' );
-       $otoken  = get_pconfig(local_user(), 'twitter', 'oauthtoken'  );
-       $osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' );
-       $enabled = get_pconfig(local_user(), 'twitter', 'post');
+       $ckey    = Config::get('twitter', 'consumerkey' );
+       $csecret = Config::get('twitter', 'consumersecret' );
+       $otoken  = PConfig::get(local_user(), 'twitter', 'oauthtoken'  );
+       $osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret' );
+       $enabled = PConfig::get(local_user(), 'twitter', 'post');
        $checked = (($enabled) ? ' checked="checked" ' : '');
-       $defenabled = get_pconfig(local_user(),'twitter','post_by_default');
+       $defenabled = PConfig::get(local_user(),'twitter','post_by_default');
        $defchecked = (($defenabled) ? ' checked="checked" ' : '');
-       $mirrorenabled = get_pconfig(local_user(),'twitter','mirror_posts');
+       $mirrorenabled = PConfig::get(local_user(),'twitter','mirror_posts');
        $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
-       $importenabled = get_pconfig(local_user(),'twitter','import');
+       $importenabled = PConfig::get(local_user(),'twitter','import');
        $importchecked = (($importenabled) ? ' checked="checked" ' : '');
-       $create_userenabled = get_pconfig(local_user(),'twitter','create_user');
+       $create_userenabled = PConfig::get(local_user(),'twitter','create_user');
        $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
        $css = (($enabled) ? '' : '-disabled');
@@ -327,42 +330,48 @@ function twitter_settings(&$a,&$s) {
                        $s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'. t('Clear OAuth configuration') .'</label>';
                        $s .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
                        $s .= '</div><div class="clear"></div>';
-                       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>'; 
+                       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
                }
        }
        $s .= '</div><div class="clear"></div>';
 }
 
 
-function twitter_post_local(&$a,&$b) {
+function twitter_post_local(&$a, &$b) {
 
-       if($b['edit'])
+       if ($b['edit']) {
                return;
+       }
 
-       if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (! $b['parent']) ) {
+       if (!local_user() || (local_user() != $b['uid'])) {
+               return;
+       }
 
-               $twitter_post = intval(get_pconfig(local_user(),'twitter','post'));
-               $twitter_enable = (($twitter_post && x($_REQUEST,'twitter_enable')) ? intval($_REQUEST['twitter_enable']) : 0);
+       $twitter_post = intval(PConfig::get(local_user(), 'twitter', 'post'));
+       $twitter_enable = (($twitter_post && x($_REQUEST, 'twitter_enable')) ? intval($_REQUEST['twitter_enable']) : 0);
 
-               // if API is used, default to the chosen settings
-               if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'twitter','post_by_default')))
-                       $twitter_enable = 1;
+       // if API is used, default to the chosen settings
+       if ($b['api_source'] && intval(PConfig::get(local_user(), 'twitter', 'post_by_default'))) {
+               $twitter_enable = 1;
+       }
 
-       if(! $twitter_enable)
+       if (!$twitter_enable) {
                return;
+       }
 
-       if(strlen($b['postopts']))
+       if (strlen($b['postopts'])) {
                $b['postopts'] .= ',';
-               $b['postopts'] .= 'twitter';
        }
+
+       $b['postopts'] .= 'twitter';
 }
 
 function twitter_action($a, $uid, $pid, $action) {
 
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
        require_once("addon/twitter/codebird.php");
 
@@ -396,7 +405,7 @@ function twitter_post_hook(&$a,&$b) {
 
        require_once("include/network.php");
 
-       if (!get_pconfig($b["uid"],'twitter','import')) {
+       if (!PConfig::get($b["uid"],'twitter','import')) {
                if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
                        return;
        }
@@ -405,7 +414,7 @@ function twitter_post_hook(&$a,&$b) {
                logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
 
                // Looking if its a reply to a twitter post
-               if ((substr($b["parent-uri"], 0, 9) != "twitter::") AND (substr($b["extid"], 0, 9) != "twitter::") AND (substr($b["thr-parent"], 0, 9) != "twitter::")) {
+               if ((substr($b["parent-uri"], 0, 9) != "twitter::") && (substr($b["extid"], 0, 9) != "twitter::") && (substr($b["thr-parent"], 0, 9) != "twitter::")) {
                        logger("twitter_post_hook: no twitter post ".$b["parent"]);
                        return;
                }
@@ -428,18 +437,18 @@ function twitter_post_hook(&$a,&$b) {
                $nicknameplain = "@".$nicknameplain;
 
                logger("twitter_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
-               if ((strpos($b["body"], $nickname) === false) AND (strpos($b["body"], $nicknameplain) === false))
+               if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
                        $b["body"] = $nickname." ".$b["body"];
 
                logger("twitter_post_hook: parent found ".print_r($orig_post, true), LOGGER_DATA);
        } else {
                $iscomment = false;
 
-               if($b['private'] OR !strstr($b['postopts'],'twitter'))
+               if($b['private'] || !strstr($b['postopts'],'twitter'))
                        return;
        }
 
-       if (($b['verb'] == ACTIVITY_POST) AND $b['deleted'])
+       if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
                twitter_action($a, $b["uid"], substr($orig_post["uri"], 9), "delete");
 
        if($b['verb'] == ACTIVITY_LIKE) {
@@ -466,10 +475,10 @@ function twitter_post_hook(&$a,&$b) {
 
        load_pconfig($b['uid'], 'twitter');
 
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($b['uid'], 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($b['uid'], 'twitter', 'oauthsecret');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($b['uid'], 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
 
        if($ckey && $csecret && $otoken && $osecret) {
                logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
@@ -487,18 +496,19 @@ function twitter_post_hook(&$a,&$b) {
                $msgarr = plaintext($a, $b, $max_char, true, 8);
                $msg = $msgarr["text"];
 
-               if (($msg == "") AND isset($msgarr["title"]))
+               if (($msg == "") && isset($msgarr["title"]))
                        $msg = shortenmsg($msgarr["title"], $max_char - 50);
 
                $image = "";
 
-               if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo"))
+               if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
                        $msg .= "\n".$msgarr["url"];
-               elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video"))
+
+               if (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
                        $image = $msgarr["image"];
 
                // and now tweet it :-)
-               if(strlen($msg) and ($image != "")) {
+               if(strlen($msg) && ($image != "")) {
                        $img_str = fetch_url($image);
 
                        $tempfile = tempnam(get_temppath(), "cache");
@@ -525,9 +535,9 @@ function twitter_post_hook(&$a,&$b) {
                        logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
 
                        if ($result->source)
-                               set_config("twitter", "application_name", strip_tags($result->source));
+                               Config::set("twitter", "application_name", strip_tags($result->source));
 
-                       if ($result->errors OR $result->error) {
+                       if ($result->errors || $result->error) {
                                logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
                                // Workaround: Remove the picture link so that the post can be reposted without it
@@ -543,9 +553,21 @@ function twitter_post_hook(&$a,&$b) {
                        }
                }
 
-               if(strlen($msg) and ($image == "")) {
+               if(strlen($msg) && ($image == "")) {
+// -----------------
+                       $max_char = 280;
+                       require_once("include/plaintext.php");
+                       $msgarr = plaintext($a, $b, $max_char, true, 8);
+                       $msg = $msgarr["text"];
+
+                       if (($msg == "") && isset($msgarr["title"]))
+                               $msg = shortenmsg($msgarr["title"], $max_char - 50);
+
+                       if (isset($msgarr["url"]))
+                               $msg .= "\n".$msgarr["url"];
+// -----------------
                        $url = 'statuses/update';
-                       $post = array('status' => $msg);
+                       $post = array('status' => $msg, 'weighted_character_count' => 'true');
 
                        if ($iscomment)
                                $post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
@@ -554,7 +576,7 @@ function twitter_post_hook(&$a,&$b) {
                        logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
 
                        if ($result->source)
-                               set_config("twitter", "application_name", strip_tags($result->source));
+                               Config::set("twitter", "application_name", strip_tags($result->source));
 
                        if ($result->errors) {
                                logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
@@ -587,9 +609,9 @@ function twitter_plugin_admin_post(&$a){
        $consumerkey    =       ((x($_POST,'consumerkey'))              ? notags(trim($_POST['consumerkey']))   : '');
        $consumersecret =       ((x($_POST,'consumersecret'))   ? notags(trim($_POST['consumersecret'])): '');
        $applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'])):'');
-       set_config('twitter','consumerkey',$consumerkey);
-       set_config('twitter','consumersecret',$consumersecret);
-       //set_config('twitter','application_name',$applicationname);
+       Config::set('twitter','consumerkey',$consumerkey);
+       Config::set('twitter','consumersecret',$consumersecret);
+       //Config::set('twitter','application_name',$applicationname);
        info( t('Settings updated.'). EOL );
 }
 function twitter_plugin_admin(&$a, &$o){
@@ -598,16 +620,16 @@ function twitter_plugin_admin(&$a, &$o){
        $o = replace_macros($t, array(
                '$submit' => t('Save Settings'),
                                                                // name, label, value, help, [extra values]
-               '$consumerkey' => array('consumerkey', t('Consumer key'),  get_config('twitter', 'consumerkey' ), ''),
-               '$consumersecret' => array('consumersecret', t('Consumer secret'),  get_config('twitter', 'consumersecret' ), ''),
-               //'$applicationname' => array('applicationname', t('Name of the Twitter Application'), get_config('twitter','application_name'),t('Set this to the exact name you gave the app on twitter.com/apps to avoid mirroring postings from ~friendica back to ~friendica'))
+               '$consumerkey' => array('consumerkey', t('Consumer key'),  Config::get('twitter', 'consumerkey' ), ''),
+               '$consumersecret' => array('consumersecret', t('Consumer secret'),  Config::get('twitter', 'consumersecret' ), ''),
+               //'$applicationname' => array('applicationname', t('Name of the Twitter Application'), Config::get('twitter','application_name'),t('Set this to the exact name you gave the app on twitter.com/apps to avoid mirroring postings from ~friendica back to ~friendica'))
        ));
 }
 
 function twitter_cron($a,$b) {
-       $last = get_config('twitter','last_poll');
+       $last = Config::get('twitter','last_poll');
 
-       $poll_interval = intval(get_config('twitter','poll_interval'));
+       $poll_interval = intval(Config::get('twitter','poll_interval'));
        if(! $poll_interval)
                $poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
 
@@ -620,21 +642,21 @@ function twitter_cron($a,$b) {
        }
        logger('twitter: cron_start');
 
-       $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND()");
+       $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1'");
        if(count($r)) {
                foreach($r as $rr) {
-                       logger('twitter: fetching for user '.$rr['uid']);
-                       twitter_fetchtimeline($a, $rr['uid']);
+                       logger('twitter:PConfig::get fetching for user '.$rr['uid']);
+                       proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
                }
        }
 
-       $abandon_days = intval(get_config('system','account_abandon_days'));
+       $abandon_days = intval(Config::get('system','account_abandon_days'));
        if ($abandon_days < 1)
                $abandon_days = 0;
 
        $abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
 
-       $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
+       $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'");
        if(count($r)) {
                foreach($r as $rr) {
                        if ($abandon_days != 0) {
@@ -646,12 +668,11 @@ function twitter_cron($a,$b) {
                        }
 
                        logger('twitter: importing timeline from user '.$rr['uid']);
-                       twitter_fetchhometimeline($a, $rr["uid"]);
-
+                       proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int)$rr['uid']);
 /*
                        // To-Do
                        // check for new contacts once a day
-                       $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
+                       $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
                        if($last_contact_check)
                                $next_contact_check = $last_contact_check + 86400;
                        else
@@ -659,7 +680,7 @@ function twitter_cron($a,$b) {
 
                        if($next_contact_check <= time()) {
                                pumpio_getallusers($a, $rr["uid"]);
-                               set_pconfig($rr['uid'],'pumpio','contact_check',time());
+                               PConfig::set($rr['uid'],'pumpio','contact_check',time());
                        }
 */
 
@@ -668,17 +689,25 @@ function twitter_cron($a,$b) {
 
        logger('twitter: cron_end');
 
-       set_config('twitter','last_poll', time());
+       Config::set('twitter','last_poll', time());
 }
 
 function twitter_expire($a,$b) {
 
-       $days = get_config('twitter', 'expire');
+       $days = Config::get('twitter', 'expire');
 
        if ($days == 0)
                return;
 
-       $r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER));
+       if (method_exists('dba', 'delete')) {
+               $r = dba::select('item', array('id'), array('deleted' => true, 'network' => NETWORK_TWITTER));
+               while ($row = dba::fetch($r)) {
+                       dba::delete('item', array('id' => $row['id']));
+               }
+               dba::close($r);
+       } else {
+               $r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER));
+       }
 
        require_once("include/items.php");
 
@@ -716,7 +745,7 @@ function twitter_prepare_body(&$a,&$b) {
                        $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
                        $nicknameplain = "@".$nicknameplain;
 
-                       if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false))
+                       if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
                                $item["body"] = $nickname." ".$item["body"];
                }
 
@@ -724,7 +753,7 @@ function twitter_prepare_body(&$a,&$b) {
                $msgarr = plaintext($a, $item, $max_char, true, 8);
                $msg = $msgarr["text"];
 
-               if (isset($msgarr["url"]) AND ($msgarr["type"] != "photo"))
+               if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
                        $msg .= " ".$msgarr["url"];
 
                if (isset($msgarr["image"]))
@@ -781,13 +810,13 @@ function twitter_do_mirrorpost($a, $uid, $post) {
 }
 
 function twitter_fetchtimeline($a, $uid) {
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
-       $lastid  = get_pconfig($uid, 'twitter', 'lastid');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+       $lastid  = PConfig::get($uid, 'twitter', 'lastid');
 
-       $application_name  = get_config('twitter', 'application_name');
+       $application_name  = Config::get('twitter', 'application_name');
 
        if ($application_name == "")
                $application_name = $a->get_hostname();
@@ -819,7 +848,7 @@ function twitter_fetchtimeline($a, $uid) {
            foreach ($posts as $post) {
                if ($post->id_str > $lastid) {
                        $lastid = $post->id_str;
-                       set_pconfig($uid, 'twitter', 'lastid', $lastid);
+                       PConfig::set($uid, 'twitter', 'lastid', $lastid);
                }
 
                if ($first_time)
@@ -838,7 +867,7 @@ function twitter_fetchtimeline($a, $uid) {
                }
            }
        }
-       set_pconfig($uid, 'twitter', 'lastid', $lastid);
+       PConfig::set($uid, 'twitter', 'lastid', $lastid);
 }
 
 function twitter_queue_hook(&$a,&$b) {
@@ -857,7 +886,7 @@ function twitter_queue_hook(&$a,&$b) {
 
                logger('twitter_queue: run');
 
-               $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` 
+               $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
                        WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
                        intval($x['cid'])
                );
@@ -866,14 +895,14 @@ function twitter_queue_hook(&$a,&$b) {
 
                $user = $r[0];
 
-               $ckey    = get_config('twitter', 'consumerkey');
-               $csecret = get_config('twitter', 'consumersecret');
-               $otoken  = get_pconfig($user['uid'], 'twitter', 'oauthtoken');
-               $osecret = get_pconfig($user['uid'], 'twitter', 'oauthsecret');
+               $ckey    = Config::get('twitter', 'consumerkey');
+               $csecret = Config::get('twitter', 'consumersecret');
+               $otoken  = PConfig::get($user['uid'], 'twitter', 'oauthtoken');
+               $osecret = PConfig::get($user['uid'], 'twitter', 'oauthsecret');
 
                $success = false;
 
-               if ($ckey AND $csecret AND $otoken AND $osecret) {
+               if ($ckey && $csecret && $otoken && $osecret) {
 
                        logger('twitter_queue: able to post');
 
@@ -925,54 +954,29 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
        $avatar = twitter_fix_avatar($contact->profile_image_url_https);
 
-       if (function_exists("update_gcontact"))
-               update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name,
-                               "network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
-                               "name" => $contact->name, "nick" => $contact->screen_name,
-                               "location" => $contact->location, "about" => $contact->description,
-                               "addr" => $contact->screen_name."@twitter.com", "generation" => 2));
-       else {
-               // Old Code
-               $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
-                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
-
-               if (count($r) == 0)
-                       q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
-                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
-                               dbesc($contact->name),
-                               dbesc($contact->screen_name),
-                               dbesc($avatar));
-               else
-                       q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
-                               dbesc($contact->name),
-                               dbesc($contact->screen_name),
-                               dbesc($avatar),
-                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
-
-               if (DB_UPDATE_VERSION >= "1177")
-                       q("UPDATE `unique_contacts` SET `location` = '%s', `about` = '%s' WHERE url = '%s'",
-                               dbesc($contact->location),
-                               dbesc($contact->description),
-                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
-       }
+       update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name,
+                       "network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
+                       "name" => $contact->name, "nick" => $contact->screen_name,
+                       "location" => $contact->location, "about" => $contact->description,
+                       "addr" => $contact->screen_name."@twitter.com", "generation" => 2));
 
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
                intval($uid), dbesc("twitter::".$contact->id_str));
 
-       if(!count($r) AND !$create_user)
+       if(!count($r) && !$create_user)
                return(0);
 
-       if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) {
+       if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
                logger("twitter_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
                return(-1);
        }
 
        if(!count($r)) {
                // create contact record
-               q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
+               q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
                                        `name`, `nick`, `photo`, `network`, `rel`, `priority`,
-                                       `writable`, `blocked`, `readonly`, `pending` )
-                                       VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0) ",
+                                       `location`, `about`, `writable`, `blocked`, `readonly`, `pending`)
+                                       VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
                        intval($uid),
                        dbesc(datetime_convert()),
                        dbesc("https://twitter.com/".$contact->screen_name),
@@ -987,6 +991,8 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
                        dbesc(NETWORK_TWITTER),
                        intval(CONTACT_IS_FRIEND),
                        intval(1),
+                       dbesc($contact->location),
+                       dbesc($contact->description),
                        intval(1)
                );
 
@@ -1011,33 +1017,25 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
                require_once("Photo.php");
 
-               $photos = import_profile_photo($avatar,$uid,$contact_id);
-
-               q("UPDATE `contact` SET `photo` = '%s',
-                                       `thumb` = '%s',
-                                       `micro` = '%s',
-                                       `name-date` = '%s',
-                                       `uri-date` = '%s',
-                                       `avatar-date` = '%s'
-                               WHERE `id` = %d",
-                       dbesc($photos[0]),
-                       dbesc($photos[1]),
-                       dbesc($photos[2]),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       intval($contact_id)
-               );
+               $photos = import_profile_photo($avatar, $uid, $contact_id, true);
 
-               if (DB_UPDATE_VERSION >= "1177")
-                       q("UPDATE `contact` SET `location` = '%s',
-                                               `about` = '%s'
+               if ($photos) {
+                       q("UPDATE `contact` SET `photo` = '%s',
+                                               `thumb` = '%s',
+                                               `micro` = '%s',
+                                               `name-date` = '%s',
+                                               `uri-date` = '%s',
+                                                       `avatar-date` = '%s'
                                        WHERE `id` = %d",
-                               dbesc($contact->location),
-                               dbesc($contact->description),
+                               dbesc($photos[0]),
+                               dbesc($photos[1]),
+                               dbesc($photos[2]),
+                               dbesc(datetime_convert()),
+                               dbesc(datetime_convert()),
+                               dbesc(datetime_convert()),
                                intval($contact_id)
                        );
-
+               }
        } else {
                // update profile photos once every two weeks as we have no notification of when they change.
 
@@ -1052,42 +1050,39 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
                        require_once("Photo.php");
 
-                       $photos = import_profile_photo($avatar, $uid, $r[0]['id']);
-
-                       q("UPDATE `contact` SET `photo` = '%s',
-                                               `thumb` = '%s',
-                                               `micro` = '%s',
-                                               `name-date` = '%s',
-                                               `uri-date` = '%s',
-                                               `avatar-date` = '%s',
-                                               `url` = '%s',
-                                               `nurl` = '%s',
-                                               `addr` = '%s',
-                                               `name` = '%s',
-                                               `nick` = '%s'
-                                       WHERE `id` = %d",
-                               dbesc($photos[0]),
-                               dbesc($photos[1]),
-                               dbesc($photos[2]),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
-                               dbesc(datetime_convert()),
-                               dbesc("https://twitter.com/".$contact->screen_name),
-                               dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
-                               dbesc($contact->screen_name."@twitter.com"),
-                               dbesc($contact->name),
-                               dbesc($contact->screen_name),
-                               intval($r[0]['id'])
-                       );
-
-                       if (DB_UPDATE_VERSION >= "1177")
-                               q("UPDATE `contact` SET `location` = '%s',
+                       $photos = import_profile_photo($avatar, $uid, $r[0]['id'], true);
+
+                       if ($photos) {
+                               q("UPDATE `contact` SET `photo` = '%s',
+                                                       `thumb` = '%s',
+                                                       `micro` = '%s',
+                                                       `name-date` = '%s',
+                                                       `uri-date` = '%s',
+                                                       `avatar-date` = '%s',
+                                                       `url` = '%s',
+                                                       `nurl` = '%s',
+                                                       `addr` = '%s',
+                                                       `name` = '%s',
+                                                       `nick` = '%s',
+                                                       `location` = '%s',
                                                        `about` = '%s'
                                                WHERE `id` = %d",
+                                       dbesc($photos[0]),
+                                       dbesc($photos[1]),
+                                       dbesc($photos[2]),
+                                       dbesc(datetime_convert()),
+                                       dbesc(datetime_convert()),
+                                       dbesc(datetime_convert()),
+                                       dbesc("https://twitter.com/".$contact->screen_name),
+                                       dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
+                                       dbesc($contact->screen_name."@twitter.com"),
+                                       dbesc($contact->name),
+                                       dbesc($contact->screen_name),
                                        dbesc($contact->location),
                                        dbesc($contact->description),
                                        intval($r[0]['id'])
                                );
+                       }
                }
        }
 
@@ -1095,10 +1090,10 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 }
 
 function twitter_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
        require_once("addon/twitter/codebird.php");
 
@@ -1151,14 +1146,14 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 
                        $plain = str_replace($url->url, '', $plain);
 
-                       if ($url->url AND $url->expanded_url AND $url->display_url) {
+                       if ($url->url && $url->expanded_url && $url->display_url) {
 
                                $expanded_url = original_url($url->expanded_url);
 
                                $oembed_data = oembed_fetch_url($expanded_url);
 
                                // Quickfix: Workaround for URL with "[" and "]" in it
-                               if (strpos($expanded_url, "[") OR strpos($expanded_url, "]"))
+                               if (strpos($expanded_url, "[") || strpos($expanded_url, "]"))
                                        $expanded_url = $url->url;
 
                                if ($type == "")
@@ -1174,7 +1169,7 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 
                                        $body = str_replace($url->url, $footerlink, $body);
                                //} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
-                               } elseif (($oembed_data->type == "photo") AND isset($oembed_data->url)) {
+                               } elseif (($oembed_data->type == "photo") && isset($oembed_data->url)) {
                                        $body = str_replace($url->url,
                                                        "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]",
                                                        $body);
@@ -1209,18 +1204,18 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
                if ($footerurl != "")
                        $footer = add_page_info($footerurl, false, $picture);
 
-               if (($footerlink != "") AND (trim($footer) != "")) {
+               if (($footerlink != "") && (trim($footer) != "")) {
                        $removedlink = trim(str_replace($footerlink, "", $body));
 
-                       if (($removedlink == "") OR strstr($body, $removedlink))
+                       if (($removedlink == "") || strstr($body, $removedlink))
                                $body = $removedlink;
 
                        $body .= $footer;
                }
 
-               if (($footer == "") AND ($picture != ""))
+               if (($footer == "") && ($picture != ""))
                        $body .= "\n\n[img]".$picture."[/img]\n";
-               elseif (($footer == "") AND ($picture == ""))
+               elseif (($footer == "") && ($picture == ""))
                        $body = add_page_info_to_body($body);
 
                if ($no_tags)
@@ -1300,7 +1295,7 @@ function twitter_media_entities($post, &$postarray) {
 
        // When the post links to an external page, we only take one picture.
        // We only do this when there is exactly one media.
-       if ((count($post->entities->urls) > 0) AND (count($post->extended_entities->media) == 1)) {
+       if ((count($post->entities->urls) > 0) && (count($post->extended_entities->media) == 1)) {
                $picture = "";
                foreach($post->extended_entities->media AS $medium) {
                        if (isset($medium->media_url_https)) {
@@ -1327,7 +1322,7 @@ function twitter_media_entities($post, &$postarray) {
                                        $bitrate = 0;
                                        // We take the video with the highest bitrate
                                        foreach ($medium->video_info->variants AS $variant) {
-                                               if (($variant->content_type == "video/mp4") AND ($variant->bitrate >= $bitrate)) {
+                                               if (($variant->content_type == "video/mp4") && ($variant->bitrate >= $bitrate)) {
                                                        $media[$medium->url] = "\n[video]".$variant->url."[/video]";
                                                        $bitrate = $variant->bitrate;
                                                }
@@ -1401,7 +1396,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                }
 
                // Is it me?
-               $own_id = get_pconfig($uid, 'twitter', 'own_id');
+               $own_id = PConfig::get($uid, 'twitter', 'own_id');
 
                if ($post->user->id_str == $own_id) {
                        $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
@@ -1433,7 +1428,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                $postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
        }
 
-       if(($contactid == 0) AND !$only_existing_contact) {
+       if(($contactid == 0) && !$only_existing_contact) {
                $contactid = $self['id'];
        } elseif ($contactid <= 0) {
                logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
@@ -1502,7 +1497,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                $postarray = $retweet;
        }
 
-       if (is_object($post->quoted_status) AND !$noquote) {
+       if (is_object($post->quoted_status) && !$noquote) {
                $quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
 
                $postarray['body'] = $statustext;
@@ -1553,7 +1548,7 @@ function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
                foreach($myconv as $conv) {
                        // now if we find a match, it means we're in this conversation
 
-                       if(!link_compare($conv['author-link'],$user[0]["url"]) AND !link_compare($conv['author-link'],$own_user[0]["url"]))
+                       if(!link_compare($conv['author-link'],$user[0]["url"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
                                continue;
 
                        require_once('include/enotify.php');
@@ -1625,23 +1620,23 @@ function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id)
 
                        logger('twitter_fetchparentpost: User '.$self["nick"].' posted parent timeline item '.$item);
 
-                       if ($item AND !function_exists("check_item_notification"))
+                       if ($item && !function_exists("check_item_notification"))
                                twitter_checknotification($a, $uid, $own_id, $item, $postarray);
                }
        }
 }
 
 function twitter_fetchhometimeline($a, $uid) {
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
-       $create_user = get_pconfig($uid, 'twitter', 'create_user');
-       $mirror_posts = get_pconfig($uid, 'twitter', 'mirror_posts');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+       $create_user = PConfig::get($uid, 'twitter', 'create_user');
+       $mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
 
        logger("twitter_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
 
-       $application_name  = get_config('twitter', 'application_name');
+       $application_name  = Config::get('twitter', 'application_name');
 
        if ($application_name == "")
                $application_name = $a->get_hostname();
@@ -1686,7 +1681,7 @@ function twitter_fetchhometimeline($a, $uid) {
 
 
        // Fetching timeline
-       $lastid  = get_pconfig($uid, 'twitter', 'lasthometimelineid');
+       $lastid  = PConfig::get($uid, 'twitter', 'lasthometimelineid');
 
        $first_time = ($lastid == "");
 
@@ -1708,7 +1703,7 @@ function twitter_fetchhometimeline($a, $uid) {
                foreach ($posts as $post) {
                        if ($post->id_str > $lastid) {
                                $lastid = $post->id_str;
-                               set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+                               PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
                        }
 
                        if ($first_time)
@@ -1737,15 +1732,15 @@ function twitter_fetchhometimeline($a, $uid) {
 
                        logger('twitter_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
 
-                       if ($item AND !function_exists("check_item_notification"))
+                       if ($item && !function_exists("check_item_notification"))
                                twitter_checknotification($a, $uid, $own_id, $item, $postarray);
 
                }
        }
-       set_pconfig($uid, 'twitter', 'lasthometimelineid', $lastid);
+       PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
 
        // Fetching mentions
-       $lastid  = get_pconfig($uid, 'twitter', 'lastmentionid');
+       $lastid  = PConfig::get($uid, 'twitter', 'lastmentionid');
 
        $first_time = ($lastid == "");
 
@@ -1782,10 +1777,10 @@ function twitter_fetchhometimeline($a, $uid) {
                        $item = item_store($postarray);
                        $postarray["id"] = $item;
 
-                       if ($item AND function_exists("check_item_notification"))
+                       if ($item && function_exists("check_item_notification"))
                                check_item_notification($item, $uid, NOTIFY_TAGSELF);
 
-                       if (!isset($postarray["parent"]) OR ($postarray["parent"] == 0))
+                       if (!isset($postarray["parent"]) || ($postarray["parent"] == 0))
                                $postarray["parent"] = $item;
 
                        logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
@@ -1802,7 +1797,7 @@ function twitter_fetchhometimeline($a, $uid) {
                        } else
                                $parent_id = $postarray['parent'];
 
-                       if (($item != 0) AND !function_exists("check_item_notification")) {
+                       if (($item != 0) && !function_exists("check_item_notification")) {
                                require_once('include/enotify.php');
                                notification(array(
                                        'type'         => NOTIFY_TAGSELF,
@@ -1824,16 +1819,16 @@ function twitter_fetchhometimeline($a, $uid) {
                }
        }
 
-       set_pconfig($uid, 'twitter', 'lastmentionid', $lastid);
+       PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
 }
 
 function twitter_fetch_own_contact($a, $uid) {
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
-       $own_id = get_pconfig($uid, 'twitter', 'own_id');
+       $own_id = PConfig::get($uid, 'twitter', 'own_id');
 
        $contact_id = 0;
 
@@ -1845,7 +1840,7 @@ function twitter_fetch_own_contact($a, $uid) {
                // Fetching user data
                $user = $connection->get('account/verify_credentials');
 
-               set_pconfig($uid, 'twitter', 'own_id', $user->id_str);
+               PConfig::set($uid, 'twitter', 'own_id', $user->id_str);
 
                $contact_id = twitter_fetch_contact($uid, $user, true);
 
@@ -1894,10 +1889,10 @@ function twitter_is_retweet($a, $uid, $body) {
 
        logger('twitter_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG);
 
-       $ckey    = get_config('twitter', 'consumerkey');
-       $csecret = get_config('twitter', 'consumersecret');
-       $otoken  = get_pconfig($uid, 'twitter', 'oauthtoken');
-       $osecret = get_pconfig($uid, 'twitter', 'oauthsecret');
+       $ckey    = Config::get('twitter', 'consumerkey');
+       $csecret = Config::get('twitter', 'consumersecret');
+       $otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+       $osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
        require_once('library/twitteroauth.php');
        $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);