From 67244bb9eac2983cd160774d310b428efcdd4ce5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 3 Oct 2013 14:14:26 +0200 Subject: [PATCH 1/2] gpluspost/tumblr: Some small optical changes to the settings of the connectors --- gpluspost/gpluspost.css | 15 +++++++++++++++ gpluspost/gpluspost.php | 8 ++++++-- tumblr/tumblr.css | 4 ++-- tumblr/tumblr.php | 5 +++-- 4 files changed, 26 insertions(+), 6 deletions(-) create mode 100755 gpluspost/gpluspost.css diff --git a/gpluspost/gpluspost.css b/gpluspost/gpluspost.css new file mode 100755 index 00000000..a9bfb2b9 --- /dev/null +++ b/gpluspost/gpluspost.css @@ -0,0 +1,15 @@ + +#gpluspost-enable-label, #gpluspost-bydefault-label, #gpluspost-noloopprevention-label, #gpluspost-skipwithoutlink-label { + float: left; + width: 200px; + margin-top: 10px; +} + +#gpluspost-checkbox, #gpluspost-bydefault, #gpluspost-noloopprevention, #gpluspost-skipwithoutlink { + float: left; + margin-top: 10px; +} + +#gpluspost-submit { + margin-top: 15px; +} diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php index dae59efe..0880a424 100644 --- a/gpluspost/gpluspost.php +++ b/gpluspost/gpluspost.php @@ -42,6 +42,10 @@ function gpluspost_settings(&$a,&$s) { if(! local_user()) return; + /* Add our stylesheet to the page so we can make our settings look nice */ + + $a->page['htmlhead'] .= '' . "\r\n"; + $enabled = get_pconfig(local_user(),'gpluspost','post'); $checked = (($enabled) ? ' checked="checked" ' : ''); @@ -79,8 +83,8 @@ function gpluspost_settings(&$a,&$s) { /* provide a submit button */ $s .= '
'; - $s .= 'Register an account at Hootsuite, add your G+ page and add the feed-url there.
'; - $s .= 'Feed-url: '.$a->get_baseurl().'/gpluspost/'.urlencode($a->user["nickname"]).''; + $s .= '

Register an account at Hootsuite, add your G+ page and add the feed-url there.
'; + $s .= 'Feed-url: '.$a->get_baseurl().'/gpluspost/'.urlencode($a->user["nickname"]).'

