Merge pull request #180 from annando/master

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

diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php
index f434f0986969e1a341d01d23144daaed76024d76..d3f6c19a69fc1483de275e4c0bfcc49864c4f87b 100644 (file)
--- a/appnetpost/appnetpost.php
+++ b/appnetpost/appnetpost.php
@@ -52,8 +52,14 @@ function appnetpost_settings(&$a,&$s) {
        $def_enabled = get_pconfig(local_user(),'appnetpost','post_by_default');
        $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-       $s .= '<div class="settings-block">';
+       $s .= '<span id="settings_appnetpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
        $s .= '<h3>' . t('App.net Post Settings') . '</h3>';
+       $s .= '</span>';
+       $s .= '<div id="settings_appnetpost_expanded" class="settings-block" style="display: none;">';
+       $s .= '<span class="fakelink" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
+       $s .= '<h3>' . t('App.net Post Settings') . '</h3>';
+       $s .= '</span>';
+
        $s .= '<div id="appnetpost-enable-wrapper">';
        $s .= '<label id="appnetpost-enable-label" for="appnetpost-checkbox">' . t('Enable App.net Post Plugin') . '</label>';
        $s .= '<input id="appnetpost-checkbox" type="checkbox" name="appnetpost" value="1" ' . $checked . '/>';
@@ -202,7 +208,7 @@ function appnetpost_original_url($url, $depth=1) {
        curl_setopt($ch, CURLOPT_NOBODY, 0);
        curl_setopt($ch, CURLOPT_TIMEOUT, 3);
        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-       curl_setopt($ch,CURLOPT_USERAGENT,'Opera/9.64(Windows NT 5.1; U; de) Presto/2.1.1');
+       curl_setopt($ch,CURLOPT_USERAGENT,'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:24.0) Gecko/20100101 Firefox/24.0');
 
        $header = curl_exec($ch);
        $curl_info = @curl_getinfo($ch);
@@ -371,7 +377,7 @@ function appnetpost_feeditem($pid, $uid) {
                        $title = substr($title, 0, -3)."...";
                }
 
-               if (!strstr($title, $msglink))
+               if (($msglink != "") AND !strstr($title, $msglink))
                        $title = trim($title." ".$msglink);
                else
                        $title = trim($title);