diff -ur --new-file --recursive ircn704/system/Btnetfld.mrc ircn705/system/Btnetfld.mrc

--- ircn704/system/Btnetfld.mrc	Sun Apr  4 19:57:06 1999

+++ $mircdirBtnetfld.mrc Wed Apr  7 13:58:30 1999

@@ -19,8 +19,8 @@

)    goto start

)  }

)}

-on @1:CTCP:*:# {

-  if ($ulevel != 40) bt.cscan $chan

+CTCP 1:*:# {

+  if (($me isop $chan) && ($ulevel != 40)) bt.cscan $chan

)}

)alias -l bt.mscan {

)  if (%bt.msg == on) {

diff -ur --new-file --recursive ircn704/system/Channel.als ircn705/system/Channel.als

--- ircn704/system/Channel.als	Sun Apr  4 19:14:20 1999

+++ $mircdirChannel.als  Fri Apr  9 01:17:26 1999

@@ -132,17 +132,17 @@

)ct .quote topic # :

)cw cwhois $1

)cwhois {

-  inc %cwhois

+  set %cwhois $addtok(%cwhois,$$1,44)

)  .quote whois $$1

)}

)cww cwhowas $1

)cwhowas {

-  inc %cwhowas

+  set %cwhowas $addtok(%cwhowas,$$1,44)

)  .quote whowas $$1

)}

)cwi cwhoiis $1

)cwhoiis {

-  inc %cwhois

+  set %cwhois $addtok(%cwhois,$$1,44)

)  .quote whois $$1 $$1

)}

)cycle {

diff -ur --new-file --recursive ircn704/system/Xdcc.mrc ircn705/system/Xdcc.mrc

--- ircn704/system/Xdcc.mrc	Fri Apr  2 15:22:00 1999

+++ $mircdirXdcc.mrc     Tue Apr  6 22:45:04 1999

@@ -177,7 +177,6 @@

)  set %filedesc [ $+ [ %num ] ] $$?="Pack Description for [ [ %num ] $+ ] :"

)  set %fcomment [ $+ [ %num ] ] $?="Comment for [ %num ] (press cancel for none)"

)  set %file [ $+ [ %num ] ] $dir="Select File for Pack [ %num ] " *.*

-  set %numpacks %num

)  iecho Pack $hc(%num) has been edited.

)  unset %num

)  tmo

diff -ur --new-file --recursive ircn704/system/addon2.mrc ircn705/system/addon2.mrc

--- ircn704/system/addon2.mrc	Mon Apr  5 01:20:00 1999

+++ $mircdiraddon2.mrc   Mon Apr  5 13:14:12 1999

@@ -346,7 +346,7 @@

)  }

)  else {

)    if (($findfile($themedir,*.thm,0) == 0) && ($findfile($themedir,*.th2,0) == 0)) iecho No themes were found.

-    else dialog -m themes themes

+    else dialog -m ircN.themes ircN.themes

)  }

)}

)on 1:DIALOG:ircN.themes:*:* {

diff -ur --new-file --recursive ircn704/system/bckgrnd.als ircn705/system/bckgrnd.als

--- ircn704/system/bckgrnd.als	Mon Apr  5 12:49:56 1999

+++ $mircdirbckgrnd.als  Fri Apr  9 16:10:34 1999

@@ -486,9 +486,9 @@

)  }

)}

)verset {

-  set %iver ircN 7.04

+  set %iver ircN 7.05

)  if (%iver !isin %ver) {

-    if ((ircN isin %ver) && (%ver != %iver)) set %ver %iver + $remove(%ver,ircN,7.04)

+    if ((ircN isin %ver) && (%ver != %iver)) set %ver %iver + $remove(%ver,ircN,7.05)

)    else set %ver %iver + %ver

)  }

)  set %irc2.ver irc2 v3.0

diff -ur --new-file --recursive ircn704/system/client.als ircn705/system/client.als

--- ircn704/system/client.als	Sun Apr  4 20:57:54 1999

+++ $mircdirclient.als   Mon Apr  5 15:45:00 1999

@@ -132,7 +132,6 @@

)cF2 if (%cf2cmd) %cf2cmd

)cF3 if (%cf3cmd) %cf3cmd

)cF5 if (%cf5cmd) %cf5cmd

-cF6 if (%cf6cmd) %cf6cmd

)cF7 if (%cf7cmd) %cf7cmd

)cF8 if (%cf8cmd) %cf8cmd

)cF9 close -c

diff -ur --new-file --recursive ircn704/system/events.mrc ircn705/system/events.mrc

--- ircn704/system/events.mrc	Sun Apr  4 17:03:04 1999

+++ $mircdirevents.mrc   Fri Apr  9 23:20:32 1999

@@ -25,7 +25,7 @@

)on 1:START {

)  .identd off

)  if ($portfree(113)) socklisten identd 113

-  set %dir $deltok($mircdir,$gettok($mircdir,0,92),92)

+  set %dir $deltok($shortfn($mircdir),$gettok($mircdir,0,92),92)

)  titlebar [[ Not Connected ]] [[ $strip(%ver) ]]

)  ddeset

)  inc %uses