'; } function gpluspost_settings_post(&$a,&$b) { diff --git a/tumblr/tumblr.css b/tumblr/tumblr.css index bdb39046..c76fb61e 100755 --- a/tumblr/tumblr.css +++ b/tumblr/tumblr.css @@ -1,11 +1,11 @@ -#tumblr-enable-label, #tumblr-username-label, #tumblr-password-label, #tumblr-bydefault-label { +#tumblr-enable-label, #tumblr-username-label, #tumblr-page-label, #tumblr-bydefault-label { float: left; width: 200px; margin-top: 10px; } -#tumblr-checkbox, #tumblr-username, #tumblr-password, #tumblr-bydefault { +#tumblr-checkbox, #tumblr-username, #tumblr-page, #tumblr-bydefault { float: left; margin-top: 10px; } diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 4bbae8e6..35004033 100755 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -201,7 +201,7 @@ function tumblr_settings(&$a,&$s) { $oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token"); $oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret"); - $s .= '
'; + $s .= '
'; if (($oauth_token != "") and ($oauth_token_secret != "")) { $page = get_pconfig(local_user(),'tumblr','page'); @@ -214,7 +214,8 @@ function tumblr_settings(&$a,&$s) { $blogs = array(); - $s .= t("Post to page:")."'; foreach($userinfo->response->user->blogs as $blog) { $blogurl = substr(str_replace(array("http://", "https://"), array("", ""), $blog->url), 0, -1); if ($page == $blogurl) From b6aa4fd7536aadf2eec7860bff26139b2b404104 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 5 Oct 2013 15:35:14 +0200 Subject: [PATCH 2/2] New addon "appnetpost" to post to app.net --- appnetpost/appnetpost.css | 15 ++ appnetpost/appnetpost.php | 405 ++++++++++++++++++++++++++++++++++++++ fbpost/fbpost.php | 51 +---- gpluspost/gpluspost.php | 33 +--- 4 files changed, 428 insertions(+), 76 deletions(-) create mode 100755 appnetpost/appnetpost.css create mode 100644 appnetpost/appnetpost.php diff --git a/appnetpost/appnetpost.css b/appnetpost/appnetpost.css new file mode 100755 index 00000000..55365e69 --- /dev/null +++ b/appnetpost/appnetpost.css @@ -0,0 +1,15 @@ + +#appnetpost-enable-label, #appnetpost-bydefault-label { + float: left; + width: 200px; + margin-top: 10px; +} + +#appnetpost-checkbox, #appnetpost-bydefault { + float: left; + margin-top: 10px; +} + +#appnetpost-submit { + margin-top: 15px; +} diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php new file mode 100644 index 00000000..f434f098 --- /dev/null +++ b/appnetpost/appnetpost.php @@ -0,0 +1,405 @@ + + */ + +function appnetpost_install() { + register_hook('post_local', 'addon/appnetpost/appnetpost.php', 'appnetpost_post_local'); + register_hook('notifier_normal', 'addon/appnetpost/appnetpost.php', 'appnetpost_send'); + register_hook('jot_networks', 'addon/appnetpost/appnetpost.php', 'appnetpost_jot_nets'); + register_hook('connector_settings', 'addon/appnetpost/appnetpost.php', 'appnetpost_settings'); + register_hook('connector_settings_post', 'addon/appnetpost/appnetpost.php', 'appnetpost_settings_post'); +} + + +function appnetpost_uninstall() { + unregister_hook('post_local', 'addon/appnetpost/appnetpost.php', 'appnetpost_post_local'); + unregister_hook('notifier_normal', 'addon/appnetpost/appnetpost.php', 'appnetpost_send'); + unregister_hook('jot_networks', 'addon/appnetpost/appnetpost.php', 'appnetpost_jot_nets'); + unregister_hook('connector_settings', 'addon/appnetpost/appnetpost.php', 'appnetpost_settings'); + unregister_hook('connector_settings_post', 'addon/appnetpost/appnetpost.php', 'appnetpost_settings_post'); +} + +function appnetpost_jot_nets(&$a,&$b) { + if(! local_user()) + return; + + $post = get_pconfig(local_user(),'appnetpost','post'); + if(intval($post) == 1) { + $defpost = get_pconfig(local_user(),'appnetpost','post_by_default'); + $selected = ((intval($defpost) == 1) ? ' checked="checked" ' : ''); + $b .= '
' + . t('Post to app.net') . '
'; + } +} + +function appnetpost_settings(&$a,&$s) { + + if(! local_user()) + return; + + /* Add our stylesheet to the page so we can make our settings look nice */ + + $a->page['htmlhead'] .= '' . "\r\n"; + + $enabled = get_pconfig(local_user(),'appnetpost','post'); + $checked = (($enabled) ? ' checked="checked" ' : ''); + + $def_enabled = get_pconfig(local_user(),'appnetpost','post_by_default'); + $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + + $s .= '
'; + $s .= '

' . t('App.net Post Settings') . '

'; + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + /* provide a submit button */ + + $s .= '
'; + $s .= '

Register an account at IFTTT and create a recipe with the following values:'; + $s .= '

  • If: New feed item (via RSS)
    • '; + $s .= '
  • Then: Post an update (via app.net)
    • '; + $s .= '
  • Feed URL: '.$a->get_baseurl().'/appnetpost/'.urlencode($a->user["nickname"]).'
    • '; + $s .= '
  • Message: {{EntryContent}}
    • '; + $s .= '
  • Original URL: {{EntryUrl}}
'; +} + +function appnetpost_settings_post(&$a,&$b) { + + if(x($_POST,'appnetpost-submit')) { + set_pconfig(local_user(),'appnetpost','post',intval($_POST['appnetpost'])); + set_pconfig(local_user(),'appnetpost','post_by_default',intval($_POST['appnetpost_bydefault'])); + } +} + +function appnetpost_post_local(&$a,&$b) { + + if($b['edit']) + return; + + if((! local_user()) || (local_user() != $b['uid'])) + return; + + if($b['private'] || $b['parent']) + return; + + $post = intval(get_pconfig(local_user(),'appnetpost','post')); + + $enable = (($post && x($_REQUEST,'appnetpost_enable')) ? intval($_REQUEST['appnetpost_enable']) : 0); + + if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'appnetpost','post_by_default'))) + $enable = 1; + + if(!$enable) + return; + + if(strlen($b['postopts'])) + $b['postopts'] .= ','; + + $b['postopts'] .= 'gplus'; +} + +function appnetpost_send(&$a,&$b) { + + logger('appnetpost_send: invoked for post '.$b['id']." ".$b['app']); + + if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) + return; + + if(! strstr($b['postopts'],'gplus')) + return; + + if($b['parent'] != $b['id']) + return; + + $itemlist = get_pconfig($b["uid"],'appnetpost','itemlist'); + $items = explode(",", $itemlist); + + $i = 0; + $newitems = array($b['id']); + foreach ($items AS $item) + if ($i++ < 9) + $newitems[] = $item; + + $itemlist = implode(",", $newitems); + + logger('appnetpost_send: new itemlist: '.$itemlist." for uid ".$b["uid"]); + + set_pconfig($b["uid"],'appnetpost','itemlist', $itemlist); +} + +function appnetpost_module() {} + +function appnetpost_init() { + global $a, $_SERVER; + + $uid = 0; + + if (isset($a->argv[1])) { + $uid = (int)$a->argv[1]; + if ($uid == 0) { + $contacts = q("SELECT `username`, `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1", dbesc($a->argv[1])); + if ($contacts) { + $uid = $contacts[0]["uid"]; + $nick = $a->argv[1]; + } + } else { + $contacts = q("SELECT `username` FROM `user` WHERE `uid`=%d LIMIT 1", intval($uid)); + $nick = $uid; + } + } + + header("content-type: application/atom+xml"); + echo ''."\n"; + echo ''."\n"; + echo "\t".'<![CDATA['.$a->config['sitename'].']]>'."\n"; + if ($uid != 0) { + echo "\t".'\n"; + echo "\t".''."\n"; + } else + echo "\t".''."\n"; + echo "\t".$a->get_baseurl()."/\n"; + echo "\t".''."\n"; + echo "\t".date("c")."\n"; // To-Do + // Copyright ... + echo "\t".''.$a->config['sitename'].''."\n"; + + if ($uid != 0) { + $itemlist = get_pconfig($uid,'appnetpost','itemlist'); + $items = explode(",", $itemlist); + + foreach ($items AS $item) + appnetpost_feeditem($item, $uid); + } else { + $items = q("SELECT `id` FROM `item` FORCE INDEX (`received`) WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `item`.`id` = `item`.`parent` ORDER BY `received` DESC LIMIT 10"); + foreach ($items AS $item) + appnetpost_feeditem($item["id"], $uid); + } + echo "\n"; + killme(); +} + +function appnetpost_original_url($url, $depth=1) { + + if ($depth > 10) + return($url); + + $siteinfo = array(); + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_HEADER, 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'); + + $header = curl_exec($ch); + $curl_info = @curl_getinfo($ch); + $http_code = $curl_info['http_code']; + curl_close($ch); + + if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302")) + AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) { + if ($curl_info['redirect_url'] != "") + return(appnetpost_original_url($curl_info['redirect_url'], ++$depth)); + else + return(appnetpost_original_url($curl_info['location'], ++$depth)); + } + + $pos = strpos($header, "\r\n\r\n"); + + if ($pos) + $body = trim(substr($header, $pos)); + else + $body = $header; + + $doc = new DOMDocument(); + @$doc->loadHTML($body); + + $xpath = new DomXPath($doc); + + $list = $xpath->query("//meta[@content]"); + foreach ($list as $node) { + $attr = array(); + if ($node->attributes->length) + foreach ($node->attributes as $attribute) + $attr[$attribute->name] = $attribute->value; + + if (@$attr["http-equiv"] == 'refresh') { + $path = $attr["content"]; + $pathinfo = explode(";", $path); + $content = ""; + foreach ($pathinfo AS $value) + if (substr(strtolower($value), 0, 4) == "url=") + return(appnetpost_original_url(substr($value, 4), ++$depth)); + } + } + + return($url); +} + +if (! function_exists( 'short_link' )) { +function short_link($url) { + require_once('library/slinky.php'); + $slinky = new Slinky( $url ); + $yourls_url = get_config('yourls','url1'); + if ($yourls_url) { + $yourls_username = get_config('yourls','username1'); + $yourls_password = get_config('yourls', 'password1'); + $yourls_ssl = get_config('yourls', 'ssl1'); + $yourls = new Slinky_YourLS(); + $yourls->set( 'username', $yourls_username ); + $yourls->set( 'password', $yourls_password ); + $yourls->set( 'ssl', $yourls_ssl ); + $yourls->set( 'yourls-url', $yourls_url ); + $slinky->set_cascade( array( $yourls, new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) ); + } else { + // setup a cascade of shortening services + // try to get a short link from these services + // in the order ur1.ca, trim, id.gd, tinyurl + $slinky->set_cascade( array( new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) ); + } + return $slinky->short(); +} }; + +function appnetpost_feeditem($pid, $uid) { + global $a; + + require_once('include/bbcode.php'); + require_once("include/html2plain.php"); + + $items = q("SELECT `uri`, `plink`, `author-link`, `author-name`, `created`, `edited`, `id`, `title`, `body` from `item` WHERE id=%d", intval($pid)); + foreach ($items AS $item) { + + // Looking for the first image + $image = ''; + if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$item['body'],$matches)) + $image = $matches[3]; + + if ($image == '') + if(preg_match("/\[img\](.*?)\[\/img\]/is",$item['body'],$matches)) + $image = $matches[1]; + + $multipleimages = (strpos($item['body'], "[img") != strrpos($item['body'], "[img")); + + // When saved into the database the content is sent through htmlspecialchars + // That means that we have to decode all image-urls + $image = htmlspecialchars_decode($image); + + $link = ''; + // look for bookmark-bbcode and handle it with priority + if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$item['body'],$matches)) + $link = $matches[1]; + + $multiplelinks = (strpos($item['body'], "[bookmark") != strrpos($item['body'], "[bookmark")); + + $body = $item['body']; + + // At first convert the text to html + $html = bbcode($body, false, false, 2); + + // Then convert it to plain text + $msg = trim(html2plain($html, 0, true)); + $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8'); + + // If there is no bookmark element then take the first link + if ($link == '') { + $links = collecturls($html); + if (sizeof($links) > 0) { + reset($links); + $link = current($links); + } + $multiplelinks = (sizeof($links) > 1); + + if ($multiplelinks) { + $html2 = bbcode($msg, false, false); + $links2 = collecturls($html2); + if (sizeof($links2) > 0) { + reset($links2); + $link = current($links2); + $multiplelinks = (sizeof($links2) > 1); + } + } + } + + $msglink = ""; + if ($multiplelinks) + $msglink = $item["plink"]; + else if ($link != "") + $msglink = $link; + else if ($multipleimages) + $msglink = $item["plink"]; + else if ($image != "") + $msglink = $image; + + // Fetching the title and add all lines + if ($item["title"] != "") + $title = $item["title"]; + + $lines = explode("\n", $msg); + foreach ($lines AS $line) + $title .= "\n".$line; + + $max_char = 256; + + $origlink = $msglink; + + if (strlen($msglink) > 20) + $msglink = short_link($msglink); + + $title = trim(str_replace($origlink, $msglink, $title)); + + if (strlen(trim($title." ".$msglink)) > $max_char) { + $title = substr($title, 0, $max_char - (strlen($msglink))); + $lastchar = substr($title, -1); + $title = substr($title, 0, -1); + $pos = strrpos($title, "\n"); + if ($pos > 0) + $title = substr($title, 0, $pos); + else if ($lastchar != "\n") + $title = substr($title, 0, -3)."..."; + } + + if (!strstr($title, $msglink)) + $title = trim($title." ".$msglink); + else + $title = trim($title); + + if ($title == "") + continue; + + //$origlink = appnetpost_original_url($origlink); + + $html = nl2br($title); + + $origlink = $item["plink"]; + $origlink = htmlspecialchars(html_entity_decode($origlink)); + + $title = str_replace("&", "&", $title); + //$html = str_replace("&", "&", $html); + + echo "\t".''."\n"; + echo "\t\t".'<![CDATA['.$title."]]>\n"; + echo "\t\t".''."\n"; + // + echo "\t\t".$item["uri"]."\n"; + echo "\t\t".date("c", strtotime($item["edited"]))."\n"; + echo "\t\t".date("c", strtotime($item["created"]))."\n"; + echo "\t\t\n\t\t\t\n"; + echo "\t\t\t".$item["author-link"]."\n\t\t\n"; + //echo ''; + echo "\t\t".'\n"; + echo "\t\n"; + } +} diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php index 0fc6dd65..6a0eb197 100644 --- a/fbpost/fbpost.php +++ b/fbpost/fbpost.php @@ -357,32 +357,6 @@ function fbpost_jot_nets(&$a,&$b) { } } -function fbpost_ShareAttributes($match) { - - $attributes = $match[1]; - - $author = ""; - preg_match("/author='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $author = $matches[1]; - - preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $author = $matches[1]; - - $headline = '
'; - - $headline .= sprintf(t('%s:'), $author); - - $headline .= "
"; - - //$text = "
".$headline."
".$match[2]."
"; - $text = "\n\t".$match[2].":\t"; - - return($text); -} - - /** * @param App $a * @param object $b @@ -563,29 +537,10 @@ function fbpost_post_hook(&$a,&$b) { // Convert recycle signs $body = str_replace("\t", " ", $body); // recycle 1 - $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); - $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body); - // recycle 2 (Test) - $recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8'); - $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body); + //$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); + //$body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n\t$2:\t", $body); - // share element - //$body = preg_replace_callback("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]/ism","fbpost_ShareAttributes", $body); - - //$bodyparts = explode("\t", $body); - // Doesn't help with multiple repeats - the problem has to be solved later - //if (sizeof($bodyparts) == 3) { - // $html = bbcode($bodyparts[2], false, false); - // $test = trim(html2plain($html, 0, true)); - - // if (trim($bodyparts[0]) == "") - // $body = trim($bodyparts[2]); - // else if (trim($test) == "") - // $body = trim($bodyparts[0]); - // else - // $body = trim($bodyparts[0])."\n\n".trim($bodyparts[1])."[quote]".trim($bodyparts[2])."[/quote]"; - //} else - $body = str_replace("\t", "", $body); + $body = str_replace("\t", "", $body); // At first convert the text to html $html = bbcode($body, false, false, 2); diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php index 0880a424..eb35cd33 100644 --- a/gpluspost/gpluspost.php +++ b/gpluspost/gpluspost.php @@ -267,32 +267,6 @@ function gpluspost_original_url($url, $depth=1) { return($url); } -function gpluspost_ShareAttributes($match) { - - $attributes = $match[1]; - - $author = ""; - preg_match("/author='(.*?)'/ism", $attributes, $matches); - if ($matches[1] != "") - $author = $matches[1]; - - preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $author = $matches[1]; - - $headline = '
'; - - $headline .= sprintf(t('%s:'), $author); - - $headline .= "
"; - - //$text = "
".$headline."
".$match[2]."
"; - //$text = "\n\t".$match[2].":\t"; - $text = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').$author.": ".$match[2]; - - return($text); -} - function gpluspost_feeditem($pid, $uid) { global $a; @@ -327,10 +301,13 @@ function gpluspost_feeditem($pid, $uid) { $multiplelinks = (strpos($item['body'], "[bookmark") != strrpos($item['body'], "[bookmark")); $body = $item['body']; - $body = preg_replace_callback("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]/ism","gpluspost_ShareAttributes", $body); - $html = bbcode($body, false, false); + // At first convert the text to html + $html = bbcode($body, false, false, 2); + + // Then convert it to plain text $msg = trim(html2plain($html, 0, true)); + $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8'); // If there is no bookmark element then take the first link if ($link == '') {