From e56af0e09e0852c7215546d6f9db32ce5cc21b39 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 22 May 2012 19:49:03 -0400 Subject: [PATCH 01/19] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: Oops - but lets commit the right revision, sorry. There's a spare line in the last one. Fix darkzero/ns BB icon background colours. cause of bogus wall-to-wall posts found add queue totals to admin summary page DE: update to the strings and some mail templates fix setting array values to config items redir links for permission controlled attachments * master: From 325343a4922543a0043b91054984354624cf5504 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 23 May 2012 07:38:31 -0400 Subject: [PATCH 02/19] Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section --- images/icons.png | Bin 12389 -> 12608 bytes mod/install.php | 87 ++++++++++++++++++------------ view/install_checks.tpl | 6 +-- view/theme/duepuntozero/style.css | 1 + 4 files changed, 56 insertions(+), 38 deletions(-) diff --git a/images/icons.png b/images/icons.png index dd3af3aee3b9c2e1269e9e82c8c9742bb988df15..0ff5c430c5c3a33b92556249ccb6af1b80f84f8a 100644 GIT binary patch literal 12608 zcmV-GF~81002Y?1^@s61{yxO00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyf0 z2{<1)KpZ0g03ZNKL_t(|+U=crcobFku;1#vvvx?x!X6ee7*G;aKt+XdhQ$#D)NvU_ zVFC!sfQ}oCqM{BCpeP85AT9$g2*R)`5D_%2NdyC7Ujy0q?yBnbet&c)>Fi-~X1?FU zd7gTbRNZsy*6p{?z31FhH&R3(LRP>5ga@>v%zA-9gNX`<1GB-5>QE5~078R8DYupr zZV3l{KD%}cV3C-#!&zU2}J^Sn>fsom+n^4Qj=$BnsPygxXo)^CyJ;{;mY|2%YFIRj+SWJ6* zbZiH}-UC_0_q#=8?fkjXdnY9&i*&!g6B83j1jdc)BLO5PC5!57KuXHE|0>Wrj|Pk( zpmG|GE&`p_hS?I0%_b-)si1XKJFKdUkf0#&c;Rt+97IHPrXb(hqMK|_+arpLiwFy| zAZc}1{2>xkQb0BgEpGChIl|#` zajEd7-x4Q!jUPkh)^FMDst|V_vr9GLB#9q>{+XcQP?oM-Ltv7>^MFEP>Ep7iwpx&_o2Jr;0+Qwc_^4PsI9 zS3LIUU-;+je-P0s2t~CLVA4=lQGm;%dJngq3q?g-C@5<720Qm=iv0Y1LPA2&YPD#! zng*?2m4&+$=>t;wIB#br0m&d5gRdbt$36S3uAjo9mgIV?4QUzaQa5g)vE|Wy~ z#4^eb?5Dh}1Y@X%RWUjN@Xow>qFCsNYS)q6oHJM}%duE2*laR^K|uhN6&7HvC}*k>sRA_9Z8=uMV6o`f?{Fi=?Dv@tXnYq5`)Qf&)CHrfy{7#L2Au zW(_a@Z3b!E_YrIiLMt>_0wd8$0R$Su(7KJpv$&)3A%T*7;%Z2ZiS5}KkNe~lT%+Z`p`C9oz=3_S*=$IXgz!{=B;j&8(dnJ! z=AI!sCcIW<|K9YYC@C-Ji_e!bXz(z8+5ZcXk&%Rkh7uSUh$KlkosKKk_m6er98ZBC_ z7M)H5CY9Q0s;ciYPG1UiVy->wp}s!nzDvf5T;xN zd<{WpRn^Oe4?r(=vGU-J{Jw+06H^19zo<4Vfx#if_391QGE|3?z~B%Zij2W%M5EKw zzvp!vIGuxPvvT6xxl5Zfw*ai<C>fTphN z0?Yv@ih|Q^N5VsCp$)ykfX!w@r_szZd)5m| zvAUNRSETddhqXP=PL@D^vODP5{W>B#bf)O+NdPPnkys)kDZG$Fc}XGI?Ho9rgWeQ? z!Dy^D1TC7PcpWsaW8!l@5}SZ9B|W{?oUzJ@NlZ*6#ph82oH})ixpU_-b?Q_AVq;^8 zii#pCDymj}Uw{2I`T6;rI&})5T1RJ9tQd_(^cn-`TxeV-gisJb>(;F)E-uF7@emmq zNkv6PwIypv&KytUh^lfvCx`vNWZ+RNF`LcEvWyS{r_+gDwOx``yA=4wfiw;f-uYmQ zAoPc?3c989=821eur7Rsg#`fY-(MfTDsQwP=M=Hm_T<8`!#GtL0FyyacuZT=pg@WW za_im4U^LdYY>A1rK&t|%&$txQ8wj_gHxRa|t6TSX|N5%{topfn^=fI#lqsUFwX2e; zQ>XIoyYEW(-g~d8($N5DHCmh=2gSw3xZN@y;XnvMR#q03m6Zq~$jQmUX0zdPHST!) zl9@$XS{elf`5ZiWko^37^78V?&(Ej0xEQ()*9 z>r_9LUSmLK0?BE_<+7sH>Co%-XfzsBRmJUgV>X*n6a}}tVTd|*YDaNNJ}#G=l9CeC z3PDIn2mk>A0eFPK?eY93^S^zGi6SvEo%EE3=X?@K!fOQ^l*RMs3$50TLvGmNcw+Ko zY3aOq%>tP6oLNNNkkBId0Jd!V5kpKDZs?PUtD=Nc*}qa=Qb=g4)&zuDP*oX+T#3`= zLa)=IHwEBSWmHw+#$NI4`hG*xjzoHTv%%)ei3aB6%1l>~>UH#o?&LBOH{Mms4C^jMZvIQ52s8;T=ltc6)=3d3wx4($q=g`FP1eTj)8(dThA)tOZgHUytkaSR;bXu`s`6vCrNy0r*C zfIa*7^Sg)dWy$O}2p{((uJ*k!7>!sfN|7tdD9SreMMVXAoeoo=Hzt^ybB2D2efVJZ zJ5qCwM&fTg-&PbwQWT}yH>f%kMX9>h%QCV4u z#bTkXtgQN`jm-f8dd79F?v#T^PKt#KKg40T<1(4Np0eA0#U8#ExZ~1WhK&>EZj{RSdk>h4u^MMDQToD4qu=2bSe2FJY508AH=bfCP^3LWGtOGPc#H# z(rkqRy$tm147bF)c>TljX6t)m zeb5tU&Wj~W7SpTO^_)Im$cvNzB3+Ib{6Cf*Q>)F(r(1YOvHUlG&bnT3mBp-z1NyHQ{}#y$QeMt7@%2}`u!P34H*-IcG2sLR z>Ty&=H>v1yALpjqLixj8Z?&jF$4=#l-Me>kp}2zQCyu#f0ROM1W_`P6jY!?`GXU}3 zx?GgC`~O)QeaKQph_qCQiBaj@+l16e^tozM-_YD@{dyr{VpI|m%u-ABN=r(_uUodD zJ#vIVSw^GNVTgzz^h>0)%Y%^lQi`R+-diX&%Ffu!Njcizm_ zBj>nKR0bv!RFv@P)A#ZC(4H;2?+s&{_V|BU-16kuZO0Yy>^q-T|K0wk;jA7TEouBM z-m|k$ij1^W1}2=Me?lp-vAOh4PABh7^~>h;0jAGB zS!?Lsx@?(hX%_NIO@J4|j0~mvQ>oGi82ZR` zdJlW9p8ond{mD)34^T_Lth7{EKmHh--A+mC)&#xzCbthCE`?ew)tw~UY=mcJVQ@OJ zI-Ll+ozl&laagSll98I4%Iejt$;`|I;Jfd>WA*CQ?Af!YX~)XtV%@rRj2=Cjv17-w zY}qnYRjsy!mjYrHNDH1x#2+SyQqd?-Z!JG4(he0db=0-Ycs!oD-yFph63x92jc@W^ zt6zSYsPHh{rRQlM-I|vk?I+2qLr89c-XqY<<-9PoUyItE{q^h8y6;nYaNc(E%GEl< zUCURq($A?Pv4Mov9=F}c-SL5v4q(BmQ-GN~#lo_TFf5jAmaG~`W=0sMFhB)Rz*O`5 zY#(s``cl6`4DGM7eog`t7u3}Usox<`RiLz5f9Kk@w7GBrRii;X^9*slde!=N78VqU zBQs`jeMJR(+q6M@*IigvuB3HE1x34d5i@Ae6&)tcJ}bR;?OJy1*ufWHe8FRnJ;nnM zJWvb7mJHASAWiu&lNpc4^U5b#m_nj)D&^e!(0Jx-uf4c`|7$-9#qOq6uz?`6j%OET zQgr+$9{$rPUViwxMsF&s4iR87NC4yC+aewqa18?&gWDysX4)T#X&o#9yuSWbUQFID zWVeg=pBgANH`lAkIZUORKy+yHefLpXg~-TpkkHP+uW3CXLz^-perpEB5dGJymY~aGz%vB5f`h{f8-%j55;hbFnWiXDJwN|Dz_BW zFjCXXC{=_AGfPrxhFVJ>VCD24UNb)J5bKwCe~*m`tECTM+p~vG8VzNUkqj6%tkwe+ z7Z-~I)2EYo;R5^HwIgowWTM-&k=DNOf@mkp6dXKw#R2q}va&MPuV2ruUAtJibSck0 z_Z));4Qi1^{Of{r;dBZ5#f9_Hh7-I!_Ijqw-;GAAqvZ5nM!&e2ITI3U0X68kRPp4H z&g2#=^y+M3;;i*l<{#sQXP)4(-^VrzUx%cRMe9dDAb7;v;_#wLw2cgw7F7*%LHcUF z!)HpwWAAU`AFH={ryO||qFr=I^>tHN8vxYO3)OYc|J%cKi45XczLj8;j_6QRgKe1b zb&*)~$rk|Z0T%gLx_5?$OYbz&c1=cx>a}iuvMLSUTo%TX)C7hmz_TNAS@LWK1N+xl zy)sn+6}E0wL|uKU-$|r?-t?jMZ+hX&JhZ;PK42~>A=GTf5fg*aXsj7_Wm)We=_TU! z?N?z`_k9(dpZ4jnqwq=$U}Yd?uz zoh`WB9**QxGG%0Uo|&79MrWYtL>hm(e>m?=Osu7R`{YgH<%fIl-pZqNj0$AJ%$1lz z+wk&~C!2)te14_KFD}LAlBo1Z^nLluMxW!^#XH#Z>mjrutwC?%@5^@M58t;h-%awQ z-=Q^_k+gc2O#3rkB7-l)_U{-VH6(yk>@8pR&OYMZ{-mY-z9?Z5F?XEbmO&8(y`l$ z**15O^vIx2O@4sG-dKa(CD0npfC1rg^Y87)8#K-9-xw~1ghk*MPA~-U`OfTG*Hx#R zKmF}pG+I61&U}nE7Bd&h6ej(1dG&C-VDoX*vb;LZgr>o^Ssl&K6*UP7bxo=dEJY4MWEdz_i*WrWe#syWx&dxqd=(U2q69&;cW>SOt_K*+=4kp}} zVdHc<#ky(Jh}yA(oXAKlGiTBvwvGkJ%R}dMBAZPAsbDj$TD4;I=+PWJc#xM~dWpcm zzWqS;67dMy=Vd>>_477SF7&vU&ckk5S5UIk4)b7I~^2!-GM1aC_{8 znzS7L;7RTo(6v$BrB4lm@*+?x=-D=`mSbVkYq|ga`;jynj5;lLmz%Nw__9{qZ{;^D zP)qY_#Q@uc>ZC^>ez4xX{=lQZ^_T0>Y9yYY{SASwyHIo@jYAvWY}A_VT)Tjf039Q4ZHHE;XYXfYTO5E~ zGUYDx8UeDEPo5e|P@q97tx)QH=_3QQ8H{}kC^x89zGJNC%r2PGH(o@Ds<3~RPz@I-a5b5Vs zvF*4bCVX8aCVX8aE|j|jfKHMmY4OTjv2*4rFF&=cih`=Z%vHVV9h;5HDKaz7EZJaT z_QcrgRe&)gW7s+K6k=yWoo3bOPXkP0V=)0shOTG!#8^_7K;j?%z~LP`xUN+z%HMj6 zYs<>0uviFq`)zLM+qd3>?wLE68;Xj^iHhQe!Go_ja8;Q;k&%(ydh4zHuj^nZL)L_M((-Q6?AP2IbaHs?>$$LkM>u?tpX9QCfyNU-(D8E~q^ zL1Q8WOxh`xF~cSi8xzCGVcs>}*e+e9FW!AubkEGBO;{KLICkfq47v5z zdf}Me3m4M$n{Utr2UBp@UGxeMml|4%8#QVaef#$1mRoKC;E_ijp}f4D-o1M_*@14i zo6yiuh7TXk)!P!pehjtmf13Us{uTr!}cxx^qyi6_hHE_v<&_U`SpbF1MSK%1Z1VI-qpxhC{DMK6w(; zjvZJ^OEK$ooE|lbyI*}(y3)xAWo2a?J9doN*jOSWB3hh`(DCMn#hPUci0cr{zjt0> z=KISDX%o+m5AObtF8u56o+(^99bf>vl|eVevGwiyrKrajiu}?_FPKi5=*URUq>RC+ z*Vc*yn!?)D4l?_otg?O=v-Vq8{``4?IJD#2TIXJS=Fysj)XtqHsZ$Fzu0O(UiWl6R9q=0RaJ0Wo4yUw|Frf_Uxg1 zU?Aec1;n94xJpa0+U=CPT$F`{QSj$Kb9W0i5W19P1dGMOjW^!dXo5mR@~4?Ui=S7| zW6Ued7;tNU&KAhT^}dZSr{D4)&pKH?bp$Vbz7xr$MNtEZ4E9>U&z>60$ahxIHZmMp z3FQ0fBdg)7m4DrhT*D}kOn)cR1qRAvy9wa6|)JVO%@XRn+R(FyvEY1 z)~A&UfBm}Na$|b?Gc(2E@4h4Op!lS&z^A_0;CH|R zvQi4`)e@i75%?$24wyq$%F6%dLn%%n%=$}DTMY)bTcp-xC6Krumh)nZNMjd zV%=S5Y#n@1EMm z5D>CZZw|h}<8lb6YCEXWX!7i~@+X0Hz{0Ez^ENaE--^{68UOgbj2U+ACH2pe^@qix zPgisQy+c|C;pm`+!1!iLE#edFgz9-K@k!l)lVqj1fu+PJ*@1U_^o|2&`@y#q*a7qb zRsp^JAsI1ZMD;RNMMVW3kB5~jSBlGlu(^7N{C)@Fx#9jO_VPhrcZ}rA6SH0Pvk<)iF;@PdNoITLHL6dK2z8FA1|NQe}?@WHF!Z$lkcC08VVCmGm znL2;V-Fb)805&uR-=?&qbm-m(<7IfUM!l8}-TSa9?I`ao-!GbkaCFc{z#FfM(Lzr> zbnv+tXI=2C6LQ@E;~5>)iBGIUs=_d@0r|j`s+BXm8D$!vzYo4{z(+p#`T~1_1mHb? zNXp8}IDGhUZ8yA4n@fhUCH0OPHHsm>AHv5Uf6V^<*<62pT%+~v-=EDpGp4flaDlk- z+DJ)~q-v7lh7AOk(|=$rYTgn?PTyG#T;}Xcn`VCY*=KEKSx!||b(f+jon%>__WJ9u zubMPzQeQ<;Qi0dwhfdZ6weIi@a5tcrBrTF8@!;LJ)2nkUg3Wp)Nn+wX*YU&tR;=HB z2Bo|Z;M>OF`)=nkx^|4FxWax#hVrf*qxo*}z|DA*9r^$tk(ILAKZKE*np$hf zUAc0l@Lc9j2ra31Ms5Bl zLrnyjbQG1Vcm$luuf*Z<@WZwrd2sk2uoa&J*wh$&T{=V|+g${hbbRpXI&OXPqv~h% zxLs(pIy`O{rl3|{@7G#Vea?U7Vu-#uQ3q7mF5tNXEVl4rCo@us&1t7*@_)f+R_dcy_CIo-uGJ36ezb5sRB`&&MBs z93{*05k*mcQdPA`QIxf^EN_`GVZx8HEbowIxp&o86_O;i)fodq0rnp8`g~p6gwQI) zM08jHvg+Nb;Z$Cw!w_IGTqu!oIaIPX%)8JOd;sAgMt(o=w(2r2-~QZXRtF)02DWb9 z3c#R2gQ&1MumpJ%LUg*Cpme3|q^MkN3c}IV!){aX`9oMU9FNukKLHEz?qsH|AKqg) z-tEh$`G)Jo{_q{&&`#`EsNS^b_=a`@z~#|%&~F4dyt0kBcI1V6=G(u#PUEcg^Ps(U zy)+(Fh^d?8__$jkN=!6(?Yyg4)01&iE zL_t(j{r8AzX^3fl{WfM9V$8B;`*-o;#T{i?&QKI(o1!QMvMldaRdt&z%ik-CvO|_- zi>j(!ola*j0F74HL#sDhv>FMWR)f~};=WF+!JyY*Q=GUx0;6851h#5x2r$;)Ea1Hr zzlycnkI4OO&AYF6xT9u=iu_WA;tD%CMKYm* zdQ1i#RbfK6M_@AOP#rExEA7<~zPI96@z?u%NS6LnXt^Bc1KG|FB4SLr3Rw25_btfXi!meFE;&G{bxoIbC+S%Z}_Uzii zu!kO{ZJV}U3z(e^2?>{GdNVR={rS;HA9a&u`3F^1|1Hb1swm1%MNwABvbya=U{ASA$mVs{e}Vq)i^{Lr=$f&6l! z2;g8-@Kr&o)kwHK0*`M1c6!(UvD=+g%C)VW-R{I_)Z=ssOa?Eo8p&G+9#LIq6@+WI zAMrxCzMuDl>2ML7&)1ZVttSrl$6-8Mm%W|d9>ZK}*@{26X z%M?ZFqN?g(x7&T==FOX{H~Z6>f_j>b+Q96yrMTQ4I>&?%-70`q!6tq=QRLZkxWMjo z3w=bWNmpTWP*GA)%K^zRQPAqm81$NI%U1;-Pz_&xsrMNj4i|2x0vKz(lj3$NIDB0x z+g(J3nehnkkXQwBRow=?2Cd#qe#zx;HmYgl{3^WL?A4VAfDe2z!;2E9e0iG^wNzhq zYgv-=DN9m5C9dxS)j#9P5cG+<_T-8=l2!YcrYSkGPX6ESGG7`JD=IwDeNxmSnH`LNnsVRF( z*T720FyEZ;VW0$fu}+D5edV66wuGLh-F;y{k8n5PbY8B$pSbKQ!ybCH+7SuWtK9v! zyK0ruTUyh;V=UkAJP3FA4Zpp6Lt2^_L`8xA{cEh?s#WmFBd}~43>*mAr(mG>y47m! zq^fGAq9{||eDh5KjC%a>$7d;u@~bS%w>h28TikBpZHrOUpF*PDaQ z!sAAG+)k%zOV3<6vp>KVAb#lN!uTPRo{%I7rM!@=4fD49*YWnao1~YL_lWc(h4j9r zH5E1oPPf2h(4f(1Fz7UxjanQ|J$9!7mphQKU?WvKOos&gue74EDwQJ_mM@mGTquNddq! z4M1ohK50B`KzJ_C6ko2sf1tTTyQZ^PMvwM7Z5B%eH(nbl36rULva5icJ`+ZasCQYG z!}!SDa4gO>VdQmaSX2mNZoLFW2VWHM8PF5>oUD`={N{%LAU+8{2!(H%F2T1Z{68ZD z1`lWR=ASuRT-x*;I6Um~Zd7New%Kea6h+x5%kt7kAANL+EX$FyEH84oT!C)4dq8Sx zYQbeb+VF_hksivQh>SpVSFh?NU5= zihcn5c{G3lFc?i>jDfJ2=7-G7)c2RTj$u;vnNktjuK9l}0|ya!27m4%nR`FcM$S8mS4zS2{3 ze-=Botif~3lb3uyj|a{i*vf6c8_t}GeVgvrPpm_#lM!;={;<{a+5D3cB;u2v26_N5 zkd@N>Kc0wBnhcD>n{oOISt+~t|5(JKL*jDcfKrbhzj-=V{LslC0uy}B;Y(Q?=9RZZ zZ^E3P#9cSGWyFBkOKRh)?We@%z2{l@?5+QSbS$5YL)&Bp$+&m7*t%sd8^!aZ(QS5q zb15CLe0S-n7Z$AN+-Hw|bEzNRpvfEO0%IFnxY#;x$W;FmKTM~|=f86%ySXY?Or$#S zwJ4t}8TW)1#qL)0Kg!0v=s$K|()*Kt{qp?Lb$iZod~Ux>(jWBn+PT2k6>km+Zs_{` z(>7La{os!we(<&E`R|;`gsbRW8PWK`x3Q}8I{^=)VFp@epygpSbgI!A?lhXy-^MAdQs zD?eE8f8__OQ%JboPJhc+{rrJu=n?~oUA;$_81K2N=l7MpDpv|XpXD2j54;!AF#rwG zNJJwsz<2K98eRwcbQ+()hD#G^=aA^`k%UF_)WtST7Zf?MQ-ne4+14!S0$N>^{%zw{ z%yqlnWB>KWJ;6?w!2iJG0FMKwOH}{E9iQbJ3|`o7h=u4dFd4i@beQ*Cml~&huutcz zTrPmVIp6py_y#n(ItK&L_(M3}r`xc!lkO!Z$?Ge}NFy$`Vd3H7_jZpq(mmRUKCFF< z_4_@!Y_7}c7`t@FeZj}`TohDzP#shs$uIpODEXy71gQ>iIUQAVzVTJ?MK=*5j1H>> z;dr0!Rk;k&`6k?S@&VSI3_wE~9!~pw9@oC*b}A2qvUR?S-W5%2ZJ;N>(9hG=+F4`1 z2O?7N{LUTgy4Et^eL+qW=NvW^@})AZLF9W%zWSh8S7LL8{%cp6YSc;5(V@D)V3W3A z_h@71)LhrwhBo$+E5Ic;Jq9 z1lEDj<^AW`cK}3NTHa~V7C7Mr@Q$kpUH%*}7T}tT_@B;xWn-z7zhbxjW%rz|cFx;1 z#JVJcqJWK{*#@RoV7LK-KocV*jTw#Spw8}5rI*pL(yf$#Wjp@k%X3!jwVy6>Xu3rj zrLaIPs?&qhEeJAc2r_91F=^<~${+<9H5w%+)9!J|FH0KjN`PLY=FfFG9b-S3@p$m* zyc+nbq{1rm^|l;}$~`C!f#ML1{##0=%jsBL_57B=mUo(8+1RTHUA_gpyb5+ZRA7;+ z)o*3Kw2=$0F5EL4+II&!0wG|_flTmh2DTfI37vLGK$d(0fL|v9ENU}y-qv*+&Tl+Z zGN{X=H(TfuX{^r5Ew{NyJ0Y_^vyjR|8;?m^{gAwM(@p^NxOeVcm&-Bs{WqQpK3C*q z>)vy<;Hz$@PJ`1WP#o~g-#@Gb79UzYbt=<&>M92RT?=>$;3zF$0`n_dz2&KCkMo#D z;Tp|8^UqX8H(V-I=EAvi-~e$bXuIiv{hELbAAEjtVddmw9*2C*k>h86w)--79WDSFVrhT*e>1aVuuHwksZ3-4As z9d<8#e$P;5Yk8;nl|6M8q00ww8$cQ@e|ycZ?6z7~W}nOBlwH4a4mfuNj%|n22WnpO zG`J2nRqutBlRa*={MVC(4o(!<$vmr&ooC1G@ur7MT75lzx808F@}Sj8ga+47D76F! z&@a9L4B!V~C%)t}aEE(_`i6ZCP?fVI`3@ZrqBRB&cDe;W9hX^qppq@wR!$Z= z&}$`hL6JkLov@~Jd+dv+zBIGa?Gp6v7EUWmQ1!)-paA;BMdES8)R$&fx;^&AC%4X+ zTIZ2I0k2n^SK0#jN~=BKYTc`H836j$b{7FG$I~Q)+wrix=K3O^Zq*6TqY=0W^0cAC zJKwAP!g#)NvF^NQ1yBwm*c0<;xTFWnK;4`vx4AGlZXJGa6T5=3yInH#Q&!0iz{ zKW#>(+vQw*=7+cI!iR5dcM-se+@>MSEA^JCdj6~H!j~^vfON$AK4|&^U4KQ8g$Iw% zL|K6h1Yh80N6p-CQ!?&{s=%qTMw@!`a&Q|4x%Nn$+hs^=|EpulJ9(ZpkJ;!FltX(% zghzXaFgyNv#t>8f{QSmz)wudwpmd ztuCl_W#z&3I{+8H9kwdYrhOOKHnH{At*P<1-+retJk&&Fn0ITk>3^SIDLn4Q7k++k zYGa-7>2}tS9zb89YpE4VtiA?m!R3ac3OJqz`89BEx^pHEUB&0}<%%XFRP@yB*BUf& zX~ojJcb#^A>f=`eLcZ(BW48urp7H2)*}=a!ZfG#RcK4h6CA~RL&CPnZbl1nV^uzi- z`IsTR^D~lGpPl#b7aG)$x@p2(VC<`}y%`Mf+N;wlfyMcI7EWzRXIxE2_%8$KgYc5l zvBpH8e?3fEkn3i1pOa#Z&q8_p=7)wovE0*MD-Bv;6BB3VQp;Tp=ybC_u-lyrJa+5m z;_dSr)DORP{5=}8Wsq_vtO0000002Y?1^@s61{yxO00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_001BWNklm$ig00g8?PM1>9krVR1wObzDYKm;iz@pyLLksGx%aih_^`;xgcZ zAPlPl5kUh2NdyC74@e*+WKVZhb$4~&?~m^6E1)xezr%Y@pLAE%d+S#9)9-zkTQ^cf zAVOBa1%wB*qtt$uK$C@XmkX=Oit17k2mnHZLMgMC5pD|yV?MifE+e+BQs5&lr;X;8dLqGsy$B%DTKY7j^G4`paE((Oq ze%*vxT1vm{^Y!$fc={Rf(~%P#&d#PxRrzeimxRT%r)S4@0PNYHMSQ;-MApt98a;PX zQnE;|@i{RukwjqZ*uD}#Vp6iG+6SbhjQyViZSd;A90DpQ(HSBz=p9&X(KsA}g5q*o zN43MQYJ>y@f!7C*+v_4CqB8~g?iQV7d)jVMR8&Ys9_|-2WF(rk>E!nkAliwqc8#JZFw@X&M&`U-}JkqW8GbRBZi<&04v* z{isu_1}8~;`@;_e1&6Y9XIt%6WgI{_9Q zrR4=^Ue)*VI5}Hb$k~FzW>2tlPo~Jv&nF}#1ifC5UaxD=>Q!2}i;=z{rH}R9%p@Qg zL}TzZ1n1bNo{}_k2LOUB7T%pzzb}>WH3nz1!|F0ggik1?bpJleN{cav>R1(H5CCt? zn}OY4-Blq@a=+6x+jCA{cO;K9R? z!Nd4r$8N6ea}B%Gw=rPA^*9_3BuPSe%R!RR+-?j;H+gxdh>i)b)!2VFeJ6^`%J}q? zr3@T2l%MwfL}X+np`oD!1_mNY5^lHaSL^)VuV#t5K4D*w_JZ)=Hj(JJ3{AmT7sTW_ zb3`SCCWC=Xh40Qghp{WefXV2h_xSUi*a7>eLXy8vL9L?^y?SHGJw-)XDFx>XXdN7g z-s|SrfowdQ8;iw?#bQCP*W+@!C^?_U^3Oj1P2osy!m`$s&p-dX!5_kX_uVHox8LB! zgxBcCpzny$B5~U-1F_rlxNX3naJd8_p%GM6R3Pc}==FLG1_R~g4oTa0qd|`+&U^)#WBII0Tm>V=|l38I1JrbtU^x=At_696x>f;(X>7 zfR&uQSG2@KeCM5aM1FogPdxENt?lo=`!4Ui^Ns*$YQG`C8i1lGxIIoJyp)`GU^JO< zI2;%Z1~g4Wr_qx4MEJUAnV(*Y{i*-<#ay2eI4jRr`a2gOO$B zH+O9J`Ym6Ie>iR`Flj8o2v{#i(C|6faVKK{J}?J z6A-4Pr`PfsD}$KC#6(j35j8+gP7ZVD&SlD!DFDRA#u613MO0K&t@gh7;tTTg^U2A{ z0jSb3*cCfwvl*k#1O^SAW_mseS`hUC<-G!CmOXL57d z_frO5wF0ZviY&_rA#l6hI910*S+$FSZ!Ab-0parpTLfWE_$r}WI&Yr15D4qScm8|< z0Q>gUhp#dkEy&Fw_KIGdJ$eYYDg$6K83~VRiy9P2VL@KK^O(%$+LkRbu@-2R0QDW4 zLV5$~mh=YFHg$FDzOUJSC4iNGSFc_zO`bei)U|e%GG)pX-g@gT>8`u(5|uhS0KHC+ z+v}pJs0fco#w%P1A;`+gqN1V#Aq2U(xi}mSG_CQ#D9Go)fdk~{=X37d zIr8)KDJm+$>2!kEbHPJwWAB@TuX4KtQe)9^bMOH?I%$&BSajT!v;@B7hpMW0JRYo8D~h7v@iYuk$4>1iD$YmKJQNofqm~OoLP7ut2nfI{1Rk&VH}U`W zCMJr+#B|bA8us}lkc7_)HYkhd&lh^V2bbJ%!13s$Nz&4J^O^-PofKG4m)#AKn0<0bs)k9EF5ET^_*ladROG~Rx+L#Xr&?~NM)lE5Y z_=H%v@I72kCz{3Li#m$bMa5=N3i0k2X<@O?lcX3_9rGuyW}1 zAP(8xeDQHvlkLT{>j=OypndB^(r*Py@+d!%g~MKfExa|ArMKkdWKpK7gbux(v16Mr zp*80F{RSdk?Eb1D*yVBJb}IxJthiiubb1R0L&Ie=ZwrUfD|>X7j-NU!7A<@am&@l@ zN;>IRhp%sXx|DnYk*)wy6T~qSCrTF*WGtOGPc#H#(rksBdzl@v$f&F#CnY7;v#h^n z0Z%d;5he*_S0Dl-fgyS-DvFv_3=%zg?xg`tdwG7d7kd2E8L?!^VtV(!ij!x~^W3Dr zNtY4@|ITK|)avu{X*M31QF=lBdt=@_@%dM4DT%#?AhjIt$)AYp)R7gRF8|H1vu+ez zX)!DFfHmvIzs2MQ>0ItI@x|x6u!Y95CvzW>G2sLR8gZ3JH>s$3j&bcxq5SFg*ILw} zqdB?a#~*icwy2zECXBvl0ROK}&H8H18j-r=2LR%`b-5sG_y4mrdXXiH5NW9p6Qk0n zj|Hib>~p14-;i&$e!UPeF)9fOR;i_WCB?GkI&yipV%k@ECycuY8PR_ft;^!^2fL~tbJ+N|E#~; zjw#~v3|}62;k^-3g8*h^C?Y!}4O>hpc`B6V0mKlO5J!x~(kM)oAhlG#t{(=lebp)v zvUV+P?RGF2(3#EXEEa^(h$2Zyk&y)5a04N?-6s9o016>$Md+2yHpkb60(kE$KZt@- zm2Pc=dH<{S!)vjm@J^ zg35y<4w9Oh%76)JOr3o~G-e3}G^<~ETwVQ5^XH51vu6`|>J$!H=7`x$T2vItUAK;s)vLvCV99W~eCel37=LZ!)^o^Ik-p_49OsX-Wz`}cnYF9g>o|C- zOyr(9%hA+#>2}-1CXZk9-BEG)>>2c}qQD%)*V(6-c4uGkxG);@5NzXb?{DPIWj{81 z-ne^T6q4SEHM~96R&A?a;q5Q#+TY$*R_pWW-D~(X-7cyCoUtH>RjJv;gk_SK=S#W7 z*nFvzjDuFPOJcBCt;}4OQx8H3q^D>5>X*&w15BHJqSny6b=fizosvRHSs7;n138tH zMEu)t^XFN!q+zeUCSCWhe{tm6YtebV=-qDY-+xcpjvbBO#L1HK5+zIPt!Ar9$T==_r?QgDw7BH;_+cuOV{*>#qB5q;mgDR zA*_UShsE+qehKl%$PAOTeb{URjVxF#ei4|(t;-wsR@%y zDQ^_0*Ong;X$K3LGV%(hKN8Q}FOOgeiRP~R$2EDb)h|3iRCpMkk~6fAZq4%#^^;`P zB_xl)=oJ{{GM*jMuSNaN{^AvB-8ZS+H*Y)V%G5f;UCXOk>8DkZ*uaF=o;Tgi9r1yZ z0bs$Z9Kgys#m2IXFl@GLmaG~;W=0s6FhB)Rz*7Bwwja2f`cl7x4C$}3eog`t7Sz=T zsoz0RRiLCwf9Kk@v^jegRi{Hd`6O|@d)NAPo-Zg6ho?{Hs`7I7v}uF>_S>JuiPR6sLz)!6t&N2A*1!N#U{YdEhT2dEtR88$GG4xhoJcxC-dJeRy($R3S%9v>hz=j)Z{9-=}`AUd@9 zd-r}?xyZ&?^IY_3Kg|Us1%sp(FYGt)Wyny?mbOz^;0EV_3KZU??dOB5c4; ze00HvG#eKB5f`h{f5bsj55|x~7=6O5l$Kb@$twXhjMTJJN)#c&tdf+Pq1Ms|SUIhy z&x}t!$oeI|_pvcywe$fTyLZz`r=v77lADJPt#v^~MMYx&v}q)sJHyZ1($Z4auV2ruUAtJibSY0i{WJpy4s4M{{QH7*;noEG;=*}< z!*O08a}|^4|AZk z@4Ac()o0ym$f`7$xh#w&sR;~8fTxD%vE-=?2K2ACdZnrYDs0`Vh`RbxzY|FPeA9>4 z&-B5Ud2oGweZX2=OsLh0D<%fB*<3yB%Cgw`{PV=^+eda#5S^ZTj_5XRBmj40Bzm_S zS79Ol4Jj%rV$-Hg+g$H`__R1r4j0$A@jFnhI+wj8V$C`xiOn!yPFDk*INmO_x zu7BaPMz7t-)yFpUZxvCVXGLa0kf~|A5|PMbaBtGWD-?i45X+ft@F3 zFK5z+eiufn{anxC0+-mmWo5ndjT?18pZqnl$)Tdo6GAoUwpy@QU`c8W2{9!Qmc!`b z2U#{F4_laus;Uh%SFJC0##Ft}%-GtfzSm&D5Eh2bWU4ye?RJaQzyF;sKm5RPn~j(m zGicksebt5NjYfpah30bc-;|1q3N~%p#F{m0a5x&C*H~%AQhzESHad{uH@0KKto0ZJ z!Z?5AJD!>NaJ`}Q?Ujc`e3uBqL(EJX-i?<(OvmXcV%yw-(t`s#HTeY&eRT~^O`tbh z0TaUO;Xm7tHE5dGzdB3`35&oZ++YgelbzYM_N#6WfBDB-==4Uun(;7gY*x;eDolKH zdDU>dVDmB5(sOl!30;GIv%8x26?F*-bxo=tEJYI=(B=-5(d&IW@3Z-&X5oY4kp|`!^Z7)i*-|{618Ioxsj3BX3U^N zY#j@5?i>cU8`)y{ZzY>))v6VvMvdaYfdf4M{PP3`2G$#bYg(~~Z|_vgk`)|EZPc3W z$}VL3!|}}eJey};`v9dhkNvBjZ&9S$F+3QA7mwFTs724AcOT=)OP4OCef#zZA?gJpi4V*dH(%X`*((k)>u*<~*GW7x`%3~_ zccJij8V5JbY}A_VT)Tjf00YBsY=_=pWY5QATAYAfGWm9lIsvks4<8>wP@qXFDOc)! z>F=z}5C9`?=_cKK^Ysk8GM0}f{HeY#_lK^;#lE$OMV%Ug#N%`j^q^FFP#*MlkfWLlHAkt5(V%srAjQ^rgjQ^rgoGsG?fI*TZ zY4OTDv2#X_kDpprML|_y#;QK_iOohOhs;bXOE%b;Jt4NL3NU&^3_EA!Aa*9y=~lJ= zRKOB81`Duc$a-c^h$VFiB>w479NMviD_gaq?6udpqO_E9n~i|iU+3!UudjEZyXVg3 z>cT>DqoTNa(4b!(xXPJ6k&%(yc;k)y?Qef$kpDc5RY%@ld04cKu(EAm0k4m~inB#B zQ|GQAII0`PCwG&z=AVrMb@P)Oh0$cjY%*L_);q!$AWfN{Dwd=jU~}dvjDMafq8?p{ z;f@*N+8$j=oAVdxgZ2Bxm<6jbk9M|_|J@S^|o-};A0XUjD4=YK3AX-Dm2A20VkvS0vsa7Z-EH{_9;q52`L zeQ^I+mDt!4(sC?3J>Nz`&lm;_uvP6JGa^PBFgin!2~wX7Kg4P+{p^E_Ny||gJ#-?m zF)@r7>Z|F-cIhI0`qo>bM`k8%!om>1(c5lg@QpXtOUL}Ua3Nj4{1RPoFa@{YPVew= zsi9Kb$dMzt{`%{=;f5Okc<{joDJv_ZPoF+b-awDXLuhCy!-fsxkw+fk&O7f!uh%!5 zdfAm-$Vbmy$E{aI^5lXHe%`&6kmxH~G?Z?CXYeJLTjow2Aieq79`WL;G~AXz&>6tv zBEmoGc*6VZ@dk$Alyo5JP|lxc-lIcl-72v9+;swr@qg&bqqjVR#i+lezO@N8)LRmy zW+kMm11C-hG2-b=GIQz>Xn|!<=Ws9&7A&(78xzKcC4GnqtNu1>me!;`X-(>v>>OCD zf>Igre(~z73_f=b&EuiCq5@}!4k+Ea;W8SLPn^KAV+Xd9608OTCr6Itj+b7Ne(lK! zrKP1DJ$jVb*jOSWB3e8dq2qNAh&9U=5Z57?|Li==jCYn3(k7lA@80oWE&Lnqm?1QS z0Wg8n&cLhV*!ucCQq&_0MSe+z4@|dAbYvu_QbuDo>TBfzEn#hHCz<_FR$9Lcsr}ZK zzkX664(|A>*0z_Qe5iUtYUj?9RH6tmdqEB}m!0$bfL3fMq-Ma%R2vgU^kmwEXslML z!DlW2ral-gn$nkcBGrX9ARs`hsHhO@7B8m5?%nhV3`Cqgi#T`?t)v9I(@B}8Q5qIT z!C(K%9W7Wu=wc=#*laegx#pTiCnz)|f0^-v_+j-tM!&d>n{VvTF9kAjeQx5jX*c}W zXPqpcGMr~W*@iq!(q78?ouErc}yUSrd$)~A(-n)-F4<;L{(WoC*)Uw=*D zi4z1=R3ND;vdM%yA%Uw#jwH5Am)~SMR!!JiTIujdz8Fnru8Rxjwb57oZs+iQmw8&; z(x?6Zw10;STw=pPnY=PjRVAdlL-9#nfsg#T!LNY@WTl+1*Gha+N8nAM9WaNil$HO> zi&ES|SdAAyZAAznGM7Bak|nE{pQey7VhN)s3}C{5*cK1LzgOtqSiVmrbdTTNud&>CQPF zWsd>tfQ4Bb=51&Sz7?xCGVYPP7(Migi@HBc)*lj!K3dH^cMWbCgrkBM0^^!FY7rmW z$5;8S#3ywFPLP%20hSV<oTJT?4+Qzz(1hgX%U%FD~~dcCY% zxl&vTgw3@(_>Y6x_{~N!YSbt)_GXaKH=)tCuD|{kZXPs@xQ=1XT-Ff41a1XD`yYzEzsm2nlA*YRH;&v@zHTRM|pqVVO86CKNo3s^ek4yMfCa>uztX#g7|ly-zSmhTfyLO3dDBjC$d#pt1z5jyxoj9)bP*$sIffN_ip>cofk z!If#4mw|j>a%JTV-;6RH(BBVVH{g9geAfeefCS*}nvj&1mU8IOq1s`1n>H5>VN2Q_ zIdUX}|2UWrKKOur`?9&}s<=km+qW;9H>OWv&!GZw%@vW7BuP~y#SI+*ET{i~Sk!Y% z7%^>U6>yoeFV4;U_~Vb;%CelQs_HI9Q98-8JoS}VURgD9;>7C}MM(u-i61ga7u34L zm%tr>QIhmXlEi&?+(Pfptq8UnktB%;cV5Z2`&zO7$5SX}=K;QI48E^-9;Iu?Xo||6 zzsgYFwPQ42?>yQ#gg(pXgYS;i5W@AoZJAE^MgXdiC?ih%owPbvr2 z0`CDvzp9n^q)=cEunV{j-(-ir!24vStge~DNKH+xHRP^bxl(v9aV3P7w7c<}jU4)= zlplZG%~e;$@$&Sy8f@#O>67VmMIYXq^(-~vYl+N$z((c;9KUqw(g<0WcPNUICCjo` zRn-??ef8Bf0Cu~*LRHl=U#3HE)f>#M|9barM!inLDXCGvzMwbpz4MXVj`NlO0Urnjp=Ywz@qk=v(0ABzjfWP@)HKjN3FW{ek z-|(jz@U8g0INOUBEv08CU#<4B(T@Ny^!|r9R9Zd!%$ziim!?mqSk_py@I5m2X0ShN ze}nB=qDQlG#u6k+V)#>AeSXG(AtXo=eTFY?wm%^0m!OvrG}hy6)sbN&2+X{ zMsulTZJ2kqDfj@wL(Kefz)e-hX#VxNOYJT~0!?h)x)p$d0|!#>aA6DbO$adfv~l0r(zRh;Jn`ef{(v!|*L%KGi>5FRlsSu?_9SK8319 zi;it*Cjd0BkpneGfI}iW`ocPcVll)000l{NklR8>9Lp$ z$f}0Z~`gdVTJVltq*G)gL* zRS>?t;%D*qdwNO!XxHcSwN!c;D*?RKKvs$XUL`(h4RAZq9r$w{m3#dD;v}+CPStI1 z`0(L)wPNnN;~IqK^NWSoL1#}nLOYGrE}!fzjW1~4W$@9=6WpKaO+n|3yMuHCz~F!cV1XxpZ(&jMy=LqfvEncj?y zS|8tk|NU;VEPt!2>VITeRux6rsVK?{S(f*ys=8X1Lgzqctus4l@PAoe%J@$`hLDIro#m+K3{!oY_(Qa z%6?$KKj=6F{G*QA-GH0;q^JB5bCq~qr_n0X@VX1oweUd#uxp$ z6#b~6>NLosk3K47#m(kbzWKQA+O#6~Y%%TH_QSJ>Z4OBXY`hCI&fMVdeI!D~)KkkVt zOXzJn+!xL>2u~A1=cVe`5Y4GF^!|sc0+CRo${qi>z1A^CTWi{PjOCl12jJEk!*8EH zke22HQBk0O|7t6^Y85>AAS_!30|r2L4h-<^x7+QVR8_4|6lLHe}FAO{E$iK z;|EWCRFWi=vh!qZn76%V8?TSOR(d{pw@5#Ho<7}MQ|@r#_6RH{9Xg#3lR<~otjFax z;&hwPJb{D-o2gu3IxN@>gk#X_FdOxlj5@3)Jw~G*uh)y}@?z9Wgol{PJaWD!eE2II zSMamDWkCq|f)Ky1p-v@akU!t|39yT-l<$d83ILvL074V-N#kGx!h30^_)_(2CYn36 zYkC&Ts8PP4&1Q?>nkynDVX-t%b|sM0X29^_^>)j$oF~h&Syk04Gi|rq7ptoJqTB7h z*5mQquyyO!;)a_3>8sZp%0ASUKL$4QEbi-Lua%xz_@l@?;)AfL+)0_k&4KhCb${&u zoCXYL-+F`l_iSr)P`onnCd@`XA%P|`kDTY~ZV@%%1NaaaN1n%*=W7naOlM^P0`Q^1 z4__4UG0+S6gshZjYxsu$B0h;45DI^pF2P?D{@uvUgNCtr^AG$|RMNB$93FOQC#o}4 zI~8y3+zviaKY`0J!+7XB#q zWSt_udpph*%S;%3&n1=OzS?n$&TT^2lXZ%|S9aiy@pT?*|Iq#;qkAMJw((M&FNyB22OEe_x)-<;I0;NAE2UwF%m<+X z7)^ZAbwFpJLQ_3tZ<&GH;Xy6cTI{P;0eFe}4MBLp)fQFt{huXYj;Hp{NG8Qgh#gzj;Jx9oi$0&%3#ayP<)%Lj zW6p%@o4&6f+6PxnM#%Hjgsoo8R&z3fM10Z{Ku_RVvQnD=#}n~MlYo)e#oTvfbss|@cFC_^U7MHH-66d;`VFWGW_P)i|XU5?Kxue zo--_b>c;=VbS%G&Mc-rt$#{Njv31K_Hj-yXVc6{c@?vhl@*hh^KD%H&r$2t^%ZvT; z22R>I7Z}r6;bQB&!Be;_|1&Yvfv=(YTxLIrR{-P2qF~iv&zOI|dS|d( z6V!a+b%ED~TN91`!=20WUj)$a^Np*7@8(9Ub8s`dnh=ij>ozRyq`Qbo^2N$A((nuI zSa^8&T|J`B^oTZN3~S$F{eF)vo2$89W0p?8JNVc+je>G7s*9>u^7DTRN`C%NL8=Qh zx9c(izXKm|ROPVS6nr%yOvB4bf6SxpUGAh}e<)k$s~ELtTI&P70j7T5uJ+D4>zxph zg7*)eSnUeie9u`qO`LW)P{@}`^(K+;E&lx7B15r53;p-5Qq^pbqN76%fx#AizaG)% z&aH#=$W8-yUKJ9Xn{smgiSw?s!oos_a5?fdN1@4GmRFqj)s(EtzFqt9hjTred(6@q z4+bAU=Vs;hQ&`PL?jO*eU`zc#&ZAu(f`1PH-U`sa1@Kj+#?W!nSJJta=N{iBx_jOd zkMs}4{T+Cm5y) z8q_}2?)2jE3hCNT0aAx>6RO*b*&s1EK3Fp*zf0{%XHz*vCp7w|uwYaAO( zh5R``I$!Y2+3MtsQ%9^O5flY%1l=~Uv;x!B5CpmyA?d8>yax~qJl z?_QX*VvqA=p-a~-(kz7q>QUWZ+#W%YMMscDM~Fp7hgK#j$gI;TxtUI{OMXGp=~n{u z9yx!m=5~#Fclsm2C(l*GS1ILonJ>2GQds6iaS0TcVAMZSDm1ri@nr;lM`@UgYT!qg z3M^9f#;wekHgZ<$!kx3BeGi}`5CV=|$OP|ZV7vLKFz5#dWXZ@0vST(_CZTdG+z& z(}ixf?m1lxzN&s2bhtHv;({mt`CbLE_~7a(ms2pm0}Ge~aD|lD@}!pJUD$CTp$hxZMW=qb`Qw#!&gJjuAFq#>yo=4K6dH{r+?4} z*En|Gg;Nu#XMWm#Zte5k^Hx7yrSEn*$Gkahd~iXD#^&7(!)FT#;-+}tB-HWGzE$CN zIWNQaI|6VUKpHK7dacH>+iF>vy_(l8Yd>=uIDHt7Zikcms~_?-X$P8W_w33^UXNP# z^NI5=ju$w|{6!)AoD+}NH$7a^8|&$NoK95Di{2m+8eD%usVz8we(|jllHiGFXH|Hd z&c#PJJbxL!-w}Wxf^R0m_7*_6y*dKMuWPB%R+BxcVW~^7=j{)Ps6M+8O?jnHYc$gGT^)((ALI!j2KGR4E@ z%ror!Zq1q9Uw?LH_4h|8kv-@vAu-nW39bFG8UXL9Z(pC{(cFulnL53~;}yhrZiOu* zh~PjgS9g!V;}twJb$W$Ib1y#i?dzA}`<;m%ARV#3FS_f2u0JEl!i(2$qU=Bhf=}_V zquTe|l#J*8N^mNz(WXAU5Zs1=+HQ%{yG&{Ae|AlN<@2WhVOSMwQ?_w zOh%|HjZQ`=@1@(PH|gTiiln!0Kk5F+&#wf8eBF_UZw%5s=`|X%gMV^e-H?9t9W(by zMr)j!m-SZ3t`BPIhh6{J!=~`gPfB`Y_PPH&+n|2bwd3akV_tfBW-!3ZFHNlg7U%C? zcp1Lmvjwaaza`w{w=O|I1itB5$MDTanV5_xxuJ$eM_|0c$W=MAc=M(l&qAO8DD@4# z6#l!6?RN!*=exncFQ<-46mLozc3< zRdk}Bui!Yd_v?VDt6FbM-5kFyb+b!&J&OzWrd)>avRszSa#=3RWw|Vu<+5Cs-;w-3 X1do|Pbpdho00000NkvXXu0mjfc&TV* diff --git a/mod/install.php b/mod/install.php index 6f5552076..1bdb792a9 100644 --- a/mod/install.php +++ b/mod/install.php @@ -4,6 +4,12 @@ $install_wizard_pass=1; function install_init(&$a){ + + // $baseurl/install/testrwrite to test if rewite in .htaccess is working + if ($a->argc==2 && $a->argv[1]=="testrewrite") { + echo "ok"; + killme(); + } global $install_wizard_pass; if (x($_POST,'pass')) $install_wizard_pass = intval($_POST['pass']); @@ -110,14 +116,7 @@ function install_content(&$a) { $wizard_status = ""; $install_title = t('Friendica Social Communications Server - Setup'); - if(x($a->data,'txt') && strlen($a->data['txt'])) { - $tpl = get_markup_template('install.tpl'); - return replace_macros($tpl, array( - '$title' => $install_title, - '$pass' => t('Database connection'), - '$text' => manual_config($a), - )); - } + if(x($a->data,'db_conn_failed')) { $install_wizard_pass = 2; @@ -128,39 +127,20 @@ function install_content(&$a) { $wizard_status = t('Could not create table.'); } + $db_return_text=""; if(x($a->data,'db_installed')) { $txt = '

