Merge remote-tracking branch 'remotes/github/0.7' into 0.70.7@210.7

1 files changed, 28 insertions, 29 deletions

diff --git a/src/html.h b/src/html.h
index 79703e0..3f55ba8 100644
--- a/src/html.h
+++ b/src/html.h
@@ -1,9 +1,10 @@
 /*:*
  *: File: ./src/html.h
  *: 
- *: yChat; Homepage: www.yChat.org; Version 0.5.6-BASIC
+ *: yChat; Homepage: www.yChat.org; Version 0.7.9.5-RELEASE
  *: 
- *: Copyright (C) 2003, 2004 Paul C. Buetow, Volker Richter
+ *: Copyright (C) 2003 Paul C. Buetow, Volker Richter
+ *: Copyright (C) 2004 Paul C. Buetow
  *: Copyright (C) 2005 EXA Digital Solutions GbR
  *: 
  *: This program is free software; you can redistribute it and/or
@@ -22,44 +23,42 @@
  *:*/
 
 // class html declaration. this class manages the html-template files.
+#include "incl.h"
 
-#ifndef s_html_H
-#define s_html_H
+#ifndef HTML_H
+#define HTML_H
 
-#include "incl.h"
-#include "cont.h"
-#include "s_conf.h"
-#include "user.h"
+#include "maps/shashmap.h"
+#include "chat/user.h"
 #include "name.h"
 
-
 using namespace std;
 
-class html : public cont, name
+class html : public shashmap<string>, name
 {
-private:
-    // needed for synchronizing the map_vals.
-    pthread_mutex_t mut_map_vals;
-
 public:
-    // public methods.
-    explicit html( ); // simple constructor.
-    ~html( );
+  html( );
+  ~html( );
 
-    // clears the template cache so that new html templates will be read
-    // from hard disk. this method is needed after changeing s.t. on
-    // the html-template files.
-    void clear_cache( );
+  // Clears the template cache so that new html templates will be read
+  // from hard disk. This method is needed after changeing s.t. on
+  // the html-template files.
+  void clear_cache( );
 
-    // returns a parsed html-template. this method will check first if the
-    // required html-template exists inside the classes template cache. if not
-    // then the file will be read from file and added to the cache.
-    // afterwards the html-template will be parsed and returned.
-    // map_params contains the client request parameters which also will be
-    // used for string substituation.
-    virtual string parse( map_string &map_params );
+  // Returns a parsed html-template. this method will check first if the
+  // required html-template exists inside the classes template cache. if not
+  // then the file will be read from file and added to the cache.
+  // afterwards the html-template will be parsed and returned.
+  // map_params contains the client request parameters which also will be
+  // used for string substituation.
+  string parse( map<string,string> &map_params );
+
+  void online_list( user *p_user, map<string,string> &map_params ); //<<
+#ifdef NCURSES
+
+  void print_cached( int i_docs );
+#endif
 
-    virtual void online_list( user *p_user, map_string &map_params );
 };
 
 #endif