changed: the way of building

core.a content.a templates.a confparser.a have gone away
	 there is only: cmslu.a now (in the global directory 'cmslu')
changed: the way of building
         in Makefile(s) we dont longer use explicitly a variable 'o = file1.o file2.o...'
	 it was put into Makefile.o.dep and is generated automatically 
         when 'make depend' is invoked
changed: some #include "..." directives were put from *.h to *.cpp files
         fewer dependences


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

core/Makefile

@@ -1,26 +1,22 @@
-o = data.o log.o sessionmanager.o requestcontroller.o dircontainer.o session.o main.o done.o request.o misc.o httpsimpleparser.o db.o error.o db_itemcolumns.o users.o config.o dirs.o groups.o function.o functionparser.o functions.o functioncodeparser.o sessioncontainer.o lastcontainer.o mounts.o mountparser.o mount.o
+include Makefile.o.dep
 
 
+all: $(o)
 
-all: core.a 
-
-core.a: $(o)
-	ar rcs core.a $(o)
 
 .SUFFIXES: .cpp .o
 
 .cpp.o:
-	$(CC) -c $(CFLAGS) $<
+	$(CXX) -c $(CXXFLAGS) $<
 
 
 
 depend:
 	makedepend $(DEPMACROS) -Y. -f- *.cpp > Makefile.dep
-
+	echo -n "o = " > Makefile.o.dep
+	ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep
 
 clean:
 	rm -f *.o
-	rm -f *.a
-
 
 include Makefile.dep

core/Makefile.dep

@@ -1,98 +1,72 @@
 # DO NOT DELETE
 
-config.o: config.h ../confparser/confparser.h error.h log.h data.h misc.h
-config.o: item.h dirs.h db.h dircontainer.h user.h group.h ugcontainer.h
-config.o: thread.h users.h groups.h functions.h function.h
-config.o: functioncodeparser.h lastcontainer.h mounts.h mount.h request.h
-config.o: requesttypes.h session.h done.h getparser.h httpsimpleparser.h
-config.o: postparser.h cookieparser.h mountparser.h
-data.o: data.h misc.h log.h item.h error.h dirs.h db.h dircontainer.h user.h
-data.o: group.h ugcontainer.h thread.h users.h groups.h functions.h
-data.o: function.h functioncodeparser.h lastcontainer.h mounts.h mount.h
-data.o: request.h requesttypes.h session.h done.h getparser.h
-data.o: httpsimpleparser.h postparser.h cookieparser.h mountparser.h
-db.o: db.h log.h item.h misc.h error.h dircontainer.h user.h group.h
-db.o: ugcontainer.h thread.h
-db_itemcolumns.o: db.h log.h item.h misc.h error.h dircontainer.h user.h
-db_itemcolumns.o: group.h ugcontainer.h thread.h
+config.o: config.h ../confparser/confparser.h log.h data.h dirs.h item.h
+config.o: dircontainer.h users.h user.h ugcontainer.h groups.h group.h
+config.o: functions.h function.h lastcontainer.h mounts.h mount.h
+data.o: data.h dirs.h item.h dircontainer.h users.h user.h ugcontainer.h
+data.o: log.h groups.h group.h functions.h function.h lastcontainer.h
+data.o: mounts.h mount.h
+db.o: db.h item.h user.h group.h thread.h error.h log.h dircontainer.h
+db.o: ugcontainer.h misc.h
+db_itemcolumns.o: db.h item.h user.h group.h thread.h error.h log.h
+db_itemcolumns.o: dircontainer.h ugcontainer.h
 dircontainer.o: dircontainer.h item.h log.h
-dirs.o: dirs.h item.h error.h log.h db.h misc.h dircontainer.h user.h group.h
-dirs.o: ugcontainer.h thread.h
+dirs.o: dirs.h item.h dircontainer.h error.h log.h db.h user.h group.h
+dirs.o: thread.h ugcontainer.h
 done.o: done.h
 error.o: error.h log.h