'; $txt .= t('Your Friendica site database has been installed.') . EOL; - $txt .= t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL ; - $txt .= t('Please see the file "INSTALL.txt".') . EOL ; - $txt .= '
'; - $txt .= '' . t('Proceed to registration') . '' ; - $txt .= '

'; - - $tpl = get_markup_template('install.tpl'); - return replace_macros($tpl, array( - '$title' => $install_title, - '$pass' => t('Proceed with Installation'), - '$text' => $txt, - )); - + $db_return_text .= $txt; } if(x($a->data,'db_failed')) { $txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL; $txt .= t('Please see the file "INSTALL.txt".') . EOL ."
" ; $txt .= "
".$a->data['db_failed'] . "
". EOL ; - - $tpl = get_markup_template('install.tpl'); - return replace_macros($tpl, array( - '$title' => $install_title, - '$pass' => t('Database connection'), - '$status' => t('Database import failed.'), - '$text' => $txt, - )); - + $db_return_text .= $txt; } - + if($db && $db->connected) { $r = q("SELECT COUNT(*) as `total` FROM `user`"); if($r && count($r) && $r[0]['total']) { @@ -174,6 +154,19 @@ function install_content(&$a) { } } + if(x($a->data,'txt') && strlen($a->data['txt'])) { + $tpl = get_markup_template('install.tpl'); + $db_return_text .= manual_config($a); + } + + if ($db_return_text!="") { + return replace_macros($tpl, array( + '$title' => $install_title, + '$pass' => "", + '$text' => $db_return_text . what_next(), + )); + } + switch ($install_wizard_pass){ case 1: { // System check @@ -191,7 +184,8 @@ function install_content(&$a) { check_php($phpath, $checks); - + check_htaccess($checks); + function check_passed($v, $c){ if ($c['required']) $v = $v && $c['status']; @@ -422,14 +416,26 @@ function check_htconfig(&$checks) { $status=false; $help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL; $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL; - $help .= t('Please check with your site documentation or support people to see if this situation can be corrected.').EOL; - $help .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; + $help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL; + $help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; } - check_add($checks, t('.htconfig.php is writable'), $status, true, $help); + check_add($checks, t('.htconfig.php is writable'), $status, false, $help); } +function check_htaccess(&$checks) { + $a = get_app(); + $status = true; + $help = ""; + $test = fetch_url($a->get_baseurl()."/install/testrewrite"); + if ($test!="ok") { + $status = false; + $help = t('Url rewrite in .htconfig is not working. Check your server configuration.'); + } + check_add($checks, t('Url rewrite is working'), $status, true, $help); +} + function manual_config(&$a) { $data = htmlentities($a->data['txt']); @@ -465,5 +471,16 @@ function load_database($db) { return $errors; } +function what_next() { + $a = get_app(); + $baseurl = $a->get_baseurl(); + return + t('

