the first part of reimplementing has been done

now we have app object and singletons are only: log logn plugin and app



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@628 e52654a7-88a9-db11-a3e9-0013d4bc506e

templates/templates.h

@@ -16,11 +16,19 @@
 #include "patterncacher.h"
 #include "misc.h"
 #include "ckeditorgetparser.h"
-#include "../core/locale.h"
 #include "indexpatterns.h"
+#include "core/config.h"
+#include "core/request.h"
+#include "core/db.h"
+#include "core/system.h"
+#include "core/locale.h"
+#include "core/sessionmanager.h"
 
 
 
+class Functions;
+
+
 
 namespace TemplatesFunctions
 {
@@ -64,7 +72,7 @@ namespace TemplatesFunctions
 
 	struct PatName
 	{
-		int fun_code;
+		const char * fun_name;
 		Pat pat;	
 	};
 
@@ -73,9 +81,18 @@ namespace TemplatesFunctions
 	extern Patterns          patterns;
 	extern PatternCacher     pattern_cacher;
 	extern Locale            locale;
-	extern Ezc::Functions    functions;
+	extern Ezc::Functions    ezc_functions;
 	extern CKEditorGetParser ckeditor_getparser;
 
+	extern Config  * config;
+	extern Request * request;
+	extern Db      * db;
+	extern System  * system;
+	extern Functions * functions;
+	extern SessionManager * session_manager;
+
+
+
 	
 	/*
 		sys
@@ -394,6 +411,13 @@ public:
 
 	Templates();
 
+	void SetConfig(Config * pconfig);
+	void SetRequest(Request * prequest);
+	void SetDb(Db * pdb);
+	void SetSystem(System * psystem);
+	void SetFunctions(Functions * pfunctions);
+	void SetSessionManager(SessionManager * psession_manager);
+
 	void ClearPatterns();
 	void ReadTemplates();
 	void ReadNewIndexTemplates();