changed: added Cur structure

we have there two pointers: 
 Request * request;
 Session * session;
these are the current request and the current session


the session GC was moved to SessionManager (was in SessionContainer)



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

notify/Makefile.dep

@@ -11,34 +11,35 @@ notify.o: ../core/user.h notifythread.h ../core/basethread.h
 notify.o: ../core/synchro.h templatesnotify.h ../core/config.h
 notify.o: ../core/confparser.h ../core/htmlfilter.h ../core/users.h
 notify.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
-notify.o: ../core/textstream.h ../core/lastcontainer.h ../core/request.h
-notify.o: ../core/requesttypes.h ../core/session.h ../core/error.h
-notify.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
-notify.o: ../templates/htmltextstream.h ../db/db.h ../db/dbbase.h
+notify.o: ../core/textstream.h ../core/lastcontainer.h ../core/cur.h
+notify.o: ../core/request.h ../core/requesttypes.h ../core/error.h
+notify.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
+notify.o: ../core/plugindata.h ../core/rebus.h ../db/db.h ../db/dbbase.h
 notify.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
 notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 notify.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
 notify.o: ../templates/templates.h ../templates/patterncacher.h
 notify.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
-notify.o: ../core/log.h ../templates/indexpatterns.h ../core/request.h
+notify.o: ../core/log.h ../templates/indexpatterns.h ../core/cur.h
 notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
 notify.o: ../notify/notify.h ../core/mounts.h ../core/mount.h
 notify.o: ../core/mountparser.h ../core/users.h ../core/groups.h
 notify.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
 notify.o: ../core/basethread.h ../core/sessionmanager.h
-notify.o: ../core/sessioncontainer.h ../core/system.h ../core/dirs.h
-notify.o: ../core/synchro.h ../core/plugin.h ../core/pluginmsg.h
-notify.o: ../core/sessionmanager.h ../functions/functions.h
-notify.o: ../functions/functionbase.h ../functions/functionparser.h
-notify.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
-notify.o: ../functions/privchanger.h ../functions/chown.h
-notify.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
-notify.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
-notify.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
-notify.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
-notify.o: ../functions/node.h ../functions/priv.h ../functions/reload.h
-notify.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h
-notify.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
+notify.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
+notify.o: ../core/dirs.h ../core/synchro.h ../core/plugin.h
+notify.o: ../core/pluginmsg.h ../core/sessionmanager.h
+notify.o: ../functions/functions.h ../functions/functionbase.h
+notify.o: ../functions/functionparser.h ../functions/adduser.h
+notify.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
+notify.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
+notify.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
+notify.o: ../functions/last.h ../functions/login.h ../functions/logout.h
+notify.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
+notify.o: ../functions/mv.h ../functions/node.h ../functions/priv.h
+notify.o: ../functions/reload.h ../functions/rm.h ../functions/run.h
+notify.o: ../functions/specialdefault.h ../functions/stat.h
+notify.o: ../functions/subject.h ../functions/template.h
 notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
 notify.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
 notify.o: ../core/htmlfilter.h
@@ -55,13 +56,14 @@ notifythread.o: ../templates/locale.h ../templates/htmltextstream.h
 notifythread.o: ../core/user.h ../core/config.h ../core/confparser.h
 notifythread.o: ../core/htmlfilter.h ../core/users.h ../core/user.h
 notifythread.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h
-notifythread.o: ../core/lastcontainer.h ../core/request.h
-notifythread.o: ../core/requesttypes.h ../core/session.h ../core/error.h
-notifythread.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
-notifythread.o: ../templates/htmltextstream.h ../db/db.h ../db/dbbase.h
-notifythread.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
-notifythread.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
-notifythread.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
+notifythread.o: ../core/lastcontainer.h ../core/cur.h ../core/request.h
+notifythread.o: ../core/requesttypes.h ../core/error.h ../core/config.h
+notifythread.o: ../templates/htmltextstream.h ../core/session.h
+notifythread.o: ../core/plugindata.h ../core/rebus.h ../db/db.h
+notifythread.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
+notifythread.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
+notifythread.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
+notifythread.o: ../core/ugcontainer.h
 templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
 templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -70,8 +72,7 @@ templatesnotify.o: ../core/textstream.h ../core/misc.h notifypool.h
 templatesnotify.o: ../templates/locale.h ../core/confparser.h
 templatesnotify.o: ../core/plugin.h ../core/pluginmsg.h ../core/log.h
 templatesnotify.o: ../core/textstream.h ../core/plugindata.h ../core/config.h