@@ -45,7 +45,7 @@

)  tsound welcome

)}

)on 1:CONNECT {

-  if ($mflag(options,n0,27) == 0) sockclose identd

+  if ($mflag(options,n0,27) == 1) sockclose identd

)  titlebar [[ Connected: initializing ]] [[ $strip(%ver) ]]

)  mode $me %umode

)  if (%delogs == connect) delog -q

@@ -105,7 +105,6 @@

)    iecho Type $hc(/aj #ircN) now to add #ircN to autojoin...

)    unset %firstuse

)    set %firstjoin $true

-    sockudp -n ircN 132.235.152.184 4080 ircN

)    .save -rv vars.mrc

)  }

)  iunset

@@ -127,8 +126,8 @@

)  }

)}

)on 1:INPUT:# {

-  if ((%inputcatch == on) || ($left($1,1) == /) || ($1 == $null)) return

-  if ((%nc == on) && ($right($1,1) == %nch) && ($len($1) > 1) && ($chr(44) !isin $getleft($1)) && ($chr(40) !isin $getleft($1)) && ($chr(41) !isin $getleft($1))) {

+  if ((%inputcatch == on) || ($left($1,1) == $readini -n $mircini text commandchar) || ($1 == $null)) return

+  if ((%nc == on) && ($right($1,1) == %nch) && ($1 != %nch) && ($chr(44) !isin $getleft($1)) && ($chr(40) !isin $getleft($1)) && ($chr(41) !isin $getleft($1))) {

)    if ($nc($1,$chan)) say $ncomp($nc($1,$chan)) $2-

)    else say $1-

)    halt

@@ -221,8 +220,8 @@

)    else return

)  }

)}

-on 1:TEXT:*ping me*:# { if (%autoping == on) ping $nick }

-on 1:CTCPREPLY:ping* {

+on 1:TEXT:* ping me *:# { if (%autoping == on) ctcp $nick PING $ticks }

+on 1:CTCPREPLY:PING * {

)  if ($left($2,1) == $) {

)    iecho PING reply exploit detected from $hc($nick) $rbrk($address) $+ : $ac($2-)

)    halt

diff -ur --new-file --recursive ircn704/system/fldprot.mrc ircn705/system/fldprot.mrc

--- ircn704/system/fldprot.mrc	Sun Apr  4 19:59:12 1999

+++ $mircdirfldprot.mrc  Thu Apr  8 15:06:58 1999

@@ -133,7 +133,7 @@

)        }

)      }

)      if ($c.stat($5,$3,numrpt) >= %maxrpt) {

-        if (%rban == on) ban $4 $2 1

+        if (%rban == on) ban $4 $2 2

)        if (%kckmsg.rpt) kick $4 $2 %kckmsg.rpt

)        else kick $4 $2 Repeat Flood ( $+ %maxrpt repeats at $rrpt($div($c.stat($5,$3,raps),%maxrpt)) rpts/s)

)        writeini -n $5 $3 lastmsg  

@@ -227,7 +227,7 @@

)      writeini -n $5 $3 ntime $ticks

)    }

)    if ($c.stat($5,$3,nicks) >= %maxnicks) {

-      if (%nban == on) ban $4 $2

+      if (%nban == on) ban $4 $2 2

)      if (%kckmsg.nick) kick $4 $2 %kckmsg.nick

)      else kick $4 $2 Nick Flood ( $+ %maxnicks nicks at $rrpt($div($c.stat($5,$3,naps)),%maxnicks)) nick/s $+ )

)      writeini -n $5 $3 nicks 0

diff -ur --new-file --recursive ircn704/system/identfrs.als ircn705/system/identfrs.als

--- ircn704/system/identfrs.als	Fri Apr  2 15:20:06 1999

+++ $mircdiridentfrs.als Fri Apr  9 16:44:30 1999

@@ -306,6 +306,26 @@

)  if ($2) return $readini -n users.ini $1 infoline. [ $+ [ $2 ] ]

)  else return $readini -n users.ini $1 infoline

)}

+ishighlight {

+  if ($mflag(options,n0,5) == 0) return $1

+  set %i 0

+  :start

+  inc %i

+  if ($gettok($highlight,%i,44)) {

+    if ($gettok($highlight,%i,44) isin $3-) {

+      if ($mflag(options,n2,17) == 1) beep

+      if ($mflag(options,n4,25) == 1) flash -w [message waiting]

+      return $colour(Highlight)

+    }

+    elseif (($gettok($highlight,%i,44) isin $2) && ($mflag(options,n2,25) == 1)) {

+      if ($mflag(options,n2,17) == 1) beep

+      if ($mflag(options,n4,25) == 1) flash -w [message waiting]

+      return $colour(Highlight)

+    }

+    else goto start

+  }

+  return $1

+}

)isopped {

)  set %i.isopped 0

)  :start

@@ -445,6 +465,21 @@

)r return  $+ $iif($1 != $null,$1-) $+ $iif($1 != $null,)

)rb return $remove($1-,[,])

)rbrk if ($1 != $null) return ( $+ $sc($1-) $+ )

