From f62575445c9afe8a58be5043493f3333d71a1877 Mon Sep 17 00:00:00 2001 From: Frank Dillon Date: Tue, 18 Nov 2008 08:15:16 +0000 Subject: [PATCH] Cleaned up Friends templates. --- .../packages-7.6.4/root_import_account.wgpkg | Bin 16429 -> 16165 bytes docs/upgrades/upgrade_7.6.3-7.6.4.pl | 2 +- lib/WebGUI/Account.pm | 2 +- lib/WebGUI/Account/Friends.pm | 14 +++++++------- lib/WebGUI/i18n/English/Account_Friends.pm | 13 ++++--------- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/docs/upgrades/packages-7.6.4/root_import_account.wgpkg b/docs/upgrades/packages-7.6.4/root_import_account.wgpkg index 250e2e62671d5dfec6b559ee2c5cc4305710ffa1..afb5c559f4e357570b79fe715a8c08ed4a10f08c 100644 GIT binary patch literal 16165 zcmV+=Kia?_iwFP!000001MPijciKp^@O-|%LgRa$o6Nbv>|kuh@9`Qti?i5{lT2nf z0%VXQBq9kr&OP(r->P1uZmA^%24Xw%oCzScx=Yp7-L=>HZ_EEHl}gQe{kPxnvmtzH z!C&dOGW?Zl&04il{Y@)Z8s*Y&8Z=%0-^BBE7eE_Zx@mVUz4ui;=Cu3pa_~o9l6>@uh+^z27t}w|1E3&*Ow3aB1ZVX|AIxh z=J}4R4~#W!Q~L`qz#o46{fyilyUy5febex;0eONn(boE=2kYYY%=9ht@LG9|Ji=~U zy5}E!A3LsZ^moX^_QbNp7CqO{;pXlw_Pkb=o`!|#(_Y7uu4Q^dqc7dJjhhS8?mIW+ z*^+e6yS1IMXDY`uzWc6zWa#}feV}aM+}MVD?iucJUjf#{wa8W1ar~k=!nZ5xy`D3% zeF+5J^9-N$@b1WNoVDEZ=1b2$t$u2jUhbWo4W#C#_ttfM$G;uZcb4DB^p4Da->}KZ zGLk(2;EmfiTyk&cbWiH`+Vo7A+&#TFG|tSC;Y@t`PK}a0!oYPV>a^B4Y^m-9vZIcpS#wf>x|y&t^ruWsg|4d4X@{#W8ZYh z8^)*v2+2FqM-(#`M)&#o@#f|ZB6xH2!s%WaJ@|6yScnCYye!i;7+tT0dt8a^clDao zlu+B=P`3vO?ml)`)ZC) z93RH$=^PmmRE-RK60SF8C$MfNgs|82F|6I|$hskfd20Tk*sQc<@J;WP)BDPC5SXn@TTM7BxjsN@A6nvb)#la`xTDSxl%R&Y{l)!axBKR`)1P z-Tksg?x8l9K51TRrq?k*N4VWK?eWCdP+tj8c$4nP^uMeHUHHzpJMn$ThHKZlHNi&z z9NWI(+C;OZTTeax+R%DLpK2$OB)*IVCZj_0Glu#_Mo+Y|I4sJi}`naBo+m(k%~G@VCpc$b6oPv%)WrSRCt33{XFS{?ojg`jkVS+(AHT` zo;``s(vv^7D82>A=&Oq~FH9^Ya3JYD2ME^o=`F+ZjO_?ur(v65&INLm7S-*`K(fS7%ly_*38o)UII>iDp&UxUIs@@VilM;)1e=ugp(v}Fq_m>Q7+u>t<6 zmc}*ALDF>LJs2-CKYUtrPXl5!T#rsre5vE?D8UfcIzvFhTM?kin~`OCgbme4b_-EJErVH=6H^M;_U zeucyjiyWJ(b{FZ5DX~gBjeMW&I^sqA9`0<>`3m37C47t0{FJi`_DtB$6+qJ-4N0~dA!>^iaSa6OIZU8LicwTTe=br;Ke0xt} zD=l^>rqwS3ig4>L5|nsFJe}ZQeZ+69_dJhqVvNi4!E|1PYi#+##+hkA#)fe#d2+A7 z@kQQ#-?-E#7PCl8_rx_oUVjElwjW?XDJR|T<=rt({rhSLTrICDRvZs^I81eY+}~8dj(Vnj$I@-kk`g*(4e&QWLH#5L@3;t5(M~2Brth2l_MtL(+B7 zUk%ul68z{HmWAi1X%B=eW4+%GuiTh@e+YMBTl$Y6JGA|-)4vUbgtkw0SzH2X`~3hC zP|pDyW?k++$LD=ffFObmgIj{7&Y%lnDMx{q0i!ZJxDh+w&$^ZXD2Ip+B>^qpl3zf+ z7rsnaQq762`1erOm;m$HxdgY%4l*jB|LMBGW<}qhKZl=fm<>BX+{hSp4b%iiq_h?7QD zjU@FR^eDCz)GET8OQKmur(aQmQ~FpeQHvo9e~WhJU{b4wS_qAuftpgjU$io#B72|A zrp(9=_Ud#R)GwTynTP`7O25|WW!RWJw+DPdT(xnl4;`n_cSZ%{8dUhj$ZrsAP_Y5a zoc2VPTYKKY!14oXA-~8z3*a=Y7e=PN*im3#Ale%CnK%G$4%1$Ryzi%-qc?BXC%$Q| zA0U#}!D0K&>-V5kx_x>%vBA9M*iZk^{*UiAXg7qxKY+?e`%{DP3yt;wOwhpa*U#v! zr%xm!23TM4`G4t0fNy!j@RpW)vAp^f;G&jONkvu+?3}r7jKhFtt4jjOE&% z3}WcyO5ffrC=75WH=w}Z0FHCeX;AJbbdg~);llJZR6>i1J}R*lbvE3U1-ZR~ zZkYpn(?vg)Ep+(6_q6+ko?|)g=D^i&x0s~5SsQ;xmX32PlHkQHz+j3p#y*5vn%CeP z@R~~KUc{Mcs^u3PXh6R}y3m-EpXA#BEUIJoEVK6&*iXMH<*p`DoD(dLs%vpUXuR7WJ&s8Gzw|& z9!H}5GFubS?#zHl5P{KkPJvQMWG0jzRUJSJiS|Wtnl266wbs*Z;(NsXYyw)oe+#k) z@`B;USEOt7r3FdX>CMpejjc;?{wUl~m$WVf>rPv&oVv+U>)m$Pghn-y>@ut~>o(9t zGQJ!%jAY)3^HxB<(T;7$Hln@q_08I*b{tWSl5q7N*FY+s3}|VoR27WEmpY>&?kUDl zv@GR3rEH1t>7}^hb_PW~?E-h4h~Z#nWqq)?uuJhTVpR}t;dj-kCAPtriBTHWLXL+J z;ScV&;10VD3jo2z2h#_4^bM?#w&8j-Nb#fAstWoFrX8y9s0yGuz-T{L3;Y zoU6FTR2C4@%{U8iRE9H}+i_ZweTjA+|CcW$$y&s1S)t;*3LQ&&bv{bOj1?asyfTFt z!-j|iqzB0|k<9^8?j*iE#rxuSvTPX{e_11D0_H$Y3Aha=KgS*@l=2~5%xjUiOrrs5 z=;#?M-W0zpkTSb%0rAQ_n)%T|7c@A-lQo^Vm&l;ZhT4Ey>ZS2_ASJ$UOCS)pPgG=b z3=$$hO`X&%Fo5u8SrLsdAa2i6uaMqB$FUQ}q#GUVZ)zK!h#N9Y<~gM&8=aACsHaaP zI=m`C;cF>t|FMHE+9!KOYTQZO$ylp&jAb}p_?fSS0!}C*R)I)D`8c31m@E*q;0oCg zr@nRD91Xbg{SZQ)i5Qba2=v@@^_%Tya5XL0{}$?;orGxMlDEm&@KD+uup{R-kZ- z>^-v{16B!c$jcGGi&XO!TDB!a&I7P!%SPX2S+j}V?=AJ{T7@;c*4mJBXU%8Lo(}e^ ztl7~#Bj%FKo*Ru;xhB)ZqTSmW859w@(rS5_W={piei5^$VC{?B{}z-Bbc+9Xt<+G& z|JQQ+-wMoszvcG7JK6u3I9wnepVJ+{U+<1CtewuMgPqE8W53dR^ZL2}{%08g0||^d zX|rJKFs7O5=VL*fiYVsLSzL1d5wsSG5zMjflVe1~Q3Sgs7YO-hdsvC;^2zK(SX}0+ z+%7_Mm4MhDD|9Lm$KGO~O$lwM91Q%#K7zpDP&h_2CX0BFLP|o~iL?0z?E3Y7gKtnMn7yLysGRR@{w(Goz8 zt>B+I>i}d(v~l0+04Q)Lac_C%*Hs*vk7$e}{*PW?Mf``>sFiE6_>W3G=l@ngW_RQN z@ErV=3OrE;ufTlur)7N|Tz-CYqn}-Ty6T=fAM|(r(eCbnY%W_(x(_kWC47(Nb`|n0 zg7*)^aqd-r%~K4b$^YCBnK&pf9pmfb;*E6l8$oS;>iQ&pV6FfZv( z(9fr27Y&@!XfTQ@LPVhpCy^uubM23&fyL-5c*%%+J$*#eHR@y%D9QtkKB~zR-9-di zPtPeTr3D2?PcS)jhk6 z9PFe)9_QeSxVVud?`r=dq>moJ=}A<%bqL{jga)Gu-M#rRnbhAMls@{0t$p*uk5@lK z84$3Cu@W#Os3iz9W9}r&3J;D1Hbx^j#hA0lk-IYplxzrIanmDx1@Y|>XYy2rdPQl1 zOH4#!ffzO(Lj7eehSDI12+29%L9y%2GDJ}(B@{**RC4uH)RIf4}rWEI^ z^e5y)P~a0o%j9Os;c0TaFlS2SeT5V%mT~ECkvH3{kSJ$uwu~K^?@gWTgehKttix0% zfzAMOTAYR{OuX$#4wR6*q5nWNfjYw{^cKn7pj!~M{q#vh^I|W%sB-Q`H9@5C zPoM}|!z8RyjuOzM(V|re1*-ax&(AlKwF=Q#KXFdP@3@!o=yPF0SPBhFY;;OQnOy84 z`aQtzSRa_Qpw>EkHTEDkj=yetuc2mwIZnwU8tYJ0LhzkG>>Q>x`30C7GTLR*Zzb$l z5Z#$THF%N`N2x~+p;;eCnhP5$-a3K2L8vPeLR4Al3#Pm-nj;vfPBmt?q z<%4!sc+*ItfRWknTgKK%cLC)E(35XgU_+tt{hOFU1U45WvEY170Qd}`0|lk1q)g7p zla53h>o1eQE2wq0J{g}ml#yy2Wgnn5~&Mpea=p z+D>6Gs{2pvQN#nUFO)e>o1=#!P(@ibz>O~p@yXMuN^F`yQ7X*v$LPFHr8#WAaGH~- zDf1>0Q$=!gsy>r-oC&SvIA~QPye96A$!8Z0K^70MkVx5?)N#k)ZJ%XJhDOuRRcJKz zjD|Ke3_KxBJrSBj2&Qs8puxlfjf8Csl9tplCq7#OX$TN`YDEw7;n*7*y|0kX9aaJ+ zj)y^Y3sTzCr0C>khhCt$&68(4dDJoiTooa4={lo?2noEUK9bpYkL-V0JpCH@0GO!rI$R?!G)BD?y_H2D@ z4}@WX?PvT&*rJw%7d^OR>z-w0tvD$hb;)diSiUBjZ2I0J0TnV3{4 zReYmHL=o&y!9DQpJjOb(wU%krZKypVRGtVH4XHR0$+C79FTkf-#UjLT#)rE{6c z#!TJjlXV3FJ|l-EU^DI9&jnjJx)Q{^*#z6{@+*v(OPu2BlDl{ocq}HQN@CgJmVdhRMFF-%=#lqp8fCC&u;j;~wWT14;5wa~>UOr{l*HM9`{rRW%WsPkeU)KJBtn>cFwKdKUuvbQgLbD8LdOr zq^IBzj_*O0X|zZZ-LQxUCwoQ1gMv#!xhD4T0j)db?cP3(VddGEwd0ew=VxEm;2V+R zNl8j^1lV@8r#OrWy_dG&qpcBO0ARygw+wsW58?9v{;%{_0AASYFZ1tp^2_K$C-i0c z1p%!bh5VDDQg|g=feNaAzJf}jhHbbqX5b}A6$N;mDB9^O{geVz8?9QkE|&vew0j=e z`5sN4wK%?V7rj-uc_ogK>i@Tz`cIW|sS%6+t5tIUzr;yf;Eg=~Z>Icj*1B*+piXs1Y$~>2OddJ_*h=UfLRo|2JRQB)UA|5BQA+t zZp6>*8vA$|gpj!ud!*k(8F2O*9*pS!-HBDc2ZVw`yA>DB>xeSq%qp zNqdj2w;_EE%JF@W%2AcY3JM5bY>CQ#G8!>^l7d@6Ad+X)b$(M+ONK_*rB8w{kFEc<~I?x7~j<|L^s{P^4Uv~i=`;eUtqck$qp-3Ec zN=qP<*-?(JKWeD8?QH-c1J1FFseqqAqeP&A*42tqxRIa*6AbC;{>rk(5O%_8UMXo~ zDz|957mKdHxZiS`;>9cyAEl4untu>Zy@4Ncg;s#!?-{HemVY#&A5Ha2*#sv(R+a}T zAxIJ$KbyiUIInzc)al}~4Xosh^XY{4`2+$B`-8nIiP)q@2?Qy&!S4v(oTy6nCR!Sv znCrv?LXvCr3=>qI>b+}0hyss|FKhq#q5bDGsCeSkmDz=Z6UTj_urw#A1)(mEt!bVs z97$yLEP5%1VHtP=q;bCz7@`L{PcjmyYZdzqvCL#QDFQvH&pio#QvdQI&OtFSy(!Sp1}$DJ)tslczw0=2TrC#_nm zB_|1Ao<5#oR+_GdnG+h!7*Vw4YWW2!S?_UIsrvub)PJc~tMT~%Y99Z;5~|7d|995^ zlcFHg75@kB!HdA*EVE=SPpyoSc;Ww zv|XMNDy*`r#6d$3(>LhiDsHilFOmi^e>32xj?~P#&hW=(3g2}hQ+TysIuF)3* zZ&+#}rJYuWWsa8%5T!EhOnVP*MxMn~Pjl=*28t5c`oU?%3X^e_*%io3(=+V>w5eyX zIi)OSaowlAi`i)*PFL?I+|050YQNgi>gfWF~@5cbpK`dIG3wCj;NfWDZu*hzbafAnIN~F~ZjG znS*qU=0RbdBcgc$TjG?-y<)I+hy!Lfgsp*f*6|&MEit%AlNu2WlH^J(w4rkesPB6; z*+gh=rL)z+@RD#KcJXHDSjGw7(f*1(5#Ibegmp_we-vJ)Hct4hwit@oghpx~9;s1= zHk3A^WKB~cgpg&OT<)AP8->l{#*!5hnal)AAWYEDbYWQ(u4U`HKzWWk;%lVin!RCi zUJHp>7E4i~9}(LLg(QxV)m^2($%?E9GzUijW2lhv&am6_*O5I9VXkTNKbGByc9xVQ z0`IE#JJ`O9%*}1KG;T6DfyXEVhq`A%=LtzG?(V)BRH3Gho0(S7;`X2fZw5YBWdBh_ z*+%ZGcf`b95N<5VhXSz|pL0 z6C)%QN0^AyVD9-OrtDQpT8IHCQNNm$<{3QY1+?0K;3 zYmi3q60ZDn@ZEQHZ!4_XLykQYBKeD?Qn6PA8?+7o>Z4+CYn}E%&tk$c(Nq|;Pj@3@I>`?Pe}d&2zThY=GdnTYNkXO!n;gQgn7W#1&Ri?lUA$QYSo(+*+_w*Q=aMA z`)Ja~X5~tyvC(QYHspLU%Q1iBLSmbM^kNUyJ2Qs1#Tmg_dZ`=ov zy^98#u7n`fb`hQ;XY@E~osb?@oyG0qm_MpY`Wp!)hJ!9*{y=4wTAlDv{Q~7Mk7aSi z>=e}YD1~Zg1_+{fCO>0k??AL%Td;57h8&UtKk1CwO^YofRgo_s2dZ~T6m0fiV& zf{e;FP@Zu!irQSq`^3*s7yK*w1}bNPqD4#w6GLfUE`!#+M43!X$}N`C3f-z8=@EAk z@kDDL8XrJ=Xn+<~phMy^1CGeIXx^jlE7=TveBQWEqX1l96EUpk$kI<`tX{{{V)5p} z=7P5{ClujG3bbOrcC?Nm z^(zW0cYDtwpcHFC5%tx+FA8x%SZG3UuB zLlhxFBrcACH%|anN&Ng63cbm5(TY!2@{vsH9f_h$zm5 zSm}u;e6(#YS&10QuBvVb6iQUp!3HfHhN~(57cxQ+IySNWy#60Ja0pJBySK#OQue_h zV(JM5qmp|UM)&#o@#f}^=NbOyrqU@p@oRRkFHe$(%U}=6V#L}i6+t((%D>#;V zt8is$R?9LT=k#UC2>hztS=OeN=hHm57rJym4PCmYyFp{|dJskgpKIjSrVU7BkXSJ| za36m2`n{p|Z=dp-dr$vZY&}4-n;6FsMw%A{)G!lFUJy{)P09W@lZ*RCttJP&EXT$D zHQ7^y{ZQJ5AF3}`40*XP*OHxpQqT5{Rrr5twMrxI|5a_|{$ER;deVLF|8)oduTU1@ zApnFoo$dry-`P0ow|;!Q-n~8BzpZ^Q991^H-H%+r;X8qRMZy}AtTlawg?=s-n<|q2)ntC(QpOCW8u8*9w0us$?amp2XmH6o5nf0m&cM0f!b7j0O=6 z{F7T}0_LS_L$e)U>l%iwL8)S+|K!<|LlW!mJ&|k|B>bJkpTkQMJr1!JB=$OEkAY5K zt^0?ov3PU17UaHw?_uomSZPdR5gCEF#SBYPyo6KjX^$^PLk{g-mTY?*2(>&+gX|(i zz+G}4=T>Vmd7L?!#9ts5Y_cjLcXcrvty&|G*)aNQ#gl6gVvfWC$558@`Kw^|6l0|F z|E*Q<|K(CmmH#=9|5eP^;xFa={~h>$WRisFkLi5>huyEAO7+XaLG|LrX}xqY?!WAp ze@gLhcfpvtvCAzW}PT6POsUKX6=3_n2t0av~`%Yp}HapE(_;}VpC z2{2N6dFhBiHYM*xhXG=9i+ERNN0&|4Qf3@UK(3mIJkBaykNP=2trjnFWQ7fHy6->T6~SB@nQ`f7+VqPJ(ba`}!Ix*NAD-8HM&wEBNXZz8 z=;q%^o^l=)ke4xzkuuPDpoZi)!%w&#s3iGyY0*fFL+nL-GU8eLKocg)I=N-39Y28Z zA~@8n!k?yED$8l&=JTh?1o

