From 7fcc7b9bb000857638466f5e38ee695ea3c67020 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 10 Jan 2012 16:54:47 -0800
Subject: [PATCH] blockem update

---
 blockem.tgz         | Bin 1357 -> 1445 bytes
 blockem/blockem.css |   2 ++
 blockem/blockem.php |  19 ++++++++++++-------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/blockem.tgz b/blockem.tgz
index b01e8f98928c70e3e421492545a6f69e2babb06e..d31c638f2aab7e80d3ac3ff0a8d88127509c6d8e 100644
GIT binary patch
literal 1445
zcmV;W1zP$aiwFSG-3(6v1MOICZ`(Ey&R6?a+*GfU1KY9_I|-6F#hUfg+I3jAeTf5u
zmS~F$B?=^!G#K*Vccf_7svRUN(ssjih>@7Qdw6{Ag=A)2MAtM8cfO$XQ4SABJA0$y
z;ojbGr$0K_I~We^xRag1;IO|x7>-7x{!V|eH^d<reMzU5QYcL%z)nh{1(P={dq6K=
zj1C4zM@L`7r>`h87k~G=mnZqNuVDgwa4>u*{s;U0!7Bd4{sG2+INBTSK>yi2*&_e*
z_@BPQh&P+faCf%}yYMqf=`pxuFatkQ6-kzBCNeh;ITbmlX7Udzm7N&$`sVu&g-(P#
zhIj0m!n-A*aGGeHABW+J;$9@uFqdM^I1N)&J~P(%37gG%kws>;r4v(@VT3pj+VEGi
zA?boCP31HZ;yUniNpm9UbSC0EzXLvrW08eha@tHT0V_uBlMT?AshpF$DbqB4GHAtU
z3uw-Z1<R(2YR$5RdNQt6`e^nz@-!Dpe<plsi)%FRn_D7LWR+MH*%yh%2JG|1W7FH`
zi^yZx&li(zVX5i|FI%MZvZYLjnhiD&z5~=Fd|D_fgLb>wzy#8T%n%V!LM+=j22n^*
z`i@hTP^v)-&<TZ{EGQ@ew-h3hK}xW$t)^QHp~W?1ETXn{4PJ|M&y3lnpXih)l*IlO
z^v2+ya+Y0#q<rjsT*w2^cR3w<ntsq>q?8AVr1P=oL(f7jsGiP<qJ=bB*8@M?&LNr_
z6W@cB#*B<TOj8fSGc)K-<RtTOzs*MLR>)Yv7z}P6iEPdm!8$*kWf=U9Z*^^eEsdqE
zA#jD_`;NtyD)$((8;Cej3ODIE>RLeW3{}@PlYQ%(4t(!*xuORbtE4hpISq}@$p$`)
z$DVVtdn-wvQ@Mf8$&B)frXBHMF65fE*@n0D<6NXE!O&tk5=~=p4H|y`_3ed82y0ck
z2B)FL`*c|oMJ#4g_0g`f7H1DKJZ3f&tRE(6R8AvCc$5&S0>^qu$P)k4bwlLkY@Pgw
zQ-Z9N6Hf_}DrPCuD?Z`ulx2CLo!8~8SJ~Ebth$%w=yrS$ZU`@EnchhGg&i$9HQDMm
zvhw<4sop<Y__k5F>YqKO`ptA}`pf%^-!A>C`~H<}@D26kBI#(!(han7?y7A{sKK(i
z2+XEmzkPrH)0=mzYzIYdXxy_bym|lDDBo}0@A^^kk2boh*R0^YEa!@{-Rx(!hWnC7
zm!%enNQp4?L(WA^1Jv%g=~A6?MXln}K^#OM=c34Bw3`#0FP)5VNCyVb`H0m^NtD<j
zAgXLh<y6Um(vs6GD5GH~on@neJ3_h(1KqGIS`*Whr+6JR#0IU|rEd?+t4p8QyIj}I
z`&S)@<)Bu+YU%JAGj#0QLEDex#cDcUq_vSGi$yv`PcitxQTwD}=4R!2foH`-ZLVvN
z1cPCV#TD2bk0j%x2O^6&i>}8ar`b6diUyNaBCeZGFl=S7Q8~Jx=Vek_%^1E{(1mjY
zWLloV3L^vNw@VJdb)r?nS$DJQp*`isp1X-0LnbnM0<O=kZFq&}p8&Yr-%S4X3(b1+
z8<vqv{ITH^g~qmp5%V|svsJOKgj{1yEv8skoJ5$a;pCL1i=emrs;y)+o_O}p$&&4f
zcZ<jBq-%Vbbn`@LQ7W8;nB~T_H86G$p59)_QoI|eFs5@-aNTuhOjo77Kl6oG39VVn
zE>*77!o#q$?md<hGWD$=Q2%k+a*ulUH6D5Y_t)S5<^O;1{ok+O|6fCzFDe&A(@^GI
z5Pb}s&NVjlTNdl&820=9`~!YXiNu#pSBo59{dNdz@I~do-^AE7TEY$;Y(m*0L4(0)
z1GBu67|;sL$mxA+0&A(ImRf45rIuQ1sil@$YN@4`T574~Uo3wEc8n1X04M+eNRQV|

