From 81160d4046f130a4a42812ba281abf805e3e82b1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 30 Mar 2012 05:35:55 -0700
Subject: [PATCH 1/7] added namethingy app

---
 namethingy.tgz            | Bin 0 -> 551 bytes
 namethingy/namethingy.php |  37 +++++++++++++++++++++++++++++++++++++
 page.tgz                  | Bin 1019 -> 1015 bytes
 page/page.php             |   2 +-
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 namethingy.tgz
 create mode 100755 namethingy/namethingy.php

diff --git a/namethingy.tgz b/namethingy.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..9642e384274093fbe8fdff05388d55af5c2dfe4c
GIT binary patch
literal 551
zcmV+?0@(c@iwFRasC7>O1MSmaYuhjo0PsBfQyj+BX=&p>iQ_D@Jq8<l>INg*ODRFI
z6<gGnj4Zc|vF|?FBy}hagVA&kyB{IM%1L+8T{x+zDj3gyIHOZ>wJ;1uelQDte>QT1
zxj&zI{rb+x^TKH`^=EFk?oB;^K7!z66&+|BMI^weB5BU#J>y5>>O7cxi^bwKYI;R{
z=>PC>QWy0L=J-SZy_p*x^xxI}pS!N^zx#qU9QB{~KYFKoZ5YnQg#q0QKI<u1_V25H
z7P_?$v`Hna6%%|3tAfI}Qn89C3SSA&MAe7GC(5ZLO2}@@cPg7c+?%-F^ZQm6LN4K&
z-BGyS-!(*qQuWet9&dk=ipr^_*s_v3l@3nyZpSc;ZOhZH02sz}&A4t}S&q-)rvaLz
zIcpS^>q3aTu}$iFT~XfJmtd1D6WlpE?On*h!H+x7-x|N3&)xE;*;{^+{KpE|$BZp<
zd1h_)Ral#wA@S|aEyQ3)8M}wHBux{W`nxN|R7uSwB2Y-Wjm_ayGZ{J`IV6c3y*07>
zTX?pLN@Q(GyE`~iW-7R%T#e5x(v@gf8`98LmbxyBTqQYG>)nbzWCFJH^rm!j!xAuw
zA&MgS_+@28Y%9BgYh)Umy8$}5PCY>;Jg`g^vH8YzO(-bK3l*DT_uwRkK0}`=scIz$
pOLRZ(U;hmeLI@#*5JCtcgb+dqA%qY@2qA?2+Hc<35M}@<003YV2~+?8

literal 0
HcmV?d00001

diff --git a/namethingy/namethingy.php b/namethingy/namethingy.php
new file mode 100755
index 000000000..0ccf106c0
--- /dev/null
+++ b/namethingy/namethingy.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ *
+ * Name: NameThingy
+ * Description: The Ultimate Random Name Generator
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ */
+
+
+function namethingy_install() {
+    register_hook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
+}
+
+function namethingy_uninstall() {
+    unregister_hook('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
+
+}
+
+function namethingy_app_menu($a,&$b) {
+    $b['app_menu'][] = '<div class="app-title"><a href="namethingy">NameThingy</a></div>';
+}
+
+
+function namethingy_module() {}
+
+function namethingy_content(&$a) {
+
+$baseurl = $a->get_baseurl() . '/addon/namethingy';
+
+$o .= <<< EOT
+<iframe src="http://namethingy.com" width="900" height="700" />
+EOT;
+
+return $o;
+}
diff --git a/page.tgz b/page.tgz
index aebbe4dd8c4a14d43181d8e2bc8b6f3151b67c17..84fb7b81480dc2f78f829613d5046bdf223f5f92 100644
GIT binary patch
literal 1015
zcmV<T0|@*diwFRasC7>O1MOAcZ`(Ey_N(<*+=y(FgG92OI0;hAZLy}<L(>fD&^-h}
z%t*9EM4~i`O6Cpy-*-nVKkV+;!_q#C9}LU9JKpi``zY5u6H)JZF+?05PI}|X{^5AM
z-y2R2#s~W&Ywyq-jSlxF!^vneJm?K^F&y_`^33P5XdA;dK(FLUCiSgUe-T$_lY`OG
z(b1PU(-%Zd{L@!h=k+ty_y_*?_K@>O{wK))9-;@sXFAUs{^$HpUn1{bw7u=YHoWJh
zIEEil4YYbAnncUm$Vwf<hrGILppcDepjtpum1V1>SpsRNfk2kEu5LvNwa|-7ms}+R
z(4fJ$5&nQueiXW~=|<s@)~{QWSNa%E<&A*Tdj?=y;`-GCBOz9sQTR1)utKG}qIJ<`
z7=685PnG0c6!5Xi@Ow&$YN@#qs^;1V8K#1A;V1IEMXM6(&nCQ*3bjxa!2o{u`dVbz
ztk73^Row)(i7TN}e+PV?rj?4;ZVs7k$V1%Vh4*Q*08Z>_iB|nLMK-Er!q79=YGq1w
zJg>h+1|kn);9B!#fIHEgRLbxKDUIQmfPFZ5ck=yDFqi3k2j;CV=%G*(^eknftNGjW
zvs0LN+vZ-s-~aiClk*b{6XvecH}e?$bfJ|Guiw9cIVzzo=a_x8TH}dm^=-;_Xs=Y}
zmKUpodi~Xr=%nkXj3Ri4;{mw<lM6tdEo31;Ho!M@==HIn;7J}lcE%gHU)Z6qDqLJX
z)L_^si)Z&i7j}KQ1B^Ofb65j;WV&X@C0Xr+o;rMM@h`E9{wGqDX|)P${XbL3J*&YM
z-}!Fq+MX7BKU2jLO1w%We4GJ&jNjN<ux{)O1JV|U!c|HR-HoTHvTSu@+D2%vk9z}5
zzdP%~zlk4H4B+e>tdn9dd?dxkDa9}xAUWOXpHk#cQ+W$AjTsqs8<~o0t{Ef+Z<?6h
z$rP2yW<<1&?CeGwtZb^P=zRI!%nwb#-jY}vHVFM`gtlpfn;v&lovy^Ltw(ZZvuRt*
z{7o&dUxW3Itfc;}OdzB-3ki)`79wU;bJzafHOm^`m8w$W#Y4-hrlzvYAQv*rP0Yqa
z1~>_muYNW<iJ1=}d?peIeFnTRn{HGiIRU-V45l1%EfyFQQeW8P6}=QOD8RWzTBK4(
z=v&h!WwulQo7`Oo1-}*rMstm+V<vvZmy_ZJ4qM$Yq>1S0Z{CQIO(Twc6>`Q_Qhyj8
zdXS(Mm8)-xAQ?9DH&HDf85qC}l}3ZdzU&qCIq^*zgf1U^=A&!$a^`*Qe^Cbq2L}fS
l2L}fS2L}fS2L}fS2L}fS2L}fS2ZyhZKLAh%pLYN#000xs>f`_b