GgfMHxu4~D79e&*mGq-UjZ!TCOC`_$!l!7dpSk|;4*EZ0{WJ=gkfUIXbkmxy0sJ`VdCtDu-7EDcA1u9j z(tNSg{~4BlF#86I6lR?Vzs)d9UvP8cTI7aw65Rj7yAe(!nTwL^v9c0+cnA{Tzozus zK86>Q>nuYqWuOf097sSrKoVGm*|t`b4UY4%QRI-1f&S4x4@b@8^0)Kj%0+j4RVb7;?u`LBul~CP6EJX|9t2b68UCmSH_7N5M24p$3f*-h zMq4U{X}U)Je3j`jly?2Zlo>?!5o(6YC3BU1O)<*xd>UdhG#o|NwmEoHM+C|zm| zTtPl3jt*F(_NQ7AXT#0Ps<*;AWn*<9k(YCW8Gi!h1;JcU)|FhQC4R9uA2-vX{)P%` z9oCd2>yccff}6X?HX3}fP|o$4315Cxma$N&TZ91X;8s`%d$ms6F83eJ2w&&4B8JA^S?kZTQ6;^|5L^#B|Gf}C)KRP}NjMZhC z4P7=L#qj$W*r_=3md#GB;>cd;7zzAebupYD1r^3e@Y#e^KfxyxsH>$$%>G+~ zc3NqnZ<^5A1a>4BK!UQEaO_x6XH?yA+I@mZfS7--tGl^xSMSFEF~bO{xH0(PbHi%|r=wW_V18`}ebc8CC378E zt=)IrJsnCAoS7rTnb2m{Mk#_=|JE{i#!&WFZ+B4}P6?m?+mIj2=r7neXyQmn@TsI0 zw52AcF}-lQS4I!=nI1Y8VnHO84B1TONhY+%%G@gxTO_b)^;RTfXjXqhmPJT{IzwGv zLR_cj54ujO5nggOW=jQv>AiA#U-<%!u3iyKgsNu9l-O#;a3ym#@>b%r!o?{h*Oc{5 zSsm;ur{{0H>*m+a`P-fS+vCIG#k=G0JMu)p(%P}cL%nPGW)G|@G{RAVxUR)hBh2g}ywF<29KO$p#6_K}w)fuT`22`E4b}=G~FqIBU7*&6l2iTK&{4 zz1%xFled|%YuY5@>NMMeE(0IWN=EQ!IyPUJQ`^8j>HtANjXlBj2m^%3`=c z=qru?t2e5ZnEzj{|C@J4XM65${2!izzaoRj8NGs~Lt;RGy5HXq_hkIMdscP&m&acR z4g2u){Pw5#{fT}L@V#dlx+^%nwI^2K7U4VNGrj8xcTr%YsydQak-G}SN@%q$Q<+qd zYVG|fhvCW+{Ji`L+&HxL3=zOu=?h3vhw3Bubu94b* z0EFnO#U7J@Z5Jn?W5fjI#E*e|`@K;33ji4S+VO$b_!}yoBF?x27eUx2WTEtjTiVbt z2Sb0eM01{_V~E!N{V#AcFfacu6llk+yWfuw{@#Xbvvk&mXJh>_#}m!;ItDQFN<0%K zDw9Q`6~V@?b7@*ehly?&=n_}5K4A}Qx~IXL8m>o^b3nSwogOK>&|%!-6IP;2aIN7G zLNXNsVuy961Qp+bH<%Ap>_HpdGVedg!8!na`G2IKCla(j-}o3K3SdEA*p0|Ghj1C*KqJo_@J#{ zgG?$s7Cg$|99#9I(Xk2tBScI_0TvQ`_=4ei1N;nEH|r?YDqM8@IeJA4-X>g?k#7?J zoKd(Gr4^-2M_xWjyyP;kG;$WXl5$e=V{mM~c3_u)OtVxTs8kxQR;^T)!_8(C9<^8G zG+KpoM7hyyNUt=PsF@1zs#N)Fa9Y`4HP^6U#glCwG)=fVxN+*A15_A!LKzI8dfZ}* zMEdrMxDMf8eS|qI@Wy)2^RN(x=HHGD=oRf?MYzTna>fCZqFpM1BuG>F3aq)*y{})$RvPHFGS6@CQI~~9T`(QQ;C>uRz*s}(%WPe8sH{5a_JPtB8wzWe;-)!XiO zKe|IfJxt%hgF~@-o8FNLY3GS@JhGimQSfv9De1H=XWeJqE(}a01J@Xs9-MesW(&?R zG2y-$ky``=`P47XzFa~^j{1R==LklqSpmRB~tPZIaptZX$ zoaLPT#kSGEHdf~j#u^!;u7UD<#7Tx;*F4ki8G!>1li2>)`X9UNjko^UfBK&vLeT;O z3w^Ld9^6LJjuZn=0w^&a1#YO3MTG(ouX#unizZOMbCg6xTp+m+34}>a2d?Y5$Y6zH zM|6lepbf+}6$Yk(ClN%TKoANhmT0kORp0zo8L7*Z8=-R&CXx3Q3i`&XC5PIdyj-$`PEkw1cj>SuENpWe*#dU+a>?Jf=+BQHFd#=DSZ&Degj#*7HN18JSktDV!cPG>uyYr1m@)(+ZoJF!pNFX4+*nFVCf<3+VnyQN(x^2KscS3L^c3?Q#`W>4R4`{utKK$8gWx!1_8AQ$m$#@~vPpjc z7NE2e2rPJbl47?30DOcYh+)`&#~)5cqMa$V0WI@&KsAP3foG0j=kkiS(-~v0>jU!= zd20^ymo#0~-~Q&KPi=^( z(q%G)l>cQS8EB;5?|3ix35}+10MKU9J1$)!lF3$rDg|;}1-S%<)`wgI14Y(4FonjR zGqL@3(|Zl7J9BIq*>}QR0t=5zbQlD(x;9+m3|SzD%jO6ala{eH(%k`ArQx92tiYk0 zOJGCSxCCs4EU_S+P=6S;REnZ}L=weam`j$KNf-A^D#8XFjsO9dk5H^qv0DjEk%h)3)=)B8g?CA#wjl#Nn|Dceuvg_{5)GVKqJu_st{3f~ z!Dyj~v>>gPtZo|pcZKI4Uwo}ywr)P19t~gi4zBc1a=eAPx=@M+_`6r+0NeZMrZKO1 zf9i9g=ZC`oe?d{8Fh+|1f2CZh#_K=S%6a_f)X7^wgWUgPA^soeggo8%7ty*j=4Y|C+3uwCc=AG!ZWtZo`tdnM>G7oeNW{Xb$z2k9V1s7o_;_BK5;+T3MB(5NFrt!Nt+qK*wg`y{6BD0;PUvEm_0YxGGcP=ul6Efs(QLJu2W}7Om znpYjztblzm#y+TQ%xlP1_L`RY^W-3Z793N6lmWgo0{=7W_22GJ;J3{~MCmW!IucXy z|MQl*zdn8DjQ?bO%ht&0Prw>a5~gnToj6e{9zp_H76|xYp$6duT{}|*WpTFncMKti^bIrOAbc0s7&+Gl@&8l2 z3cU*{0h|%f3y|?mvJhw{ii1XKHiBaSKcP`ziWIMl-=R(JR@F1@0eDfM_o^7uHFd@2 zfi1*WCmt6<9Ym?Sb{3i^)XEmQD0+fCnY&d%qL9!DhBzP-mtvkcAR=U9EWNIR6 z0UXG5CLSIfd0-1+Y}a$QD$(;jS8SxY$L4NTan3{HeIy=7dXqR@oi#wS^U4Azu0|#ZC*Uzxw*1$ewgOl ztLy!r;r|s#i=?9K5NaV9R9W?~G6O~YCw^95ph%!$qEaff8)4cll8O-Mr%n3nFT1W{im5yro=@v+7gwI zku*H_rj|K>FZ8bheW?Q7piI?}1i6+!s^1rkHxWuDVe8YK2NLHb>-@;=`Vg#71K1PZ z3AbTe&jvgovTze1doKf*)#T3Nn6Wh6aw}NGDg%|zM+Gs?FU!$A z3Cf&$tuHrd+!)2e0L*yA|qm>h(&iD#vB!I-OO>=*t`neEE`oJ1dp@$1mUR*&Cy%HhX3DHtMxnsg_a`^Pbe(2oBzR z@+Fo3YpjOKpp}Bie5h}HyF_oGt&;^k~I-a0UO7T_jH@XRMwH$DI!^cBftQ2;U_or(ESu7=cwK*BVNGAzS8Z+>KT$4z6SA{AOYAvwb01+-Q0*URYSwNaH`F}90 zwd1pjY178MHN0$tLPPbad<0RSDIK5>fB}`w=t&G{vmxthW@SL%llWgPJ14i;P>PL+ zDt10Tbmo_MgzRXP5bh&8`sS#5eKqnw?^Q-Ooz8i4c(U{A@TX}y8`WB^C5u7xv!e<8 z--0~xKAGFnAZD`C-1A?#$o09 z`HRlimhrY1-9_eP_dI~&jSF7BqxGkwS1(|beX%p4icgu3um8>L7= zcZ?V2fr{*{-tMB4AlXKOe;V>*8JU*8;q_c|jAe)MEn=hs)a0E&(RlKT7e@E_`SIrF zj^`Qv=H`Xdy)t_6<~+4wmazoLU?;a-5w-RW&%@FE;Z-V zsv)h(5PUVqCysAknmwXYrm#y*tK7ruWL}edTW-oe2>?1hQ7E*=p6B z6?xh*`+x_NxeqIxG%Hss4bVPSO0q5`?ZoG0t5b-rDKnB;RZQ=!#_OG{_wNp0yciyB z?7nz6>Rh~$g)dxGJJxszUd^P^jdiP-hZQ>DDR3tp{O^wJ##zffZ@%>G)9R;Y>E+(Z znY_V3dLNs(2%lzK%4LWcW=rYc|N3_o2U0%9N->bMA=2wB(f`#N^+s<0UFoccgWZk) z`z0AX&g~T}9TL_1@l%-{R;{z)MWwm1fAQ)=sc?FI+1RkI4&@UDj=mLS`xnzk!}p$L z=&lg%)}B~FH7}^!cBXed;Vx0IkvI^N`IK?G@yfSt%T!hnqgpu4M-f4)gGR1wLx38M zh$5*!cY2uSc$?Q2^9&1^I-v@#dASWquyq%Z@P<+`1 zPag?$O4^uxn2wvlPOpbm5$UW4bbt@q`Ze&@!ea!ZA}rVn^uogE*o6OuqX5SN(UH>3 z1dW0aBi2!@RX9z-GZgK7qQeH!Z_?7tD20g3tx_x{xJ{BnxNszmoJ9bk=dJvhx|-MA zQU;r8?Nxl+TC8%kTyDuc`E1fi3Y@Fbf3Cr9W`EUO!-6$JDj9(G0oQ`Y$~p4XZmfm2}#BZ$kJP-1puJMGQn24+h*Z8u{I3U}9`5Bblt5%Ez z>Uk_ujf!FtrHM2@yFk}0Z^%0TG=a_=IycAmq2rE->Se7g0b+xA4_WMcR9<9+P*f1? z0;Rl_3UD!8NdjDghG>}rSOWjQpvWJ}XTlh>>wk0q&yY!9;9fB!{u6se&&w>*&RfA6IKl@*fWaj0Yg7p?z2jgn0U zer%EY-`My|)c@97&AP0sPGc8x{jaDykK;~aA9DTg5)aBp+I15DN3X9${|k{@&0PQc zlj!Si{NFF9|3wC`i2oFrAU;hAte@|DFACSYt@nesg`H2=Z{OT*6a^kRT|}~ zN?^#z_4Bm8L>&%lV1-6kG$k+Ym{pdzlOY3b$X{ zQ)kS3V*a>+`61#AOq**#^N4pd^2MmL+in}9XhMQakG6~OpwcoyaKJ4QvSOR-wMmm) z-416=qTA2B>h?NiZzNHD8A6?wqRY-8${*(Cq=&%X$--0qf(9vLwH2r_AQi;X?l^VJJKRQ)Q z`JKyuGsXY)jZ1xE`4Q<)PKqe%{7;(YhCe>F^^$q~?(F6F)7s$dVn^aT=GOU7@#^NP zQ)1ASyh4Dd%zc0!nh#JQGIKu}nTYOl8s1DPDdu)-;R$$G#%i}BX{Ki5v@?L4Gu!u% z*)G)@4VjK}W?Ne$;ajl~k2tO*W;?-5^$RfDOX1-1PIC<87|1a&9|rzE@$!e304f3i DWKisi literal 16429 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 _>r8c5qoBG+%cYGHH}$B0FLstJ2bPR zs^w5wNwTNX9Itb=pYrAiCA(kCFn`oAn_%~pM^>3+Z8hk8nTaq_wF=e^ zX=M`TVX0ZI@zbTDY9LGuVc7}Kw5jG?l(G5mUK-5!O6ns#b0Ot4aPB z3PNynY-amq{y%LEAr{8oShq*UaMjURyAp^X0mri5YRPz)qUi3I#M7o7+cze>tLfO@ zDxfUgW+eE~J+Uk~JHIM8%UV`?KFxCnA*B0p28T2;T|xD{`zM$y<|n8bDEn(%O%vYj!MvsJ4;VPEAxg@o0Gv+X>@8 ziNT-(RFEs8MY)mgdtiN~OpY>nAySRIP@Y1&qUr)YSx{-Eoy;hU$L8Y9(3Sm#t zMymYZTZQ~zueDV1pUd;ViqTs9rBeQ%L;go0NjUwHE%(3M{q&*MzOEcJFQ1>aYnRjE zi(x&w4zEJ)50OBKKqwD?tU~{D(ctwBX!NNxX{$%IB-8osLKnz+MD1 z$Im4w4<>*gGd;a@L?O$F`;;R=vr=y=Q)36=Efd07A_81(XDCx+ixY=<=F=yL6aY3z z+gv2xwj5%ctX%obFp-`HKNaSg;GXa$Z8a5&5o`hnc-M=i#!kjvFD(}@0kVR{B^koX z-z{dx;Wxz36%eV+_bj7d$~4BRjT)IUk*yP18Ez<%PH;UiNpg0VYL{vhYZ0G}AZx$V zfQhnAF3IfJXw@a3Z&66iJ5XK(K+P)fG)>6nEcN+*c$!>2Ulo{Ub+KW3(Gg#coe`-U znxv)S$_pzP&)!V`_q72vSt2PaMUkD-&@O-l zv;$;;Rk&?iEqOb;pBSa?`Va50RSf!a1Sv{i6oj*QLF3ykoXZvry z+OOZgc{Uw<{${ci__{kCIlf~lOD%PSUUKEB@?U)w@?X8yt#@MbU$ex2E_vi>^`-o` zAo&lSQQ6|(;BD>VaMC@lf4(?wTwYB-Rw}ji2jc)Pv;Qu^1q_m>2ZyQ32!GUqo8u9_D07=Lv1$|DN5~l}r_5E>m2s4o2l^<}_ddk* zyq8lU}s>uOtD$~UVA_C0$(pOz; zpy{A4`=HfU)=sP2l#kNPV`V)AMQbI_>Uvi`i#)%THM#3QnzyhY7q(?)pc1KnMZ_TM@d&9MRg();`~BX zYUh7AIVwKz%a)_&IcHpXHLl!x&)t__-ya_CtnZ&rhI^gp+O|q@3Xp%2T)1p;Y86}d zLfc4?|C)=D{AgF9jSd{~{RKX|5b7uRWD0e&)`|IlYwdO^|1ET&6Dpfe{$q}jbIiIx zLZ!vc0S8~EjtgPfcRVZ*MN1D{Lx-Enpq02)&|0UnE6eo8#!#BewsCuD+C%4-v@FB8 zygS>OdZw~X5K3JA2*L`U>my|W=N6LIBW~w-NUE0cE`Wz4S6#>PtL6mXuF6xZvq&>i zH^Kd9_^hTEwGSV^e184e?Y^B&&zz2TJRIyqU1FYXLIP9%XchMS7R+8YKNKVe2 zc)_7T14lxDPwZukThN#KN}o`!xHPVwT^w(0>>z%O zv<=7uMBbcq5sv%9ANjZ4BH!gfCcKvxQB^6Xtz%pZS)9u&rm-kOQm?&F=Jb{0o7d)m z2<5cYR$-~78ABqT`;{9XYh$n(CB!GR3e@0^}4-YyW5a?1~N(kdqFf$ zKA-Ci2>I4(bUU(DFio=Yvstby*OnJxcRhN0(7bIt?@nv4cV9Ic^pq(Vxyg9Nv=RNnL`@*x&njgBg7kjVHKdK(zQ~b*i@c8~oHZE#z z1Hb^pyXYGr5|X$lsx&Bgvp;p6Ytu5Kxuy7JrUc-*K|l*cz*ȍ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 H06GEyaB&<1 diff --git a/docs/upgrades/upgrade_7.6.3-7.6.4.pl b/docs/upgrades/upgrade_7.6.3-7.6.4.pl index ad51e6c68..ac002de03 100644 --- a/docs/upgrades/upgrade_7.6.3-7.6.4.pl +++ b/docs/upgrades/upgrade_7.6.3-7.6.4.pl @@ -421,7 +421,7 @@ sub upgradeAccount { #Add the settings for the friends module $setting->add("friendsStyleTemplateId",""); #Use the userStyle by default - $setting->add("friendsLayoutTempalteId","N716tpSna0iIQTKxS4gTWA"); + $setting->add("friendsLayoutTempalteId","zrNpGbT3odfIkg6nFSUy8Q"); $setting->add("friendsViewTemplateId","1Yn_zE_dSiNuaBGNLPbxtw"); $setting->add("friendsEditTemplateId","AZFU33p0jpPJ-E6qLSWZng"); $setting->add("friendsSendRequestTemplateId","AGJBGviWGAwjnwziiPjvDg"); diff --git a/lib/WebGUI/Account.pm b/lib/WebGUI/Account.pm index 8da4c087a..db04aadba 100644 --- a/lib/WebGUI/Account.pm +++ b/lib/WebGUI/Account.pm @@ -57,7 +57,7 @@ sub appendCommonVars { $var->{'user_member_since'} = $user->dateCreated; $var->{'view_profile_url' } = $user->getProfileUrl; $var->{'root_url' } = $session->url->page("op=account"); - #$var->{'back_url' } = $session->env->get("HTTP_REFERER") || $var->{'view_profile_url'} + $var->{'back_url' } = $session->url->getBackToSiteURL; } diff --git a/lib/WebGUI/Account/Friends.pm b/lib/WebGUI/Account/Friends.pm index d767e0453..ef72551e0 100644 --- a/lib/WebGUI/Account/Friends.pm +++ b/lib/WebGUI/Account/Friends.pm @@ -45,11 +45,12 @@ sub appendCommonVars { my $user = $session->user; my $pageUrl = $session->url->page; - $var->{'user_full_name' } = $user->getWholeName; - $var->{'user_member_since' } = $user->dateCreated; - $var->{'view_profile_url' } = $user->getProfileUrl($pageUrl); - $var->{'edit_profile_url' } = $session->url->page("op=account"); - $var->{'back_url' } = $session->env->get("HTTP_REFERER") || $var->{'view_profile_url'} + $self->SUPER::appendCommonVars($var); + + $var->{'is_edit' } = $self->uid eq ""; + $var->{'can_edit_friends'} = ($self->uid eq "" || $self->uid eq $session->user->userId); + $var->{'edit_friends_url'} = $self->getUrl("module=friends;do=view"); + $var->{'view_friends_url'} = $self->getUrl("module=friends;do=view;uid=".$session->user->userId); } #------------------------------------------------------------------- @@ -225,7 +226,7 @@ This method returns the template ID for the account layout. sub getLayoutTemplateId { my $self = shift; - return $self->session->setting->get("friendsLayoutTempalteId") || $self->SUPER::getLayoutTemplateId; + return $self->session->setting->get("friendsLayoutTempalteId") || "zrNpGbT3odfIkg6nFSUy8Q"; } @@ -488,7 +489,6 @@ sub www_view { $self->appendCommonVars($var); my $displayView = $uid ne ""; - $var->{'can_edit' } = $session->user->userId eq $user->userId; $var->{'display_message'} = $msg; #Override these diff --git a/lib/WebGUI/i18n/English/Account_Friends.pm b/lib/WebGUI/i18n/English/Account_Friends.pm index 3e757b109..0d4ac8bc3 100644 --- a/lib/WebGUI/i18n/English/Account_Friends.pm +++ b/lib/WebGUI/i18n/English/Account_Friends.pm @@ -94,13 +94,13 @@ our $I18N = { lastUpdated => 1119068809 }, - 'edit my profile' => { - message => q|edit my profile|, + 'edit my friends' => { + message => q|edit my friends|, lastUpdated => 1068703399 }, - 'profile as others label' => { - message => q{view my profile as others see it}, + 'friends as others label' => { + message => q{view my friends as others see them}, lastUpdated => 1119068809 }, @@ -167,11 +167,6 @@ Thanks, message => q{This user prefers not to be added as a friend.}, lastUpdated => 1186264488, }, - - '' => { - message => q{}, - lastUpdated => 1225724810, - }, 'back to user profile' => { message => q{back to users profile},