From d995fc3994a065d068679edb09afd03483079f10 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 15 May 2015 20:56:05 +0200
Subject: [PATCH 1/2] The intelligent shortening for social media systems like
 Twitter, GNU Social and App.net can now be disabled.

---
 include/plaintext.php |  2 ++
 mod/settings.php      | 23 +++++++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/include/plaintext.php b/include/plaintext.php
index 88febbfff8..c8cdfa57df 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -182,6 +182,8 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2) {
 				$post["url"] = $b["plink"];
 			} elseif (strpos($b["body"], "[share") !== false)
 				$post["url"] = $b["plink"];
+			elseif (get_pconfig($b["uid"], "system", "no_intelligent_shortening"))
+				$post["url"] = $b["plink"];
 
 			$msg = shortenmsg($msg, $limit);
 		}
diff --git a/mod/settings.php b/mod/settings.php
index 7db196b030..da987260ca 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -177,7 +177,9 @@ function settings_post(&$a) {
 
 		check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
 
-		if(x($_POST, 'imap-submit')) {
+		if(x($_POST, 'general-submit')) {
+			set_pconfig(local_user(), 'system', 'no_intelligent_shortening', $_POST['no_intelligent_shortening']);
+		} elseif(x($_POST, 'imap-submit')) {
 
 			$mail_server       = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
 			$mail_port         = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
@@ -733,7 +735,24 @@ function settings_content(&$a) {
 
 	if(($a->argc > 1) && ($a->argv[1] === 'connectors')) {
 
-		$settings_connectors = "";
+		$settings_connectors = '<span id="settings_general_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_general_expanded\'); openClose(\'settings_general_inflated\');">';
+		$settings_connectors .= '<h3 class="connector">'. t('General Social Media Settings').'</h3>';
+		$settings_connectors .= '</span>';
+		$settings_connectors .= '<div id="settings_general_expanded" class="settings-block" style="display: none;">';
+		$settings_connectors .= '<span class="fakelink" onclick="openClose(\'settings_general_expanded\'); openClose(\'settings_general_inflated\');">';
+		$settings_connectors .= '<h3 class="connector">'. t('General Social Media Settings').'</h3>';
+		$settings_connectors .= '</span>';
+
+		$checked = ((get_pconfig(local_user(), 'system', 'no_intelligent_shortening')) ? ' checked="checked" ' : '');
+
+		$settings_connectors .= '<div id="general-shortening-wrapper">';
+		$settings_connectors .= '<label id="general-shortening-label" for="shortening-checkbox">'. t('Disable intelligent shortening'). '</label>';
+		$settings_connectors .= '<input id="shortening-checkbox" type="checkbox" name="no_intelligent_shortening" value="1" ' . $checked . '/>';
+		$settings_connectors .= '</div>';
+
+		$settings_connectors .= '<div class="settings-submit-wrapper" ><input type="submit" name="general-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+
+		$settings_connectors .= '</div><div class="clear"></div>';
 
 		call_hooks('connector_settings', $settings_connectors);
 

From 472a6f138040bde03eff98a8a2e20d114451ce0e Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Fri, 15 May 2015 21:09:00 +0200
Subject: [PATCH 2/2] Added explanation for shortening.

---
 mod/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index da987260ca..a003401dff 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -745,9 +745,10 @@ function settings_content(&$a) {
 
 		$checked = ((get_pconfig(local_user(), 'system', 'no_intelligent_shortening')) ? ' checked="checked" ' : '');
 
-		$settings_connectors .= '<div id="general-shortening-wrapper">';
-		$settings_connectors .= '<label id="general-shortening-label" for="shortening-checkbox">'. t('Disable intelligent shortening'). '</label>';
+		$settings_connectors .= '<div id="no_intelligent_shortening" class="field checkbox">';
+		$settings_connectors .= '<label id="no_intelligent_shortening-label" for="shortening-checkbox">'. t('Disable intelligent shortening'). '</label>';
 		$settings_connectors .= '<input id="shortening-checkbox" type="checkbox" name="no_intelligent_shortening" value="1" ' . $checked . '/>';
+		$settings_connectors .= '<span class="field_help">'.t('Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post.').'</span>';
 		$settings_connectors .= '</div>';
 
 		$settings_connectors .= '<div class="settings-submit-wrapper" ><input type="submit" name="general-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';