-function.o: function.h log.h item.h
-functioncodeparser.o: functioncodeparser.h function.h log.h item.h
-functionparser.o: functionparser.h request.h requesttypes.h log.h session.h
-functionparser.o: error.h item.h done.h user.h getparser.h httpsimpleparser.h
-functionparser.o: postparser.h cookieparser.h function.h thread.h data.h
-functionparser.o: misc.h dirs.h db.h dircontainer.h group.h ugcontainer.h
-functionparser.o: users.h groups.h functions.h functioncodeparser.h
-functionparser.o: lastcontainer.h mounts.h mount.h mountparser.h
-functionparser.o: ../app/content.h ../core/log.h ../core/data.h
-functionparser.o: ../core/function.h
-functions.o: functions.h function.h log.h item.h functioncodeparser.h
-groups.o: groups.h group.h db.h log.h item.h misc.h error.h dircontainer.h
-groups.o: user.h ugcontainer.h thread.h
+function.o: function.h item.h
+functioncodeparser.o: functioncodeparser.h item.h function.h log.h
+functionparser.o: functionparser.h requesttypes.h ../app/content.h log.h
+functionparser.o: item.h error.h data.h dirs.h dircontainer.h users.h user.h
+functionparser.o: ugcontainer.h groups.h group.h functions.h function.h
+functionparser.o: lastcontainer.h mounts.h mount.h db.h thread.h request.h
+functionparser.o: session.h done.h
+functions.o: functions.h function.h item.h
+groups.o: groups.h group.h ugcontainer.h log.h db.h item.h user.h thread.h
+groups.o: error.h dircontainer.h
 httpsimpleparser.o: httpsimpleparser.h
 lastcontainer.o: lastcontainer.h log.h
 log.o: log.h
-main.o: requestcontroller.h data.h misc.h log.h item.h error.h dirs.h db.h
-main.o: dircontainer.h user.h group.h ugcontainer.h thread.h users.h groups.h
-main.o: functions.h function.h functioncodeparser.h lastcontainer.h mounts.h
-main.o: mount.h request.h requesttypes.h session.h done.h getparser.h
-main.o: httpsimpleparser.h postparser.h cookieparser.h mountparser.h
-main.o: ../content/content.h ../templates/templates.h ../../ezc/src/ezc.h
-main.o: ../core/data.h ../core/request.h ../core/item.h ../core/db.h
-main.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h
-main.o: ../core/groups.h ../core/log.h ../templates/patterncacher.h
-main.o: ../app/templates.h ../core/misc.h ../core/function.h
-main.o: ../core/functionparser.h ../app/content.h sessionmanager.h
-main.o: sessioncontainer.h config.h ../confparser/confparser.h
-misc.o: misc.h log.h item.h
+main.o: requestcontroller.h ../content/content.h ../core/item.h
+main.o: ../templates/templates.h ../../ezc/src/ezc.h
+main.o: ../templates/patterncacher.h ../app/templates.h sessionmanager.h
+main.o: sessioncontainer.h session.h done.h item.h error.h log.h user.h
+main.o: functionparser.h requesttypes.h ../app/content.h data.h dirs.h
+main.o: dircontainer.h users.h ugcontainer.h groups.h group.h functions.h
+main.o: function.h lastcontainer.h mounts.h mount.h request.h thread.h db.h
+main.o: config.h ../confparser/confparser.h
+misc.o: misc.h item.h log.h
 mount.o: mount.h
