friendica/friendica-addons
8
3
Fork 14
Code Issues 3 Pull requests 1 Releases 16 Wiki Activity

inflate/deflate settings #166

Merged
annando merged 18 commits from master into master 2013-12-01 11:25:26 +01:00
Conversation 0 Commits 18 Files changed 18 +13 -3
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 27ccb34334 - Show all commits

14
pumpio/pumpio.php
View file

@ -218,8 +218,13 @@ function pumpio_settings(&$a,&$s) {
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<div class="settings-block">'; $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
$s .= '<h3>' . t('Pump.io Post Settings') . '</h3>'; $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
$s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
$s .= '</span>';
$s .= '<div id="pumpio-username-wrapper">'; $s .= '<div id="pumpio-username-wrapper">';
$s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>'; $s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
@ -712,8 +717,13 @@ function pumpio_fetchtimeline(&$a, $uid) {
$_REQUEST["body"] = html2bbcode($post->object->content); $_REQUEST["body"] = html2bbcode($post->object->content);
if ($post->object->fullImage->url != "") // To-Do: Picture has to be cached and stored locally
if ($post->object->fullImage->url != "") {
if ($post->object->fullImage->pump_io->proxyURL != "")
$_REQUEST["body"] = "[url=".$post->object->fullImage->pump_io->proxyURL."][img]".$post->object->image->pump_io->proxyURL."[/img][/url]\n".$_REQUEST["body"];
else
$_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"]; $_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
}
logger('pumpio: posting for user '.$uid); logger('pumpio: posting for user '.$uid);