1 files changed, 34 insertions, 26 deletions

diff --git a/src/reqp.h b/src/reqp.h
index 6dc8c2d..3a998b9 100755
--- a/src/reqp.h
+++ b/src/reqp.h
@@ -1,41 +1,49 @@
 #include "incl.h"
+
 #ifndef REQP_H
 #define REQP_H
 
-#include "maps/hashmap.h"
+#include <map>
+#include "thrd/thrd.h"
 
 using namespace std;
 
+typedef map<string, string, less<string> > map_string;
+
 class reqp
 {
 private:
-  static const string s_http;
-  static const string s_http_stream;
-  static const string s_http_colength;
-  static const string s_http_cotype;
-
-  // returns the request url from thr client's http request header
-  // until the first "?" and stores all request parameter values
-  // ( behind "?" ) into map_params.
-  string get_url( int &i_sock, string s_req, hashmap<string> &map_params );
-  // returns a specific value of the client's http request header.
-  // ( s.t. like the User-Agent, Referer etc... ).
-  string get_from_header( string s_req, string s_hdr );
-
-  int htoi( string *p_str );
-  void run_html_mod( string s_event, hashmap<string> &map_params, user* p_user ); //<<
-  // Removes double dots ".."
-  string remove_dots( string s_req );
-
-  // Parses "event=bla?blu=bli&sadasda=asddds ..." string and stores them in the map
-  void get_request_parameters( string s_parameters, hashmap<string>& map_params );
+    static string  HTTP_CODEOK,
+    HTTP_CODENF,
+    HTTP_EXPIRE,
+    HTTP_SERVER,
+    HTTP_CONTAC,
+    HTTP_CACHEC,
+    HTTP_CONNEC,
+    HTTP_CHUNKE,
+    HTTP_COTYPE;
+
+    // returns the request url from thr client's http request header
+    // until the first "?" and stores all request parameter values
+    // ( behind "?" ) into map_params.
+    virtual string get_url( thrd* p_thrd, string s_req, map_string &map_params );
+    // returns a specific value of the client's http request header.
+    // ( s.t. like the User-Agent, Referer etc... ).
+    virtual string get_from_header( string s_req, string s_hdr );
+
+    virtual int htoi( string *s );
+    // Removes double dots ".." 
+    string remove_dots( string s_req );
+
+    // Parses "event=bla?blu=bli&sadasda=asddds ..." string and stores them in the map
+    void get_request_parameters( string s_parameters, map_string& map_params );
 
 public:
-  reqp( );
-  string parse( int &i_sock, string s_req, hashmap<string> &map_params );
-  string url_decode ( string s_url );
-  string get_content_type( string s_file );
-  void parse_headers( string s_req, hashmap<string> &map_params );
+    reqp( );
+    virtual string parse( thrd* p_thrd, string s_req, map_string &map_params );
+    virtual string url_decode ( string );
+    virtual string get_content_type( string );
+    virtual void parse_headers( string s_req, map_string &map_params );
 };
 
 #endif