From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Tue, 20 Feb 2001 13:00:13 +0000 (+0000)
Subject: - added mkcrypt, fixed up "crypt" cmd.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=37455a2edf26d57c93fe11107cc1b8fd1ea1fd55;p=infobot.git

- added mkcrypt, fixed up "crypt" cmd.


git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@409 c11ca15a-4712-0410-83d8-924469b57eb5
---

diff --git a/src/Misc.pl b/src/Misc.pl
index b190857..b9c473f 100644
--- a/src/Misc.pl
+++ b/src/Misc.pl
@@ -676,4 +676,11 @@ sub closePID {
     return 0 if ( -f $file{PID});
 }
 
+sub mkcrypt {
+    my($str) = @_;
+    my $salt = join '',('.','/',0..9,'A'..'Z','a'..'z')[rand 64, rand 64];
+
+    return crypt($str, $salt);
+}
+
 1;
diff --git a/src/UserExtra.pl b/src/UserExtra.pl
index 075e0c2..e0c234a 100644
--- a/src/UserExtra.pl
+++ b/src/UserExtra.pl
@@ -462,13 +462,27 @@ sub userCommands {
     }
 
     # crypt.
-    if ($message =~ /^crypt\s+(\S+)\s*(?:,| )\s*(\S+)/) {
-	# word salt.
-	&pSReply(crypt($1, $2));
-	return;
-    }
+    if ($message =~ /^crypt(\s+(.*))?$/i) {
+	my @args	= split /\s+/, $2;
+
+	if (!scalar @args or scalar @args > 2) {
+	    &help("crypt");
+	    return;
+	}
+
+	if (scalar @args == 2) {
+	    if (length $args[0] != 2) {
+		&msg($who, "invalid format...");
+		return;
+	    }
 
+	    &pSReply( crypt($args[1], $args[0]) );
+	} else {
+	    &pSReply( &mkcrypt($args[0]) );
+	}
 
+	return;
+    }
 
     # cycle.
     if ($message =~ /^(cycle)(\s+(\S+))?$/i) {