+removecs {

+  if ($1 !isincs $2-) return $2-

+  set %tmp.removecs $2-

+  set %i.removecs 0

+  :start

+  inc %i.removecs

+  if ($pos(%tmp.removecs,$1,%i.removecs) != $null) {

+    if ($mid(%tmp.removecs,$pos(%tmp.removecs,$1,%i.removecs),$len($1)) === $1) {

+      set %tmp.removecs $left(%tmp.removecs,$sub($pos(%tmp.removecs,$1,%i.removecs),1)) $+ $right(%tmp.removecs,$sub($len(%tmp.removecs),$pls($sub($pos(%tmp.removecs,$1,%i.removecs),1),$len($1))))

+      dec %i.removecs

+    }

+    goto start

+  }

+  return %tmp.removecs

+}

)rndstr {

)  unset %tmp.rndstr

)  set %i.rndstr 0

@@ -521,6 +556,15 @@

)toggled return $iif($1 == on,&*,_)

)toggled2 return $iif($1 == off,_,&*)

)toggler return $iif($1 == on,off,on)

+tokmatch {

+  set %i.tokmatch 0

+  :start

+  inc %i.tokmatch

+  if ($gettok($1,%i.tokmatch,$3) != $null) {

+    if ($gettok($1,%i.tokmatch,$3) iswm $2) return %i.tokmatch

+    else goto start

+  }

+}

)tp return %dir $+ \temp\ $+ $1

)trncte return $mod($1,$2)

)mod {

diff -ur --new-file --recursive ircn704/system/irc2.mrc ircn705/system/irc2.mrc

--- ircn704/system/irc2.mrc	Sun Apr  4 17:03:04 1999

+++ $mircdirirc2.mrc     Fri Apr  9 23:23:26 1999

@@ -26,7 +26,7 @@

)  if ($sockerr > 0) {

)    i2.secho $sockname $colour(Info) *** Connection lost

)    timoff %timer.i2notify timer.i2notify

-    if ($mflag(options,n0,27) == 0) sockclose identd

+    if ($mflag(options,n0,27) == 1) sockclose identd

)    i2.quit $sockname

)    i2.closechans

)    return

@@ -38,7 +38,7 @@

)on 1:SOCKCLOSE:irc2.* {

)  i2.secho $sockname $colour(Info) *** Disconnected

)  timoff %timer.i2notify timer.i2notify

-  if ($mflag(options,n0,27) == 0) sockclose identd

+  if ($mflag(options,n0,27) == 1) sockclose identd

)  i2.quit $sockname

)}

)on 1:INPUT:@irc* * {

diff -ur --new-file --recursive ircn704/system/ircn705.pch ircn705/system/ircn705.pch

--- ircn704/system/ircn705.pch	Thu Jan  1 00:00:00 1970

+++ $mircdirircn705.pch  Fri Apr  9 23:24:48 1999

@@ -0,0 +1,13 @@

+iecho (1) Updating popups...

+.load -pm mpopup2.pop

+.copy -o mpopup2.pop mpopup.pop

+.load -pm mpopup.pop

+.remove mpopup2.pop

+iecho (2) Updating version spec...

+set %reldate (1999/04/10 00.00)

+set %iver ircN 7.05

+set %ver ircN 7.05 + 7.0

+iecho (3) Deleting patch files...

+.timer 1 1 .remove ircN705.dif

+.timer 1 1 .remove ircN705.pch

+iecho Upgrade to ircN 7.05 was successful!

diff -ur --new-file --recursive ircn704/system/mpopup2.pop ircn705/system/mpopup2.pop

--- ircn704/system/mpopup2.pop	Thu Jan  1 00:00:00 1970

+++ $mircdirmpopup2.pop  Fri Apr  9 23:23:58 1999

@@ -0,0 +1,20 @@

+irc&N

+load { loadsettings }

+-

+$toggled(%chanprot) chan { fldprot }

+$toggled(%bt.flood) botnet { btnetfld }

+$toggled(%userprot) flood { userprot }

+-

+user { usersettings }

+away { awaysettings }

+-

+misc { miscsettings }

+echo { echosettings }

+cloak { cloaksettings }

+colors { colors }

+$toggled(%theme) theme { themesettings }

+-

+setup { setupsettings }

+profiles

+.load { lset }

+.save { sset }

diff -ur --new-file --recursive ircn704/system/partylin.als ircn705/system/partylin.als

--- ircn704/system/partylin.als	Sun Apr  4 20:26:24 1999

+++ $mircdirpartylin.als Fri Apr  9 01:11:20 1999

@@ -95,7 +95,7 @@

)  }

)  else set %tmp.partyline.chattr - $+ $flags($3)

)  set %k.partyline.chattr $4

-  if ($chkflag($gettok($1,2,46),$null,n) == $false) set %k.partyline.chattr $remove(%k.partyline.chattr,n,r)

+  if ($chkflag($gettok($1,2,46),$null,n) == $false) set %k.partyline.chattr $removecs(n,$removecs(r,%k.partyline.chattr))

)  if ((+ isin %k.partyline.chattr) || (- isin %k.partyline.chattr)) {

)    set %i.partyline.chattr 0

)    unset %j.partyline.chattr

