From 8a51e29824fc2569ac1d0def3070bee7c0552231 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 2 Mar 2012 17:22:16 +0100
Subject: [PATCH 1/8] template proc: add variable filters

---
 include/template_processor.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/include/template_processor.php b/include/template_processor.php
index 111fc5849a..90c6b2e650 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -160,15 +160,25 @@
 
 		private function var_replace($s){
 			$m = array();
-			if (preg_match_all('/\$\[{0,1}([a-zA-Z0-9-_]+\.*)+\]{0,1}/', $s,$m)){
-				foreach($m[0] as $var){
-					$varn = str_replace(array("[","]"), array("",""), $var);
-					$val = $this->_get_var($varn, true);
+			if (preg_match_all('/(\$\[{0,1}([a-zA-Z0-9-_]+\.*)+)(\|[a-zA-Z0-9-_]+)*\]{0,1}/', $s,$m)){
+				foreach($m[1] as $id=>$var){
+					$var = str_replace("[", "", $var);
+					$val = $this->_get_var($var, true);
+					
+					// apply filters
+					if ($m[3][$id]!=""){
+						$filters = explode("|",trim($m[3][$id],"|"));
+						foreach($filters as $filter)
+							if (function_exists($filter)) 
+								$val=$filter($val);
+					}
 					if ($val!=KEY_NOT_EXISTS)
-						$s = str_replace($var, $val, $s);
+						$s = str_replace($m[0][$id], $val, $s);
 				}
 			}
 			
+			
+			
 			return $s;
 		}
 	

From a406c165810f23a5f8f91d49ede17d7d6b3cd775 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Mon, 5 Mar 2012 22:31:03 +0100
Subject: [PATCH 2/8] fixes

---
 view/theme/diabook/icons/community.png | Bin 0 -> 475 bytes
 view/theme/diabook/icons/globe.png     | Bin 875 -> 1361 bytes
 view/theme/diabook/nav.tpl             |  14 +++++++++++++-
 view/theme/diabook/style.css           |  17 +++++++++++++----
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 view/theme/diabook/icons/community.png
 mode change 100755 => 100644 view/theme/diabook/icons/globe.png

diff --git a/view/theme/diabook/icons/community.png b/view/theme/diabook/icons/community.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c91e8b756323f2fa9214a63648d51448d6ab90e
GIT binary patch
literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY%
z5D5ij*btxq00CP`L_t(I%k9)ZOO{a>2JqjTZ-f?vv__~UZ8fw;AHXrersf-4LWgit
za>~W1CGNSYe`9@tzJcHpgg6C?L-YqJ;%zzN;py?wpuoWk4(FWfKKJ!p=RP+NC-~p!
z9d;ly&*2583iS?mBI0XT-l-#e{B02(lrdGfPV^h@9%8X<A4kMIZWY13+YJgQGgmQJ
z_~nRLI>_;2NmL~?OIEMv8o8aN=>3bwYYP8pIrFWB`_jVgb_rjt*4N8C*&=ee%r`1-
zvQ;=UhjFQjjb-L&M0{$hM#Oezj^biPPZW*)dS>Qbtl~n&f5c79;7LRKK3?KIu2c`c
zgZYSf-pkC_n66st16Htwrx<T(w;nd|0B5jNO0gGv)5q<~<ug3O8qQZv+S+X#ukaby
zuz=YTo9^RY*$g4^v*D}@gJNJ4r?HM-fAnl-jvUZlN5R>M`2IKliW3}D{00=IR1cQN
R2|EA)002ovPDHLkV1mv3&g}pI

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png
old mode 100755
new mode 100644
index bf27a8f3f6f50fc23c2c3a97a12036e219a3b5bb..6bb9bc09d3dfbf6cab80e1cc8e08c8e9720a28df
GIT binary patch
delta 1281
zcmV+c1^)W$2GI(TV1ES;GbL=NU~2#X1kp)EK~zY`&6Z7wS7j8&f6sr0nbGlslpr<j
z1Ij^3WE4%aO(A3p<KCRYs9d-RL8icn98u5_wN@b%Zd?plLehQ7MJ?2Yk!2ARlmk-(
z1)_qepi|>~={zkw|G!sr>|+tVa2NNyAJ2Qv`<&+-_>YI~Hh-CASp{eWT7fo6&jYgn
z**1Wrv$j704oT{^J)BY+`^SJ;mQ4Xx16w6MY8y!a*KF4TmNaO)IqcZ}SyHF%!zrcy
zzXh1*xoppu)M0xqa7oetFw^#!qy%KPM}c>NZIW#J9MB9*mvqqfE}$o+<nsBIJAf?*
zx`4I7QAt~D_kY>00Q+peVtW7>PATn>w9j@$QlF$Pz|q*-1uW09OydFq^MSoUtL=S~
zUbQ_WX%TQt(mN@o(Fms^jJtqiwif|Iv1gy8R$#BB`F8}&vTTa&4xm-io|MuC+gE_~
z!H=CqQJgF7H9$(~9I!LM*8^8#@1D4LN1o?XZ+XK!&wnexTH6PJen}tO?vu2@_G(}N
zI4G&#_H{{{17NqLI@?o#wUU}`9|nGq^a$`m%(VeUN@+~t-2~u!Npo$F0Cn+InK=wJ
zjK^x*mNa6!vC3HBdVCGGPXS9(N`v)rXshkHz}LW5U=Vmr(q`KYlD66I1?nRej!44x
zN?<~yN`DKmBQCsK(vLCMDQTJQR^UW^+^{X)<kOVWvGBUd_9RK)0iUOo&X(9b3Mi%Y
zP09AF?KP4X1ARqNd==*`1|FBx2Arsbhj}Q*@lvE_NSY4x0GCVTYOq}iB9+HwNj<iw
z12bwQk&XjrfxOJpS+>uoluniwVjJ71i=r4P*?-3(C2m11iekX_>4;d_eiArudsdC5
zS(c4Sx^DZoPz@wC0?oFsN*c0V1*u4y5(i(taR*h?qzRY^4A>s#=Hz7Cbt$DveTiw3
zR3D5Z)B{PCm?K1c?DlZp)N$29UDDTzO4O~g)IcAw2Dk_eN_yG$`=LB<7e(RHJ6?*U
zpMPGm3D^U?CF!-IC_W4_-3uHC=GFk?Q6~b8DW&tV@N&tCrbv}>MPE|WIP(wLZVrqZ
zX$oMr?Wap&Iw$FZq=k~E{Z(PLJ<aw);DYTlCHoV=Y)M7g!$ZL9z%zNCpNPsZ$M%Jg
zw^ezb_u8%|e!V2}JYQ;if~0G<TO=(2E`I=XvMgHxi~vh@gNcXAfZf0;;HfB26`-M-
z8j|(`jb&1V{bZ~e1BL_qKA=m|sO=$OGVoJiP*s{?N!!CyBz<A~7u$1y72$E0q%**X
zq>fT)YLIk4@FMWL?Jt4Tz{9|k;ZUcf;aeUz&-1CaKalj2?JnSr=w}WAOMpD3^nY2b
zy=YrimS$P@tfa#Bx02c-2j2tMN%{!bP!vV~E%mS{iYt<KhwJMkbw>K^2d+wL&+~jn
zsg71l+e}IAz*S&>gt{}%=mvII!Twb7ZTA4}(S2=<`q&izD}gujJbxfU?AX%*thC)7
zYY*7o7+~$8#kEma{^{-QrKP3ijC!OKlJ1f8oTO#IWJ!~3FP8LRv?6u$=FO`IHbu+P
zAZb-JU<Yk)0=jQ+qVC!zN?INDvDPNqz6R8V<_=0~F3H;|N!x87Nhw|VSB-Fpcq`Cm
ryVeMY90JrDVW3;ma8VRv{9nc&Dy!p~SOABf00000NkvXXu0mjf!L4-}

delta 792
zcmV+z1LyqF3hM@tV1EM-9wPQYn#=$I0_#acK~zY`&DC3ol~oi6@ZXGDl4U8Vg%Jgc
zvAaOo1p^5Z$}%n3FZL2q5Iqc1NK}|q2K8(a(SrsN6~u~&w4%43f<iH<ZCDRkO_^zf
zI;ogrFKgg%(D5AML>oT7k9FDqZ{7Zj|M(2`>riW*g;%gXB7esE^&dWmpB%=$xVzRm
zW1xTua0ljN6{Zh5!dY0E-}m97K?9zT)%krPZtFL#!+oT42urZAL%b@12NK~WS-;M+
z8s`lP@Zyg8jplm+77q$=K5oS^Y{j9JudKCR(DUHeS{LFfoWjIuY$mc<?!*TCfgA7!
z?!gYcgr70v41eS@gag<!J=63eF6-e3C$KvrMr*C_U<Gc%2WRp73vc6@;fUCR8}V)`
zI?qXrV+=>Kb|0ngbL>y~7!Ko~F8^cr0&5~-T||rzb+r939>r6*GR1rGCO*!z9>=#4
zaWs8yNwztOYw>u#;ZJPA3zPPzCGT46B5cn3$lPzm^M4WXclT^Y#Hm{A+APbWRPDls
zh}hPB|FmvFYwchu<wG3I=9q`2xV@CJyS4Ufhpk%cTX>>_5H@23J6dbKjYUTCDjvY6
zn3)$IIF0!N%*pzXU}Hr55)r5Rn!|`V(FO2RMEp=|om*?&RBK(D@@;812YVyp@Ko(O
zZ7O9cWq&yy!%@6nN;!nraX*%qQYNq+YmyjRDdp?d+KDsWdA5CaHRfU;3hu(P)Xl}S
z+0m1Hx-1EPXWxLe)+O0Aojf`_n`s-a$@yKMV<D+;@l=3Qap}$Z$flW%ukak6#Kt6n
znYoxJqrUE(YFJ8HoBM8(F+Rb|5%FGYZM?O%r+<|4W%B3c9ozp%DdoG?+V4FB)>^N?
zLs^gCk_VrTh+SPXJJwp;UP?KROOuahV^?eKn|@NdA{*xW1X>pnqf?B~Yj`+Qya3nt
zmC{nmgSi<-BI2`N_FQXiUozAL=9N-@Y_09@HNwq!BqDb9v&|#o7&axZj{85He*vN(
W`4Jr=sO6gg0000<MNUMnLSTY=42+Nf

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 34a37ad2e9..284883ceba 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -53,7 +53,15 @@
 					<li class="empty">$emptynotifications</li>
 				</ul>
 			</li>		
-		{{ endif }}					
+		{{ endif }}	
+			
+		{{ if $nav.search}}
+		<li id="search-box">
+			<form method="get" action="$nav.search.0">
+				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+			</form>
+		</li>		
+		{{ endif }}	
 		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
@@ -61,6 +69,10 @@
 
 				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
 
+
+										<li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
+
+
 										 <li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
 
 				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 06ddf6de18..913f2b641f 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -91,6 +91,8 @@
   background-image: url("../../../view/theme/diabook/icons/notify.png");}
 .icon.messages {
   background-image: url("../../../view/theme/diabook/icons/messages.png");}
+.icon.community {
+  background-image: url("../../../view/theme/diabook/icons/community.png");}
   
 .icon.drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
 .icon.drophide 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");}
@@ -526,7 +528,7 @@ header #banner a:hover {
   color: #ffffff;
   text-decoration: none;
   outline: none;
-  vertical-align: bottom;
+  vertical-align: middle;
 }
 header #banner #logo-img {
   height: 25px;
@@ -610,12 +612,19 @@ nav #logo-text {
     margin-top: 3px;
     margin-right: 15px;
 }
+nav .nav-menu-search {
+  position: relative;
+  
+  margin: 3px 17px;
+  margin-right: 0px;
+  height: 17px;
+}
 
 nav .nav-menu-icon {
   position: relative;
   height: 22px;
   padding: 5px;
-  margin: 0px 12px;
+  margin: 0px 7px;
   -moz-border-radius: 5px 5px 0 0;
   -webkit-border-radius: 5px 5px 0 0;
   border-radius: 5px 5px 0 0;
@@ -1329,9 +1338,9 @@ section {
   margin: 0px 2em 20px 0px;
 }
 #profile-jot-form #profile-jot-text {
-  height: 3.0em;
+  height: 2.0em;
   width: 99%;
-  font-size: 10px;
+  font-size: 15px;
   color: #999999;
   border: 1px solid #DDD;
   padding: 0.3em;

From 3da97e239394106482960877852d0403e2c88d90 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 5 Mar 2012 23:20:42 -0800
Subject: [PATCH 3/8] finalise spam storage model, begin driver changes.

---
 library/spam/b8/storage/storage_frndc.php | 34 +++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/library/spam/b8/storage/storage_frndc.php b/library/spam/b8/storage/storage_frndc.php
index 7702c108b3..62909d4715 100644
--- a/library/spam/b8/storage/storage_frndc.php
+++ b/library/spam/b8/storage/storage_frndc.php
@@ -174,20 +174,44 @@ class b8_storage_frndc extends b8_storage_base
 				array_push($where, $token);
 			}
 
-			$where = 'token IN ("' . implode('", "', $where) . '")';
+			$where = 'term IN ("' . implode('", "', $where) . '")';
 		}
 
 		else {
 			$token = dbesc($token);
-			$where = 'token = "' . $token . '"';
+			$where = 'term = "' . $token . '"';
 		}
 
 		# ... and fetch the data
 
 		$result = q('
-			SELECT *
-			FROM ' . $this->config['table_name'] . '
-			WHERE ' . $where . ' AND uid = ' . $uid );
+			SELECT * FROM spam WHERE ' . $where . ' AND uid = ' . $uid );
+
+
+		$returned_tokens = array();
+		if(count($result)) {
+			foreach($result as $rr)
+				$returned_tokens[] = $rr['term'];
+		}
+		$to_create = array();
+
+		if(count($tokens) > 0) {
+			foreach($tokens as $token)
+				if(! in_array($token,$returned_tokens))
+					$to_create[] = str_tolower($token); 
+		}
+		if(count($to_create)) {
+			$sql = '';
+			foreach($to_create as $term) {
+				if(strlen($sql))
+					$sql .= ',';
+				$sql .= sprintf("(term,datetime,uid) values('%s','%s',%d)",
+					dbesc(str_tolower($term))
+					dbesc(datetime_convert()),
+					intval($uid)
+				);
+			q("insert into spam " . $sql);
+		}
 
 		return $result;
 

From b64b1d13a43659af3f479bf29b6ac9b9b3f009ee Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 6 Mar 2012 08:27:20 +0100
Subject: [PATCH 4/8] fixes in diabook

---
 view/theme/diabook/icons/bug-x.gif    | Bin 0 -> 134 bytes
 view/theme/diabook/icons/dislike.png  | Bin 385 -> 386 bytes
 view/theme/diabook/icons/language.png | Bin 0 -> 849 bytes
 view/theme/diabook/icons/like.png     | Bin 393 -> 388 bytes
 view/theme/diabook/nav.tpl            |  15 ++++++++++++---
 view/theme/diabook/style.css          |   5 ++++-
 6 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 view/theme/diabook/icons/bug-x.gif
 create mode 100644 view/theme/diabook/icons/language.png

diff --git a/view/theme/diabook/icons/bug-x.gif b/view/theme/diabook/icons/bug-x.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10936caa77447918523dac210ec106b3f9e48cca
GIT binary patch
literal 134
zcmZ?wbhEHb6krfwXkq{XMMcE|ZSCg_4F7>BD(e4#AkCoolZ6o^sRJTFYMGe5Id<LQ
zd*1TnTA=u@n&#^YY@SXfsb>s%TpZV|Fm*ZV=u*7+-1gPSCWLw)Xj)pv*tCG{F-zu2
dPrj|vyW$S0D+X{pDRI1Kl4=;J{ep$T8USlOEiV87

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/dislike.png b/view/theme/diabook/icons/dislike.png
index fcf340258fc1258f7c8c97081d51741b79a102bf..23de426c5a6def7113c12ee557789e8d0b6c8d2e 100644
GIT binary patch
delta 298
zcmV+_0oDG21A+sPVSg4WIzzW*jQ{`v0!c(cR5;76(!VZ5K@`XF&u*@jEeJw_Mx|G%
zJ(CB}iPuni0)+$-jfQvt&59^&{B4M3_g>ApGHxz6l0C`f%*;9GJ2SsIjLA;$ghMP~
z3%AHoB;ym;*ugqv0a(Q}hG=62^ARh;w<0!&4b0*~l2l+H%YQhC^(aQ3_#*ruy+LYa
zVR@>`yoh<H4$!K(b`}03Rt4k{=vF{=FhZ2F5GJCi|3^_fat0~jGB&#5cX1TIQq^XJ
zdz`0F*v1lG@QO3+VG3)QL@)N9qi6a}&9#V4JjUtAnE6eEI=jOu-V;4K{{g^5l9Sbm
w+64HBx4+>gX(O<2%NhVfTt!~5@+;%9FF>7130?zlDgXcg07*qoM6N<$f|mG(r~m)}

delta 297
zcmV+^0oMM41AzmOVSfTN9-H^(>;M1(0ZBwbR5;6}(!ELpQ4j^-Z`buN5Jd|ML45>U
zQ}_zLi;rTX&!M&2Slh%-MbKy?v2!;fiLsf5xNJ5A4-DMP+&ObN=fV}<FhB=8I7c7j
zn)<{oj<KI%4;#@OVHLYrQ;$V#;Q;L<2BE+q65Iq)*-I+t@_&7iP1%x|jTTnw2*&uS
zAxb9t<vmUP6KQ4h7z-g!#r>%Sqc~?#13XX2Oltf|Vs4P)E{2xT#uHA_ouR&uZiX{#
zV;!#%&qe%=R{V)23~`CaP|(AB(}oUC@DUyqIBGJniY~5^PZ*ldLy+Skq?d2gc?jUU
vDZ(<kCVb%@n<9};J}<!#FOf(ujQoRN(y&E0302RX00000NkvXXu0mjf|7U|U

diff --git a/view/theme/diabook/icons/language.png b/view/theme/diabook/icons/language.png
new file mode 100644
index 0000000000000000000000000000000000000000..8029c01553836cc651835c2d57f88442cfcdfb46
GIT binary patch
literal 849
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKV3zQ7aSW-LlQd!S^y}~ETm1ZY
z>8bYr@BVXY;{D>{<~OncRWkhlpY-DG{DS{qW^Vp(U;FRR|BsW^|5yK3zoYJI50++d
zWZ3tgMNm*k;Xjc7<HrvMR#sL95I-;|`2XKOe}24t_43i{*RM~%d-ra~hxhN7fQ;qm
z=XciB)av;5{o9jE7cT}P8TIPLiwBqg|5Nz+<0r$HFP|AWIXD=Mj0_om|N6xNG(zqD
z`wwd0zJHJY`t{3VMg~R(K0ZDMadB~m$4{P^0F45f{{KJAK|{U<1p$VGOBJ#VE(yPR
zk;{2LO#Tu3mA+X|if&jXC&g@!Ira6cA4g-RjECmJRac@i*D5Mmm_Po@)Ub8h?@G)5
zyMLetDe^TK2)G_p_gHm(&6<~z92Qlj9O4;Wzb&eoyH=^4(OFxoDnGL}TJ!6}eSS_H
zJ%%s#Dsy`7u+~&f>X{)~ypI85PRNCgyax<87z~14fBp|iW6>zCZL)tMX|P%8(R2~P
zvhcK3THoWI%iQIa16!MNVIwDlfxuyh$$!P`Hmnul&onx)@<QYe#@n+b8MCw>?4IY6
zJAWrwsm+;<ybKB)3<vd>EKqr4udp`6$tQ=${D5x5@9kFXf{IEjv_eFU58qXPomcjZ
zg&!0;KIb>`0z=2);(15*?M-j?PjvJ$n8?Ddvu^3v+z*HLC!}qu3ts2dC8*xS+&Aar
zqrlK>zbcMBnERRK2G~ZY!h`ee>m~SPZB~4Lef|9DH*em2nlook-JLsk^4`3WnYE{8
z&#C<T`%-^=dwcur_Wb)gwSRw=8Z!d{T>Jid$-2M4DrYt}Ha>iQem;Nwzdx2g54ZDA
z{<zcys0ftooXQw`)L0=Lr%qN0Ur<^GN;EBL23o$a_V=+5KR>6lsi~<Yy1BXe0kK&U
z4@8O1;hns|NMkrSwbV9%QBrod(HkZXeMZHZ>7Ejqi>4TD-S#bNyQOipi%!D<?mMp*
k&ify`_X?v;gFM&*W(JpFzwRu*COeR6p00i_>zopr07;~NAOHXW

literal 0
HcmV?d00001

diff --git a/view/theme/diabook/icons/like.png b/view/theme/diabook/icons/like.png
index c9543afd53eeaf4d51f16ff2421f72d4628e6657..b65edccc07e0125f663ff738e6983ae01a239e96 100644
GIT binary patch
delta 300
zcmV+{0n`481B3&RVSg4W6rW*eLI3~(1W80eR5;7E(>+QAK@f)FXLiLEK@b)E2?Rkz
zF!BT%7>h^nE_)9#@(hBJnrS44Ya${Th=B<Hj5}jevoynq4roEsT~PJbS6$uwv(4fV
z7wBWU9?<y#Ford3U?u!kfbmG2#4@^V0dpwg{E4y+U;$g02!FrCM?I*Lw2N)5;s!nJ
zVLzl-y-#5i>sZ2|0$t(_r<lPGPLM|n)ykul2b`x$h9U77i#Q6uOp?oFA4b8^9aMXc
z4D(6fbt@vKr(v$0NO}!F^NWX)T3JhMQjn$K&Nl(w1W-1>M<cBi+{fIzaY1)@kC&Jh
yEAWCVT&D^KcqI;Cfm=K_NG|Y%GaUTMcl`p>wLcs9C5r+80000<MNUMnLSTYNSbs<W

delta 305
zcmV-10nYw}1BnBWVSfTO7;BGmm;e9)2}wjjR5;6>(>qE7Q4|K??<O&rq|j0<wDN(9
z*th}LU~lIVvK4U+R`%ACPAn`G1s{#rC>Bw4%-Ed3FiakL;K1eQzyEnN-WG6-9!{`R
zCNw4pG_Zs<%%EK+)FuebVioh)K<BRlO{8&zaRMEz6v`ZgPk$}2jlDwJsj7s8Lo8wr
zN4UW{4zM3hY$C%MZsXq*Uf=?K<PourE-nMhBlW!G&oN$E0H4^!7Vb;rDuE3B2I^5x
z7T&^gV0lGvhFBe~TB#oiKT%Q<OaB?;R93ahsUVyeu;P1YgHgATPZ7L7Y~o$)L5hst
zaE;A4Af?D(F)IIaT-ES^*C5pKfk(WLi2NM_J)HgmOn*ZG&8q-;00000NkvXXu0mjf
DitL6f

diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 284883ceba..1f2f64f6af 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -1,6 +1,7 @@
 <header>
-	{# $langselector version 0.01#}
-
+	
+	
+	
 	<div id="site-location">$sitelocation</div>
 	<div id="banner">$banner</div>
 </header>
@@ -73,7 +74,9 @@
 										<li ><a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
 
 
-										 <li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+										<li><a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
+										
+										<li><a class="$nav.search.2" href="friendica" title="About" >About</a></li>
 
 				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
 				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
@@ -135,6 +138,12 @@
 
 </nav>
 
+<div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
+<div style="position: fixed; bottom: 7px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="images/bug-x.gif" title="Fehlerreport für das Theme diaBook erstellen"></a></div>
+
+
+<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+
 
 
 <ul id="nav-notifications-template" style="display:none;" rel="template">
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 913f2b641f..ddbbc2e53d 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -108,6 +108,7 @@
 .icon.lock		{ background-image: url("../../../view/theme/diabook/icons/lock.png");}
 .icon.unlock		{ background-image: url("../../../view/theme/diabook/icons/unlock.png");}
 .icon.isstar    { background-image: url("../../../view/theme/diabook/icons/isstar.png");}
+.icon.language    { background-image: url("../../../view/theme/diabook/icons/language.png");}
 
 
 .camera 	{ background-image: url("../../../view/theme/diabook/icons/camera.png"); 
@@ -172,7 +173,7 @@
 .youtube        { background-position: -130px -40px;}
 
 /*.attach         { background-position: -190px -40px;}*/
-.language       { background-position: -210px -40px;}
+/*.language       { background-position: -210px -40px;}*/
 
 
 .icon.on             { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
@@ -1190,6 +1191,7 @@ section {
   color: #999999;
   border: 1px solid #DDD;
   padding: 0.3em;
+  font-size: 14px;
 }
 .wall-item-comment-wrapper .comment-edit-text-full {
   font-size: 14px;
@@ -1537,6 +1539,7 @@ section {
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
+	font-size: 10px;
 }
 #profile-jot-perms{
    float: right;

From 8b0dd349f56c3f336fb8c7f03fa0b2a1b2f13061 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 6 Mar 2012 08:31:54 +0100
Subject: [PATCH 5/8] add img

---
 images/bug-x.gif | Bin 0 -> 134 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 images/bug-x.gif

diff --git a/images/bug-x.gif b/images/bug-x.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10936caa77447918523dac210ec106b3f9e48cca
GIT binary patch
literal 134
zcmZ?wbhEHb6krfwXkq{XMMcE|ZSCg_4F7>BD(e4#AkCoolZ6o^sRJTFYMGe5Id<LQ
zd*1TnTA=u@n&#^YY@SXfsb>s%TpZV|Fm*ZV=u*7+-1gPSCWLw)Xj)pv*tCG{F-zu2
dPrj|vyW$S0D+X{pDRI1Kl4=;J{ep$T8USlOEiV87

literal 0
HcmV?d00001


From 607ee1ff9c08a38fb938955bda5fd8aa8776ecbc Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Tue, 6 Mar 2012 09:50:18 +0100
Subject: [PATCH 6/8] quattro: theme settings (a bit hackish)

---
 view/theme/quattro/theme.php          | 46 +++++++++++++++++++++++++++
 view/theme/quattro/theme_settings.tpl | 11 +++++++
 2 files changed, 57 insertions(+)
 create mode 100644 view/theme/quattro/theme.php
 create mode 100644 view/theme/quattro/theme_settings.tpl

diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
new file mode 100644
index 0000000000..7e5ab1e62e
--- /dev/null
+++ b/view/theme/quattro/theme.php
@@ -0,0 +1,46 @@
+<?php
+
+$a->hooks[] = array('plugin_settings', 'view/theme/quattro/theme.php', 'quattro_settings');
+$a->hooks[] = array('plugin_settings_post', 'view/theme/quattro/theme.php', 'quattro_settings_post');
+
+
+function quattro_settings(&$a, &$o){
+	if(!local_user())
+		return;		
+	
+	$align = get_pconfig(local_user(), 'quattro', 'align' );
+	
+	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+	$o .= replace_macros($t, array(
+		'$submit' => t('Submit'),
+		'$baseurl' => $a->get_baseurl(),
+		'$title' => t("Theme settings"),
+		'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
+	));
+}
+
+function quattro_settings_post(&$a){
+	if(! local_user())
+		return;
+	if (isset($_POST['quattro-settings-submit'])){
+		set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
+	}
+	goaway($a->get_baseurl()."/settings/addon");
+}
+
+
+$quattro_align = get_pconfig(local_user(), 'quattro', 'align' );
+
+if(local_user() && $quattro_align=="center"){
+	
+	$a->page['htmlhead'].="
+	<style>
+		html { width: 100%; margin:0px; padding:0px; }
+		body {
+			margin: 50px auto;
+			width: 900px;
+		}
+	</style>
+	";
+	
+}
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
new file mode 100644
index 0000000000..25af042530
--- /dev/null
+++ b/view/theme/quattro/theme_settings.tpl
@@ -0,0 +1,11 @@
+<div class="settings-block">
+	<h3 class="settings-heading">$title</h3>
+	
+	{{inc field_select.tpl with $field=$align}}{{endinc}}
+	
+	<div class="settings-submit-wrapper">
+		<input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
+	</div>
+
+	
+</div>

From 23718bfc259c00e87e3845ba4b1ead52ca7c6559 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 6 Mar 2012 02:17:55 -0800
Subject: [PATCH 7/8] prevent duplicate likes

---
 include/items.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/include/items.php b/include/items.php
index 3c55fbb4f0..fdff6b642f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1595,6 +1595,14 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 				if((activity_match($datarray['verb'],ACTIVITY_LIKE)) || (activity_match($datarray['verb'],ACTIVITY_DISLIKE))) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2148,6 +2156,14 @@ function local_delivery($importer,$data) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 					$datarray['last-child'] = 0;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
@@ -2297,6 +2313,15 @@ function local_delivery($importer,$data) {
 				if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
+					// only one like or dislike per person
+					$r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1",
+						intval($datarray['uid']),
+						intval($datarray['contact-id']),
+						dbesc($datarray['verb'])
+					);
+					if($r && count($r))
+						continue; 
+
 				}
 
 				if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {

From eec4cff84be630bf3a4165321a423c29ed7926e9 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 6 Mar 2012 04:28:45 -0800
Subject: [PATCH 8/8] remove "smilie" expansion for Diaspora logo

---
 include/text.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/text.php b/include/text.php
index 042ee982cb..c8c03174e6 100755
--- a/include/text.php
+++ b/include/text.php
@@ -737,7 +737,7 @@ function smilies($s, $sample = false) {
 		':headdesk',
 		'~friendika', 
 		'~friendica', 
-		'Diaspora*' 
+//		'Diaspora*' 
 	);
 
 	$icons = array(
@@ -778,7 +778,7 @@ function smilies($s, $sample = false) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
-		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
+//		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
 
 	);