-mountparser.o: mountparser.h log.h mount.h error.h item.h data.h misc.h
-mountparser.o: dirs.h db.h dircontainer.h user.h group.h ugcontainer.h
-mountparser.o: thread.h users.h groups.h functions.h function.h
-mountparser.o: functioncodeparser.h lastcontainer.h mounts.h request.h
-mountparser.o: requesttypes.h session.h done.h getparser.h httpsimpleparser.h
-mountparser.o: postparser.h cookieparser.h
-mounts.o: mounts.h mount.h request.h requesttypes.h log.h session.h error.h
-mounts.o: item.h done.h user.h getparser.h httpsimpleparser.h postparser.h
-mounts.o: cookieparser.h function.h thread.h mountparser.h data.h misc.h
-mounts.o: dirs.h db.h dircontainer.h group.h ugcontainer.h users.h groups.h
-mounts.o: functions.h functioncodeparser.h lastcontainer.h
-request.o: request.h requesttypes.h log.h session.h error.h item.h done.h
-request.o: user.h getparser.h httpsimpleparser.h postparser.h cookieparser.h
-request.o: function.h thread.h
-requestcontroller.o: requestcontroller.h data.h misc.h log.h item.h error.h
-requestcontroller.o: dirs.h db.h dircontainer.h user.h group.h ugcontainer.h
-requestcontroller.o: thread.h users.h groups.h functions.h function.h
-requestcontroller.o: functioncodeparser.h lastcontainer.h mounts.h mount.h
-requestcontroller.o: request.h requesttypes.h session.h done.h getparser.h
-requestcontroller.o: httpsimpleparser.h postparser.h cookieparser.h
-requestcontroller.o: mountparser.h ../content/content.h
+mountparser.o: mountparser.h mount.h item.h error.h log.h data.h dirs.h
+mountparser.o: dircontainer.h users.h user.h ugcontainer.h groups.h group.h
+mountparser.o: functions.h function.h lastcontainer.h mounts.h
+mounts.o: mounts.h mount.h data.h dirs.h item.h dircontainer.h users.h user.h
+mounts.o: ugcontainer.h log.h groups.h group.h functions.h function.h
+mounts.o: lastcontainer.h request.h requesttypes.h session.h done.h error.h
+mounts.o: thread.h mountparser.h
+request.o: request.h requesttypes.h session.h done.h item.h error.h log.h
+request.o: user.h function.h thread.h getparser.h httpsimpleparser.h
+request.o: postparser.h cookieparser.h
+requestcontroller.o: requestcontroller.h ../content/content.h ../core/item.h
 requestcontroller.o: ../templates/templates.h ../../ezc/src/ezc.h
-requestcontroller.o: ../core/data.h ../core/request.h ../core/item.h
-requestcontroller.o: ../core/db.h ../core/error.h ../core/user.h
-requestcontroller.o: ../core/group.h ../core/users.h ../core/groups.h
-requestcontroller.o: ../core/log.h ../templates/patterncacher.h
-requestcontroller.o: ../app/templates.h ../core/misc.h ../core/function.h
-requestcontroller.o: ../core/functionparser.h ../app/content.h
-requestcontroller.o: sessionmanager.h sessioncontainer.h
-session.o: session.h requesttypes.h error.h log.h item.h done.h user.h
-sessioncontainer.o: sessioncontainer.h session.h requesttypes.h error.h log.h
-sessioncontainer.o: item.h done.h user.h data.h misc.h dirs.h db.h
-sessioncontainer.o: dircontainer.h group.h ugcontainer.h thread.h users.h
-sessioncontainer.o: groups.h functions.h function.h functioncodeparser.h
-sessioncontainer.o: lastcontainer.h mounts.h mount.h request.h getparser.h
-sessioncontainer.o: httpsimpleparser.h postparser.h cookieparser.h
-sessioncontainer.o: mountparser.h
-sessionmanager.o: sessionmanager.h request.h requesttypes.h log.h session.h
-sessionmanager.o: error.h item.h done.h user.h getparser.h httpsimpleparser.h
-sessionmanager.o: postparser.h cookieparser.h function.h thread.h data.h
-sessionmanager.o: misc.h dirs.h db.h dircontainer.h group.h ugcontainer.h
-sessionmanager.o: users.h groups.h functions.h functioncodeparser.h
-sessionmanager.o: lastcontainer.h mounts.h mount.h mountparser.h
-sessionmanager.o: sessioncontainer.h
-users.o: users.h user.h db.h log.h item.h misc.h error.h dircontainer.h
-users.o: group.h ugcontainer.h thread.h
+requestcontroller.o: ../templates/patterncacher.h ../app/templates.h
+requestcontroller.o: sessionmanager.h sessioncontainer.h session.h done.h
+requestcontroller.o: item.h error.h log.h user.h functionparser.h
+requestcontroller.o: requesttypes.h ../app/content.h data.h dirs.h
+requestcontroller.o: dircontainer.h users.h ugcontainer.h groups.h group.h
+requestcontroller.o: functions.h function.h lastcontainer.h mounts.h mount.h
+requestcontroller.o: request.h thread.h postparser.h httpsimpleparser.h
+requestcontroller.o: cookieparser.h
+session.o: session.h done.h item.h error.h log.h user.h
+sessioncontainer.o: sessioncontainer.h session.h done.h item.h error.h log.h
+sessioncontainer.o: user.h data.h dirs.h dircontainer.h users.h ugcontainer.h
+sessioncontainer.o: groups.h group.h functions.h function.h lastcontainer.h
+sessioncontainer.o: mounts.h mount.h
+sessionmanager.o: sessionmanager.h sessioncontainer.h session.h done.h item.h
+sessionmanager.o: error.h log.h user.h request.h requesttypes.h function.h
+sessionmanager.o: thread.h data.h dirs.h dircontainer.h users.h ugcontainer.h
+sessionmanager.o: groups.h group.h functions.h lastcontainer.h mounts.h
+sessionmanager.o: mount.h
+users.o: users.h user.h ugcontainer.h log.h db.h item.h group.h thread.h
+users.o: error.h dircontainer.h