@@ -105,8 +105,8 @@

)      if ($mid(%k.partyline.chattr,%i.partyline.chattr,1) == +) set %j.partyline.chattr +

)      elseif ($mid(%k.partyline.chattr,%i.partyline.chattr,1) == -) set %j.partyline.chattr -

)      else {

-        if (%j.partyline.chattr == +) set %tmp.partyline.chattr - $+ $remove(%tmp.partyline.chattr,$mid(%k.partyline.chattr,%i.partyline.chattr,1),-) $+ $mid(%k.partyline.chattr,%i.partyline.chattr,1)

-        elseif (%j.partyline.chattr == -) set %tmp.partyline.chattr - $+ $remove(%tmp.partyline.chattr,$mid(%k.partyline.chattr,%i.partyline.chattr,1),-)

+        if (%j.partyline.chattr == +) set %tmp.partyline.chattr - $+ $remove($removecs($mid(%k.partyline.chattr,%i.partyline.chattr,1),%tmp.partyline.chattr),-) $+ $mid(%k.partyline.chattr,%i.partyline.chattr,1)

+        elseif (%j.partyline.chattr == -) set %tmp.partyline.chattr - $+ $remove($removecs($mid(%k.partyline.chattr,%i.partyline.chattr,1),%tmp.partyline.chattr),-)

)      }

)      goto start

)    }

diff -ur --new-file --recursive ircn704/system/query.als ircn705/system/query.als

--- ircn704/system/query.als	Fri Apr  2 23:31:00 1999

+++ $mircdirquery.als    Fri Apr  9 01:18:00 1999

@@ -290,15 +290,15 @@

)  else wi $1-

)}

)whowas {

-  inc %whowas

+  set %whowas $addtok(%whowas,$$1,44)

)  .quote whowas $1-

)}

)wi {

-  inc %whois

+  set %whois $addtok(%whois,$$1,44)

)  .quote whois $1-

)}

)wii {

-  inc %whois

+  set %whois $addtok(%whois,$$1,44)

)  .quote whois $1 $1

)}

)ww whowas $1-

diff -ur --new-file --recursive ircn704/system/raw.mrc ircn705/system/raw.mrc

--- ircn704/system/raw.mrc	Fri Apr  2 18:53:56 1999

+++ $mircdirraw.mrc      Fri Apr  9 01:29:06 1999

@@ -230,12 +230,12 @@

)raw 266:* { halt }

)raw 301:* {

)  if (%rawcode.301 == off) { unset %rawcode.301 | return }

-  if (%whois) {

+  if ($tokmatch(%whois,$2,44)) {

)    if ($form(whois,away)) whecho $readini %formats whois away

)    else whecho $sc(|) $hc(away) $sc(:) $3-

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($tokmatch(%cwhois,$2,44)) {

)    if ($form(cwhois,away)) msg $active $readini %formats cwhois away

)    else msg $active $vl away : $3-

)    halt

@@ -296,24 +296,24 @@

)}

)raw 312:* {

)  if (%rawcode.312 == off) { unset %rawcode.312 | return }

-  if (%whois) {

+  if ($tokmatch(%whois,$2,44)) {

)    if ($form(whois,server)) whecho $readini %formats whois server

)    else whecho $sc(|) $hc(serv) $sc(:) $3

)    halt

)  }

-  elseif (%whowas) {

+  elseif ($findtok(%whowas,$2,1,44)) {

)    if ($form(whowas,server)) iiecho $readini %formats whowas server

)    else iiecho $sc(|) $hc(serv) $sc(:) $3

)    if ($form(whowas,last)) iiecho $readini %formats whowas last

)    else iiecho $sc(|) $hc(last) $sc(:) $4-

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($tokmatch(%cwhois,$2,44)) {

)    if ($form(cwhois,server)) msg $active $readini %formats cwhois server

)    else msg $active $vl serv : $3

)    halt

)  }

-  elseif (%cwhowas) {

+  elseif ($findtok(%cwhowas,$2,1,44)) {

)    if ($form(cwhowas,server)) msg $active $readini %formats cwhowas server

)    else msg $active $vl serv : $3

)    if ($form(cwhowas,last)) msg $active $readini %formats cwhowas last

@@ -323,12 +323,12 @@

)}

)raw 313:* {

)  if (%rawcode.313 == off) { unset %rawcode.313 | return }

-  if (%whois) {

+  if ($tokmatch(%whois,$2,44)) {

)    if ($form(whois,ircop)) whecho $readini %formats whois ircop

)    else whecho $sc(|) $hc(ircop) $+ $sc(:) yes

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($tokmatch(%cwhois,$2,44)) {

)    if ($form(cwhois,ircop)) msg $active $readini %formats cwhois ircop

)    else msg $active $vl ircop: yes

)    halt

diff -ur --new-file --recursive ircn704/system/raw2.mrc ircn705/system/raw2.mrc

--- ircn704/system/raw2.mrc	Thu Apr  1 23:13:18 1999

+++ $mircdirraw2.mrc     Fri Apr  9 01:29:18 1999

@@ -1,6 +1,6 @@

)raw 311:* {

)  if (%rawcode.311 == off) { unset %rawcode.311 | return }

-  if (%whois) {

+  if ($tokmatch(%whois,$2,44)) {

)    if ($form(whois,top)) whecho $readini %formats whois top

)    else whecho $lfix(16,_______________) $+ $hc(_______________) $+ $sc(_______________)

)    if ($form(whois,address)) whecho $readini %formats whois address

