Skip to content

Commit 8e98f61

Browse files
committed
Tons of Rhost fixes.
1 parent 27d1041 commit 8e98f61

8 files changed

+89
-46
lines changed

Account Management - ACCOUNT.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ th u(NEWCOBJ,Account Database <ACCOUNTS>,accounts,u(cobj,account),,,WIZARD SAFE,
7777

7878
&INC`MAIN [u(cobj,account)]=@select/inline cand(u(isadmin,%#),strlen(%0))=1,{@attach %!/INC`TARGET},0,{@check isdbref(u(setr,accid,get(%#/D`ACCOUNT)))=@attach %!/INC`MSG=ERROR: No account to display.;th u(setq,accname,name(%q<accid>))};@attach %!/INC`SHOW
7979

80-
&INC`CREATE [u(cobj,account)]=@attach %!/INC`VALID`ACCOUNT=%0;@stop isdbref(u(find_in,u(cobj,accounts),%q<value>))=@attach %!/INC`MSG=ERROR: An account already exists with that name.;@check valid(name,%q<value>)=@attach %!/INC`MSG=ERROR: That name can't be used for an account.;@attach %!/INC`CREATE`DO;@attach %!/INC`MSG`CHAN={Created NEW ACCOUNT: %q<accname>}
80+
&INC`CREATE [u(cobj,account)]=@attach %!/INC`VALID`ACCOUNT=%0;@stop isdbref(u(find_in,u(cobj,accounts),%q<value>))=@attach %!/INC`MSG=ERROR: An account already exists with that name.;@check valid(name,%q<value>)=@attach %!/INC`MSG=ERROR: That name can't be used for an account.;@attach %!/INC`CREATE`DO;@attach %!/INC`MSG=You have created the account: %q<accname>;@attach %!/INC`MSG`CHAN={Created NEW ACCOUNT: %q<accname>}
8181

8282
&INC`CREATE`DO [u(cobj,account)]=@tel [u(setr,accid,objid(create(u(setr,accname,%q<value>))))]=u(cobj,accounts);@parent %q<accid>=u(cobj,accounts);th u(attrib_set,%q<accid>,D`ACCOUNT,%q<accid>);th u(attrib_set,%q<accid>,D`ACCOUNT`ID,u(call`2,volp_account,0,'[sqlescape(%q<accid>)]','[sqlescape(%q<accname>)]'));
8383

Finger Renderer - FINGER.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ th u(NEWCOBJ,Finger <FINGER>,finger,,,,WIZARD SAFE !NO_COMMAND,INHERIT SIDEFX SA
1616

1717
&INC`MAIN [u(cobj,finger)]=@attach %!/INC`CHECKPC=u(strfirstof,%0,%#),1;@attach %!/FINGER`[u(conf,FORMATTER)]
1818

19-
&FINGER`STANDARD [u(Cobj,finger)]=th u(setr,co,u(conf,FIELD_COLOR));th u(setq,bord,ansi(u(color,%#,FINGER,BORDER),if(u(op,SYSTEM,SCREEN_READER),%b,|)));@pemit %#=u(HEADER,if(strlen(u(setr,hdr,u(conf,HEADER_CONTENTS))),u(strfirstof,u(getproperty,%q<t1>,%q<hdr>),get(%q<t1>/D`FINGER`%q<hdr>))),,,1);th u(setq,col1,u(conf,LEFT_COLUMN));th u(setq,rjust1,lmath(max,iter(%q<col1>,strlen(u(elements,##,2,~)),|,%b)));th u(setq,col2,u(conf,RIGHT_COLUMN));th u(setq,rjust2,lmath(max,iter(%q<col2>,strlen(u(elements,##,2,~)),|,%b)));@pemit %#=align(1. [floor(fdiv(sub(u(width,%#),7),2))] 1. [ceil(fdiv(sub(u(width,%#),7),2))] 1.,%q<bord>,iter(%q<col1>,ansi(%q<co>,rjust(u(elements,##,2,~),%q<rjust1>)):%B[u(strfirstof,u(getprop,%q<t1>,u(elements,##,1,~),D`FINGER),u(elements,##,3,~))],|,%R),%q<bord>,iter(%q<col2>,ansi(%q<co>,rjust(u(elements,##,2,~),%q<rjust2>)):%B[u(strfirstof,u(getprop,%q<t1>,u(elements,##,1,~),D`FINGER),u(elements,##,3,~))],|,%R),%q<bord>);@dolist/inline/delimit | [u(conf,BOTTOM_COLUMN)]=@select/inline strlen(u(setr,found,u(strfirstof,u(getprop,%q<t1>,u(elements,##,1,~),D`FINGER),u(elements,##,3,~))))=>0,{@pemit %#=u(SEPARATOR,u(capnames,u(strfirstof,u(elements,##,2,~),##)),,,1);@pemit %#=align(1. [u(strfirstof,u(elements,##,4,~),<)][sub(u(width,%#),4)] 1.,%q<bord>,edit(%q<found>,%t,space(8)),%q<bord>)};@pemit %#=u(FOOTER,if(strlen(u(setr,shdr,u(conf,FOOTER_CONTENTS))),u(getprop,%q<t1>,%q<shdr>,D`FINGER)),,,1)
19+
&FINGER`STANDARD [u(Cobj,finger)]=th u(setr,co,u(conf,FIELD_COLOR));th u(setq,bord,ansi(u(color,%#,FINGER,BORDER),if(u(op,SYSTEM,SCREEN_READER),%b,|)));@pemit %#=u(HEADER,if(strlen(u(setr,hdr,u(conf,HEADER_CONTENTS))),u(strfirstof,u(getproperty,%q<t1>,%q<hdr>),get(%q<t1>/D`FINGER`%q<hdr>))),,,1);th u(setq,col1,u(conf,LEFT_COLUMN));th u(setq,rjust1,lmath(max,iter(%q<col1>,strlen(u(elements,##,2,~)),|,%b)));th u(setq,col2,u(conf,RIGHT_COLUMN));th u(setq,rjust2,lmath(max,iter(%q<col2>,strlen(u(elements,##,2,~)),|,%b)));th u(setq,col1width,floor(fdiv(sub(u(width,%#),7),2)));th u(setq,col2width,ceil(fdiv(sub(u(width,%#),7),2)));th u(setq,col1data,trim(iter(%q<col1>,ansi(%q<co>,rjust(u(elements,##,2,~),%q<rjust1>)):%B[u(strfirstof,u(getprop,%q<t1>,u(elements,##,1,~),D`FINGER),u(elements,##,3,~))],|,%R),r,%R));th u(setq,col2data,trim(iter(%q<col2>,ansi(%q<co>,rjust(u(elements,##,2,~),%q<rjust2>)):%B[u(strfirstof,u(getprop,%q<t1>,u(elements,##,1,~),D`FINGER),u(elements,##,3,~))],|,%R),r,%R));@pemit %#=switch(%va,PennMUSH,align(1. %q<col1width> 1. %q<col2width> 1.,%q<bord>,%q<col1data>,%q<bord>,%q<col2data>,%q<bord>),RhostMUSH,printf($1&:%q<bord>:s $%q<col1width>|-"s $1&:%q<bord>:s $%q<col2width>|-"s $1&:%q<bord>:s,%R,%q<col1data>,%R,%q<col2data>,%R));@dolist/inline/delimit | [u(conf,BOTTOM_COLUMN)]=@select/inline strlen(u(setr,found,u(strfirstof,u(getprop,%q<t1>,u(elements,##,1,~),D`FINGER),u(elements,##,3,~))))=>0,{@pemit %#=u(SEPARATOR,u(capnames,u(strfirstof,u(elements,##,2,~),##)),,,1);@pemit %#=align(1. [u(strfirstof,u(elements,##,4,~),<)][sub(u(width,%#),4)] 1.,%q<bord>,edit(%q<found>,%t,space(8)),%q<bord>)};@pemit %#=u(FOOTER,if(strlen(u(setr,shdr,u(conf,FOOTER_CONTENTS))),u(getprop,%q<t1>,%q<shdr>,D`FINGER)),,,1)
2020

2121
&INC`FIELDS [u(cobj,finger)]=@attach %!/INC`MSG=Available Fields: [iter(u(FUN`FIELDS,%#),%i0,|,\,%b)]
2222

0 commit comments

Comments
 (0)