]> git.mxchange.org Git - friendica-addons.git/blobdiff - fromgplus/fromgplus.php
Revert "Revert "Move objects to src""
[friendica-addons.git] / fromgplus / fromgplus.php
index f4a61ec2dfd456d0e5c3d395b699e0d2290f072c..0699f75bbf178d3d6a64191c5b830d26e29128c2 100644 (file)
@@ -9,9 +9,13 @@
 
 define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
-require_once('mod/share.php');
-require_once('mod/parse_url.php');
-require_once('include/text.php');
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Object\Image;
+
+require_once 'mod/share.php';
+require_once 'mod/parse_url.php';
+require_once 'include/text.php';
 
 function fromgplus_install() {
        register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
@@ -39,9 +43,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>';
@@ -63,7 +67,7 @@ function fromgplus_addon_settings(&$a,&$s) {
        $s .= '<input id="fromgplus-keywords" type="checkbox" name="fromgplus-keywords" value="1"'.$keywords_checked.' />';
        $s .= '<div class="clear"></div>';
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit" 
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit"
 class="settings-submit" value="' . t('Save Settings') . '" /></div>';
        $s .= '</div>';
 
@@ -76,14 +80,14 @@ 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');
+                       PConfig::delete(local_user(),'fromgplus','lastdate');
 
                info( t('Google+ Import Settings saved.') . EOL);
        }
@@ -94,20 +98,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 +128,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 +138,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) {
@@ -178,7 +182,7 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
        $_REQUEST['location'] = $location;
        $_REQUEST['coord'] = $coord;
 
-       if (($_REQUEST['title'] == "") AND ($_REQUEST['body'] == "")) {
+       if (($_REQUEST['title'] == "") && ($_REQUEST['body'] == "")) {
                logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
                return;
        }
@@ -260,22 +264,22 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
        }
 
        if ($cleaned["full"] != "")
-               $infoFull = get_photo_info($cleaned["full"]);
+               $infoFull = Image::getInfoFromURL($cleaned["full"]);
        else
                $infoFull = array("0" => 0, "1" => 0);
 
        if ($cleaned["preview"] != "")
-               $infoPreview = get_photo_info($cleaned["preview"]);
+               $infoPreview = Image::getInfoFromURL($cleaned["preview"]);
        else
                $infoFull = array("0" => 0, "1" => 0);
 
-       if (($infoPreview[0] >= $infoFull[0]) AND ($infoPreview[1] >= $infoFull[1])) {
+       if (($infoPreview[0] >= $infoFull[0]) && ($infoPreview[1] >= $infoFull[1])) {
                $temp = $cleaned["full"];
                $cleaned["full"] = $cleaned["preview"];
                $cleaned["preview"] = $temp;
        }
 
-       if (($cleaned["full"] == $cleaned["preview"]) OR (($infoPreview[0] == $infoFull[0]) AND ($infoPreview[1] == $infoFull[1])))
+       if (($cleaned["full"] == $cleaned["preview"]) || (($infoPreview[0] == $infoFull[0]) && ($infoPreview[1] == $infoFull[1])))
                $cleaned["preview"] = "";
 
        if ($cleaned["full"] == "")
@@ -305,7 +309,6 @@ function fromgplus_cleantext($text) {
 }
 
 function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
-       require_once("include/Photo.php");
        require_once("include/items.php");
        require_once("include/network.php");
 
@@ -338,20 +341,21 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 
                                // Add Keywords to page link
                                $data = parseurl_getsiteinfo_cached($pagedata["url"], true);
-                               if (isset($data["keywords"]) AND get_pconfig($uid, 'fromgplus', 'keywords')) {
+                               if (isset($data["keywords"]) && PConfig::get($uid, 'fromgplus', 'keywords')) {
                                        $pagedata["keywords"] = $data["keywords"];
                                }
                                break;
 
                        case "photo":
                                // Don't store shared pictures in your wall photos (to prevent a possible violating of licenses)
-                               if ($shared)
+                               if ($shared) {
                                        $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
-                               else {
-                                       if ($attachment->fullImage->url != "")
-                                               $images = store_photo($a, $uid, "", $attachment->fullImage->url);
-                                       elseif ($attachment->image->url != "")
-                                               $images = store_photo($a, $uid, "", $attachment->image->url);
+                               } else {
+                                       if ($attachment->fullImage->url != "") {
+                                               $images = Image::storePhoto($a, $uid, "", $attachment->fullImage->url);
+                                       } elseif ($attachment->image->url != "") {
+                                               $images = Image::storePhoto($a, $uid, "", $attachment->image->url);
+                                       }
                                }
 
                                if ($images["preview"] != "") {
@@ -362,11 +366,12 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                        $post .= "\n[img]".$images["full"]."[/img]\n";
                                        $pagedata["images"][0]["src"] = $images["full"];
 
-                                       if ($images["preview"] != "")
+                                       if ($images["preview"] != "") {
                                                $pagedata["images"][1]["src"] = $images["preview"];
+                                       }
                                }
 
-                               if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {
+                               if (($attachment->displayName != "") && (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {
                                        $post .= fromgplus_html2bbcode($attachment->displayName)."\n";
                                        $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                }
@@ -429,8 +434,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 +443,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 +468,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;
@@ -491,7 +496,7 @@ function fromgplus_fetch($a, $uid) {
                                                if (isset($item->location->displayName))
                                                        $location = $item->location->displayName;
 
-                                               if (isset($item->location->position->latitude) AND
+                                               if (isset($item->location->position->latitude) &&
                                                        isset($item->location->position->longitude))
                                                        $coord = $item->location->position->latitude." ".$item->location->position->longitude;
 
@@ -505,7 +510,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,
@@ -542,7 +547,7 @@ function fromgplus_fetch($a, $uid) {
                                                if (isset($item->location->displayName))
                                                        $location = $item->location->displayName;
 
-                                               if (isset($item->location->position->latitude) AND
+                                               if (isset($item->location->position->latitude) &&
                                                        isset($item->location->position->longitude))
                                                        $coord = $item->location->position->latitude." ".$item->location->position->longitude;
 
@@ -555,5 +560,5 @@ function fromgplus_fetch($a, $uid) {
                }
        }
        if ($lastdate != 0)
-               set_pconfig($uid,'fromgplus','lastdate', $lastdate);
+               PConfig::set($uid,'fromgplus','lastdate', $lastdate);
 }