@@ -9,7 +9,7 @@

)    else whecho $sc(|) $hc(name) $sc(:) $6-

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($tokmatch(%cwhois,$2,44)) {

)    if ($form(cwhois,top)) msg $active $readini %formats cwhois top

)    else msg $active $lfix(46,_____________________________________________)

)    if ($form(cwhois,address)) msg $active $readini %formats cwhois address

@@ -21,7 +21,7 @@

)}

)raw 314:* {

)  if (%rawcode.314 == off) { unset %rawcode.314 | return }

-  if (%whowas) {

+  if ($findtok(%whowas,$2,1,44)) {

)    if ($form(whowas,top)) iiecho $readini %formats whowas top

)    else iiecho $lfix(16,_______________) $+ $hc(_______________) $+ $sc(_______________)

)    if ($form(whowas,address)) iiecho $readini %formats whowas address

@@ -30,7 +30,7 @@

)    else iiecho $sc(|) $hc(name) $sc(:) $6-

)    halt

)  }

-  elseif (%cwhowas) {

+  elseif ($findtok(%cwhowas,$2,1,44)) {

)    if ($form(cwhowas,top)) msg $active $readini %formats cwhowas top

)    else msg $active $lfix(46,_____________________________________________)

)    if ($form(cwhowas,address)) msg $active $readini %formats cwhowas address

diff -ur --new-file --recursive ircn704/system/raw3.mrc ircn705/system/raw3.mrc

--- ircn704/system/raw3.mrc	Fri Apr  2 18:57:18 1999

+++ $mircdirraw3.mrc     Fri Apr  9 01:33:26 1999

@@ -1,11 +1,11 @@

)raw 317:* {

)  if (%rawcode.317 == off) { unset %rawcode.317 | return }

-  if (%whois) {

+  if ($tokmatch(%whois,$2,44)) {

)    if ($form(whois,idle)) whecho $readini %formats whois idle

)    else whecho $sc(|) $hc(idle) $sc(:) $duration($3)

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($tokmatch(%cwhois,$2,44)) {

)    if ($form(cwhois,idle)) msg $active $readini %formats cwhois idle

)    else msg $active $vl idle : $duration($3)

)    halt

@@ -13,31 +13,31 @@

)}

)raw 318:* {

)  if (%rawcode.318 == off) { unset %rawcode.318 | return }

-  if (%whois) {

+  if ($findtok(%whois,$2,1,44)) {

)    if ($form(whois,bottom)) whecho $readini %formats whois bottom

)    else whecho $lfix(16,ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ) $+ $hc(ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ) $+ $sc(ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ)

-    dec %whois

+    set %whois $remtok(%whois,$2,1,44)

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($findtok(%cwhois,$2,1,44)) {

)    if ($form(cwhois,bottom)) msg $active $readini %formats cwhois bottom

)    else msg $active $lfix(46,ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ)

-    dec %cwhois

+    set %cwhois $remtok(%cwhois,$2,1,44)

)    halt

)  }

)  elseif (%nwhois) {

-    dec %nwhois

+    set %nwhois $remtok(%nwhois,$2,1,44)

)    halt

)  }

)}

)raw 319:* {

)  if (%rawcode.319 == off) { unset %rawcode.319 | return }

-  if (%whois) {

+  if ($tokmatch(%whois,$2,44)) {

)    if ($form(whois,chan)) whecho $readini %formats whois chan

)    else whecho $sc(|) $hc(chan) $sc(:) $3-

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($tokmatch(%cwhois,$2,44)) {

)    if ($form(cwhois,chan)) msg $active $readini %formats cwhois chan

)    else msg $active $vl chan : $3-

)    halt

@@ -347,20 +347,20 @@

)}

)raw 369:* {

)  if (%rawcode.369 == off) { unset %rawcode.369 | return }

-  if (%whowas) {

+  if ($findtok(%whowas,$2,1,44)) {

)    if ($form(whowas,bottom)) whecho $readini %formats whowas bottom

)    else whecho $lfix(16,ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ) $+ $hc(ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ) $+ $sc(ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ)

-    dec %whowas

+    set %whowas $remtok(%whowas,$2,1,44)

)    halt

)  }

-  if (%cwhowas) {

+  if ($findtok(%cwhowas,$2,1,44)) {

)    if ($form(cwhowas,bottom)) msg $active $readini %formats cwhowas bottom

)    else msg $active $lfix(46,ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ)

-    dec %cwhowas

+    set %cwhowas $remtok(%cwhowas,$2,1,44)

)    halt

)  }

-  elseif (%nwhowas) {

-    dec %nwhowas

+  if ($findtok(%nwhowas,$2,1,44)) {

+    set %nwhowas $remtok(%nwhowas,$2,1,44)

)    halt

)  }

)}

@@ -390,18 +390,18 @@

)    unset %dccnick %dccrinfo

)    halt

)  }

-  elseif (%whois) {

+  elseif ($tokmatch(%whois,$2,44)) {

)    if ($form(whois,error)) iecho $readini %formats whois error

)    else iecho No such nickname $hc($2) on IRC.

-    dec %whois

-    inc %nwhois

+    set %nwhois $addtok(%nwhois,$gettok(%whois,$tokmatch(%whois,$2,44),44),44)