literal 1019
zcmV<X0|fjZiwFStp>0n91MO8!Z`(!?)m8iz(}i17hE3|jvJ6L55+p8qh~vU3(t}}G
zYjQ;{OfK2w(ym(MzjubBB}?hop-v9n2Z7|y3}<%cy`@T?h@kVl=p!bRac4L_nhb|W
zo&NZEcziTy>@7Nj!DKWV4f~Vhey5L%{-6WnXWmzXx-wh?baEagQr}DU7jb1WJ|3K$
zoP3EreL<AOKVAGXEuX2zKkz>q4JI4@$3x^FACEiGf2RFx;eXEm^d<7{1pE6A?8AGW
zi&OX!)j+GaqKdREjV#nDd`OFj3Nl%l3W^0pMV{A6nkA5SD)3}p>f&C+Pzt>$bk0>I
z01X=4Cc^De%8x=<O}c^Kr}gXFq=i0(b9pD={E-2e=D2>fX2i#8GYY@u6;>!zTeQsT
z1fy@4+o__Iiwr&%30|j^sFa!;p-QfekbW#E7ybgrS=1_`{+fh0QlS>I%<IALPFITr
zn-%&dEs8s@Y2rqx*gXK3$8n*8t&>CMCS)Dgd*OWAEr1hyTB26}O_7}{i7<5c_G%eZ
z9mnbJk%7pA5V+QS>EWAbjtXUXgp`Kxi^o2ky*qpJ6U=2iKY)3yGrB3%1l@BP>0<u<
z<;6M7+t=n!x7+>shqKEw3=`&|(0B6?+<2jt3$Ne5g*hsr&gYnYuv+7eX!UK(4(MH}
z%stOm8+E#?EzwT5cNqlm4#xv>0VWlII$Ow0fUJP;=+Nn6LBXTc+jPb&cw96?Usbre
zUe{pQC<|wgL08TC`T!VpzU62P<dN}~9hYQnCiK+dHWv39yXbx*MVVSFuc`lM>Ud<;
z+v5k{?cFxJ#ojMewuBsy5(yt?KtJPF%`8|uc7_3QjYHuoCWmgvlNCv_Ix%%6wA00R
zJxqT%Ys0?@Hz|5>aS4r+Vy|2z#l<Ow(C;BR?e3pa<W6IG4>ArJ84fEMi(9T4L>aHD
zkUhv4mB?m9bQ9UyjWk%<6h+qh($UQIjmO@sxuh>p#d^Lw4bV9a@a;_+D%jRKYzmXE
z*=$;8Gj~_i+vj1swMJY2RxjXFznO%}EHe=@s(IKvADU%}A5B##@nYTks=KMo6G(+j
zQWLUap8<}<q^rkDM<H{;htJdkzRQ4TX4j3fBqyLZn8B1os>K3>eCi8(yrHin26;HQ
zK#N%F0DW5`rOeIv|0Z|aLB?-IhS6MO>X3<F@hhcxhQn5O4EZ8Dy1PfiXVZWqUzwb-
zmFCyOLk|+PqH=Ym2-0IEe-p)G!$1#aC^;HD_SKwKmlNM4MriZFXFfVlFK5oz{yVj>
pu&}VOu&}VOu&}VOu&}VOu&}VOu&}VOu(0@Q_yYjuVhI2!003u({xJXm

diff --git a/page/page.php b/page/page.php
index 2a65cab88..72972eded 100755
--- a/page/page.php
+++ b/page/page.php
@@ -44,7 +44,7 @@ function page_page_end($a,&$b) {
 
 	$page = '<div id="page-sidebar" class="widget">
 			<div class="title tool">
-			<h3>'.t("Community Pages").'</h3></div>
+			<h3>'.t("Forums").'</h3></div>
 			<div id="sidebar-page-list"><ul>';
 
 	$contacts = page_getpage($a->user['uid']);

From 39edf6a50038c50dcd66f5e9512b596e49c7ed9b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 31 Mar 2012 08:04:45 +0200
Subject: [PATCH 2/7] SN: if there is a title, include in into the outgoing
 dent

---
 statusnet/statusnet.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 8f2fbf819..9830c881b 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -425,7 +425,12 @@ function statusnet_post_hook(&$a,&$b) {
                 // we can later send to StatusNet. This way we can "gain" some 
                 // information during shortening of potential links but do not 
                 // shorten all the links in a 200000 character long essay.
-                $tmp = substr($b['body'], 0, 2*$max_char);
+                if (! $b['title']=='') {
+                    $tmp = $b['title'] . ' : '. $b['body'];
+                    $tmp = substr($tmp, 0, 2*$max_char);
+                } else {
+                    $tmp = substr($b['body'], 0, 2*$max_char);
+                }
                 // if [url=bla][img]blub.png[/img][/url] get blub.png
                 $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp);
                 // preserve links to images, videos and audios

From c388a7f6c9cd7628ca844a9ad670f23bb3bb3ab9 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 31 Mar 2012 08:06:07 +0200
Subject: [PATCH 3/7] Twitter: if there is a title include it into the outgoing
 tweet

---
 twitter/twitter.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 4f4d72808..acd60fb2a 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -291,7 +291,12 @@ function twitter_post_hook(&$a,&$b) {
                 // we can later send to Twitter. This way we can "gain" some 
                 // information during shortening of potential links but do not 
                 // shorten all the links in a 200000 character long essay.
-                $tmp = substr($b['body'], 0, 2*$max_char);
+                if (! $b['title']=='') {
+                    $tmp = $b['title'] . ' : '. $b['body'];
+                    $tmp = substr($tmp, 0, 2*$max_char);
+                } else {
+                    $tmp = substr($b['body'], 0, 2*$max_char);
+                }
                 // if [url=bla][img]blub.png[/img][/url] get blub.png
                 $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp);
                 // preserve links to images, videos and audios

From 9ffb8f131d5d1fb8bf4d722cacbca707bb373b58 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Fri, 30 Mar 2012 23:19:14 -0700
Subject: [PATCH 4/7] viewsrc only on your own stuff

---
 viewsrc.tgz         | Bin 593 -> 609 bytes
 viewsrc/viewsrc.php |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewsrc.tgz b/viewsrc.tgz
index a9be888a806c6219cceb7cf37184f67c8f7c78d8..2ace240a6fef124011513f485166f93df404300f 100644
GIT binary patch
delta 603
zcmV-h0;K)X1mOgKABzY8-Jy0*00ZrmO>f#j5QcrlzhZ(=yhf>wiESccs3Nt;w1-H!
zAY?6O!B%XqwO*%*n*8_fIzaP5q)JWFL+6nId1hzkotZV)8T(O-#5LZLfnqcYjA7u9
zhC|;N1mQ6Bz1F_L@VwD+5O|?~to+{44?+Wi_Y}3IsU;PE07gNRbtbN}@|APdItaa!
zlar6o^nqM&_P_acs<e9Z8hXKD=)bmqPZ^)>-w%Uh0|sxdWDo!O{-e)o<ECl4{k{o(
z_(lshhRtQrhA*s6L{`a+mt#0vE}?s=oN&P#k+3f0S$PGLLnc`P2`?qPkvi;>iMkE(
zoPmBmYh=oQ#Td@BD+cG=QA3nUS&dzHH+(1Ig<A=}%5vrw>hM%YtB-4%tENn}j;*{n
zE7k7uoY?Tw><G5bYRN>La(+cDEhw&1E_qzAvayc9qRS;O-8~mxJ9jys#o4DXQde}%
zVpcByIOi@vCA&BGG}4q$T4~C6Z01GsziLPK^P-)9?E!MwqepPq<F;z5M?X!qV`inY
z$Wum_)*PG(L{S7^zh9W0=;5MG%}%FBwmFFo)dq{sQo&aJNp~l&JGX3SMa$%N!EcD}
zt#hxxBX^rg<vrc2@Y!Hmp@+RiJN;}$$N}U$p?TcYOc2|KyE`C{EpRY_-eT4+#+uKp
zCR5!**tSw2m~2F;RA_fQ^f^p`3PEpGDY0hc;emi8)}vR+vSBg>J)||0@q*T@5&Akf
pVC@>VoF_%wnn&=v(8E6d^*;)eF#;402!bFV%`aa21(5(K007}ZE;|4K

delta 584
zcmV-O0=NC)1knV4ABzY8=Kyn000ZrmQE%EX6ovCje#IR^I6+-PXb2SzOqI6BZV#3E
zf>30FAyE@Ma-6Q!)c-!40^16eCavuz?S2wOaePnCxz});v#+&Ged`tJYeu7?H5i7Y
z!63By!)OqN!DfAn6$GQxFzWYD&3Z5h!_b1^Yns~8)QU=f0IQ_wI+wROe`a5`9!A00
z+1XoodP8ov^WR>*Dyv@n9cI8$6h1fqAQ}cw<{w7kz=HmZJ2}FCKL7ZGp15t>ey?Xk
z4?fe9jbVEj%)&=jr!ucpF8CNOmP=?~>xXb98kw>-6gj^EB_LO<gj8_F?vyFJX0qOt
z1YY0VUo<Lz6LJif`3-~1U8^C^l&Z$Qzi+;miqfy7Smg!tOTBq&s`baW?N!55<6~zp
z$+@0gQ8+Gqvs;p_^I9>PWJ26H#28AdOem3*j5p*22wg4(_m3QS^Kh^Eq|QA*kgn*O
zC5$hBTXSEa#UAV<K^p!`l!m`zm;>=YievH|#My0saJn6O0^N>qb*K(~KQ#|#BvWOP
zF}fsk@Foz)F?{-RWw+wTgEqBWt&X$PbWEvPAas^Vw(3pVdwcCUalIAg>HR|7IVM}{
z!F<R5PD$&YA9eVoF&m@Z&SKO3eC51@LZq}vnwm++b+xc$s*zlacNR0U>E#?IK&7Pj
zT0yQdne%w#fO5!BzYyZWWC|wxnyF+#Yt~3JWe><c2l2qD8c$@duever3H*4`W1Ii>
W9|e;?0v8PbEZ+gpc2hI}C;$Knv>w+0

diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index a610b76ca..f165e9c53 100644
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -32,7 +32,7 @@ EOS;
 }
 
 function viewsrc_item_photo_menu(&$a,&$b) {
-	if(! local_user())
+	if((! local_user()) || (local_user() != $b['item']['uid']))
 		return;
 	$b['menu'] = array_merge( array( t('View Source') => $a->get_baseurl() . '/viewsrc/'. $b['item']['id']), $b['menu']);
 

From b6ab56fd7fe37194423738fc82c3050d2aed00f4 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 31 Mar 2012 09:59:27 +0200
Subject: [PATCH 5/7] SN: added option to not send #tag links to the SN account

---
 statusnet/statusnet.css |  7 +++++--
 statusnet/statusnet.php | 28 +++++++++++++++++++---------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/statusnet/statusnet.css b/statusnet/statusnet.css
index 6c1347fc7..a5594cb70 100755
--- a/statusnet/statusnet.css
+++ b/statusnet/statusnet.css
@@ -18,9 +18,12 @@
 #statusnet-default-label {
 	float: left;
 	width: 250px;
-	margin-bottom: 25px;
 }
-
+#statusnet-sendtaglinks-label {
+        float: left;
+        width: 250px;
+        margin-bottom: 25px;
+}
 #statusnet-disconnect {
 	float: left;
 }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 9830c881b..897c54152 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -2,7 +2,7 @@
 /**
  * Name: StatusNet Connector
  * Description: Relay public postings to a connected StatusNet account
- * Version: 1.0.3
+ * Version: 1.0.4
  * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias>
  */
  
