]> git.mxchange.org Git - friendica-addons.git/blobdiff - fromgplus/fromgplus.php
projects / friendica-addons.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
PL translation blackout THX waldis
[friendica-addons.git] / fromgplus / fromgplus.php
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index c028ea852ddef2beea32a59f72a090b6cf387868..ac433526a020b033b68188c5471225f6b4058a4d 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -11,8 +11,12 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Model\Item;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
@@ -49,27 +53,27 @@ function fromgplus_addon_settings(&$a,&$s) {
        $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>';
+       $s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. L10n::t('Google+ Mirror').'</h3>';
        $s .= '</span>';
        $s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">';
        $s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
-       $s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t('Google+ Mirror').'</h3>';
+       $s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. L10n::t('Google+ Mirror').'</h3>';
        $s .= '</span>';
 
        $s .= '<div id="fromgplus-wrapper">';
 
-       $s .= '<label id="fromgplus-enable-label" for="fromgplus-enable">'.t('Enable Google+ Import').'</label>';
+       $s .= '<label id="fromgplus-enable-label" for="fromgplus-enable">'.L10n::t('Enable Google+ Import').'</label>';
        $s .= '<input id="fromgplus-enable" type="checkbox" name="fromgplus-enable" value="1"'.$enable_checked.' />';
        $s .= '<div class="clear"></div>';
-       $s .= '<label id="fromgplus-label" for="fromgplus-account">'.t('Google Account ID').' </label>';
+       $s .= '<label id="fromgplus-label" for="fromgplus-account">'.L10n::t('Google Account ID').' </label>';
        $s .= '<input id="fromgplus-account" type="text" name="fromgplus-account" value="'.$account.'" />';
        $s .= '</div><div class="clear"></div>';
-       $s .= '<label id="fromgplus-keywords-label" for="fromgplus-keywords">'.t('Add keywords to post').'</label>';
+       $s .= '<label id="fromgplus-keywords-label" for="fromgplus-keywords">'.L10n::t('Add keywords to post').'</label>';
        $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"
-class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
        $s .= '</div>';
 
        return;
@@ -77,20 +81,20 @@ class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 
 function fromgplus_addon_settings_post(&$a,&$b) {
 
-       if(! local_user())
+       if (!local_user())
                return;
 
-       if($_POST['fromgplus-submit']) {
+       if (!empty($_POST['fromgplus-submit'])) {
                PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
-               $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
+               $enable = (x($_POST,'fromgplus-enable') ? intval($_POST['fromgplus-enable']) : 0);
                PConfig::set(local_user(),'fromgplus','enable', $enable);
-               $keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0);
+               $keywords = (x($_POST, 'fromgplus-keywords') ? intval($_POST['fromgplus-keywords']) : 0);
                PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
 
                if (!$enable)
                        PConfig::delete(local_user(),'fromgplus','lastdate');
 
-               info( t('Google+ Import Settings saved.') . EOL);
+               info(L10n::t('Google+ Import Settings saved.') . EOL);
        }
 }
 
@@ -99,8 +103,8 @@ function fromgplus_addon_admin(&$a, &$o)
        $t = get_markup_template("admin.tpl", "addon/fromgplus/");
 
        $o = replace_macros($t, [
-                       '$submit' => t('Save Settings'),
-                       '$key' => ['key', t('Key'), trim(Config::get('fromgplus', 'key')), t('')],
+                       '$submit' => L10n::t('Save Settings'),
+                       '$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), ''],
        ]);
 }
 