literal 1357
zcmV-T1+w}diwFS00Sr$71MOFBZ`(Ey_E+my+*GfUi`cSV+X)ieMVs~0+I3jAeMtg?
zmMEJuB?=^!G#K*V$2Ysy>@HoAwiu=Zg23e6b9c}2j?{v(c#X5D@dc%)<oI~h7>tI;
zgTb)T8;u9!Vc)DfY4rQYy}|MEc-$K`di}w$KWM<{O9r)(Qb@!B8X1b0gx`?-BYMSh
zH140AoP3R#zM?E#{oVg=u__+jhc57VJp5SwN8?`K)c?8GGxZ;i`r`)l9zBu+@;|Tt
z<b|rZ=XueyXC6F*pHPNR!5s#@@B<bxCxs*|ck57KR#2=rf5%*yjefVMf4?l{it$r;
zOV$|PZU}|RO3LCiinbJYW0pk)XDOjL%9Qd<TdTjw^U^YpwYN<WbCRnHQ5v@4Pp`@G
zk_d_Ue8t#03<{15#PNK=lDpst0+b{yj}Dw^y}1Fb7`4y#L20=p`CMQrNxl@HjBAuW
zm_3X<FPM;@32$wc5AWVPKw6nsXe;wCLfk&=<5Bkz_T!Ovh`*|S__T$Np0<SM(({@m
z4Zj1Wi0Hf&n1}7Q*HopJCC?QkD2Y@rBnhyRgOGO=ixtKaBm=p^P@p9S!Qd7{jB?13
zY8IpEyeVk5hMdIMG=#=$q0UU3T?Q+e(G^BXa1Grl1QSZ~HE>L){s%`sfV?a4)R*|Z
zjA9{tSaF<A{Q$ZKYKi51fdnqOJ|A5OqQfLAQ*9FXkl}=&sjm){57A67`d9oa_s=vR
zty{(u0aMVpMa=S)EW=%Xjy81&jsl}=Dr{)9wwk~#N)R{}Tf*j;kQ<085<(^EIO-Tc
zf2LG-HCN9~Y%&b|SJtBs7u!>%Q<+3s=WGw3Bvao7*}3JYC@|kcr)Ys`MboVKkTSkw
zt<&%~ah$U(L#ni@agf9bxTy!f{qp8Q9|&V*LxV|V@c!<W<V7i~0U8%OMfM?AgL_Zm
z2GJ6`vRih$fvI2BL8J(n?XnzGj8yt|<5Q|3%0))xmN=NXplyV9*RQ0oS*ymqSv`zj
zNl0;fVOA}9IxUyTHtG*OdH-OGn~~u9d|~?hfi~CMt@+RIE`GfXs^JIMX681<CwIe<
z<RsfevwPQV-78I!r!3S-zk2iT{KwaCx5pX;y1_};u<-ib8?AhQFyGzj{jU<;HfCN@
zYWudLY?A%V8E|iTv_rrGA<h*HeqT_Q;81BFxoxYCslY~Y6QEjDF{Z4{6J?howQqxr
z)shS~o{LenDMs<iECCX>C+wExKuAt;9@=V{O=sC`s*DufrG{=AkH$n#-?@6sXkx?G
z;xZsoC3t-qAoCLH=>6dO$YD9CZLE?zyyij$wsz3w&+%e39WUJ2aFi!3o2y7w@xv2y
zHV!yOH%L8e)g>`KIPm?5Wa>H*QG!!cQrU51sUx!PAH~w&pz7PkfOx^gz5{2i(0_8P
z?tzZ>*eO;_vW^)rJ3$b0J*lQ_cR9}34Sp#l4}HO7zdeZ@kT&uT4_^zY6E>agra`JM
zN=>K_ERQLP*Hc#D{G2j@!>euA?3!MwGX}<yC=_2ZwH;(M6Zl?02hKH+9>f|eiZxi!
zwgm%sVQi=4ZkW{w&D}fo6Cw(V?oJ_RIX(m5`raXOix->$*hc-v@Baf={-gVN;QOyP
z7!Eey|NUWaV7~v9TK)a^6~uc|dCTZglTwD{DNvkBH3x1<B3GxNzRipG>Su<ydWCl+
zE7Vt?SyIFBN#)Ag$M|O>duwW|ir&cSeQSnlsil@$YN@4`T574KmRf45rIuQ1sil@$
P{+sd_coTnb04M+eC{3v2

diff --git a/blockem/blockem.css b/blockem/blockem.css
index 72c0bcc3..265b6ba8 100644
--- a/blockem/blockem.css
+++ b/blockem/blockem.css
@@ -8,6 +8,8 @@
 #blockem-words {
 	float: left;
 	margin-top: 10px;
+	width: 400px;
+	height: 150px;
 }
 
 #blockem-submit {
diff --git a/blockem/blockem.php b/blockem/blockem.php
index 4fff2148..f8c30dc6 100644
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -11,6 +11,7 @@
 
 function blockem_install() {
 	register_hook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body');
+	register_hook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item');
 	register_hook('plugin_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings');
 	register_hook('plugin_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
 
@@ -19,6 +20,7 @@ function blockem_install() {
 
 function blockem_uninstall() {
 	unregister_hook('prepare_body', 'addon/blockem/blockem.php', 'blockem_prepare_body');
+	unregister_hook('display_item', 'addon/blockem/blockem.php', 'blockem_display_item');
 	unregister_hook('plugin_settings', 'addon/blockem/blockem.php', 'blockem_addon_settings');
 	unregister_hook('plugin_settings_post', 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
 
@@ -30,7 +32,6 @@ function blockem_uninstall() {
 
 function blockem_addon_settings(&$a,&$s) {
 
-
 	if(! local_user())
 		return;
 
@@ -47,7 +48,7 @@ function blockem_addon_settings(&$a,&$s) {
     $s .= '<h3>' . t('"Blockem" Settings') . '</h3>';
     $s .= '<div id="blockem-wrapper">';
     $s .= '<label id="blockem-label" for="blockem-words">' . t('Comma separated profile URLS to block') . ' </label>';
-    $s .= '<input id="blockem-words" type="text" name="blockem-words" value="' . $words .'" />';
+    $s .= '<textarea id="blockem-words" type="text" name="blockem-words" >' . htmlspecialchars($words) . '</textarea>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blockem-submit" name="blockem-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
@@ -97,10 +98,14 @@ function blockem_prepare_body(&$a,&$b) {
 		}
 	}
 	if($found) {
-		$rnd = random_string(8);
-		$b['item']['author-avatar'] = $a->get_baseurl() . "/images/default-profile-sm.jpg";
-		$b['html'] = 
-'<script>$("#wall-item-photo-' . $b['item']['id'] . '").removeAttr("src")</script>' . 
-'<div id="blockem-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'blockem-' . $rnd . '\'); >' . sprintf( t('Blocked %s - Click to open/close'),$word ) . '</div><div id="blockem-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';  
+		$rnd = random_string(8);	
+		$b['html'] = '<div id="blockem-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'blockem-' . $rnd . '\'); >' . sprintf( t('Blocked %s - Click to open/close'),$word ) . '</div><div id="blockem-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';  
 	}
 }
+
+
+function blockem_display_item(&$a,&$b) {
+	if(strstr($b['output'],'id="blockem-wrap-'))
+		$b['output'] = preg_replace('/\<img(.*?)src=\"(.*?)\" class=\"wall\-item\-photo(.*?)\>/','<img$1src="' . $a->get_baseurl() . "/images/default-profile-sm.jpg" . '" class="wall-item-photo$3>',$b['output']);
+}
+