X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FUserExtra.pl;h=ada60ce8113155e9c07a0e378c67793df0f403a1;hb=f7cae48a17d6decd0a9bd997188271daa0a885b1;hp=d967932054e65630971ea1071e70f3bfbc3f893d;hpb=0efbbcb79c523ee9e16c659f2d9df5a00a250211;p=infobot.git

diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index d967932..ada60ce 100644
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -17,25 +17,25 @@ use vars qw(%channels %chanstats %cmdstats %count %ircstats %param
 
 &addCmdHook("main", 'chan(stats|info)', ('CODEREF' => 'chaninfo', ) );
 &addCmdHook("main", 'cmd(stats|info)', ('CODEREF' => 'cmdstats', ) );
-&addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo', 
+&addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo',
 	'Cmdstats' => 'Factoid Info', Module => 'factoids', ) );
-&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', 
-	'Cmdstats' => 'Factoid Stats', Help => "factstats", 
+&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats',
+	'Cmdstats' => 'Factoid Stats', Help => "factstats",
 	Forker => 1, 'Identifier' => 'factoids', ) );
-&addCmdHook("main", 'help', ('CODEREF' => 'help', 
+&addCmdHook("main", 'help', ('CODEREF' => 'help',
 	'Cmdstats' => 'Help', ) );
 &addCmdHook("main", 'karma', ('CODEREF' => 'karma', ) );
-&addCmdHook("main", 'i?spell', ('CODEREF' => 'ispell', 
+&addCmdHook("main", 'i?spell', ('CODEREF' => 'ispell',
 	Help => 'spell', Identifier => 'spell', ) );
-&addCmdHook("main", 'd?nslookup', ('CODEREF' => 'DNS', 
+&addCmdHook("main", 'd?nslookup', ('CODEREF' => 'DNS',
 	Help => 'nslookup', Identifier => 'allowDNS',
 	Forker => "NULL", ) );
-&addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell', 
+&addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell',
 	Help => 'tell', Identifier => 'allowTelling',
 	Cmdstats => 'Tell') );
-&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse', 
+&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse',
 	Module => 'news', 'Cmdstats' => 'News' ) );
-&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats', 
+&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats',
 #	Forker => "NULL",
  ) );
 
@@ -58,7 +58,7 @@ sub chaninfo {
 
 	### line 1.
 	foreach (sort keys %channels) {
-	    if (/^\s*$/ or / /) {
+	    if ( /^\s*$/ or / / ) {
 		&status("chanstats: fe channels: chan == NULL.");
 		&ircCheck();
 		next;
@@ -225,7 +225,7 @@ sub factstats {
 sub karma {
     my $target	= lc( shift || $who );
     my $karma	= &sqlSelect("stats", "counter",
-	{ nick => $target, type => "karma" }) || 0; 
+	{ nick => $target, type => "karma" }) || 0;
 
     if ($karma != 0) {
 	&pSReply("$target has karma of $karma");
@@ -330,7 +330,7 @@ sub tell {
     $target	= $talkchannel  if ($target =~ /^us$/i);
     $target	= $who		if ($target =~ /^(me|myself)$/i);
 
-    &status("tell: target = $target, query = $query");  
+    &status("tell: target = $target, query = $query");
 
     # "intrusive".
 #    if ($target !~ /^$mask{chan}$/ and !&IsNickInAnyChan($target)) {
@@ -416,7 +416,7 @@ sub DNS {
 	    $result = $match." is ".$x unless ($x =~ /^\s*$/);
 	} else {
 	    $result = "I can't seem to find that address in DNS";
-        }
+	}
 
     } else {
 
@@ -622,8 +622,8 @@ sub userCommands {
 
 	&status("USER reload $who");
 	&pSReply("reloading...");
-	&reloadAllModules();
-	&pSReply("reloaded.");
+	my $modules = &reloadAllModules();
+	&pSReply("reloaded:$modules");
 	return;
     }
 
@@ -787,7 +787,7 @@ sub userCommands {
 	}
 
 	&pSReply($reply);
-		
+
 	return;
     }
 
@@ -796,7 +796,11 @@ sub userCommands {
 	my $startString	= scalar(gmtime $^T);
 	my $upString	= &Time2String(time() - $^T);
 	my $factoids	= &countKeys("factoids");
-
+	my $forks = 0;
+	foreach (keys %forked) {
+	    $forks += scalar keys %{ $forked{$_} };
+	}
+	$forks /= 2;
 	$count{'Commands'}	= 0;
 	foreach (keys %cmdstats) {
 	    $count{'Commands'} += $cmdstats{$_};
@@ -817,7 +821,9 @@ sub userCommands {
 	  ".  I have been awake for $upString this session, and ".
 	  "currently reference \002$factoids\002 factoids.  ".
 	  "I'm using about \002$memusage\002 ".
-	  "kB of memory."
+	  "kB of memory. With \002$forks\002 active ".
+		&fixPlural("fork",$forks).
+	  "."
 	);
 
 	return;