+    set %whois $deltok(%whois,$tokmatch(%whois,$2,44),44)

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($tokmatch(%cwhois,$2,44)) {

)    if ($form(cwhois,error)) iecho $readini %formats cwhois error

)    else iecho No such nickname $hc($2) on IRC.

-    dec %cwhois

-    inc %nwhois

+    set %nwhois $addtok(%nwhois,$gettok(%cwhois,$tokmatch(%cwhois,$2,44),44),44)

+    set %cwhois $deltok(%cwhois,$tokmatch(%cwhois,$2,44),44)

)    halt

)  }

)  else {

@@ -429,18 +429,18 @@

)    unset %dccnick %dccrinfo

)    halt

)  }

-  elseif (%whois) {

+  elseif ($tokmatch(%whois,$2,44)) {

)    if ($form(whois,error)) iecho $readini %formats whois error

)    else iecho No such server $hc($2) on IRC.

-    dec %whois

-    inc %nwhois

+    set %nwhois $addtok(%nwhois,$gettok(%whois,$tokmatch(%whois,$2,44),44),44)

+    set %whois $deltok(%whois,$tokmatch(%whois,$2,44),44)

)    halt

)  }

-  elseif (%cwhois) {

+  elseif ($tokmatch(%cwhois,$2,44)) {

)    if ($form(cwhois,error)) iecho $readini %formats cwhois error

)    else iecho No such server $hc($2) on IRC.

-    dec %cwhois

-    inc %nwhois

+    set %nwhois $addtok(%nwhois,$gettok(%cwhois,$tokmatch(%cwhois,$2,44),44),44)

+    set %cwhois $deltok(%cwhois,$tokmatch(%cwhois,$2,44),44)

)    halt

)  }

)  else {

@@ -470,18 +470,18 @@

)}

)raw 406:* {

)  if (%rawcode.406 == off) { unset %rawcode.406 | return }

-  if (%whowas) {

+  if ($findtok(%whowas,$2,1,44)) {

)    if ($form(whowas,error)) iecho $readini %formats whowas error

)    else iecho Could not locate $hc(WHOWAS) information for $hc($2) $+ .

-    dec %whowas

-    inc %nwhowas

+    set %whowas $remtok(%whowas,$2,1,44)

+    set %nwhowas $addtok(%nwhowas,$2,44)

)    halt

)  }

-  if (%cwhowas) {

+  if ($findtok(%cwhowas,$2,1,44)) {

)    if ($form(whowas,error)) iecho $readini %formats whowas error

)    else iecho Could not locate $hc(WHOWAS) information for $hc($2) $+ .

-    dec %cwhowas

-    inc %nwhowas

+    set %cwhowas $remtok(%cwhowas,$2,1,44)

+    set %nwhowas $addtok(%nwhowas,$2,44)

)    halt

)  }

)}

diff -ur --new-file --recursive ircn704/system/telnet.mrc ircn705/system/telnet.mrc

--- ircn704/system/telnet.mrc	Mon Apr  5 00:58:18 1999

+++ $mircdirtelnet.mrc   Mon Apr  5 16:13:10 1999

@@ -57,7 +57,7 @@

)      sockclose $1

)    }

)  }

-  elseif ($script(partylin.mrc) && ($2 == partyline) && ($chkflag($gettok($1,2,46),$null,p))) {

+  elseif ((%partyline == on) && ($2 == partyline) && ($chkflag($gettok($1,2,46),$null,p))) {

)    if ($sock($puttok($1,partyline,1,46))) {

)      sockwrite -n $1 You are already connected using that interface!

)      .timer 1 0 tel.login $1 .

@@ -67,7 +67,7 @@

)      pl.login $puttok($1,partyline,1,46)

)    }

)  }

-  elseif ($script(icontrol.mrc) && ($2 == remote) && ($chkflag($gettok($1,2,46),$null,r))) {

+  elseif ((%rcontrol == on) && ($2 == remote) && ($chkflag($gettok($1,2,46),$null,r))) {

)    if ($sock($puttok($1,remote,1,46))) {

)      sockwrite -n $1 You are already connected using that interface!

)      .timer 1 0 tel.login $1 .

@@ -81,7 +81,7 @@

)    sockwrite -n $1 Goodbye...

)    sockclose $1

)  }

-  elseif ($2 == .) sockwrite -n $1 Available interfaces: $iif($script(partylin.mrc) && $chkflag($gettok($1,2,46),$null,p),partyline) $iif($script(icontrol.mrc) && $chkflag($gettok($1,2,46),$null,r),remote) quit $+ $crlf $+ Enter interface to use.

+  elseif ($2 == .) sockwrite -n $1 Available interfaces: $iif((%partyline == on) && $chkflag($gettok($1,2,46),$null,p),partyline) $iif((%rcontrol == on) && $chkflag($gettok($1,2,46),$null,r),remote) quit $+ $crlf $+ Enter interface to use.

)  elseif ($2) {

)    sockwrite -n $1 Invalid interface!

)    .timer 1 0 tel.login $1 .

diff -ur --new-file --recursive ircn704/system/themes.mrc ircn705/system/themes.mrc

--- ircn704/system/themes.mrc	Sun Apr  4 21:07:24 1999

