--- parser3/src/include/pa_request.h	2002/04/15 12:03:32	1.131
+++ parser3/src/include/pa_request.h	2002/09/10 12:05:37	1.147
@@ -3,13 +3,13 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_request.h,v 1.131 2002/04/15 12:03:32 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
 #define PA_REQUEST_H
 
+static const char* IDENT_REQUEST_H="$Date: 2002/09/10 12:05:37 $";
+
 #include "pa_pool.h"
 #include "pa_hash.h"
 #include "pa_wcontext.h"
@@ -20,6 +20,7 @@
 #include "pa_venv.h"
 #include "pa_vstatus.h"
 #include "pa_vform.h"
+#include "pa_vmail.h"
 #include "pa_vmath.h"
 #include "pa_vrequest.h"
 #include "pa_vresponse.h"
@@ -32,6 +33,7 @@
 
 // consts
 
+#define MAIN_METHOD_NAME "main"
 const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500;
 
 // defines
@@ -80,7 +82,7 @@ public:
 		const char *content_type;
 		size_t content_length;
 		const char *cookie;
-		const char *user_agent;
+		bool mail_received;
 	};
 	
 	Request(Pool& apool,
@@ -99,10 +101,8 @@ public:
 		BEWARE: may throw exception to you: catch it!
 	*/
 	void core(
-		const char *root_config_filespec, ///< system config filespec
-		bool root_config_fail_on_read_problem, ///< fail if system config file not found
-		const char *site_config_filespec, ///< site config filespec
-		bool site_config_fail_on_read_problem, ///< fail if site config file not found
+		const char *config_filespec, ///< system config filespec
+		bool config_fail_on_read_problem, ///< fail if system config file not found
 		bool header_only);
 
 	/// executes ops
@@ -128,7 +128,7 @@ public:
 		VStateless_class *base_class=0); // core.C
 	/// compiles a @a source buffer
 	VStateless_class *use_buf(
-		const char *source, const char *file,
+		const char *source, const String& filespec, const char *filespec_cstr,
 		VStateless_class *aclass=0, const String *name=0, 
 		VStateless_class *base_class=0); // core.C
 
@@ -151,6 +151,13 @@ public:
 		else \
 			write_##modification##_lang(*dual.get_value()); \
 	}
+#define DEFINE_DUAL_CHECKED(modification) \
+	void write_##modification##_lang(StringOrValue dual, const String *origin) { \
+		if(const String *string=dual.get_string()) \
+			write_##modification##_lang(*string); \
+		else \
+			write_##modification##_lang(*dual.get_value(), origin); \
+	}
 
 	/// appending, sure of clean string inside
 	void write_no_lang(const String& astring) {
@@ -181,11 +188,16 @@ public:
 	void write_assign_lang(Value& avalue) {
 		wcontext->write(avalue, flang); 
 	}
+	/// appending possible string, assigning untaint language
+	void write_assign_lang(Value& avalue, const String *origin) {
+		wcontext->write(avalue, flang, origin); 
+	}
 	/// appending string, assigning untaint language
 	void write_assign_lang(const String& astring) {
 		wcontext->write(astring, flang); 
 	}
 	DEFINE_DUAL(assign)
+	DEFINE_DUAL_CHECKED(assign)
 
 	/// returns relative to @a path  path to @a file 
 	const String& relative(const char *apath, const String& relative_name);
@@ -206,13 +218,20 @@ public:
 		return fconnection; 
 	}
 
+	bool origins_mode() {
+		return main_class->get_element(*origins_mode_name, main_class, false)!=0;  // $ORIGINS mode
+	}
+
 public:
 	
 	/// info from web server
 	Info& info;
 	/// user's post data
-	char *post_data;  size_t post_size;
+	const char *post_data;  size_t post_size;
 
+	/// name of 'main' method
+	const String main_method_name;
+	
 	/// operators are methods of this class
 	Methoded& OP;
 	/// $env:fields
@@ -221,6 +240,8 @@ public:
 	VStatus status;
 	/// $form:elements
 	VForm form;
+	/// $mail
+	VMail mail;
 	/// $math:constants
 	VMath math;
 	/// $request:elements
@@ -234,8 +255,9 @@ public:
 	/// execution stack
 	Stack stack;
 	/// contexts
-	Value *self, *root, *rcontext;
-	/// contexts
+	Value *self;
+	VMethodFrame *method_frame;
+	Value *rcontext;
 	WContext *wcontext;
 	/// exception stack trace
 	Stack exception_trace;
@@ -260,21 +282,34 @@ private: // core data
 	*/
 	uint anti_endless_execute_recoursion;
 
+private:
+
+	/// already executed some @conf method
+	bool configure_admin_done;
+
+	void configure_admin(VStateless_class& conf_class, const String *source);
+
 private: // compile.C
 
 	VStateless_class& real_compile(COMPILE_PARAMS);
 
 private: // execute.C
 
-	const String *execute_method(Value& aself, const Method& method,
-		bool return_cstr);
+	/// for @postprocess[body]
 	const String& execute_method(VMethodFrame& amethodFrame, const Method& method);
+	//{ for @conf[filespec] and @auto[filespec]
+	void execute_method(Value& aself, 
+		const Method& method, VString *optional_param,
+		const String **return_string);
+	void execute_nonvirtual_method(VStateless_class& aclass, 
+		const String& method_name, VString *optional_param,
+		const String **return_string,
+		const Method **return_method=0);
+	//}
+	/// for @main[]
 	const String *execute_virtual_method(Value& aself, const String& method_name);
-	const String *execute_nonvirtual_method(VStateless_class& aclass, 
-		const String& method_name,
-		bool return_cstr);
 
-	Value *get_element(bool can_call_operator);
+	Value *get_element(const String *& remember_name, bool can_call_operator);
 
 private: // defaults