--- parser3/src/classes/file.C	2005/11/22 11:21:35	1.139
+++ parser3/src/classes/file.C	2005/11/24 14:00:34	1.142
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_FILE_C="$Date: 2005/11/22 11:21:35 $";
+static const char * const IDENT_FILE_C="$Date: 2005/11/24 14:00:34 $";
 
 #include "pa_config_includes.h"
 
@@ -259,9 +259,9 @@ static bool is_safe_env_key(const char*
 }
 #ifndef DOXYGEN
 struct Append_env_pair_info {
+	Request_charsets* charsets;
 	HashStringString* env;
 	Value* vstdin;
-	Value* vcharset;
 };
 #endif
 static void append_env_pair(
@@ -271,13 +271,13 @@ static void append_env_pair(
 	if(akey==STDIN_EXEC_PARAM_NAME) {
 		info->vstdin=avalue;
 	} else if(akey==CHARSET_EXEC_PARAM_NAME) {
-		info->vcharset=avalue;
+		// ignore, already processed
 	} else {
 		if(!is_safe_env_key(akey.cstr()))
 			throw Exception("parser.runtime",
 				new String(akey, String::L_TAINTED),
 				"not safe environment variable");
-		info->env->put(akey, avalue->as_string().cstr_to_string_body(String::L_UNSPECIFIED));
+		info->env->put(akey, avalue->as_string().cstr_to_string_body(String::L_UNSPECIFIED, 0, info->charsets));
 	}
 }
 #ifndef DOXYGEN
@@ -348,8 +348,19 @@ static void _exec_cgi(Request& r, Method
 	if(params.count()>1) {
 		Value& venv=params.as_no_junction(1, "env must not be code");
 		if(HashStringValue* user_env=venv.get_hash()) {
-			Append_env_pair_info info={&env, 0, 0};
-			user_env->for_each(append_env_pair, &info);
+			// $.charset  [previewing to handle URI pieces]
+			if(Value* vcharset=user_env->get(CHARSET_EXEC_PARAM_NAME))
+				charset=&charsets.get(vcharset->as_string()
+					.change_case(r.charsets.source(), String::CC_UPPER));
+
+			// $.others
+			Append_env_pair_info info={&r.charsets, &env, 0};
+			{
+				// influence URLencoding of tainted pieces to String::L_URI lang
+				// main target -- $.QUERY_STRING
+				Temp_client_charset temp(r.charsets, charset? *charset: r.charsets.source());
+				user_env->for_each(append_env_pair, &info);
+			}
 			// $.stdin
 			if(info.vstdin) {
 				stdin_specified=true;
@@ -363,10 +374,6 @@ static void _exec_cgi(Request& r, Method
 							0,
 							STDIN_EXEC_PARAM_NAME " parameter must be string or file");
 			}
-			// $.charset
-			if(info.vcharset)
-				charset=&charsets.get(info.vcharset->as_string()
-					.change_case(r.charsets.source(), String::CC_UPPER));
 		}
 	}
 
@@ -588,7 +595,7 @@ static void _find(Request& r, MethodPara
 		file_spec=&r.relative(r.request_info.uri, file_name);
 
 	// easy way
-	if(file_readable(r.absolute(*file_spec))) {
+	if(file_exist(r.absolute(*file_spec))) {
 		r.write_assign_lang(*file_spec);
 		return;
 	}
@@ -603,7 +610,7 @@ static void _find(Request& r, MethodPara
 		String test_name;
 		test_name<<*(dirname=&dirname->mid(0, after_monkey_slash));
 		test_name<<basename;
-		if(file_readable(r.absolute(test_name))) {
+		if(file_exist(r.absolute(test_name))) {
 			r.write_assign_lang(test_name);
 			return;
 		}
@@ -779,25 +786,24 @@ static void _sql(Request& r, MethodParam
 	VFile& self=GET_SELF(r, VFile);
 	self.set(true/*tainted*/, handlers.value.str, handlers.value.length, user_file_name_cstr, vcontent_type);
 }
-/*
+
 static void _base64(Request& r, MethodParams& params) {
+	VFile& self=GET_SELF(r, VFile);
 	if(params.count()) {
-		// encode 
-		const char* cstr=params.as_string(0, "parameter must be string").cstr();
-		const char* encoded=pa_base64_encode(cstr, strlen(cstr));
-		r.write_assign_lang(*new String(encoded, 0, true/*once ?param=base64(something) was needed* /));
-	} else {
 		// decode
-		VString& vself=GET_SELF(r, VString);
-		const char* cstr=vself.string().cstr();
-		void* decoded_cstr=0;
+		const char* cstr=params.as_string(0, "parameter must be string").cstr();
+		char* decoded_cstr=0;
 		size_t decoded_size=0;
 		pa_base64_decode(cstr, strlen(cstr), decoded_cstr, decoded_size);
 		if(decoded_cstr && decoded_size)
-			r.write_assign_lang(*new String(static_cast<const char*>(decoded_cstr), decoded_size, true));
+			self.set(true/*tainted*/, decoded_cstr, decoded_size);
+	} else {
+		// encode 
+		const char* encoded=pa_base64_encode(self.value_ptr(), self.value_size());
+		r.write_assign_lang(*new String(encoded, 0, true/*once ?param=base64(something) was needed*/));
 	}
 }
-*/
+
 // constructor
 
 MFile::MFile(): Methoded("file") {
@@ -862,5 +868,5 @@ MFile::MFile(): Methoded("file") {
 
 	// ^file.base64[] << encode
 	// ^file::base64[string] << decode
-	//add_native_method("base64", Method::CT_DYNAMIC, _base64, 0, 1);
+	add_native_method("base64", Method::CT_DYNAMIC, _base64, 0, 1);
 }