What next

') + ."

".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') + .t('Please see the file "INSTALL.txt".') + ."

" + .t("Go to your new Firendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") + ."

"; +} diff --git a/view/install_checks.tpl b/view/install_checks.tpl index a1a75ade6..8a76c454c 100644 --- a/view/install_checks.tpl +++ b/view/install_checks.tpl @@ -3,9 +3,9 @@
{{ for $checks as $check }} - + {{if $check.help }} - + {{endif}} {{ endfor }}
$check.title {{if $check.required}}(required){{endif}}
$check.title {{if $check.required}}(required){{endif}}
$check.help
$check.help
@@ -19,6 +19,6 @@ {{ else }} - + {{ endif }}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index fca935dee..f984cab68 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2950,6 +2950,7 @@ aside input[type='text'] { .starred { background-position: -16px -48px; } .unstarred { background-position: -32px -48px; } .tagged { background-position: -48px -48px; } +.yellow { background-position: -64px -48px; } .filer-icon { From 789063da399675575f61e150f11dbe534d7db3c5 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 23 May 2012 15:58:22 -0400 Subject: [PATCH 03/19] add a placeholder attribute on search-text; dispy fixes Signed-off-by: Simon L'nu --- include/text.php | 2 +- view/theme/darkbubble/unsupported | 0 view/theme/dispy/dark/style.css | 18 ++++++++++-------- view/theme/dispy/dark/style.less | 31 +++++++++++++++++++++---------- view/theme/dispy/group_side.tpl | 5 ++--- view/theme/dispy/light/style.css | 6 +++--- view/theme/dispy/light/style.less | 31 +++++++++++++++++++++---------- 7 files changed, 58 insertions(+), 35 deletions(-) delete mode 100644 view/theme/darkbubble/unsupported diff --git a/include/text.php b/include/text.php index e93c24ef4..d6a9ef5d3 100644 --- a/include/text.php +++ b/include/text.php @@ -646,7 +646,7 @@ function search($s,$id='search-box',$url='/search',$save = false) { $a = get_app(); $o = '
'; $o .= '
'; - $o .= ''; + $o .= ''; $o .= ''; if($save) $o .= ''; diff --git a/view/theme/darkbubble/unsupported b/view/theme/darkbubble/unsupported deleted file mode 100644 index e69de29bb..000000000 diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 6f29ef1f4..612c24f5c 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -58,7 +58,7 @@ h6{font-size:xx-small;} #articlemain{width:100%;height:100%;margin:0 auto;} .button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;} #profile-listing-desc a{color:#eeeecc;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px ridge #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -121,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} +.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} .menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;} @@ -135,7 +135,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;} #asideright,#asideleft{display:none;} .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #638ec4;padding-bottom:3px;} -.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} +.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} #asidemain h4{font-size:1.2em;} #asidemain #viewcontacts{text-align:right;} #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} @@ -389,21 +389,23 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} -.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;} +.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#2e2f2e;background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} -.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeecc;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} .sidebar-group-element a{border:0;text-decoration:none;} +.sidebar-group-element.group-selected{color:#2e2f2e;} #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;} #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} #side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;} -.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} -.nets-link,.nets-all{margin-left:0px;} +.categories-ul,.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.categories-ul li,.nets-ul li{margin:10px 0 0;} +.categories-link,.nets-link,.nets-all{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin-left:0px;}.categories-link:active,.nets-link:active,.nets-all:active,.categories-link:hover,.nets-link:hover,.nets-all:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.categories-link a,.nets-link a,.nets-all a{border:0;text-decoration:none;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} #pending-update{float:right;color:white;font-weight:bold;background-color:red;padding:0 0.3em;} .admin.linklist{border:0;padding:0;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 000918a9b..51bf7ca30 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -312,7 +312,7 @@ h6 { [id$="-desc"] { color: @main_colour; background: @bg_colour; - .borders(3px, outset, @main_colour); + .borders(3px, ridge, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -510,7 +510,8 @@ nav .nav-link { background-position: -44px -190px; } } -#nav-login-link, #nav-logout-link { +#nav-login-link, +#nav-logout-link { background-position: 0 -88px; &:hover { background-position: -22px -88px; @@ -669,11 +670,10 @@ nav #nav-notifications-linkmenu { #mini-search-text { background: white; color: @bg_colour; - margin: 8px; } #search-text { .borders(1px, solid, @main_alt_colour); - margin: 8px 0; + margin: 5px 0; } #mini-search-text { font-size: 8pt; @@ -771,7 +771,7 @@ nav #nav-notifications-linkmenu { margin: 0px; padding: 0px; font-size: small; - line-height: 1.1; + line-height: 1.2; .borders(3px, solid, @link_colour); .rounded_corners; z-index: 100000; @@ -880,10 +880,12 @@ nav #nav-notifications-linkmenu { padding-bottom: 3px; } #profile-photo-wrapper { - margin: 20px; - img { - .box_shadow(3px, 3px, 10px, 0); - } + margin: 20px 0; + background-color: @menu_bg_colour; + padding: 5px; + .box(175px, 175px); + .rounded_corners; + .box_shadow(3px, 3px, 10px, 0); } } #asidemain { @@ -2333,11 +2335,12 @@ div { #group-sidebar { margin-bottom: 10px; } +.categories-selected, .group-selected, .nets-selected, .fileas-selected { // padding: 4px; - // color: @bg_colour; + color: @bg_colour; // background: @main_colour; // .borders(1px, solid, @link_colour); .multibutton_active; @@ -2369,6 +2372,10 @@ div { .sidebar-group-element { .multibutton; .rounded_corners; + color: @main_colour; + &.group-selected { + color: @bg_colour; + } } #sidebar-new-group { margin: auto; @@ -2396,14 +2403,18 @@ div { margin-right: 3px; width: 75%; } +.categories-ul, .nets-ul { .list_reset; li { margin: 10px 0 0; } } +.categories-link, .nets-link, .nets-all { + .multibutton; + .rounded_corners; margin-left: 0px; } #netsearch-box { diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl index 10ecec2e8..be8e23de0 100644 --- a/view/theme/dispy/group_side.tpl +++ b/view/theme/dispy/group_side.tpl @@ -5,10 +5,9 @@