core/Makefile.o.dep

@@ -0,0 +1 @@
+o = config.o data.o db.o db_itemcolumns.o dircontainer.o dirs.o done.o error.o function.o functioncodeparser.o functionparser.o functions.o groups.o httpsimpleparser.o lastcontainer.o log.o main.o misc.o mount.o mountparser.o mounts.o request.o requestcontroller.o session.o sessioncontainer.o sessionmanager.o users.o 

core/config.cpp

@@ -2,12 +2,14 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "config.h"
+#include "log.h"
+#include "data.h"
 
 
 Config::Config()

core/config.h

@@ -2,22 +2,19 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfileconfig
-#define headerfileconfig
-
-
-#include "../confparser/confparser.h"
-#include "error.h"
-#include "data.h"
-#include "log.h"
+#ifndef headerfilecmslucoreconfig
+#define headerfilecmslucoreconfig
 
 #include <string>
 
+#include "../confparser/confparser.h"
+
+
 
 class Config
 {

core/cookieparser.h

@@ -2,18 +2,18 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilecookieparser
-#define headerfilecookieparser
+#ifndef headerfilecmslucorecookieparser
+#define headerfilecmslucorecookieparser
 
 #include <fcgiapp.h>
 #include "httpsimpleparser.h"
 #include "requesttypes.h"
-
+#include "log.h"
 
 
 

core/data.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -11,6 +11,8 @@
 
 
 
+
+
 Data::Data()
 {
 	signal_hup       = false;

core/data.h

@@ -2,22 +2,19 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfiledata
-#define headerfiledata
+#ifndef headerfilecmslucoredata
+#define headerfilecmslucoredata
 
 #include <string>
 #include <vector>
 #include <map>
 #include <string.h>
 
-#include "misc.h"
-#include "item.h"
-#include "error.h"
 #include "dirs.h"
 #include "users.h"
 #include "groups.h"

core/db.cpp

@@ -2,12 +2,14 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "db.h"
+#include "log.h"
+#include "misc.h"
 
 
 Db::Db(bool close_at_end_)

core/db.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilecoredb
-#define headerfilecoredb
+#ifndef headerfilecmslucoredb
+#define headerfilecmslucoredb
 
 
 #include <string>
@@ -20,15 +20,13 @@
 #include <ctime>
 #include <cstring>
 
-#include "log.h"
 #include "item.h"
-#include "misc.h"
-#include "error.h"
-#include "dircontainer.h"
 #include "user.h"
 #include "group.h"
-#include "ugcontainer.h"
 #include "thread.h"
+#include "error.h"
+#include "dircontainer.h"
+#include "ugcontainer.h"
 
 
 

core/db_itemcolumns.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */

core/dircontainer.cpp

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "dircontainer.h"
-
+#include "log.h"
 
 
 DirContainer::DirContainer()

core/dircontainer.h

@@ -2,18 +2,18 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfiledircontainer
-#define headerfiledircontainer
+#ifndef headerfilecmslucoredircontainer
+#define headerfilecmslucoredircontainer
 
 #include <list>
 #include <map>
 #include "item.h"
-#include "log.h"
+
 
 
 class DirContainer

core/dirs.cpp

@@ -2,12 +2,16 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "dirs.h"
+#include "error.h"
+#include "log.h"
+#include "db.h"
+
 
 
 void Dirs::Clear()

core/dirs.h

@@ -2,22 +2,20 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfiledirs
-#define headerfiledirs
+#ifndef headerfilecmslucoredirs
+#define headerfilecmslucoredirs
 
 
 #include <vector>
 #include <map>
 #include <string>
+
 #include "item.h"
-#include "error.h"
-#include "log.h"
-#include "db.h"
 #include "dircontainer.h"
 
 

core/done.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */

core/done.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfiledone
-#define headerfiledone
+#ifndef headerfilecmslucoredone
+#define headerfilecmslucoredone
 
 
 

core/error.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */

core/error.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfileerror
-#define headerfileerror
+#ifndef headerfilecmslucoreerror
+#define headerfilecmslucoreerror
 
 #include <iostream>
 #include "log.h"

core/function.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -10,6 +10,7 @@
 #include "function.h"
 
 
+
 Function::Function()
 {
 	code = FUN_NONE;

core/function.h

@@ -7,11 +7,10 @@
  * 
  */
  
-#ifndef headerfilefunction
-#define headerfilefunction
+#ifndef headerfilecmslucorefunction
+#define headerfilecmslucorefunction
 
 #include <iostream>
-#include "log.h"
 #include "item.h"
 
 

core/functioncodeparser.cpp

@@ -2,12 +2,14 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "functioncodeparser.h"
+#include "function.h"
+#include "log.h"
 
 
 

core/functioncodeparser.h

@@ -2,19 +2,18 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilefunctioncodeparser
-#define headerfilefunctioncodeparser
+#ifndef headerfilecmslucorefunctioncodeparser
+#define headerfilecmslucorefunctioncodeparser
 
 #include <cstring>
 #include <cstdlib>
-#include "function.h"
+
 #include "item.h"
-#include "log.h"
 
 
 class FunctionCodeParser

core/functionparser.cpp

@@ -2,13 +2,18 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "functionparser.h"
-
+#include "log.h"
+#include "item.h"
+#include "error.h"
+#include "data.h"
+#include "db.h"
+#include "request.h"
 
 
 

core/functionparser.h

@@ -2,20 +2,15 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilefunctionparser
-#define headerfilefunctionparser
+#ifndef headerfilecmslucorefunctionparser
+#define headerfilecmslucorefunctionparser
 
-#include "request.h"
-#include "log.h"
-#include "item.h"
-#include "error.h"
-#include "data.h"
-#include "db.h"
+#include "requesttypes.h"
 
 #ifdef APPFUNCTIONS	
 #include "../app/content.h"

core/functions.cpp

@@ -14,6 +14,7 @@
 
 
 
+
 void Functions::Clear()
 {
 	table.clear();

core/functions.h

@@ -2,18 +2,18 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilefunctions
-#define headerfilefunctions
+#ifndef headerfilecmslucorefunctions
+#define headerfilecmslucorefunctions
 
 #include <map>
 #include <string>
+
 #include "function.h"
-#include "functioncodeparser.h"
 
 
 

core/getparser.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilegetparser
-#define headerfilegetparser
+#ifndef headerfilecmslucoregetparser
+#define headerfilecmslucoregetparser
 
 #include "httpsimpleparser.h"
 #include "requesttypes.h"

core/group.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilegroup
-#define headerfilegroup
+#ifndef headerfilecmslucoregroup
+#define headerfilecmslucoregroup
 
 #include <string>
 #include <vector>

core/groups.cpp

@@ -2,14 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "groups.h"
-
-
+#include "db.h"
 
 
 

core/groups.h

@@ -2,17 +2,17 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilegroups
-#define headerfilegroups
+#ifndef headerfilecmslucoregroups
+#define headerfilecmslucoregroups
 
 #include <map>
+
 #include "group.h"
-#include "db.h"
 #include "ugcontainer.h"
 
 

core/httpsimpleparser.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */

core/httpsimpleparser.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilehttpsimpleparser
-#define headerfilehttpsimpleparser
+#ifndef headerfilecmslucorehttpsimpleparser
+#define headerfilecmslucorehttpsimpleparser
 
 
 #include <string>

core/item.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfileitem
-#define headerfileitem
+#ifndef headerfilecmslucoreitem
+#define headerfilecmslucoreitem
 
 #include <string>
 

core/lastcontainer.cpp

@@ -9,6 +9,7 @@
 
 
 #include "lastcontainer.h"
+#include "log.h"
 
 
 

core/lastcontainer.h

@@ -7,15 +7,14 @@
  * 
  */
  
-#ifndef headerfilelastcontainer33
-#define headerfilelastcontainer33
+#ifndef headerfilecmslucorelastcontainer
+#define headerfilecmslucorelastcontainer
 
 #include <string>
 #include <list>
 #include <cstring>
 #include <ctime>
 
-#include "log.h"
 
 
 // how many items we store in the 'last' function

core/log.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */

core/log.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilelog
-#define headerfilelog
+#ifndef headerfilecmslucorelog
+#define headerfilecmslucorelog
 
 
 #include <sstream>

core/main.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -11,6 +11,7 @@
 #include <ctime>
 #include <signal.h>
 #include <iostream>
+
 #include "requestcontroller.h"
 #include "data.h"
 #include "log.h"

core/misc.cpp

@@ -2,12 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "misc.h"
+#include "log.h"
 
 
 

core/misc.h

@@ -2,19 +2,18 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilemisc
-#define headerfilemisc
+#ifndef headerfilecmslucoremisc
+#define headerfilecmslucoremisc
 
 
 #include <string>
 #include <sstream>
 #include <ctime>
-#include "log.h"
 #include "item.h"
 
 #define MAJOR_VER        0

core/mount.h

@@ -8,8 +8,8 @@
  */
 
 
-#ifndef headerfilecoremount
-#define headerfilecoremount
+#ifndef headerfilecmslucoremount
+#define headerfilecmslucoremount
 
 #include <set>
 #include <string>

core/mountparser.cpp

@@ -9,6 +9,7 @@
  
 #include "mountparser.h"
 #include "data.h"
+#include "log.h"
 
 
 

core/mountparser.h

@@ -7,17 +7,15 @@
  * 
  */
  
-#ifndef headerfilecoremountparser
-#define headerfilecoremountparser
+#ifndef headerfilecmslucoremountparser
+#define headerfilecmslucoremountparser
 
 #include <map>
 #include <string>
 
-#include "log.h"
 #include "mount.h"
-#include "error.h"
 #include "item.h"
-
+#include "error.h"
 
 
 

core/mounts.cpp

@@ -9,6 +9,9 @@
  
 #include "mounts.h"
 #include "data.h"
+#include "request.h"
+#include "log.h"
+#include "mountparser.h"
 
 
 void Mounts::ReadMounts()

core/mounts.h

@@ -8,15 +8,12 @@
  */
  
 
-#ifndef headerfilecoremounts
-#define headerfilecoremounts
+#ifndef headerfilecmslucorecoremounts
+#define headerfilecmslucorecoremounts
 
 
 #include <map>
 #include "mount.h"
-#include "request.h"
-#include "log.h"
-#include "mountparser.h"
 
 
 

core/postparser.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilepostparser
-#define headerfilepostparser
+#ifndef headerfilecmslucorepostparser
+#define headerfilecmslucorepostparser
 
 #include <fcgiapp.h>
 #include <string>

core/request.cpp

@@ -2,12 +2,16 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "request.h"
+#include "getparser.h"
+#include "postparser.h"
+#include "cookieparser.h"
+#include "log.h"
 
 
 

core/request.h

@@ -2,32 +2,29 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilerequest
-#define headerfilerequest
+#ifndef headerfilecmslucorerequest
+#define headerfilecmslucorerequest
 
 #include <fcgiapp.h>
 #include <sstream>
 #include <vector>
 #include <ctime>
 #include <iomanip>
-#include "requesttypes.h"
-#include "log.h"
-#include "session.h"
 
-#include "getparser.h"
-#include "postparser.h"
-#include "cookieparser.h"
+#include "requesttypes.h"
+#include "session.h"
 #include "item.h"
 #include "error.h"
 #include "function.h"
 #include "thread.h"
 
 
+
 struct Request
 {
 	// request id

core/requestcontroller.cpp

@@ -2,12 +2,17 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "requestcontroller.h"
+#include "data.h"
+#include "log.h"
+#include "request.h"
+#include "postparser.h"
+#include "cookieparser.h"
 
 
 

core/requestcontroller.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilerequestcontroller
-#define headerfilerequestcontroller
+#ifndef headerfilecmslucorerequestcontroller
+#define headerfilecmslucorerequestcontroller
 
 #include <unistd.h>
 #include <sys/stat.h>
@@ -18,13 +18,10 @@
 #include <grp.h>
 #include <errno.h>
 
-#include "data.h"
-#include "log.h"
-#include "request.h"
 #include "../content/content.h"
 #include "sessionmanager.h"
-#include "postparser.h"
-#include "cookieparser.h"
+#include "functionparser.h"
+#include "sessioncontainer.h"
 
 
 class RequestController

core/requesttypes.h

@@ -2,13 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilerequesttypes
-#define headerfilerequesttypes
+#ifndef headerfilecmslucorerequesttypes
+#define headerfilecmslucorerequesttypes
 
 #include <string>
 #include <vector>

core/session.cpp

@@ -2,7 +2,7 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -10,6 +10,7 @@
 #include "session.h"
 
 
+
 Session::Session()
 {
 	Clear();

core/session.h

@@ -2,19 +2,18 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilecoresession
-#define headerfilecoresession
+#ifndef headerfilecmslucoresession
+#define headerfilecmslucoresession
 
 #include <ctime>
-#include "requesttypes.h"
-#include "error.h"
-#include "item.h"
 #include "done.h"
+#include "item.h"
+#include "error.h"
 #include "user.h"
 
 

core/sessioncontainer.cpp

@@ -2,13 +2,15 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "sessioncontainer.h"
 #include "data.h"
+#include "log.h"
+
 
 void SessionContainer::Clear()
 {

core/sessioncontainer.h

@@ -2,20 +2,22 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilesessioncontainer
-#define headerfilesessioncontainer
+#ifndef headerfilecmslucoresessioncontainer
+#define headerfilecmslucoresessioncontainer
 
 
 #include <list>
 #include <map>
 #include <ctime>
+
 #include "session.h"
-#include "log.h"
+
+
 
 
 class SessionContainer

core/sessionmanager.cpp

@@ -2,12 +2,17 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "sessionmanager.h"
+#include "request.h"
+#include "log.h"
+#include "data.h"
+#include "session.h"
+
 
 
 bool SessionManager::IsSession(long id)

core/sessionmanager.h

@@ -2,22 +2,17 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfilesessionmanager
-#define headerfilesessionmanager
+#ifndef headerfilecmslucoresessionmanager
+#define headerfilecmslucoresessionmanager
 
 #include <set>
 #include <ctime>
 
-#include "request.h"
-#include "log.h"
-#include "data.h"
-#include "session.h"
-#include "db.h"
 #include "sessioncontainer.h"
 
 

core/thread.h

@@ -7,12 +7,13 @@
  * 
  */
  
-#ifndef headerfilecorethread
-#define headerfilecorethread
+#ifndef headerfilecmslucorecorethread
+#define headerfilecmslucorecorethread
 
 #include <string>
 
 
+
 class Thread
 {
 public:

core/ugcontainer.h

@@ -2,17 +2,18 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfileugcontainer
-#define headerfileugcontainer
+#ifndef headerfilecmslucoreugcontainer
+#define headerfilecmslucoreugcontainer
 
 #include <vector>
 #include <map>
 #include <stdexcept>
+
 #include "log.h"
 
 

core/user.h

@@ -2,17 +2,19 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfileuser
-#define headerfileuser
+#ifndef headerfilecmslucoreuser
+#define headerfilecmslucoreuser
 
 #include <string>
 #include <vector>
 
+
+
 struct User
 {
 	long id;

core/users.cpp

@@ -2,12 +2,13 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
 #include "users.h"
+#include "db.h"
 
 
 

core/users.h

@@ -2,17 +2,16 @@
  * This file is a part of CMSLU -- Content Management System like Unix
  * and is not publicly distributed
  * 
- * Copyright (c) 2008, Tomasz Sowa
+ * Copyright (c) 2008-2009, Tomasz Sowa
  * All rights reserved.
  * 
  */
  
-#ifndef headerfileusers
-#define headerfileusers
+#ifndef headerfilecmslucoreusers
+#define headerfilecmslucoreusers
 
 #include <map>
 #include "user.h"
-#include "db.h"
 #include "ugcontainer.h"