From 54a8167ea9a5aa4ebf5dd93ef555f76f1695fc96 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 7 Apr 2009 13:56:21 -0700 Subject: [PATCH] Support for removing all users. --- lib/WebGUI/Account/FriendManager.pm | 8 +++++++- lib/WebGUI/Help/Account_FriendManager.pm | 1 + .../i18n/English/Account_FriendManager.pm | 11 +++++++++++ .../root_import_account_friendmanager.wgpkg | Bin 1968 -> 2069 bytes 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/WebGUI/Account/FriendManager.pm b/lib/WebGUI/Account/FriendManager.pm index 92f2f5b85..5bfc4e666 100644 --- a/lib/WebGUI/Account/FriendManager.pm +++ b/lib/WebGUI/Account/FriendManager.pm @@ -194,6 +194,7 @@ sub www_editFriends { $var->{username} = $user->username; $var->{userId} = $user->userId; $var->{manageUrl} = $self->getUrl('module=friendManager;do=view'); + $var->{removeAll} = WebGUI::Form::checkbox($session, { name => 'removeAllFriends', value => 'all', }); return $self->processTemplate($var,$session->setting->get("fmEditTemplateId")); } @@ -222,8 +223,13 @@ sub www_editFriendsSave () { $ufriend->add([$userToAdd]); } + ##Remove all has priority, that way we don't delete friends twice. + my $removeAll = $form->process('removeAllFriends','checkbox'); my @usersToRemove = $form->process('friendToAxe', 'checkList'); - if (scalar @usersToRemove) { + if ($removeAll eq 'all') { + $ufriend->delete($user->friends->getUsers()); + } + elsif (scalar @usersToRemove) { $ufriend->delete(\@usersToRemove); } diff --git a/lib/WebGUI/Help/Account_FriendManager.pm b/lib/WebGUI/Help/Account_FriendManager.pm index 6514ed285..3bece6aaf 100644 --- a/lib/WebGUI/Help/Account_FriendManager.pm +++ b/lib/WebGUI/Help/Account_FriendManager.pm @@ -44,6 +44,7 @@ our $HELP = { { name => 'checkForm', }, ], }, + { name => 'removeAll', }, { name => 'submit', required => 1, }, { name => 'formFooter', diff --git a/lib/WebGUI/i18n/English/Account_FriendManager.pm b/lib/WebGUI/i18n/English/Account_FriendManager.pm index 612c67bd3..56bac13fa 100644 --- a/lib/WebGUI/i18n/English/Account_FriendManager.pm +++ b/lib/WebGUI/i18n/English/Account_FriendManager.pm @@ -138,6 +138,17 @@ our $I18N = { lastUpdated => 0, }, + 'removeAll' => { + message => q{A checkbox to remove all friends from this user.}, + lastUpdated => 0, + }, + + 'remove all' => { + message => q{Remove all}, + context => q{Template label. To remove all members of a set, to emtpy it.}, + lastUpdated => 0, + }, + 'submit' => { message => q{A button with internationalized label to submit the form.}, lastUpdated => 0, diff --git a/sbin/packages/root_import_account_friendmanager.wgpkg b/sbin/packages/root_import_account_friendmanager.wgpkg index ab0ddd050f5b3651e6678a59addca7627401794e..d8e25e82e6f340e75a5a3c8a2629d83284dcb609 100644 GIT binary patch literal 2069 zcmV+w2vlR_AO2c<$aR~3XAi-a-9M>RSO97Pk0_h2hnGqsVF8 z&@yGtZzSn3qH;pQaxWt{A1Dj?jXAVgPRKdqiKMH?@f$|Odr-;Ka2XMDs|0>caCnKw zW@F<>s(D0?uUJTD2cviphEI@veMe$GBk0o=)23(?ajg0%A|v(Gj>K4uDeI$la+{4L zI1DKp_mOXgK3}mbcH~$9CEi#{qB7K?S01^YzV4lnpJ%L<3_3my-;B$(sff%K1n0`3 zv8JGdgMg<@IU_*{3uDZHIl>_!RpmY^U(+xoY?)?Mo(rzHnkSat6>^RRPm|N|r9MZq zuT`F=NSs7Di;gDV@reN~(TEFlq+s%Th6U1Akl~mdA33lFuAUqpVKfnB^xajXTxKzT zFQVhC#_?~bOzB;Ua)zVFLmW(z;>g|&WtV$0uvfmeaL??OzkPb-V1SiqPz4fzQmh$F zL@`W9XoBUnJyYsoU@!_mC?y~^iY=o78JL;)%P0ve2HEcQsK8E*2Ob(}vIs?-C)r)( zwfhm;y#F?>bXlK&+dmoAJ>w3 z32J^v2k5AgwRq5xeqSUlsM9*Sg03LY?VLR8foFuxr406I-8R(HurnMqT%&2g(jX#O z^oLwco&xk@Ng*RL9mZ4{GUumiu{i-H1F&^==U#kHCr@{&nK9T*ICsw9?}s7d#P2{ z_57aecUyj^gs7;BEHtY;DAOLK6&=|zSuW44z>kzzd)qCisMK3D?=7%$Moww+hATiM zFp6yED>RA;OE2$-hjt06wa_>LcQdQH1YIZA+*Sq41PhRkP2}zOUtga6uu5zy zf8fD1C-j1YqVfe9;WV<`cPls7o-1RJf!XVId%bqotK43Y8I@q(UgQ?Ej!j^g!Soe^ zRDm$zH>XTXyQM}2xVE)2!GR@1ro4`2X~t#8nDauO2n)nKQRg*q6dq?j>0Qq|n09OL`zM8|{-%fxB6-EMD@r=WSc z%jB*|ZkewRe?Fi8>lFmvZSr>9&~eGij@HcIGK{hAE9gXT+J3_H#d`>>!ZxTZk%jO0e<>5<&D~q7cYo zh=OH0(uOewiH8GQVZ_mKM;*`-W{AP9Xlv;hPbVF4unazN>=aW4BHIF*V8~`L zi>a>(beJl|7wCQGn*xDlAZVhH6ai2_XKP8}RMCj){M9Mmz^JV zr0yYe^hY6hOE&W^G~A$Ji_mO}o=3h5zjF9@g{Nym3q&`z`xrek;x|SZeL_$a=Aw@t z=_n~APtj-eNJ8EjOmtZ!h6N#&P&S$O5oJ0{)GP98kgg1s5w)@MS$NxNssCOaHea;; zUz*?Zf%Jl(ydU3|YwunWn&}*_61DHHB2>-!!N%@uceM}R%BKEBkph|IvZ#YV>cUW7 zg)vh)G1j)VNYsl_NaFQ!ZEZC$8iG|{T6PL`lS;B*m}gy?3f1-MYV@6{KiDMvU?FWf zIKxwNsXg%HdN@z&hrxkBMWO(m6-M#`jVV=BII^AULM74KeRTmcvqNt~bs;Y<==uR# zO|idPb>Rzm+@reSdCf{8`>#=5IPCTg{Z55VyQ(gjGEre-?o?fnH_63^S8Y6*Pk(uS zai->PY4mQvPTi%tP+`e^s|zc{0iHfo7i!bV)%+j)=+-)a79_yf)c^CketRkZ_dD%} z{$DM>wmo>?{67nL%2IFDH~sZ`g9|0#YK#`ummmv6c;^_c3LeUMqJY8^xO#V5B#?mE?2~Tb1+V3D}kCKM()6~(DeM74$O>E zC_Xxs^X}3v35ku4pyX?A3O&Lcift#V3CX$=d8a~m_^ODN75AD(^TuvWdCJB}=>s2r zBmp#JPI#m_Qt(x`u~!-{UkZuxYm~=qh=Tq|C#3{%kMIVJX}NDh2gJ1Ke@CO^u;aBm z-lEjjH#(rBV4BPugspp6;=0pdLu=z8N+x(n6!f&B$o@w|Mb;Oa9e*SoStigzICB2X z*quV%%u7X06G54&A6)2+HP@u|B!vH@dgzpF+f6>4_dtQaB?bNu3i=k`04e|gJzx6Q literal 1968 zcmV;h2T%APiwFP!00000|Ls|AQ`$SBt{B^4O*Q&y= zk$uW*mSs7P17ycpGc2oIt*jX^W%Zv(Dk5NMF85i`pD!c+#G!L=JfA^p+6Hz zuiDDLYc>6BZ+?_KSkgj)qm$Tumi;S^kAfm{8}?D=L9(lcqrL4JANHd@fJez$eUaUy-|W3QsSMF z?({?=B~{5J|G=g<{ll#meK!oM;jU9*-m7jdJrcfVE;v^v8{pnd;<`Kvl-UuC2Ht=K zpf+JrkEwhflZVXnXfU}OCQk%cT#dq56NQa-1&_ibZy))fVyihfMF*juDsQ`I@3gdN zX>_cp8_(VJKH9VxeRg&j2oansK{Qkj?p9XD&B;|*B%=hF4#~$y)1PG zZ|Hyz>17Eiy~@sqqd*~d#dtvcM?zDLWcK=QtdgsEUB|IX9zTI~RJ1_S_NjglJKL(a z^Gnc{AyDBF|4#6(mDew5`{3;nGQc6G%9rhP9;RZi@K3@Pck2PSR2OcKy8RYx8>f4E zP?20vRZLA}n3_S#*Hr1kO;8RpiRr9^&*S>q^}Kn?BA#b}f2Yfyr!Cw|uB|tK zViWNhT}JHzQ+iwJ6tr;*+!Sn_dkzbFR50~c_$|Q)Cq&R7_O62C!J$W!$S>umKv|y% z=~<9-)E@E*yi7Z3Y^Y{)7h|f~JWCyQJm{bGNYI^^F^;*%It+3FI=y9Awk*5s*o|DG zV#<%D#qMP!{$*gO81Xxq4^QIgoY6R!)N>M(I0bDQ3(G08&%#$+!9rZ^;+kI2(SQcg z+1=KG=`PaQr$jdsreTo;-a0=TEi2%zl(r&YPcy|19TGvdz z@;U90$d8S06*i7ZIkAtHxwTc_+N#y$@f#ErF(BoT8giI_ScX6{4-SBye+GDD6c-6W~k*q+tuh>i1;a_ivY#s1#; z=o2_Y#)Qe!k%XK&X=J_6RDGqwI>B%Bu{O(d^l3P$oN~>oZxtL5Yzl#wo;lnS;Z0Cc zjdv%bUk{+BtkKuq5+1o<9(-BGiGDX8b7J25f%TtLg<@~K{;yW7+I{_ZH%oro=>I|e zSK3BoXY>T^KymY7AL~Q;$Q(t?Y)8!Z%nlEfjK4PqEZB6VeEj6H1R**75!44JQjL5H zH7r#y4C^^~r=ajOVJf^a@ob(YG?(cS$i0|SOnn+i6AqyOzRAGMNZCS`B{U>m22~sv z(?T=Sj}+RDl;UIhzV%K)!O|5hRE898!K}H4BgK4%_{GegAgN6owrIYOWJqGRP|j_e z@go}ZE3yzQoA{;uXO@)Mla?WCM0%WWczm!yhj6Z#6aTY4E<+aeDHK1-On&F?ZW*#N z4>Yrf1QuL{k_8waZaJMUERGy5${5d-N55&15T?L_GZA@&;TsM z=1|`UMtZHFNeCV>w`O2AdyDxNhGVuxVa$W9J~8YFusr7F1Q2KG8Sg(lbu~TOc&f2? z3{*GAu*K#v>C-bjfgjD5vp)MZ93TM6GttSVKz3<>ODkApIS9OfMplo&0lqYBC*Q*) z0#5-rVr*j?hyE}G{*`sy0fF0gxp0yB?||Tq`c|Xj6wI_L2(GVEvJ`VG2rjR~(~E-| z>5cmDpPe47(QD?v8Ou|*f#3y`+!caPDd(q#;NJ$^mNaV`|HC=Dw9ZewNRY9p|6|uH zwF&$Wo?X7j|4TCQLN<5B|4G4T&n< zSxy@37!@?Spksu$vVi2D5omUtu>s{#e7#$7%7xq8F(@OPda&w>F=5L!}p=#2-!uf53g&m80dkZV2 z3*P=nU1(agxQ`ae?22v7siwr&N}_ZdIhzGl(D!s3ashWJZz@hLpSPe*P*nR}x&aNx zt~vI&*Us(+z_q(>WiD{GdZ8Jz(qaRnan}!fq)ip{eSAOeXcv5ayd&^E<;bLh#>$bC zJ&g^saMKTkFbxF@^!>pp!pby~=Bp5H(*L=3!osuWo_Mc;dky?t8u%L!qb|DuC;$K? CBHKLx