-templatesnotify.o: ../core/request.h ../core/requesttypes.h ../core/session.h
-templatesnotify.o: ../core/error.h ../core/user.h ../core/rebus.h
+templatesnotify.o: ../core/request.h ../core/requesttypes.h ../core/error.h
 templatesnotify.o: ../templates/htmltextstream.h ../core/system.h
 templatesnotify.o: ../core/sessionmanager.h ../core/synchro.h
 templatesnotify.o: ../functions/functions.h ../functions/functionbase.h
@@ -84,8 +85,9 @@ templatesnotify.o: ../core/htmlfilter.h ../core/system.h ../core/dirs.h
 templatesnotify.o: ../core/dircontainer.h ../notify/notify.h ../core/mounts.h
 templatesnotify.o: ../core/mount.h ../core/mountparser.h ../core/users.h
 templatesnotify.o: ../core/groups.h ../core/group.h ../core/ugcontainer.h
-templatesnotify.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
-templatesnotify.o: ../core/synchro.h ../functions/functionparser.h
+templatesnotify.o: ../core/rebus.h ../core/loadavg.h ../core/thumb.h
+templatesnotify.o: ../core/basethread.h ../core/synchro.h
+templatesnotify.o: ../functions/functionparser.h ../core/cur.h
 templatesnotify.o: ../functions/adduser.h ../functions/cat.h
 templatesnotify.o: ../functions/chmod.h ../functions/privchanger.h
 templatesnotify.o: ../functions/chown.h ../functions/ckeditor.h
@@ -107,4 +109,5 @@ templatesnotify.o: ../core/httpsimpleparser.h ../core/log.h
 templatesnotify.o: ../templates/indexpatterns.h ../templates/localefilter.h
 templatesnotify.o: ../templates/locale.h ../templates/htmltextstream.h
 templatesnotify.o: ../core/sessionmanager.h ../core/sessioncontainer.h
+templatesnotify.o: ../core/session.h ../core/user.h ../core/cur.h
 templatesnotify.o: ../core/lastcontainer.h

notify/notify.cpp

@@ -32,9 +32,9 @@ void Notify::SetSynchro(Synchro * psynchro)
 
 
 
-void Notify::SetRequest(Request * prequest)
+void Notify::SetCur(Cur * pcur)
 {
-	request = prequest;
+	cur = pcur;
 }
 
 

notify/notify.h

@@ -7,8 +7,8 @@
  * 
  */
  
-#ifndef headerfilecmslunotify
-#define headerfilecmslunotify
+#ifndef headerfile_winix_notify_notify
+#define headerfile_winix_notify_notify
 
 #include <vector>
 #include <string>
@@ -31,7 +31,7 @@ public:
 	Notify();
 
 	void SetSynchro(Synchro * psynchro);
-	void SetRequest(Request * prequest);
+	void SetCur(Cur * pcur);
 	void SetConfig(Config * pconfig);
 	void SetUsers(Users * pusers);
 	void SetDirs(Dirs * pdirs);
@@ -50,7 +50,7 @@ public:
 
 private:
 
-	Request * request;
+	Cur     * cur;
 	Config  * config;
 	Dirs    * dirs;
 	Users   * users;

notify/notifypool.h

@@ -7,8 +7,8 @@
  * 
  */
  
-#ifndef headerfilecmslunotifypool
-#define headerfilecmslunotifypool
+#ifndef headerfile_winix_notify_notifypool
+#define headerfile_winix_notify_notifypool
 
 #include <list>
 #include <string>

notify/notifythread.h

@@ -7,8 +7,8 @@
  * 
  */
  
-#ifndef headerfilecmslunotifythread
-#define headerfilecmslunotifythread
+#ifndef headerfile_winix_notify_notifythread
+#define headerfile_winix_notify_notifythread
 
 #include "core/basethread.h"
 #include "templatesnotify.h"