--- parser3/src/include/pa_request.h	2002/04/15 12:03:32	1.131
+++ parser3/src/include/pa_request.h	2002/06/12 10:58:42	1.136
@@ -4,7 +4,7 @@
 	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 $
+	$Id: pa_request.h,v 1.136 2002/06/12 10:58:42 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -32,6 +32,7 @@
 
 // consts
 
+#define MAIN_METHOD_NAME "main"
 const uint ANTI_ENDLESS_EXECUTE_RECOURSION=500;
 
 // defines
@@ -80,7 +81,6 @@ public:
 		const char *content_type;
 		size_t content_length;
 		const char *cookie;
-		const char *user_agent;
 	};
 	
 	Request(Pool& apool,
@@ -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,6 +218,10 @@ public:
 		return fconnection; 
 	}
 
+	bool origins_mode() {
+		return main_class->get_element(*origins_mode_name)!=0;  // $ORIGINS mode
+	}
+
 public:
 	
 	/// info from web server
@@ -213,6 +229,9 @@ public:
 	/// user's post data
 	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
@@ -260,6 +279,13 @@ 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);
@@ -274,7 +300,7 @@ private: // execute.C
 		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