@@ -108,7 +112,7 @@ function fromgplus_addon_admin_post(&$a)
 {
        $key = ((x($_POST, 'key')) ? trim($_POST['key']) : '');
        Config::set('fromgplus', 'key', $key);
-       info(t('Settings updated.'). EOL);
+       info(L10n::t('Settings updated.'). EOL);
 }
 
 function fromgplus_cron($a,$b) {
@@ -165,7 +169,6 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
        $_SESSION['uid'] = $uid;
 
        unset($_REQUEST);
-       $_REQUEST['type'] = 'wall';
        $_REQUEST['api_source'] = true;
 
        $_REQUEST['profile_uid'] = $uid;
@@ -173,7 +176,7 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
        $_REQUEST['extid'] = NETWORK_GPLUS;
 
        if (isset($id)) {
-               $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+               $_REQUEST['message_id'] = Item::newURI($uid, NETWORK_GPLUS.':'.$id);
        }
 
        // $_REQUEST['verb']
@@ -226,7 +229,9 @@ function fromgplus_parse_query($var)
 
        foreach($var as $val) {
                $x          = explode('=', $val);
-               $arr[$x[0]] = $x[1];
+               if (count($x) > 1) {
+                       $arr[$x[0]] = $x[1];
+               }
        }
        unset($val, $x, $var);
        return $arr;
@@ -246,7 +251,7 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
                $cleaned = [];
 
        $queryvar = fromgplus_parse_query($fullImage);
-       if ($queryvar['url'] != "")
+       if (!empty($queryvar['url']))
                $cleaned["full"] = urldecode($queryvar['url']);
        else
                $cleaned["full"] = $fullImage;
@@ -254,24 +259,24 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
                $cleaned["full"] = "";
 
        $queryvar = fromgplus_parse_query($image);
-       if ($queryvar['url'] != "")
+       if (!empty($queryvar['url']))
                        $cleaned["preview"] = urldecode($queryvar['url']);
        else
                $cleaned["preview"] = $image;
        if (@exif_imagetype($cleaned["preview"]) == 0)
                $cleaned["preview"] = "";
 
-       if ($cleaned["full"] == "") {
+       if (empty($cleaned["full"])) {
                $cleaned["full"] = $cleaned["preview"];
                $cleaned["preview"] = "";
        }
 
-       if ($cleaned["full"] != "")
+       if (!empty($cleaned["full"]))
                $infoFull = Image::getInfoFromURL($cleaned["full"]);
        else
                $infoFull = ["0" => 0, "1" => 0];
 
-       if ($cleaned["preview"] != "")
+       if (!empty($cleaned["preview"]))
                $infoPreview = Image::getInfoFromURL($cleaned["preview"]);
        else
                $infoFull = ["0" => 0, "1" => 0];
@@ -312,8 +317,7 @@ function fromgplus_cleantext($text) {
 }
 
 function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
-       require_once("include/items.php");
-       require_once("include/network.php");
+       require_once 'include/items.php';
 
        $post = "";
        $quote = "";
@@ -324,23 +328,26 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                switch($attachment->objectType) {
                        case "video":
                                $pagedata["type"] = "video";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                break;
 
                        case "article":
                                $pagedata["type"] = "link";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
 
                                $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
                                if ($images["full"] != "")
                                        $pagedata["images"][0]["src"] = $images["full"];
 
-                               $quote = trim(fromgplus_html2bbcode($attachment->content));
+                               if (!empty($attachment->content)) {
+                                       $quote = trim(fromgplus_html2bbcode($attachment->content));
+                               }
 
-                               if ($quote != "")
+                               if (!empty($quote)) {
                                        $pagedata["text"] = $quote;
+                               }
 
                                // Add Keywords to page link
                                $data = parseurl_getsiteinfo_cached($pagedata["url"], true);
@@ -361,11 +368,11 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                        }
                                }
 
-                               if ($images["preview"] != "") {
+                               if (!empty($images["preview"])) {
                                        $post .= "\n[url=".$images["page"]."][img]".$images["preview"]."[/img][/url]\n";
                                        $pagedata["images"][0]["src"] = $images["preview"];
                                        $pagedata["url"] = $images["page"];
-                               } elseif ($images["full"] != "") {
+                               } elseif (!empty($images["full"])) {
                                        $post .= "\n[img]".$images["full"]."[/img]\n";
                                        $pagedata["images"][0]["src"] = $images["full"];
 
@@ -381,7 +388,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                break;
 
                        case "photo-album":
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
 
@@ -402,7 +409,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 
                        case "album":
                                $pagedata["type"] = "link";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
 
                                $thumb = $attachment->thumbnails[0];
@@ -415,7 +422,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                break;
 
                        case "audio":
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
                                break;
@@ -440,7 +447,7 @@ function fromgplus_fetch($a, $uid) {
        $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 = Network::fetchUrl("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
        //$result = file_get_contents("google.txt");
        //file_put_contents("google.txt", $result);
 
@@ -452,7 +459,7 @@ function fromgplus_fetch($a, $uid) {
 
        $lastdate = 0;
 
-       if (!is_array($activities->items))
+       if (empty($activities->items))
                return;
 
        $reversed = array_reverse($activities->items);
@@ -518,12 +525,12 @@ function fromgplus_fetch($a, $uid) {
                                                if (function_exists("share_header"))
                                                        $post .= share_header($item->object->actor->displayName, $item->object->actor->url,
                                                                                $item->object->actor->image->url, "",
-                                                                               datetime_convert('UTC','UTC',$item->object->published),$item->object->url);
+                                                                               DateTimeFormat::utc($item->object->published),$item->object->url);
                                                else
                                                        $post .= "[share author='".str_replace("'", "&#039;",$item->object->actor->displayName).
                                                                        "' profile='".$item->object->actor->url.
                                                                        "' avatar='".$item->object->actor->image->url.
-                                                                       "' posted='".datetime_convert('UTC','UTC',$item->object->published).
+                                                                       "' posted='".DateTimeFormat::utc($item->object->published).
                                                                        "' link='".$item->object->url."']";
 
                                                $post .= fromgplus_html2bbcode($item->object->content);
Unnamed repository; edit this file 'description' to name the repository.