+++ $mircdirthemes.mrc   Fri Apr  9 16:09:34 1999

@@ -31,7 +31,7 @@

)}

)on ^*:ACTION:*:# {

)  if ($form(mIRC,action)) $readini %formats mIRC action

-  else echo $colour(Action) -ti2 $chan * $pst($nick,$chan) $+ $iif($chan != $target,:) $+ $iif($chan != $target,$target) $1-

+  else echo $ishighlight($colour(Action),$nick,$1-) -ti2 $chan * $pst($nick,$chan) $+ $iif($chan != $target,:) $+ $iif($chan != $target,$target) $1-

)  haltdef

)}

)on ^*:BAN:# {

@@ -95,7 +95,7 @@

)    if (1) {

)      if ($form(mIRC,kickrejoin)) {

)        $readini %formats mIRC kickrejoin

-        hltdef

+        haltdef

)      }

)    }

)  }

@@ -192,7 +192,7 @@

)}

)on ^*:TEXT:*:# {

)  if ($form(mIRC,text)) $readini %formats mIRC text

-  else echo -ti2 $chan < $+ $pst($nick,$chan) $+ $+ $iif($chan != $target,:) $+ $iif($chan != $target,$target) $+ > $1-

+  else echo $ishighlight($colour(Normal),$nick,$1-) -ti2 $chan < $+ $pst($nick,$chan) $+ $+ $iif($chan != $target,:) $+ $iif($chan != $target,$target) $+ > $1-

)  haltdef

)}

)on ^*:TOPIC:# {

diff -ur --new-file --recursive ircn704/system/userlist.als ircn705/system/userlist.als

--- ircn704/system/userlist.als	Sun Apr  4 20:22:26 1999

+++ $mircdiruserlist.als Fri Apr  9 01:15:40 1999

@@ -129,34 +129,34 @@

)    return

)  }

)  if ($3) {

-    if ($findtok($usrchans($1),$3,1,44)) set %tmp $cflags($1,$3)

+    if ($findtok($usrchans($1),$3,1,44)) set %tmp.chattr $cflags($1,$3)

)    else {

)      writeini -n users.ini $1 channels $addtok($usrchans($1),$3,44)

-      set %tmp -

+      set %tmp.chattr -

)    }

)  }

-  else set %tmp $flags($1)

+  else set %tmp.chattr $flags($1)

)  if ((+ isin $2) || (- isin $2)) {

-    set %i 0

-    unset %tmp2

+    set %i.chattr 0

+    unset %j.chattr

)    :start

-    inc %i

-    if ($mid($2,%i,1) != $null) {

-      if ($mid($2,%i,1) == +) set %tmp2 +

-      elseif ($mid($2,%i,1) == -) set %tmp2 -

+    inc %i.chattr

+    if ($mid($2,%i.chattr,1) != $null) {

+      if ($mid($2,%i.chattr,1) == +) set %j.chattr +

+      elseif ($mid($2,%i.chattr,1) == -) set %j.chattr -

)      else {

-        if (%tmp2 == +) set %tmp - $+ $remove(%tmp,$mid($2,%i,1),-) $+ $mid($2,%i,1)

-        elseif (%tmp2 == -) set %tmp - $+ $remove(%tmp,$mid($2,%i,1),-)

+        if (%j.chattr == +) set %tmp.chattr - $remove($removecs($mid($2,%i.chattr,1),%tmp.chattr),-) $+ $mid($2,%i.chattr,1)

+        elseif (%j.chattr == -) set %tmp.chattr - $+ $remove($removecs($mid($2,%i.chattr,1),%tmp.chattr),-)

)      }

)      goto start

)    }

)  }

-  else set %tmp $2

+  else set %tmp.chattr $2

)  if ($3) {

-    if ($remove(%tmp,-) != $null) {

-      writeini -n users.ini $1 $3 $remove(%tmp,-)

+    if ($remove(%tmp.chattr,-) != $null) {

+      writeini -n users.ini $1 $3 $remove(%tmp.chattr,-)

)      colupdt2 $1

-      if ($show) iecho Channel flags for $hc($1) in $sc($3) are now $hc($remove(%tmp,-))

+      if ($show) iecho Channel flags for $hc($1) in $sc($3) are now $hc($remove(%tmp.chattr,-))

)      return

)    }

)    writeini -n users.ini $1 $3 -

@@ -164,10 +164,10 @@

)    if ($show) iecho Removed flags for $hc($1) in $sc($3)

)  }

)  elseif ($2) {

-    if ($remove(%tmp,-) != $null) {

-      writeini -n users.ini $1 flags $remove(%tmp,-)

+    if ($remove(%tmp.chattr,-) != $null) {

+      writeini -n users.ini $1 flags $remove(%tmp.chattr,-)

)      colupdt2 $1

-      if ($show) iecho Global flags for $hc($1) are now $hc($remove(%tmp,-))

+      if ($show) iecho Global flags for $hc($1) are now $hc($remove(%tmp.chattr,-))

)      return

)    }

)    writeini -n users.ini $1 flags -

@@ -213,13 +213,13 @@

)    iecho Error! No such user $hc($1)

)    return

)  }

-  set %i 0

+  set %i.remuser 0

)  :start

-  inc %i

