Merge pull request #166 from annando/master

inflate/deflate settings

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 . '/>';

blockem/blockem.php

@@ -49,8 +49,14 @@ function blockem_addon_settings(&$a,&$s) {
 	if(! $words)
 		$words = '';
 
-    $s .= '<div class="settings-block">';
+    $s .= '<span id="settings_blockem_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
     $s .= '<h3>' . t('"Blockem" Settings') . '</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_blockem_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
+    $s .= '<h3>' . t('"Blockem" Settings') . '</h3>';
+    $s .= '</span>';
+
     $s .= '<div id="blockem-wrapper">';
     $s .= '<label id="blockem-label" for="blockem-words">' . t('Comma separated profile URLS to block') . ' </label>';
     $s .= '<textarea id="blockem-words" type="text" name="blockem-words" >' . htmlspecialchars($words) . '</textarea>';

blogger/blogger.php

@@ -70,8 +70,14 @@ function blogger_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
     $s .= '<h3>' . t('Blogger Post Settings') . '</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
+    $s .= '<h3>' . t('Blogger Post Settings') . '</h3>';
+    $s .= '</span>';
+
     $s .= '<div id="blogger-enable-wrapper">';
     $s .= '<label id="blogger-enable-label" for="blogger-checkbox">' . t('Enable Blogger Post Plugin') . '</label>';
     $s .= '<input id="blogger-checkbox" type="checkbox" name="blogger" value="1" ' . $checked . '/>';

fbpost/fbpost.php

@@ -808,10 +808,10 @@ function fbpost_post_hook(&$a,&$b) {
  */
 function fbpost_enotify(&$app, &$data) {
 	if (x($data, 'params') && $data['params']['type'] == NOTIFY_SYSTEM && x($data['params'], 'system_type') && $data['params']['system_type'] == 'facebook_connection_invalid') {
-		$data['itemlink'] = '/facebook';
+		$data['itemlink'] = '/fbpost';
 		$data['epreamble'] = $data['preamble'] = t('Your Facebook connection became invalid. Please Re-authenticate.');
 		$data['subject'] = t('Facebook connection became invalid');
-		$data['body'] = sprintf( t("Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."), $data['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]", "[url=" . $app->config["system"]["url"] . "/facebook]", "[/url]");
+		$data['body'] = sprintf( t("Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."), $data['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]", "[url=" . $app->config["system"]["url"] . "/fbpost]", "[/url]");
 	}
 }
 

fbsync/fbsync.php

@@ -119,8 +119,13 @@ function fbsync_settings(&$a,&$s) {
 
 	/* Add some HTML to the existing form */
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_fbsync_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
 	$s .= '<h3>' . t('Facebook Import Settings') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_fbsync_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
+	$s .= '<h3>' . t('Facebook Import Settings') . '</h3>';
+	$s .= '</span>';
 
 	$s .= '<div id="fbsync-enable-wrapper">';
 	$s .= '<label id="fbsync-enable-label" for="fbsync-checkbox">' . t('Import Facebook newsfeed') . '</label>';

forumlist/forumlist.php

@@ -157,9 +157,14 @@ function forumlist_plugin_settings(&$a,&$s) {
 
 
 	/* Add some HTML to the existing form */
-
+	$s .= '<span id="settings_forumlist_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">';
-	$s .= '<div class="settings-block">';
 	$s .= '<h3>' . t('Forumlist Settings') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_forumlist_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">';
+	$s .= '<h3>' . t('Forumlist Settings') . '</h3>';
+	$s .= '</span>';
+
 	$s .= '<div id="forumlist-settings-wrapper">';
 	$s .= '<label id="forumlist-random-label" for="forumlist-random">' . t('Randomise forum list') . '</label>';
 	$s .= '<input id="forumlist-random" type="checkbox" name="forumlist_random" value="1" ' . $randomise_checked . '/>';

fromgplus/fromgplus.php

@@ -33,8 +33,14 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
 	$account = get_pconfig(local_user(),'fromgplus','account');
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
 	$s .= '<h3>' . t('Google+ Import Settings').'</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 .= '<h3>' . t('Google+ Import Settings').'</h3>';
+	$s .= '</span>';
+
 	$s .= '<div id="fromgplus-wrapper">';
 
 	$s .= '<label id="fromgplus-enable-label" for="fromgplus-enable">'.t('Enable Google+ Import').'</label>';

gpluspost/gpluspost.php

@@ -58,8 +58,14 @@ function gpluspost_settings(&$a,&$s) {
 	$skip_enabled = get_pconfig(local_user(),'gpluspost','skip_without_link');
 	$skip_checked = (($skip_enabled) ? ' checked="checked" ' : '');
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_gpluspost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
 	$s .= '<h3>' . t('Google+ Post Settings') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_gpluspost_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
+	$s .= '<h3>' . t('Google+ Post Settings') . '</h3>';
+	$s .= '</span>';
+
 	$s .= '<div id="gpluspost-enable-wrapper">';
 	$s .= '<label id="gpluspost-enable-label" for="gpluspost-checkbox">' . t('Enable Google+ Post Plugin') . '</label>';
 	$s .= '<input id="gpluspost-checkbox" type="checkbox" name="gpluspost" value="1" ' . $checked . '/>';

jappixmini/jappixmini.php

@@ -294,10 +294,14 @@ function jappixmini_settings(&$a, &$s) {
         $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
     }
 
-    $s .= '<div class="settings-block">';
+    $s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
-
     $s .= '<h3>'.t('Jappix Mini addon settings').'</h3>';
-    $s .= '<div>';
+    $s .= '</span>';
+    $s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
+    $s .= '<h3>'.t('Jappix Mini addon settings').'</h3>';
+    $s .= '</span>';
+
     $s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';
     $s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"'.$activate.' />';
     $s .= '<br />';

libertree/libertree.php

@@ -63,8 +63,14 @@ function libertree_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
     $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
+    $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $s .= '</span>';
+
     $s .= '<div id="libertree-enable-wrapper">';
     $s .= '<label id="libertree-enable-label" for="libertree-checkbox">' . t('Enable Libertree Post Plugin') . '</label>';
     $s .= '<input id="libertree-checkbox" type="checkbox" name="libertree" value="1" ' . $checked . '/>';

nsfw/nsfw.php

@@ -74,8 +74,14 @@ function nsfw_addon_settings(&$a,&$s) {
 	if(! $words)
 		$words = 'nsfw,';
 
-    $s .= '<div class="settings-block">';
+    $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
     $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '</span>';
+
     $s .= '<div id="nsfw-wrapper">';
     $s .= '<p>' . t ('This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter.') . '</p>';
     $s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . t('Enable Content filter') . ' </label>';

pumpio/pumpio.php

@@ -218,8 +218,13 @@ function pumpio_settings(&$a,&$s) {
 
     /* 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 .= '</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 .= '<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);
 
-				if ($post->object->fullImage->url != "")
+				// To-Do: Picture has to be cached and stored locally
-					$_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
+				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"];
+				}
 
 				logger('pumpio: posting for user '.$uid);
 

showmore/showmore.php

@@ -34,8 +34,14 @@ function showmore_addon_settings(&$a,&$s) {
 	if(!$chars)
 		$chars = '1100';
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_showmore_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
 	$s .= '<h3>' . t('"Show more" Settings').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_showmore_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
+	$s .= '<h3>' . t('"Show more" Settings').'</h3>';
+	$s .= '</span>';
+
 	$s .= '<div id="showmore-wrapper">';
 
 	$s .= '<label id="showmore-enable-label" for="showmore-enable">'.t('Enable Show More').'</label>';

snautofollow/snautofollow.php

@@ -52,8 +52,14 @@ function snautofollow_settings(&$a,&$s) {
 
 	/* Add some HTML to the existing form */
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_snautofollow_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">';
 	$s .= '<h3>' . t('StatusNet AutoFollow Settings') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_snautofollow_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">';
+	$s .= '<h3>' . t('StatusNet AutoFollow Settings') . '</h3>';
+	$s .= '</span>';
+
 	$s .= '<div id="snautofollow-wrapper">';
 	$s .= '<label id="snautofollow-label" for="snautofollow-checkbox">' . t('Automatically follow any StatusNet followers/mentioners') . '</label>';
 	$s .= '<input id="snautofollow-checkbox" type="checkbox" name="snautofollow" value="1" ' . $snautofollow_checked . '/>';

statusnet/statusnet.php

@@ -278,8 +278,13 @@ function statusnet_settings(&$a,&$s) {
 	$shorteningenabled = get_pconfig(local_user(),'statusnet','intelligent_shortening');
 	$shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
 	$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
+	$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>';
+	$s .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
 		/***

tumblr/tumblr.php

@@ -181,8 +181,13 @@ function tumblr_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
     $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
+    $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
+    $s .= '</span>';
 
     $s .= '<div id="tumblr-username-wrapper">';
     $s .= '<a href="'.$a->get_baseurl().'/tumblr/connect">'.t("(Re-)Authenticate your tumblr page").'</a>';

wppost/wppost.php

@@ -72,8 +72,13 @@ function wppost_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
     $s .= '<h3>' . t('WordPress Post Settings') . '</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
+    $s .= '<h3>' . t('WordPress Post Settings') . '</h3>';
+    $s .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
     $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';
     $s .= '<input id="wppost-checkbox" type="checkbox" name="wppost" value="1" ' . $checked . '/>';

yourls/yourls.php

@@ -49,10 +49,16 @@ function yourls_addon_settings(&$a,&$s) {
 
 
 
-$yourls_ssl = get_config('yourls', 'ssl1');
+	$yourls_ssl = get_config('yourls', 'ssl1');
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_yourls_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
 	$s .= '<h3>' . t('YourLS Settings') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_yourls_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
+	$s .= '<h3>' . t('YourLS Settings') . '</h3>';
+	$s .= '</span>';
+
 	$s .= '<div id="yourls-url-wrapper">';
 	$s .= '<label id="yourls-url-label" for="yourls-url">' . t('URL: http://') . '</label>';
 	$s .= '<input id="yourls-url" type="text" name="yourls_url" value="' . $yourls_url .'" />';