--- parser3/src/classes/math.C	2003/01/31 12:34:27	1.24.2.2
+++ parser3/src/classes/math.C	2003/04/14 14:59:29	1.26
@@ -1,11 +1,11 @@
 /** @file
 	Parser: @b math parser class.
 
-	Copyright(c) 2001-2003 ArtLebedev Group(http://www.artlebedev.com)
+	Copyright(c) 2001, 2003 ArtLebedev Group(http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru>(http://paf.design.ru)
 */
 
-static const char* IDENT_MATH_C="$Date: 2003/01/31 12:34:27 $";
+static const char* IDENT_MATH_C="$Date: 2003/04/14 14:59:29 $";
 
 #include "pa_common.h"
 #include "pa_vint.h"
@@ -24,6 +24,7 @@ static const char* IDENT_MATH_C="$Date:
 
 // defines
 
+#define PI 3.1415926535
 #define MAX_SALT 8
 
 // class
@@ -46,11 +47,11 @@ static void _random(Request& r, const St
 	Pool& pool=r.pool();
 
 	Value& range=params->as_junction(0, "range must be expression");
-    double top=r.process_to_value(range).as_double();
-    if(top<=1)
+	double top=r.process_to_value(range).as_double();
+	if(top<=0)
 		throw Exception("parser.runtime",
 			&method_name,
-			"top must be above 1(%g)", top);
+			"top must be above 0(%g)", top);
 	
 	r.write_no_lang(*new(pool) VInt(pool, _random(uint(top))));
 }
@@ -113,10 +114,10 @@ MATH2(pow);
 inline bool is_salt_body_char(int c) {
 	return isalnum(c) || c == '.' || c=='/';
 }
-static size_t calc_prefix_size(const char* salt) {
+static size_t calc_prefix_size(const char *salt) {
 	if(size_t salt_size=strlen(salt)) {
 		if(!is_salt_body_char(salt[0])) { // $...  {...
-			const char* cur=salt+1; // skip
+			const char *cur=salt+1; // skip
 			while(is_salt_body_char(*cur++)) // ...$  ...}
 				;
 			return cur-salt;
@@ -127,11 +128,11 @@ static size_t calc_prefix_size(const cha
 }
 static void _crypt(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	const char* password=params->as_string(0, "password must be string").cstr();
-	const char* maybe_bodyless_salt=params->as_string(1, "salt must be string").cstr();
+	const char *password=params->as_string(0, "password must be string").cstr();
+	const char *maybe_bodyless_salt=params->as_string(1, "salt must be string").cstr();
 
 	size_t prefix_size=calc_prefix_size(maybe_bodyless_salt);
-	const char* normal_salt;
+	const char *normal_salt;
 	char normalize_buf[MAX_STRING];
 	if(prefix_size==strlen(maybe_bodyless_salt)) { // bodyless?
 		strncpy(normalize_buf, maybe_bodyless_salt, MAX_STRING-MAX_SALT-1);
@@ -152,11 +153,13 @@ static void _crypt(Request& r, const Str
 		const size_t sample_size=120;
 		char *sample_buf=(char *)pool.malloc(sample_size);
 		pa_MD5Encode((const unsigned char *)password,
-				(const unsigned char *)normal_salt, sample_buf, sample_size);
+			(const unsigned char *)normal_salt, 1/*TRUE: mix in magic string*/,
+			sample_buf, sample_size,
+			0, 0);
 		r.write_pass_lang(*new(pool) String(pool, sample_buf));
     } else {
 #ifdef HAVE_CRYPT
-		const char* sample_buf=crypt(password, normal_salt);
+		const char *sample_buf=crypt(password, normal_salt);
 		if(!sample_buf  // nothing generated
 			|| !sample_buf[0] // generated nothing
 			|| strncmp(sample_buf, normal_salt, prefix_size)!=0) // salt prefix not preserved
@@ -173,6 +176,27 @@ static void _crypt(Request& r, const Str
 	}
 }
 
+static void _md5(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
+	const char *string=params->as_string(0, "parameter must be string").cstr();
+	const size_t sample_size=120;
+	char sample_buf[sample_size];
+	const int sample_bytes_count=12;
+	unsigned char sample_bytes[sample_bytes_count];
+	pa_MD5Encode((const unsigned char *)string,
+		(const unsigned char *)"",  0/*FALSE: mix in magic string*/,
+		sample_buf, sample_size,
+		sample_bytes, sample_bytes_count);
+	char *sample_bytes_hex=(char *)pool.malloc(sample_bytes_count*2/*byte->hh*/+1/*for zero-teminator*/);
+	unsigned char *src=sample_bytes;
+	unsigned char *end=sample_bytes+sample_bytes_count;
+	char *dest=sample_bytes_hex;
+	while(src<end)
+		dest+=snprintf(dest, 3, "%02x", *src++);
+
+	r.write_pass_lang(*new(pool) String(pool, sample_bytes_hex));
+}
+
 // constructor
 
 MMath::MMath(Pool& apool) : Methoded(apool, "math") {
@@ -199,6 +223,9 @@ MMath::MMath(Pool& apool) : Methoded(apo
 
 	// ^crypt[password;salt]
 	ADD2(crypt);
+
+	// ^md5[string]
+	ADD1(md5);
 }
 
 // in MSVC each thread has it's own pseudo-random sequence
@@ -221,10 +248,16 @@ void MMath::configure_admin(Request&) {
 
 // global variables
 
-VStateless_classPtr math_base_class(???);
+Methoded *math_base_class;
+Hash *math_consts;
 
 // creator
 
 Methoded *MMath_create(Pool& pool) {
+	math_consts=new(pool) Hash(pool);
+	math_consts->put(
+		*new(pool) String(pool, "PI"), 
+		new(pool) VDouble(pool, PI));
+
 	return math_base_class=new(pool) MMath(pool);
 }