@@ -155,6 +155,7 @@ function statusnet_settings_post ($a,$post) {
             del_pconfig( local_user(), 'statusnet', 'oauthtoken' );
             del_pconfig( local_user(), 'statusnet', 'oauthsecret' );
             del_pconfig( local_user(), 'statusnet', 'baseapi' );
+            del_pconfig( local_user(), 'statusnet', 'post_taglinks');
 	} else {
             if (isset($_POST['statusnet-preconf-apiurl'])) {
                 /***
@@ -218,14 +219,16 @@ function statusnet_settings_post ($a,$post) {
 					//  ok, now that we have the Access Token, save them in the user config
 					set_pconfig(local_user(),'statusnet', 'oauthtoken',  $token['oauth_token']);
 					set_pconfig(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']);
-                    set_pconfig(local_user(),'statusnet', 'post', 1);
+                                        set_pconfig(local_user(),'statusnet', 'post', 1);
+                                        set_pconfig(local_user(),'statusnet', 'post_taglinks', 1);
                     //  reload the Addon Settings page, if we don't do it see Bug #42
                     goaway($a->get_baseurl().'/settings/connectors');
 				} else {
 					//  if no PIN is supplied in the POST variables, the user has changed the setting
-					//  to post a tweet for every new __public__ posting to the wall
+					//  to post a dent for every new __public__ posting to the wall
 					set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
-					set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
+                                        set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
+                                        set_pconfig(local_user(),'statusnet','post_taglinks',intval($_POST['statusnet-sendtaglinks']));
 					info( t('StatusNet settings updated.') . EOL);
         	}}}}
 }
@@ -247,7 +250,9 @@ function statusnet_settings(&$a,&$s) {
 	$enabled = get_pconfig(local_user(), 'statusnet', 'post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
 	$defenabled = get_pconfig(local_user(),'statusnet','post_by_default');
-	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
+        $defchecked = (($defenabled) ? ' checked="checked" ' : '');
+        $linksenabled = get_pconfig(local_user(),'statusnet','post_taglinks');
+        $linkschecked = (($linksenabled) ? ' checked="checked" ' : '');
 	$s .= '<div class="settings-block">';
 	$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>';
 
@@ -336,6 +341,9 @@ function statusnet_settings(&$a,&$s) {
 			$s .= '<div class="clear"></div>';
 			$s .= '<label id="statusnet-default-label" for="statusnet-default">'. t('Send public postings to StatusNet by default') .'</label>';
 			$s .= '<input id="statusnet-default" type="checkbox" name="statusnet-default" value="1" ' . $defchecked . '/>';
+			$s .= '<div class="clear"></div>';
+                        $s .= '<label id="statusnet-sendtaglinks-label" for="statusnet-sendtaglinks">'.t('Send #tag links to StatusNet').'</label>';
+                        $s .= '<input id="statusnet-sendtaglinks" type="checkbox" name="statusnet-sendtaglinks" value="1" '. $linkschecked . '/>';
 			$s .= '</div><div class="clear"></div>';
 
 			$s .= '<div id="statusnet-disconnect-wrapper">';
@@ -440,11 +448,13 @@ function statusnet_post_hook(&$a,&$b) {
                 $tmp = preg_replace( '/\[\\/?youtube(\\s+.*?\]|\])/i', '', $tmp);
                 $tmp = preg_replace( '/\[\\/?vimeo(\\s+.*?\]|\])/i', '', $tmp);
                 $tmp = preg_replace( '/\[\\/?audio(\\s+.*?\]|\])/i', '', $tmp);
+                $linksenabled = get_pconfig($b['uid'],'statusnet','post_taglinks');
                 // if a #tag is linked, don't send the [url] over to SN
-                //   this is commented out by default as it means backlinks
-                //   to friendica, if you don't like this feel free to
-                //   uncomment the following line
-//                $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
+                // that is, don't send if the option is not set in the 
+                // connector settings
+                if ($linksenabled=='0') {
+                    $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
+                }
                 // preserve links to webpages
                 $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
                 $tmp = preg_replace( '/\[bookmark\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/bookmark\]/i', '$2 $1', $tmp);

From a2ff679d2d6d6f6f54774fc3016cdb1216cefbc9 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 31 Mar 2012 10:19:36 +0200
Subject: [PATCH 6/7] Twitter: add option to send #tag links to connected
 account

---
 twitter/twitter.css | 15 ++++++++++++---
 twitter/twitter.php | 21 +++++++++++++++------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/twitter/twitter.css b/twitter/twitter.css
index 899cfd173..75747979e 100755
--- a/twitter/twitter.css
+++ b/twitter/twitter.css
@@ -12,7 +12,7 @@
 }
 #twitter-disconnect-label {
 	float: left;
-	width: 200px;
+	width: 250px;
 	margin-bottom: 25px;
 }
 
@@ -21,16 +21,25 @@
 }
 #twitter-enable-label {
 	float: left;
-	width: 200px;
+	width: 250px;
 	margin-bottom: 5px;
 }
+#twitter-default-label {
+	float: left;
+	width: 250px;
+}
+#twitter-sendtaglinks-label {
+        float: left;
+        width: 250px;
+        margin-bottom: 25px;
+}
 
 #twitter-checkbox {
 	float: left;
 }
 #twitter-pin-label {
 	float: left;
-	width: 200px;
+	width: 250px;
 	margin-bottom: 25px;
 }
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index acd60fb2a..006c16152 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -2,7 +2,7 @@
 /**
  * Name: Twitter Connector
  * Description: Relay public postings to a connected Twitter account
- * Version: 1.0.2
+ * Version: 1.0.3
  * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias>
  */
 
@@ -93,6 +93,7 @@ function twitter_settings_post ($a,$post) {
                 del_pconfig( local_user(), 'twitter', 'oauthsecret'  );  
                 del_pconfig( local_user(), 'twitter', 'post' );
                 del_pconfig( local_user(), 'twitter', 'post_by_default' );
+                del_pconfig( local_user(), 'twitter', 'post_taglinks');
 	} else {
 	if (isset($_POST['twitter-pin'])) {
 		//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
@@ -109,6 +110,7 @@ function twitter_settings_post ($a,$post) {
  		set_pconfig(local_user(),'twitter', 'oauthtoken',  $token['oauth_token']);
 		set_pconfig(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
                 set_pconfig(local_user(),'twitter', 'post', 1);
+                set_pconfig(local_user(),'twitter', 'post_taglinks', 1);
                 //  reload the Addon Settings page, if we don't do it see Bug #42
                 goaway($a->get_baseurl().'/settings/connectors');
 	} else {
@@ -116,6 +118,7 @@ function twitter_settings_post ($a,$post) {
 		//  to post a tweet for every new __public__ posting to the wall
 		set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
                 set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
+                set_pconfig(local_user(),'twitter','post_taglinks',intval($_POST['twitter-sendtaglinks']));
                 info( t('Twitter settings updated.') . EOL);
 	}}
 }
@@ -136,6 +139,8 @@ function twitter_settings(&$a,&$s) {
 	$checked = (($enabled) ? ' checked="checked" ' : '');
         $defenabled = get_pconfig(local_user(),'twitter','post_by_default');
 	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
+        $linksenabled = get_pconfig(local_user(),'twitter','post_taglinks');
+        $linkschecked = (($linksenabled) ? ' checked="checked" ' : '');
 
 	$s .= '<div class="settings-block">';
 	$s .= '<h3>'. t('Twitter Posting Settings') .'</h3>';
@@ -192,6 +197,9 @@ function twitter_settings(&$a,&$s) {
                         $s .= '<div class="clear"></div>';
                         $s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
                         $s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
+			$s .= '<div class="clear"></div>';
+                        $s .= '<label id="twitter-sendtaglinks-label" for="twitter-sendtaglinks">'.t('Send #tag links to Twitter').'</label>';
+                        $s .= '<input id="twitter-sendtaglinks" type="checkbox" name="twitter-sendtaglinks" value="1" '. $linkschecked . '/>';
 			$s .= '</div><div class="clear"></div>';
 
 			$s .= '<div id="twitter-disconnect-wrapper">';
@@ -306,12 +314,13 @@ function twitter_post_hook(&$a,&$b) {
                 $tmp = preg_replace( '/\[\\/?youtube(\\s+.*?\]|\])/i', '', $tmp);
                 $tmp = preg_replace( '/\[\\/?vimeo(\\s+.*?\]|\])/i', '', $tmp);
                 $tmp = preg_replace( '/\[\\/?audio(\\s+.*?\]|\])/i', '', $tmp);
+                $linksenabled = get_pconfig($b['uid'],'twitter','post_taglinks');
                 // if a #tag is linked, don't send the [url] over to SN
-                //   this is commented out by default as it means backlinks
-                //   to friendica, if you don't like this feel free to
-                //   uncomment the following line
-//                $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
-                // preserve links to webpages
+                // that is, don't send if the option is not set in the 
+                // connector settings
+                if ($linksenabled=='0') {
+                    $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
+                }
                 $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
                 $tmp = preg_replace( '/\[bookmark\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/bookmark\]/i', '$2 $1', $tmp);
                 // find all http or https links in the body of the entry and 

From 79fb8a1c454759a7d86e23f78b4df1a8babe2313 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 31 Mar 2012 10:24:24 +0200
Subject: [PATCH 7/7] SN/Twitter: added hint to the admin panel in the README
 file

---
 statusnet/README | 3 +++
 twitter/README   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/statusnet/README b/statusnet/README
index 48f620aba..ce1e1179b 100755
--- a/statusnet/README
+++ b/statusnet/README
@@ -42,6 +42,9 @@ ___ Configuration ___
 
 __ Global Configuration __
 
+If you enabled an administrator account, please use the admin panel to cofigure
+the StatusNet reley.
+
 To activate this addon add statusnet to the list of active addons in your
 .htconfig.php file 
     $a->config['system']['addon'] = "statusnet, ...".
diff --git a/twitter/README b/twitter/README
index 99edf0d30..9d52a4746 100755
--- a/twitter/README
+++ b/twitter/README
@@ -47,6 +47,9 @@ ___ Configuration ___
 
 __ Global Configuration __
 
+If you enabled an administrator account, please use the admin panel to cofigure
+the Twitter reley.
+
 To activate this addon add @twitter@ to the list of active addons in your
 .htconfig.php file 
     $a->config['system']['addon'] = "twitter, ..."