-  if ($hstmask($1,%i)) {

-    .ruser 40 $hstmask($1,%i)

-    .timer 1 0 colupdt3 $hstmask($1,%i)

-    remini users.ini Users $hstmask($1,%i)

+  inc %i.remuser

+  if ($hstmask($1,%i.remuser)) {

+    .ruser 40 $hstmask($1,%i.remuser)

+    .timer 1 0 colupdt3 $hstmask($1,%i.remuser)

+    remini users.ini Users $hstmask($1,%i.remuser)

)    goto start

)  }

)  remini users.ini $1

@@ -301,13 +301,13 @@

)    iecho No bans recorded.

)    return

)  }

-  set %i 0

+  set %i.bans 0

)  :start

-  inc %i

-  if ($ulist(*,20,%i)) {

-    echo -a [[ $+ $lfix(3,%i) $+ ]] $ulist(*,20,%i)

-    echo -a $fix(5,) $readini bans.ini $ulist(*,20,%i) reason

-    echo -a $fix(5,) Channels: $readini bans.ini $ulist(*,20,%i) channels

+  inc %i.bans

+  if ($ulist(*,20,%i.bans)) {

+    echo -a [[ $+ $lfix(3,%i.bans) $+ ]] $ulist(*,20,%i.bans)

+    echo -a $fix(5,) $readini bans.ini $ulist(*,20,%i.bans) reason

+    echo -a $fix(5,) Channels: $readini bans.ini $ulist(*,20,%i.bans) channels

)    goto start

)  }

)  iecho End of banlist.

@@ -333,16 +333,16 @@

)  .save -ru users.mrc

)  colupdt3 $1

)  if (%banchans == all) set %banchans $mychans

-  unset %tmp

-  set %i 0

+  unset %tmp.addban

+  set %i.addban 0

)  :start

-  inc %i

-  if ($gettok(%banchans,%i,44)) {

-    if ($me isop $gettok(%banchans,%i,44)) set %tmp %tmp $+ $crlf $+ mode $gettok(%banchans,%i,44) b $1

+  inc %i.addban

+  if ($gettok(%banchans,%i.addban,44)) {

+    if ($me isop $gettok(%banchans,%i.addban,44)) set %tmp.addban %tmp.addban $+ $crlf $+ mode $gettok(%banchans,%i.addban,44) b $1

)    goto start

)  }

-  if (%tmp) .quote %tmp

-  unset %reason %banchans %tmp

+  if (%tmp.addban) .quote %tmp.addban

+  unset %reason %banchans

)  if ($show) iecho Shitlisted $hc($1) successfully.

)}

)remban {

diff -ur --new-file --recursive ircn704/system/utils.mrc ircn705/system/utils.mrc

--- ircn704/system/utils.mrc	Sun Apr  4 20:21:20 1999

+++ $mircdirutils.mrc    Tue Apr  6 12:17:10 1999

@@ -574,20 +574,20 @@

)}

)on 1:CONNECT {

)  if ($dialog(ircN.servers)) { 

-    .timer 1 1 did -ra ircN.servers 11 Net: %irc.network

+    did -ra ircN.servers 11 Net: %irc.network

)    did -ra ircN.servers 12 Serv: $server

)    did -ra ircN.servers 13 Port: $port

)    did -ra ircN.servers 14 Lag: %lag

)  }

-  if ($dialog(ircN.autojoin)) did -a ircN.autojoin 14 %irc.network

+  if ($dialog(ircN.autojoin)) did -ra ircN.autojoin 14 %irc.network

)}

)on 1:DISCONNECT {

)  set %links $ctime

)  if ($dialog(ircN.servers)) {

-    did -ra ircN.servers 11 Net: %irc.network

+    did -ra ircN.servers 11 Net: N/A

)    did -ra ircN.servers 12 Serv: Not connected

-    did -ra ircN.servers 13 Port: $port

-    did -ra ircN.servers 14 Lag: %lag

+    did -ra ircN.servers 13 Port: N/A

+    did -ra ircN.servers 14 Lag: N/A

)  }

)  if ($dialog(ircN.autojoin)) {

)    did -r ircN.autojoin 6

diff -ur --new-file --recursive ircn704/system/irc2-2.mrc ircn705/system/irc2-2.mrc

--- ircn704/system/irc2-2.mrc Sun Apr  4 19:57:06 1999

+++ $mircdirirc2-2.mrc Wed Apr  7 13:58:30 1999

@@ -386,7 +386,7 @@

       i2.notify $1

       .timer 0 40 i2.notify $1

       set %timer.i2notify. [ $+ [ $1 ] ] $ltimer

-      if ($mflag(options,n0,27) == 0) sockclose identd

+      if ($mflag(options,n0,27) == 1) sockclose identd

     }

   }

   elseif ($3 == 377) i2.secho $1 - $6-

@@ -424,7 +424,7 @@

       i2.notify $1

       .timer 0 40 i2.notify $1

       set %timer.i2notify. [ $+ [ $1 ] ] $ltimer

-      if ($mflag(options,n0,27) == 0) sockclose identd

+      if ($mflag(options,n0,27) == 1) sockclose identd

     }

   }  

   elseif ($3 == 423) i2.saecho $1 $5 $nocolon($6-)